diff --git a/kanji/05a09-Kaisho.svg b/kanji/05a09-Kaisho.svg
index 27f02ffa6..1cf47f7a4 100644
--- a/kanji/05a09-Kaisho.svg
+++ b/kanji/05a09-Kaisho.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:05a09-Kaisho-s2" kvg:type="㇒" d="M40.75,37.39c0.08,1.27,0.14,4.34-0.16,6.18C38.18,58.41,31.23,79.46,14,90.5"/>
 		<path id="kvg:05a09-Kaisho-s3" kvg:type="㇀/㇐" d="M9.5,46.92c0.77,0.81,1.8,1.4,3.86,1.2c2.22-0.21,21.97-4.18,31.14-6.24"/>
 	</g>
-	<g id="kvg:05a09-Kaisho-g2" kvg:position="right">
+	<g id="kvg:05a09-Kaisho-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:05a09-Kaisho-g3" kvg:element="由" kvg:position="top">
 			<g id="kvg:05a09-Kaisho-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:05a09-Kaisho-s4" kvg:type="㇑" d="M49.56,22.83c0.51,0.62,0.91,1.27,1.03,1.81c0.98,4.47,2.84,14.1,3.42,22.32"/>
diff --git a/kanji/05a09-KaishoVtLst.svg b/kanji/05a09-KaishoVtLst.svg
index 81e73f4ef..6f2a8fbb8 100644
--- a/kanji/05a09-KaishoVtLst.svg
+++ b/kanji/05a09-KaishoVtLst.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:05a09-KaishoVtLst-s2" kvg:type="㇒" d="M40.75,37.39c0.08,1.27,0.14,4.34-0.16,6.18C38.18,58.41,31.23,79.46,14,90.5"/>
 		<path id="kvg:05a09-KaishoVtLst-s3" kvg:type="㇀/㇐" d="M9.5,46.92c0.77,0.81,1.8,1.4,3.86,1.2c2.22-0.21,21.97-4.18,31.14-6.24"/>
 	</g>
-	<g id="kvg:05a09-KaishoVtLst-g2" kvg:position="right">
+	<g id="kvg:05a09-KaishoVtLst-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:05a09-KaishoVtLst-g3" kvg:element="由" kvg:variant="true" kvg:position="top">
 			<g id="kvg:05a09-KaishoVtLst-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:05a09-KaishoVtLst-s4" kvg:type="㇑" d="M49.56,22.83c0.51,0.62,0.91,1.27,1.03,1.81c0.98,4.47,2.84,14.1,3.42,22.32"/>
diff --git a/kanji/05a09.svg b/kanji/05a09.svg
index 61988b440..96206adc5 100644
--- a/kanji/05a09.svg
+++ b/kanji/05a09.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:05a09-s2" kvg:type="㇒" d="M40.75,37.39c0.08,1.27,0.14,4.34-0.16,6.18C38.18,58.41,31.23,79.46,14,90.5"/>
 		<path id="kvg:05a09-s3" kvg:type="㇀/㇐" d="M9.5,46.92c0.77,0.81,1.8,1.4,3.86,1.2c2.22-0.21,21.97-4.18,31.14-6.24"/>
 	</g>
-	<g id="kvg:05a09-g2" kvg:position="right">
+	<g id="kvg:05a09-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:05a09-g3" kvg:element="由" kvg:position="top">
 			<g id="kvg:05a09-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:05a09-s4" kvg:type="㇑" d="M49.56,22.83c0.51,0.62,0.91,1.27,1.03,1.81c0.98,4.47,2.84,14.1,3.42,22.32"/>
diff --git a/kanji/05cfb.svg b/kanji/05cfb.svg
index 6f5836ed7..48fc766f4 100644
--- a/kanji/05cfb.svg
+++ b/kanji/05cfb.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:05cfb-s2" kvg:type="㇄a" d="M12.79,43.77c0.91,0.91,1.21,1.98,1.19,3.31c-0.08,4.63-0.73,12.54-1.42,21.55c-0.22,2.91-0.19,3.86,2.73,2.59c5.17-2.26,10.38-3.78,19.63-5.67"/>
 		<path id="kvg:05cfb-s3" kvg:type="㇑" d="M35.62,40.26c0.94,0.94,1.01,2.11,0.94,3.85c-0.17,4.25-0.41,12.58-0.63,20.26c-0.07,2.29-0.13,4.52-0.19,6.57"/>
 	</g>
