diff --git a/interface/resources/serverless/Models/avatarStand.fst b/interface/resources/serverless/Models/avatarStand.fst
index 9ecd17d41b..04a4982e75 100644
--- a/interface/resources/serverless/Models/avatarStand.fst
+++ b/interface/resources/serverless/Models/avatarStand.fst
@@ -1,3 +1,3 @@
-name = AVATAR_STAND
-filename = qrc:///serverless/Models/avatarStand.fbx
-materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [0.4235294117647059, 1, 0], "roughness": 0.26, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.89, 1.68247, 0.756], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = AVATAR_STAND
+filename = qrc:///serverless/Models/avatarStand.fbx
+materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [0.4235294117647059, 1, 0], "roughness": 0.26, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.89, 1.68247, 0.756], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/dome.fst b/interface/resources/serverless/Models/dome.fst
index 94dd350020..6e7a00536a 100644
--- a/interface/resources/serverless/Models/dome.fst
+++ b/interface/resources/serverless/Models/dome.fst
@@ -1,3 +1,3 @@
-name = DOME
-filename = qrc:///serverless/Models/dome.fbx
-materialMap = [{"mat::FLOOR": {"materials":[{ "name": "FLOOR", "albedo": [0.06 ,0.06 ,0.06], "roughness": 0.32, "metallic": 0.01, "normalMap": "qrc:///serverless/Textures/fundationNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.64741, 2.09, 0.713058], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::STRUCTURE": {"materials":[{ "name": "STRUCTURE", "albedo": [0.7882, 0.9333, 0.6274], "roughness": 0.5, "metallic": 0.1, "albedoMap": "qrc:///serverless/Textures/Concrete15_col-512.jpg", "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = DOME
+filename = qrc:///serverless/Models/dome.fbx
+materialMap = [{"mat::FLOOR": {"materials":[{ "name": "FLOOR", "albedo": [0.06 ,0.06 ,0.06], "roughness": 0.32, "metallic": 0.01, "normalMap": "qrc:///serverless/Textures/fundationNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.64741, 2.09, 0.713058], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::STRUCTURE": {"materials":[{ "name": "STRUCTURE", "albedo": [0.7882, 0.9333, 0.6274], "roughness": 0.5, "metallic": 0.1, "albedoMap": "qrc:///serverless/Textures/Concrete15_col-512.jpg", "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/engery-bowl.fst b/interface/resources/serverless/Models/engery-bowl.fst
index 37ba07d723..de7a9df083 100644
--- a/interface/resources/serverless/Models/engery-bowl.fst
+++ b/interface/resources/serverless/Models/engery-bowl.fst
@@ -1,3 +1,3 @@
-name = ENERGY_BOWL
-filename = qrc:///serverless/Models/engery-bowl.fbx
-materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1 ,1 ,1], "albedoMap": "qrc:///serverless/Textures/Metal26_col.jpg","roughness": 0.28, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/Metal26_nrm.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = ENERGY_BOWL
+filename = qrc:///serverless/Models/engery-bowl.fbx
+materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1 ,1 ,1], "albedoMap": "qrc:///serverless/Textures/Metal26_col.jpg","roughness": 0.28, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/Metal26_nrm.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst b/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst
index 9449aa3e1b..3047f93d8a 100644
--- a/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst
+++ b/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst
@@ -1,3 +1,3 @@
-name = LOGO-OVERTE
-filename = qrc:///serverless/Models/logo_overte.fbx
-materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.5, "metallic": 0.01, "emissive": [1.55, 1.55, 1.55], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::SECONDARY": {"materials":[{ "name": "SECONDARY", "albedo": [0.3843, 0.39213, 0.8901], "roughness": 0.5, "metallic": 0.01, "emissive": [0.6988, 0.5611, 2.6047], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = LOGO-OVERTE
+filename = qrc:///serverless/Models/logo_overte.fbx
+materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.5, "metallic": 0.01, "emissive": [1.55, 1.55, 1.55], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::SECONDARY": {"materials":[{ "name": "SECONDARY", "albedo": [0.3843, 0.39213, 0.8901], "roughness": 0.5, "metallic": 0.01, "emissive": [0.6988, 0.5611, 2.6047], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/standAngle_Applications.fst b/interface/resources/serverless/Models/standAngle_Applications.fst
index bfa6593aee..e18e3f00e2 100644
--- a/interface/resources/serverless/Models/standAngle_Applications.fst
+++ b/interface/resources/serverless/Models/standAngle_Applications.fst
@@ -1,3 +1,3 @@
-name = STAND-ANGLE_APPLICATIONS
-filename = qrc:///serverless/Models/standAngle.fbx
-materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/applications.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = STAND-ANGLE_APPLICATIONS
+filename = qrc:///serverless/Models/standAngle.fbx
+materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/applications.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/standAngle_Avatar.fst b/interface/resources/serverless/Models/standAngle_Avatar.fst
index 0cb6bd2f05..6831033241 100644
--- a/interface/resources/serverless/Models/standAngle_Avatar.fst
+++ b/interface/resources/serverless/Models/standAngle_Avatar.fst
@@ -1,3 +1,3 @@
-name = STAND-ANGLE_AVATAR
-filename = qrc:///serverless/Models/standAngle.fbx
-materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/avatar.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = STAND-ANGLE_AVATAR
+filename = qrc:///serverless/Models/standAngle.fbx
+materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/avatar.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/standAngle_ConfigWizard.fst b/interface/resources/serverless/Models/standAngle_ConfigWizard.fst
index f956c85086..c181c863ba 100644
--- a/interface/resources/serverless/Models/standAngle_ConfigWizard.fst
+++ b/interface/resources/serverless/Models/standAngle_ConfigWizard.fst
@@ -1,3 +1,3 @@
-name = STAND-ANGLE_CONFIG-WIZARD
-filename = qrc:///serverless/Models/standAngle.fbx
-materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [0 ,0 ,0], "roughness": 1, "metallic": 0.01, "unlit": true, "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = STAND-ANGLE_CONFIG-WIZARD
+filename = qrc:///serverless/Models/standAngle.fbx
+materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [0 ,0 ,0], "roughness": 1, "metallic": 0.01, "unlit": true, "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/standAngle_Controls.fst b/interface/resources/serverless/Models/standAngle_Controls.fst
index c896cd885f..f305994a6e 100644
--- a/interface/resources/serverless/Models/standAngle_Controls.fst
+++ b/interface/resources/serverless/Models/standAngle_Controls.fst
@@ -1,3 +1,3 @@
-name = STAND-ANGLE_CONTROLS
-filename = qrc:///serverless/Models/standAngle.fbx
-materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/controls.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = STAND-ANGLE_CONTROLS
+filename = qrc:///serverless/Models/standAngle.fbx
+materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/controls.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/standAngle_TabletAndToolbar.fst b/interface/resources/serverless/Models/standAngle_TabletAndToolbar.fst
index be95bd8412..463a4ba047 100644
--- a/interface/resources/serverless/Models/standAngle_TabletAndToolbar.fst
+++ b/interface/resources/serverless/Models/standAngle_TabletAndToolbar.fst
@@ -1,3 +1,3 @@
-name = STAND-ANGLE_TABLET-TOOLBAR
-filename = qrc:///serverless/Models/standAngle.fbx
-materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/tabletAndToolbar.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = STAND-ANGLE_TABLET-TOOLBAR
+filename = qrc:///serverless/Models/standAngle.fbx
+materialMap = [{"mat::IMAGE": {"materials":[{ "name": "IMAGE", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.2, "metallic": 0.01, "unlit": true, "albedoMap": "qrc:///serverless/Images/tabletAndToolbar.png", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/teleporter.fst b/interface/resources/serverless/Models/teleporter.fst
index db5a627717..7fe57a45b9 100644
--- a/interface/resources/serverless/Models/teleporter.fst
+++ b/interface/resources/serverless/Models/teleporter.fst
@@ -1,3 +1,3 @@
-name = TELEPORTER
-filename = qrc:///serverless/Models/teleporter.fbx
-materialMap = [{"mat::EXO": {"materials":[{ "name": "MAIN", "albedo": [0.06, 0.06, 0.06], "roughness": 0.26, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.51466666, 0.879843137, 2.84], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::ENDO": {"materials":[{ "name": "ENDO", "albedo": [0.85, 0.85, 0.85], "roughness": 0.26, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = TELEPORTER
+filename = qrc:///serverless/Models/teleporter.fbx
+materialMap = [{"mat::EXO": {"materials":[{ "name": "MAIN", "albedo": [0.06, 0.06, 0.06], "roughness": 0.26, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.51466666, 0.879843137, 2.84], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::ENDO": {"materials":[{ "name": "ENDO", "albedo": [0.85, 0.85, 0.85], "roughness": 0.26, "metallic": 1.0, "normalMap": "qrc:///serverless/Textures/concreteNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/Models/test_area.fst b/interface/resources/serverless/Models/test_area.fst
index 55189b4987..a0908342f9 100644
--- a/interface/resources/serverless/Models/test_area.fst
+++ b/interface/resources/serverless/Models/test_area.fst
@@ -1,3 +1,3 @@
-name = QUICK-TEST-AREA
-filename = qrc:///serverless/Models/test_area.fbx
-materialMap = [{"mat::FLOOR": {"materials":[{ "name": "FLOOR", "albedo": [0.06 ,0.06 ,0.06], "roughness": 0.32, "metallic": 0.01, "normalMap": "qrc:///serverless/Textures/fundationNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.64741, 2.09, 0.713058], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
+name = QUICK-TEST-AREA
+filename = qrc:///serverless/Models/test_area.fbx
+materialMap = [{"mat::FLOOR": {"materials":[{ "name": "FLOOR", "albedo": [0.06 ,0.06 ,0.06], "roughness": 0.32, "metallic": 0.01, "normalMap": "qrc:///serverless/Textures/fundationNormal512.jpg", "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::LIGHT": {"materials":[{ "name": "LIGHT", "albedo": [1, 1, 1], "roughness": 0.5, "metallic": 0.01, "emissive": [1.64741, 2.09, 0.713058], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]