From 55fb76caf91d1588c7af57ca74fbc8734bcf5379 Mon Sep 17 00:00:00 2001
From: Ben Bullock <benkasminbullock@gmail.com>
Date: Mon, 16 Jan 2023 07:15:59 +0900
Subject: [PATCH] Add missing kvg:part= fields, and fix other part errors

---
 kanji/063c0-Kaisho.svg      |  2 +-
 kanji/063c0.svg             |  2 +-
 kanji/067ec-Kaisho.svg      |  2 +-
 kanji/0695d-Kaisho.svg      |  2 +-
 kanji/0695d.svg             |  2 +-
 kanji/06aa3.svg             |  2 +-
 kanji/06b4c.svg             |  8 ++++----
 kanji/0703e-Kaisho.svg      |  2 +-
 kanji/0703e.svg             |  2 +-
 kanji/0721b-Kaisho.svg      |  2 +-
 kanji/0721b.svg             |  2 +-
 kanji/07246.svg             |  2 +-
 kanji/0763b-Kaisho.svg      | 14 ++++++++------
 kanji/0763b.svg             | 14 ++++++++------
 kanji/07a61-Kaisho.svg      |  2 +-
 kanji/07a61.svg             |  2 +-
 kanji/07ab6-Kaisho.svg      | 14 ++++++++------
 kanji/07ab6.svg             | 14 ++++++++------
 kanji/07c0d.svg             | 14 ++++++++------
 kanji/07c54.svg             | 22 ++++++++++++----------
 kanji/07d20-Kaisho.svg      |  4 ++--
 kanji/07e37-Kaisho.svg      | 14 ++++++++------
 kanji/07e37.svg             | 14 ++++++++------
 kanji/081ba-Kaisho.svg      |  4 ++--
 kanji/08262.svg             |  2 +-
 kanji/08594.svg             |  2 +-
 kanji/085ea.svg             | 22 ++++++++++++----------
 kanji/0862d-Kaisho.svg      |  2 +-
 kanji/0862d.svg             |  2 +-
 kanji/087bb.svg             | 14 ++++++++------
 kanji/088c1-Kaisho.svg      |  4 ++--
 kanji/088c1.svg             |  4 ++--
 kanji/08938.svg             | 14 ++++++++------
 kanji/08974-Kaisho.svg      |  2 +-
 kanji/08974.svg             |  2 +-
 kanji/08aeb-Kaisho.svg      |  2 +-
 kanji/08aeb.svg             |  2 +-
 kanji/08b7d-LeFst.svg       |  4 ++--
 kanji/08ec8-Kaisho.svg      | 10 +++++-----
 kanji/08ec8.svg             | 12 ++++++------
 kanji/08f09-Kaisho.svg      |  4 ++--
 kanji/08f09.svg             |  4 ++--
 kanji/093e4.svg             | 14 ++++++++------
 kanji/095cc-Kaisho.svg      |  2 +-
 kanji/095cc.svg             |  2 +-
 kanji/09698.svg             | 16 ++++++++--------
 kanji/09acf-Kaisho.svg      |  2 +-
 kanji/09acf-KaishoHzFst.svg | 14 ++++++++------
 kanji/09acf.svg             | 14 ++++++++------
 49 files changed, 181 insertions(+), 153 deletions(-)

diff --git a/kanji/063c0-Kaisho.svg b/kanji/063c0-Kaisho.svg
index 1f9fa861e..31b02471a 100644
--- a/kanji/063c0-Kaisho.svg
+++ b/kanji/063c0-Kaisho.svg
@@ -54,7 +54,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:063c0-Kaisho-s7" kvg:type="㇔" d="M53.54,44.08c2.15,1.35,5.56,5.54,6.1,7.63"/>
 		<path id="kvg:063c0-Kaisho-s8" kvg:type="㇒" d="M80.54,42.14c0.02,0.22,0.04,0.57-0.04,0.88c-0.45,1.86-3.05,5.94-6.61,8.44"/>
-		<g id="kvg:063c0-Kaisho-g6" kvg:element="束">
+		<g id="kvg:063c0-Kaisho-g6" kvg:element="束" kvg:part="2">
 			<g id="kvg:063c0-Kaisho-g7" kvg:element="口" kvg:part="2">
 				<path id="kvg:063c0-Kaisho-s9" kvg:type="㇐" d="M48.46,57.93c9.09-0.92,30.34-2.69,38.84-3.14"/>
 			</g>
diff --git a/kanji/063c0.svg b/kanji/063c0.svg
index 3f1af6c0c..838e5f981 100644
--- a/kanji/063c0.svg
+++ b/kanji/063c0.svg
@@ -54,7 +54,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:063c0-s7" kvg:type="㇔" d="M53.54,44.08c2.15,1.35,5.56,5.54,6.1,7.63"/>
 		<path id="kvg:063c0-s8" kvg:type="㇒" d="M80.54,42.14c0.02,0.22,0.04,0.57-0.04,0.88c-0.45,1.86-3.05,5.94-6.61,8.44"/>
-		<g id="kvg:063c0-g6" kvg:element="束">
+		<g id="kvg:063c0-g6" kvg:element="束" kvg:part="2">
 			<g id="kvg:063c0-g7" kvg:element="口" kvg:part="2">
 				<path id="kvg:063c0-s9" kvg:type="㇐" d="M48.46,57.93c9.09-0.92,30.34-2.69,38.84-3.14"/>
 			</g>
diff --git a/kanji/067ec-Kaisho.svg b/kanji/067ec-Kaisho.svg
index 1ad358b51..d55fcb857 100644
--- a/kanji/067ec-Kaisho.svg
+++ b/kanji/067ec-Kaisho.svg
@@ -48,7 +48,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 	<path id="kvg:067ec-Kaisho-s4" kvg:type="㇔" d="M35.52,46.33c3.1,1.74,8.02,7.17,8.79,9.88"/>
 	<path id="kvg:067ec-Kaisho-s5" kvg:type="㇒" d="M72.28,44.64c0.03,0.24,0.05,0.63-0.05,0.98c-0.63,2.06-4.23,6.58-9.17,9.35"/>
-	<g id="kvg:067ec-Kaisho-g4" kvg:element="束">
+	<g id="kvg:067ec-Kaisho-g4" kvg:element="束" kvg:part="2">
 		<g id="kvg:067ec-Kaisho-g5" kvg:element="口" kvg:part="2">
 			<path id="kvg:067ec-Kaisho-s6" kvg:type="㇐" d="M28.92,62.43c13.1-0.92,39.41-2.69,51.65-3.14"/>
 		</g>
diff --git a/kanji/0695d-Kaisho.svg b/kanji/0695d-Kaisho.svg
index 5b930540b..78e7a99b4 100644
--- a/kanji/0695d-Kaisho.svg
+++ b/kanji/0695d-Kaisho.svg
@@ -55,7 +55,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:0695d-Kaisho-s8" kvg:type="㇔" d="M55.06,47.33c1.68,1.66,4.35,6.81,4.77,9.38"/>
 		<path id="kvg:0695d-Kaisho-s9" kvg:type="㇒" d="M79.11,46.14c0.01,0.22,0.03,0.57-0.03,0.88c-0.33,1.86-2.2,5.94-4.76,8.44"/>
-		<g id="kvg:0695d-Kaisho-g6" kvg:element="束">
+		<g id="kvg:0695d-Kaisho-g6" kvg:element="束" kvg:part="2">
 			<g id="kvg:0695d-Kaisho-g7" kvg:element="口" kvg:part="2">
 				<path id="kvg:0695d-Kaisho-s10" kvg:type="㇐" d="M50.76,61.93c8.6-0.92,27.19-1.69,35.23-2.14"/>
 			</g>
diff --git a/kanji/0695d.svg b/kanji/0695d.svg
index 254181d4c..d52cccad6 100644
--- a/kanji/0695d.svg
+++ b/kanji/0695d.svg
@@ -55,7 +55,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:0695d-s8" kvg:type="㇔" d="M55.06,47.33c1.68,1.66,4.35,6.81,4.77,9.38"/>
 		<path id="kvg:0695d-s9" kvg:type="㇒" d="M79.11,46.14c0.01,0.22,0.03,0.57-0.03,0.88c-0.33,1.86-2.2,5.94-4.76,8.44"/>
-		<g id="kvg:0695d-g6" kvg:element="束">
+		<g id="kvg:0695d-g6" kvg:element="束" kvg:part="2">
 			<g id="kvg:0695d-g7" kvg:element="口" kvg:part="2">
 				<path id="kvg:0695d-s10" kvg:type="㇐" d="M50.76,61.93c8.6-0.92,27.19-1.69,35.23-2.14"/>
 			</g>
diff --git a/kanji/06aa3.svg b/kanji/06aa3.svg
index 24aac59eb..61bd964cd 100644
--- a/kanji/06aa3.svg
+++ b/kanji/06aa3.svg
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:06aa3-g9" kvg:element="工" kvg:part="2" kvg:variant="true">
-				<g id="kvg:06aa3-g10" kvg:element="土">
+				<g id="kvg:06aa3-g10" kvg:element="土" kvg:part="2">
 					<path id="kvg:06aa3-s11" kvg:type="㇐" d="M46.25,56.21c0.67,0.22,3.04,0.45,4.17,0.35c12.14-1.09,30.89-2.71,41.94-3.04c1.81-0.05,3.99,0.37,4.89,0.72"/>
 				</g>
 			</g>
diff --git a/kanji/06b4c.svg b/kanji/06b4c.svg
index e55ead300..63dc5d990 100644
--- a/kanji/06b4c.svg
+++ b/kanji/06b4c.svg
@@ -50,10 +50,10 @@ kvg:type CDATA #IMPLIED >
 					<path id="kvg:06b4c-s3" kvg:type="㇕b" d="M18.75,34.28c4.65-0.96,11.62-2.38,14.17-2.62c1.1-0.1,1.76,0.61,1.6,1.22c-0.5,1.92-1.31,5.39-1.98,7.88"/>
 					<path id="kvg:06b4c-s4" kvg:type="㇐b" d="M20.83,43.36c2.68-0.24,5.82-0.99,9.42-1.31c1.15-0.1,2.32-0.21,3.49-0.33"/>
 				</g>
-			</g>
-			<g id="kvg:06b4c-g7" kvg:element="丁" kvg:part="2" kvg:position="bottom">
-				<g id="kvg:06b4c-g8" kvg:element="亅" kvg:variant="true">
-					<path id="kvg:06b4c-s5" kvg:type="㇑/㇚" d="M44,21.37c0.03,0.26,0.98,1.35,1.01,3c0.12,5.81,0.06,14.91-0.02,20.39c-0.03,1.96-0.06,3.46-0.08,4.17"/>
+				<g id="kvg:06b4c-g7" kvg:element="丁" kvg:part="2" kvg:position="bottom">
+					<g id="kvg:06b4c-g8" kvg:element="亅" kvg:variant="true">
+						<path id="kvg:06b4c-s5" kvg:type="㇑/㇚" d="M44,21.37c0.03,0.26,0.98,1.35,1.01,3c0.12,5.81,0.06,14.91-0.02,20.39c-0.03,1.96-0.06,3.46-0.08,4.17"/>
+					</g>
 				</g>
 			</g>
 			<g id="kvg:06b4c-g9" kvg:element="可">
diff --git a/kanji/0703e-Kaisho.svg b/kanji/0703e-Kaisho.svg
index 68d51baf2..d53575728 100644
--- a/kanji/0703e-Kaisho.svg
+++ b/kanji/0703e-Kaisho.svg
@@ -69,7 +69,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 			<path id="kvg:0703e-Kaisho-s15" kvg:type="㇔" d="M58.47,57.94c1.48,1.02,3.81,4.18,4.18,5.76"/>
 			<path id="kvg:0703e-Kaisho-s16" kvg:type="㇒" d="M75.96,56.95c0.01,0.14,0.03,0.37-0.03,0.57c-0.3,1.2-2.01,3.83-4.36,5.45"/>
-			<g id="kvg:0703e-Kaisho-g10" kvg:element="束">
+			<g id="kvg:0703e-Kaisho-g10" kvg:element="束" kvg:part="2">
 				<g id="kvg:0703e-Kaisho-g11" kvg:element="口" kvg:part="2">
 					<path id="kvg:0703e-Kaisho-s17" kvg:type="㇐" d="M54.84,67.81c6.23-0.54,19.25-2.06,25.07-2.33"/>
 				</g>
diff --git a/kanji/0703e.svg b/kanji/0703e.svg
index 54a0d6819..5f1e36eff 100644
--- a/kanji/0703e.svg
+++ b/kanji/0703e.svg
@@ -69,7 +69,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 			<path id="kvg:0703e-s15" kvg:type="㇔" d="M58.47,57.94c1.48,1.02,3.81,4.18,4.18,5.76"/>
 			<path id="kvg:0703e-s16" kvg:type="㇒" d="M75.96,56.95c0.01,0.14,0.03,0.37-0.03,0.57c-0.3,1.2-2.01,3.83-4.36,5.45"/>
-			<g id="kvg:0703e-g10" kvg:element="束">
+			<g id="kvg:0703e-g10" kvg:element="束" kvg:part="2">
 				<g id="kvg:0703e-g11" kvg:element="口" kvg:part="2">
 					<path id="kvg:0703e-s17" kvg:type="㇐" d="M54.84,67.81c6.23-0.54,19.25-2.06,25.07-2.33"/>
 				</g>
diff --git a/kanji/0721b-Kaisho.svg b/kanji/0721b-Kaisho.svg
index b606ba6a4..11e6b9f5a 100644
--- a/kanji/0721b-Kaisho.svg
+++ b/kanji/0721b-Kaisho.svg
@@ -70,7 +70,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 			<path id="kvg:0721b-Kaisho-s16" kvg:type="㇔" d="M60.33,58.25c1.5,1.06,3.86,4.36,4.23,6.01"/>
 			<path id="kvg:0721b-Kaisho-s17" kvg:type="㇒" d="M78.03,56.23c0.01,0.16,0.02,0.41-0.02,0.64c-0.25,1.35-1.69,4.32-3.67,6.13"/>