-	<g id="kvg:05cfb-g2" kvg:position="right">
+	<g id="kvg:05cfb-g2" kvg:element="夋" kvg:position="right">
 		<g id="kvg:05cfb-g3" kvg:element="允" kvg:position="top">
 			<g id="kvg:05cfb-g4" kvg:element="厶" kvg:position="top">
 				<path id="kvg:05cfb-s4" kvg:type="㇜" d="M61.16,12.5c0.22,0.88,0,2.09-0.35,2.58c-4.43,6.05-7.55,10.42-13.24,16.82c-1.62,1.82-1.38,3.3,1.38,2.77c8.56-1.66,21.69-5.28,31.1-7.16"/>
diff --git a/kanji/0609b.svg b/kanji/0609b.svg
index f7c43f7c9..57fa5e56e 100644
--- a/kanji/0609b.svg
+++ b/kanji/0609b.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0609b-s2" kvg:type="㇔" d="M31.27,31.58c2.57,1.83,6.65,7.53,7.29,10.38"/>
 		<path id="kvg:0609b-s3" kvg:type="㇑" d="M22.87,14.25c1.09,0.5,1.74,2.25,1.96,3.25c0.22,1,0,73.75-0.22,80"/>
 	</g>
-	<g id="kvg:0609b-g2" kvg:position="right">
+	<g id="kvg:0609b-g2" kvg:element="夋" kvg:position="right">
 		<g id="kvg:0609b-g3" kvg:element="允" kvg:position="top">
 			<g id="kvg:0609b-g4" kvg:element="厶" kvg:position="top">
 				<path id="kvg:0609b-s4" kvg:type="㇜" d="M60.41,12.25c0.44,0.42,0.41,2.03,0.15,2.58c-3.24,6.83-9.3,12.42-13.74,18.57c-1.43,1.98-1.88,2.05,0.88,1.52c8.56-1.66,26.19-6.03,35.6-7.91"/>
diff --git a/kanji/068ad-Kaisho.svg b/kanji/068ad-Kaisho.svg
index db95a8766..6c9e50048 100644
--- a/kanji/068ad-Kaisho.svg
+++ b/kanji/068ad-Kaisho.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:068ad-Kaisho-s3" kvg:type="㇒" d="M29.94,41.78C24.31,56.82,20.5,64.5,11.36,76.34"/>
 		<path id="kvg:068ad-Kaisho-s4" kvg:type="㇔/㇏" d="M31.97,50.4c2.37,1.59,6.28,6.76,8.28,9.85"/>
 	</g>
-	<g id="kvg:068ad-Kaisho-g2" kvg:position="right">
+	<g id="kvg:068ad-Kaisho-g2" kvg:element="夋" kvg:position="right">
 		<g id="kvg:068ad-Kaisho-g3" kvg:element="允" kvg:position="top">
 			<g id="kvg:068ad-Kaisho-g4" kvg:element="厶" kvg:position="top">
 				<path id="kvg:068ad-Kaisho-s5" kvg:type="㇜" d="M63.41,9.75c0.44,0.42,0.41,2.03,0.15,2.58c-3.24,6.83-9.3,12.42-13.74,18.57c-1.43,1.98-1.88,2.55,0.88,2.02c8.56-1.66,21.69-4.53,31.1-6.41"/>
diff --git a/kanji/068ad.svg b/kanji/068ad.svg
index 11e8729db..992d3337b 100644
--- a/kanji/068ad.svg
+++ b/kanji/068ad.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:068ad-s3" kvg:type="㇒" d="M29.94,41.78C24.31,56.82,20.5,64.5,11.36,76.34"/>
 		<path id="kvg:068ad-s4" kvg:type="㇔/㇏" d="M31.97,50.4c2.37,1.59,6.28,6.76,8.28,9.85"/>
 	</g>
-	<g id="kvg:068ad-g2" kvg:position="right">
+	<g id="kvg:068ad-g2" kvg:element="夋" kvg:position="right">
 		<g id="kvg:068ad-g3" kvg:element="允" kvg:position="top">
 			<g id="kvg:068ad-g4" kvg:element="厶" kvg:position="top">
 				<path id="kvg:068ad-s5" kvg:type="㇜" d="M63.41,9.75c0.44,0.42,0.41,2.03,0.15,2.58c-3.24,6.83-9.3,12.42-13.74,18.57c-1.43,1.98-1.88,2.55,0.88,2.02c8.56-1.66,21.69-4.53,31.1-6.41"/>
diff --git a/kanji/06d5a.svg b/kanji/06d5a.svg
index 159303aa9..4fefd58b3 100644
--- a/kanji/06d5a.svg
+++ b/kanji/06d5a.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06d5a-s2" kvg:type="㇔" d="M14.75,40.5C19.07,42,25.92,46.67,27,49"/>
 		<path id="kvg:06d5a-s3" kvg:type="㇀" d="M14.25,86.73c1.71,1.27,3.78,1.32,4.86-0.25c3.14-4.57,10.29-17.16,13.14-22.99"/>
 	</g>
