diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/project.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/project.meta
new file mode 100644
index 0000000..3f2cd9d
--- /dev/null
+++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/project.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1fa36039328c18e48808faaf6a351f48
+folderAsset: yes
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset
index 336425d..6231801 100644
Binary files a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset and b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset differ
diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenSetup.cs b/_DOTween.Assembly/DOTweenEditor/DOTweenSetup.cs
index 123b83c..865739a 100644
--- a/_DOTween.Assembly/DOTweenEditor/DOTweenSetup.cs
+++ b/_DOTween.Assembly/DOTweenEditor/DOTweenSetup.cs
@@ -44,6 +44,12 @@ namespace DG.DOTweenEditor
             EditorUtils.RemoveGlobalDefine(GlobalDefine_TextMeshPro);
         }
 
+        // Removes all legacy defines
+        public static void RemoveAllLegacyDefines()
+        {
+            EditorUtils.RemoveGlobalDefine(GlobalDefine_Legacy_NoRigidbody);
+        }
+
         // Adds all Unity Modules defines but not the ones for external assets
         public static void AddAllUnityDefines()
         {
diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs b/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs
index b05291e..f10304f 100644
--- a/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs
+++ b/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs
@@ -30,6 +30,7 @@ namespace DG.DOTweenEditor
                 break;
             }
             if (!containsDOTween) return AssetDeleteResult.DidNotDelete;
+            Debug.Log("::: DOTween deleted");
             // DOTween is being deleted: deal with it
             // Remove EditorPrefs
             EditorPrefs.DeleteKey(Application.dataPath + DOTweenUtilityWindow.Id);
@@ -53,21 +54,24 @@ namespace DG.DOTweenEditor
 
         static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
         {
+            Debug.Log("::::::::::::::::::::: OnPostprocessAllAssets :::::::::::::::::::::::::::::");
             if (_setupDialogRequested) return;
 
             string[] dotweenEntries = System.Array.FindAll(importedAssets, name => name.Contains("DOTween") && !name.EndsWith(".meta") && !name.EndsWith(".jpg") && !name.EndsWith(".png"));
             bool dotweenImported = dotweenEntries.Length > 0;
+            Debug.Log("::: DOTween imported: " + dotweenImported);
             if (dotweenImported) {
                 // Delete old DOTween files
                 EditorUtils.DeleteLegacyNoModulesDOTweenFiles();
                 // Delete old DemiLib configuration
                 EditorUtils.DeleteOldDemiLibCore();
-                // Remove old NoRigidbody define
-                EditorUtils.RemoveGlobalDefine(DOTweenSetup.GlobalDefine_Legacy_NoRigidbody);
+                // Remove old legacy defines
+                DOTweenSetup.RemoveAllLegacyDefines();
                 //
                 bool differentCoreVersion = EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.Id) != Application.dataPath + DOTween.Version;
                 bool differentProVersion = EditorUtils.hasPro && EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.IdPro) != Application.dataPath + EditorUtils.proVersion;
                 bool setupRequired = differentCoreVersion || differentProVersion;
+                Debug.Log("::: Setup required: " + setupRequired + " - " + differentCoreVersion + "/" + differentProVersion);
                 if (setupRequired) {
                     _setupDialogRequested = true;
                     EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.Id, Application.dataPath + DOTween.Version);
diff --git a/_DOTween.Assembly/PostBuild_DOTween.bat b/_DOTween.Assembly/PostBuild_DOTween.bat
index 4a6b0b3..0f33186 100644
--- a/_DOTween.Assembly/PostBuild_DOTween.bat
+++ b/_DOTween.Assembly/PostBuild_DOTween.bat
@@ -47,7 +47,10 @@ set CopyToDirModulesTest=%1..\ModulesTest.Unity2018\Assets\Demigiant\%5%SubDir%
 :: Modules test project
 echo ::: Exporting from %CopyFromDir% to %CopyToDirModulesTest%
 echo f | xcopy %CopyFromDir% %CopyToDirModulesTest% /Y /I /E
-:: exit /B
+:: UnityTests.Unity5
+echo ::: Exporting from %CopyFromDir% to %CopyToDirUnity5Tests%
+echo f | xcopy %CopyFromDir% %CopyToDirUnity5Tests% /Y /I /E
+exit /B
 :: bin.Global
 echo ::: Exporting from %CopyFromDir% to %CopyToDir%
 echo f | xcopy %CopyFromDir% %CopyToDir% /Y /I /E
@@ -57,9 +60,6 @@ echo f | xcopy %CopyFromDir% %CopyToDirNoMeta% /Y /I /E
 :: UnityTests.Unity4
 echo ::: Exporting from %CopyFromDir% to %CopyToDirUnityTests%
 echo f | xcopy %CopyFromDir% %CopyToDirUnityTests% /Y /I /E
-:: UnityTests.Unity5
-echo ::: Exporting from %CopyFromDir% to %CopyToDirUnity5Tests%
-echo f | xcopy %CopyFromDir% %CopyToDirUnity5Tests% /Y /I /E
 :: UnityCompatibilityTests.Unity35
 echo ::: Exporting from %CopyFromDir% to %CopyToDirCompatibilityTests%
 echo f | xcopy %CopyFromDir% %CopyToDirCompatibilityTests% /Y /I /E