-			<g id="kvg:0721b-Kaisho-g10" kvg:element="束">
+			<g id="kvg:0721b-Kaisho-g10" kvg:element="束" kvg:part="2">
 				<g id="kvg:0721b-Kaisho-g11" kvg:element="口" kvg:part="2">
 					<path id="kvg:0721b-Kaisho-s18" kvg:type="㇐" d="M56.65,67.56c6.31-0.56,19.48-2.15,25.37-2.43"/>
 				</g>
diff --git a/kanji/0721b.svg b/kanji/0721b.svg
index 6696235a4..d2fd94a0b 100644
--- a/kanji/0721b.svg
+++ b/kanji/0721b.svg
@@ -70,7 +70,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 			<path id="kvg:0721b-s16" kvg:type="㇔" d="M60.33,58.25c1.5,1.06,3.86,4.36,4.23,6.01"/>
 			<path id="kvg:0721b-s17" kvg:type="㇒" d="M78.03,56.23c0.01,0.16,0.02,0.41-0.02,0.64c-0.25,1.35-1.69,4.32-3.67,6.13"/>
-			<g id="kvg:0721b-g10" kvg:element="束">
+			<g id="kvg:0721b-g10" kvg:element="束" kvg:part="2">
 				<g id="kvg:0721b-g11" kvg:element="口" kvg:part="2">
 					<path id="kvg:0721b-s18" kvg:type="㇐" d="M56.65,67.56c6.31-0.56,19.48-2.15,25.37-2.43"/>
 				</g>
diff --git a/kanji/07246.svg b/kanji/07246.svg
index 1e9c45238..5b21c89fc 100644
--- a/kanji/07246.svg
+++ b/kanji/07246.svg
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07246-g9" kvg:element="工" kvg:part="2" kvg:variant="true">
-				<g id="kvg:07246-g10" kvg:element="土">
+				<g id="kvg:07246-g10" kvg:element="土" kvg:part="2">
 					<path id="kvg:07246-s11" kvg:type="㇐" d="M39.75,56c0.85,0.28,3.87,0.57,5.3,0.44c15.44-1.36,33.41-3.39,47.47-3.8c2.3-0.07,5.07,0.46,6.22,0.9"/>
 				</g>
 			</g>
diff --git a/kanji/0763b-Kaisho.svg b/kanji/0763b-Kaisho.svg
index 4251e12c5..5d33a2146 100644
--- a/kanji/0763b-Kaisho.svg
+++ b/kanji/0763b-Kaisho.svg
@@ -47,27 +47,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:0763b-Kaisho-g2" kvg:element="婁" kvg:position="tarec">
 		<g id="kvg:0763b-Kaisho-g3" kvg:position="top">
 			<g id="kvg:0763b-Kaisho-g4" kvg:element="串" kvg:part="1">
-				<g id="kvg:0763b-Kaisho-g5" kvg:element="口">
+				<g id="kvg:0763b-Kaisho-g5" kvg:element="口" kvg:part="1">
 					<path id="kvg:0763b-Kaisho-s6" kvg:type="㇑" d="M44.71,33.16c0.35,0.21,1,1.11,1.11,1.9c0.77,5.13,1.45,11.81,2.13,15.19"/>
 					<path id="kvg:0763b-Kaisho-s7" kvg:type="㇕" d="M45.99,34.17c9.33-0.8,24.81-1.63,32.19-2.33c2.35-0.22,3.7,1.16,3.4,2.7c-1.2,6.14-2.05,9.74-2.74,13.15"/>
 				</g>
 			</g>
 			<path id="kvg:0763b-Kaisho-s8" kvg:type="㇐" d="M35.78,41.69c1.38,0.55,3.92,0.69,5.29,0.55c10.62-1.01,33.68-3,46.47-3.92c2.3-0.17,3.68,0.26,4.83,0.54"/>
 			<g id="kvg:0763b-Kaisho-g6" kvg:element="串" kvg:part="2">
-				<path id="kvg:0763b-Kaisho-s9" kvg:type="㇐" d="M48.31,48.14c2.39-0.19,26.77-1.21,29.85-1.39"/>
-				<g id="kvg:0763b-Kaisho-g7" kvg:element="中">
-					<g id="kvg:0763b-Kaisho-g8" kvg:element="口">
+				<g id="kvg:0763b-Kaisho-g7" kvg:element="口" kvg:part="2">
+					<path id="kvg:0763b-Kaisho-s9" kvg:type="㇐" d="M48.31,48.14c2.39-0.19,26.77-1.21,29.85-1.39"/>
+				</g>
+				<g id="kvg:0763b-Kaisho-g8" kvg:element="中">
+					<g id="kvg:0763b-Kaisho-g9" kvg:element="口">
 						<path id="kvg:0763b-Kaisho-s10" kvg:type="㇑" d="M45.57,55.39c0.3,0.39,0.82,0.9,0.96,1.76c0.52,3.16,1.29,6.26,1.84,9.17"/>
 						<path id="kvg:0763b-Kaisho-s11" kvg:type="㇕b" d="M46.78,56.31c9.69-0.78,23.18-2.06,30.84-2.73c2.44-0.21,3.85,1.12,3.53,2.61c-0.38,1.75-1.13,5.12-1.72,7.22"/>
 						<path id="kvg:0763b-Kaisho-s12" kvg:type="㇐b" d="M48.76,65.52c2.62-0.21,28.83-1.9,32.2-2.11"/>
 					</g>
-					<g id="kvg:0763b-Kaisho-g9" kvg:element="丨">
+					<g id="kvg:0763b-Kaisho-g10" kvg:element="丨">
 						<path id="kvg:0763b-Kaisho-s13" kvg:type="㇑" d="M61.45,24.25c0.82,0.42,1.3,1.9,1.47,2.74c0.16,0.84,0,32.22-0.16,37.48"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:0763b-Kaisho-g10" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:0763b-Kaisho-g11" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:0763b-Kaisho-s14" kvg:type="㇛" d="M57.96,66.67c0.33,0.75,0.1,1.7-0.17,2.64c-1.29,4.59-6.83,10.93-10.96,16.21c-0.9,1.15-0.19,1.36,0.5,1.38C64.75,87.5,75,91.25,86.08,99.08"/>
 			<path id="kvg:0763b-Kaisho-s15" kvg:type="㇒" d="M76.17,73.35c0.12,0.64,0.2,2.2-0.23,3.13c-3.47,7.52-11.27,18.85-38.3,23.77"/>
 			<path id="kvg:0763b-Kaisho-s16" kvg:type="㇐" d="M31.88,76.94c1.97,0.59,4.07,0.98,5.01,0.91C53.5,76.5,73,74.5,90.94,73.9c1.57-0.05,4.28,0.36,5.56,1.04"/>
diff --git a/kanji/0763b.svg b/kanji/0763b.svg
index 1f735f785..5ed9ef872 100644
--- a/kanji/0763b.svg
+++ b/kanji/0763b.svg
@@ -47,27 +47,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:0763b-g2" kvg:element="婁" kvg:position="tarec">
 		<g id="kvg:0763b-g3" kvg:position="top">
 			<g id="kvg:0763b-g4" kvg:element="串" kvg:part="1">
-				<g id="kvg:0763b-g5" kvg:element="口">
+				<g id="kvg:0763b-g5" kvg:element="口" kvg:part="1">
 					<path id="kvg:0763b-s6" kvg:type="㇑" d="M44.71,33.16c0.35,0.21,1,1.11,1.11,1.9c0.77,5.13,1.45,11.81,2.13,15.19"/>
 					<path id="kvg:0763b-s7" kvg:type="㇕" d="M45.99,34.17c9.33-0.8,24.81-1.63,32.19-2.33c2.35-0.22,3.7,1.16,3.4,2.7c-1.2,6.14-2.05,9.74-2.74,13.15"/>
 				</g>
 			</g>
 			<path id="kvg:0763b-s8" kvg:type="㇐" d="M35.78,41.69c1.38,0.55,3.92,0.69,5.29,0.55c10.62-1.01,33.68-3,46.47-3.92c2.3-0.17,3.68,0.26,4.83,0.54"/>
 			<g id="kvg:0763b-g6" kvg:element="串" kvg:part="2">
-				<path id="kvg:0763b-s9" kvg:type="㇐" d="M48.31,48.14c2.39-0.19,26.77-1.21,29.85-1.39"/>
-				<g id="kvg:0763b-g7" kvg:element="中">
-					<g id="kvg:0763b-g8" kvg:element="口">
+				<g id="kvg:0763b-g7" kvg:element="口" kvg:part="1">
+					<path id="kvg:0763b-s9" kvg:type="㇐" d="M48.31,48.14c2.39-0.19,26.77-1.21,29.85-1.39"/>
+				</g>
+				<g id="kvg:0763b-g8" kvg:element="中">
+					<g id="kvg:0763b-g9" kvg:element="口">
 						<path id="kvg:0763b-s10" kvg:type="㇑" d="M45.57,55.39c0.3,0.39,0.82,0.9,0.96,1.76c0.52,3.16,1.29,6.26,1.84,9.17"/>
 						<path id="kvg:0763b-s11" kvg:type="㇕b" d="M46.78,56.31c9.69-0.78,23.18-2.06,30.84-2.73c2.44-0.21,3.85,1.12,3.53,2.61c-0.38,1.75-1.13,5.12-1.72,7.22"/>
 						<path id="kvg:0763b-s12" kvg:type="㇐b" d="M48.76,65.52c2.62-0.21,28.83-1.9,32.2-2.11"/>
 					</g>
-					<g id="kvg:0763b-g9" kvg:element="丨">
+					<g id="kvg:0763b-g10" kvg:element="丨">
 						<path id="kvg:0763b-s13" kvg:type="㇑" d="M61.45,24.25c0.82,0.42,1.3,1.9,1.47,2.74c0.16,0.84,0,32.22-0.16,37.48"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:0763b-g10" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:0763b-g11" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:0763b-s14" kvg:type="㇛" d="M57.96,66.67c0.33,0.75,0.1,1.7-0.17,2.64c-1.29,4.59-6.83,10.93-10.96,16.21c-0.9,1.15-0.19,1.36,0.5,1.38C64.75,87.5,75,91.25,86.08,99.08"/>
 			<path id="kvg:0763b-s15" kvg:type="㇒" d="M76.17,73.35c0.12,0.64,0.2,2.2-0.23,3.13c-3.47,7.52-11.27,18.85-38.3,23.77"/>
 			<path id="kvg:0763b-s16" kvg:type="㇐" d="M31.88,76.94c1.97,0.59,4.07,0.98,5.01,0.91C53.5,76.5,73,74.5,90.94,73.9c1.57-0.05,4.28,0.36,5.56,1.04"/>
diff --git a/kanji/07a61-Kaisho.svg b/kanji/07a61-Kaisho.svg
index 9cb76da03..8dc58a959 100644
--- a/kanji/07a61-Kaisho.svg
+++ b/kanji/07a61-Kaisho.svg
@@ -67,7 +67,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07a61-Kaisho-g11" kvg:element="工" kvg:part="2" kvg:variant="true">
-				<g id="kvg:07a61-Kaisho-g12" kvg:element="土">
+				<g id="kvg:07a61-Kaisho-g12" kvg:element="土" kvg:part="2">
 					<path id="kvg:07a61-Kaisho-s12" kvg:type="㇐" d="M45.25,56.19c0.7,0.24,3.21,0.5,4.39,0.39c12.79-1.2,32.56-2.48,44.2-2.85c1.91-0.06,4.2-0.09,5.15,0.29"/>
 				</g>
 			</g>
diff --git a/kanji/07a61.svg b/kanji/07a61.svg
index dcd000e6a..29bcaf67a 100644
--- a/kanji/07a61.svg
+++ b/kanji/07a61.svg
@@ -67,7 +67,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07a61-g11" kvg:element="工" kvg:part="2" kvg:variant="true">
-				<g id="kvg:07a61-g12" kvg:element="土">
+				<g id="kvg:07a61-g12" kvg:element="土" kvg:part="2">
 					<path id="kvg:07a61-s12" kvg:type="㇐" d="M45.25,56.19c0.7,0.24,3.21,0.5,4.39,0.39c12.79-1.2,32.56-2.48,44.2-2.85c1.91-0.06,4.2-0.09,5.15,0.29"/>
 				</g>
 			</g>
diff --git a/kanji/07ab6-Kaisho.svg b/kanji/07ab6-Kaisho.svg
index 9ce97cc98..9d36266cd 100644
--- a/kanji/07ab6-Kaisho.svg
+++ b/kanji/07ab6-Kaisho.svg
@@ -53,27 +53,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:07ab6-Kaisho-g5" kvg:element="婁" kvg:position="bottom">
 		<g id="kvg:07ab6-Kaisho-g6" kvg:position="top">
 			<g id="kvg:07ab6-Kaisho-g7" kvg:element="串" kvg:part="1">
-				<g id="kvg:07ab6-Kaisho-g8" kvg:element="口">
+				<g id="kvg:07ab6-Kaisho-g8" kvg:element="口" kvg:part="1">
 					<path id="kvg:07ab6-Kaisho-s6" kvg:type="㇑" d="M31.12,38.4c0.25,0.21,0.76,1.15,0.9,1.98c0.93,5.47,2.34,12.54,3.06,16.13"/>
 					<path id="kvg:07ab6-Kaisho-s7" kvg:type="㇕" d="M32.61,38.92c12.65-0.82,30.78-2.17,40.79-2.88c3.19-0.23,5.02,1.18,4.61,2.75C76.38,45.05,75.93,50.53,75,54"/>
 				</g>
 			</g>
 			<path id="kvg:07ab6-Kaisho-s8" kvg:type="㇐" d="M15.75,47.03c1.49,0.61,4.22,0.71,5.71,0.61c12.79-0.89,51.54-4.39,67.82-4.21c2.48,0.03,3.97,0.29,5.21,0.6"/>
 			<g id="kvg:07ab6-Kaisho-g9" kvg:element="串" kvg:part="2">
