diff --git a/.gitignore b/.gitignore
index 6bab57fed..bf7e7e748 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,6 @@ Assets/StreamingAssets/crashlytics-build.properties
 # Manually appended
 #
 .idea/
+Assets/Private/
+Assets/Private.meta
 
diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef b/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef
index e07e9f2cf..7e9613aba 100644
--- a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef
+++ b/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef
@@ -1,10 +1,8 @@
 {
     "name": "MeshUtility.Editor",
     "references": [
-        "MeshUtility",
-        "ShaderProperty.Runtime"
+        "MeshUtility"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -13,5 +11,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
\ No newline at end of file
diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef b/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef
index 43d291b89..a7b8ef0e7 100644
--- a/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef
+++ b/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef
@@ -1,15 +1,13 @@
 {
     "name": "MeshUtility",
-    "references": [
-        "UniUnlit",
-        "ShaderProperty.Runtime"
-    ],
-    "optionalUnityReferences": [],
+    "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
\ No newline at end of file
diff --git a/Assets/VRM/Editor/VRM.Editor.asmdef b/Assets/VRM/Editor/VRM.Editor.asmdef
index 07a1a0ec1..d8f4af362 100644
--- a/Assets/VRM/Editor/VRM.Editor.asmdef
+++ b/Assets/VRM/Editor/VRM.Editor.asmdef
@@ -5,7 +5,6 @@
         "UniHumanoid",
         "MeshUtility",
         "MeshUtility.Editor",
-        "UniUnlit",
         "VRMShaders.GLTF.IO.Runtime",
         "VRMShaders.GLTF.IO.Editor",
         "UniGLTF",
diff --git a/Assets/VRM/Runtime/VRM.asmdef b/Assets/VRM/Runtime/VRM.asmdef
index d48d35e2b..828486611 100644
--- a/Assets/VRM/Runtime/VRM.asmdef
+++ b/Assets/VRM/Runtime/VRM.asmdef
@@ -1,13 +1,12 @@
 {
     "name": "VRM",
     "references": [
-        "MToon",
         "UniHumanoid",
         "MeshUtility",
         "UniGLTF",
         "VRMShaders.GLTF.IO.Runtime",
-        "UniUnlit",
-        "VRMShaders.VRM.IO.Runtime"
+        "VRMShaders.VRM.IO.Runtime",
+        "MToon"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/VRM10/Runtime/VRM10.asmdef b/Assets/VRM10/Runtime/VRM10.asmdef
index da10c463f..e83e938f4 100644
--- a/Assets/VRM10/Runtime/VRM10.asmdef
+++ b/Assets/VRM10/Runtime/VRM10.asmdef
@@ -2,7 +2,6 @@
     "name": "VRM10",
     "references": [
         "VrmLib",
-        "UniUnlit",
         "MToon",
         "MeshUtility",
         "MeshUtility.Editor",
diff --git a/Assets/VRM10/Tests/VRM10.Tests.asmdef b/Assets/VRM10/Tests/VRM10.Tests.asmdef
index 911a1bedb..de5b82d71 100644
--- a/Assets/VRM10/Tests/VRM10.Tests.asmdef
+++ b/Assets/VRM10/Tests/VRM10.Tests.asmdef
@@ -2,12 +2,10 @@
     "name": "VRM10.Tests",
     "references": [
         "VrmLib",
-        "ShaderProperty.Runtime",
         "VRM10",
-        "UniGLTF"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "UniGLTF",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
     ],
     "includePlatforms": [
         "Editor"
@@ -15,9 +13,14 @@
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [],
-    "autoReferenced": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
     "defineConstraints": [
+        "UNITY_INCLUDE_TESTS",
         "UNITY_INCLUDE_TESTS"
-    ]
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
\ No newline at end of file
diff --git a/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants b/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants
new file mode 100644
index 000000000..8255b2c68
--- /dev/null
+++ b/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VRM10Shaders
+  m_Shaders:
+  - first: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants: []
+  - first: {fileID: 4800000, guid: 1a97144e4ad27a04aafd70f7b915cedb, type: 3}
+    second:
+      variants: []
+  - first: {fileID: 4800000, guid: 8c17b56f4bf084c47872edcb95237e4a, type: 3}
+    second:
+      variants: []
diff --git a/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants.meta b/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants.meta
new file mode 100644
index 000000000..d725f5ce2
--- /dev/null
+++ b/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58f01bf8180084642a5f4c17a3c8cd4b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: