diff --git a/Assets/.DS_Store b/Assets/.DS_Store
new file mode 100644
index 0000000..aad2ded
Binary files /dev/null and b/Assets/.DS_Store differ
diff --git a/Assets/Demos/.DS_Store b/Assets/Demos/.DS_Store
new file mode 100644
index 0000000..14ffee9
Binary files /dev/null and b/Assets/Demos/.DS_Store differ
diff --git a/Assets/Demos/Marker/.DS_Store b/Assets/Demos/Marker/.DS_Store
new file mode 100644
index 0000000..6942806
Binary files /dev/null and b/Assets/Demos/Marker/.DS_Store differ
diff --git a/Assets/Demos/Markerless/.DS_Store b/Assets/Demos/Markerless/.DS_Store
new file mode 100644
index 0000000..c912da3
Binary files /dev/null and b/Assets/Demos/Markerless/.DS_Store differ
diff --git a/Assets/Plugins/WebGL/ARWTAccess.jslib b/Assets/Plugins/WebGL/ARWTAccess.jslib
new file mode 100644
index 0000000..4463ec8
--- /dev/null
+++ b/Assets/Plugins/WebGL/ARWTAccess.jslib
@@ -0,0 +1,28 @@
+mergeInto(LibraryManager.library, {
+
+	CameraReady : function() {
+
+		cameraReady();
+
+	},
+
+    DetectionManagerReady : function () {
+
+        detectionManagerReady();
+
+    },
+
+    ObjectAvailable : function() {
+
+		objectAvailable();
+
+	},
+
+	GetCamName : function(camName) {
+
+		var name = Pointer_stringify(camName)
+		getCamName(name);
+
+	},
+
+});
\ No newline at end of file
diff --git a/Assets/Resources/.DS_Store b/Assets/Resources/.DS_Store
new file mode 100644
index 0000000..7faafee
Binary files /dev/null and b/Assets/Resources/.DS_Store differ
diff --git a/Assets/Scripts/.DS_Store b/Assets/Scripts/.DS_Store
new file mode 100644
index 0000000..39028e9
Binary files /dev/null and b/Assets/Scripts/.DS_Store differ
diff --git a/Assets/Scripts/Common/.DS_Store b/Assets/Scripts/Common/.DS_Store
new file mode 100644
index 0000000..8ba9703
Binary files /dev/null and b/Assets/Scripts/Common/.DS_Store differ
diff --git a/Assets/Scripts/Common/CameraController.cs b/Assets/Scripts/Common/CameraController.cs
index cc919bc..0ed1c2e 100644
--- a/Assets/Scripts/Common/CameraController.cs
+++ b/Assets/Scripts/Common/CameraController.cs
@@ -1,16 +1,27 @@
 using UnityEngine;