-				<path id="kvg:07ab6-Kaisho-s9" kvg:type="㇐" d="M35,54.78c3.54-0.17,35.44-2.52,40-2.69"/>
-				<g id="kvg:07ab6-Kaisho-g10" kvg:element="中">
-					<g id="kvg:07ab6-Kaisho-g11" kvg:element="口">
+				<g id="kvg:07ab6-Kaisho-g10" kvg:element="口" kvg:part="2">
+					<path id="kvg:07ab6-Kaisho-s9" kvg:type="㇐" d="M35,54.78c3.54-0.17,35.44-2.52,40-2.69"/>
+				</g>
+				<g id="kvg:07ab6-Kaisho-g11" kvg:element="中">
+					<g id="kvg:07ab6-Kaisho-g12" kvg:element="口">
 						<path id="kvg:07ab6-Kaisho-s10" kvg:type="㇑" d="M32.25,60.75c0.31,0.43,0.86,1,1.01,1.94c0.55,3.48,1.35,6.9,1.93,10.12"/>
 						<path id="kvg:07ab6-Kaisho-s11" kvg:type="㇕b" d="M34.11,62.31c12.3-0.69,29.44-1.83,39.17-2.43c3.1-0.19,4.89,1,4.48,2.33c-0.48,1.56-1.43,4.56-2.18,6.44"/>
 						<path id="kvg:07ab6-Kaisho-s12" kvg:type="㇐b" d="M36.76,70.85c3.21-0.12,36.35-1.73,40.48-1.87"/>
 					</g>
-					<g id="kvg:07ab6-Kaisho-g12" kvg:element="丨">
+					<g id="kvg:07ab6-Kaisho-g13" kvg:element="丨">
 						<path id="kvg:07ab6-Kaisho-s13" kvg:type="㇑" d="M51.3,28c1.57,0.41,2.5,1.85,2.82,2.68c0.31,0.82,0,34.03-0.31,39.18"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:07ab6-Kaisho-g13" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:07ab6-Kaisho-g14" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:07ab6-Kaisho-s14" kvg:type="㇛" d="M49.98,72.7c0.52,0.54,0.24,1.29-0.08,2.03c-1.59,3.65-6.65,10.1-12.27,14.59c-1.22,0.98-0.19,1.07,0.79,1c13.77-0.97,35.87,5.98,43.33,9.93"/>
 			<path id="kvg:07ab6-Kaisho-s15" kvg:type="㇒" d="M68.5,76.5c0.14,0.63,0.23,2.17-0.28,3.08C64.12,86.99,51.25,98.25,23,103"/>
 			<path id="kvg:07ab6-Kaisho-s16" kvg:type="㇐" d="M13.38,80.64c2.15,0.66,4.45,1.04,5.49,1c16.21-0.63,52.49-4,73.3-4.29c1.72-0.02,4.69,0.4,6.09,1.15"/>
diff --git a/kanji/07ab6.svg b/kanji/07ab6.svg
index 343cb7cef..683adcad4 100644
--- a/kanji/07ab6.svg
+++ b/kanji/07ab6.svg
@@ -53,27 +53,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:07ab6-g5" kvg:element="婁" kvg:position="bottom">
 		<g id="kvg:07ab6-g6" kvg:position="top">
 			<g id="kvg:07ab6-g7" kvg:element="串" kvg:part="1">
-				<g id="kvg:07ab6-g8" kvg:element="口">
+				<g id="kvg:07ab6-g8" kvg:element="口" kvg:part="1">
 					<path id="kvg:07ab6-s6" kvg:type="㇑" d="M31.12,38.4c0.25,0.21,0.76,1.15,0.9,1.98c0.93,5.47,2.34,12.54,3.06,16.13"/>
 					<path id="kvg:07ab6-s7" kvg:type="㇕" d="M32.61,38.92c12.65-0.82,30.78-2.17,40.79-2.88c3.19-0.23,5.02,1.18,4.61,2.75C76.38,45.05,75.93,50.53,75,54"/>
 				</g>
 			</g>
 			<path id="kvg:07ab6-s8" kvg:type="㇐" d="M15.75,47.03c1.49,0.61,4.22,0.71,5.71,0.61c12.79-0.89,51.54-4.39,67.82-4.21c2.48,0.03,3.97,0.29,5.21,0.6"/>
 			<g id="kvg:07ab6-g9" kvg:element="串" kvg:part="2">
-				<path id="kvg:07ab6-s9" kvg:type="㇐" d="M35,54.78c3.54-0.17,35.44-2.52,40-2.69"/>
-				<g id="kvg:07ab6-g10" kvg:element="中">
-					<g id="kvg:07ab6-g11" kvg:element="口">
+				<g id="kvg:07ab6-g10" kvg:element="口" kvg:part="2">
+					<path id="kvg:07ab6-s9" kvg:type="㇐" d="M35,54.78c3.54-0.17,35.44-2.52,40-2.69"/>
+				</g>
+				<g id="kvg:07ab6-g11" kvg:element="中">
+					<g id="kvg:07ab6-g12" kvg:element="口">
 						<path id="kvg:07ab6-s10" kvg:type="㇑" d="M32.25,60.75c0.31,0.43,0.86,1,1.01,1.94c0.55,3.48,1.35,6.9,1.93,10.12"/>
 						<path id="kvg:07ab6-s11" kvg:type="㇕b" d="M34.11,62.31c12.3-0.69,29.44-1.83,39.17-2.43c3.1-0.19,4.89,1,4.48,2.33c-0.48,1.56-1.43,4.56-2.18,6.44"/>
 						<path id="kvg:07ab6-s12" kvg:type="㇐b" d="M36.76,70.85c3.21-0.12,36.35-1.73,40.48-1.87"/>
 					</g>
-					<g id="kvg:07ab6-g12" kvg:element="丨">
+					<g id="kvg:07ab6-g13" kvg:element="丨">
 						<path id="kvg:07ab6-s13" kvg:type="㇑" d="M51.3,28c1.57,0.41,2.5,1.85,2.82,2.68c0.31,0.82,0,34.03-0.31,39.18"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:07ab6-g13" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:07ab6-g14" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:07ab6-s14" kvg:type="㇛" d="M49.98,72.7c0.52,0.54,0.24,1.29-0.08,2.03c-1.59,3.65-6.65,10.1-12.27,14.59c-1.22,0.98-0.19,1.07,0.79,1c13.77-0.97,35.87,5.98,43.33,9.93"/>
 			<path id="kvg:07ab6-s15" kvg:type="㇒" d="M68.5,76.5c0.14,0.63,0.23,2.17-0.28,3.08C64.12,86.99,51.25,98.25,23,103"/>
 			<path id="kvg:07ab6-s16" kvg:type="㇐" d="M13.38,80.64c2.15,0.66,4.45,1.04,5.49,1c16.21-0.63,52.49-4,73.3-4.29c1.72-0.02,4.69,0.4,6.09,1.15"/>
diff --git a/kanji/07c0d.svg b/kanji/07c0d.svg
index 8f1adbb94..0111d83a7 100644
--- a/kanji/07c0d.svg
+++ b/kanji/07c0d.svg
@@ -52,27 +52,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:07c0d-g4" kvg:element="婁" kvg:position="bottom">
 		<g id="kvg:07c0d-g5" kvg:position="top">
 			<g id="kvg:07c0d-g6" kvg:element="串" kvg:part="1">
-				<g id="kvg:07c0d-g7" kvg:element="口">
+				<g id="kvg:07c0d-g7" kvg:element="口" kvg:part="1">
 					<path id="kvg:07c0d-s7" kvg:type="㇑" d="M31.04,38.23c0.44,0.24,1.26,1.27,1.41,2.17c0.98,5.85,1.83,12.33,2.67,16.18"/>
 					<path id="kvg:07c0d-s8" kvg:type="㇕" d="M31.93,38.92c12.88-0.73,32.31-2.48,42.49-3.13c3.25-0.21,4.09,1.34,3.65,3.05c-1.74,6.78-1.96,11.25-2.95,15.02"/>
 				</g>
 			</g>
 			<path id="kvg:07c0d-s9" kvg:type="㇐" d="M16.25,46.98c1.48,0.6,4.21,0.75,5.69,0.6C33.37,46.48,72,44,89.55,43.92c2.47-0.01,3.96,0.29,5.2,0.59"/>
 			<g id="kvg:07c0d-g8" kvg:element="串" kvg:part="2">
-				<path id="kvg:07c0d-s10" kvg:type="㇐" d="M35.75,54.68c3.37-0.21,34.17-1.89,38.5-2.1"/>
-				<g id="kvg:07c0d-g9" kvg:element="中">
-					<g id="kvg:07c0d-g10" kvg:element="口">
+				<g id="kvg:07c0d-g9" kvg:element="口" kvg:part="2">
+					<path id="kvg:07c0d-s10" kvg:type="㇐" d="M35.75,54.68c3.37-0.21,34.17-1.89,38.5-2.1"/>
+				</g>
+				<g id="kvg:07c0d-g10" kvg:element="中">
+					<g id="kvg:07c0d-g11" kvg:element="口">
 						<path id="kvg:07c0d-s11" kvg:type="㇑" d="M31.73,61.04c0.27,0.48,0.74,1.11,0.86,2.16c0.47,3.87,1.66,6.67,2.15,10.24"/>
 						<path id="kvg:07c0d-s12" kvg:type="㇕b" d="M33.86,61.45c12.37-0.77,30.61-1.55,40.39-2.22c3.12-0.21,3.92,1.12,3.51,2.6c-0.48,1.74-1.44,4.6-2.19,6.7"/>
 						<path id="kvg:07c0d-s13" kvg:type="㇐b" d="M34.5,71.32c3.28-0.17,39.04-2.05,43.25-2.22"/>
 					</g>
-					<g id="kvg:07c0d-g11" kvg:element="丨">
+					<g id="kvg:07c0d-g12" kvg:element="丨">
 						<path id="kvg:07c0d-s14" kvg:type="㇑" d="M52.76,29.5c0.81,0.43,1.29,1.94,1.46,2.8c0.16,0.86,0,32.41-0.16,37.79"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:07c0d-g12" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:07c0d-g13" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:07c0d-s15" kvg:type="㇛" d="M49.82,72.78c0.45,0.64,0.13,1.44-0.23,2.23c-1.76,3.88-6.79,9.74-12.4,14.2c-1.22,0.97-0.25,1.27,0.67,1.17c14.39-1.62,29.89,4.38,42.64,10.88"/>
 			<path id="kvg:07c0d-s16" kvg:type="㇒" d="M68.5,76.75c0.14,0.61,0.23,2.1-0.27,2.99c-4.08,7.2-13.24,18.05-44.98,22.76"/>
 			<path id="kvg:07c0d-s17" kvg:type="㇐" d="M14.65,80.82c2.09,0.25,4.33,0.39,5.34,0.38c15.76-0.25,51.55-3.37,71.79-3.49c1.68-0.01,4.56,0.15,5.92,0.43"/>
diff --git a/kanji/07c54.svg b/kanji/07c54.svg
index 08f5de637..46b86f50c 100644
--- a/kanji/07c54.svg
+++ b/kanji/07c54.svg
@@ -53,39 +53,41 @@ kvg:type CDATA #IMPLIED >
 		<g id="kvg:07c54-g5" kvg:element="婁" kvg:position="left">
 			<g id="kvg:07c54-g6" kvg:position="top">
 				<g id="kvg:07c54-g7" kvg:element="串" kvg:part="1">
-					<g id="kvg:07c54-g8" kvg:element="口">
+					<g id="kvg:07c54-g8" kvg:element="口" kvg:part="1">
 						<path id="kvg:07c54-s7" kvg:type="㇑" d="M21.24,37.21c0.22,0.24,0.65,1.31,0.73,2.24c0.55,6.07,1.78,12.33,2.25,16.33"/>
 						<path id="kvg:07c54-s8" kvg:type="㇕" d="M21.8,38.62c8.07-0.91,21.79-1.98,28.17-2.77c2.03-0.25,3.2,1.31,2.94,3.06c-1.04,6.96-2.15,10.61-3.36,14.9"/>
 					</g>
 				</g>
 				<path id="kvg:07c54-s9" kvg:type="㇐" d="M12.24,46.32c1.19,0.46,3.37,0.54,4.57,0.46c12.55-0.84,27.94-2.03,40.37-3.17c1.98-0.18,3.18,0.22,4.17,0.45"/>
 				<g id="kvg:07c54-g9" kvg:element="串" kvg:part="2">
-					<path id="kvg:07c54-s10" kvg:type="㇐" d="M24.58,53.67c4.97-0.4,20.12-1.41,25.11-1.61"/>
-					<g id="kvg:07c54-g10" kvg:element="中">
-						<g id="kvg:07c54-g11" kvg:element="口">
+					<g id="kvg:07c54-g10" kvg:element="口" kvg:part="2">
+						<path id="kvg:07c54-s10" kvg:type="㇐" d="M24.58,53.67c4.97-0.4,20.12-1.41,25.11-1.61"/>
+					</g>
+					<g id="kvg:07c54-g11" kvg:element="中">
+						<g id="kvg:07c54-g12" kvg:element="口">
 							<path id="kvg:07c54-s11" kvg:type="㇑" d="M21.46,60.25c0.48,0.45,0.75,1.48,0.99,2.22c0.66,2.08,1.59,6.4,1.92,9.31"/>
 							<path id="kvg:07c54-s12" kvg:type="㇕b" d="M23.39,61.71c6.69-0.72,20.79-2.31,26.08-2.94c1.69-0.2,2.25,0.33,2,2.04c-0.19,1.35-1.21,3.98-1.62,5.95"/>
 							<path id="kvg:07c54-s13" kvg:type="㇐b" d="M25.58,69.27c1.67-0.2,24.21-1.31,26.35-1.51"/>
 						</g>
-						<g id="kvg:07c54-g12" kvg:element="丨">
+						<g id="kvg:07c54-g13" kvg:element="丨">
 							<path id="kvg:07c54-s14" kvg:type="㇑" d="M35.66,31.23c1.07,0.4,1.71,1.81,1.92,2.61c0.21,0.8,0,29.14-0.21,34.17"/>
 						</g>
 					</g>
 				</g>
 			</g>
