diff --git a/Native/EditorOnly/EditorNativeToManaged.cpp b/Native/EditorOnly/EditorNativeToManaged.cpp
index 1e656926..dc95633c 100644
--- a/Native/EditorOnly/EditorNativeToManaged.cpp
+++ b/Native/EditorOnly/EditorNativeToManaged.cpp
@@ -14,7 +14,7 @@ extern "C"
 	// Import effect callbacks:
 	void				(POPCORN_TO_MANAGED_CONVENTION *_OnEffectDependencyFound)(const char *dependencyPath, int isLinearTexture) = null;
 	void				(POPCORN_TO_MANAGED_CONVENTION *_OnEffectRendererFound)(const void *rendererDesc, int type, int idx) = null;
-	void				(POPCORN_TO_MANAGED_CONVENTION* _OnEffectRendererLink)(int globalIdx, const char *currentQualityLevel, int uid) = null;
+	void				(POPCORN_TO_MANAGED_CONVENTION* _OnEffectRendererLink)(int globalIdx, const char *currentQualityLevel, unsigned int uid) = null;
 	void				(POPCORN_TO_MANAGED_CONVENTION *_OnEffectEventFound)(const SFxEventDesc *attribDesc) = null;
 	void				(POPCORN_TO_MANAGED_CONVENTION *_OnEffectAttributeFound)(const SFxAttributeDesc *attribDesc) = null;
 	void				(POPCORN_TO_MANAGED_CONVENTION *_OnEffectSamplerFound)(const SFxSamplerDesc *samplerDesc) = null;
@@ -40,7 +40,7 @@ extern "C"
 
 	MANAGED_TO_POPCORN_CONVENTION void			SetDelegateOnEffectRendererLink(void *delegatePtr)
 	{
-		_OnEffectRendererLink = (void (POPCORN_TO_MANAGED_CONVENTION*)(int globalIdx, const char *currentQualityLevel, int uid))delegatePtr;
+		_OnEffectRendererLink = (void (POPCORN_TO_MANAGED_CONVENTION*)(int globalIdx, const char *currentQualityLevel, unsigned int uid))delegatePtr;
 	}
 
 	MANAGED_TO_POPCORN_CONVENTION void			SetDelegateOnEffectEventFound(void *delegatePtr)
@@ -110,7 +110,7 @@ extern "C"
 		}
 	}
 
-	void										OnEffectRendererLink(int globalIdx, const char *currentQualityLevel, int uid)
+	void										OnEffectRendererLink(int globalIdx, const char *currentQualityLevel, unsigned int uid)
 	{
 		PK_SCOPEDPROFILE();
 		PK_ASSERT(CCurrentThread::IsMainThread());
diff --git a/Native/EditorOnly/EditorNativeToManaged.h b/Native/EditorOnly/EditorNativeToManaged.h
index 934f3cec..864e5155 100644
--- a/Native/EditorOnly/EditorNativeToManaged.h
+++ b/Native/EditorOnly/EditorNativeToManaged.h
@@ -148,7 +148,7 @@ extern "C"
 	void										OnEffectRendererFound(const void *effectRdrDesc, int type, int idx);
 
 	MANAGED_TO_POPCORN_CONVENTION void			SetDelegateOnEffectRendererLink(void* delegatePtr);
-	void										OnEffectRendererLink(int globalIdx, const char *currentQualityLevel, int uid);
+	void										OnEffectRendererLink(int globalIdx, const char *currentQualityLevel, unsigned int uid);
 
 	MANAGED_TO_POPCORN_CONVENTION void			SetDelegateOnEffectEventFound(void *delegatePtr);
 	void										OnEffectEventFound(const SFxEventDesc *attribDesc);
diff --git a/Native/ManagedToNative.h b/Native/ManagedToNative.h
index 0e4aa4c4..a9a70e4d 100644
--- a/Native/ManagedToNative.h
+++ b/Native/ManagedToNative.h
@@ -298,15 +298,15 @@ extern "C"
 
 	struct SDecalInfo
 	{
-		CFloat3		 m_Position;
-		CFloat3		 m_Scale;
-		CQuaternion  m_Orientation;
+		CFloat3		m_Position;
+		CFloat3		m_Scale;
+		CQuaternion	m_Orientation;
 		char		*m_DiffuseMap;
 		char		*m_EmissiveMap;
-		CFloat4		 m_DiffuseColor;
-		CFloat4		 m_EmissiveColor;
-		CFloat1		 m_AtlasID;
-		int			 m_UID;
+		CFloat4		m_DiffuseColor;
+		CFloat3		m_EmissiveColor;
+		CFloat1		m_AtlasID;
+		int			m_UID;
 	};
 
 	//----------------------------------------------------------------------------
diff --git a/Native/NativeToManaged.h b/Native/NativeToManaged.h
index de7bdf05..4ad78355 100644
--- a/Native/NativeToManaged.h
+++ b/Native/NativeToManaged.h
@@ -64,7 +64,7 @@ extern "C"
 		SRenderingFeatureLitDesc	*m_LitRendering;
 
 		int							m_CameraID;
-		int							m_UID;
+		unsigned int				m_UID;
 
 		SPopcornRendererDesc()
 		:	m_CustomName(null)
@@ -84,7 +84,7 @@ extern "C"
 		,	m_DrawOrder(0)
 		,	m_LitRendering(null)
 		,	m_CameraID(0)
-		,	m_UID(-1)
+		,	m_UID(0)
 		{
 		}
 	};
@@ -146,18 +146,18 @@ extern "C"
 	// Decals:
 	struct SDecalRendererDesc
 	{
-		int				 m_ShaderVariationFlags;
+		int				m_ShaderVariationFlags;
 
-		const char		 *m_DiffuseMap;
-		const char		 *m_EmissiveMap;
+		const char		*m_DiffuseMap;
+		const char		*m_EmissiveMap;
 
-		CFloat4			 m_DiffuseColor;
-		CFloat3			 m_EmissiveColor;
+		CFloat4			m_DiffuseColor;
+		CFloat3			m_EmissiveColor;
 
-		int				 m_TextureAtlasCount;
-		CFloat4			 *m_TextureAtlas;
+		int				m_TextureAtlasCount;
+		CFloat4			*m_TextureAtlas;
 
-		int				 m_UID;
+		unsigned int	m_UID;
 
 		SDecalRendererDesc()
 			: m_ShaderVariationFlags(0)
@@ -167,7 +167,7 @@ extern "C"
 			, m_EmissiveColor(CFloat3::ZERO)
 			, m_TextureAtlasCount(0)
 			, m_TextureAtlas(null)
-			, m_UID(-1)
+			, m_UID(0)
 		{
 		}
 	};
@@ -201,7 +201,7 @@ extern "C"
 		int							m_TextureAtlasCount;
 		CFloat4						*m_TextureAtlas;
 