-	<g id="kvg:06d5a-g2" kvg:position="right">
+	<g id="kvg:06d5a-g2" kvg:element="夋" kvg:position="right">
 		<g id="kvg:06d5a-g3" kvg:element="允" kvg:position="top">
 			<g id="kvg:06d5a-g4" kvg:element="厶" kvg:position="top">
 				<path id="kvg:06d5a-s4" kvg:type="㇜" d="M62.41,10.25c0.44,0.42,0.41,2.03,0.15,2.58c-3.24,6.83-9.05,11.42-15.74,18.07c-1.73,1.72-1.88,3.55,0.88,3.02c8.56-1.66,26.19-6.53,35.6-8.41"/>
diff --git a/kanji/076b4.svg b/kanji/076b4.svg
index eb1a642e7..506566d72 100644
--- a/kanji/076b4.svg
+++ b/kanji/076b4.svg
@@ -37,7 +37,7 @@ kvg:type CDATA #IMPLIED >
 <svg xmlns="http://www.w3.org/2000/svg" width="109" height="109" viewBox="0 0 109 109">
 <g id="kvg:StrokePaths_076b4" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:076b4" kvg:element="皴">
-	<g id="kvg:076b4-g1" kvg:position="left">
+	<g id="kvg:076b4-g1" kvg:element="夋" kvg:position="left">
 		<g id="kvg:076b4-g2" kvg:element="允" kvg:position="top">
 			<g id="kvg:076b4-g3" kvg:element="厶" kvg:position="top">
 				<path id="kvg:076b4-s1" kvg:type="㇜" d="M30.91,11.25c0.44,0.42,0.48,2.08,0.15,2.58C26.75,20.25,23.5,25,17.81,31.9c-1.55,1.88-1.88,3.05,0.88,2.52c8.56-1.66,18.69-3.53,28.1-5.41"/>
diff --git a/kanji/07ae3-Kaisho.svg b/kanji/07ae3-Kaisho.svg
index 0887ed38e..83e5329d8 100644
--- a/kanji/07ae3-Kaisho.svg
+++ b/kanji/07ae3-Kaisho.svg
@@ -48,7 +48,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07ae3-Kaisho-s5" kvg:type="㇀/㇐" d="M9.5,75.07c0.95,1.2,3.06,1.18,4,0.7c10.31-5.21,18.75-10.02,27.9-14.31"/>
 		</g>
 	</g>
-	<g id="kvg:07ae3-Kaisho-g4" kvg:position="right">
+	<g id="kvg:07ae3-Kaisho-g4" kvg:element="夋" kvg:position="right">
 		<g id="kvg:07ae3-Kaisho-g5" kvg:element="允" kvg:position="top">
 			<g id="kvg:07ae3-Kaisho-g6" kvg:element="厶" kvg:position="top">
 				<path id="kvg:07ae3-Kaisho-s6" kvg:type="㇜" d="M60.56,11.5c0.4,0.38,0.37,1.85,0.13,2.35c-2.96,6.23-8.04,11.34-12.09,16.95c-1.31,1.81-1.72,1.88,0.81,1.38c7.81-1.52,23.9-5.51,32.5-7.22"/>
diff --git a/kanji/07ae3.svg b/kanji/07ae3.svg
index 2e4d29cdc..50c015d6d 100644
--- a/kanji/07ae3.svg
+++ b/kanji/07ae3.svg
@@ -48,7 +48,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07ae3-s5" kvg:type="㇀/㇐" d="M9.5,75.57c1.12,1.18,2.27,1.09,4,0.2c11-5.65,16.88-8.65,27.9-14.31"/>
 		</g>
 	</g>
-	<g id="kvg:07ae3-g4" kvg:position="right">
+	<g id="kvg:07ae3-g4" kvg:element="夋" kvg:position="right">
 		<g id="kvg:07ae3-g5" kvg:element="允" kvg:position="top">
 			<g id="kvg:07ae3-g6" kvg:element="厶" kvg:position="top">
 				<path id="kvg:07ae3-s6" kvg:type="㇜" d="M60.81,12.25c0,1.12-0.31,2-0.87,2.85c-3.78,5.77-5.57,7.9-10.59,14.7c-1.32,1.79-1.2,2.95,1.31,2.38c9.22-2.06,20.97-4.81,31.25-7.22"/>