-			<g id="kvg:07c54-g13" kvg:element="女" kvg:position="bottom">
+			<g id="kvg:07c54-g14" kvg:element="女" kvg:position="bottom">
 				<path id="kvg:07c54-s15" kvg:type="㇛" d="M35.11,71.28c0.24,0.75-0.01,1.65-0.28,2.55c-1.35,4.38-7.4,10.37-11.19,15.28c-0.82,1.07-0.23,1.37,0.34,1.36c9.7-0.17,22.27,4.54,27.82,10.27"/>
 				<path id="kvg:07c54-s16" kvg:type="㇒" d="M47.75,75.5c0.1,0.64,0.32,2.22-0.19,3.11c-4.44,7.71-11.01,18.04-32.06,23.64"/>
 				<path id="kvg:07c54-s17" kvg:type="㇐" d="M12.63,81.1c1.27,0.57,2.63,0.42,3.24,0.38C27.36,80.83,42.49,79.2,56,78.31c1.1-0.07,2,0.19,3.26,0.3"/>
 			</g>
 		</g>
-		<g id="kvg:07c54-g14" kvg:element="攵" kvg:variant="true" kvg:original="攴" kvg:position="right">
-			<g id="kvg:07c54-g15" kvg:position="top">
+		<g id="kvg:07c54-g15" kvg:element="攵" kvg:variant="true" kvg:original="攴" kvg:position="right">
+			<g id="kvg:07c54-g16" kvg:position="top">
 				<path id="kvg:07c54-s18" kvg:type="㇒" d="M71.1,32.39c0.04,0.68,0.23,1.78-0.07,2.71c-1.92,5.94-7.13,19.42-13.78,27.65"/>
 				<path id="kvg:07c54-s19" kvg:type="㇐" d="M69.97,45.81c0.03-0.14,1.62,0,2.2-0.04c5.96-0.42,10.46-1.94,19.56-2.62c1.02-0.08,1.65-0.02,1.92,0.07"/>
 			</g>
-			<g id="kvg:07c54-g16" kvg:element="乂" kvg:position="bottom">
-				<g id="kvg:07c54-g17" kvg:element="丿">
+			<g id="kvg:07c54-g17" kvg:element="乂" kvg:position="bottom">
+				<g id="kvg:07c54-g18" kvg:element="丿">
 					<path id="kvg:07c54-s20" kvg:type="㇒" d="M83.66,48.56c0.44,1.19,0.68,2.04,0.22,4.22C79.69,72.57,70.15,90.24,56.37,97.1"/>
 				</g>
 				<path id="kvg:07c54-s21" kvg:type="㇏" d="M62.75,60c2.83,0.22,19.84,28.65,28.95,35.56c1.75,1.33,2.87,1.55,4.3,1.69"/>
diff --git a/kanji/07d20-Kaisho.svg b/kanji/07d20-Kaisho.svg
index 8e8768d18..5ec3d27dd 100644
--- a/kanji/07d20-Kaisho.svg
+++ b/kanji/07d20-Kaisho.svg
@@ -38,11 +38,11 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_07d20-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:07d20-Kaisho" kvg:element="素">
 	<g id="kvg:07d20-Kaisho-g1" kvg:element="龶" kvg:position="top">
-		<g id="kvg:07d20-Kaisho-g2" kvg:element="三" kvg:position="top">
+		<g id="kvg:07d20-Kaisho-g2" kvg:element="三" kvg:part="1" kvg:position="top">
 			<path id="kvg:07d20-Kaisho-s1" kvg:type="㇐" d="M34.13,23.67c0.94,0.38,2.66,0.46,3.6,0.38c6.77-0.55,26.02-3.3,31.86-3.88c1.56-0.16,2.21-0.09,3.03-0.02"/>
 		</g>
 		<path id="kvg:07d20-Kaisho-s2" kvg:type="㇑" d="M52.06,12.38c0.76,0.26,2.01,1.62,2.01,3.42c0,5.69-0.15,19.06-0.07,27.19"/>
-		<g id="kvg:07d20-Kaisho-g3" kvg:element="三" kvg:position="bottom">
+		<g id="kvg:07d20-Kaisho-g3" kvg:element="三" kvg:part="2" kvg:position="bottom">
 			<path id="kvg:07d20-Kaisho-s3" kvg:type="㇐" d="M31.38,34.78c0.94,0.28,2.66,0.34,3.6,0.28c6.77-0.4,30.02-4.49,35.86-4.92c1.56-0.11,2.71-0.06,3.53-0.02"/>
 			<path id="kvg:07d20-Kaisho-s4" kvg:type="㇐" d="M15.63,46.5c1.47,0.3,4.15,0.36,5.62,0.3c10.56-0.43,53.76-6.05,65.52-6.3c2.43-0.05,5.98-0.25,7.73,0.48"/>
 		</g>
diff --git a/kanji/07e37-Kaisho.svg b/kanji/07e37-Kaisho.svg
index f8887d54c..f45dc76ca 100644
--- a/kanji/07e37-Kaisho.svg
+++ b/kanji/07e37-Kaisho.svg
@@ -48,27 +48,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:07e37-Kaisho-g2" kvg:element="婁" kvg:position="right">
 		<g id="kvg:07e37-Kaisho-g3" kvg:position="top">
 			<g id="kvg:07e37-Kaisho-g4" kvg:element="串" kvg:part="1">
-				<g id="kvg:07e37-Kaisho-g5" kvg:element="口">
+				<g id="kvg:07e37-Kaisho-g5" kvg:element="口" kvg:part="1">
 					<path id="kvg:07e37-Kaisho-s7" kvg:type="㇑" d="M49.03,19.23c0.56,0.25,1.6,1.33,1.79,2.27c1.24,6.13,1.84,13.43,2.92,17.47"/>
 					<path id="kvg:07e37-Kaisho-s8" kvg:type="㇕" d="M50.13,20.34c10.34-1,24.74-1.64,32.91-2.51c2.61-0.28,4.1,1.44,3.77,3.35C85.47,28.8,84.52,32.77,83.77,37"/>
 				</g>
 			</g>
 			<path id="kvg:07e37-Kaisho-s9" kvg:type="㇐" d="M42.3,29.55c1.26,0.43,3.58,0.52,4.84,0.43c11.11-0.73,31.61-2.98,45.06-3.98c1.81-0.13,3.57,0.64,4.92,0.92"/>
 			<g id="kvg:07e37-Kaisho-g6" kvg:element="串" kvg:part="2">
-				<path id="kvg:07e37-Kaisho-s10" kvg:type="㇐" d="M53.7,37.74c2.56-0.17,26.52-2.06,29.81-2.23"/>
-				<g id="kvg:07e37-Kaisho-g7" kvg:element="中">
-					<g id="kvg:07e37-Kaisho-g8" kvg:element="口">
+				<g id="kvg:07e37-Kaisho-g7" kvg:element="口" kvg:part="2">
+					<path id="kvg:07e37-Kaisho-s10" kvg:type="㇐" d="M53.7,37.74c2.56-0.17,26.52-2.06,29.81-2.23"/>
+				</g>
+				<g id="kvg:07e37-Kaisho-g8" kvg:element="中">
+					<g id="kvg:07e37-Kaisho-g9" kvg:element="口">
 						<path id="kvg:07e37-Kaisho-s11" kvg:type="㇑" d="M50.51,45.98c0.45,0.44,1.23,1.02,1.45,1.98c0.78,3.54,1.94,7.03,2.76,10.3"/>
 						<path id="kvg:07e37-Kaisho-s12" kvg:type="㇕b" d="M51.45,47.07c9.8-0.92,23.46-2.44,31.21-3.24c2.47-0.25,3.9,1.33,3.57,3.1C85.85,49,85,52.25,83.99,56"/>
 						<path id="kvg:07e37-Kaisho-s13" kvg:type="㇐b" d="M55.45,56.56c2.3-0.16,25.33-1.46,28.3-1.62"/>
 					</g>
-					<g id="kvg:07e37-Kaisho-g9" kvg:element="丨">
+					<g id="kvg:07e37-Kaisho-g10" kvg:element="丨">
 						<path id="kvg:07e37-Kaisho-s14" kvg:type="㇑" d="M66.31,10.5c0.83,0.46,1.32,2.08,1.48,3.01c0.16,0.93,0,35.45-0.17,41.24"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:07e37-Kaisho-g10" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:07e37-Kaisho-g11" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:07e37-Kaisho-s15" kvg:type="㇛" d="M66.44,58.87c0.37,0.92,0.11,2.09-0.18,3.24c-1.44,5.63-7.59,13.41-12.18,19.88c-1,1.41-0.21,1.68,0.55,1.69C65.28,83.83,82.74,90.76,88.25,98"/>
 			<path id="kvg:07e37-Kaisho-s16" kvg:type="㇒" d="M80.98,64.25c0.11,0.81,0.19,2.78-0.22,3.96c-3.29,9.5-10.66,23.83-36.23,30.04"/>
 			<path id="kvg:07e37-Kaisho-s17" kvg:type="㇐" d="M44.63,72.71c1.69,0.3,3.49,0.48,4.3,0.46c12.71-0.29,28.22-3.66,44.54-3.79c1.35-0.01,3.68,0.19,4.78,0.53"/>
diff --git a/kanji/07e37.svg b/kanji/07e37.svg
index 37483b716..92b2d9cf5 100644
--- a/kanji/07e37.svg
+++ b/kanji/07e37.svg
@@ -48,27 +48,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:07e37-g2" kvg:element="婁" kvg:position="right">
 		<g id="kvg:07e37-g3" kvg:position="top">
 			<g id="kvg:07e37-g4" kvg:element="串" kvg:part="1">
-				<g id="kvg:07e37-g5" kvg:element="口">
+				<g id="kvg:07e37-g5" kvg:element="口" kvg:part="1">
 					<path id="kvg:07e37-s7" kvg:type="㇑" d="M49.03,19.23c0.56,0.25,1.6,1.33,1.79,2.27c1.24,6.13,1.84,13.43,2.92,17.47"/>
 					<path id="kvg:07e37-s8" kvg:type="㇕" d="M50.13,20.34c10.34-1,24.74-1.64,32.91-2.51c2.61-0.28,4.1,1.44,3.77,3.35C85.47,28.8,84.52,32.77,83.77,37"/>
 				</g>
 			</g>
 			<path id="kvg:07e37-s9" kvg:type="㇐" d="M42.3,29.55c1.26,0.43,3.58,0.52,4.84,0.43c11.11-0.73,31.61-2.98,45.06-3.98c1.81-0.13,3.57,0.64,4.92,0.92"/>
 			<g id="kvg:07e37-g6" kvg:element="串" kvg:part="2">
-				<path id="kvg:07e37-s10" kvg:type="㇐" d="M53.7,37.74c2.56-0.17,26.52-2.06,29.81-2.23"/>
-				<g id="kvg:07e37-g7" kvg:element="中">
-					<g id="kvg:07e37-g8" kvg:element="口">
+				<g id="kvg:07e37-g7" kvg:element="口" kvg:part="2">
+					<path id="kvg:07e37-s10" kvg:type="㇐" d="M53.7,37.74c2.56-0.17,26.52-2.06,29.81-2.23"/>
+				</g>
+				<g id="kvg:07e37-g8" kvg:element="中">
+					<g id="kvg:07e37-g9" kvg:element="口">
 						<path id="kvg:07e37-s11" kvg:type="㇑" d="M50.51,45.98c0.45,0.44,1.23,1.02,1.45,1.98c0.78,3.54,1.94,7.03,2.76,10.3"/>
 						<path id="kvg:07e37-s12" kvg:type="㇕b" d="M51.45,47.07c9.8-0.92,23.46-2.44,31.21-3.24c2.47-0.25,3.9,1.33,3.57,3.1C85.85,49,85,52.25,83.99,56"/>
 						<path id="kvg:07e37-s13" kvg:type="㇐b" d="M55.45,56.56c2.3-0.16,25.33-1.46,28.3-1.62"/>
 					</g>
-					<g id="kvg:07e37-g9" kvg:element="丨">
+					<g id="kvg:07e37-g10" kvg:element="丨">
 						<path id="kvg:07e37-s14" kvg:type="㇑" d="M66.31,10.5c0.83,0.46,1.32,2.08,1.48,3.01c0.16,0.93,0,35.45-0.17,41.24"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:07e37-g10" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:07e37-g11" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:07e37-s15" kvg:type="㇛" d="M66.44,58.87c0.37,0.92,0.11,2.09-0.18,3.24c-1.44,5.63-7.59,13.41-12.18,19.88c-1,1.41-0.21,1.68,0.55,1.69C65.28,83.83,82.74,90.76,88.25,98"/>
 			<path id="kvg:07e37-s16" kvg:type="㇒" d="M80.98,64.25c0.11,0.81,0.19,2.78-0.22,3.96c-3.29,9.5-10.66,23.83-36.23,30.04"/>
 			<path id="kvg:07e37-s17" kvg:type="㇐" d="M44.63,72.71c1.69,0.3,3.49,0.48,4.3,0.46c12.71-0.29,28.22-3.66,44.54-3.79c1.35-0.01,3.68,0.19,4.78,0.53"/>
diff --git a/kanji/081ba-Kaisho.svg b/kanji/081ba-Kaisho.svg
index c23eaa075..57165f192 100644
--- a/kanji/081ba-Kaisho.svg
+++ b/kanji/081ba-Kaisho.svg
@@ -37,12 +37,12 @@ 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_081ba-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:081ba-Kaisho" kvg:element="膺">
-	<g id="kvg:081ba-Kaisho-g1" kvg:element="广" kvg:part="1" kvg:position="tare" kvg:radical="nelson">
+	<g id="kvg:081ba-Kaisho-g1" kvg:element="广" kvg:position="tare" kvg:radical="nelson">
 		<path id="kvg:081ba-Kaisho-s1" kvg:type="㇑a" d="M52.42,10.25c0.76,0.34,1.68,1.98,1.83,2.67c0.15,0.68,0.16,2.82,0.01,7.08"/>
 		<path id="kvg:081ba-Kaisho-s2" kvg:type="㇐" d="M22.08,22.08c1.52,0.54,4.6,0.52,6.12,0.43C44,21.61,63.5,19,83.31,18.79c2.53-0.03,4.34,0.36,5.6,0.63"/>
 		<path id="kvg:081ba-Kaisho-s3" kvg:type="㇒" d="M26.91,23.58c0.05,1.6,0.1,4.14-0.1,6.45c-1.18,13.59-3.85,46.55-16.58,61.19"/>
 	</g>
