diff --git a/README.md b/README.md
index c175c365..920eac7c 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.19.2`
+* **Version:** `v2.19.3`
 * **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 1f905350..6acb9590 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.19.2`
+* **Version:** `v2.19.3`
 * **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 c175c365..920eac7c 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.19.2`
+* **Version:** `v2.19.3`
 * **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 5d2484dc..8fdbd556 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.19.2",
+  "version": "2.19.3",
   "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.19.2"
+    "com.persistant-studios.popcornfx": "2.19.3"
   }
 }
diff --git a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md
index 72f09a32..03623ad7 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.19.2`
+* **Version:** `v2.19.3`
 * **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 c175c365..920eac7c 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.19.2`
+* **Version:** `v2.19.3`
 * **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 08d77e7c..de07faf8 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.19.2",
+  "version": "2.19.3",
   "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.19.2"
+    "com.persistant-studios.popcornfx": "2.19.3"
   }
 }
diff --git a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md
index 72f09a32..03623ad7 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.19.2`
+* **Version:** `v2.19.3`
 * **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/PKFxMenus.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
index 864b814d..74370c65 100644
--- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
+++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
@@ -580,6 +580,7 @@ static void _DeleteUnusedPKFxFXMaterials(MenuCommand menuCommand)
 					deleteCount++;
 				}
 			}
+			AssetDatabase.SaveAssets();
 			Debug.Log("[PopcornFX] " + deleteCount + " unused PKFx material deleted.");
 		}
 
