diff --git a/Assets/AnimationRiggingWorkshop/Constraints/ConstraintsUtils.cs b/Assets/AnimationRiggingWorkshop/Constraints/ConstraintsUtils.cs
index edd14c2..7d8e68c 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/ConstraintsUtils.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/ConstraintsUtils.cs
@@ -1,64 +1,62 @@
 using System;
 using System.Collections.Generic;
+using UnityEngine;
 
-namespace UnityEngine.Animations.Rigging
+static class ConstraintsUtils
 {
-    static class ConstraintsUtils
+    public static Transform[] ExtractChain(Transform root, Transform tip)
     {
-        public static Transform[] ExtractChain(Transform root, Transform tip)
-        {
-            if (!tip.IsChildOf(root))
-                return new Transform[0]{};
-
-            var chain = new List<Transform>();
+        if (!tip.IsChildOf(root))
+            return new Transform[0]{};
 
-            Transform tmp = tip;
-            while (tmp != root)
-            {
-                chain.Add(tmp);
-                tmp = tmp.parent;
-            }
-            chain.Add(root);
-            chain.Reverse();
+        var chain = new List<Transform>();
 
-            return chain.ToArray();
+        Transform tmp = tip;
+        while (tmp != root)
+        {
+            chain.Add(tmp);
+            tmp = tmp.parent;
         }
+        chain.Add(root);
+        chain.Reverse();
 
-        public static float[] ExtractLengths(Transform[] chain)
-        {
-            float[] lengths = new float[chain.Length];
-            lengths[0] = 0f;
+        return chain.ToArray();
+    }
 
-            // Evaluate lengths as distance between each transform in the chain.
-            for (int i = 1; i < chain.Length; ++i)
-            {
-                lengths[i] = chain[i].localPosition.magnitude;
-            }
+    public static float[] ExtractLengths(Transform[] chain)
+    {
+        float[] lengths = new float[chain.Length];
+        lengths[0] = 0f;
 
-            return lengths;
+        // Evaluate lengths as distance between each transform in the chain.
+        for (int i = 1; i < chain.Length; ++i)
+        {
+            lengths[i] = chain[i].localPosition.magnitude;
         }
 
-        public static float[] ExtractSteps(Transform[] chain)
-        {
-            float[] lengths = ExtractLengths(chain);
+        return lengths;
+    }
 
-            float totalLength = 0f;
-            Array.ForEach(lengths, (length) => totalLength += length);
+    public static float[] ExtractSteps(Transform[] chain)
+    {
+        float[] lengths = ExtractLengths(chain);
 
-            float[] steps = new float[lengths.Length];
+        float totalLength = 0f;
+        Array.ForEach(lengths, (length) => totalLength += length);
 
-            // Evaluate weights and steps based on curve.
-            float cumulativeLength = 0.0f;
-            for (int i = 0; i < lengths.Length; ++i)
-            {
-                cumulativeLength += lengths[i];
+        float[] steps = new float[lengths.Length];
 
-                float t = cumulativeLength / totalLength;
+        // Evaluate weights and steps based on curve.
+        float cumulativeLength = 0.0f;
+        for (int i = 0; i < lengths.Length; ++i)
+        {
+            cumulativeLength += lengths[i];
 
-                steps[i] = t;
-            }
+            float t = cumulativeLength / totalLength;
 
-            return steps;
+            steps[i] = t;
         }
+
+        return steps;
     }
 }
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/CopyLocation.cs b/Assets/AnimationRiggingWorkshop/Constraints/CopyLocation.cs
index be8be71..b402e25 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/CopyLocation.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/CopyLocation.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 using UnityEngine.Animations.Rigging;
-using UnityEngine.Experimental.Animations;
+using UnityEngine.Animations;
 using Unity.Burst;
 using Unity.Mathematics;
 
@@ -72,7 +72,7 @@ public override CopyLocationJob Create(Animator animator, ref CopyLocationData d
             source = ReadOnlyTransformHandle.Bind(animator, data.sourceObject),
 
             // Bind data.invert to job.invert so values can be resolved from the AnimationStream
-            invert = Vector3BoolProperty.Bind(animator, component, PropertyUtils.ConstructConstraintDataPropertyName(nameof(data.invert)))
+            invert = Vector3BoolProperty.Bind(animator, component, UnityEngine.Animations.Rigging.ConstraintsUtils.ConstructConstraintDataPropertyName(nameof(data.invert)))
         };
     }
 
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/CopyLocationStep0.cs b/Assets/AnimationRiggingWorkshop/Constraints/CopyLocationStep0.cs
index 94c60e8..efe91ad 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/CopyLocationStep0.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/CopyLocationStep0.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 using UnityEngine.Animations.Rigging;
-using UnityEngine.Experimental.Animations;
+using UnityEngine.Animations;
 using Unity.Burst;
 using Unity.Mathematics;
 
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/HelloWorld.cs b/Assets/AnimationRiggingWorkshop/Constraints/HelloWorld.cs
index eff38b1..3d7a90b 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/HelloWorld.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/HelloWorld.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 using UnityEngine.Animations.Rigging;
-using UnityEngine.Experimental.Animations;
+using UnityEngine.Animations;
 using Unity.Burst;
 using Unity.Mathematics;
 
@@ -9,7 +9,7 @@ public struct HelloWorldJob : IWeightedAnimationJob
 {
     public ReadWriteTransformHandle constrained;
     public ReadOnlyTransformHandle  source;
-    
+
     public FloatProperty jobWeight { get; set; }
 
     public void ProcessRootMotion(AnimationStream stream) { }
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/TwistChain.cs b/Assets/AnimationRiggingWorkshop/Constraints/TwistChain.cs
index 1236615..d7f5f6d 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/TwistChain.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/TwistChain.cs
@@ -1,118 +1,115 @@
-using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
+using UnityEngine.Animations;
+using UnityEngine.Animations.Rigging;
 
-namespace UnityEngine.Animations.Rigging
+[Unity.Burst.BurstCompile]
+public struct TwistChainJob : IWeightedAnimationJob
 {
-    using Experimental.Animations;
+    public ReadWriteTransformHandle rootTarget;
+    public ReadWriteTransformHandle tipTarget;
 
-    [Unity.Burst.BurstCompile]
-    public struct TwistChainJob : IWeightedAnimationJob
-    {
-        public ReadWriteTransformHandle rootTarget;
-        public ReadWriteTransformHandle tipTarget;
-
-        public NativeArray<ReadWriteTransformHandle> chain;
+    public NativeArray<ReadWriteTransformHandle> chain;
 
-        public NativeArray<float> steps;
-        public NativeArray<float> weights;
+    public NativeArray<float> steps;
+    public NativeArray<float> weights;
 
-        public FloatProperty jobWeight { get; set; }
+    public FloatProperty jobWeight { get; set; }
 
-        public void ProcessRootMotion(AnimationStream stream) { }
-
-        public void ProcessAnimation(AnimationStream stream)
-        {
-            // Retrieve root and tip rotation.
-            Quaternion rootRotation = rootTarget.GetRotation(stream);
-            Quaternion tipRotation = tipTarget.GetRotation(stream);
+    public void ProcessRootMotion(AnimationStream stream) { }
 
-            float mainWeight = jobWeight.Get(stream);
+    public void ProcessAnimation(AnimationStream stream)
+    {
+        // Retrieve root and tip rotation.
+        Quaternion rootRotation = rootTarget.GetRotation(stream);
+        Quaternion tipRotation = tipTarget.GetRotation(stream);
 
-            // Interpolate rotation on chain.
-            for (int i = 0; i < chain.Length; ++i)
-            {
-                chain[i].SetRotation(stream, Quaternion.Lerp(chain[i].GetRotation(stream), Quaternion.Lerp(rootRotation, tipRotation, weights[i]), mainWeight));
-            }
+        float mainWeight = jobWeight.Get(stream);
 
-            // Update position of tip handle for easier visualization.
-            rootTarget.SetPosition(stream, chain[0].GetPosition(stream));
-            tipTarget.SetPosition(stream, chain[chain.Length - 1].GetPosition(stream));
+        // Interpolate rotation on chain.
+        for (int i = 0; i < chain.Length; ++i)
+        {
+            chain[i].SetRotation(stream, Quaternion.Lerp(chain[i].GetRotation(stream), Quaternion.Lerp(rootRotation, tipRotation, weights[i]), mainWeight));
         }
+
+        // Update position of tip handle for easier visualization.
+        rootTarget.SetPosition(stream, chain[0].GetPosition(stream));
+        tipTarget.SetPosition(stream, chain[chain.Length - 1].GetPosition(stream));
     }
+}
 
-    [System.Serializable]
-    public struct TwistChainData : IAnimationJobData
-    {
-        public Transform root;
-        public Transform tip;
+[System.Serializable]
+public struct TwistChainData : IAnimationJobData
+{
+    public Transform root;
+    public Transform tip;
 
-        [SyncSceneToStream] public Transform rootTarget;
-        [SyncSceneToStream] public Transform tipTarget;
+    [SyncSceneToStream] public Transform rootTarget;
+    [SyncSceneToStream] public Transform tipTarget;
 
-        public AnimationCurve curve;
+    public AnimationCurve curve;
 
-        bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null || curve == null);
+    bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null || curve == null);
 
-        void IAnimationJobData.SetDefaultValues()
-        {
-            root = tip = rootTarget = tipTarget = null;
-            curve = AnimationCurve.Linear(0f, 0f, 1f, 1f);
-        }
+    void IAnimationJobData.SetDefaultValues()
+    {
+        root = tip = rootTarget = tipTarget = null;
+        curve = AnimationCurve.Linear(0f, 0f, 1f, 1f);
     }
+}
 
 
-    public class TwistChainJobBinder : AnimationJobBinder<TwistChainJob, TwistChainData>
+public class TwistChainJobBinder : AnimationJobBinder<TwistChainJob, TwistChainData>
+{
+    public override TwistChainJob Create(Animator animator, ref TwistChainData data, Component component)
     {
-        public override TwistChainJob Create(Animator animator, ref TwistChainData data, Component component)
+        // Retrieve chain in-between root and tip transforms.
+        Transform[] chain = ConstraintsUtils.ExtractChain(data.root, data.tip);
+
+        // Extract steps from chain.
+        float[] steps = ConstraintsUtils.ExtractSteps(chain);
+
+        // Build Job.
+        var job = new TwistChainJob();
+        job.chain = new NativeArray<ReadWriteTransformHandle>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.steps = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.weights = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.rootTarget = ReadWriteTransformHandle.Bind(animator, data.rootTarget);
+        job.tipTarget = ReadWriteTransformHandle.Bind(animator, data.tipTarget);
+
+        // Set values in NativeArray.
+        for (int i = 0; i < chain.Length; ++i)
         {
-            // Retrieve chain in-between root and tip transforms.
-            Transform[] chain = ConstraintsUtils.ExtractChain(data.root, data.tip);
-
-            // Extract steps from chain.
-            float[] steps = ConstraintsUtils.ExtractSteps(chain);
-
-            // Build Job.
-            var job = new TwistChainJob();
-            job.chain = new NativeArray<ReadWriteTransformHandle>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.steps = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.weights = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.rootTarget = ReadWriteTransformHandle.Bind(animator, data.rootTarget);
-            job.tipTarget = ReadWriteTransformHandle.Bind(animator, data.tipTarget);
-
-            // Set values in NativeArray.
-            for (int i = 0; i < chain.Length; ++i)
-            {
-                job.chain[i] = ReadWriteTransformHandle.Bind(animator, chain[i]);
-                job.steps[i] = steps[i];
-                job.weights[i] = Mathf.Clamp01(data.curve.Evaluate(steps[i]));
-            }
-
-            return job;
+            job.chain[i] = ReadWriteTransformHandle.Bind(animator, chain[i]);
+            job.steps[i] = steps[i];
+            job.weights[i] = Mathf.Clamp01(data.curve.Evaluate(steps[i]));
         }
 
-        public override void Destroy(TwistChainJob job)
-        {
-            job.chain.Dispose();
-            job.weights.Dispose();
-            job.steps.Dispose();
-        }
+        return job;
+    }
 
-        public override void Update(TwistChainJob job, ref TwistChainData data)
-        {
-            // Update weights based on curve.
-            for (int i = 0; i < job.steps.Length; ++i)
-            {
-                job.weights[i] = Mathf.Clamp01(data.curve.Evaluate(job.steps[i]));
-            }
-        }
+    public override void Destroy(TwistChainJob job)
+    {
+        job.chain.Dispose();
+        job.weights.Dispose();
+        job.steps.Dispose();
     }
 
-    [DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Final")]
-    public class TwistChain : RigConstraint<
-        TwistChainJob,
-        TwistChainData,
-        TwistChainJobBinder
-        >
+    public override void Update(TwistChainJob job, ref TwistChainData data)
     {
+        // Update weights based on curve.
+        for (int i = 0; i < job.steps.Length; ++i)
+        {
+            job.weights[i] = Mathf.Clamp01(data.curve.Evaluate(job.steps[i]));
+        }
     }
 }
+
+[DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Final")]
+public class TwistChain : RigConstraint<
+    TwistChainJob,
+    TwistChainData,
+    TwistChainJobBinder
+    >
+{
+}
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep0.cs b/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep0.cs
index 7755711..5cd68ca 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep0.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep0.cs
@@ -1,92 +1,89 @@
-using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
+using UnityEngine.Animations;
+using UnityEngine.Animations.Rigging;
 
-namespace UnityEngine.Animations.Rigging
+[Unity.Burst.BurstCompile]
+public struct TwistChainStep0Job : IWeightedAnimationJob
 {
-    using Experimental.Animations;
+    public ReadWriteTransformHandle rootTarget;
+    public ReadWriteTransformHandle tipTarget;
 
-    [Unity.Burst.BurstCompile]
-    public struct TwistChainStep0Job : IWeightedAnimationJob
-    {
-        public ReadWriteTransformHandle rootTarget;
-        public ReadWriteTransformHandle tipTarget;
-
-        public NativeArray<ReadWriteTransformHandle> chain;
+    public NativeArray<ReadWriteTransformHandle> chain;
 
-        public NativeArray<float> steps;
+    public NativeArray<float> steps;
 
-        public FloatProperty jobWeight { get; set; }
+    public FloatProperty jobWeight { get; set; }
 
-        public void ProcessRootMotion(AnimationStream stream) {}
+    public void ProcessRootMotion(AnimationStream stream) {}
 
-        public void ProcessAnimation(AnimationStream stream)
-        {
-            // 1. Retrieve root and tip rotation.
-            // q1 <- ROOT_TARGET_ROTATION
-            // q2 <- TIP_TARGET_ROTATION
+    public void ProcessAnimation(AnimationStream stream)
+    {
+        // 1. Retrieve root and tip rotation.
+        // q1 <- ROOT_TARGET_ROTATION
+        // q2 <- TIP_TARGET_ROTATION
 
-            // 2. Interpolate rotation on chain.
-            // FOREACH(transform in chain)
-            //     transform.rotation <- LERP(transform.rotation, LERP(q1, q2, w), jobWeight)
+        // 2. Interpolate rotation on chain.
+        // FOREACH(transform in chain)
+        //     transform.rotation <- LERP(transform.rotation, LERP(q1, q2, w), jobWeight)
 
-            // 3. Update position of tip handle for easier visualization.
-            // ROOT_TARGET_POSITION <- ROOT_CHAIN_POSITION
-            // TIP_TARGET_POSITION <- TIP_CHAIN_POSITION
-        }
+        // 3. Update position of tip handle for easier visualization.
+        // ROOT_TARGET_POSITION <- ROOT_CHAIN_POSITION
+        // TIP_TARGET_POSITION <- TIP_CHAIN_POSITION
     }
+}
 
-    [System.Serializable]
-    public struct TwistChainStep0Data : IAnimationJobData
-    {
-        public Transform root;
-        public Transform tip;
+[System.Serializable]
+public struct TwistChainStep0Data : IAnimationJobData
+{
+    public Transform root;
+    public Transform tip;
 
-        [SyncSceneToStream] public Transform rootTarget;
-        [SyncSceneToStream] public Transform tipTarget;
+    [SyncSceneToStream] public Transform rootTarget;
+    [SyncSceneToStream] public Transform tipTarget;
 
-        bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null);
+    bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null);
 
-        void IAnimationJobData.SetDefaultValues()
-        {
-            root = tip = rootTarget = tipTarget = null;
-        }
+    void IAnimationJobData.SetDefaultValues()
+    {
+        root = tip = rootTarget = tipTarget = null;
     }
+}
 
-    public class TwistChainStep0JobBinder : AnimationJobBinder<TwistChainStep0Job, TwistChainStep0Data>
+public class TwistChainStep0JobBinder : AnimationJobBinder<TwistChainStep0Job, TwistChainStep0Data>
+{
+    public override TwistChainStep0Job Create(Animator animator, ref TwistChainStep0Data data, Component component)
     {
-        public override TwistChainStep0Job Create(Animator animator, ref TwistChainStep0Data data, Component component)
-        {
-            // 1. Retrieve chain in-between root and tip transforms.
-            // ...
-
-            // 2. Extract steps from chain.
-            // ...
+        // 1. Retrieve chain in-between root and tip transforms.
+        // ...
 
-            // 3. Build Job.
-            var job = new TwistChainStep0Job();
-            // ...
+        // 2. Extract steps from chain.
+        // ...
 
-            // 4. Set values in NativeArray.
-            // ...
+        // 3. Build Job.
+        var job = new TwistChainStep0Job();
+        // ...
 
-            return job;
-        }
+        // 4. Set values in NativeArray.
+        // ...
 
-        public override void Destroy(TwistChainStep0Job job)
-        {
-        }
+        return job;
+    }
 
-        public override void Update(TwistChainStep0Job job, ref TwistChainStep0Data data)
-        {
-        }
+    public override void Destroy(TwistChainStep0Job job)
+    {
     }
 
-    [DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Step 0")]
-    public class TwistChainStep0 : RigConstraint<
-        TwistChainStep0Job,
-        TwistChainStep0Data,
-        TwistChainStep0JobBinder
-        >
+    public override void Update(TwistChainStep0Job job, ref TwistChainStep0Data data)
     {
     }
 }
+
+[DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Step 0")]
+public class TwistChainStep0 : RigConstraint<
+    TwistChainStep0Job,
+    TwistChainStep0Data,
+    TwistChainStep0JobBinder
+    >
+{
+}
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep1.cs b/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep1.cs
index d380115..7afdfd4 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep1.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep1.cs
@@ -1,101 +1,98 @@
-using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
+using UnityEngine.Animations;
+using UnityEngine.Animations.Rigging;
 
-namespace UnityEngine.Animations.Rigging
+[Unity.Burst.BurstCompile]
+public struct TwistChainStep1Job : IWeightedAnimationJob
 {
-    using Experimental.Animations;
+    public ReadWriteTransformHandle rootTarget;
+    public ReadWriteTransformHandle tipTarget;
 
-    [Unity.Burst.BurstCompile]
-    public struct TwistChainStep1Job : IWeightedAnimationJob
-    {
-        public ReadWriteTransformHandle rootTarget;
-        public ReadWriteTransformHandle tipTarget;
-
-        public NativeArray<ReadWriteTransformHandle> chain;
+    public NativeArray<ReadWriteTransformHandle> chain;
 
-        public NativeArray<float> steps;
+    public NativeArray<float> steps;
 
-        public FloatProperty jobWeight { get; set; }
+    public FloatProperty jobWeight { get; set; }
 
-        public void ProcessRootMotion(AnimationStream stream) {}
+    public void ProcessRootMotion(AnimationStream stream) {}
 
-        public void ProcessAnimation(AnimationStream stream)
-        {
-            // 1. Retrieve root and tip rotation.
-            // q1 <- ROOT_TARGET_ROTATION
-            // q2 <- TIP_TARGET_ROTATION
+    public void ProcessAnimation(AnimationStream stream)
+    {
+        // 1. Retrieve root and tip rotation.
+        // q1 <- ROOT_TARGET_ROTATION
+        // q2 <- TIP_TARGET_ROTATION
 
-            // 2. Interpolate rotation on chain.
-            // FOREACH(transform in chain)
-            //     transform.rotation <- LERP(transform.rotation, LERP(q1, q2, w), jobWeight)
+        // 2. Interpolate rotation on chain.
+        // FOREACH(transform in chain)
+        //     transform.rotation <- LERP(transform.rotation, LERP(q1, q2, w), jobWeight)
 
-            // 3. Update position of tip handle for easier visualization.
-            // ROOT_TARGET_POSITION <- ROOT_CHAIN_POSITION
-            // TIP_TARGET_POSITION <- TIP_CHAIN_POSITION
-        }
+        // 3. Update position of tip handle for easier visualization.
+        // ROOT_TARGET_POSITION <- ROOT_CHAIN_POSITION
+        // TIP_TARGET_POSITION <- TIP_CHAIN_POSITION
     }
+}
 
-    [System.Serializable]
-    public struct TwistChainStep1Data : IAnimationJobData
-    {
-        public Transform root;
-        public Transform tip;
+[System.Serializable]
+public struct TwistChainStep1Data : IAnimationJobData
+{
+    public Transform root;
+    public Transform tip;
 
-        [SyncSceneToStream] public Transform rootTarget;
-        [SyncSceneToStream] public Transform tipTarget;
+    [SyncSceneToStream] public Transform rootTarget;
+    [SyncSceneToStream] public Transform tipTarget;
 
-        bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null);
+    bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null);
 
-        void IAnimationJobData.SetDefaultValues()
-        {
-            root = tip = rootTarget = tipTarget = null;
-        }
+    void IAnimationJobData.SetDefaultValues()
+    {
+        root = tip = rootTarget = tipTarget = null;
     }
+}
 
-    public class TwistChainStep1JobBinder : AnimationJobBinder<TwistChainStep1Job, TwistChainStep1Data>
+public class TwistChainStep1JobBinder : AnimationJobBinder<TwistChainStep1Job, TwistChainStep1Data>
+{
+    public override TwistChainStep1Job Create(Animator animator, ref TwistChainStep1Data data, Component component)
     {
-        public override TwistChainStep1Job Create(Animator animator, ref TwistChainStep1Data data, Component component)
-        {
-            // Retrieve chain in-between root and tip transforms.
-            Transform[] chain = ConstraintsUtils.ExtractChain(data.root, data.tip);
-
-            // Extract steps from chain.
-            float[] steps = ConstraintsUtils.ExtractSteps(chain);
-
-            // Build Job.
-            var job = new TwistChainStep1Job();
-            job.chain = new NativeArray<ReadWriteTransformHandle>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.steps = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.rootTarget = ReadWriteTransformHandle.Bind(animator, data.rootTarget);
-            job.tipTarget = ReadWriteTransformHandle.Bind(animator, data.tipTarget);
-
-            // Set values in NativeArray.
-            for (int i = 0; i < chain.Length; ++i)
-            {
-                job.chain[i] = ReadWriteTransformHandle.Bind(animator, chain[i]);
-                job.steps[i] = steps[i];
-            }
-
-            return job;
-        }
+        // Retrieve chain in-between root and tip transforms.
+        Transform[] chain = ConstraintsUtils.ExtractChain(data.root, data.tip);
 
-        public override void Destroy(TwistChainStep1Job job)
-        {
-            job.chain.Dispose();
-            job.steps.Dispose();
-        }
+        // Extract steps from chain.
+        float[] steps = ConstraintsUtils.ExtractSteps(chain);
+
+        // Build Job.
+        var job = new TwistChainStep1Job();
+        job.chain = new NativeArray<ReadWriteTransformHandle>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.steps = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.rootTarget = ReadWriteTransformHandle.Bind(animator, data.rootTarget);
+        job.tipTarget = ReadWriteTransformHandle.Bind(animator, data.tipTarget);
 
-        public override void Update(TwistChainStep1Job job, ref TwistChainStep1Data data)
+        // Set values in NativeArray.
+        for (int i = 0; i < chain.Length; ++i)
         {
+            job.chain[i] = ReadWriteTransformHandle.Bind(animator, chain[i]);
+            job.steps[i] = steps[i];
         }
+
+        return job;
     }
 
-    [DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Step 1")]
-    public class TwistChainStep1 : RigConstraint<
-        TwistChainStep1Job,
-        TwistChainStep1Data,
-        TwistChainStep1JobBinder
-        >
+    public override void Destroy(TwistChainStep1Job job)
     {
+        job.chain.Dispose();
+        job.steps.Dispose();
     }
+
+    public override void Update(TwistChainStep1Job job, ref TwistChainStep1Data data)
+    {
+    }
+}
+
+[DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Step 1")]
+public class TwistChainStep1 : RigConstraint<
+    TwistChainStep1Job,
+    TwistChainStep1Data,
+    TwistChainStep1JobBinder
+    >
+{
 }
diff --git a/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep2.cs b/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep2.cs
index f001c24..36fde07 100644
--- a/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep2.cs
+++ b/Assets/AnimationRiggingWorkshop/Constraints/TwistChainStep2.cs
@@ -1,105 +1,102 @@
-using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
+using UnityEngine.Animations;
+using UnityEngine.Animations.Rigging;
 
-namespace UnityEngine.Animations.Rigging
+[Unity.Burst.BurstCompile]
+public struct TwistChainStep2Job : IWeightedAnimationJob
 {
-    using Experimental.Animations;
+    public ReadWriteTransformHandle rootTarget;
+    public ReadWriteTransformHandle tipTarget;
 
-    [Unity.Burst.BurstCompile]
-    public struct TwistChainStep2Job : IWeightedAnimationJob
-    {
-        public ReadWriteTransformHandle rootTarget;
-        public ReadWriteTransformHandle tipTarget;
+    public NativeArray<ReadWriteTransformHandle> chain;
+
+    public NativeArray<float> steps;
 
-        public NativeArray<ReadWriteTransformHandle> chain;
+    public FloatProperty jobWeight { get; set; }
 
-        public NativeArray<float> steps;
+    public void ProcessRootMotion(AnimationStream stream) {}
 
-        public FloatProperty jobWeight { get; set; }
+    public void ProcessAnimation(AnimationStream stream)
+    {
+        // Retrieve root and tip rotation.
+        Quaternion rootRotation = rootTarget.GetRotation(stream);
+        Quaternion tipRotation = tipTarget.GetRotation(stream);
 
-        public void ProcessRootMotion(AnimationStream stream) {}
+        float mainWeight = jobWeight.Get(stream);
 
-        public void ProcessAnimation(AnimationStream stream)
+        // Interpolate rotation on chain.
+        for (int i = 0; i < chain.Length; ++i)
         {
-            // Retrieve root and tip rotation.
-            Quaternion rootRotation = rootTarget.GetRotation(stream);
-            Quaternion tipRotation = tipTarget.GetRotation(stream);
+            chain[i].SetRotation(stream, Quaternion.Lerp(chain[i].GetRotation(stream), Quaternion.Lerp(rootRotation, tipRotation, steps[i]), mainWeight));
+        }
 
-            float mainWeight = jobWeight.Get(stream);
+        // Update position of tip handle for easier visualization.
+        rootTarget.SetPosition(stream, chain[0].GetPosition(stream));
+        tipTarget.SetPosition(stream, chain[chain.Length - 1].GetPosition(stream));
+    }
+}
 
-            // Interpolate rotation on chain.
-            for (int i = 0; i < chain.Length; ++i)
-            {
-                chain[i].SetRotation(stream, Quaternion.Lerp(chain[i].GetRotation(stream), Quaternion.Lerp(rootRotation, tipRotation, steps[i]), mainWeight));
-            }
+[System.Serializable]
+public struct TwistChainStep2Data : IAnimationJobData
+{
+    public Transform root;
+    public Transform tip;
 
-            // Update position of tip handle for easier visualization.
-            rootTarget.SetPosition(stream, chain[0].GetPosition(stream));
-            tipTarget.SetPosition(stream, chain[chain.Length - 1].GetPosition(stream));
-        }
+    [SyncSceneToStream] public Transform rootTarget;
+    [SyncSceneToStream] public Transform tipTarget;
+
+    bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null);
+
+    void IAnimationJobData.SetDefaultValues()
+    {
+        root = tip = rootTarget = tipTarget = null;
     }
+}
 
-    [System.Serializable]
-    public struct TwistChainStep2Data : IAnimationJobData
+public class TwistChainStep2JobBinder : AnimationJobBinder<TwistChainStep2Job, TwistChainStep2Data>
+{
+    public override TwistChainStep2Job Create(Animator animator, ref TwistChainStep2Data data, Component component)
     {
-        public Transform root;
-        public Transform tip;
+        // Retrieve chain in-between root and tip transforms.
+        Transform[] chain = ConstraintsUtils.ExtractChain(data.root, data.tip);
 
-        [SyncSceneToStream] public Transform rootTarget;
-        [SyncSceneToStream] public Transform tipTarget;
+        // Extract steps from chain.
+        float[] steps = ConstraintsUtils.ExtractSteps(chain);
 
-        bool IAnimationJobData.IsValid() => !(root == null || tip == null || !tip.IsChildOf(root) || rootTarget == null || tipTarget == null);
+        // Build Job.
+        var job = new TwistChainStep2Job();
+        job.chain = new NativeArray<ReadWriteTransformHandle>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.steps = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+        job.rootTarget = ReadWriteTransformHandle.Bind(animator, data.rootTarget);
+        job.tipTarget = ReadWriteTransformHandle.Bind(animator, data.tipTarget);
 
-        void IAnimationJobData.SetDefaultValues()
+        // Set values in NativeArray.
+        for (int i = 0; i < chain.Length; ++i)
         {
-            root = tip = rootTarget = tipTarget = null;
+            job.chain[i] = ReadWriteTransformHandle.Bind(animator, chain[i]);
+            job.steps[i] = steps[i];
         }
+
+        return job;
     }
 
-    public class TwistChainStep2JobBinder : AnimationJobBinder<TwistChainStep2Job, TwistChainStep2Data>
+    public override void Destroy(TwistChainStep2Job job)
     {
-        public override TwistChainStep2Job Create(Animator animator, ref TwistChainStep2Data data, Component component)
-        {
-            // Retrieve chain in-between root and tip transforms.
-            Transform[] chain = ConstraintsUtils.ExtractChain(data.root, data.tip);
-
-            // Extract steps from chain.
-            float[] steps = ConstraintsUtils.ExtractSteps(chain);
-
-            // Build Job.
-            var job = new TwistChainStep2Job();
-            job.chain = new NativeArray<ReadWriteTransformHandle>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.steps = new NativeArray<float>(chain.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            job.rootTarget = ReadWriteTransformHandle.Bind(animator, data.rootTarget);
-            job.tipTarget = ReadWriteTransformHandle.Bind(animator, data.tipTarget);
-
-            // Set values in NativeArray.
-            for (int i = 0; i < chain.Length; ++i)
-            {
-                job.chain[i] = ReadWriteTransformHandle.Bind(animator, chain[i]);
-                job.steps[i] = steps[i];
-            }
-
-            return job;
-        }
-
-        public override void Destroy(TwistChainStep2Job job)
-        {
-            job.chain.Dispose();
-            job.steps.Dispose();
-        }
-
-        public override void Update(TwistChainStep2Job job, ref TwistChainStep2Data data)
-        {
-        }
+        job.chain.Dispose();
+        job.steps.Dispose();
     }
 
-    [DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Step 2")]
-    public class TwistChainStep2 : RigConstraint<
-        TwistChainStep2Job,
-        TwistChainStep2Data,
-        TwistChainStep2JobBinder
-        >
+    public override void Update(TwistChainStep2Job job, ref TwistChainStep2Data data)
     {
     }
 }
+
+[DisallowMultipleComponent, AddComponentMenu("SIGGRAPH 2019/Twist Chain Step 2")]
+public class TwistChainStep2 : RigConstraint<
+    TwistChainStep2Job,
+    TwistChainStep2Data,
+    TwistChainStep2JobBinder
+    >
+{
+}
diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset
new file mode 100644
index 0000000..36c3781
--- /dev/null
+++ b/Assets/DefaultVolumeProfile.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: DefaultVolumeProfile
+  m_EditorClassIdentifier: 
+  components: []
diff --git a/Assets/DefaultVolumeProfile.asset.meta b/Assets/DefaultVolumeProfile.asset.meta
new file mode 100644
index 0000000..3fa9dd3
--- /dev/null
+++ b/Assets/DefaultVolumeProfile.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3ef586960adb4c029e7bcc97a6f2979
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/MegaCity/Building/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat b/Assets/MegaCity/Building/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat
index 8e9d313..1885a69 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8611864164189687068
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,15 @@ Material:
   m_Name: Aircondition_Units_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +44,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +132,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -194,6 +229,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -254,3 +291,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Floor_Tiled.mat b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Floor_Tiled.mat
index a064e7c..7db47cd 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Floor_Tiled.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Floor_Tiled.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,14 +23,27 @@ Material:
   m_Name: Buildings_Floor_Tiled
   m_Shader: {fileID: -6465566751694194690, guid: 4aa8667e11ee1114dbd872ebf1ef7a5c,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _DEPTHOFFSET_ON _EMISSIVE_COLOR_MAP _ENABLESPECULAROCCLUSION
-    _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _PIXEL_DISPLACEMENT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _DEPTHOFFSET_ON
+  - _EMISSIVE_COLOR_MAP
+  - _ENABLESPECULAROCCLUSION
+  - _HEIGHTMAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
+  - _PIXEL_DISPLACEMENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -82,6 +95,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Boolean_27C2A8C7: 0
     - Boolean_89AA2E77: 1
@@ -101,6 +127,7 @@ Material:
     - _Metalness: 1
     - _NormalScale: 1
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -130,3 +157,5 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat
index 91fc808..7d3584c 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6595522011668014028
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +23,19 @@ Material:
   m_Name: Buildings_Tileset_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _DEPTHOFFSET_ON _EMISSIVE_COLOR_MAP _ENABLESPECULAROCCLUSION
-    _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _PIXEL_DISPLACEMENT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _DEPTHOFFSET_ON
+  - _EMISSIVE_COLOR_MAP
+  - _ENABLESPECULAROCCLUSION
+  - _HEIGHTMAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
+  - _PIXEL_DISPLACEMENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +48,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +136,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Boolean_27C2A8C7: 0
     - Boolean_89AA2E77: 0
@@ -198,6 +236,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -266,3 +306,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat
index 42a752b..311c8bc 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6320438256447427896
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +23,16 @@ Material:
   m_Name: Buildings_Tileset_A_Railing
   m_Shader: {fileID: -6465566751694194690, guid: 7cf490330990eb849bfd06e03c0ac606,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BENTNORMALMAP _EMISSIVE_COLOR_MAP _ENABLESPECULAROCCLUSION
-    _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +45,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +133,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -195,6 +230,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -256,3 +293,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat
index 879b6f7..eaf0181 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +10,19 @@ Material:
   m_Name: Buildings_Tileset_A_Tarp
   m_Shader: {fileID: -6465566751694194690, guid: 7cf490330990eb849bfd06e03c0ac606,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _DEPTHOFFSET_ON _EMISSIVE_COLOR_MAP _ENABLESPECULAROCCLUSION
-    _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _PIXEL_DISPLACEMENT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _DEPTHOFFSET_ON
+  - _EMISSIVE_COLOR_MAP
+  - _ENABLESPECULAROCCLUSION
+  - _HEIGHTMAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
+  - _PIXEL_DISPLACEMENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +35,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +123,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -196,6 +221,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -260,3 +287,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &4031731423674788680
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Floorlight_A/Floorlight_A.mat b/Assets/MegaCity/Building/Materials/Environment/Floorlight_A/Floorlight_A.mat
index 7ae68e2..02f1ebe 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Floorlight_A/Floorlight_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Floorlight_A/Floorlight_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,14 @@ Material:
   m_Name: Floorlight_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _EMISSIVE_COLOR_MAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _EMISSIVE_COLOR_MAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +30,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +118,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -193,6 +214,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _SSRefractionProjectionModel: 0
@@ -255,3 +278,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &3940579449425523538
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat b/Assets/MegaCity/Building/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat
index f67015f..12e67ea 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8544454333666004058
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +23,15 @@ Material:
   m_Name: Laundry_Collection_A
   m_Shader: {fileID: -6465566751694194690, guid: 7cf490330990eb849bfd06e03c0ac606,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP
-    _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +44,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +132,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -195,6 +229,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -256,3 +292,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat b/Assets/MegaCity/Building/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat
index 8deb704..ecd611b 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +10,16 @@ Material:
   m_Name: Neon_Signs_A
   m_Shader: {fileID: -6465566751694194690, guid: 7cf490330990eb849bfd06e03c0ac606,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BENTNORMALMAP _EMISSIVE_COLOR_MAP _ENABLESPECULAROCCLUSION
-    _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +32,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +120,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -196,6 +218,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -260,3 +284,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &7836054313990508829
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat
index 18ac237..aac89ba 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +10,15 @@ Material:
   m_Name: Pagoda_Decoration_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP
-    _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -186,6 +207,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -194,6 +216,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -254,3 +278,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &1738058950286223968
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat
index 2bd0087..9efe3b4 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,11 @@ Material:
   m_Name: Pagoda_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +27,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +115,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -186,6 +204,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 0
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -194,6 +213,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -257,3 +278,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &7358383872645406932
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat
index 104d116..9214031 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,15 @@ Material:
   m_Name: Pagoda_Ceiling_Tiling_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _EMISSIVE_COLOR_MAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -194,6 +216,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -254,3 +278,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &1325494695846168220
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat
index 3dda951..d59b118 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,15 @@ Material:
   m_Name: Pagoda_RoofTiles_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _EMISSIVE_COLOR_MAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -195,6 +217,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -258,3 +282,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &8472705942285844186
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat
index f797f07..e772e9a 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5098129423573399606
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,15 @@ Material:
   m_Name: Pagoda_Roof_Trims_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _EMISSIVE_COLOR_MAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +44,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +132,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -195,6 +230,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -258,3 +295,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat
index ff80918..28b976a 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,14 @@ Material:
   m_Name: Pagoda_Tileset_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +30,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +118,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -194,6 +215,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -254,3 +277,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &4309891102565567219
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat
index cb8a3b7..205d831 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,15 @@ Material:
   m_Name: Pagoda_Trims_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _EMISSIVE_COLOR_MAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -195,6 +217,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -258,3 +282,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &6451458049602397864
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Blue.mat b/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Blue.mat
index 3a9dc09..3f9ec73 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Blue.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Blue.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,14 @@ Material:
   m_Name: Pipes_A_Blue
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +30,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +118,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -185,6 +206,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -193,6 +215,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -253,3 +277,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &505968403497995743
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Red.mat b/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Red.mat
index a091daf..3e47dfe 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Red.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_Red.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,14 @@ Material:
   m_Name: Pipes_A_Red
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +30,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +118,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -185,6 +206,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -193,6 +215,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -253,3 +277,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2295276320396516030
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_White.mat b/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_White.mat
index f856663..0fb32c3 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_White.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Pipes_A/Pipes_A_White.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3721731872182711752
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,14 @@ Material:
   m_Name: Pipes_A_White
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +43,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +131,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -185,6 +219,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -193,6 +228,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -254,3 +291,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat
index aef95d3..30a5601 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1149671659746951829
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,15 @@ Material:
   m_Name: Satellite_Dish_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +44,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +132,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -186,6 +221,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -194,6 +230,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -257,3 +295,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat
index 41c021c..9f6ad99 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,15 @@ Material:
   m_Name: Satellite_Dish_B
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -186,6 +208,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -194,6 +217,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -257,3 +282,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2007507169589162887
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat
index b762c07..acc48c5 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5818549968579904520
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,15 @@ Material:
   m_Name: Satellite_Dish_C
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +44,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +132,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -186,6 +221,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 0
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -194,6 +230,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -257,3 +295,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat
index 947b305..4710517 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1594441880837729032
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,13 @@ Material:
   m_Name: Satellite_Dishes_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +42,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +130,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -186,6 +219,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 0
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -194,6 +228,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -257,3 +293,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Scaffolding_A/Scaffolding_A.mat b/Assets/MegaCity/Building/Materials/Environment/Scaffolding_A/Scaffolding_A.mat
index d197c14..a6ef5ab 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Scaffolding_A/Scaffolding_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Scaffolding_A/Scaffolding_A.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7563104732395070358
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +23,15 @@ Material:
   m_Name: Scaffolding_A
   m_Shader: {fileID: -6465566751694194690, guid: 7cf490330990eb849bfd06e03c0ac606,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP
-    _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +44,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +132,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -187,6 +221,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 1
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 3
     - _PPDLodThreshold: 5
@@ -195,6 +230,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -234,6 +271,7 @@ Material:
     - _UVEmissive: 0
     - _UseEmissiveIntensity: 0
     - _UseShadowThreshold: 0
+    - _Vpush: 0
     - _ZTestDepthEqualForOpaque: 3
     - _ZTestGBuffer: 3
     - _ZTestModeDistortion: 4
@@ -258,3 +296,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Building/Materials/Environment/Streetlight_A/Streetlight_A.mat b/Assets/MegaCity/Building/Materials/Environment/Streetlight_A/Streetlight_A.mat
index a8d0454..881c9a6 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Streetlight_A/Streetlight_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Streetlight_A/Streetlight_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,14 @@ Material:
   m_Name: Streetlight_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _EMISSIVE_COLOR_MAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _EMISSIVE_COLOR_MAP
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +30,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +118,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Boolean_89AA2E77: 0
     - Vector1_9154D9D: 1
@@ -194,6 +215,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _SSRefractionProjectionModel: 0
@@ -260,3 +283,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &5525687288265114711
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A.mat b/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A.mat
index 4e6cb4c..7240477 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,15 @@ Material:
   m_Name: Window_Collection_A
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -194,6 +216,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -254,3 +278,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2180921093091326947
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat b/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat
index 31bcb2b..cbe14bb 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,8 +10,16 @@ Material:
   m_Name: Window_Collection_A_Emissive
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _EMISSIVE_COLOR_MAP _ENABLESPECULAROCCLUSION _MASKMAP
-    _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _EMISSIVE_COLOR_MAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -24,6 +32,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -111,6 +120,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Boolean_89AA2E77: 0
     - Vector1_9154D9D: 1
@@ -196,6 +218,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -260,3 +284,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &4222422245118858250
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat b/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat
index 252cfe4..46cf77f 100644
--- a/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat
+++ b/Assets/MegaCity/Building/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +10,15 @@ Material:
   m_Name: Window_Collection_A_Glass
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _BENTNORMALMAP _ENABLESPECULAROCCLUSION _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _BENTNORMALMAP
+  - _ENABLESPECULAROCCLUSION
+  - _MASKMAP
+  - _NORMALMAP
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -23,6 +31,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +119,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -195,6 +217,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _RefractionSSRayModel: 0
@@ -258,3 +282,18 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &8214720979844355732
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/MegaCity/Building/Materials/Rendering/_ShadowCaster.mat b/Assets/MegaCity/Building/Materials/Rendering/_ShadowCaster.mat
index c2cca14..88bb5ec 100644
--- a/Assets/MegaCity/Building/Materials/Rendering/_ShadowCaster.mat
+++ b/Assets/MegaCity/Building/Materials/Rendering/_ShadowCaster.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3144126288448255212
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,7 +23,13 @@ Material:
   m_Name: _ShadowCaster
   m_Shader: {fileID: -6465566751694194690, guid: f96385200ca2c3248aa7ab5d13baf8c7,
     type: 3}
-  m_ShaderKeywords: _DISABLE_DECALS _DOUBLESIDED_ON _NORMALMAP_TANGENT_SPACE
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _DISABLE_DECALS
+  - _DOUBLESIDED_ON
+  - _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 1
@@ -23,6 +42,7 @@ Material:
   - TransparentDepthPostpass
   - TransparentBackface
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,6 +130,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_9154D9D: 1
     - _AORemapMax: 1
@@ -184,6 +217,7 @@ Material:
     - _MaterialID: 1
     - _MeshAnimationMode: 0
     - _Metallic: 0
+    - _Metalness: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _PPDLodThreshold: 5
@@ -192,6 +226,8 @@ Material:
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
     - _PreRefractionPass: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _ReceivesSSR: 1
     - _RefractionModel: 0
     - _SSRefractionProjectionModel: 0
@@ -254,3 +290,5 @@ Material:
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Decal_Dirt_A_Mat.mat b/Assets/MegaCity/Decals/Materials/Decal_Dirt_A_Mat.mat
index bfd6038..fb3975e 100644
--- a/Assets/MegaCity/Decals/Materials/Decal_Dirt_A_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Decal_Dirt_A_Mat.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,13 +23,18 @@ Material:
   m_Name: Decal_Dirt_A_Mat
   m_Shader: {fileID: -6465566751694194690, guid: d2cf7fd9f3611b4458f127202e05fec6,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -73,6 +78,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_A52CBC0D: 1
     - Vector1_DECB3A34: 0.665
@@ -88,6 +106,7 @@ Material:
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -103,3 +122,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Decal_Dirt_B_Mat.mat b/Assets/MegaCity/Decals/Materials/Decal_Dirt_B_Mat.mat
index 007b44f..74d5b6c 100644
--- a/Assets/MegaCity/Decals/Materials/Decal_Dirt_B_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Decal_Dirt_B_Mat.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,13 +23,18 @@ Material:
   m_Name: Decal_Dirt_B_Mat
   m_Shader: {fileID: -6465566751694194690, guid: d2cf7fd9f3611b4458f127202e05fec6,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -73,6 +78,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_A52CBC0D: 1
     - Vector1_DECB3A34: 0.665
@@ -88,6 +106,7 @@ Material:
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -103,3 +122,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Decal_Dirt_Leak_A_Mat.mat b/Assets/MegaCity/Decals/Materials/Decal_Dirt_Leak_A_Mat.mat
index 0578c43..8679e82 100644
--- a/Assets/MegaCity/Decals/Materials/Decal_Dirt_Leak_A_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Decal_Dirt_Leak_A_Mat.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,13 +23,18 @@ Material:
   m_Name: Decal_Dirt_Leak_A_Mat
   m_Shader: {fileID: -6465566751694194690, guid: d2cf7fd9f3611b4458f127202e05fec6,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -73,6 +78,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_A52CBC0D: 1
     - Vector1_DECB3A34: 0.514
@@ -88,6 +106,7 @@ Material:
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -103,3 +122,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Decal_Rust_A_Mat.mat b/Assets/MegaCity/Decals/Materials/Decal_Rust_A_Mat.mat
index ed39f48..b483ba9 100644
--- a/Assets/MegaCity/Decals/Materials/Decal_Rust_A_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Decal_Rust_A_Mat.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,13 +23,18 @@ Material:
   m_Name: Decal_Rust_A_Mat
   m_Shader: {fileID: -6465566751694194690, guid: d2cf7fd9f3611b4458f127202e05fec6,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -73,6 +78,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_A52CBC0D: 0.5
     - Vector1_DECB3A34: 0.479
@@ -88,6 +106,7 @@ Material:
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -103,3 +122,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Decal_Rust_B_Mat.mat b/Assets/MegaCity/Decals/Materials/Decal_Rust_B_Mat.mat
index e848a07..204f6ae 100644
--- a/Assets/MegaCity/Decals/Materials/Decal_Rust_B_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Decal_Rust_B_Mat.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,13 +23,18 @@ Material:
   m_Name: Decal_Rust_B_Mat
   m_Shader: {fileID: -6465566751694194690, guid: d2cf7fd9f3611b4458f127202e05fec6,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -73,6 +78,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_A52CBC0D: 1
     - Vector1_DECB3A34: 0.63
@@ -88,6 +106,7 @@ Material:
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -103,3 +122,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Decal_Rust_C_Mat.mat b/Assets/MegaCity/Decals/Materials/Decal_Rust_C_Mat.mat
index f968e13..e0388a4 100644
--- a/Assets/MegaCity/Decals/Materials/Decal_Rust_C_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Decal_Rust_C_Mat.mat
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23,13 +23,18 @@ Material:
   m_Name: Decal_Rust_C_Mat
   m_Shader: {fileID: -6465566751694194690, guid: d2cf7fd9f3611b4458f127202e05fec6,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -73,6 +78,19 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_A52CBC0D: 1
     - Vector1_DECB3A34: 0.63
@@ -88,6 +106,7 @@ Material:
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
@@ -103,3 +122,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Decals/Materials/Puddle_Mat.mat b/Assets/MegaCity/Decals/Materials/Puddle_Mat.mat
index 185acda..75a09c9 100644
--- a/Assets/MegaCity/Decals/Materials/Puddle_Mat.mat
+++ b/Assets/MegaCity/Decals/Materials/Puddle_Mat.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5669134668908316116
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,16 +23,34 @@ Material:
   m_Name: Puddle_Mat
   m_Shader: {fileID: -6465566751694194690, guid: 28862be056129e640901d64cdea64630,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Boolean_13FD5D27: 1
     - Vector1_3AD1788C: 5
@@ -29,8 +60,12 @@ Material:
     - Vector1_B7C26DC3: 0.26
     - Vector1_C55E1F43: 0.14
     - Vector1_FF9D0F33: 0.55
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_51BD3F74: {r: 0.612985, g: 0.8162623, b: 0.8962264, a: 0}
     - Color_76CD8536: {r: 1, g: 1, b: 1, a: 0}
     - Color_F84A3C73: {r: 0, g: 0, b: 0, a: 0}
     - Vector2_750C2476: {r: 0.31, g: 9.21, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/MegaCity/Particles/Smoke_Particle_Mat.mat b/Assets/MegaCity/Particles/Smoke_Particle_Mat.mat
index 2344a22..558feb5 100644
--- a/Assets/MegaCity/Particles/Smoke_Particle_Mat.mat
+++ b/Assets/MegaCity/Particles/Smoke_Particle_Mat.mat
@@ -2,22 +2,32 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Smoke_Particle_Mat
   m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
-  m_ShaderKeywords: _FADING_ON _FLIPBOOKBLENDING_ON _RECEIVE_SHADOWS_OFF _SOFTPARTICLES_ON
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _FADING_ON
+  - _FLIPBOOKBLENDING_ON
+  - _SOFTPARTICLES_ON
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords:
+  - _RECEIVE_SHADOWS_OFF
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3050
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     RenderType: Transparent
   disabledShaderPasses:
   - SHADOWCASTER
+  - DepthOnly
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -65,8 +75,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 2
     - _BlendOp: 0
     - _BumpScale: 1
@@ -82,6 +94,7 @@ Material:
     - _DistortionStrength: 1
     - _DistortionStrengthScaled: 0.1
     - _DstBlend: 1
+    - _DstBlendAlpha: 1
     - _EmissionEnabled: 0
     - _FlipbookBlending: 1
     - _FlipbookMode: 0
@@ -101,7 +114,8 @@ Material:
     - _SoftParticlesFarFadeDistance: 1
     - _SoftParticlesNearFadeDistance: 0
     - _SpecularHighlights: 1
-    - _SrcBlend: 1
+    - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
     - _Surface: 1
     - _UVSec: 0
     - _ZWrite: 0
@@ -111,11 +125,13 @@ Material:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.8603976, g: 0.8603976, b: 0.8603976, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &2812288083808370507
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -128,4 +144,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
diff --git a/Assets/MegaCity/Shaders/Effects/FogQuad_Mat.mat b/Assets/MegaCity/Shaders/Effects/FogQuad_Mat.mat
index 5cbc5cf..864b1a3 100644
--- a/Assets/MegaCity/Shaders/Effects/FogQuad_Mat.mat
+++ b/Assets/MegaCity/Shaders/Effects/FogQuad_Mat.mat
@@ -1,8 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8756713138028651757
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10,16 +23,34 @@ Material:
   m_Name: FogQuad_Mat
   m_Shader: {fileID: -6465566751694194690, guid: 3d06b60c433d7524f8482d2f69ccb236,
     type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_1D86DCC6: 1.7
     - Vector1_2D6C68BB: -0.41
@@ -29,7 +60,11 @@ Material:
     - Vector1_AD7540F0: -24.1
     - Vector1_BAF0AFD: -16.1
     - Vector1_EFA741B5: 40
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_1463F17: {r: 0.30980393, g: 0.26666668, b: 0.21960786, a: 1}
     - Color_64D543A5: {r: 1, g: 0, b: 0, a: 1}
     - Vector2_8EB42B8: {r: 0.1, g: 0.1, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/ProjectTemplate/ExampleAssets/Materials/Ground_Mat.mat b/Assets/ProjectTemplate/ExampleAssets/Materials/Ground_Mat.mat
index 4dba5d8..414b78b 100644
--- a/Assets/ProjectTemplate/ExampleAssets/Materials/Ground_Mat.mat
+++ b/Assets/ProjectTemplate/ExampleAssets/Materials/Ground_Mat.mat
@@ -12,24 +12,32 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Ground_Mat
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _METALLICSPECGLOSSMAP
+  - _NORMALMAP
+  - _OCCLUSIONMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -77,14 +85,34 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0
@@ -99,12 +127,16 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/ProjectTemplate/ExampleAssets/Materials/Stud_Mat.mat b/Assets/ProjectTemplate/ExampleAssets/Materials/Stud_Mat.mat
index 13f639e..c44ff73 100644
--- a/Assets/ProjectTemplate/ExampleAssets/Materials/Stud_Mat.mat
+++ b/Assets/ProjectTemplate/ExampleAssets/Materials/Stud_Mat.mat
@@ -12,24 +12,32 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Stud_Mat
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _METALLICSPECGLOSSMAP
+  - _NORMALMAP
+  - _OCCLUSIONMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 1
-  m_CustomRenderQueue: 2050
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -77,14 +85,34 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
@@ -99,12 +127,16 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.07618539, g: 0.082282715, b: 0.07421358, a: 1}
+    - _EmissionColor: {r: 0.0067161303, g: 0.0074898335, b: 0.0064763986, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/ProjectTemplate/Materials/HelloWorld/Blue.mat b/Assets/ProjectTemplate/Materials/HelloWorld/Blue.mat
index d9cdee7..82ef10f 100644
--- a/Assets/ProjectTemplate/Materials/HelloWorld/Blue.mat
+++ b/Assets/ProjectTemplate/Materials/HelloWorld/Blue.mat
@@ -2,21 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Blue
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -28,6 +33,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -44,37 +61,67 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0, g: 0.020600796, b: 1, a: 1}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0, g: 0.020600796, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &6497372900423366456
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -87,4 +134,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
diff --git a/Assets/ProjectTemplate/Materials/HelloWorld/Red.mat b/Assets/ProjectTemplate/Materials/HelloWorld/Red.mat
index 4ba6bbe..b8f46ed 100644
--- a/Assets/ProjectTemplate/Materials/HelloWorld/Red.mat
+++ b/Assets/ProjectTemplate/Materials/HelloWorld/Red.mat
@@ -2,21 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Red
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -28,6 +33,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -44,37 +61,67 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &6497372900423366456
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -87,4 +134,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
diff --git a/Assets/RendererSettings.asset b/Assets/RendererSettings.asset
new file mode 100644
index 0000000..83ed1c7
--- /dev/null
+++ b/Assets/RendererSettings.asset
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
+  m_Name: RendererSettings
+  m_EditorClassIdentifier: 
+  debugShaders:
+    debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
+      type: 3}
+    hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
+    probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
+      type: 3}
+  probeVolumeResources:
+    probeVolumeDebugShader: {fileID: 0}
+    probeVolumeFragmentationDebugShader: {fileID: 0}
+    probeVolumeOffsetDebugShader: {fileID: 0}
+    probeVolumeSamplingDebugShader: {fileID: 0}
+    probeSamplingDebugMesh: {fileID: 0}
+    probeSamplingDebugTexture: {fileID: 0}
+    probeVolumeBlendStatesCS: {fileID: 0}
+  m_RendererFeatures: []
+  m_RendererFeatureMap: 
+  m_UseNativeRenderPass: 0
+  xrSystemData: {fileID: 0}
+  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  m_AssetVersion: 2
+  m_OpaqueLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_TransparentLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_DefaultStencilState:
+    overrideStencilState: 0
+    stencilReference: 0
+    stencilCompareFunction: 8
+    passOperation: 2
+    failOperation: 0
+    zFailOperation: 0
+  m_ShadowTransparentReceive: 1
+  m_RenderingMode: 0
+  m_DepthPrimingMode: 0
+  m_CopyDepthMode: 1
+  m_DepthAttachmentFormat: 0
+  m_DepthTextureFormat: 0
+  m_AccurateGbufferNormals: 0
+  m_IntermediateTextureMode: 1
diff --git a/Assets/RendererSettings.asset.meta b/Assets/RendererSettings.asset.meta
new file mode 100644
index 0000000..3266709
--- /dev/null
+++ b/Assets/RendererSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e6fe0ff34eab24fb6976dba650f76714
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja.mat
index 70d4fbe..a05ff03 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja.mat
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja
   m_Shader: {fileID: 4800000, guid: 50f1e2edbb6ee5b4ebd7e4aa1f8caaa3, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +64,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_3f259b258a5717848e9737a46b48d1fd_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_480d3a0058c1bb8090012c7ac3fe0a62_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5751E918_Texture:
         m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -103,6 +116,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_c90452fa37939a8e8cc1a003216d30c2_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_d9b1f294d8d4d987b24a9fb1e61ddd0d_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -111,6 +132,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_3d83c343ff84f180bf7cbd2704cfe4f6_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_79F375AB_Out:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -131,6 +156,23 @@ Material:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_a65fa995208f5d8b8bc9bbe49bd45c78_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_5DF63B5D: 0.24
     - Vector1_C0E349B1: 0.24
@@ -147,6 +189,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -166,3 +210,18 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &5643573172661872014
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Cloth.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Cloth.mat
index 5487954..68d8054 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Cloth.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Cloth.mat
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Cloth
   m_Shader: {fileID: 4800000, guid: 0d9b3b22f68526b4b9f431996f7969ce, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -63,6 +68,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_211d9da6c026fe8690fcbe2174ad7517_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_2293059C_Texture:
         m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -91,6 +100,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6331d2918d192e83aa02e947e34949e6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_7E758427_Texture:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -99,6 +112,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8bcdba2d2cbb548a8b2b82a70a99433a_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_987A6A12_Texture:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -115,10 +132,31 @@ Material:
         m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b376eba683cb2287b311bc2b77774a70_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_f88a520ceadfb78f96d6dfd482ca6890_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_12ECDB54: 0.16
     - Vector1_CBBB8742: 0.16
@@ -135,6 +173,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -153,3 +193,18 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &3928138245308371333
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_ClothFlag.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_ClothFlag.mat
index 34d75e6..1f0b0bf 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_ClothFlag.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_ClothFlag.mat
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_ClothFlag
   m_Shader: {fileID: 4800000, guid: 15bacff7342e7fc45ab41fdcd991ecf0, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +64,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_211d9da6c026fe8690fcbe2174ad7517_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_2293059C_Texture:
         m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -79,6 +88,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8bcdba2d2cbb548a8b2b82a70a99433a_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_987A6A12_Texture:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -95,10 +108,31 @@ Material:
         m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b376eba683cb2287b311bc2b77774a70_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_f88a520ceadfb78f96d6dfd482ca6890_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_12ECDB54: 2.4
     - Vector1_CBBB8742: 0
@@ -115,6 +149,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -133,3 +169,18 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2858892374668921946
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Eyes.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Eyes.mat
index 0c6252a..2510f9c 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Eyes.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Eyes.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7038880840445459547
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Eyes
   m_Shader: {fileID: 4800000, guid: 1aa3994cee30b3a42b9d371f78bdd880, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -43,10 +61,22 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8395edc77e45cc83aa9dc0d81276edb0_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 418d14e8ab54df6479f7d38029872905, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8397cddf725b8687be00daf6bee33223_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_86329AF0_Texture:
         m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8ee5c33d4770128ab08b0494edb785c5_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_A041A781_Texture:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -59,6 +89,23 @@ Material:
         m_Texture: {fileID: 2800000, guid: 418d14e8ab54df6479f7d38029872905, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_df6e87e8ff15e282bf5271b979003b0d_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_184D4B68: 2
     - Vector1_2359E682: 0
@@ -68,6 +115,8 @@ Material:
     - Vector1_5B07699D: 1
     - Vector1_662602AD: 1
     - Vector1_D802F59E: 0.87
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_707B9444: {r: 0.47843137, g: 1, b: 0.003921569, a: 0}
     - Color_EAD38CF4: {r: 0.47883767, g: 1, b: 0.0047169924, a: 0}
@@ -75,3 +124,5 @@ Material:
     - Vector2_7D229047: {r: -19, g: -7, b: 0, a: 0}
     - Vector2_8C0022CC: {r: 25, g: 25, b: 0, a: 0}
     - Vector2_9753E166: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Leather.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Leather.mat
index c2879d1..86b0e14 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Leather.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Leather.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4893730800329456340
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Leather
   m_Shader: {fileID: 4800000, guid: 2717cfe7bc528054eb473c74b723c29b, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -27,6 +45,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_24657995760a458da4d64e9c2a4b9acf_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_3E8F9539_Texture:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -39,6 +61,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_61f964c04c92ea82b4b484ce7ad041bb_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_62E4DE6A_Texture:
         m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -67,6 +93,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a8060485031d738780b121d93de3d6a6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_bb0ae3c341f64985aeaebe66f34f09e1_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_1BA683CC_Out:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -79,6 +113,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_9e14bdb5a96c8d85871eb5eee2060c29_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_A22F3F8F_Out:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -91,7 +129,26 @@ Material:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Floats: []
+    - _Texture2DAsset_e05f702c5206798dbd78e67a97004113_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_3E382A72: {r: 0.3207547, g: 0.21936616, b: 0.15432538, a: 0}
     - Color_602C9B69: {r: 0.09019608, g: 0.107985266, b: 0.18039216, a: 0}
@@ -101,3 +158,5 @@ Material:
     - Color_BDC90C30: {r: 0.4627451, g: 0.41159055, b: 0.31764707, a: 0}
     - Color_BF065094: {r: 0.31764707, g: 0.32941177, b: 0.46274513, a: 0}
     - Color_E44ECA60: {r: 0.11320752, g: 0.08009966, b: 0.0469918, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Skin.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Skin.mat
index 9fc1488..2df16cc 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Skin.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/graphs_Ninja_Skin.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2214949174967221957
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Skin
   m_Shader: {fileID: 4800000, guid: 3ab7dd0b5fb9f574a94cf448201e7e26, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -27,6 +45,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5028165a06d816859d2dbbf1664e594c_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_55AF77A_Texture:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -35,6 +57,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6c2fc9585a453a81842274851af8eb1e_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_B30FC96B_Texture:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -47,6 +73,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_149E4697: 0.41
     - Vector1_45BCAEB7: 1
@@ -56,6 +95,10 @@ Material:
     - Vector1_9430777B: 0.53
     - Vector1_B689B066: 0.35
     - Vector1_D3584EF6: 1.3
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_422C6F10: {r: 0.8396226, g: 0.61488533, b: 0.5742702, a: 1}
     - Color_8777B784: {r: 0.9433962, g: 0.6452474, b: 0.6452474, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2.mat
index 0859fe9..878f94f 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2.mat
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja2
   m_Shader: {fileID: 4800000, guid: 50f1e2edbb6ee5b4ebd7e4aa1f8caaa3, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +64,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_3f259b258a5717848e9737a46b48d1fd_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_480d3a0058c1bb8090012c7ac3fe0a62_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5751E918_Texture:
         m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -87,6 +100,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_c90452fa37939a8e8cc1a003216d30c2_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_d9b1f294d8d4d987b24a9fb1e61ddd0d_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -95,6 +116,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_3d83c343ff84f180bf7cbd2704cfe4f6_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_79F375AB_Out:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -107,6 +132,23 @@ Material:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_a65fa995208f5d8b8bc9bbe49bd45c78_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_5DF63B5D: 0.03
     - Vector1_C0E349B1: 0.52
@@ -123,6 +165,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -142,3 +186,18 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &8263451212383773198
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Cloth.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Cloth.mat
index 295d3fd..9150de1 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Cloth.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Cloth.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7820088469772240742
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja2_Cloth
   m_Shader: {fileID: 4800000, guid: 0d9b3b22f68526b4b9f431996f7969ce, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +77,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_211d9da6c026fe8690fcbe2174ad7517_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_2293059C_Texture:
         m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -75,10 +97,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6331d2918d192e83aa02e947e34949e6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_7E758427_Texture:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8bcdba2d2cbb548a8b2b82a70a99433a_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_987A6A12_Texture:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -95,10 +125,31 @@ Material:
         m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b376eba683cb2287b311bc2b77774a70_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_f88a520ceadfb78f96d6dfd482ca6890_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_12ECDB54: 0.16
     - Vector1_CBBB8742: 0.16
@@ -115,6 +166,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -133,3 +186,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_ClothFlag.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_ClothFlag.mat
index 4d8a0c9..91b63a7 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_ClothFlag.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_ClothFlag.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1033126987246787311
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja2_ClothFlag
   m_Shader: {fileID: 4800000, guid: 0d9b3b22f68526b4b9f431996f7969ce, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +77,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_211d9da6c026fe8690fcbe2174ad7517_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_2293059C_Texture:
         m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -75,10 +97,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6331d2918d192e83aa02e947e34949e6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_7E758427_Texture:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8bcdba2d2cbb548a8b2b82a70a99433a_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_987A6A12_Texture:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -95,10 +125,31 @@ Material:
         m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b376eba683cb2287b311bc2b77774a70_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_f88a520ceadfb78f96d6dfd482ca6890_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_12ECDB54: 2.4
     - Vector1_CBBB8742: 2.4
@@ -115,6 +166,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -133,3 +186,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Eyes.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Eyes.mat
index 8f0c406..212bb9d 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Eyes.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Eyes.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3017341671561968361
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja2_Eyes
   m_Shader: {fileID: 4800000, guid: 1aa3994cee30b3a42b9d371f78bdd880, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -43,10 +61,22 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8395edc77e45cc83aa9dc0d81276edb0_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 418d14e8ab54df6479f7d38029872905, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8397cddf725b8687be00daf6bee33223_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_86329AF0_Texture:
         m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8ee5c33d4770128ab08b0494edb785c5_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_A041A781_Texture:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -59,6 +89,23 @@ Material:
         m_Texture: {fileID: 2800000, guid: 418d14e8ab54df6479f7d38029872905, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_df6e87e8ff15e282bf5271b979003b0d_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_184D4B68: 1.09
     - Vector1_2359E682: 0
@@ -68,6 +115,8 @@ Material:
     - Vector1_5B07699D: 1
     - Vector1_662602AD: 1
     - Vector1_D802F59E: 0.95
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_707B9444: {r: 1, g: 0.55267936, b: 0.4481132, a: 1}
     - Color_EAD38CF4: {r: 0.47883767, g: 1, b: 0.0047169924, a: 0}
@@ -75,3 +124,5 @@ Material:
     - Vector2_7D229047: {r: -19, g: -7, b: 0, a: 0}
     - Vector2_8C0022CC: {r: 25, g: 25, b: 0, a: 0}
     - Vector2_9753E166: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Leather.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Leather.mat
index 69c3e34..9bb482f 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Leather.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Leather.mat
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8480927183104706215
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja2_Leather
   m_Shader: {fileID: 4800000, guid: 2717cfe7bc528054eb473c74b723c29b, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -27,6 +45,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_24657995760a458da4d64e9c2a4b9acf_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_3E8F9539_Texture:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -35,6 +57,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_61f964c04c92ea82b4b484ce7ad041bb_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_62E4DE6A_Texture:
         m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -51,6 +77,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a8060485031d738780b121d93de3d6a6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_bb0ae3c341f64985aeaebe66f34f09e1_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_1BA683CC_Out:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -59,6 +93,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_9e14bdb5a96c8d85871eb5eee2060c29_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_A22F3F8F_Out:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -67,7 +105,26 @@ Material:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Floats: []
+    - _Texture2DAsset_e05f702c5206798dbd78e67a97004113_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_3E382A72: {r: 0.8509804, g: 0.09019608, b: 0, a: 0}
     - Color_602C9B69: {r: 0.09019608, g: 0.107985266, b: 0.18039216, a: 0}
@@ -77,3 +134,5 @@ Material:
     - Color_BDC90C30: {r: 0.8490566, g: 0.0883914, b: 0, a: 0}
     - Color_BF065094: {r: 0.31132078, g: 0.16692676, b: 0.13069598, a: 0}
     - Color_E44ECA60: {r: 0.4627451, g: 0.38039216, b: 0.31764707, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Skin.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Skin.mat
index 34e2f15..794dea1 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Skin.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/Variants/graphs_Ninja2_Skin.mat
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja2_Skin
   m_Shader: {fileID: 4800000, guid: 3ab7dd0b5fb9f574a94cf448201e7e26, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -27,6 +32,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5028165a06d816859d2dbbf1664e594c_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_55AF77A_Texture:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -35,6 +44,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6c2fc9585a453a81842274851af8eb1e_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_B30FC96B_Texture:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -47,6 +60,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_149E4697: 0.54
     - Vector1_45BCAEB7: 0.8
@@ -56,6 +82,23 @@ Material:
     - Vector1_9430777B: 0.56
     - Vector1_B689B066: 0.36
     - Vector1_D3584EF6: 1.3
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_422C6F10: {r: 0.6037736, g: 0.27704066, b: 0.21929511, a: 1}
     - Color_8777B784: {r: 0.745283, g: 0.48162156, b: 0.48162156, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &6964168382273482700
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja 1.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja 1.mat
index 84c7e80..6aa897f 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja 1.mat	
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja 1.mat	
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5419358726268322188
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja 1
   m_Shader: {fileID: 4800000, guid: 50f1e2edbb6ee5b4ebd7e4aa1f8caaa3, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +77,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_3f259b258a5717848e9737a46b48d1fd_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_480d3a0058c1bb8090012c7ac3fe0a62_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5751E918_Texture:
         m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -103,6 +129,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_c90452fa37939a8e8cc1a003216d30c2_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_d9b1f294d8d4d987b24a9fb1e61ddd0d_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -111,6 +145,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_3d83c343ff84f180bf7cbd2704cfe4f6_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_79F375AB_Out:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -131,6 +169,23 @@ Material:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_a65fa995208f5d8b8bc9bbe49bd45c78_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_5DF63B5D: 0.24
     - Vector1_C0E349B1: 0.24
@@ -147,6 +202,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -166,3 +223,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Cloth 1.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Cloth 1.mat
index a8d727a..9e6abaa 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Cloth 1.mat	
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Cloth 1.mat	
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5060140948548560321
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Cloth 1
   m_Shader: {fileID: 4800000, guid: 0d9b3b22f68526b4b9f431996f7969ce, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -63,6 +81,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_211d9da6c026fe8690fcbe2174ad7517_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_2293059C_Texture:
         m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -91,6 +113,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6331d2918d192e83aa02e947e34949e6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_7E758427_Texture:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -99,6 +125,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8bcdba2d2cbb548a8b2b82a70a99433a_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_987A6A12_Texture:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -115,10 +145,31 @@ Material:
         m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b376eba683cb2287b311bc2b77774a70_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_f88a520ceadfb78f96d6dfd482ca6890_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_12ECDB54: 0.16
     - Vector1_CBBB8742: 0.16
@@ -135,6 +186,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -153,3 +206,5 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_ClothFlag 1.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_ClothFlag 1.mat
index 1f2a2dd..42ba43d 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_ClothFlag 1.mat	
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_ClothFlag 1.mat	
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_ClothFlag 1
   m_Shader: {fileID: 4800000, guid: 15bacff7342e7fc45ab41fdcd991ecf0, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,6 +64,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_211d9da6c026fe8690fcbe2174ad7517_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 119ea842395280045b6ffa66788a836d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_2293059C_Texture:
         m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -79,6 +88,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8bcdba2d2cbb548a8b2b82a70a99433a_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_987A6A12_Texture:
         m_Texture: {fileID: 2800000, guid: 10ab1ee52985c024b8a1fd20c5ee4e61, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -95,10 +108,31 @@ Material:
         m_Texture: {fileID: 2800000, guid: 28c0faa02202f7a43a1e1402cbc5f8bc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b376eba683cb2287b311bc2b77774a70_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: e673ddbd83e7168478f90bfa5fc28f61, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_f88a520ceadfb78f96d6dfd482ca6890_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 6c42d962f61053b4eb49fada915bb522, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_12ECDB54: 2.4
     - Vector1_CBBB8742: 16.02
@@ -115,6 +149,8 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -133,3 +169,18 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2788145875693408529
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Eyes 1.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Eyes 1.mat
index 2817ffd..49ea531 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Eyes 1.mat	
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Eyes 1.mat	
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Eyes 1
   m_Shader: {fileID: 4800000, guid: 1aa3994cee30b3a42b9d371f78bdd880, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -51,10 +56,22 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8395edc77e45cc83aa9dc0d81276edb0_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 418d14e8ab54df6479f7d38029872905, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8397cddf725b8687be00daf6bee33223_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_86329AF0_Texture:
         m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_8ee5c33d4770128ab08b0494edb785c5_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_A041A781_Texture:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -75,6 +92,23 @@ Material:
         m_Texture: {fileID: 2800000, guid: 418d14e8ab54df6479f7d38029872905, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_df6e87e8ff15e282bf5271b979003b0d_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_184D4B68: 2
     - Vector1_2359E682: 0
@@ -84,6 +118,8 @@ Material:
     - Vector1_5B07699D: 1
     - Vector1_662602AD: 1
     - Vector1_D802F59E: 0.87
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_707B9444: {r: 0.47843137, g: 1, b: 0.003921569, a: 0}
     - Color_EAD38CF4: {r: 0.47883767, g: 1, b: 0.0047169924, a: 0}
@@ -91,3 +127,18 @@ Material:
     - Vector2_7D229047: {r: -19, g: -7, b: 0, a: 0}
     - Vector2_8C0022CC: {r: 25, g: 25, b: 0, a: 0}
     - Vector2_9753E166: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &362466051200367953
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Leather 1.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Leather 1.mat
index 7cf8cde..33993a0 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Leather 1.mat	
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Leather 1.mat	
@@ -1,21 +1,39 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3232214200417576424
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Leather 1
   m_Shader: {fileID: 4800000, guid: 2717cfe7bc528054eb473c74b723c29b, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -27,6 +45,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_24657995760a458da4d64e9c2a4b9acf_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 99f051344e3e9cd45a501779934e6163, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_3E8F9539_Texture:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -39,6 +61,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_61f964c04c92ea82b4b484ce7ad041bb_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_62E4DE6A_Texture:
         m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -67,6 +93,14 @@ Material:
         m_Texture: {fileID: 2800000, guid: d6ac4720774bde74e8cd49fe44030c04, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a8060485031d738780b121d93de3d6a6_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_bb0ae3c341f64985aeaebe66f34f09e1_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: b4545adf21a8cc5439c95807334e9a34, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_1BA683CC_Out:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -79,6 +113,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_9e14bdb5a96c8d85871eb5eee2060c29_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_A22F3F8F_Out:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -91,7 +129,26 @@ Material:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Floats: []
+    - _Texture2DAsset_e05f702c5206798dbd78e67a97004113_Out_0_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_3E382A72: {r: 0.4627451, g: 0.4117647, b: 0.31764707, a: 0}
     - Color_602C9B69: {r: 0.09019608, g: 0.107985266, b: 0.18039216, a: 0}
@@ -101,3 +158,5 @@ Material:
     - Color_BDC90C30: {r: 0.4627451, g: 0.41159055, b: 0.31764707, a: 0}
     - Color_BF065094: {r: 0.31764707, g: 0.32941177, b: 0.46274513, a: 0}
     - Color_E44ECA60: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Skin 1.mat b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Skin 1.mat
index 9c09116..753a30b 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Skin 1.mat	
+++ b/Assets/TestNinja/Content/Characters/Ninja/Materials/hdrp_materials/graphs_Ninja_Skin 1.mat	
@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: graphs_Ninja_Skin 1
   m_Shader: {fileID: 4800000, guid: 3ab7dd0b5fb9f574a94cf448201e7e26, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -27,6 +32,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5028165a06d816859d2dbbf1664e594c_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_55AF77A_Texture:
         m_Texture: {fileID: 2800000, guid: c8d62f9aea861a248855d4adb65d2c76, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -35,6 +44,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_6c2fc9585a453a81842274851af8eb1e_Texture_1_Texture2D:
+        m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_B30FC96B_Texture:
         m_Texture: {fileID: 2800000, guid: 03c39246d90bc4646b3793edf6b1d78a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -55,6 +68,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fe86390306dbf8d49a6b34599f6e8aed, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - Vector1_149E4697: 0.41
     - Vector1_45BCAEB7: 1
@@ -64,6 +90,23 @@ Material:
     - Vector1_9430777B: 0.53
     - Vector1_B689B066: 0.35
     - Vector1_D3584EF6: 1.3
+    - _QueueControl: 0
+    - _QueueOffset: 0
     m_Colors:
     - Color_422C6F10: {r: 0.8396226, g: 0.61488533, b: 0.5742702, a: 1}
     - Color_8777B784: {r: 0.9433962, g: 0.6452474, b: 0.6452474, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &805459375370221795
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
diff --git a/Assets/TestNinja/Content/Characters/Ninja/Models/Props/Chopsticks_Mat.mat b/Assets/TestNinja/Content/Characters/Ninja/Models/Props/Chopsticks_Mat.mat
index 36cf188..db6ecdb 100644
--- a/Assets/TestNinja/Content/Characters/Ninja/Models/Props/Chopsticks_Mat.mat
+++ b/Assets/TestNinja/Content/Characters/Ninja/Models/Props/Chopsticks_Mat.mat
@@ -2,21 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Chopsticks_Mat
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -28,6 +33,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -44,37 +61,67 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
+    - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.18867922, g: 0.1408737, b: 0.10501956, a: 1}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.18867919, g: 0.14087367, b: 0.10501952, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &2651635153456324855
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -87,4 +134,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
diff --git a/Assets/TestNinja/Content/Weapons/Materials/NinjaWeapons_material.mat b/Assets/TestNinja/Content/Weapons/Materials/NinjaWeapons_material.mat
index aa2f64c..92d5cba 100644
--- a/Assets/TestNinja/Content/Weapons/Materials/NinjaWeapons_material.mat
+++ b/Assets/TestNinja/Content/Weapons/Materials/NinjaWeapons_material.mat
@@ -12,24 +12,32 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 9
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NinjaWeapons_material
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _METALLICSPECGLOSSMAP
+  - _NORMALMAP
+  - _OCCLUSIONMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -109,14 +117,34 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
@@ -130,12 +158,16 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
new file mode 100644
index 0000000..8905471
--- /dev/null
+++ b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -0,0 +1,374 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
+  m_Name: UniversalRenderPipelineGlobalSettings
+  m_EditorClassIdentifier: 
+  m_ShaderStrippingSetting:
+    m_Version: 0
+    m_ExportShaderVariants: 1
+    m_ShaderVariantLogLevel: 0
+    m_StripRuntimeDebugShaders: 1
+  m_URPShaderStrippingSetting:
+    m_Version: 0
+    m_StripUnusedPostProcessingVariants: 0
+    m_StripUnusedVariants: 1
+    m_StripScreenCoordOverrideVariants: 1
+  m_ShaderVariantLogLevel: 0
+  m_ExportShaderVariants: 1
+  m_StripDebugVariants: 1
+  m_StripUnusedPostProcessingVariants: 0
+  m_StripUnusedVariants: 1
+  m_StripScreenCoordOverrideVariants: 1
+  supportRuntimeDebugDisplay: 0
+  m_EnableRenderGraph: 0
+  m_Settings:
+    m_SettingsList:
+      m_List:
+      - rid: 7025355143373127863
+      - rid: 7025355143373127864
+      - rid: 7025355143373127865
+      - rid: 7025355143373127866
+      - rid: 7025355143373127867
+      - rid: 7025355143373127868
+      - rid: 7025355143373127869
+      - rid: 7025355143373127870
+      - rid: 7025355143373127871
+      - rid: 7025355143373127872
+      - rid: 7025355143373127873
+      - rid: 7025355143373127874
+      - rid: 7025355143373127875
+      - rid: 7025355143373127876
+      - rid: 7025355143373127877
+      - rid: 7025355143373127878
+      - rid: 7025355143373127879
+      - rid: 7025355143373127880
+      - rid: 7025355143373127881
+      - rid: 7025355143373127882
+      - rid: 7025355143373127883
+      - rid: 7025355143373127884
+      - rid: 7025355143373127885
+      - rid: 7025355143373127886
+    m_RuntimeSettings:
+      m_List: []
+  m_AssetVersion: 8
+  m_ObsoleteDefaultVolumeProfile: {fileID: 0}
+  m_RenderingLayerNames:
+  - Default
+  m_ValidRenderingLayers: 0
+  lightLayerName0: 
+  lightLayerName1: 
+  lightLayerName2: 
+  lightLayerName3: 
+  lightLayerName4: 
+  lightLayerName5: 
+  lightLayerName6: 
+  lightLayerName7: 
+  apvScenesData:
+    obsoleteSceneBounds:
+      m_Keys: []
+      m_Values: []
+    obsoleteHasProbeVolumes:
+      m_Keys: []
+      m_Values: 
+  references:
+    version: 2
+    RefIds:
+    - rid: 7025355143373127863
+      type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2,
+          type: 2}
+    - rid: 7025355143373127864
+      type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d,
+          type: 2}
+        m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d,
+          type: 2}
+        m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d,
+          type: 2}
+        m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e,
+          type: 2}
+        m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862,
+          type: 2}
+        m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40,
+          type: 2}
+    - rid: 7025355143373127865
+      type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 1
+        m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837,
+          type: 3}
+        m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44,
+          type: 3}
+        m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb,
+          type: 3}
+    - rid: 7025355143373127866
+      type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
+          type: 3}
+        m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587,
+          type: 3}
+        m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
+          type: 3}
+    - rid: 7025355143373127867
+      type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd,
+          type: 3}
+        m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959,
+          type: 3}
+        m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
+        m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
+          type: 3}
+        m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    - rid: 7025355143373127868
+      type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea,
+          type: 3}
+        m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772,
+          type: 3}
+        m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395,
+          type: 3}
+    - rid: 7025355143373127869
+      type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_VolumeProfile: {fileID: 11400000, guid: e3ef586960adb4c029e7bcc97a6f2979,
+          type: 2}
+    - rid: 7025355143373127870
+      type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f,
+          type: 3}
+        m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11,
+          type: 3}
+        m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd,
+          type: 3}
+        m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144,
+          type: 3}
+        m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90,
+          type: 3}
+        m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1,
+          type: 3}
+        m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b,
+          type: 3}
+        m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
+          type: 3}
+        m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61,
+          type: 3}
+    - rid: 7025355143373127871
+      type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_EnableRenderCompatibilityMode: 0
+    - rid: 7025355143373127872
+      type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+        m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
+          type: 3}
+        m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304,
+          type: 3}
+        m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608,
+          type: 3}
+        m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2,
+          type: 3}
+        m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395,
+          type: 3}
+    - rid: 7025355143373127873
+      type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal,
+        asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_StripUnusedPostProcessingVariants: 0
+        m_StripUnusedVariants: 1
+        m_StripScreenCoordOverrideVariants: 1
+    - rid: 7025355143373127874
+      type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3}
+        m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00,
+          type: 3}
+        m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6,
+          type: 3}
+        m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3,
+          type: 3}
+        m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1,
+          type: 3}
+        m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273,
+          type: 3}
+        m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca,
+          type: 3}
+        m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+        m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3,
+          type: 2}
+        m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40,
+          type: 2}
+        m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5,
+          type: 2}
+    - rid: 7025355143373127875
+      type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
+      data:
+        m_Version: 0
+        m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2,
+          type: 3}
+        m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef,
+          type: 3}
+        m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b,
+          type: 3}
+        m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114,
+          type: 3}
+        m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da,
+          type: 3}
+        m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c,
+          type: 3}
+        m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df,
+          type: 3}
+        m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100,
+          type: 3}
+        m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248,
+          type: 3}
+    - rid: 7025355143373127876
+      type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_version: 0
+        m_EnableCompilationCaching: 1
+        m_EnableValidityChecks: 1
+    - rid: 7025355143373127877
+      type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d,
+          type: 3}
+        probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c,
+          type: 3}
+        probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931,
+          type: 3}
+    - rid: 7025355143373127878
+      type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_version: 0
+        m_IncludeReferencedInScenes: 0
+        m_IncludeAssetsByLabel: 0
+        m_LabelToInclude: 
+    - rid: 7025355143373127879
+      type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d,
+          type: 3}
+        subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22,
+          type: 3}
+        voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e,
+          type: 3}
+        traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123,
+          type: 3}
+        traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123,
+          type: 3}
+        skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d,
+          type: 3}
+        skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d,
+          type: 3}
+        renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9,
+          type: 3}
+        renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9,
+          type: 3}
+    - rid: 7025355143373127880
+      type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d,
+          type: 3}
+        probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303,
+          type: 3}
+        probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393,
+          type: 3}
+        probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381,
+          type: 3}
+        probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2,
+          type: 3}
+        numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a,
+          type: 3}
+    - rid: 7025355143373127881
+      type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        m_ProbeVolumeDisableStreamingAssets: 0
+    - rid: 7025355143373127882
+      type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        m_UseBicubicLightmapSampling: 0
+    - rid: 7025355143373127883
+      type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering,
+        asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a,
+          type: 3}
+        m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba,
+          type: 3}
+        m_VisualizationLookupTable:
+          m_Data:
+          - {r: 1, g: 0, b: 0, a: 1}
+          - {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+          - {r: 1, g: 1, b: 1, a: 1}
+          - {r: 0, g: 1, b: 0, a: 1}
+          - {r: 0.75, g: 0.75, b: 0, a: 1}
+          - {r: 0, g: 0.75, b: 0.55, a: 1}
+          - {r: 0.5, g: 0, b: 0.5, a: 1}
+          - {r: 0.5, g: 0.5, b: 0.5, a: 1}
+          - {r: 0, g: 0, b: 1, a: 1}
+        m_ConversionLookupTable:
+          m_Data:
+          - {r: 1, g: 0, b: 0, a: 1}
+          - {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+          - {r: 1, g: 1, b: 1, a: 1}
+          - {r: 0, g: 1, b: 0, a: 1}
+          - {r: 0.75, g: 0.75, b: 0, a: 1}
+          - {r: 0, g: 0.75, b: 0.55, a: 1}
+          - {r: 0.5, g: 0, b: 0.5, a: 1}
+          - {r: 0.5, g: 0.5, b: 0.5, a: 1}
+          - {r: 0, g: 0, b: 1, a: 1}
+    - rid: 7025355143373127884
+      type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
+        m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
+        m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
+    - rid: 7025355143373127885
+      type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 0
+        m_ExportShaderVariants: 1
+        m_ShaderVariantLogLevel: 0
+        m_StripRuntimeDebugShaders: 1
+    - rid: 7025355143373127886
+      type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util,
+        asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 0
+        m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta
new file mode 100644
index 0000000..aa73de1
--- /dev/null
+++ b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: addffe4f0f3b949fa928c452f3cfb653
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 2373b29..5b7aa94 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,19 +1,19 @@
 {
   "dependencies": {
-    "com.unity.animation.rigging": "0.2.3-preview",
-    "com.unity.burst": "1.1.1",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ext.nunit": "1.0.0",
-    "com.unity.ide.rider": "1.0.8",
-    "com.unity.ide.visualstudio": "1.0.11",
-    "com.unity.ide.vscode": "1.0.7",
-    "com.unity.package-manager-ui": "2.2.0",
+    "com.unity.ai.navigation": "2.0.5",
+    "com.unity.animation.rigging": "1.3.0",
+    "com.unity.burst": "1.8.18",
+    "com.unity.collab-proxy": "2.6.0",
+    "com.unity.ext.nunit": "2.0.5",
+    "com.unity.ide.rider": "3.0.34",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.multiplayer.center": "1.0.0",
     "com.unity.playablegraph-visualizer": "0.2.1-preview.3",
-    "com.unity.render-pipelines.lightweight": "6.9.0",
-    "com.unity.test-framework": "1.0.13",
-    "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.1.0",
-    "com.unity.ugui": "1.0.0",
+    "com.unity.render-pipelines.universal": "17.0.3",
+    "com.unity.test-framework": "1.4.5",
+    "com.unity.timeline": "1.8.7",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index ac1e4a2..a4201db 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 16
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -13,9 +13,6 @@ GraphicsSettings:
   m_ScreenSpaceShadows:
     m_Mode: 1
     m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
-  m_LegacyDeferred:
-    m_Mode: 1
-    m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
   m_DepthNormals:
     m_Mode: 1
     m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
@@ -28,6 +25,7 @@ GraphicsSettings:
   m_LensFlare:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
+  m_VideoShadersIncludeMode: 2
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -36,6 +34,7 @@ GraphicsSettings:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
+  m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
   m_CustomRenderPipeline: {fileID: 11400000, guid: 19ba41d7c0026c3459d37c2fe90c55a0,
@@ -48,6 +47,7 @@ GraphicsSettings:
   m_LightmapStripping: 0
   m_FogStripping: 0
   m_InstancingStripping: 0
+  m_BrgStripping: 0
   m_LightmapKeepPlain: 1
   m_LightmapKeepDirCombined: 1
   m_LightmapKeepDynamicPlain: 1
@@ -58,5 +58,12 @@ GraphicsSettings:
   m_FogKeepExp: 1
   m_FogKeepExp2: 1
   m_AlbedoSwatchInfos: []
+  m_RenderPipelineGlobalSettingsMap:
+    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: addffe4f0f3b949fa928c452f3cfb653,
+      type: 2}
   m_LightsUseLinearIntensity: 1
   m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0
+  m_LightProbeOutsideHullStrategy: 0
+  m_CameraRelativeLightCulling: 0
+  m_CameraRelativeShadowCulling: 0
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
index 17c8f53..6a65192 100644
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -293,3 +293,196 @@ InputManager:
     type: 0
     axis: 0
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: Enable Debug Button 1
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: left ctrl
+    altNegativeButton: 
+    altPositiveButton: joystick button 8
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Enable Debug Button 2
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: backspace
+    altNegativeButton: 
+    altPositiveButton: joystick button 9
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Reset
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: left alt
+    altNegativeButton: 
+    altPositiveButton: joystick button 1
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Next
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: page down
+    altNegativeButton: 
+    altPositiveButton: joystick button 5
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Previous
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: page up
+    altNegativeButton: 
+    altPositiveButton: joystick button 4
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Validate
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: return
+    altNegativeButton: 
+    altPositiveButton: joystick button 0
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Persistent
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: right shift
+    altNegativeButton: 
+    altPositiveButton: joystick button 2
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Multiplier
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: left shift
+    altNegativeButton: 
+    altPositiveButton: joystick button 3
+    gravity: 0
+    dead: 0
+    sensitivity: 0
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Horizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: left
+    positiveButton: right
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Vertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: down
+    positiveButton: up
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Vertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: down
+    positiveButton: up
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 6
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Debug Horizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: left
+    positiveButton: right
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 5
+    joyNum: 0
+  m_UsePhysicalKeys: 1
diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset
new file mode 100644
index 0000000..5b5face
--- /dev/null
+++ b/ProjectSettings/MemorySettings.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!387306366 &1
+MemorySettings:
+  m_ObjectHideFlags: 0
+  m_EditorMemorySettings:
+    m_MainAllocatorBlockSize: -1
+    m_ThreadAllocatorBlockSize: -1
+    m_MainGfxBlockSize: -1
+    m_ThreadGfxBlockSize: -1
+    m_CacheBlockSize: -1
+    m_TypetreeBlockSize: -1
+    m_ProfilerBlockSize: -1
+    m_ProfilerEditorBlockSize: -1
+    m_BucketAllocatorGranularity: -1
+    m_BucketAllocatorBucketsCount: -1
+    m_BucketAllocatorBlockSize: -1
+    m_BucketAllocatorBlockCount: -1
+    m_ProfilerBucketAllocatorGranularity: -1
+    m_ProfilerBucketAllocatorBucketsCount: -1
+    m_ProfilerBucketAllocatorBlockSize: -1
+    m_ProfilerBucketAllocatorBlockCount: -1
+    m_TempAllocatorSizeMain: -1
+    m_JobTempAllocatorBlockSize: -1
+    m_BackgroundJobTempAllocatorBlockSize: -1
+    m_JobTempAllocatorReducedBlockSize: -1
+    m_TempAllocatorSizeGIBakingWorker: -1
+    m_TempAllocatorSizeNavMeshWorker: -1
+    m_TempAllocatorSizeAudioWorker: -1
+    m_TempAllocatorSizeCloudWorker: -1
+    m_TempAllocatorSizeGfx: -1
+    m_TempAllocatorSizeJobWorker: -1
+    m_TempAllocatorSizeBackgroundWorker: -1
+    m_TempAllocatorSizePreloadManager: -1
+  m_PlatformMemorySettings: {}
diff --git a/ProjectSettings/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset
new file mode 100644
index 0000000..2a93664
--- /dev/null
+++ b/ProjectSettings/MultiplayerManager.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!655991488 &1
+MultiplayerManager:
+  m_ObjectHideFlags: 0
+  m_EnableMultiplayerRoles: 0
+  m_StrippingTypes: {}
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
new file mode 100644
index 0000000..c2e48bd
--- /dev/null
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EnablePreReleasePackages: 0
+  m_AdvancedSettingsExpanded: 1
+  m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
+  oneTimeWarningShown: 0
+  oneTimeDeprecatedPopUpShown: 0
+  m_Registries:
+  - m_Id: main
+    m_Name: 
+    m_Url: https://packages.unity.com
+    m_Scopes: []
+    m_IsDefault: 1
+    m_Capabilities: 7
+    m_ConfigSource: 0
+  m_UserSelectedRegistryName: 
+  m_UserAddingNewScopedRegistry: 0
+  m_RegistryInfoDraft:
+    m_Modified: 0
+    m_ErrorMessage: 
+    m_UserModificationsInstanceId: -904
+    m_OriginalInstanceId: -906
+  m_LoadAssets: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 7e64146..169012e 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.2.0f1
-m_EditorVersionWithRevision: 2019.2.0f1 (20c1667945cf)
+m_EditorVersion: 6000.1.0b1
+m_EditorVersionWithRevision: 6000.1.0b1 (d8239ed3f65b)
diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset
new file mode 100644
index 0000000..df2f009
--- /dev/null
+++ b/ProjectSettings/ShaderGraphSettings.asset
@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shaderVariantLimit: 2048
+  customInterpolatorErrorThreshold: 32
+  customInterpolatorWarningThreshold: 16
+  customHeatmapValues: {fileID: 0}
diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset
new file mode 100644
index 0000000..08faf03
--- /dev/null
+++ b/ProjectSettings/URPProjectSettings.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LastMaterialVersion: 9
diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset
new file mode 100644
index 0000000..979fd8e
--- /dev/null
+++ b/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_TrackPackagesOutsideProject: 0