-	<g id="kvg:081ba-Kaisho-g2" kvg:element="膺" kvg:position="tarec">
+	<g id="kvg:081ba-Kaisho-g2" kvg:position="tarec">
 		<g id="kvg:081ba-Kaisho-g3" kvg:position="倠">
 			<g id="kvg:081ba-Kaisho-g4" kvg:element="亻" kvg:variant="true" kvg:original="人">
 				<path id="kvg:081ba-Kaisho-s4" kvg:type="㇒" d="M44.25,26.56c0.1,0.52,0.17,1.18-0.09,1.83c-1.61,4.08-7.35,11.47-14.87,17"/>
diff --git a/kanji/08262.svg b/kanji/08262.svg
index eec7fb2ff..807d0cab0 100644
--- a/kanji/08262.svg
+++ b/kanji/08262.svg
@@ -64,7 +64,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:08262-g9" kvg:element="工" kvg:part="2" kvg:variant="true">
-				<g id="kvg:08262-g10" kvg:element="土">
+				<g id="kvg:08262-g10" kvg:element="土" kvg:part="2">
 					<path id="kvg:08262-s13" kvg:type="㇐" d="M42.58,55.66c0.72,0.09,3.42,0.58,6,0.48c13.08-0.53,29.67-2.46,41.83-2.93c3.08-0.12,6.52,0.47,7.5,0.62"/>
 				</g>
 			</g>
diff --git a/kanji/08594.svg b/kanji/08594.svg
index cb5aa2c3b..950998a7e 100644
--- a/kanji/08594.svg
+++ b/kanji/08594.svg
@@ -61,7 +61,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:08594-g9" kvg:element="工" kvg:part="2" kvg:variant="true">
-				<g id="kvg:08594-g10" kvg:element="土">
+				<g id="kvg:08594-g10" kvg:element="土" kvg:part="2">
 					<path id="kvg:08594-s10" kvg:type="㇐" d="M15.87,63.34c0.89,0.21,4.08,0.42,5.59,0.33c16.28-1.01,49.53-3.92,64.35-4.22c2.43-0.05,5.34,0.34,6.56,0.67"/>
 				</g>
 			</g>
diff --git a/kanji/085ea.svg b/kanji/085ea.svg
index e460cc50a..57d56c813 100644
--- a/kanji/085ea.svg
+++ b/kanji/085ea.svg
@@ -46,39 +46,41 @@ kvg:type CDATA #IMPLIED >
 		<g id="kvg:085ea-g3" kvg:element="婁" kvg:position="left">
 			<g id="kvg:085ea-g4" kvg:position="top">
 				<g id="kvg:085ea-g5" kvg:element="串" kvg:part="1">
-					<g id="kvg:085ea-g6" kvg:element="口">
+					<g id="kvg:085ea-g6" kvg:element="口" kvg:part="2">
 						<path id="kvg:085ea-s4" kvg:type="㇑" d="M22.16,34.61c0.27,0.22,0.77,1.16,0.86,1.97c0.59,5.34,2.5,10.86,3.02,14.38"/>
 						<path id="kvg:085ea-s5" kvg:type="㇕" d="M23.14,35.67c7.18-0.84,19.88-2.32,25.55-3.05c1.81-0.23,2.85,1.2,2.61,2.81c-0.92,6.39-1.41,9.74-2.49,13.68"/>
 					</g>
 				</g>
 				<path id="kvg:085ea-s6" kvg:type="㇐" d="M13.31,42.28c0.84,0.43,2.87,0.5,3.71,0.43c8.81-0.78,27.23-2.21,37.59-2.94c1.39-0.1,2.23,0.2,2.93,0.42"/>
 				<g id="kvg:085ea-g7" kvg:element="串" kvg:part="2">
-					<path id="kvg:085ea-s7" kvg:type="㇐" d="M26.75,49.42c4.34-0.39,17.58-1.38,21.93-1.58"/>
-					<g id="kvg:085ea-g8" kvg:element="中">
-						<g id="kvg:085ea-g9" kvg:element="口">
+					<g id="kvg:085ea-g8" kvg:element="口" kvg:part="2">
+						<path id="kvg:085ea-s7" kvg:type="㇐" d="M26.75,49.42c4.34-0.39,17.58-1.38,21.93-1.58"/>
+					</g>
+					<g id="kvg:085ea-g9" kvg:element="中">
+						<g id="kvg:085ea-g10" kvg:element="口">
 							<path id="kvg:085ea-s8" kvg:type="㇑" d="M21.89,55.71c0.54,0.41,0.85,1.37,1.12,2.04c0.75,1.92,1.79,5.91,2.17,8.59"/>
 							<path id="kvg:085ea-s9" kvg:type="㇕b" d="M23.18,57.36c6.81-0.73,20.14-2.32,25.52-2.95c1.72-0.2,2.29,0.33,2.04,2.05c-0.2,1.35-1.23,3.5-1.65,5.47"/>
 							<path id="kvg:085ea-s10" kvg:type="㇐b" d="M25.01,64.8c1.84-0.2,22.61-1.77,24.98-1.97"/>
 						</g>
-						<g id="kvg:085ea-g10" kvg:element="丨">
+						<g id="kvg:085ea-g11" kvg:element="丨">
 							<path id="kvg:085ea-s11" kvg:type="㇑" d="M36.05,27.73c0.57,0.39,0.92,1.77,1.03,2.56c0.11,0.79,0,28.59-0.11,33.52"/>
 						</g>
 					</g>
 				</g>
 			</g>
-			<g id="kvg:085ea-g11" kvg:element="女" kvg:position="bottom">
+			<g id="kvg:085ea-g12" kvg:element="女" kvg:position="bottom">
 				<path id="kvg:085ea-s12" kvg:type="㇛" d="M34.14,66.51c0.26,0.75,0.08,1.69-0.13,2.62c-1.03,4.55-5.94,10-9.23,15.22c-0.72,1.14-0.15,1.34,0.39,1.37c10.08,0.53,17.08,4.78,21.1,10.4"/>
 				<path id="kvg:085ea-s13" kvg:type="㇒" d="M45.88,69.82c0.08,0.65,0.25,2.28-0.16,3.19c-3.54,7.91-8.79,18.5-25.58,24.24"/>
 				<path id="kvg:085ea-s14" kvg:type="㇀/㇐" d="M15.63,75.07c1.07,0.84,2.21,1.34,2.72,1.29c10.4-1.15,24.36-3.99,36.33-5.32"/>
 			</g>
 		</g>
-		<g id="kvg:085ea-g12" kvg:element="攵" kvg:variant="true" kvg:original="攴" kvg:position="right">
-			<g id="kvg:085ea-g13" kvg:position="top">
+		<g id="kvg:085ea-g13" kvg:element="攵" kvg:variant="true" kvg:original="攴" kvg:position="right">
+			<g id="kvg:085ea-g14" kvg:position="top">
 				<path id="kvg:085ea-s15" kvg:type="㇒" d="M70.35,29.89c0.04,0.66,0.22,1.73-0.07,2.63c-1.85,5.79-6.88,18.9-13.29,26.91"/>
 				<path id="kvg:085ea-s16" kvg:type="㇐" d="M67.22,49.36c0.03-0.15,1.76,0,2.38-0.04c6.46-0.43,11.35-1.99,21.22-2.68c1.11-0.08,1.79-0.02,2.08,0.07"/>
 			</g>
-			<g id="kvg:085ea-g14" kvg:element="乂" kvg:position="bottom">
-				<g id="kvg:085ea-g15" kvg:element="丿">
+			<g id="kvg:085ea-g15" kvg:element="乂" kvg:position="bottom">
+				<g id="kvg:085ea-g16" kvg:element="丿">
 					<path id="kvg:085ea-s17" kvg:type="㇒" d="M79.9,51.74c0.45,1.11,0.7,1.9,0.23,3.93c-4.3,18.43-14.11,34.89-28.26,41.28"/>
 				</g>
 				<path id="kvg:085ea-s18" kvg:type="㇏" d="M60,61.74c3,2.01,19.49,23.3,27.58,31.51c1.72,1.75,2.95,3,4.92,4.25"/>
diff --git a/kanji/0862d-Kaisho.svg b/kanji/0862d-Kaisho.svg
index 24081c7b2..4882e7b78 100644
--- a/kanji/0862d-Kaisho.svg
+++ b/kanji/0862d-Kaisho.svg
@@ -70,7 +70,7 @@ kvg:type CDATA #IMPLIED >
 					<path id="kvg:0862d-Kaisho-s15" kvg:type="㇐" d="M40.05,69.08c6.74-0.61,13.48-1.32,20.22-1.94c0.75-0.07,1.48-0.13,2.18-0.2"/>
 				</g>
 			</g>
-			<g id="kvg:0862d-Kaisho-g11" kvg:element="束">
+			<g id="kvg:0862d-Kaisho-g11" kvg:element="束" kvg:part="2">
 				<g id="kvg:0862d-Kaisho-g12" kvg:element="日" kvg:part="2">
 					<g id="kvg:0862d-Kaisho-g13" kvg:element="口" kvg:part="2">
 						<path id="kvg:0862d-Kaisho-s16" kvg:type="㇐" d="M41.98,76.11c5.26-0.29,18.84-2.17,25.39-2.42"/>
diff --git a/kanji/0862d.svg b/kanji/0862d.svg
index 5f401ff0c..be75016cd 100644
--- a/kanji/0862d.svg
+++ b/kanji/0862d.svg
@@ -70,7 +70,7 @@ kvg:type CDATA #IMPLIED >
 					<path id="kvg:0862d-s15" kvg:type="㇐" d="M40.05,69.08c4.87-0.45,25.9-2.67,28.82-2.67"/>
 				</g>
 			</g>
-			<g id="kvg:0862d-g11" kvg:element="束">
+			<g id="kvg:0862d-g11" kvg:element="束" kvg:part="2">
 				<g id="kvg:0862d-g12" kvg:element="日" kvg:part="2">
 					<g id="kvg:0862d-g13" kvg:element="口" kvg:part="2">
 						<path id="kvg:0862d-s16" kvg:type="㇐" d="M41.23,76.11c6.65-0.74,18.84-2.17,25.39-2.42"/>
diff --git a/kanji/087bb.svg b/kanji/087bb.svg
index 9aa1c1b22..3b93f0f78 100644
--- a/kanji/087bb.svg
+++ b/kanji/087bb.svg
@@ -54,27 +54,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:087bb-g5" kvg:element="婁" kvg:position="right">
 		<g id="kvg:087bb-g6" kvg:position="top">
 			<g id="kvg:087bb-g7" kvg:element="串" kvg:part="1">
-				<g id="kvg:087bb-g8" kvg:element="口">
+				<g id="kvg:087bb-g8" kvg:element="口" kvg:part="1">
 					<path id="kvg:087bb-s7" kvg:type="㇑" d="M51.72,20.1c0.36,0.26,1.03,1.42,1.16,2.41c0.8,6.52,1.51,14.75,2.21,19.05"/>
 					<path id="kvg:087bb-s8" kvg:type="㇕" d="M53.04,21.39c9.68-1.02,24.17-1.71,31.83-2.59c2.44-0.28,3.84,1.47,3.53,3.44c-1.24,7.81-3.13,12.38-3.84,16.72"/>
 				</g>
 			</g>
 			<path id="kvg:087bb-s9" kvg:type="㇐" d="M44.46,30.1c1.5,0.64,4.24,0.78,5.74,0.64c9.02-0.86,28.13-2.2,41.5-2.68c2.49-0.09,3.8-0.57,5.74-0.37"/>
 			<g id="kvg:087bb-g9" kvg:element="串" kvg:part="2">
-				<path id="kvg:087bb-s10" kvg:type="㇐" d="M55.45,40.15c2.49-0.24,25.21-2.17,28.4-2.41"/>
-				<g id="kvg:087bb-g10" kvg:element="中">
-					<g id="kvg:087bb-g11" kvg:element="口">
+				<g id="kvg:087bb-g10" kvg:element="口" kvg:part="2">
+					<path id="kvg:087bb-s10" kvg:type="㇐" d="M55.45,40.15c2.49-0.24,25.21-2.17,28.4-2.41"/>
+				</g>
+				<g id="kvg:087bb-g11" kvg:element="中">
+					<g id="kvg:087bb-g12" kvg:element="口">
 						<path id="kvg:087bb-s11" kvg:type="㇑" d="M52.14,46.37c0.28,0.44,0.78,1.03,0.91,2.01c0.49,3.61,1.22,8.16,1.74,11.49"/>
 						<path id="kvg:087bb-s12" kvg:type="㇕b" d="M53.28,48.42c9.18-0.89,23.98-2.35,31.24-3.12c2.32-0.25,3.65,1.28,3.35,2.99c-0.36,2-1.57,4.85-2.13,7.26"/>
 						<path id="kvg:087bb-s13" kvg:type="㇐b" d="M55.16,57.96c2.49-0.24,28.83-1.67,32.03-1.91"/>
 					</g>
-					<g id="kvg:087bb-g12" kvg:element="丨">
+					<g id="kvg:087bb-g13" kvg:element="丨">
 						<path id="kvg:087bb-s14" kvg:type="㇑" d="M68.67,12.25c0.77,0.48,1.24,2.17,1.39,3.13s0,34.85-0.15,40.87"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:087bb-g13" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:087bb-g14" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:087bb-s15" kvg:type="㇛" d="M67.7,59.27c0.35,0.86,0.11,1.95-0.18,3.02c-1.39,5.25-7.35,12.5-11.8,18.54c-0.97,1.31-0.2,1.57,0.53,1.58c10.32,0.14,27.73,7.61,33.07,14.36"/>
 			<path id="kvg:087bb-s16" kvg:type="㇒" d="M81.82,65.63c0.1,0.74,0.16,2.54-0.19,3.62c-2.84,8.7-9.23,21.81-31.37,27.5"/>
 			<path id="kvg:087bb-s17" kvg:type="㇐" d="M42.63,68.22c2.08,0.57,4.29,0.9,5.29,0.87c15.64-0.55,25.08-1.33,45.2-2.79c1.66-0.12,4.53-0.15,5.88,0.5"/>