-		int							m_UID;
+		unsigned int				m_UID;
 		int							m_DrawOrder;
 
 		ManagedBool					m_TransformUVs_RGBOnly;
@@ -226,7 +226,7 @@ extern "C"
 			, m_AnimDescRendering(null)
 			, m_TextureAtlasCount(0)
 			, m_TextureAtlas(null)
-			, m_UID(-1)
+			, m_UID(0)
 			, m_DrawOrder(0)
 			, m_TransformUVs_RGBOnly(ManagedBool_False)
 			, m_UseVertexColor(ManagedBool_False)
diff --git a/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp b/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp
index a9e6b5bf..c36a2375 100644
--- a/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp
+++ b/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp
@@ -825,12 +825,12 @@ bool CUnityBillboardingBatchPolicy::_UpdateThread_IssueDrawCallDecal(const Drawe
 			diffuseColor = page->StreamForReading<CFloat4>(diffuseColorId);
 
 		// Emissive Color
-		TStridedMemoryView<const CFloat4> emissiveColor;
+		TStridedMemoryView<const CFloat3> emissiveColor;
 		bool hasEmissiveColor = emissiveColorId.Valid();
 		
 		if (hasEmissiveColor)
 		{
-			emissiveColor = page->StreamForReading<CFloat4>(emissiveColorId);
+			emissiveColor = page->StreamForReading<CFloat3>(emissiveColorId);
 		}
 
 		// Atlas ID
diff --git a/Native/RenderingIntegration/UnityRenderDataFactory.cpp b/Native/RenderingIntegration/UnityRenderDataFactory.cpp
index beec50ac..186d539d 100644
--- a/Native/RenderingIntegration/UnityRenderDataFactory.cpp
+++ b/Native/RenderingIntegration/UnityRenderDataFactory.cpp
@@ -80,7 +80,7 @@ PRendererCacheBase	CUnityRenderDataFactory::UpdateThread_CreateRendererCache(con
 	}
 	else if (renderer->m_RendererType == Renderer_Decal)
 	{
-	succeeded = rendererCache->GameThread_SetupRenderer(static_cast<const CRendererDataDecal*>(renderer.Get()));
+		succeeded = rendererCache->GameThread_SetupRenderer(static_cast<const CRendererDataDecal*>(renderer.Get()));
 	}
 
 	rendererCache->SetAssetName(particleDesc->ParentEffect()->HandlerName());
diff --git a/Native/RenderingIntegration/UnityRendererCache.h b/Native/RenderingIntegration/UnityRendererCache.h
index 7a11cbb4..419af44e 100644
--- a/Native/RenderingIntegration/UnityRendererCache.h
+++ b/Native/RenderingIntegration/UnityRendererCache.h
@@ -264,11 +264,11 @@ class CParticleMaterialDescDecal
 	CStringId					m_DiffuseMap;
 	CStringId					m_EmissiveMap;
 	CFloat4						m_DiffuseColor;
-	CFloat3 					m_EmissiveColor;
+	CFloat3						m_EmissiveColor;
 
-	bool InitFromRenderer(const CRendererDataDecal &renderer);
+	bool	InitFromRenderer(const CRendererDataDecal &renderer);
 
-	bool		operator == (const CParticleMaterialDescDecal &oth) const;
+	bool	operator == (const CParticleMaterialDescDecal &oth) const;
 };
 
 struct	SUnityMeshInfoPerView
@@ -350,7 +350,7 @@ class	CUnityRendererCache : public CRendererCacheBase
 	,	m_AssetName("")
 	,	m_HasCustomMat(false)
 	,	m_CustomMatID(-1)
-	,	m_UID(-1)
+	,	m_UID(0)
 	{
 	}
 
@@ -401,7 +401,7 @@ class	CUnityRendererCache : public CRendererCacheBase
 
 	bool										m_HasCustomMat;
 	int											m_CustomMatID;
-	int											m_UID;
+	unsigned int								m_UID;
 };
 PK_DECLARE_REFPTRCLASS(UnityRendererCache);
 
diff --git a/README.md b/README.md
index b7dc9b38..737a4b8e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.
diff --git a/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md b/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md
index bbfe0cd7..2f5e3a2f 100644
--- a/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md
+++ b/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md
@@ -1,6 +1,6 @@
 # Unity PopcornFX Plugin
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2019.4` to `2021.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
 
diff --git a/com.persistant-studios.popcornfx.hdrp/README.md b/com.persistant-studios.popcornfx.hdrp/README.md
index b7dc9b38..737a4b8e 100644
--- a/com.persistant-studios.popcornfx.hdrp/README.md
+++ b/com.persistant-studios.popcornfx.hdrp/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.
diff --git a/com.persistant-studios.popcornfx.hdrp/package.json b/com.persistant-studios.popcornfx.hdrp/package.json
index 624fcafc..fb736598 100644
--- a/com.persistant-studios.popcornfx.hdrp/package.json
+++ b/com.persistant-studios.popcornfx.hdrp/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.persistant-studios.popcornfx.hdrp",
   "description": "HDRP Materials for PopcornFX.",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "unity": "2020.2",
   "unityRelease": "",
   "displayName": "PopcornFX HDRP",
   "dependencies": {
     "com.unity.render-pipelines.core": "10.2.2",
     "com.unity.render-pipelines.high-definition": "10.2.2",
-    "com.persistant-studios.popcornfx": "2.20.0"
+    "com.persistant-studios.popcornfx": "2.20.1"
   }
 }
diff --git a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md
index 74ad6334..68fdeb4b 100644
--- a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md
+++ b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md
@@ -1,6 +1,6 @@
 # Unity PopcornFX Plugin
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2017.4` to `2021.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
 
diff --git a/com.persistant-studios.popcornfx.urp/README.md b/com.persistant-studios.popcornfx.urp/README.md
index b7dc9b38..737a4b8e 100644
--- a/com.persistant-studios.popcornfx.urp/README.md
+++ b/com.persistant-studios.popcornfx.urp/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.
diff --git a/com.persistant-studios.popcornfx.urp/package.json b/com.persistant-studios.popcornfx.urp/package.json
index ec998183..976e24eb 100644
--- a/com.persistant-studios.popcornfx.urp/package.json
+++ b/com.persistant-studios.popcornfx.urp/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.persistant-studios.popcornfx.urp",
   "description": "URP Materials for PopcornFX.",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "unity": "2020.2",
   "unityRelease": "",
   "displayName": "PopcornFX URP",
   "dependencies": {
     "com.unity.render-pipelines.core": "10.2.2",
     "com.unity.render-pipelines.universal": "10.2.2",
-    "com.persistant-studios.popcornfx": "2.20.0"
+    "com.persistant-studios.popcornfx": "2.20.1"
   }
 }