+using System.Runtime.InteropServices;
 
 namespace ARWT.Core{
     public class CameraController : MonoBehaviour{
         
+	    [DllImport("__Internal")]
+	    private static extern void ObjectAvailable();
+	    		
+	    [DllImport("__Internal")]
+	    private static extern void CameraReady();
+	    
         Matrix4x4 defProj;
         Camera cam;
 
-        [System.Obsolete]
         void Start() {
             cam = GetComponent<Camera>();
-            Application.ExternalCall("cameraReady");
             
+	        if(!Application.isEditor){
+	        	
+		        CameraReady();
+		        
+	        }
+	        
             defProj = cam.projectionMatrix;
         }
 
@@ -63,7 +74,8 @@ public void setProjection(string val){
             p[2, 3] = defProj[14];
 
 
-            cam.projectionMatrix = p;
+	        cam.projectionMatrix = p;
+	        
         }
 
         public void setPosition(string val){
@@ -92,6 +104,24 @@ public void setEuler(string val){
 
             transform.eulerAngles = new Vector3(x, y, z);
         }
+        
+	    public void ObjectCheck(string objectName){
+	    	
+	    	if(GameObject.Find(objectName) != null){
+	    		
+	    		if(!Application.isEditor){
+	    			
+		    		ObjectAvailable();
+	    		
+	    		}
+	    		
+	    	}else{
+	    		
+	    		Debug.LogError("There is no gameobject with the name " + objectName + " available for use!");
+	    		
+	    	}
+
+	    }
 
     }
 }
diff --git a/Assets/Scripts/Common/PostBuild/PostBuildActions.cs b/Assets/Scripts/Common/PostBuild/PostBuildActions.cs
index af0b021..3b08e86 100644
--- a/Assets/Scripts/Common/PostBuild/PostBuildActions.cs
+++ b/Assets/Scripts/Common/PostBuild/PostBuildActions.cs
@@ -17,26 +17,19 @@ public class PostBuildActions{
         static string markersPath = "data/markers";
         static string markersImagesPath = "data/markersImages";
         static string index = "index.html";
-        static string appJS = "js/app.js";
-
-        
 
         [PostProcessBuild]
-        public static void OnPostProcessBuild(BuildTarget target, string targetPath){
-            var path = Path.Combine(targetPath, "Build/UnityLoader.js");
+	    public static void OnPostProcessBuild(BuildTarget target, string targetPath){
+	    	
+		    var path = Path.Combine(targetPath, "Build/" + getName(targetPath) + ".loader.js");
             var text = File.ReadAllText(path);
             text = text.Replace("UnityLoader.SystemInfo.mobile", "false");
             File.WriteAllText(path, text);
 
-            string buildJsonPath = "Build/" + getName(targetPath) + ".json";
-            path = Path.Combine(targetPath, "Build/" + getName(targetPath) + ".json");
-            replaceInFile(path, "backgroundColor", "");
 
             generateHTML(targetPath);
             copyImages(targetPath);
 
-            string unityDeclaration = $"const unityInstance = UnityLoader.instantiate(\"unityContainer\", \"{buildJsonPath}\");";
-            replaceInFile(Path.Combine(targetPath, appJS), buildPlaceholder, unityDeclaration);
         }
 
         static string getName(string p){
diff --git a/Assets/Scripts/WebAR/.DS_Store b/Assets/Scripts/WebAR/.DS_Store
new file mode 100644
index 0000000..4586c99
Binary files /dev/null and b/Assets/Scripts/WebAR/.DS_Store differ
diff --git a/Assets/Scripts/WebAR/DetectionManager.cs b/Assets/Scripts/WebAR/DetectionManager.cs
index 96af069..7a2af10 100644
--- a/Assets/Scripts/WebAR/DetectionManager.cs
+++ b/Assets/Scripts/WebAR/DetectionManager.cs
@@ -1,5 +1,6 @@
 using ARWT.Core;
 using UnityEngine;
+using System.Runtime.InteropServices;
 
 namespace ARWT.Marker{
     public class MarkerInfo{
@@ -19,15 +20,23 @@ public MarkerInfo(string name, bool isVisible, Vector3 position, Quaternion rota
     }
 
     public class DetectionManager : Singleton<DetectionManager>{
-
+	    
+	    [DllImport("__Internal")]
+	    private static extern void DetectionManagerReady();
+	    
         public delegate void MarkerDetection(MarkerInfo m);
         public static event MarkerDetection onMarkerDetected;
         public static event MarkerDetection onMarkerVisible;
         public static event MarkerDetection onMarkerLost;
         
-        [System.Obsolete]
-        void Start() {
-            Application.ExternalCall("detectionManagerReady");
+	    void Start() {
+        	
+	        if(!Application.isEditor){
+	        	
+		        DetectionManagerReady();
+	        
+	        }
+	        
         }
 
         public void markerInfos(string infos){
diff --git a/Assets/WebGLTemplates/.DS_Store b/Assets/WebGLTemplates/.DS_Store
new file mode 100644
index 0000000..f4ac641
Binary files /dev/null and b/Assets/WebGLTemplates/.DS_Store differ
diff --git a/Assets/WebGLTemplates/WebAR/.DS_Store b/Assets/WebGLTemplates/WebAR/.DS_Store
new file mode 100644
index 0000000..e9b5054
Binary files /dev/null and b/Assets/WebGLTemplates/WebAR/.DS_Store differ
diff --git a/Assets/WebGLTemplates/WebAR/index.html b/Assets/WebGLTemplates/WebAR/index.html
index 8286be0..2d815d7 100644
--- a/Assets/WebGLTemplates/WebAR/index.html
+++ b/Assets/WebGLTemplates/WebAR/index.html
@@ -1,26 +1,217 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en-us">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Unity WebGL Player | WebGL Test AR</title>
+    <title>Unity WebGL Player | {{{ PRODUCT_NAME }}}</title>
+    <script src="Build/{{{ LOADER_FILENAME }}}"></script>
     <script src="js/lib/aframe.min.js"></script>
     <script src="js/lib/aframe-ar.js"></script>
-    <script src="Build/UnityLoader.js"></script>
-    <script src="js/app.js"></script>
 
-  </head>
+</head>
 
-  <body style="margin: 0px; overflow: hidden;">
-    <a-scene embedded arjs vr-mode-ui="enabled: false" copycanvas>
-      <div id="unityContainer" style="z-index: 2" ></div>
-      <!-- <a-marker preset="hiro"> <a-box></a-box> </a-marker> -->
-      <!-- <a-marker type="pattern" url="data/markers/pattern-arjs.patt"><a-box></a-box></a-marker> -->
-      <!-- <a-marker type="pattern" url="data/markers/test.patt" markercontroller="name : hiro"></a-marker> -->
+<body>
+    <!-- style for the loader -->
+    <style>
+        html, body {
+            overflow: hidden;
+        }
+
+        .arjs-loader {
+            height: 100%;
+            width: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+            background-color: rgba(0, 0, 0, 1);
+            z-index: 9999;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .arjs-loader div {
+            text-align: center;
+            font-size: 1.25em;
+            color: white;
+        }
+
+    </style>
+
+    <div class="arjs-loader" id="arjs-loader">
+        <div>Loading, please wait...</div>
+    </div>
+
+
+    <div id="unity-container" class="unity-desktop" style="z-index: 2; position: absolute; top: 0; left: 0;">
+
+        <canvas id="unity-canvas"></canvas>
+
+    </div>
+
+    <script>
+
+        var container = document.querySelector("#unity-container");
+        var unityCanvas = document.querySelector("#unity-canvas");
+
+        var buildUrl = "Build";
+        var loaderUrl = buildUrl + "/{{{ LOADER_FILENAME }}}";
+        var config = {
+            dataUrl: buildUrl + "/{{{ DATA_FILENAME }}}",
+            frameworkUrl: buildUrl + "/{{{ FRAMEWORK_FILENAME }}}",
+            codeUrl: buildUrl + "/{{{ CODE_FILENAME }}}",
+            #if MEMORY_FILENAME
+        memoryUrl: buildUrl + "/{{{ MEMORY_FILENAME }}}",
+            #endif
+#if SYMBOLS_FILENAME
+        symbolsUrl: buildUrl + "/{{{ SYMBOLS_FILENAME }}}",
+            #endif
+        streamingAssetsUrl: "StreamingAssets",
+            companyName: "{{{ COMPANY_NAME }}}",
+            productName: "{{{ PRODUCT_NAME }}}",
+            productVersion: "{{{ PRODUCT_VERSION }}}",
+        };
+        
+
+        var script = document.createElement("script");
+        var unityInstance;
+
+        script.src = loaderUrl;
+        script.onload = () => {
+            createUnityInstance(unityCanvas, config, (progress) => {
+
+            }).then((ui) => {
+                unityInstance = ui;
+
+            }).catch((message) => {
+                alert(message);
+            });
+        };
+        document.body.appendChild(script);
+
+        let isCameraReady = false;
+        let isDetectionManagerReady = false;
+        let gl = null;
+
+        function cameraReady() {
+            isCameraReady = true;
+            gl = unityInstance.Module.ctx;
+            console.log("Camera Ready");
+        }
+
+        let isObjectAvailable = false;
+        function objectAvailable() {
+
+            isObjectAvailable = true;
+
+        }
+
+        function detectionManagerReady() {
+            isDetectionManagerReady = true;
+        }
+
+        let camName = null;
+        function getCamName(name) {
+            camName = name;
+        }
+
+        function createUnityMatrix(el) {
+            const m = el.matrix.clone();
+            const zFlipped = new THREE.Matrix4().makeScale(1, 1, -1).multiply(m);
+            const rotated = zFlipped.multiply(new THREE.Matrix4().makeRotationX(-Math.PI / 2));
+            return rotated;
+        }
+
+        AFRAME.registerComponent('markercontroller', {
+            schema: {
+                name: { type: 'string' }
+            },
+            tock: function (time, timeDelta) {
+
+                let position = new THREE.Vector3();
+                let rotation = new THREE.Quaternion();
+                let scale = new THREE.Vector3();
+
+                createUnityMatrix(this.el.object3D).decompose(position, rotation, scale);
+
+                const serializedInfos = `${this.data.name},${this.el.object3D.visible},${position.toArray()},${rotation.toArray()},${scale.toArray()}`;
+
+                if (isDetectionManagerReady) {
+                    unityInstance.SendMessage("DetectionManager", "markerInfos", serializedInfos);
+                }
+            }
+        });
+
+        AFRAME.registerComponent('cameratransform', {
+            tock: function (time, timeDelta) {
+
+                let camtr = new THREE.Vector3();
+                let camro = new THREE.Quaternion();
+                let camsc = new THREE.Vector3();
+
+                this.el.object3D.matrix.clone().decompose(camtr, camro, camsc);
+
+                const projection = this.el.components.camera.camera.projectionMatrix.clone();
+                const serializedProj = `${[...projection.elements]}`
+
+                const posCam = `${[...camtr.toArray()]}`
+                const rotCam = `${[...camro.toArray()]}`
+
+                if (isCameraReady) {
+
+                    setTimeout(() => {
+                        document.querySelector("#arjs-loader").style.display = "none";
+                    }, 1000);
+
+                    unityInstance.SendMessage(camName, "setProjection", serializedProj);
+                    unityInstance.SendMessage(camName, "setPosition", posCam);
+                    unityInstance.SendMessage(camName, "setRotation", rotCam);
+
+                    let w = window.innerWidth;
+                    let h = window.innerHeight;
+
+                    const ratio = unityCanvas.height / h;
+
+                    w *= ratio;
+                    h *= ratio;
+
+                    const size = `${w},${h}`;
+
+                    unityInstance.SendMessage(camName, "ObjectCheck", "Canvas");
+
+                    if (isObjectAvailable) {
+
+                        unityInstance.SendMessage("Canvas", "setSize", size);
+
+                    }
+
+                }
+
+                if (gl != null) {
+                    gl.dontClearOnFrameStart = true;
+                }
+            }
+        });
+
+        AFRAME.registerComponent('copycanvas', {
+            tick: function (time, timeDelta) {
+
+                unityCanvas.style.width = window.innerWidth + 'px';
+                unityCanvas.style.height = window.innerHeight + 'px';
+
+            }
+        });
+
+    </script>
+
+    <a-scene embedded arjs='trackingMethod: best; patternRatio: 0.5; debugUIEnabled: false;' vr-mode-ui="enabled: false" copycanvas>
+
+        --MARKERS--
+        <a-entity camera cameratransform></a-entity>
 
-      --MARKERS--
-      <a-entity camera cameratransform></a-entity>
     </a-scene>
-  </body>
-</html>
\ No newline at end of file
+
+</body>
+
+</html>
diff --git a/Assets/WebGLTemplates/WebXR/.DS_Store b/Assets/WebGLTemplates/WebXR/.DS_Store
new file mode 100644
index 0000000..5a541e5
Binary files /dev/null and b/Assets/WebGLTemplates/WebXR/.DS_Store differ