diff --git a/kanji/088c1-Kaisho.svg b/kanji/088c1-Kaisho.svg
index 24e81322b..6db273e68 100644
--- a/kanji/088c1-Kaisho.svg
+++ b/kanji/088c1-Kaisho.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_088c1-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:088c1-Kaisho" kvg:element="裁">
-	<g id="kvg:088c1-Kaisho-g1" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:088c1-Kaisho-g1" kvg:element="𢦏" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:088c1-Kaisho-g2" kvg:element="土" kvg:part="1">
 			<g id="kvg:088c1-Kaisho-g3" kvg:element="十" kvg:radical="nelson">
 				<path id="kvg:088c1-Kaisho-s1" kvg:type="㇐" d="M23.13,25.88c0.98,0.26,2.78,0.32,3.76,0.26c6.86-0.38,15.86-2.25,22.3-2.83c1.62-0.14,2.62,0.12,3.43,0.26"/>
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:088c1-Kaisho-s9" kvg:type="㇏" d="M42.12,65.56c6.88,4.19,12.63,9.69,18.21,18.18"/>
 		</g>
 	</g>
-	<g id="kvg:088c1-Kaisho-g9" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:088c1-Kaisho-g9" kvg:element="𢦏" kvg:part="2" kvg:position="kamae">
 		<g id="kvg:088c1-Kaisho-g10" kvg:element="戈" kvg:part="2">
 			<g id="kvg:088c1-Kaisho-g11" kvg:element="弋" kvg:part="2">
 				<path id="kvg:088c1-Kaisho-s10" kvg:type="㇂" d="M55.75,10c1.56,1.84,2.68,2.35,3.03,6.31C61.5,47,72.25,81.5,89.67,94.17c5.89,4.28,5.26,0.79,4.48-7.36"/>
diff --git a/kanji/088c1.svg b/kanji/088c1.svg
index 17db435b9..b2b790fa9 100644
--- a/kanji/088c1.svg
+++ b/kanji/088c1.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_088c1" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:088c1" kvg:element="裁">
-	<g id="kvg:088c1-g1" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:088c1-g1" kvg:element="𢦏" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:088c1-g2" kvg:element="土" kvg:part="1" kvg:phon="土戈1">
 			<g id="kvg:088c1-g3" kvg:element="十" kvg:radical="nelson">
 				<path id="kvg:088c1-s1" kvg:type="㇐" d="M23.63,25.63c1.68,0.45,3.54,0.3,5.24,0.16c6.57-0.5,14.34-1.94,20.32-2.48c1.62-0.14,2.87-0.12,3.68,0.01"/>
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:088c1-s9" kvg:type="㇔/㇏" d="M42.12,65.56c6.88,4.19,12.63,9.69,18.21,18.18"/>
 		</g>
 	</g>
-	<g id="kvg:088c1-g9" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:088c1-g9" kvg:element="𢦏" kvg:part="2" kvg:position="kamae">
 		<g id="kvg:088c1-g10" kvg:element="戈" kvg:part="2" kvg:phon="土戈2">
 			<g id="kvg:088c1-g11" kvg:element="弋" kvg:part="2">
 				<path id="kvg:088c1-s10" kvg:type="㇂" d="M56.75,9.5c1.56,1.84,2.23,3.35,2.53,7.31c2.59,33.44,11.84,61.69,30.64,77.86c5.52,4.75,5.01,0.29,4.23-7.86"/>
diff --git a/kanji/08938.svg b/kanji/08938.svg
index 229a6a0f0..d8a3ad4d7 100644
--- a/kanji/08938.svg
+++ b/kanji/08938.svg
@@ -47,27 +47,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:08938-g2" kvg:element="婁" kvg:position="right">
 		<g id="kvg:08938-g3" kvg:position="top">
 			<g id="kvg:08938-g4" kvg:element="串" kvg:part="1">
-				<g id="kvg:08938-g5" kvg:element="口">
+				<g id="kvg:08938-g5" kvg:element="口" kvg:part="1">
 					<path id="kvg:08938-s6" kvg:type="㇑" d="M49.87,22.1c0.38,0.26,1.09,1.42,1.22,2.42c0.85,6.54,1.6,13.79,2.34,18.1"/>
 					<path id="kvg:08938-s7" kvg:type="㇕" d="M51.27,23.39c10.25-1.02,24.54-2.71,32.65-3.6c2.59-0.28,4.07,1.47,3.74,3.45C86.34,31.06,85.4,35.65,84.65,40"/>
 				</g>
 			</g>
 			<path id="kvg:08938-s8" kvg:type="㇐" d="M42.79,32.46c1.14,0.52,3.24,0.65,4.38,0.52c8.78-0.96,34.48-4.84,46.46-4.1c1.9,0.12,3.04,0.25,4,0.51"/>
 			<g id="kvg:08938-g6" kvg:element="串" kvg:part="2">
-				<path id="kvg:08938-s9" kvg:type="㇐" d="M53.82,41.2c2.63-0.24,26.69-2.17,30.07-2.42"/>
-				<g id="kvg:08938-g7" kvg:element="中">
-					<g id="kvg:08938-g8" kvg:element="口">
+				<g id="kvg:08938-g7" kvg:element="口" kvg:part="2">
+					<path id="kvg:08938-s9" kvg:type="㇐" d="M53.82,41.2c2.63-0.24,26.69-2.17,30.07-2.42"/>
+				</g>
+				<g id="kvg:08938-g8" kvg:element="中">
+					<g id="kvg:08938-g9" kvg:element="口">
 						<path id="kvg:08938-s10" kvg:type="㇑" d="M51.37,47.94c0.3,0.45,0.7,1.06,0.97,2.02c1.41,5.13,2.04,8.18,2.6,11.52"/>
 						<path id="kvg:08938-s11" kvg:type="㇕b" d="M52.59,49.75c9.73-0.89,25.02-2.61,32.71-3.38c2.45-0.25,3.87,1.28,3.54,2.99c-0.38,2.01-1.38,5.37-1.98,7.79"/>
 						<path id="kvg:08938-s12" kvg:type="㇐b" d="M55.32,59.81c2.63-0.24,29.7-2.42,33.08-2.67"/>
 					</g>
-					<g id="kvg:08938-g9" kvg:element="丨">
+					<g id="kvg:08938-g10" kvg:element="丨">
 						<path id="kvg:08938-s13" kvg:type="㇑" d="M67.82,12.22c0.82,0.48,1.31,2.17,1.47,3.14c0.16,0.97,0,36.96-0.16,43"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:08938-g10" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:08938-g11" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:08938-s14" kvg:type="㇛" d="M69.07,61.38c0.33,0.87,0.1,1.95-0.17,3.03C67.6,69.67,61.04,75.95,56.89,82c-0.9,1.32-0.19,1.57,0.5,1.58c9.63,0.15,27.4,7.38,32.38,14.15"/>
 			<path id="kvg:08938-s15" kvg:type="㇒" d="M81.36,66.5c0.09,0.76,0.15,2.59-0.17,3.69c-2.58,8.86-12.64,21.73-32.75,27.53"/>
 			<path id="kvg:08938-s16" kvg:type="㇐" d="M45.63,71.33c1.6,0.55,3.3,0.88,4.06,0.84c12.01-0.53,29.38-2.7,44.8-2.94c1.28-0.02,3.47,0.34,4.51,0.97"/>
diff --git a/kanji/08974-Kaisho.svg b/kanji/08974-Kaisho.svg
index 4c6ec0edf..926239bad 100644
--- a/kanji/08974-Kaisho.svg
+++ b/kanji/08974-Kaisho.svg
@@ -71,7 +71,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 			<path id="kvg:08974-Kaisho-s17" kvg:type="㇔" d="M63.09,60.19c1.04,1.06,2.69,4.36,2.95,6.01"/>
 			<path id="kvg:08974-Kaisho-s18" kvg:type="㇒" d="M79.03,59.45c0.01,0.15,0.02,0.38-0.02,0.59c-0.23,1.25-1.55,3.99-3.35,5.67"/>
-			<g id="kvg:08974-Kaisho-g10" kvg:element="束">
+			<g id="kvg:08974-Kaisho-g10" kvg:element="束" kvg:part="2">
 				<g id="kvg:08974-Kaisho-g11" kvg:element="口" kvg:part="2">
 					<path id="kvg:08974-Kaisho-s19" kvg:type="㇐" d="M60.18,70.31c5.85-0.54,19.08-1.56,24.55-1.83"/>
 				</g>
diff --git a/kanji/08974.svg b/kanji/08974.svg
index 5b0a9f1f9..ccfe09e1e 100644
--- a/kanji/08974.svg
+++ b/kanji/08974.svg
@@ -71,7 +71,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 			<path id="kvg:08974-s17" kvg:type="㇔" d="M63.09,60.19c1.04,1.06,2.69,4.36,2.95,6.01"/>
 			<path id="kvg:08974-s18" kvg:type="㇒" d="M79.03,59.45c0.01,0.15,0.02,0.38-0.02,0.59c-0.23,1.25-1.55,3.99-3.35,5.67"/>
-			<g id="kvg:08974-g10" kvg:element="束">
+			<g id="kvg:08974-g10" kvg:element="束" kvg:part="2">
 				<g id="kvg:08974-g11" kvg:element="口" kvg:part="2">
 					<path id="kvg:08974-s19" kvg:type="㇐" d="M60.18,70.31c5.85-0.54,19.08-1.56,24.55-1.83"/>
 				</g>
diff --git a/kanji/08aeb-Kaisho.svg b/kanji/08aeb-Kaisho.svg
index dc09480e3..effbc06de 100644
--- a/kanji/08aeb-Kaisho.svg
+++ b/kanji/08aeb-Kaisho.svg
@@ -60,7 +60,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:08aeb-Kaisho-s11" kvg:type="㇔" d="M53.36,43.89c2.81,1.8,7.26,7.38,7.96,10.17"/>
 		<path id="kvg:08aeb-Kaisho-s12" kvg:type="㇒" d="M80.75,41.06c0.02,0.28,0.04,0.72-0.04,1.11c-0.44,2.35-2.98,7.5-6.46,10.65"/>
-		<g id="kvg:08aeb-Kaisho-g7" kvg:element="束">
+		<g id="kvg:08aeb-Kaisho-g7" kvg:element="束" kvg:part="2">
 			<g id="kvg:08aeb-Kaisho-g8" kvg:element="口" kvg:part="2">
 				<path id="kvg:08aeb-Kaisho-s13" kvg:type="㇐" d="M50.9,59.79c8.88-0.94,28.65-3.25,36.95-3.71"/>
 			</g>
diff --git a/kanji/08aeb.svg b/kanji/08aeb.svg
index a43499345..70b159e08 100644
--- a/kanji/08aeb.svg
+++ b/kanji/08aeb.svg
@@ -60,7 +60,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:08aeb-s11" kvg:type="㇔" d="M53.36,43.89c2.81,1.8,7.26,7.38,7.96,10.17"/>
 		<path id="kvg:08aeb-s12" kvg:type="㇒" d="M80.75,41.06c0.02,0.28,0.04,0.72-0.04,1.11c-0.44,2.35-2.98,7.5-6.46,10.65"/>
-		<g id="kvg:08aeb-g7" kvg:element="束">
+		<g id="kvg:08aeb-g7" kvg:element="束" kvg:part="2">
 			<g id="kvg:08aeb-g8" kvg:element="口" kvg:part="2">
 				<path id="kvg:08aeb-s13" kvg:type="㇐" d="M50.9,59.79c8.88-0.94,28.65-3.25,36.95-3.71"/>
 			</g>
diff --git a/kanji/08b7d-LeFst.svg b/kanji/08b7d-LeFst.svg
index 6acaa2b42..ff50b2f94 100644
--- a/kanji/08b7d-LeFst.svg
+++ b/kanji/08b7d-LeFst.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:08b7d-LeFst" kvg:element="譽">
 	<g id="kvg:08b7d-LeFst-g1" kvg:element="與" kvg:position="top">
 		<g id="kvg:08b7d-LeFst-g2" kvg:position="top">
-			<g id="kvg:08b7d-LeFst-g3" kvg:element="𦥑" kvg:variant="true" kvg:original="臼">
+			<g id="kvg:08b7d-LeFst-g3" kvg:element="𦥑" kvg:part="1" kvg:variant="true" kvg:original="臼">
 				<path id="kvg:08b7d-LeFst-s1" kvg:type="㇐" d="M37.63,12.17c0.03,0.25,0.14,0.71-0.07,0.98c-2.56,3.46-6.34,6.64-13,9.43"/>
 				<path id="kvg:08b7d-LeFst-s2" kvg:type="㇑" d="M22.08,22.04c1,0.32,1.67,1.44,1.8,2.1c0.39,1.94,1.99,21.31,2.68,27.28"/>
 				<path id="kvg:08b7d-LeFst-s3" kvg:type="㇐" d="M24.72,32.24c3.19-0.34,8.2-1.99,10.81-2.35c1.14-0.16,2.55-0.26,3.18-0.26"/>
@@ -48,7 +48,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08b7d-LeFst-s5" kvg:type="㇐" d="M49.23,17.34c4.46-0.19,9.67-1.31,12.62-1.5c0.83-0.05,1.61,0.07,2.02,0.14"/>
 			<path id="kvg:08b7d-LeFst-s6" kvg:type="㇞" d="M49.4,10.19c0.72,0.63,0.46,2.29,0.14,3.34c-1.29,4.36-2.57,10.77-2.94,11.37c-0.93,1.5,0.22,1.98,2.38,1.57c1.54-0.29,4.72-0.74,8.6-1.07c1.62-0.14,2.92,0.59,2.64,1.72C58.77,32.97,58,41.64,57.03,50"/>
 			<path id="kvg:08b7d-LeFst-s7" kvg:type="㇑" d="M47.55,31.81c0.2,1.09,0.97,2.59,0.8,3.3c-0.3,1.24-1.22,7.84-2.37,13.86"/>