diff --git a/kanji/08058-Kaisho.svg b/kanji/08058-Kaisho.svg
index c22dcfdee..a1f938b20 100644
--- a/kanji/08058-Kaisho.svg
+++ b/kanji/08058-Kaisho.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08058-Kaisho-s5" kvg:type="㇀" d="M11.75,78.84c0.72,0.41,2.05,0.51,2.65,0.22c2.44-1.18,18.09-9.42,21.85-11.3"/>
 		<path id="kvg:08058-Kaisho-s6" kvg:type="㇑" d="M38.01,21.5c0.77,1.25,0.85,2.46,0.85,3.85s0.12,59.03,0.12,70.4"/>
 	</g>
-	<g id="kvg:08058-Kaisho-g2" kvg:position="right">
+	<g id="kvg:08058-Kaisho-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:08058-Kaisho-g3" kvg:element="由" kvg:position="top">
 			<g id="kvg:08058-Kaisho-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:08058-Kaisho-s7" kvg:type="㇑" d="M49.25,24c0.75,0.59,1.33,1.19,1.5,1.71c1.43,4.21,2.66,13.79,3.5,21.54"/>
diff --git a/kanji/08058-KaishoVt3Vt3.svg b/kanji/08058-KaishoVt3Vt3.svg
index d002002ef..048a5cc4f 100644
--- a/kanji/08058-KaishoVt3Vt3.svg
+++ b/kanji/08058-KaishoVt3Vt3.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08058-KaishoVt3Vt3-s5" kvg:type="㇐" d="M22.71,53.49c2.38-0.3,4.74-0.68,7.11-1.02c0.55-0.08,1.1-0.15,1.69-0.23"/>
 		<path id="kvg:08058-KaishoVt3Vt3-s6" kvg:type="㇀" d="M11.75,78.84c0.72,0.41,2.05,0.51,2.65,0.22c2.44-1.18,18.09-9.42,21.85-11.3"/>
 	</g>
-	<g id="kvg:08058-KaishoVt3Vt3-g2" kvg:position="right">
+	<g id="kvg:08058-KaishoVt3Vt3-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:08058-KaishoVt3Vt3-g3" kvg:element="由" kvg:position="top">
 			<g id="kvg:08058-KaishoVt3Vt3-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:08058-KaishoVt3Vt3-s7" kvg:type="㇑" d="M49.25,24c0.75,0.59,1.33,1.19,1.5,1.71c1.43,4.21,2.66,13.79,3.5,21.54"/>
diff --git a/kanji/08058-KaishoVt3VtLst.svg b/kanji/08058-KaishoVt3VtLst.svg
index 038db4f28..68d7a9f3a 100644
--- a/kanji/08058-KaishoVt3VtLst.svg
+++ b/kanji/08058-KaishoVt3VtLst.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08058-KaishoVt3VtLst-s5" kvg:type="㇀" d="M22.71,53.49c2.38-0.3,4.74-0.68,7.11-1.02c0.55-0.08,1.1-0.15,1.69-0.23"/>
 		<path id="kvg:08058-KaishoVt3VtLst-s6" kvg:type="㇑" d="M11.75,78.84c0.72,0.41,2.05,0.51,2.65,0.22c2.44-1.18,18.09-9.42,21.85-11.3"/>
 	</g>
-	<g id="kvg:08058-KaishoVt3VtLst-g2" kvg:position="right">
+	<g id="kvg:08058-KaishoVt3VtLst-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:08058-KaishoVt3VtLst-g3" kvg:element="由" kvg:position="top">
 			<g id="kvg:08058-KaishoVt3VtLst-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:08058-KaishoVt3VtLst-s7" kvg:type="㇑" d="M49.25,24c0.75,0.59,1.33,1.19,1.5,1.71c1.43,4.21,2.66,13.79,3.5,21.54"/>
diff --git a/kanji/08058.svg b/kanji/08058.svg
index 3fddc7b6b..dee405087 100644
--- a/kanji/08058.svg
+++ b/kanji/08058.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08058-s5" kvg:type="㇀" d="M11.75,78.84c0.72,0.41,2.05,0.51,2.65,0.22c2.44-1.18,18.09-9.42,21.85-11.3"/>
 		<path id="kvg:08058-s6" kvg:type="㇑" d="M38.01,21.5c0.77,1.25,0.85,2.46,0.85,3.85s0.12,59.03,0.12,70.4"/>
 	</g>
-	<g id="kvg:08058-g2" kvg:position="right">
+	<g id="kvg:08058-g2" kvg:element="甹" kvg:position="right">
 		<g id="kvg:08058-g3" kvg:element="由" kvg:position="top">
 			<g id="kvg:08058-g4" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:08058-s7" kvg:type="㇑" d="M49.25,24c0.75,0.59,1.33,1.19,1.5,1.71c1.43,4.21,2.66,13.79,3.5,21.54"/>