diff --git a/com.persistant-studios.popcornfx/README.md b/com.persistant-studios.popcornfx/README.md
index c175c365..920eac7c 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.19.2`
+* **Version:** `v2.19.3`
 * **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 8e381204..ac63b95d 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: 4eabcbf13b6141cf892074f4078ec997
+guid: b971256d048349dca917576f3062ecfd
 
 folderAsset: yes
 DefaultImporter:
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta
index a808419a..5709e0f3 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: 851139e510cd4df5870ea242bc8fcf6f
+guid: edad621b48e440e98eeb29571020da6f
 
 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 bad0362e..006e8b04 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:328fbcb7dcc25b90cb431fe3c1b732f98fe6160d773ab0b3dc6954c34e7713ec
-size 176653904
+oid sha256:c830350aa3c481a57ce35002ae93974aa8ec8854466a8898d1338fe0963704d6
+size 176655004
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 7c06d4ef..654b6587 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: 6bc219ad129049f58bcb6accb753400f
+guid: 23016b6e78594403b8bb0e91a2c79b60
 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 cd0c5c38..d230536a 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: f784792df4bd4e7696751433c9290ca5
+guid: 58865b5247334f7986e8344d9a01ff23
 
 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 47db288e..a1a108e4 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:98d9861fd1c35dca274c4f55d3ae4906411ec8e557e7a19166e43849f57eecea
-size 138229072
+oid sha256:b2a64ce416136d4fafadee09b6fdc5598197b8c9daac6a7f8f6e1763e7c79657
+size 138217432
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 63712e8d..22937db0 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: 4672d23849234a398864eea4fc31db61
+guid: 9dc044329d324b728be84177bd7f2967
 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 804e0b28..7d82ddd7 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: 5c5279ccf7b84bb49d223bdd641326a5
+guid: 51ccd40f2f40411f9ec9d92467cea0ee
 
 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 5b677344..bff36423 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:5b9eef845a388ba814149ebe301f1650ced2a7d134231c873f8667382f933344
-size 69106353
+oid sha256:a4bb92cd14bb42791bef2d248da39a4b9caa68b02b92f887b73a4359d4e7a611
+size 69129841
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 4dfa7886..5f389abf 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: 45d6f4efb23c4b4badfc5c97a847dcb6
+guid: 4ee81388ac1a422482db1e7f07ff4975
 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 bb9cdfb1..9c43e7f2 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: 1deb361771bd4ae795bdd6ba07fe9b24
+guid: 0c94873ab5ca4f7dbea16e412f137a57
 
 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 34888110..6f0d2f19 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: ddf954209f6243feb9433f5fa9401987
+guid: 8d991ec744c04218b5bac07acb2d9750
 
 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 e994fad5..2ebf069f 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:d9096634c6640d93307105b7812ae90d9ebcbc7de585e55927d8f4924a39d761
-size 185027992
+oid sha256:6317fd28bab498955fc6a9f92cab921fb4c292be7e0419564f1797e412869a6a
+size 185032432
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 62bb959e..9ca9a557 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: 0e11fdf8937d470185c6d9c8c508077d
+guid: e024472c5a46452b803e851f271563c6
 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 a19ebf9b..7cbaf631 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: 5890db20b9b14b9f839518497860f3bc
+guid: 281833c626624e81ad292ab469cfb2f4
 
 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 d0e82bef..5fe19b0d 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:5b12aa5a512ee87422c2dfb7be386d817795c5c0427c7aa5c2c7a854101c0ee3
-size 4831744
+oid sha256:1284180eb2e66c0f46df6ae4b8d41cbcd619227313b439109b240a2edb604e9d
+size 4839424
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 e398dff8..f9af5742 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: c3ad384ead194b19aa543d70e0bc6700
+guid: 9026968d36c345508318a65ee15d4f6b
 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 5a06dfce..edeb97ff 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: 3d5d242f8e1b4c9199d48f17a967377e
+guid: 113c5f2009f34327a1fb617bfd5001b7
 
 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 f95af058..56890777 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:d731ce3907b554fa01facf13e77eef94128dffa457a5ace9cbd0f0c96c13050b
-size 24184320
+oid sha256:d2bc8d20253f3101fae583e7880959284221b5b5f3be51e6073d47ffdbf31156
+size 24189440
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 2f619bed..670f3592 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: bfaa011c34d042af9ddc273b6c64b798
+guid: 3bf6ed75121c4b0393b672a50b485c70
 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 cc3362ae..4a83f39d 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:35727228839cc2b772312fa3015b9c84b3f364d53f20b6cb09afac4aef7a8896
-size 21842888
+oid sha256:ef0141bfb5afe36f5bb1ae9fcb9227d4a6a7d17760e876e3eaed929a2f6082d2
+size 21855176
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 27b4dd2b..b44e816f 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: c6fa53002b8d4a39957fc6845c23de8b
+guid: 1ce583eab9b84fd48c136750cec15dd6
 PluginImporter:
   serializedVersion: 2
   isPreloaded: 0
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
index 309d5de2..eb1a2b13 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
@@ -377,7 +377,7 @@ internal partial class PKFxManagerImpl : object
 		//----------------------------------------------------------------------------
 
 		private const string m_UnityVersion = "Unity 2019.4 and up";
-		public const string m_PluginVersion = "2.19.2 for " + m_UnityVersion;
+		public const string m_PluginVersion = "2.19.3 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/PKFxAssets/PKFxAssetCreationUtils.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxAssetCreationUtils.cs
index 8317c241..26d13415 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxAssetCreationUtils.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxAssetCreationUtils.cs
@@ -390,6 +390,7 @@ private static void ApplyPKImportSetting(PKFxEffectAsset.DependencyDesc dependen
 				ModelImporter modelImporter = assetImporter as ModelImporter;
 
 				modelImporter.isReadable = true;
+				modelImporter.sortHierarchyByName = false;
 				modelImporter.bakeAxisConversion = true;
 				modelImporter.SaveAndReimport();
 			}
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
index 15ad79f6..ed4a1352 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
@@ -401,7 +401,10 @@ public void AddRenderer(ERendererType type, SPopcornRendererDesc renderer, int i
 				mat = curMat.m_CustomMaterial;
 			}
 			else
+			{
 				mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(batch, this, false, false, false);
+				AssetDatabase.SaveAssets();
+			}
 
 			if (mat == null)
 			{
@@ -432,7 +435,10 @@ public void AddRenderer(ERendererType type, SMeshRendererDesc renderer, int idx)
 				mat = curMat.m_CustomMaterial;
 			}
 			else
+			{
 				mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(batch, this, false, false, false);
+				AssetDatabase.SaveAssets();
+			}
 
 			if (mat == null)
 			{
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
index de6d52ba..4efe6ef8 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
@@ -232,7 +232,6 @@ public Material EditorResolveMaterial(SBatchDesc batchDesc, PKFxEffectAsset asse
 				binding.SetMaterialKeywords(batchDesc, material);
 				binding.BindMaterialProperties(batchDesc, material, asset, logError);
 			}
-			AssetDatabase.SaveAssets();
 			return material;
 		}
 #endif
diff --git a/com.persistant-studios.popcornfx/package.json b/com.persistant-studios.popcornfx/package.json
index c804b786..a66fa928 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.19.2",
+  "version": "2.19.3",
   "unity": "2019.3",
   "displayName": "PopcornFX"
 }
diff --git a/download_3rd_party.bat b/download_3rd_party.bat
index 2f5c851b..5e9f6f60 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.19.2-20896_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.19.3-21095_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 0b0a1b40..d19e5a9c 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.19.2-20896_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.19.3-21095_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-RHI_SDK1.make b/projects/UnityStore_android/PK-RHI_SDK1.make
index 231a7bd4..4048a391 100644
--- a/projects/UnityStore_android/PK-RHI_SDK1.make
+++ b/projects/UnityStore_android/PK-RHI_SDK1.make
@@ -171,7 +171,7 @@ OBJECTS += $(OBJDIR)/glew.o
 all: $(TARGET)
 	@:
 
-$(TARGET): $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
+$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
 	$(PRELINKCMDS)
 	@echo Linking PK-RHI_SDK1
 	$(SILENT) $(LINKCMD)
diff --git a/projects/UnityStore_ios/PK-Discretizers_SDK1.make b/projects/UnityStore_ios/PK-Discretizers_SDK1.make
index 15e7cc03..ac7ef828 100644
--- a/projects/UnityStore_ios/PK-Discretizers_SDK1.make
+++ b/projects/UnityStore_ios/PK-Discretizers_SDK1.make
@@ -1,7 +1,7 @@
 # Alternative GNU Make project makefile autogenerated by Premake
 
 ifndef config
-  config=debug_ios
+  config=debug_ios64
 endif
 
 ifndef verbose
@@ -18,6 +18,15 @@ endif
 # Configurations
 # #############################################
 
+ifeq ($(origin CC), default)
+  CC = xcrun --sdk iphoneos clang -arch arm64
+endif
+ifeq ($(origin CXX), default)
+  CXX = xcrun --sdk iphoneos clang++ -arch arm64
+endif
+ifeq ($(origin AR), default)
+  AR = xcrun --sdk iphoneos ar
+endif
 PCH = ../../ExternalLibs/Runtime/pk_discretizers/dc_precompiled.h
 PCH_PLACEHOLDER = $(OBJDIR)/$(notdir $(PCH))
 GCH = $(PCH_PLACEHOLDER).gch
@@ -39,33 +48,7 @@ endef
 define POSTBUILDCMDS
 endef
 
-ifeq ($(config),debug_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-Discretizers_d.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Debug/PK-Discretizers_SDK1
-DEFINES += -D_DEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-
-else ifeq ($(config),debug_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
+ifeq ($(config),debug_ios64)
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-Discretizers_d.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Debug/PK-Discretizers_SDK1
@@ -73,33 +56,7 @@ DEFINES += -D_DEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),release_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-Discretizers_r.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Release/PK-Discretizers_SDK1
-DEFINES += -DNDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),release_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-Discretizers_r.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Release/PK-Discretizers_SDK1
@@ -107,33 +64,7 @@ DEFINES += -DNDEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),retail_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-Discretizers_s.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Retail/PK-Discretizers_SDK1
-DEFINES += -DNDEBUG -DPK_RETAIL
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),retail_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-Discretizers_s.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Retail/PK-Discretizers_SDK1
diff --git a/projects/UnityStore_ios/PK-ParticlesToolbox_SDK1.make b/projects/UnityStore_ios/PK-ParticlesToolbox_SDK1.make
index cfd4ff93..1f21cbd1 100644
--- a/projects/UnityStore_ios/PK-ParticlesToolbox_SDK1.make
+++ b/projects/UnityStore_ios/PK-ParticlesToolbox_SDK1.make
@@ -1,7 +1,7 @@
 # Alternative GNU Make project makefile autogenerated by Premake
 
 ifndef config
-  config=debug_ios
+  config=debug_ios64
 endif
 
 ifndef verbose
@@ -18,6 +18,15 @@ endif
 # Configurations
 # #############################################
 
+ifeq ($(origin CC), default)
+  CC = xcrun --sdk iphoneos clang -arch arm64
+endif
+ifeq ($(origin CXX), default)
+  CXX = xcrun --sdk iphoneos clang++ -arch arm64
+endif
+ifeq ($(origin AR), default)
+  AR = xcrun --sdk iphoneos ar
+endif
 PCH = ../../ExternalLibs/Runtime/pk_particles_toolbox/pt_precompiled.h
 PCH_PLACEHOLDER = $(OBJDIR)/$(notdir $(PCH))
 GCH = $(PCH_PLACEHOLDER).gch
@@ -39,33 +48,7 @@ endef
 define POSTBUILDCMDS
 endef
 
-ifeq ($(config),debug_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_d.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Debug/PK-ParticlesToolbox_SDK1
-DEFINES += -D_DEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-
-else ifeq ($(config),debug_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
+ifeq ($(config),debug_ios64)
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_d.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Debug/PK-ParticlesToolbox_SDK1
@@ -73,33 +56,7 @@ DEFINES += -D_DEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),release_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_r.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Release/PK-ParticlesToolbox_SDK1
-DEFINES += -DNDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),release_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_r.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Release/PK-ParticlesToolbox_SDK1
@@ -107,33 +64,7 @@ DEFINES += -DNDEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),retail_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_s.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Retail/PK-ParticlesToolbox_SDK1
-DEFINES += -DNDEBUG -DPK_RETAIL
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),retail_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_s.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Retail/PK-ParticlesToolbox_SDK1
diff --git a/projects/UnityStore_ios/PK-RHI_SDK1.make b/projects/UnityStore_ios/PK-RHI_SDK1.make
index 6933a5c2..f55aed1f 100644
--- a/projects/UnityStore_ios/PK-RHI_SDK1.make
+++ b/projects/UnityStore_ios/PK-RHI_SDK1.make
@@ -1,7 +1,7 @@
 # Alternative GNU Make project makefile autogenerated by Premake
 
 ifndef config
-  config=debug_ios
+  config=debug_ios64
 endif
 
 ifndef verbose
@@ -18,6 +18,15 @@ endif
 # Configurations
 # #############################################
 
+ifeq ($(origin CC), default)
+  CC = xcrun --sdk iphoneos clang -arch arm64
+endif
+ifeq ($(origin CXX), default)
+  CXX = xcrun --sdk iphoneos clang++ -arch arm64
+endif
+ifeq ($(origin AR), default)
+  AR = xcrun --sdk iphoneos ar
+endif
 PCH = ../../ExternalLibs/Runtime/pk_rhi/src/precompiled/rhi_precompiled.h
 PCH_PLACEHOLDER = $(OBJDIR)/$(notdir $(PCH))
 GCH = $(PCH_PLACEHOLDER).gch
@@ -39,33 +48,7 @@ endef
 define POSTBUILDCMDS
 endef
 
-ifeq ($(config),debug_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-RHI_d.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Debug/PK-RHI_SDK1
-DEFINES += -D_DEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-
-else ifeq ($(config),debug_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
+ifeq ($(config),debug_ios64)
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-RHI_d.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Debug/PK-RHI_SDK1
@@ -73,33 +56,7 @@ DEFINES += -D_DEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),release_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-RHI_r.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Release/PK-RHI_SDK1
-DEFINES += -DNDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),release_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-RHI_r.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Release/PK-RHI_SDK1
@@ -107,33 +64,7 @@ DEFINES += -DNDEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),retail_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-RHI_s.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Retail/PK-RHI_SDK1
-DEFINES += -DNDEBUG -DPK_RETAIL
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),retail_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-RHI_s.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Retail/PK-RHI_SDK1
diff --git a/projects/UnityStore_ios/PK-RenderHelpers_SDK1.make b/projects/UnityStore_ios/PK-RenderHelpers_SDK1.make
index bdb7af54..dbe23edf 100644
--- a/projects/UnityStore_ios/PK-RenderHelpers_SDK1.make
+++ b/projects/UnityStore_ios/PK-RenderHelpers_SDK1.make
@@ -1,7 +1,7 @@
 # Alternative GNU Make project makefile autogenerated by Premake
 
 ifndef config
-  config=debug_ios
+  config=debug_ios64
 endif
 
 ifndef verbose
@@ -18,6 +18,15 @@ endif
 # Configurations
 # #############################################
 
+ifeq ($(origin CC), default)
+  CC = xcrun --sdk iphoneos clang -arch arm64
+endif
+ifeq ($(origin CXX), default)
+  CXX = xcrun --sdk iphoneos clang++ -arch arm64
+endif
+ifeq ($(origin AR), default)
+  AR = xcrun --sdk iphoneos ar
+endif
 PCH = ../../ExternalLibs/Runtime/pk_render_helpers/src/precompiled/rh_precompiled.h
 PCH_PLACEHOLDER = $(OBJDIR)/$(notdir $(PCH))
 GCH = $(PCH_PLACEHOLDER).gch
@@ -39,33 +48,7 @@ endef
 define POSTBUILDCMDS
 endef
 
-ifeq ($(config),debug_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-RenderHelpers_d.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Debug/PK-RenderHelpers_SDK1
-DEFINES += -D_DEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-
-else ifeq ($(config),debug_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
+ifeq ($(config),debug_ios64)
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_d.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Debug/PK-RenderHelpers_SDK1
@@ -73,33 +56,7 @@ DEFINES += -D_DEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),release_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-RenderHelpers_r.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Release/PK-RenderHelpers_SDK1
-DEFINES += -DNDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),release_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_r.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Release/PK-RenderHelpers_SDK1
@@ -107,33 +64,7 @@ DEFINES += -DNDEBUG
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),retail_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-RenderHelpers_s.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Retail/PK-RenderHelpers_SDK1
-DEFINES += -DNDEBUG -DPK_RETAIL
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),retail_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_s.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Retail/PK-RenderHelpers_SDK1
diff --git a/projects/UnityStore_ios/PK-Runtime_SDK1.make b/projects/UnityStore_ios/PK-Runtime_SDK1.make
index adb8bb89..4d044f29 100644
--- a/projects/UnityStore_ios/PK-Runtime_SDK1.make
+++ b/projects/UnityStore_ios/PK-Runtime_SDK1.make
@@ -1,7 +1,7 @@
 # Alternative GNU Make project makefile autogenerated by Premake
 
 ifndef config
-  config=debug_ios
+  config=debug_ios64
 endif
 
 ifndef verbose
@@ -18,6 +18,15 @@ endif
 # Configurations
 # #############################################
 
+ifeq ($(origin CC), default)
+  CC = xcrun --sdk iphoneos clang -arch arm64
+endif
+ifeq ($(origin CXX), default)
+  CXX = xcrun --sdk iphoneos clang++ -arch arm64
+endif
+ifeq ($(origin AR), default)
+  AR = xcrun --sdk iphoneos ar
+endif
 FORCE_INCLUDE += -include pk_compiler_warnings.h
 ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
@@ -35,34 +44,7 @@ endef
 define POSTBUILDCMDS
 endef
 
-ifeq ($(config),debug_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-Runtime_d.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Debug/PK-Runtime_SDK1
-DEFINES += -D_DEBUG
-INCLUDES += -I../../ExternalLibs/Runtime -I../../ExternalLibs/Runtime/include -I../../ExternalLibs/Runtime/include/license/UnityStore -I../../ExternalLibs/Runtime/pk_maths/src -I../../ExternalLibs/Runtime/pk_maths -I../../ExternalLibs/Runtime/pk_toolkit -I../../ExternalLibs/Runtime/pk_toolkit/src/include -I../../ExternalLibs/Runtime/pk_kernel -I../../ExternalLibs/Runtime/pk_imaging -I../../ExternalLibs/Runtime/pk_base_object/src -I../../ExternalLibs/Runtime/pk_base_object/src/precompiled -I../../ExternalLibs/Runtime/pk_compiler/src -I../../ExternalLibs/Runtime/pk_compiler/src/precompiled -I../../ExternalLibs/Runtime/pk_engine_utils/src/precompiled -I../../ExternalLibs/Runtime/pk_geometrics -I../../ExternalLibs/Runtime/pk_particles/src -I../intermediate/UnityStore/GM/ios/Debug/PK-Runtime_SDK1
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
-
-else ifeq ($(config),debug_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
+ifeq ($(config),debug_ios64)
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-Runtime_d.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Debug/PK-Runtime_SDK1
@@ -71,34 +53,7 @@ INCLUDES += -I../../ExternalLibs/Runtime -I../../ExternalLibs/Runtime/include -I
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O2 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -ggdb -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),release_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-Runtime_r.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Release/PK-Runtime_SDK1
-DEFINES += -DNDEBUG
-INCLUDES += -I../../ExternalLibs/Runtime -I../../ExternalLibs/Runtime/include -I../../ExternalLibs/Runtime/include/license/UnityStore -I../../ExternalLibs/Runtime/pk_maths/src -I../../ExternalLibs/Runtime/pk_maths -I../../ExternalLibs/Runtime/pk_toolkit -I../../ExternalLibs/Runtime/pk_toolkit/src/include -I../../ExternalLibs/Runtime/pk_kernel -I../../ExternalLibs/Runtime/pk_imaging -I../../ExternalLibs/Runtime/pk_base_object/src -I../../ExternalLibs/Runtime/pk_base_object/src/precompiled -I../../ExternalLibs/Runtime/pk_compiler/src -I../../ExternalLibs/Runtime/pk_compiler/src/precompiled -I../../ExternalLibs/Runtime/pk_engine_utils/src/precompiled -I../../ExternalLibs/Runtime/pk_geometrics -I../../ExternalLibs/Runtime/pk_particles/src -I../intermediate/UnityStore/GM/ios/Release/PK-Runtime_SDK1
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),release_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-Runtime_r.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Release/PK-Runtime_SDK1
@@ -107,34 +62,7 @@ INCLUDES += -I../../ExternalLibs/Runtime -I../../ExternalLibs/Runtime/include -I
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -arch arm64 -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
 
-else ifeq ($(config),retail_ios)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch armv7
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch armv7
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
-TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios
-TARGET = $(TARGETDIR)/libPK-Runtime_s.a
-OBJDIR = ../intermediate/UnityStore/GM/ios/Retail/PK-Runtime_SDK1
-DEFINES += -DNDEBUG -DPK_RETAIL
-INCLUDES += -I../../ExternalLibs/Runtime -I../../ExternalLibs/Runtime/include -I../../ExternalLibs/Runtime/include/license/UnityStore -I../../ExternalLibs/Runtime/pk_maths/src -I../../ExternalLibs/Runtime/pk_maths -I../../ExternalLibs/Runtime/pk_toolkit -I../../ExternalLibs/Runtime/pk_toolkit/src/include -I../../ExternalLibs/Runtime/pk_kernel -I../../ExternalLibs/Runtime/pk_imaging -I../../ExternalLibs/Runtime/pk_base_object/src -I../../ExternalLibs/Runtime/pk_base_object/src/precompiled -I../../ExternalLibs/Runtime/pk_compiler/src -I../../ExternalLibs/Runtime/pk_compiler/src/precompiled -I../../ExternalLibs/Runtime/pk_engine_utils/src/precompiled -I../../ExternalLibs/Runtime/pk_geometrics -I../../ExternalLibs/Runtime/pk_particles/src -I../intermediate/UnityStore/GM/ios/Retail/PK-Runtime_SDK1
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -mcpu=cortex-a8 -marm -march=armv7-a -Wshadow -Wundef -O3 -fno-strict-aliasing -pipe -isysroot `xcrun --sdk iphoneos --show-sdk-path` -Wall -Wextra -std=gnu++0x -fno-exceptions -fno-rtti -Winvalid-pch -Wno-pragma-pack -fno-math-errno -fno-trapping-math -miphoneos-version-min=8.0 -fembed-bitcode
-
 else ifeq ($(config),retail_ios64)
-ifeq ($(origin CC), default)
-  CC = xcrun --sdk iphoneos clang -arch arm64
-endif
-ifeq ($(origin CXX), default)
-  CXX = xcrun --sdk iphoneos clang++ -arch arm64
-endif
-ifeq ($(origin AR), default)
-  AR = xcrun --sdk iphoneos ar
-endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_ios64
 TARGET = $(TARGETDIR)/libPK-Runtime_s.a
 OBJDIR = ../intermediate/UnityStore/GM/ios64/Retail/PK-Runtime_SDK1
diff --git a/projects/UnityStore_linux/PK-AssetBaker.make b/projects/UnityStore_linux/PK-AssetBaker.make
index 810c27b6..f2d2a288 100644
--- a/projects/UnityStore_linux/PK-AssetBaker.make
+++ b/projects/UnityStore_linux/PK-AssetBaker.make
@@ -71,7 +71,7 @@ endif
 TARGETDIR = ../../../release/application/BinariesGM_linux_ARM64_d
 TARGET = $(TARGETDIR)/PK-AssetBaker
 OBJDIR = ../intermediate/UnityStore/GM/ARM64/Debug/PK-AssetBaker
-DEFINES += -D_DEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=0 -DUSE_FBXIMPORTER -DUSE_IMAGE_PLUGIN_HDR -DUSE_IMAGE_PLUGIN_TIFF -DUSE_IMAGE_PLUGIN_PKM -DUSE_IMAGE_PLUGIN_PVR
+DEFINES += -D_DEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=0 -DUSE_IMAGE_PLUGIN_HDR -DUSE_IMAGE_PLUGIN_TIFF -DUSE_IMAGE_PLUGIN_PKM -DUSE_IMAGE_PLUGIN_PVR
 FORCE_INCLUDE +=
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wshadow -Wundef -fno-omit-frame-pointer -fno-strict-aliasing -g -Wall -Wextra -Winvalid-pch -fno-math-errno -fno-trapping-math -ggdb -pipe -target aarch64-linux-gnu
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wshadow -Wundef -fno-omit-frame-pointer -fno-strict-aliasing -g -Wall -Wextra -std=gnu++0x -fno-exceptions -fvisibility-inlines-hidden -fno-rtti -fvisibility=hidden -Winvalid-pch -fno-math-errno -fno-trapping-math -ggdb -pipe -target aarch64-linux-gnu
@@ -118,7 +118,7 @@ endif
 TARGETDIR = ../../../release/application/BinariesGM_linux_ARM64_r
 TARGET = $(TARGETDIR)/PK-AssetBaker
 OBJDIR = ../intermediate/UnityStore/GM/ARM64/Release/PK-AssetBaker
-DEFINES += -DNDEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=0 -DUSE_FBXIMPORTER -DUSE_IMAGE_PLUGIN_HDR -DUSE_IMAGE_PLUGIN_TIFF -DUSE_IMAGE_PLUGIN_PKM -DUSE_IMAGE_PLUGIN_PVR
+DEFINES += -DNDEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=0 -DUSE_IMAGE_PLUGIN_HDR -DUSE_IMAGE_PLUGIN_TIFF -DUSE_IMAGE_PLUGIN_PKM -DUSE_IMAGE_PLUGIN_PVR
 FORCE_INCLUDE +=
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -g -Wall -Wextra -Winvalid-pch -fno-math-errno -fno-trapping-math -pipe -target aarch64-linux-gnu
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fno-strict-aliasing -g -Wall -Wextra -std=gnu++0x -fno-exceptions -fvisibility-inlines-hidden -fno-rtti -fvisibility=hidden -Winvalid-pch -fno-math-errno -fno-trapping-math -pipe -target aarch64-linux-gnu