-			<g id="kvg:08b7d-LeFst-g4" kvg:element="𦥑" kvg:variant="true" kvg:original="臼">
+			<g id="kvg:08b7d-LeFst-g4" kvg:element="𦥑" kvg:part="2" kvg:variant="true" kvg:original="臼">
 				<path id="kvg:08b7d-LeFst-s8" kvg:type="㇕" d="M69.7,16.64c1.29,0.01,2.15,0.35,3.88,0.08c4.52-0.71,11.19-0.97,11.72-0.97c1.47,0,2.24,0.77,1.93,1.77c-1.39,4.45-4.69,24.84-5.6,30.97"/>
 				<path id="kvg:08b7d-LeFst-s9" kvg:type="㇐" d="M68.19,27.01c0.65,0.11,1.99,0.46,2.99,0.44c3.55-0.07,11.84-0.94,12.73-0.94"/>
 				<path id="kvg:08b7d-LeFst-s10" kvg:type="㇐" d="M68.31,38c0.57,0.09,2.11,0.45,2.75,0.47c3,0.08,9.17-0.31,11.92-0.47"/>
diff --git a/kanji/08ec8-Kaisho.svg b/kanji/08ec8-Kaisho.svg
index 01f6c8c44..dd9e50ce1 100644
--- a/kanji/08ec8-Kaisho.svg
+++ b/kanji/08ec8-Kaisho.svg
@@ -47,11 +47,11 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08ec8-Kaisho-s7" kvg:type="㇒" d="M40.64,47.25c0.24,0.86,0.65,2.37,0,3.78C36.18,60.83,20.55,78.02,11.03,83"/>
 	</g>
 	<g id="kvg:08ec8-Kaisho-g2" kvg:element="應" kvg:position="right">
-		<g id="kvg:08ec8-Kaisho-g3" kvg:element="雁" kvg:variant="true" kvg:position="tare">
-			<g id="kvg:08ec8-Kaisho-g4" kvg:element="广" kvg:part="1">
-				<path id="kvg:08ec8-Kaisho-s8" kvg:type="㇔" d="M69.22,11.13c0.46,0.31,1.45,2.36,1.54,2.99c0.09,0.63,0.05,3.81-0.05,7.75"/>
-			</g>
-			<g id="kvg:08ec8-Kaisho-g5" kvg:element="广" kvg:position="tare">
+		<g id="kvg:08ec8-Kaisho-g3" kvg:element="广" kvg:part="1">
+			<path id="kvg:08ec8-Kaisho-s8" kvg:type="㇔" d="M69.22,11.13c0.46,0.31,1.45,2.36,1.54,2.99c0.09,0.63,0.05,3.81-0.05,7.75"/>
+		</g>
+		<g id="kvg:08ec8-Kaisho-g4" kvg:element="雁" kvg:variant="true" kvg:position="tare">
+			<g id="kvg:08ec8-Kaisho-g5" kvg:element="广" kvg:part="2" kvg:position="tare">
 				<g id="kvg:08ec8-Kaisho-g6" kvg:element="厂">
 					<path id="kvg:08ec8-Kaisho-s9" kvg:type="㇐" d="M46.41,23.64c1.13,0.19,2.88,0.27,4.34,0.19c10.66-0.54,27.56-1.85,41.58-2.38c1.88-0.07,3.02,0.09,3.96,0.19"/>
 				</g>
diff --git a/kanji/08ec8.svg b/kanji/08ec8.svg
index 19076312c..06412c85b 100644
--- a/kanji/08ec8.svg
+++ b/kanji/08ec8.svg
@@ -47,15 +47,15 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08ec8-s7" kvg:type="㇒" d="M40.64,47.25c0.24,0.86,0.65,2.37,0,3.78C36.18,60.83,20.55,78.02,11.03,83"/>
 	</g>
 	<g id="kvg:08ec8-g2" kvg:element="應" kvg:position="right">
-		<g id="kvg:08ec8-g3" kvg:element="雁" kvg:variant="true" kvg:position="tare">
-			<g id="kvg:08ec8-g4" kvg:element="广" kvg:part="1">
-				<path id="kvg:08ec8-s8" kvg:type="㇔" d="M69.22,11.13c0.46,0.31,1.45,2.36,1.54,2.99c0.09,0.63,0.05,3.81-0.05,7.75"/>
-			</g>
-			<g id="kvg:08ec8-g5" kvg:element="广" kvg:position="tare">
+		<g id="kvg:08ec8-g3" kvg:element="广" kvg:part="1">
+			<path id="kvg:08ec8-s8" kvg:type="㇔" d="M69.22,11.13c0.46,0.31,1.45,2.36,1.54,2.99c0.09,0.63,0.05,3.81-0.05,7.75"/>
+		</g>
+		<g id="kvg:08ec8-g4" kvg:element="雁" kvg:variant="true" kvg:position="tare">
+			<g id="kvg:08ec8-g5" kvg:element="广" kvg:part="2" kvg:position="tare">
 				<g id="kvg:08ec8-g6" kvg:element="厂">
 					<path id="kvg:08ec8-s9" kvg:type="㇐" d="M46.41,23.64c1.13,0.19,2.88,0.27,4.34,0.19c10.66-0.54,27.56-1.85,41.58-2.38c1.88-0.07,3.02,0.09,3.96,0.19"/>
+					<path id="kvg:08ec8-s10" kvg:type="㇒" d="M50.2,24.51c0.04,1.58,0.43,4.06,0.43,6.33c0,16.16,0.13,43.91-12.31,60.08"/>
 				</g>
-				<path id="kvg:08ec8-s10" kvg:type="㇒" d="M50.2,24.51c0.04,1.58,0.43,4.06,0.43,6.33c0,16.16,0.13,43.91-12.31,60.08"/>
 			</g>
 			<g id="kvg:08ec8-g7" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left">
 				<path id="kvg:08ec8-s11" kvg:type="㇒" d="M64.42,29.63c0.06,0.61,0.1,1.37-0.05,2.12C63.4,36.47,59.64,45.6,55.11,52"/>
diff --git a/kanji/08f09-Kaisho.svg b/kanji/08f09-Kaisho.svg
index 5a42d233f..216f08bab 100644
--- a/kanji/08f09-Kaisho.svg
+++ b/kanji/08f09-Kaisho.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_08f09-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08f09-Kaisho" kvg:element="載">
-	<g id="kvg:08f09-Kaisho-g1" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:08f09-Kaisho-g1" kvg:element="𢦏" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:08f09-Kaisho-g2" kvg:element="土">
 			<g id="kvg:08f09-Kaisho-g3" kvg:element="十" kvg:radical="nelson">
 				<path id="kvg:08f09-Kaisho-s1" kvg:type="㇐" d="M23.63,26.38c0.98,0.26,2.78,0.32,3.76,0.26c6.86-0.38,15.86-2.25,22.3-2.83c1.62-0.14,2.62,0.12,3.43,0.26"/>
@@ -59,7 +59,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08f09-Kaisho-s9" kvg:type="㇐" d="M16.16,84.82c0.88,0.54,2.49,0.66,3.38,0.54c11.31-1.61,24.05-4.2,34.45-4.55c1.47-0.05,2.35,0.25,3.09,0.52"/>
 		<path id="kvg:08f09-Kaisho-s10" kvg:type="㇑" d="M37.67,40.13c0.5,0.4,1.57,2.97,1.67,3.77c0.1,0.79-0.06,48.02-0.17,52.98"/>
 	</g>
-	<g id="kvg:08f09-Kaisho-g7" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:08f09-Kaisho-g7" kvg:element="𢦏" kvg:part="2" kvg:position="kamae">
 		<g id="kvg:08f09-Kaisho-g8" kvg:element="戈" kvg:part="2">
 			<g id="kvg:08f09-Kaisho-g9" kvg:element="弋" kvg:part="2">
 				<path id="kvg:08f09-Kaisho-s11" kvg:type="㇂" d="M60.25,12.5c1.25,1.78,2.15,2.27,2.43,6.09c2.17,29.62,10.78,62.91,24.73,75.14c4.71,4.13,4.22,0.76,3.59-7.11"/>
diff --git a/kanji/08f09.svg b/kanji/08f09.svg
index df14b8c73..c0cb7a645 100644
--- a/kanji/08f09.svg
+++ b/kanji/08f09.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_08f09" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08f09" kvg:element="載">
-	<g id="kvg:08f09-g1" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:08f09-g1" kvg:element="𢦏" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:08f09-g2" kvg:element="土" kvg:phon="土戈1">
 			<g id="kvg:08f09-g3" kvg:element="十" kvg:radical="nelson">
 				<path id="kvg:08f09-s1" kvg:type="㇐" d="M23.88,26.13c1.79,0.48,3.81,0.28,5.63,0.13c6.53-0.53,14.56-1.92,20.43-2.45c1.62-0.14,2.87-0.12,3.68,0.01"/>
@@ -59,7 +59,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08f09-s9" kvg:type="㇐" d="M16.16,84.57c1.96,0.56,5.12,0.32,6.83,0.02c8.38-1.46,19.01-2.73,27.63-3.36c2.18-0.16,4.13-0.36,6.47,0.09"/>
 		<path id="kvg:08f09-s10" kvg:type="㇑" d="M38.17,40.38c1.04,1.04,1.42,2.62,1.42,4.02c0,0.66-0.03,31.97-0.03,46.47c0,2.92-0.04,5.03-0.06,5.88"/>
 	</g>
-	<g id="kvg:08f09-g7" kvg:element="𢦏" kvg:position="kamae">
+	<g id="kvg:08f09-g7" kvg:element="𢦏" kvg:part="2" kvg:position="kamae">
 		<g id="kvg:08f09-g8" kvg:element="戈" kvg:part="2" kvg:phon="土戈2">
 			<g id="kvg:08f09-g9" kvg:element="弋" kvg:part="2">
 				<path id="kvg:08f09-s11" kvg:type="㇂" d="M61.25,12.75c1.56,1.56,1.9,3.27,2.18,7.09c2.17,29.62,10.03,61.66,23.98,73.89c4.71,4.13,4.22,0.76,3.59-7.11"/>
diff --git a/kanji/093e4.svg b/kanji/093e4.svg
index 5d4f687e1..83fc4012a 100644
--- a/kanji/093e4.svg
+++ b/kanji/093e4.svg
@@ -50,27 +50,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:093e4-g2" kvg:element="婁" kvg:position="right">
 		<g id="kvg:093e4-g3" kvg:position="top">
 			<g id="kvg:093e4-g4" kvg:element="串" kvg:part="1">
-				<g id="kvg:093e4-g5" kvg:element="口">
+				<g id="kvg:093e4-g5" kvg:element="口" kvg:part="1">
 					<path id="kvg:093e4-s9" kvg:type="㇑" d="M52.31,20.75c0.36,0.27,1.04,1.44,1.17,2.44C54.28,29.81,55.5,37.64,56.2,42"/>
 					<path id="kvg:093e4-s10" kvg:type="㇕" d="M53.65,21.55c9.77-1.04,24.37-0.75,32.09-1.65c2.46-0.29,3.87,1.49,3.56,3.49c-1.25,7.92-2.15,11.56-2.87,15.96"/>
 				</g>
 			</g>
 			<path id="kvg:093e4-s11" kvg:type="㇐" d="M45.47,30.41c1.09,0.43,3.08,0.49,4.17,0.43c8.11-0.41,35.61-2.04,44.98-2.56c1.81-0.1,2.9,0.21,3.8,0.42"/>
 			<g id="kvg:093e4-g6" kvg:element="串" kvg:part="2">
-				<path id="kvg:093e4-s12" kvg:type="㇐" d="M56.07,39.57c2.51-0.24,26.42-1.2,29.64-1.44"/>
-				<g id="kvg:093e4-g7" kvg:element="中">
-					<g id="kvg:093e4-g8" kvg:element="口">
+				<g id="kvg:093e4-g7" kvg:element="口" kvg:part="2">
+					<path id="kvg:093e4-s12" kvg:type="㇐" d="M56.07,39.57c2.51-0.24,26.42-1.2,29.64-1.44"/>
+				</g>
+				<g id="kvg:093e4-g8" kvg:element="中">
+					<g id="kvg:093e4-g9" kvg:element="口">
 						<path id="kvg:093e4-s13" kvg:type="㇑" d="M53.74,47.25c0.3,0.42,0.81,0.98,0.95,1.91c0.51,3.42,1.78,6.77,2.32,9.93"/>
 						<path id="kvg:093e4-s14" kvg:type="㇕b" d="M54.94,48.24c9.6-0.84,22.98-2.23,30.57-2.95c2.42-0.23,3.82,1.21,3.5,2.82c-0.37,1.89-1.12,5.54-1.7,7.82"/>
 						<path id="kvg:093e4-s15" kvg:type="㇐b" d="M57.4,58.21c2.6-0.23,28.08-2.05,31.42-2.28"/>
 					</g>
-					<g id="kvg:093e4-g9" kvg:element="丨">
+					<g id="kvg:093e4-g10" kvg:element="丨">
 						<path id="kvg:093e4-s16" kvg:type="㇑" d="M69.4,12.75c0.78,0.49,1.25,2.2,1.4,3.18c0.16,0.98,0,34.89-0.16,41"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:093e4-g10" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:093e4-g11" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:093e4-s17" kvg:type="㇛" d="M67.99,59.48c0.37,0.88,0.11,1.98-0.19,3.06c-1.46,5.33-6.73,12.69-11.42,18.81c-1.02,1.33-0.21,1.59,0.56,1.6c10.86,0.15,28.65,6.71,34.27,13.56"/>
 			<path id="kvg:093e4-s18" kvg:type="㇒" d="M81.64,62.92c0.1,0.81,0.17,2.77-0.2,3.93c-3.02,9.46-12.69,23.65-33.34,29.9"/>
 			<path id="kvg:093e4-s19" kvg:type="㇐" d="M44.63,71.36c1.52,0.42,3.14,0.66,3.87,0.64c11.43-0.4,31.53-2.74,46.21-2.92c1.22-0.01,3.31-0.24,4.3,0.23"/>
diff --git a/kanji/095cc-Kaisho.svg b/kanji/095cc-Kaisho.svg
index a2e0aa782..52a2c910d 100644
--- a/kanji/095cc-Kaisho.svg
+++ b/kanji/095cc-Kaisho.svg
@@ -63,7 +63,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:095cc-Kaisho-s12" kvg:type="㇔" d="M42.3,58.99c1.68,1.05,4.34,4.31,4.76,5.94"/>
 		<path id="kvg:095cc-Kaisho-s13" kvg:type="㇒" d="M63.6,56.68c0.01,0.18,0.02,0.45-0.02,0.71c-0.26,1.49-1.74,4.76-3.76,6.76"/>