diff --git a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md
index 74ad6334..68fdeb4b 100644
--- a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md
+++ b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md
@@ -1,6 +1,6 @@
 # Unity PopcornFX Plugin
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2017.4` to `2021.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
 
diff --git a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxSettingsEditor.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxSettingsEditor.cs
index 629fe46b..084f174d 100644
--- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxSettingsEditor.cs
+++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxSettingsEditor.cs
@@ -614,6 +614,7 @@ private static void DisplayFeatureSetCategory(PKFxEditorCategory category)
 			if (PKFxSettings.EnablePopcornFXSound != soundValue)
 			{
 				PKFxSettings.EnablePopcornFXSound = soundValue;
+				PKFxManager.SetupPopcornFxSettings(false);
 			}
 			if (PKFxSettings.EnablePopcornFXSound)
 			{
@@ -624,6 +625,7 @@ private static void DisplayFeatureSetCategory(PKFxEditorCategory category)
 			if (PKFxSettings.EnablePopcornFXDecal != decalValue)
 			{
 				PKFxSettings.EnablePopcornFXDecal = decalValue;
+				PKFxManager.SetupPopcornFxSettings(false);
 			}
 
 			if (PKFxSettings.EnablePopcornFXDecal)
diff --git a/com.persistant-studios.popcornfx/README.md b/com.persistant-studios.popcornfx/README.md
index b7dc9b38..737a4b8e 100644
--- a/com.persistant-studios.popcornfx/README.md
+++ b/com.persistant-studios.popcornfx/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.20.0`
+* **Version:** `v2.20.1`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta
index a8beb27f..43a3aae3 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b213442ac5bd4eba951fad27c5171dad
+guid: 25e808d606384072b690e63e11032490
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta
index c390f40c..b63932a3 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a51b5b751c5940b39d1254c3f1da9ceb
+guid: f027fc4e156448e187dd3bef9d84e647
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so
index ba69b13b..a708c539 100755
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c65dddade2a6efcfcb88268ace08885efad04dc44e2a1acf8b8f032bafabbe8b
-size 180434864
+oid sha256:9076d701487df62179d197f4de36b0e7e73f084e58114d2ca164321927e7abc9
+size 180435236
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta
index d08d43e9..c2f48898 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1d020d4c235a426886c1f08b361155fe
+guid: 0443be27b22046e09918c522ce889182
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta
index 6878d029..510d3c3c 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a9aac735ef74541989cc827eb76a357
+guid: b0bf892543e74d56b8184313fb27a11f
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so
index d71b236b..da3a10cd 100755
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:045ff5ec14338973cad182c89c85032c7cebc5b97ea4f66f51925cf7735616b4
-size 141683192
+oid sha256:be7d249bd64337f64fdeb462cbf39b020617b6505b36a49a88253f83c00ddaec
+size 141680512
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta
index ec0fb787..89bb228e 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c2dd27bcc5c8473f987fe7479e6f9de6
+guid: 25c4114289e646bfb6506b43f8c20148
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta
index 0b844764..ee3d5fc9 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 92d3a55b622842abbaa83b9fad118fa9
+guid: 9a5d56a826c44241b34ae53b6b35af7a
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib
index c11ef16d..36dab216 100755
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:995d35ba9dec2ab28d6a235aacc78906c6a8fe09459c1bc6993c85d6b6cb3aff
-size 70784753
+oid sha256:533461da549a8995d02261d8a3b08a92d15c70040b3061641a5a171964f2ad47
+size 70822705
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta
index ef84c19d..e925fda9 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6c37bb0658724e2e8611db6d2ccbd471
+guid: 73ad0f2c692442e8bc9817bd575434fb
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta
index 924ff7aa..ac304783 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c00bdbfd3c4348a58779be65f3bfd857
+guid: 59a3b07c165e463aa81b225c80f4b049
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta
index d922dbbc..f12ba385 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5b95043a662e45788801f5cb35d1ee80
+guid: e130a734da344f8ab0f8ec9a119d5b1b
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a
index b4482d8f..7c53d0b1 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba785c5e194217e5bf3d705bcaa6b09ded448f216e7e032f31da03a7c06c06a6
-size 187035056
+oid sha256:e1884e1eda4aca88c1bc2cde7230f59253ba9cdb9cb16904b3b76a27074b9c93
+size 187035168
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta
index 241101b2..18684fd8 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 456c1fc8307d47ee8e1bd804ad38a5f7
+guid: 66aa21f4f3134006acb0101f64b6e7ac
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta
index 2165e59b..9acd3b49 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2421144e3b6c48c29d65e2901c1041bd
+guid: cac14954fd954bb3b47e9a38c45b9868
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll
index 3f4aa2ce..c06bc929 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c2f2f9671a51b762fe746c911b6eeb9ed5dc2a6954ca493edc74fbd5774c0ab
-size 4927488
+oid sha256:5214ba9fbb9d2fd7c4c2d8c65a44a5ceda9515d56cef4ac57b27f955294028c0
+size 4920320
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta
index 4d8c8138..9de697fe 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 571637bef3aa4c9ba287143731090a7f
+guid: 6e4b301ee91a4683b749e30ce8a8a29e
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta
index 6c84cf50..9ba083f8 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cfcef0330a7a4c3897b2b655d0893edc
+guid: edb814ed1a4745dd872b0f3075b90349
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll
index f37f5885..bc11edf4 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e00a1c5559a138e7763abb9f77ea075053a1c7d64d18cf2415aec043f8b0bb4b
-size 24683008
+oid sha256:32c773a19b9661d4efddbb66af6b34e57688b29bfc05bf76af408048dabf6534
+size 24689664
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta
index 4fdd84a3..4580be71 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 403e195a20d54812a28ea7abfaed0233
+guid: 7399d2dca3994d6ab4ed326e0303c406
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so
index f2be39fa..1c52d10a 100755
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbc3991fbd87ed083bbefd39aea735541f7bf939e5a032bff10d2059b1af146a
-size 22429832
+oid sha256:c0f5245298eaf72b057d192b30c0a31924c51bb16be242472be066036bdc479e
+size 22446632
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta
index b003af94..38e1eaf0 100644
--- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta
+++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bb8018b475e643e6acb022b7c1051032
+guid: 5d836ee5f9f048ffa284e4e682f3aa2b
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Prefabs/PKFXProfilerEditorPanel.prefab b/com.persistant-studios.popcornfx/Runtime/Prefabs/PKFXProfilerEditorPanel.prefab
index 93683fc4..a774f6dd 100644
--- a/com.persistant-studios.popcornfx/Runtime/Prefabs/PKFXProfilerEditorPanel.prefab
+++ b/com.persistant-studios.popcornfx/Runtime/Prefabs/PKFXProfilerEditorPanel.prefab
@@ -26,6 +26,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9173302806718924035}
   m_RootOrder: 3
@@ -65,6 +66,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5723901631710583118}
   m_Father: {fileID: 9173302806718924035}
@@ -72,8 +74,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 214.94992, y: 0}
-  m_SizeDelta: {x: 429.89984, y: 0}
+  m_AnchoredPosition: {x: 210.3, y: 0}
+  m_SizeDelta: {x: 420.6, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1188559949
 CanvasRenderer:
@@ -181,6 +183,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8217059946870821631}
   m_RootOrder: 0
@@ -260,6 +263,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8617941056056623004}
   - {fileID: 3824043855146253009}
@@ -328,6 +332,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7179570329959503632}
   m_RootOrder: 0
@@ -403,6 +408,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3039843238731335810}
   m_RootOrder: 0
@@ -478,6 +484,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 772744541569402124}
   m_RootOrder: 1
@@ -564,6 +571,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2708401161727024749}
   - {fileID: 9173302806718924035}
@@ -671,8 +679,7 @@ MonoBehaviour:
   m_SortByType: 0
   m_ListContainer: {fileID: 5060266197637807066}
   m_ToggleButton: {fileID: 694494474175310088}
-  m_EffectEntryPrefab: {fileID: 1477978029982756, guid: f0af1468e1015f145819da3e0150e4da,
-    type: 3}
+  m_EffectEntryPrefab: {fileID: 1477978029982756, guid: f0af1468e1015f145819da3e0150e4da, type: 3}
   m_ImageGlobalCount: {fileID: 3695459017539295023}
   m_ImageGlobalTime: {fileID: 4718259992200060410}
   m_TextComponent_SortButtonText: {fileID: 5823584277270398504}
@@ -682,11 +689,6 @@ MonoBehaviour:
   m_TextComponent_GlobalUpdateTime: {fileID: 288552654676311903}
   m_TextComponent_GlobalParticleCount: {fileID: 3679162990596421172}
   m_TextComponent_TotalEmitters: {fileID: 7721615856797569496}
-  m_LowImpactColor: {r: 0.12629855, g: 1, b: 0, a: 0.5254902}
-  m_HighImpactColor: {r: 1, g: 0, b: 0, a: 0.7294118}
-  m_ShowStats: 101
-  m_EnableProfiler: 114
-  m_ChangeSort: 116
 --- !u!225 &1599057975457216646
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -742,6 +744,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 812018950506390408}
   - {fileID: 772849678773705748}
@@ -865,6 +868,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3039843238731335810}
   m_RootOrder: 1
@@ -946,6 +950,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8962684026657938112}
   m_Father: {fileID: 7689712242074729034}
@@ -1087,6 +1092,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6406929288686626105}
   - {fileID: 3816092262139778643}
@@ -1210,6 +1216,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7580243752714270995}
   - {fileID: 3408614330718015434}
@@ -1277,6 +1284,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2385033307491912341}
   - {fileID: 2725408791582199341}
@@ -1344,6 +1352,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2726064242649014088}
   m_RootOrder: 0
@@ -1419,6 +1428,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8822946645604595085}
   m_RootOrder: 1
@@ -1498,6 +1508,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 454513343725762943}
   - {fileID: 832355849421053858}
@@ -1565,6 +1576,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4900580256089579387}
   - {fileID: 5140423096790867939}
@@ -1632,6 +1644,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4065388505902198861}
   - {fileID: 772744541569402124}
@@ -1709,6 +1722,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8822946645604595085}
   m_RootOrder: 0
@@ -1784,6 +1798,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3817403808388199219}
   - {fileID: 7144835497991037626}
@@ -1851,6 +1866,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 581271459923309232}
   m_RootOrder: 1
@@ -1927,6 +1943,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7122346112087277239}
   - {fileID: 6326631101876960193}
@@ -2050,6 +2067,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 772794624350587954}
   m_RootOrder: 0
@@ -2125,6 +2143,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2346957613314485454}
   m_RootOrder: 1
@@ -2204,6 +2223,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5937436414482699278}
   m_RootOrder: 1
@@ -2269,6 +2289,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7850988798525735901}
   m_RootOrder: 3
@@ -2334,6 +2355,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 581271459923309232}
   m_RootOrder: 0
@@ -2409,6 +2431,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7179570329959503632}
   m_RootOrder: 1
@@ -2482,6 +2505,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9173302806718924035}
   m_RootOrder: 1
@@ -2519,6 +2543,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4065388505902198861}
   m_RootOrder: 0
@@ -2594,6 +2619,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6240083577046992668}
   m_RootOrder: 0
@@ -2669,6 +2695,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2346957613314485454}
   m_RootOrder: 0
@@ -2744,6 +2771,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8534948856282043759}
   m_RootOrder: 0
@@ -2819,14 +2847,15 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1188559946}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 214.94992, y: 0}
-  m_SizeDelta: {x: 429.89984, y: 0}
+  m_AnchoredPosition: {x: 210.3, y: 0}
+  m_SizeDelta: {x: 420.6, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &8957852396353913070
 MonoBehaviour:
@@ -2896,6 +2925,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4065388505902198861}
   m_RootOrder: 1
@@ -2976,6 +3006,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2527968448624000521}
   - {fileID: 2346957613314485454}
@@ -3081,6 +3112,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6105218754053063269}
   m_RootOrder: 1
@@ -3160,6 +3192,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7179570329959503632}
   m_RootOrder: 2
@@ -3239,6 +3272,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 772744541569402124}
   m_RootOrder: 0
@@ -3314,6 +3348,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2726064242649014088}
   m_RootOrder: 1
@@ -3394,6 +3429,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2888316164511215548}
   - {fileID: 2323844865752155221}
@@ -3515,6 +3551,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9173302806718924035}
   m_RootOrder: 5
@@ -3553,6 +3590,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7179570329959503632}
   - {fileID: 5276232605420574008}
@@ -3658,6 +3696,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5276232605420574008}
   m_RootOrder: 1
@@ -3737,6 +3776,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6240083577046992668}
   m_RootOrder: 1
@@ -3816,6 +3856,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8534948856282043759}
   m_RootOrder: 1
@@ -3895,6 +3936,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8951078382752825666}
   m_RootOrder: 0
@@ -3970,6 +4012,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3848461943504522861}
   m_RootOrder: 0
@@ -4045,6 +4088,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9140875476697318106}
   - {fileID: 4011299087415026755}
@@ -4112,6 +4156,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6631141624580088693}
   m_RootOrder: 3
@@ -4178,6 +4223,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6105218754053063269}
   - {fileID: 2726064242649014088}
@@ -4281,6 +4327,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9173302806718924035}
   m_RootOrder: 7
@@ -4318,6 +4365,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8951078382752825666}
   m_RootOrder: 1
@@ -4395,6 +4443,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9173302806718924035}
   m_RootOrder: 9
@@ -4432,6 +4481,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7296863721349383129}
   - {fileID: 5149399618260754727}
@@ -4499,6 +4549,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5276232605420574008}
   m_RootOrder: 0
@@ -4574,6 +4625,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 581271459923309232}
   m_RootOrder: 2
@@ -4653,6 +4705,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2527968448624000521}
   m_RootOrder: 1
@@ -4732,6 +4785,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2527968448624000521}
   m_RootOrder: 0
@@ -4807,6 +4861,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4968707926539603702}
   - {fileID: 1354791220196281456}
@@ -4874,6 +4929,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3848461943504522861}
   m_RootOrder: 1
@@ -4953,6 +5009,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6105218754053063269}
   m_RootOrder: 0
@@ -5027,6 +5084,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7689712242074729034}
   m_RootOrder: 2
@@ -5084,6 +5142,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2045904863758455339}
   - {fileID: 7070759627924310670}
@@ -5152,6 +5211,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8822946645604595085}
   - {fileID: 3434046880521159598}
@@ -5255,6 +5315,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 984490640205913538}
   - {fileID: 5373349387877705206}
@@ -5322,6 +5383,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7689712242074729034}
   - {fileID: 4907438646299004671}
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs
index 62fd3c4f..6f01a19f 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs
@@ -47,9 +47,11 @@ public static short				GetUniqueID {
 		private bool					m_EnableDistortion = false;
 		private bool					m_EnableBlur = false;
 
+#if UNITY_EDITOR
 		private bool					m_IsEditorCamera = false;
 		public bool						IsEditorCamera { get { return m_IsEditorCamera; } }
 		private int						m_EditorCameraOriginMask;
+#endif
 
 		//----------------------------------------------------------------------------
 
@@ -227,9 +229,11 @@ internal void SetCullingMask(short ID, LayerMask targetMask, LayerMask allPKMask
 				else
 					cull |= 1 << LayerMask.NameToLayer(PKFxManagerImpl.m_DistortionLayer);
 			}
+#if UNITY_EDITOR
 			if (m_IsEditorCamera)
 				Tools.visibleLayers = cull;
 			else
+#endif
 				m_Camera.cullingMask = cull;
 		}
 
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalData.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalData.cs
index eb50b5e9..072d3b38 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalData.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalData.cs
@@ -5,19 +5,19 @@
 
 namespace PopcornFX
 {
-    public class PKFxDecalData : MonoBehaviour
-    {
-        public Material     m_Material;
-        public string       m_MaterialID;
-        public Texture2D    m_AtlasRects;
-        public int          m_UID;
+	public class PKFxDecalData : MonoBehaviour
+	{
+		public Material		m_Material;
+		public string		m_MaterialID;
+		public Texture2D	m_AtlasRects;
+		public uint			m_UID;
 
 		public void Reset()
 		{
-            m_Material = null;
-            m_MaterialID = "";
-            m_AtlasRects = null;
-            m_UID = -1;
+			m_Material = null;
+			m_MaterialID = "";
+			m_AtlasRects = null;
+			m_UID = 0;
 		}
 	}
 }
\ No newline at end of file
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalPool.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalPool.cs
index d9d11251..25e156ec 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalPool.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxDecalPool.cs
@@ -15,9 +15,9 @@ public struct SDecalInfo
 		public IntPtr		m_DiffuseMap;
 		public IntPtr		m_EmissiveMap;
 		public Vector4		m_DiffuseColor;
-		public Vector4		m_EmissiveColor;
+		public Vector3		m_EmissiveColor;
 		public float		m_AtlasID;
-		public int			m_UID;
+		public uint			m_UID;
 	}
 
 	public List<PKFxDecalData> m_Decals = new List<PKFxDecalData>();
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
index 77bd2c6e..a97d4091 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
@@ -399,7 +399,7 @@ internal partial class PKFxManagerImpl : object
 		//----------------------------------------------------------------------------
 
 		private const string m_UnityVersion = "Unity 2019.4 and up";
-		public const string m_PluginVersion = "2.20.0 for " + m_UnityVersion;
+		public const string m_PluginVersion = "2.20.1 for " + m_UnityVersion;
 		public static string m_CurrentVersionString = "";
 		public static bool		m_IsStarted = false;
 		public static string	m_DistortionLayer = "PopcornFX_Disto";
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs
index 7f53f784..eb71abe5 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs
@@ -140,7 +140,7 @@ public struct SPopcornRendererDesc
 		public IntPtr m_LitRendering;
 
 		public int	m_CameraId;
-		public int	m_UID;
+		public uint	m_UID;
 	};
 
 	// Meshes:
@@ -169,7 +169,7 @@ public struct SMeshRendererDesc
 
 		public int		m_TextureAtlasCount;
 		public IntPtr	m_TextureAtlas;
-		public int		m_UID;
+		public uint		m_UID;
 		public int		m_DrawOrder;
 		public int		m_TransformUVs_RGBOnly;
 		public int		m_UseVertexColor;
@@ -179,19 +179,19 @@ public struct SMeshRendererDesc
 	[StructLayout(LayoutKind.Sequential)]
 	public struct SDecalRendererDesc
 	{
-        public int		m_ShaderVariationFlags;
+		public int		m_ShaderVariationFlags;
 
-        public IntPtr	m_DiffuseMap;
+		public IntPtr	m_DiffuseMap;
 		public IntPtr	m_EmissiveMap;
 
 		public Vector4	m_DiffuseColor;
-		public Vector4	m_EmissiveColor;
+		public Vector3	m_EmissiveColor;
 
-        public int		m_TextureAtlasCount;
-        public IntPtr	m_TextureAtlas;
+		public int		m_TextureAtlasCount;
+		public IntPtr	m_TextureAtlas;
 
-        public int		m_UID;
-    };
+		public uint		m_UID;
+	};
 
 
 	[StructLayout(LayoutKind.Sequential)]
@@ -736,14 +736,14 @@ private static void OnEffectRendererFound(IntPtr RendererDescPtr, int type, int
 				}
 			}
 			else if (etype == ERendererType.Decal)
-            {
-                unsafe
-                {
-                    SDecalRendererDesc* nativeRendererDesc = (SDecalRendererDesc*)RendererDescPtr.ToPointer();
-                    m_CurrentlyImportedAsset.AddRenderer(etype, *nativeRendererDesc, idx);
-                }
-
-            }
+			{
+				unsafe
+				{
+					SDecalRendererDesc* nativeRendererDesc = (SDecalRendererDesc*)RendererDescPtr.ToPointer();
+					m_CurrentlyImportedAsset.AddRenderer(etype, *nativeRendererDesc, idx);
+				}
+
+			}
 			else
 			{
 				unsafe
@@ -757,10 +757,10 @@ private static void OnEffectRendererFound(IntPtr RendererDescPtr, int type, int
 
 		//----------------------------------------------------------------------------
 
-		public delegate void EffectRendererLinkCallback(int GlobalIdx, string qualityLevel, int UID);
+		public delegate void EffectRendererLinkCallback(int GlobalIdx, string qualityLevel, uint UID);
 
 		[MonoPInvokeCallback(typeof(EffectRendererLinkCallback))]
-		private static void OnEffectRendererLink(int globalIdx, string qualityLevel, int UID)
+		private static void OnEffectRendererLink(int globalIdx, string qualityLevel, uint UID)
 		{
 #if UNITY_EDITOR
 			m_CurrentlyImportedAsset.LinkRenderer(globalIdx, qualityLevel, UID);
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
index 1288ba35..4073dec7 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
@@ -28,11 +28,11 @@ public override byte[] m_Data
 		[Serializable]
 		public class MaterialUIDToIndex
 		{
-			public int		m_UID = -1;
+			public uint		m_UID = 0;
 			public int		m_Idx = -1;
 			public string	m_Quality = "Medium";
 
-			public MaterialUIDToIndex(int uid = -1, int idx = -1, string quality = "Medium")
+			public MaterialUIDToIndex(uint uid = 0, int idx = -1, string quality = "Medium")
 			{
 				m_UID = uid;
 				m_Idx = idx;
@@ -300,7 +300,7 @@ public static void DrawEditorCustomMaterial(PKFxCustomMaterialInfo customMat, bo
 			EditorGUI.indentLevel -= 1;
 		}
 
-		public void AddCustomMaterial(SerializedProperty prop, SBatchDesc sBatchDesc, Material newMat, int id)
+		public void AddCustomMaterial(SerializedProperty prop, SBatchDesc sBatchDesc, Material newMat, uint id)
 		{
 			if (m_CustomMaterials == null)
 				m_CustomMaterials = new List<PKFxCustomMaterialInfo>();
@@ -322,7 +322,7 @@ public void AddCustomMaterial(SerializedProperty prop, SBatchDesc sBatchDesc, Ma
 				so = new SerializedObject(customRule);
 				so.FindProperty("m_AssetVirtualPath").stringValue = AssetVirtualPath;
 				so.FindProperty("m_BatchDescName").stringValue = sBatchDesc.m_GeneratedName;
-				so.FindProperty("m_UID").intValue = id;
+				so.FindProperty("m_UID").intValue = (int)id;
 				so.FindProperty("m_CustomMaterial").objectReferenceValue = newMat;
 			}
 			else
@@ -455,37 +455,37 @@ public void AddRenderer(ERendererType type, SMeshRendererDesc renderer, int idx)
 		}
 
 		public void AddRenderer(ERendererType type, SDecalRendererDesc renderer, int idx)
-        {
-            SBatchDesc batch = new SBatchDesc(renderer);
-            m_RendererDescs.Add(batch);
-
-            while (idx >= m_Materials.Count)
-                m_Materials.Add(null);
-
-
-            Material mat = null;
-            RemoveOutdatedCustomMaterials(batch);
-            PKFxCustomMaterialInfo curMat = FindCustomMaterialInfo(batch);
-            if (curMat != null && curMat.m_CustomMaterial != null)
-            {
-                curMat.SetMaterialKeywords(batch, curMat.m_CustomMaterial);
-                curMat.BindMaterialProperties(batch, curMat.m_CustomMaterial, this, true);
-                mat = curMat.m_CustomMaterial;
-            }
-            else
-                mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(batch, this, false, false, false);
-
-            if (mat == null)
-            {
-                string assetFullPath = "Assets" + PKFxSettings.UnityPackFxPath + "/" + AssetVirtualPath + ".asset";
-                PKFxEffectAsset asset = (PKFxEffectAsset)AssetDatabase.LoadAssetAtPath(assetFullPath, typeof(PKFxEffectAsset));
-                Debug.LogError("Can't find a material for asset " + AssetVirtualPath + " in following batch desc: " + m_RendererDescs[m_RendererDescs.Count - 1].m_GeneratedName, asset);
-                return;
-            }
-            m_Materials[idx] = mat;
-        }
-
-        public void LinkRenderer(int GlobalIdx, string qualityLevel, int UID)
+		{
+			SBatchDesc batch = new SBatchDesc(renderer);
+			m_RendererDescs.Add(batch);
+
+			while (idx >= m_Materials.Count)
+				m_Materials.Add(null);
+
+
+			Material mat = null;
+			RemoveOutdatedCustomMaterials(batch);
+			PKFxCustomMaterialInfo curMat = FindCustomMaterialInfo(batch);
+			if (curMat != null && curMat.m_CustomMaterial != null)
+			{
+				curMat.SetMaterialKeywords(batch, curMat.m_CustomMaterial);
+				curMat.BindMaterialProperties(batch, curMat.m_CustomMaterial, this, true);
+				mat = curMat.m_CustomMaterial;
+			}
+			else
+				mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(batch, this, false, false, false);
+
+			if (mat == null)
+			{
+				string assetFullPath = "Assets" + PKFxSettings.UnityPackFxPath + "/" + AssetVirtualPath + ".asset";
+				PKFxEffectAsset asset = (PKFxEffectAsset)AssetDatabase.LoadAssetAtPath(assetFullPath, typeof(PKFxEffectAsset));
+				Debug.LogError("Can't find a material for asset " + AssetVirtualPath + " in following batch desc: " + m_RendererDescs[m_RendererDescs.Count - 1].m_GeneratedName, asset);
+				return;
+			}
+			m_Materials[idx] = mat;
+		}
+
+		public void LinkRenderer(int GlobalIdx, string qualityLevel, uint UID)
 		{
 			MaterialUIDToIndex index = m_MaterialIndexes.Find(item => item.m_UID == UID && item.m_Quality == qualityLevel);
 			if (index == null)
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs
index 51f042cd..47b40e7e 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs
@@ -17,7 +17,7 @@ public class PKFxSettings : ScriptableObject
 		public enum ERenderPipeline
 		{
 			Legacy,
-			URP	  ,
+			URP,
 			HDRP
 		}
 
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxCustomMaterialInfo.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxCustomMaterialInfo.cs
index 329cc13d..ac549732 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxCustomMaterialInfo.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxCustomMaterialInfo.cs
@@ -15,7 +15,7 @@ public class PKFxCustomMaterialInfo : PKFxShaderInputBindings
 	{
 		public string	m_AssetVirtualPath;
 		public string	m_BatchDescName;
-		public int		m_UID;
+		public uint		m_UID;
 		public Material m_CustomMaterial;
 	}
 }
\ No newline at end of file
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs
index 94853389..e959c151 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs
@@ -373,7 +373,7 @@ public class SBatchDesc
 		[SerializeField]
 		internal int				m_CameraId;
 
-		public int m_UID;
+		public uint					m_UID;
 
 
 		public SBatchDesc(ERendererType type, SPopcornRendererDesc desc)
diff --git a/com.persistant-studios.popcornfx/package.json b/com.persistant-studios.popcornfx/package.json
index 92730bdc..e9b27472 100644
--- a/com.persistant-studios.popcornfx/package.json
+++ b/com.persistant-studios.popcornfx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.persistant-studios.popcornfx",
   "description": "PopcornFX is a 3D realtime FX Solution for Games & Interactive applications.",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "unity": "2019.3",
   "displayName": "PopcornFX"
 }
diff --git a/download_3rd_party.bat b/download_3rd_party.bat
index 7a36f467..86508c98 100644
--- a/download_3rd_party.bat
+++ b/download_3rd_party.bat
@@ -7,7 +7,7 @@ set OPEN_SOURCE_UNITY_REPO_PATH=%~dp0
 
 bitsadmin /reset
 bitsadmin /create third_party_download
-bitsadmin /addfile third_party_download http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.20.0-21905_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip "%OPEN_SOURCE_UNITY_REPO_PATH%ExternalLibs.zip"
+bitsadmin /addfile third_party_download http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.20.1-21982_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip "%OPEN_SOURCE_UNITY_REPO_PATH%ExternalLibs.zip"
 bitsadmin /setpriority third_party_download "FOREGROUND"
 bitsadmin /resume third_party_download
 
diff --git a/download_3rd_party.sh b/download_3rd_party.sh
index 1bffc64b..db02cc34 100644
--- a/download_3rd_party.sh
+++ b/download_3rd_party.sh
@@ -4,6 +4,6 @@ SCRIPT_PATH=$(readlink -f "$0")
 OPEN_SOURCE_UNITY_REPO_PATH=$(dirname "$SCRIPT_PATH")
 
 rm -rf "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs"
-wget "http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.20.0-21905_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip" -O "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
+wget "http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.20.1-21982_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip" -O "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
 unzip "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
 rm -f "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
diff --git a/projects/UnityStore_android/PK-UpgraderLib.make b/projects/UnityStore_android/PK-UpgraderLib.make
index 66809875..30f40639 100644
--- a/projects/UnityStore_android/PK-UpgraderLib.make
+++ b/projects/UnityStore_android/PK-UpgraderLib.make
@@ -209,6 +209,7 @@ GENERATED += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+GENERATED += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 GENERATED += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -547,6 +548,7 @@ OBJECTS += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+OBJECTS += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -1055,6 +1057,9 @@ $(OBJDIR)/core_upgrader_2_20_0_21121.o: ../../ExternalLibs/pk_upgraderlib/src/Up
 $(OBJDIR)/core_upgrader_2_20_0_21896.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.0.21896/core_upgrader_2_20_0_21896.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+$(OBJDIR)/core_upgrader_2_20_1_21978.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.1.21978/core_upgrader_2_20_1_21978.cpp
+	@echo "$(notdir $<)"
+	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/core_upgrader_2_3_0_59136.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.3.0.59136/core_upgrader_2_3_0_59136.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
diff --git a/projects/UnityStore_ios/PK-UpgraderLib.make b/projects/UnityStore_ios/PK-UpgraderLib.make
index 48d31d77..ec16dad5 100644
--- a/projects/UnityStore_ios/PK-UpgraderLib.make
+++ b/projects/UnityStore_ios/PK-UpgraderLib.make
@@ -136,6 +136,7 @@ GENERATED += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+GENERATED += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 GENERATED += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -474,6 +475,7 @@ OBJECTS += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+OBJECTS += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -982,6 +984,9 @@ $(OBJDIR)/core_upgrader_2_20_0_21121.o: ../../ExternalLibs/pk_upgraderlib/src/Up
 $(OBJDIR)/core_upgrader_2_20_0_21896.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.0.21896/core_upgrader_2_20_0_21896.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(PERFILE_FLAGS_0) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+$(OBJDIR)/core_upgrader_2_20_1_21978.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.1.21978/core_upgrader_2_20_1_21978.cpp
+	@echo "$(notdir $<)"
+	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(PERFILE_FLAGS_0) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/core_upgrader_2_3_0_59136.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.3.0.59136/core_upgrader_2_3_0_59136.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(PERFILE_FLAGS_0) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
diff --git a/projects/UnityStore_linux/PK-UpgraderLib.make b/projects/UnityStore_linux/PK-UpgraderLib.make
index a4802b4b..2469b2f2 100644
--- a/projects/UnityStore_linux/PK-UpgraderLib.make
+++ b/projects/UnityStore_linux/PK-UpgraderLib.make
@@ -223,6 +223,7 @@ GENERATED += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+GENERATED += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 GENERATED += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -561,6 +562,7 @@ OBJECTS += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+OBJECTS += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -1069,6 +1071,9 @@ $(OBJDIR)/core_upgrader_2_20_0_21121.o: ../../ExternalLibs/pk_upgraderlib/src/Up
 $(OBJDIR)/core_upgrader_2_20_0_21896.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.0.21896/core_upgrader_2_20_0_21896.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+$(OBJDIR)/core_upgrader_2_20_1_21978.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.1.21978/core_upgrader_2_20_1_21978.cpp
+	@echo "$(notdir $<)"
+	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/core_upgrader_2_3_0_59136.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.3.0.59136/core_upgrader_2_3_0_59136.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
diff --git a/projects/UnityStore_macosx/PK-UpgraderLib.make b/projects/UnityStore_macosx/PK-UpgraderLib.make
index 6fed1feb..3fea40b0 100644
--- a/projects/UnityStore_macosx/PK-UpgraderLib.make
+++ b/projects/UnityStore_macosx/PK-UpgraderLib.make
@@ -164,6 +164,7 @@ GENERATED += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 GENERATED += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+GENERATED += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 GENERATED += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 GENERATED += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -502,6 +503,7 @@ OBJECTS += $(OBJDIR)/core_upgrader_2_1_0_53244.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_20910.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21121.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_20_0_21896.o
+OBJECTS += $(OBJDIR)/core_upgrader_2_20_1_21978.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_2_0_56591.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59136.o
 OBJECTS += $(OBJDIR)/core_upgrader_2_3_0_59175.o
@@ -1010,6 +1012,9 @@ $(OBJDIR)/core_upgrader_2_20_0_21121.o: ../../ExternalLibs/pk_upgraderlib/src/Up
 $(OBJDIR)/core_upgrader_2_20_0_21896.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.0.21896/core_upgrader_2_20_0_21896.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+$(OBJDIR)/core_upgrader_2_20_1_21978.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.20.1.21978/core_upgrader_2_20_1_21978.cpp
+	@echo "$(notdir $<)"
+	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
 $(OBJDIR)/core_upgrader_2_3_0_59136.o: ../../ExternalLibs/pk_upgraderlib/src/Upgrades/Data/2.3.0.59136/core_upgrader_2_3_0_59136.cpp
 	@echo "$(notdir $<)"
 	$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
diff --git a/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj b/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj
index 27397fdb..46b7d68c 100644
--- a/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj
+++ b/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj
@@ -919,6 +919,14 @@
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Samplers_pkfx_2_20_0_21896.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Trails_pkfx_2_20_0_21896.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Utils_pkfx_2_20_0_21896.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Billboard_AnimatedMasked_pkma_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Interface_Default_pkri_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Mesh_AnimatedMasked_pkma_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Ribbon_AnimatedMasked_pkma_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureAlphaMasks_h_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureDithering_h_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureEmissive_h_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Templates_Core_pkfx_2_20_1_21978.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Editor_Templates_Basic_pkfx_2_3_0_59136.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Editor_Templates_FX_Simple_pkfx_2_3_0_59136.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Library_PopcornFXCore_Materials_Default_Billboard_pkma_2_3_0_59136.h" />
@@ -1245,6 +1253,7 @@
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.20910\core_upgrader_2_20_0_20910.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21121\core_upgrader_2_20_0_21121.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\core_upgrader_2_20_0_21896.cpp" />
+    <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\core_upgrader_2_20_1_21978.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\core_upgrader_2_3_0_59136.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59175\core_upgrader_2_3_0_59175.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59344\core_upgrader_2_3_0_59344.cpp" />
diff --git a/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj.filters b/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj.filters
index 0e343ca0..13bb1484 100644
--- a/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj.filters
+++ b/projects/UnityStore_vs2019/PK-UpgraderLib.android.vcxproj.filters
@@ -166,6 +166,9 @@
     <Filter Include="Sources\Upgrades\Data\2.20.0.21896">
       <UniqueIdentifier>{A3105B77-8F4C-5EE1-F85E-76D8E4B906FC}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Sources\Upgrades\Data\2.20.1.21978">
+      <UniqueIdentifier>{655155C4-518D-582E-BA9F-7025A6FA0049}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Sources\Upgrades\Data\2.3.0.59136">
       <UniqueIdentifier>{D2A7990E-3E16-EF8D-87FF-A98DF3ACE429}</UniqueIdentifier>
     </Filter>
@@ -2064,6 +2067,30 @@
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Utils_pkfx_2_20_0_21896.h">
       <Filter>Sources\Upgrades\Data\2.20.0.21896</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Billboard_AnimatedMasked_pkma_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Interface_Default_pkri_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Mesh_AnimatedMasked_pkma_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Ribbon_AnimatedMasked_pkma_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureAlphaMasks_h_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureDithering_h_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureEmissive_h_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Templates_Core_pkfx_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Editor_Templates_Basic_pkfx_2_3_0_59136.h">
       <Filter>Sources\Upgrades\Data\2.3.0.59136</Filter>
     </ClInclude>
@@ -3038,6 +3065,9 @@
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\core_upgrader_2_20_0_21896.cpp">
       <Filter>Sources\Upgrades\Data\2.20.0.21896</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\core_upgrader_2_20_1_21978.cpp">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\core_upgrader_2_3_0_59136.cpp">
       <Filter>Sources\Upgrades\Data\2.3.0.59136</Filter>
     </ClCompile>
diff --git a/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj b/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj
index f7230a08..7a933898 100644
--- a/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj
+++ b/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj
@@ -1057,6 +1057,14 @@
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Samplers_pkfx_2_20_0_21896.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Trails_pkfx_2_20_0_21896.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Utils_pkfx_2_20_0_21896.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Billboard_AnimatedMasked_pkma_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Interface_Default_pkri_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Mesh_AnimatedMasked_pkma_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Ribbon_AnimatedMasked_pkma_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureAlphaMasks_h_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureDithering_h_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureEmissive_h_2_20_1_21978.h" />
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Templates_Core_pkfx_2_20_1_21978.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Editor_Templates_Basic_pkfx_2_3_0_59136.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Editor_Templates_FX_Simple_pkfx_2_3_0_59136.h" />
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Library_PopcornFXCore_Materials_Default_Billboard_pkma_2_3_0_59136.h" />
@@ -1383,6 +1391,7 @@
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.20910\core_upgrader_2_20_0_20910.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21121\core_upgrader_2_20_0_21121.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\core_upgrader_2_20_0_21896.cpp" />
+    <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\core_upgrader_2_20_1_21978.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\core_upgrader_2_3_0_59136.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59175\core_upgrader_2_3_0_59175.cpp" />
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59344\core_upgrader_2_3_0_59344.cpp" />
diff --git a/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj.filters b/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj.filters
index 0e343ca0..13bb1484 100644
--- a/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj.filters
+++ b/projects/UnityStore_vs2019/PK-UpgraderLib.vcxproj.filters
@@ -166,6 +166,9 @@
     <Filter Include="Sources\Upgrades\Data\2.20.0.21896">
       <UniqueIdentifier>{A3105B77-8F4C-5EE1-F85E-76D8E4B906FC}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Sources\Upgrades\Data\2.20.1.21978">
+      <UniqueIdentifier>{655155C4-518D-582E-BA9F-7025A6FA0049}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Sources\Upgrades\Data\2.3.0.59136">
       <UniqueIdentifier>{D2A7990E-3E16-EF8D-87FF-A98DF3ACE429}</UniqueIdentifier>
     </Filter>
@@ -2064,6 +2067,30 @@
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\Library_PopcornFXCore_Templates_Utils_pkfx_2_20_0_21896.h">
       <Filter>Sources\Upgrades\Data\2.20.0.21896</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Billboard_AnimatedMasked_pkma_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Interface_Default_pkri_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Mesh_AnimatedMasked_pkma_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Materials_Ribbon_AnimatedMasked_pkma_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureAlphaMasks_h_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureDithering_h_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Shaders_includes_FeatureEmissive_h_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\Library_PopcornFXCore_Templates_Core_pkfx_2_20_1_21978.h">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\Editor_Templates_Basic_pkfx_2_3_0_59136.h">
       <Filter>Sources\Upgrades\Data\2.3.0.59136</Filter>
     </ClInclude>
@@ -3038,6 +3065,9 @@
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.0.21896\core_upgrader_2_20_0_21896.cpp">
       <Filter>Sources\Upgrades\Data\2.20.0.21896</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.20.1.21978\core_upgrader_2_20_1_21978.cpp">
+      <Filter>Sources\Upgrades\Data\2.20.1.21978</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\ExternalLibs\pk_upgraderlib\src\Upgrades\Data\2.3.0.59136\core_upgrader_2_3_0_59136.cpp">
       <Filter>Sources\Upgrades\Data\2.3.0.59136</Filter>
     </ClCompile>