diff --git a/kanji/09021.svg b/kanji/09021.svg
index 89609b7d6..dd4915ec4 100644
--- a/kanji/09021.svg
+++ b/kanji/09021.svg
@@ -37,28 +37,30 @@ kvg:type CDATA #IMPLIED >
 <svg xmlns="http://www.w3.org/2000/svg" width="109" height="109" viewBox="0 0 109 109">
 <g id="kvg:StrokePaths_09021" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:09021" kvg:element="逡">
-	<g id="kvg:09021-g1" kvg:element="允" kvg:position="top">
-		<g id="kvg:09021-g2" kvg:element="厶" kvg:position="top">
-			<path id="kvg:09021-s1" kvg:type="㇜" d="M62.41,9.75c0.44,0.34,0.41,1.63,0.15,2.07c-3.24,5.47-11.8,11.96-16.24,16.89c-1.43,1.59-1.88,1.65,0.88,1.22c8.56-1.33,24.19-3.84,33.6-5.34"/>
-			<path id="kvg:09021-s2" kvg:type="㇔" d="M74.27,19.18c4.07,2.17,10.51,8.94,11.53,12.32"/>
-		</g>
-		<g id="kvg:09021-g3" kvg:element="儿" kvg:position="bottom">
-			<g id="kvg:09021-g4" kvg:element="八" kvg:variant="true">
-				<g id="kvg:09021-g5" kvg:element="丿" kvg:position="left">
-					<path id="kvg:09021-s3" kvg:type="㇒" d="M55.81,32.78c0.04,0.35,0.18,0.92-0.08,1.39C54,37.3,49,43.32,42.2,47.46"/>
-				</g>
-				<g id="kvg:09021-g6" kvg:position="right">
-					<path id="kvg:09021-s4" kvg:type="㇟" d="M69.48,28.53c0.38,0.44,0.68,0.96,0.71,1.65c0.1,3.05-0.27,6-0.27,8.08c0,4.84,4.57,4.29,9.07,4.29c4.75,0,7.7-0.59,8.54-1.79"/>
+	<g id="kvg:09021-g1" kvg:element="夋">
+		<g id="kvg:09021-g2" kvg:element="允" kvg:position="top">
+			<g id="kvg:09021-g3" kvg:element="厶" kvg:position="top">
+				<path id="kvg:09021-s1" kvg:type="㇜" d="M62.41,9.75c0.44,0.34,0.41,1.63,0.15,2.07c-3.24,5.47-11.8,11.96-16.24,16.89c-1.43,1.59-1.88,1.65,0.88,1.22c8.56-1.33,24.19-3.84,33.6-5.34"/>
+				<path id="kvg:09021-s2" kvg:type="㇔" d="M74.27,19.18c4.07,2.17,10.51,8.94,11.53,12.32"/>
+			</g>
+			<g id="kvg:09021-g4" kvg:element="儿" kvg:position="bottom">
+				<g id="kvg:09021-g5" kvg:element="八" kvg:variant="true">
+					<g id="kvg:09021-g6" kvg:element="丿" kvg:position="left">
+						<path id="kvg:09021-s3" kvg:type="㇒" d="M55.81,32.78c0.04,0.35,0.18,0.92-0.08,1.39C54,37.3,49,43.32,42.2,47.46"/>
+					</g>
+					<g id="kvg:09021-g7" kvg:position="right">
+						<path id="kvg:09021-s4" kvg:type="㇟" d="M69.48,28.53c0.38,0.44,0.68,0.96,0.71,1.65c0.1,3.05-0.27,6-0.27,8.08c0,4.84,4.57,4.29,9.07,4.29c4.75,0,7.7-0.59,8.54-1.79"/>
+					</g>
 				</g>
 			</g>
 		</g>
+		<g id="kvg:09021-g8" kvg:element="夂" kvg:position="bottom">
+			<path id="kvg:09021-s5" kvg:type="㇒" d="M59.09,42.63c0.06,0.6-0.23,2.14-0.64,2.93c-2.88,5.63-8.41,14.71-19.17,22.59"/>
+			<path id="kvg:09021-s6" kvg:type="㇇" d="M56.75,52.68c0.5,0.35,2.83,0.4,3.55,0.33c2.37-0.23,11.71-1.79,15.09-2.5c2.32-0.49,3.15,0.61,2.39,1.89C72.25,61.56,55,76.99,39.17,82"/>
+			<path id="kvg:09021-s7" kvg:type="㇏" d="M51.31,57.6C56,61,74,76.5,83.8,81.8c1.95,1.06,3.43,1.71,5.28,2.06"/>
+		</g>
 	</g>