-		<g id="kvg:095cc-Kaisho-g8" kvg:element="束">
+		<g id="kvg:095cc-Kaisho-g8" kvg:element="束" kvg:part="2">
 			<g id="kvg:095cc-Kaisho-g9" kvg:element="口" kvg:part="2">
 				<path id="kvg:095cc-Kaisho-s14" kvg:type="㇐" d="M38.42,69.33c8.21-0.58,23.2-2.18,30.88-2.47"/>
 			</g>
diff --git a/kanji/095cc.svg b/kanji/095cc.svg
index 08af68a47..79d3f079d 100644
--- a/kanji/095cc.svg
+++ b/kanji/095cc.svg
@@ -63,7 +63,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<path id="kvg:095cc-s12" kvg:type="㇔" d="M42.3,58.99c1.68,1.05,4.34,4.31,4.76,5.94"/>
 		<path id="kvg:095cc-s13" kvg:type="㇒" d="M63.6,56.68c0.01,0.18,0.02,0.45-0.02,0.71c-0.26,1.49-1.74,4.76-3.76,6.76"/>
-		<g id="kvg:095cc-g8" kvg:element="束">
+		<g id="kvg:095cc-g8" kvg:element="束" kvg:part="2">
 			<g id="kvg:095cc-g9" kvg:element="口" kvg:part="2">
 				<path id="kvg:095cc-s14" kvg:type="㇐" d="M38.42,69.33c8.21-0.58,23.2-2.18,30.88-2.47"/>
 			</g>
diff --git a/kanji/09698.svg b/kanji/09698.svg
index def15893e..f05f63108 100644
--- a/kanji/09698.svg
+++ b/kanji/09698.svg
@@ -51,14 +51,14 @@ kvg:type CDATA #IMPLIED >
 				<g id="kvg:09698-g6" kvg:position="right">
 					<path id="kvg:09698-s5" kvg:type="㇏" d="M67.13,15.31c2.05,0.37,14.56,14.57,20.63,17.74c2.35,1.23,3.19,1.88,5.46,2.28"/>
 				</g>
-				<path id="kvg:09698-s6" kvg:type="㇐" d="M51.52,34.62c1.03,0.51,2.92,0.56,3.96,0.51c4.82-0.25,14.26-1.38,19.16-1.97c1.71-0.21,2.76-0.39,3.62-0.13"/>
-				<g id="kvg:09698-g7" kvg:element="八">
-					<g id="kvg:09698-g8" kvg:position="left">
-						<path id="kvg:09698-s7" kvg:type="㇒" d="M54.05,45.69c0.26,0.58-0.04,1.24-0.36,1.96c-2.12,4.7-10.1,15.05-14.95,17.45"/>
-					</g>
-					<g id="kvg:09698-g9" kvg:position="right">
-						<path id="kvg:09698-s8" kvg:type="㇏" d="M65.38,42.31c2.23,0.4,15.82,15.84,22.41,19.29c2.55,1.33,3.46,2.05,5.93,2.48"/>
-					</g>
+			</g>
+			<path id="kvg:09698-s6" kvg:type="㇐" d="M51.52,34.62c1.03,0.51,2.92,0.56,3.96,0.51c4.82-0.25,14.26-1.38,19.16-1.97c1.71-0.21,2.76-0.39,3.62-0.13"/>
+			<g id="kvg:09698-g7" kvg:element="八">
+				<g id="kvg:09698-g8" kvg:position="left">
+					<path id="kvg:09698-s7" kvg:type="㇒" d="M54.05,45.69c0.26,0.58-0.04,1.24-0.36,1.96c-2.12,4.7-10.1,15.05-14.95,17.45"/>
+				</g>
+				<g id="kvg:09698-g9" kvg:position="right">
+					<path id="kvg:09698-s8" kvg:type="㇏" d="M65.38,42.31c2.23,0.4,15.82,15.84,22.41,19.29c2.55,1.33,3.46,2.05,5.93,2.48"/>
 				</g>
 			</g>
 			<g id="kvg:09698-g10" kvg:element="皿" kvg:position="bottom">
diff --git a/kanji/09acf-Kaisho.svg b/kanji/09acf-Kaisho.svg
index 80322b71e..a17f76303 100644
--- a/kanji/09acf-Kaisho.svg
+++ b/kanji/09acf-Kaisho.svg
@@ -56,7 +56,7 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:09acf-Kaisho-g4" kvg:element="婁" kvg:position="right">
 		<g id="kvg:09acf-Kaisho-g5" kvg:position="top">
 			<g id="kvg:09acf-Kaisho-g6" kvg:element="串" kvg:part="1">
-				<g id="kvg:09acf-Kaisho-g7" kvg:element="口">
+				<g id="kvg:09acf-Kaisho-g7" kvg:element="口" kvg:part="1">
 					<path id="kvg:09acf-Kaisho-s11" kvg:type="㇑" d="M55.25,22.54c0.34,0.26,0.99,1.41,1.11,2.4c0.77,6.49,2.45,13.67,3.12,17.94"/>
 					<path id="kvg:09acf-Kaisho-s12" kvg:type="㇕" d="M56.52,23.82c9.28-1.02,22.7-2.69,30.03-3.57c2.34-0.28,3.68,1.46,3.38,3.42c-1.19,7.76-2.18,12.83-3.72,17.62"/>
 				</g>
diff --git a/kanji/09acf-KaishoHzFst.svg b/kanji/09acf-KaishoHzFst.svg
index 2cc67e52f..338ec7760 100644
--- a/kanji/09acf-KaishoHzFst.svg
+++ b/kanji/09acf-KaishoHzFst.svg
@@ -56,27 +56,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:09acf-KaishoHzFst-g4" kvg:element="婁" kvg:position="right">
 		<g id="kvg:09acf-KaishoHzFst-g5" kvg:position="top">
 			<g id="kvg:09acf-KaishoHzFst-g6" kvg:element="串" kvg:part="1">
-				<g id="kvg:09acf-KaishoHzFst-g7" kvg:element="口">
+				<g id="kvg:09acf-KaishoHzFst-g7" kvg:element="口" kvg:part="1">
 					<path id="kvg:09acf-KaishoHzFst-s11" kvg:type="㇑" d="M55.25,22.54c0.34,0.26,0.99,1.41,1.11,2.4c0.77,6.49,2.45,13.67,3.12,17.94"/>
 					<path id="kvg:09acf-KaishoHzFst-s12" kvg:type="㇕" d="M56.52,23.82c9.28-1.02,22.7-2.69,30.03-3.57c2.34-0.28,3.68,1.46,3.38,3.42c-1.19,7.76-2.18,12.83-3.72,17.62"/>
 				</g>
 			</g>
 			<path id="kvg:09acf-KaishoHzFst-s13" kvg:type="㇐" d="M48.9,31.81c1.03,0.52,2.93,0.64,3.96,0.52c7.94-0.95,30.17-3.8,41-3.07c1.72,0.12,2.75,0.25,3.61,0.51"/>
 			<g id="kvg:09acf-KaishoHzFst-g8" kvg:element="串" kvg:part="2">
-				<path id="kvg:09acf-KaishoHzFst-s14" kvg:type="㇐" d="M59.82,41.48c2.38-0.24,23.14-2.15,26.2-2.39"/>
-				<g id="kvg:09acf-KaishoHzFst-g9" kvg:element="中">
-					<g id="kvg:09acf-KaishoHzFst-g10" kvg:element="口">
+				<g id="kvg:09acf-KaishoHzFst-g9" kvg:element="口" kvg:part="2">
+					<path id="kvg:09acf-KaishoHzFst-s14" kvg:type="㇐" d="M59.82,41.48c2.38-0.24,23.14-2.15,26.2-2.39"/>
+				</g>
+				<g id="kvg:09acf-KaishoHzFst-g10" kvg:element="中">
+					<g id="kvg:09acf-KaishoHzFst-g11" kvg:element="口">
 						<path id="kvg:09acf-KaishoHzFst-s15" kvg:type="㇑" d="M55.11,48.66c0.27,0.44,0.75,1.03,0.87,2c0.47,3.59,1.67,7.62,2.17,10.93"/>
 						<path id="kvg:09acf-KaishoHzFst-s16" kvg:type="㇕b" d="M56.21,49.71c10.29-0.46,23.55-1.34,30.51-2.1c2.22-0.24,3.5,1.27,3.21,2.97c-0.34,1.99-2.02,5.82-2.56,8.21"/>
 						<path id="kvg:09acf-KaishoHzFst-s17" kvg:type="㇐b" d="M58.5,59.68c2.38-0.24,28.18-0.66,31.25-0.89"/>
 					</g>
-					<g id="kvg:09acf-KaishoHzFst-g11" kvg:element="丨">
+					<g id="kvg:09acf-KaishoHzFst-g12" kvg:element="丨">
 						<path id="kvg:09acf-KaishoHzFst-s18" kvg:type="㇑" d="M70.99,13.75c0.74,0.48,1.18,2.15,1.33,3.11c0.15,0.96,0,36.13-0.15,42.12"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:09acf-KaishoHzFst-g12" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:09acf-KaishoHzFst-g13" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:09acf-KaishoHzFst-s19" kvg:type="㇛" d="M68.58,61.99c0.3,0.86,0.39,2.05-0.15,3C64.75,71.5,62.25,76,57.47,80.92c-1.07,1.1-0.17,1.57,0.45,1.57c11.83,0.01,25.83,7.01,31.48,13.78"/>
 			<path id="kvg:09acf-KaishoHzFst-s20" kvg:type="㇒" d="M81.94,68.06c0.09,0.7,0.16,2.39-0.19,3.4c-2.83,8.16-9.19,20.46-31.23,25.79"/>
 			<path id="kvg:09acf-KaishoHzFst-s21" kvg:type="㇐" d="M47.63,71.5c1.75,0.48,3.62,0.76,4.47,0.73c13.19-0.46,24.51-2.56,41.45-2.77c1.4-0.02,3.82,0.29,4.96,0.84"/>
diff --git a/kanji/09acf.svg b/kanji/09acf.svg
index 35c1f37ff..b630b37e1 100644
--- a/kanji/09acf.svg
+++ b/kanji/09acf.svg
@@ -56,27 +56,29 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:09acf-g4" kvg:element="婁" kvg:position="right">
 		<g id="kvg:09acf-g5" kvg:position="top">
 			<g id="kvg:09acf-g6" kvg:element="串" kvg:part="1">
-				<g id="kvg:09acf-g7" kvg:element="口">
+				<g id="kvg:09acf-g7" kvg:element="口" kvg:part="1">
 					<path id="kvg:09acf-s11" kvg:type="㇑" d="M55.25,22.54c0.34,0.26,0.99,1.41,1.11,2.4c0.77,6.49,2.45,13.67,3.12,17.94"/>
 					<path id="kvg:09acf-s12" kvg:type="㇕" d="M56.52,23.82c9.28-1.02,22.7-2.69,30.03-3.57c2.34-0.28,3.68,1.46,3.38,3.42c-1.19,7.76-2.18,12.83-3.72,17.62"/>
 				</g>
 			</g>
 			<path id="kvg:09acf-s13" kvg:type="㇐" d="M48.9,31.81c1.03,0.52,2.93,0.64,3.96,0.52c7.94-0.95,30.17-3.8,41-3.07c1.72,0.12,2.75,0.25,3.61,0.51"/>
 			<g id="kvg:09acf-g8" kvg:element="串" kvg:part="2">
-				<path id="kvg:09acf-s14" kvg:type="㇐" d="M59.82,41.48c2.38-0.24,23.14-2.15,26.2-2.39"/>
-				<g id="kvg:09acf-g9" kvg:element="中">
-					<g id="kvg:09acf-g10" kvg:element="口">
+				<g id="kvg:09acf-g9" kvg:element="口" kvg:part="2">
+					<path id="kvg:09acf-s14" kvg:type="㇐" d="M59.82,41.48c2.38-0.24,23.14-2.15,26.2-2.39"/>
+				</g>
+				<g id="kvg:09acf-g10" kvg:element="中">
+					<g id="kvg:09acf-g11" kvg:element="口">
 						<path id="kvg:09acf-s15" kvg:type="㇑" d="M55.11,48.66c0.27,0.44,0.75,1.03,0.87,2c0.47,3.59,1.67,7.62,2.17,10.93"/>
 						<path id="kvg:09acf-s16" kvg:type="㇕b" d="M56.21,49.71c10.29-0.46,23.55-1.34,30.51-2.1c2.22-0.24,3.5,1.27,3.21,2.97c-0.34,1.99-2.02,5.82-2.56,8.21"/>
 						<path id="kvg:09acf-s17" kvg:type="㇐b" d="M58.5,59.68c2.38-0.24,28.18-0.66,31.25-0.89"/>
 					</g>
-					<g id="kvg:09acf-g11" kvg:element="丨">
+					<g id="kvg:09acf-g12" kvg:element="丨">
 						<path id="kvg:09acf-s18" kvg:type="㇑" d="M70.99,13.75c0.74,0.48,1.18,2.15,1.33,3.11c0.15,0.96,0,36.13-0.15,42.12"/>
 					</g>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:09acf-g12" kvg:element="女" kvg:position="bottom">
+		<g id="kvg:09acf-g13" kvg:element="女" kvg:position="bottom">
 			<path id="kvg:09acf-s19" kvg:type="㇛" d="M68.58,61.99c0.3,0.86,0.39,2.05-0.15,3C64.75,71.5,62.25,76,57.47,80.92c-1.07,1.1-0.17,1.57,0.45,1.57c11.83,0.01,25.83,7.01,31.48,13.78"/>
 			<path id="kvg:09acf-s20" kvg:type="㇒" d="M81.94,68.06c0.09,0.7,0.16,2.39-0.19,3.4c-2.83,8.16-9.19,20.46-31.23,25.79"/>
 			<path id="kvg:09acf-s21" kvg:type="㇐" d="M47.63,71.5c1.75,0.48,3.62,0.76,4.47,0.73c13.19-0.46,24.51-2.56,41.45-2.77c1.4-0.02,3.82,0.29,4.96,0.84"/>