-	<g id="kvg:09021-g7" kvg:element="夂" kvg:position="bottom">
-		<path id="kvg:09021-s5" kvg:type="㇒" d="M59.09,42.63c0.06,0.6-0.23,2.14-0.64,2.93c-2.88,5.63-8.41,14.71-19.17,22.59"/>
-		<path id="kvg:09021-s6" kvg:type="㇇" d="M56.75,52.68c0.5,0.35,2.83,0.4,3.55,0.33c2.37-0.23,11.71-1.79,15.09-2.5c2.32-0.49,3.15,0.61,2.39,1.89C72.25,61.56,55,76.99,39.17,82"/>
-		<path id="kvg:09021-s7" kvg:type="㇏" d="M51.31,57.6C56,61,74,76.5,83.8,81.8c1.95,1.06,3.43,1.71,5.28,2.06"/>
-	</g>
-	<g id="kvg:09021-g8" kvg:element="辶" kvg:position="nyo" kvg:radical="general">
+	<g id="kvg:09021-g9" kvg:element="辶" kvg:position="nyo" kvg:radical="general">
 		<path id="kvg:09021-s8" kvg:type="㇔" d="M16.46,13.75c4.6,1.52,11.89,6.26,13.04,8.63"/>
 		<path id="kvg:09021-s9" kvg:type="㇔" d="M12.96,33.25c4.34,1.57,11.21,6.45,12.29,8.88"/>
 		<path id="kvg:09021-s10" kvg:type="㇋" d="M10.5,56.11c2.25,0.9,3.75,0.45,4.75,0.22c1-0.22,8-3.14,9.5-3.59c1.5-0.45,3.75,1.12,2.75,2.47c-1,1.35-4,6.5-4.75,7.63c-0.75,1.12-0.5,3.14,1,4.71c1.5,1.57,2.75,3.36,3.5,4.71C28,73.6,28,74.73,26.5,75.85c-1.5,1.12-9,7.4-10.5,7.85"/>
diff --git a/kanji/09178-Kaisho.svg b/kanji/09178-Kaisho.svg
index bb6d0e1e1..4002b78fe 100644
--- a/kanji/09178-Kaisho.svg
+++ b/kanji/09178-Kaisho.svg
@@ -52,7 +52,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09178-Kaisho-s7" kvg:type="㇐a" d="M13.93,87.7c6.56-0.49,21.44-1.79,29.61-2.21"/>
 		</g>
 	</g>
-	<g id="kvg:09178-Kaisho-g5" kvg:position="right">
+	<g id="kvg:09178-Kaisho-g5" kvg:element="夋" kvg:position="right">
 		<g id="kvg:09178-Kaisho-g6" kvg:element="允" kvg:position="top">
 			<g id="kvg:09178-Kaisho-g7" kvg:element="厶" kvg:position="top">
 				<path id="kvg:09178-Kaisho-s8" kvg:type="㇜" d="M66.41,11.75c0.44,0.42,0.41,2.03,0.15,2.58C63.32,21.15,60.75,25,54.31,32.4c-1.6,1.84-1.9,1.98,0.88,1.52c6.77-1.12,21.19-4.53,30.6-6.41"/>
diff --git a/kanji/099ff-Vt6.svg b/kanji/099ff-Vt6.svg
index 75e1c877f..d6cab5161 100644
--- a/kanji/099ff-Vt6.svg
+++ b/kanji/099ff-Vt6.svg
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:099ff-Vt6-s10" kvg:type="㇔" d="M31.76,63.75c1.33,2.53,3.51,5.15,3.98,8.5"/>
 		</g>
 	</g>
-	<g id="kvg:099ff-Vt6-g3" kvg:position="right">
+	<g id="kvg:099ff-Vt6-g3" kvg:element="夋" kvg:position="right">
 		<g id="kvg:099ff-Vt6-g4" kvg:element="允" kvg:position="top">
 			<g id="kvg:099ff-Vt6-g5" kvg:element="厶" kvg:position="top">
 				<path id="kvg:099ff-Vt6-s11" kvg:type="㇜" d="M64.43,12c0.4,0.42,0.43,2.06,0.13,2.58C60.25,22,56.5,27,50.47,33.65c-1.59,1.76-1.72,2.05,0.81,1.52C59.09,33.5,74,29.25,84.8,26.75"/>
diff --git a/kanji/099ff.svg b/kanji/099ff.svg
index 4fd730d8d..86ecd2ba9 100644
--- a/kanji/099ff.svg
+++ b/kanji/099ff.svg
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:099ff-s10" kvg:type="㇔" d="M31.51,63.5c1.74,2.25,3.76,5.65,4.23,9"/>
 		</g>
 	</g>
-	<g id="kvg:099ff-g3" kvg:position="right">
+	<g id="kvg:099ff-g3" kvg:element="夋" kvg:position="right">
 		<g id="kvg:099ff-g4" kvg:element="允" kvg:position="top">
 			<g id="kvg:099ff-g5" kvg:element="厶" kvg:position="top">
 				<path id="kvg:099ff-s11" kvg:type="㇜" d="M64.93,12.75c0.19,1,0.01,2.09-0.62,3.08c-4.5,7.17-7.42,10.69-12.7,16.55c-1.94,2.18-1.39,3.34,1.22,2.75c8.09-1.83,21.73-6.01,31.95-8.37"/>
diff --git a/kanji/09a01-Kaisho.svg b/kanji/09a01-Kaisho.svg
index c1c05747f..f207e7b01 100644
--- a/kanji/09a01-Kaisho.svg
+++ b/kanji/09a01-Kaisho.svg
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09a01-Kaisho-s10" kvg:type="㇔" d="M33.17,66.41c1.04,2.35,2.76,4.78,3.13,7.89"/>
 		</g>
 	</g>
-	<g id="kvg:09a01-Kaisho-g3" kvg:position="right">
+	<g id="kvg:09a01-Kaisho-g3" kvg:element="甹" kvg:position="right">
 		<g id="kvg:09a01-Kaisho-g4" kvg:element="由" kvg:position="top">
 			<g id="kvg:09a01-Kaisho-g5" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:09a01-Kaisho-s11" kvg:type="㇑" d="M52.31,20.45c0.57,0.73,1.01,1.48,1.14,2.12c1.09,5.23,3.16,16.51,3.8,26.15"/>
@@ -67,7 +67,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:09a01-Kaisho-g8" kvg:position="bottom">
 			<path id="kvg:09a01-Kaisho-s16" kvg:type="㇐" d="M51.54,57.69c1.37,0.26,3.88,0.29,5.24,0.26c10.59-0.23,21.92-2.64,37.13-3c2.28-0.05,3.65,0.12,4.79,0.26"/>
-			<path id="kvg:09a01-Kaisho-s17" kvg:type="㇟" d="M65.95,59.52c0.31,0.59,0.48,1.34,0.06,2.18c-1.17,2.34-5.04,6.17-6.6,8.52c-0.88,1.33-0.28,2.56,1.84,2.18c3.86-0.69,18.34-2.7,23.11-3.56C89,68,89.55,70.67,88.4,73.66c-2.65,6.84-6.65,15.59-13.79,22.69c-4.56,4.54-6.11,1.65-7.93-1.21"/>
+			<path id="kvg:09a01-Kaisho-s17" kvg:type="㇉" d="M65.95,59.52c0.31,0.59,0.48,1.34,0.06,2.18c-1.17,2.34-5.04,6.17-6.6,8.52c-0.88,1.33-0.28,2.56,1.84,2.18c3.86-0.69,18.34-2.7,23.11-3.56C89,68,89.55,70.67,88.4,73.66c-2.65,6.84-6.65,15.59-13.79,22.69c-4.56,4.54-6.11,1.65-7.93-1.21"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/09a01-KaishoVtLst.svg b/kanji/09a01-KaishoVtLst.svg
index e397fe753..356beb91b 100644
--- a/kanji/09a01-KaishoVtLst.svg
+++ b/kanji/09a01-KaishoVtLst.svg
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09a01-KaishoVtLst-s10" kvg:type="㇔" d="M33.17,66.41c1.04,2.35,2.76,4.78,3.13,7.89"/>
 		</g>
 	</g>
-	<g id="kvg:09a01-KaishoVtLst-g3" kvg:position="right">
+	<g id="kvg:09a01-KaishoVtLst-g3" kvg:element="甹" kvg:position="right">
 		<g id="kvg:09a01-KaishoVtLst-g4" kvg:element="由" kvg:variant="true" kvg:position="top">
 			<g id="kvg:09a01-KaishoVtLst-g5" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:09a01-KaishoVtLst-s11" kvg:type="㇑" d="M52.31,20.45c0.57,0.73,1.01,1.48,1.14,2.12c1.09,5.23,3.16,16.51,3.8,26.15"/>
@@ -67,7 +67,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:09a01-KaishoVtLst-g8" kvg:position="bottom">
 			<path id="kvg:09a01-KaishoVtLst-s16" kvg:type="㇐" d="M51.54,57.69c1.37,0.26,3.88,0.29,5.24,0.26c10.59-0.23,21.92-2.64,37.13-3c2.28-0.05,3.65,0.12,4.79,0.26"/>
-			<path id="kvg:09a01-KaishoVtLst-s17" kvg:type="㇟" d="M65.95,59.52c0.31,0.59,0.48,1.34,0.06,2.18c-1.17,2.34-5.04,6.17-6.6,8.52c-0.88,1.33-0.28,2.56,1.84,2.18c3.86-0.69,18.34-2.7,23.11-3.56C89,68,89.55,70.67,88.4,73.66c-2.65,6.84-6.65,15.59-13.79,22.69c-4.56,4.54-6.11,1.65-7.93-1.21"/>
+			<path id="kvg:09a01-KaishoVtLst-s17" kvg:type="㇉" d="M65.95,59.52c0.31,0.59,0.48,1.34,0.06,2.18c-1.17,2.34-5.04,6.17-6.6,8.52c-0.88,1.33-0.28,2.56,1.84,2.18c3.86-0.69,18.34-2.7,23.11-3.56C89,68,89.55,70.67,88.4,73.66c-2.65,6.84-6.65,15.59-13.79,22.69c-4.56,4.54-6.11,1.65-7.93-1.21"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/09a01.svg b/kanji/09a01.svg
index a2eb79f85..cd26140ca 100644
--- a/kanji/09a01.svg
+++ b/kanji/09a01.svg
@@ -51,23 +51,17 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09a01-s10" kvg:type="㇔" d="M33.17,66.41c1.04,2.35,2.76,4.78,3.13,7.89"/>
 		</g>
 	</g>
-	<g id="kvg:09a01-g3" kvg:position="right">
+	<g id="kvg:09a01-g3" kvg:position="right" kvg:element="甹">
 		<g id="kvg:09a01-g4" kvg:element="由" kvg:position="top">
-			<g id="kvg:09a01-g5" kvg:element="田" kvg:part="1" kvg:partial="true">
 				<path id="kvg:09a01-s11" kvg:type="㇑" d="M52.31,20.45c0.57,0.73,1.01,1.48,1.14,2.12c1.09,5.23,3.16,16.51,3.8,26.15"/>
 				<path id="kvg:09a01-s12" kvg:type="㇕a" d="M54.28,22.99c9.17-1.19,29.52-3.41,35.32-3.88c2.13-0.17,2.93,1.21,2.81,2.49c-0.43,4.68-1.71,15.73-3.05,23.45"/>
-			</g>
-			<g id="kvg:09a01-g6" kvg:element="丨">
 				<path id="kvg:09a01-s13" kvg:type="㇑a" d="M69.71,8.11c1.22,1.04,1.94,2.54,1.95,3.9c0.04,13.49,0.22,29.51,0.22,33.03"/>
-			</g>
-			<g id="kvg:09a01-g7" kvg:element="田" kvg:part="2" kvg:partial="true">
 				<path id="kvg:09a01-s14" kvg:type="㇐a" d="M55.66,33.64c2.53-0.23,33.66-3.21,35.75-3.21"/>
 				<path id="kvg:09a01-s15" kvg:type="㇐a" d="M57.41,46.27c6.4-0.34,24.3-2.37,32.03-2.5"/>
-			</g>
 		</g>
 		<g id="kvg:09a01-g8" kvg:position="bottom">
 			<path id="kvg:09a01-s16" kvg:type="㇐" d="M51.54,57.69c1.37,0.26,3.88,0.29,5.24,0.26c10.59-0.23,21.92-2.64,37.13-3c2.28-0.05,3.65,0.12,4.79,0.26"/>
-			<path id="kvg:09a01-s17" kvg:type="㇟" d="M65.95,59.52c0.31,0.59,0.48,1.34,0.06,2.18c-1.17,2.34-5.04,6.17-6.6,8.52c-0.88,1.33-0.28,2.56,1.84,2.18c3.86-0.69,18.34-2.7,23.11-3.56C89,68,89.55,70.67,88.4,73.66c-2.65,6.84-6.65,15.59-13.79,22.69c-4.56,4.54-6.11,1.65-7.93-1.21"/>
+			<path id="kvg:09a01-s17" kvg:type="㇉" d="M65.95,59.52c0.31,0.59,0.48,1.34,0.06,2.18c-1.17,2.34-5.04,6.17-6.6,8.52c-0.88,1.33-0.28,2.56,1.84,2.18c3.86-0.69,18.34-2.7,23.11-3.56C89,68,89.55,70.67,88.4,73.66c-2.65,6.84-6.65,15.59-13.79,22.69c-4.56,4.54-6.11,1.65-7.93-1.21"/>
 		</g>
 	</g>
 </g>