diff --git a/kanji/04e71.svg b/kanji/04e71.svg
index 97c423e37..7012958fb 100644
--- a/kanji/04e71.svg
+++ b/kanji/04e71.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_04e71" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:04e71" kvg:element="乱">
 	<g id="kvg:04e71-g1" kvg:element="舌" kvg:position="left" kvg:radical="nelson">
-		<g id="kvg:04e71-g2" kvg:position="top">
+		<g id="kvg:04e71-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:04e71-s1" kvg:type="㇒" d="M45.63,17.75c-0.13,0.62-0.5,1.5-1.36,2.15c-3.68,2.81-12.61,7.84-28.4,11.96"/>
 			<path id="kvg:04e71-s2" kvg:type="㇐" d="M12.11,48.05c1.86,0.51,3.87,0.3,5.75,0.05c6.74-0.9,19.89-2.99,28.52-3.94c2.39-0.26,4.9-0.29,7.27,0.1"/>
 			<path id="kvg:04e71-s3" kvg:type="㇑a" d="M31.64,30.33c0.89,0.89,1.48,2.79,1.48,4.4c0,1.35-0.07,27.74-0.2,32.36"/>
diff --git a/kanji/0522e.svg b/kanji/0522e.svg
index 097d0c7b6..629e707c2 100644
--- a/kanji/0522e.svg
+++ b/kanji/0522e.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_0522e" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0522e" kvg:element="刮">
 	<g id="kvg:0522e-g1" kvg:element="舌" kvg:position="left" kvg:radical="nelson">
-		<g id="kvg:0522e-g2" kvg:position="top">
+		<g id="kvg:0522e-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:0522e-s1" kvg:type="㇒" d="M46.77,13.25c0.08,0.41-0.64,1.95-1.1,2.39c-3.53,3.35-12.48,9.49-28.12,14.15"/>
 			<path id="kvg:0522e-s2" kvg:type="㇐" d="M10.03,48.06c1.06,0.45,3.69,0.58,4.75,0.45c9.35-1.11,35.47-5.07,42.5-5.65c1.76-0.15,2.82,0.22,3.7,0.44"/>
 			<path id="kvg:0522e-s3" kvg:type="㇑a" d="M34.71,26.87c0.44,0.35,1.35,2.63,1.44,3.33c0.16,1.31,0.45,33.67,0.36,38.19"/>
diff --git a/kanji/0606c.svg b/kanji/0606c.svg
index 87e64970f..d24652031 100644
--- a/kanji/0606c.svg
+++ b/kanji/0606c.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0606c-s3" kvg:type="㇑" d="M23.87,13.75c1.09,0.5,1.74,2.25,1.96,3.25c0.22,1,0,73.75-0.22,80"/>
 	</g>
 	<g id="kvg:0606c-g2" kvg:element="舌" kvg:position="right">
-		<g id="kvg:0606c-g3" kvg:position="top">
+		<g id="kvg:0606c-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:0606c-s4" kvg:type="㇒" d="M82.25,14.75c0.1,0.45-0.76,2.87-1.32,3.36C76.67,21.85,65.87,28.04,47,33.25"/>
 			<path id="kvg:0606c-s5" kvg:type="㇐" d="M40.83,50.21c1.08,0.3,3.79,0.37,4.88,0.3c9.35-0.65,35.73-4.55,48.67-4.73c1.81-0.02,2.89,0.14,3.8,0.29"/>
 			<path id="kvg:0606c-s6" kvg:type="㇑a" d="M66.92,30.5c0.55,0.38,1.72,2.87,1.83,3.64c0.21,1.43-0.07,30.06-0.18,35"/>
diff --git a/kanji/06187-Kaisho.svg b/kanji/06187-Kaisho.svg
index e5900f3a9..c9e69c5c2 100644
--- a/kanji/06187-Kaisho.svg
+++ b/kanji/06187-Kaisho.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:06187-Kaisho" kvg:element="憇">
 	<g id="kvg:06187-Kaisho-g1" kvg:element="甜" kvg:position="top">
 		<g id="kvg:06187-Kaisho-g2" kvg:element="舌" kvg:position="left">
-			<g id="kvg:06187-Kaisho-g3" kvg:position="top">
+			<g id="kvg:06187-Kaisho-g3" kvg:element="千" kvg:position="top">
 				<path id="kvg:06187-Kaisho-s1" kvg:type="㇒" d="M46.16,11.36c0.07,0.3-0.55,1.43-0.95,1.75c-3.04,2.46-10.75,6.97-24.22,10.38"/>
 				<path id="kvg:06187-Kaisho-s2" kvg:type="㇐" d="M16.35,35.29c0.79,0.22,2.78,0.28,3.57,0.22c7.03-0.54,25.18-3.47,30.46-3.76c1.32-0.07,2.12,0.1,2.78,0.22"/>
 				<path id="kvg:06187-Kaisho-s3" kvg:type="㇑a" d="M34.93,20.42c0.4,0.25,1.25,1.85,1.33,2.34c0.15,0.92-0.05,18.37-0.13,21.54"/>
diff --git a/kanji/06187.svg b/kanji/06187.svg
index 7188848d2..1d7ce5178 100644
--- a/kanji/06187.svg
+++ b/kanji/06187.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:06187" kvg:element="憇">
 	<g id="kvg:06187-g1" kvg:element="甜" kvg:position="top">
 		<g id="kvg:06187-g2" kvg:element="舌" kvg:position="left">
-			<g id="kvg:06187-g3" kvg:position="top">
+			<g id="kvg:06187-g3" kvg:element="千" kvg:position="top">
 				<path id="kvg:06187-s1" kvg:type="㇒" d="M46.16,11.36c0.07,0.3-0.55,1.43-0.95,1.75c-3.04,2.46-10.75,6.97-24.22,10.38"/>
 				<path id="kvg:06187-s2" kvg:type="㇐" d="M16.35,35.29c0.79,0.22,2.78,0.28,3.57,0.22c7.03-0.54,25.18-3.47,30.46-3.76c1.32-0.07,2.12,0.1,2.78,0.22"/>
 				<path id="kvg:06187-s3" kvg:type="㇑a" d="M34.93,20.42c0.4,0.25,1.25,1.85,1.33,2.34c0.15,0.92-0.05,18.37-0.13,21.54"/>
diff --git a/kanji/061a9-Kaisho.svg b/kanji/061a9-Kaisho.svg
index b86a786b7..2b3e4890b 100644
--- a/kanji/061a9-Kaisho.svg
+++ b/kanji/061a9-Kaisho.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:061a9-Kaisho" kvg:element="憩">
 	<g id="kvg:061a9-Kaisho-g1" kvg:position="top">
 		<g id="kvg:061a9-Kaisho-g2" kvg:element="舌" kvg:position="left">
-			<g id="kvg:061a9-Kaisho-g3" kvg:position="top">
+			<g id="kvg:061a9-Kaisho-g3" kvg:element="千" kvg:position="top">
 				<path id="kvg:061a9-Kaisho-s1" kvg:type="㇒" d="M40.96,12.25c0.06,0.29-0.48,1.85-0.83,2.16c-2.67,2.42-9.47,6.4-21.33,9.76"/>
 				<path id="kvg:061a9-Kaisho-s2" kvg:type="㇐" d="M13.47,36.78c0.72,0.19,2.52,0.16,3.24,0.19C24,37.25,40,34,49.01,33.39c1.2-0.08,1.92,0.09,2.52,0.19"/>
 				<path id="kvg:061a9-Kaisho-s3" kvg:type="㇑a" d="M33.82,22.07c0.44,0.29,1.37,2.14,1.45,2.71c0.16,1.06-0.05,19.78-0.14,23.46"/>
diff --git a/kanji/061a9.svg b/kanji/061a9.svg
index 2d5441a43..ea5346484 100644
--- a/kanji/061a9.svg
+++ b/kanji/061a9.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:061a9" kvg:element="憩">
 	<g id="kvg:061a9-g1" kvg:position="top">
 		<g id="kvg:061a9-g2" kvg:element="舌" kvg:position="left" kvg:phon="舌">
-			<g id="kvg:061a9-g3" kvg:position="top">
+			<g id="kvg:061a9-g3" kvg:element="千" kvg:position="top">
 				<path id="kvg:061a9-s1" kvg:type="㇒" d="M40.96,12c-0.08,0.88-0.74,1.85-1.28,2.31c-2.94,2.49-8.89,6.43-20.12,9.61"/>
 				<path id="kvg:061a9-s2" kvg:type="㇐" d="M13.97,36.53c1.67,0.44,4.07,0.3,5.78,0.18c8.96-0.65,18.62-2.21,27.5-3.41c1.56-0.21,2.98-0.22,4.53,0.03"/>
 				<path id="kvg:061a9-s3" kvg:type="㇑a" d="M34.32,21.82c0.74,0.74,0.95,2.05,0.95,3.21c0,1.07-0.05,19.53-0.14,23.21"/>
diff --git a/kanji/062ec.svg b/kanji/062ec.svg
index 01b6aa6c6..bafd0db93 100644
--- a/kanji/062ec.svg
+++ b/kanji/062ec.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:062ec-s3" kvg:type="㇀" d="M14.46,67.38c1.41,0.75,2.96,0.55,4.11-0.35c3.55-2.78,12.56-10.21,19.17-16.11"/>
 	</g>
 	<g id="kvg:062ec-g2" kvg:element="舌" kvg:position="right" kvg:phon="舌">
-		<g id="kvg:062ec-g3" kvg:position="top">
+		<g id="kvg:062ec-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:062ec-s4" kvg:type="㇒" d="M81.25,16.5c-0.38,1.38-0.62,2-1.71,2.79C75.36,22.33,66.76,28.28,49.5,33"/>
 			<path id="kvg:062ec-s5" kvg:type="㇐" d="M44.58,49.91c2.45,0.82,6.29,0.56,8.8,0.13c10.31-1.79,25.16-4.16,36-4.83c2.6-0.16,5.22-0.36,7.79,0.16"/>
 			<path id="kvg:062ec-s6" kvg:type="㇑a" d="M68.17,29.5c0.92,0.92,1.33,2,1.33,3.64c0,6.11-0.12,26.6-0.12,33.36"/>
diff --git a/kanji/06d3b.svg b/kanji/06d3b.svg
index 12c8ac77a..22101dd75 100644
--- a/kanji/06d3b.svg
+++ b/kanji/06d3b.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06d3b-s3" kvg:type="㇀" d="M16,88.02c3.12,0.36,4.3-0.37,5.45-2.3c3.37-5.64,5.73-10.52,8.8-17.71"/>
 	</g>
 	<g id="kvg:06d3b-g2" kvg:element="舌" kvg:position="right" kvg:phon="舌">
-		<g id="kvg:06d3b-g3" kvg:position="top">
+		<g id="kvg:06d3b-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:06d3b-s4" kvg:type="㇒" d="M78.25,15.25c-0.25,1.38-0.85,2.48-2.43,3.36c-6.57,3.64-15.33,7.53-33.29,11.38"/>
 			<path id="kvg:06d3b-s5" kvg:type="㇐" d="M36.63,48.9c1.91,0.39,5.51,0.31,7.4,0.14c12.84-1.16,30.34-3.29,44.4-3.78c3.18-0.11,5.1,0.18,6.69,0.38"/>
 			<path id="kvg:06d3b-s6" kvg:type="㇑a" d="M63.54,27.31c0.62,0.43,2.07,1.69,2.07,4.09c0,1.34,0.2,24.94,0.11,34.61"/>
diff --git a/kanji/06ff6-Kaisho.svg b/kanji/06ff6-Kaisho.svg
index 5125cc64e..ab89ec6a8 100644
--- a/kanji/06ff6-Kaisho.svg
+++ b/kanji/06ff6-Kaisho.svg
@@ -58,7 +58,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:06ff6-Kaisho-g6" kvg:element="舌">
-			<g id="kvg:06ff6-Kaisho-g7" kvg:position="top">
+			<g id="kvg:06ff6-Kaisho-g7" kvg:element="千" kvg:position="top">
 				<path id="kvg:06ff6-Kaisho-s12" kvg:type="㇒" d="M74.42,44.75c0.07,0.21-0.51,1.29-0.88,1.51c-2.84,1.69-10.04,4.48-22.62,6.83"/>
 				<path id="kvg:06ff6-Kaisho-s13" kvg:type="㇐" d="M46.08,62.16c1.01,0.32,3.53,0.46,4.53,0.32c7.65-1.14,17.36-3.33,29.38-3.52c1.68-0.02,2.69,0.15,3.53,0.31"/>
 				<path id="kvg:06ff6-Kaisho-s14" kvg:type="㇑a" d="M62.34,52.77c0.41,0.23,1.29,1.72,1.37,2.18c0.15,0.85-0.05,12.03-0.14,14.98"/>
diff --git a/kanji/06ff6.svg b/kanji/06ff6.svg
index 5488c3b9b..9114553a5 100644
--- a/kanji/06ff6.svg
+++ b/kanji/06ff6.svg
@@ -58,7 +58,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:06ff6-g6" kvg:element="舌">
-			<g id="kvg:06ff6-g7" kvg:position="top">
+			<g id="kvg:06ff6-g7" kvg:element="千" kvg:position="top">
 				<path id="kvg:06ff6-s12" kvg:type="㇒" d="M74.42,44.75c0.07,0.21-0.51,1.29-0.88,1.51c-2.84,1.69-10.04,4.48-22.62,6.83"/>
 				<path id="kvg:06ff6-s13" kvg:type="㇐" d="M46.08,62.16c1.01,0.32,3.53,0.46,4.53,0.32c7.65-1.14,17.36-3.33,29.38-3.52c1.68-0.02,2.69,0.15,3.53,0.31"/>
 				<path id="kvg:06ff6-s14" kvg:type="㇑a" d="M62.34,52.77c0.41,0.23,1.29,1.72,1.37,2.18c0.15,0.85-0.05,12.03-0.14,14.98"/>
diff --git a/kanji/0751c-Kaisho.svg b/kanji/0751c-Kaisho.svg
index f88c6ad57..5bb0a2334 100644
--- a/kanji/0751c-Kaisho.svg
+++ b/kanji/0751c-Kaisho.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_0751c-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0751c-Kaisho" kvg:element="甜">
 	<g id="kvg:0751c-Kaisho-g1" kvg:element="舌" kvg:position="left" kvg:radical="nelson">
-		<g id="kvg:0751c-Kaisho-g2" kvg:position="top">
+		<g id="kvg:0751c-Kaisho-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:0751c-Kaisho-s1" kvg:type="㇒" d="M42.78,16.75c0.08,0.43-0.6,2.04-1.03,2.5c-3.29,3.5-11.63,9.92-26.19,14.8"/>
 			<path id="kvg:0751c-Kaisho-s2" kvg:type="㇐" d="M10.53,48.71c0.86,0.31,3.01,0.4,3.86,0.31c7.6-0.77,28.85-3.52,34.57-3.93c1.43-0.1,2.29,0.15,3.01,0.31"/>
 			<path id="kvg:0751c-Kaisho-s3" kvg:type="㇑a" d="M31.71,30.37c0.43,0.35,1.35,2.63,1.44,3.33c0.16,1.31-0.05,26.17-0.14,30.69"/>
diff --git a/kanji/0751c.svg b/kanji/0751c.svg
index eb9778853..08052e1f1 100644
--- a/kanji/0751c.svg
+++ b/kanji/0751c.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_0751c" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0751c" kvg:element="甜">
 	<g id="kvg:0751c-g1" kvg:element="舌" kvg:position="left" kvg:radical="nelson">
-		<g id="kvg:0751c-g2" kvg:position="top">
+		<g id="kvg:0751c-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:0751c-s1" kvg:type="㇒" d="M42.78,16.75c0.08,0.43-0.6,2.04-1.03,2.5c-3.29,3.5-11.63,9.92-26.19,14.8"/>
 			<path id="kvg:0751c-s2" kvg:type="㇐" d="M10.53,48.71c0.86,0.31,3.01,0.4,3.86,0.31c7.6-0.77,28.85-3.52,34.57-3.93c1.43-0.1,2.29,0.15,3.01,0.31"/>
 			<path id="kvg:0751c-s3" kvg:type="㇑a" d="M31.71,30.37c0.43,0.35,1.35,2.63,1.44,3.33c0.16,1.31-0.05,26.17-0.14,30.69"/>
diff --git a/kanji/07b48.svg b/kanji/07b48.svg
index c0b44d685..f453c044f 100644
--- a/kanji/07b48.svg
+++ b/kanji/07b48.svg
@@ -50,7 +50,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:07b48-g4" kvg:element="舌" kvg:position="bottom">
-		<g id="kvg:07b48-g5" kvg:position="top">
+		<g id="kvg:07b48-g5" kvg:element="千" kvg:position="top">
 			<path id="kvg:07b48-s7" kvg:type="㇒" d="M66.26,38c0.09,0.29-0.7,1.8-1.21,2.11c-3.88,2.36-13.75,6.26-30.97,9.54"/>
 			<path id="kvg:07b48-s8" kvg:type="㇐" d="M15.6,61.93c1.46,0.34,5.11,0.5,6.55,0.34c11.07-1.23,48.01-6.27,65.4-6.47c2.43-0.03,3.89,0.16,5.1,0.34"/>
 			<path id="kvg:07b48-s9" kvg:type="㇑a" d="M52.77,47.99c0.56,0.31,1.74,2.32,1.85,2.94c0.21,1.15-0.07,19.6-0.18,23.59"/>
diff --git a/kanji/08052-Kaisho.svg b/kanji/08052-Kaisho.svg
index 2d3844844..b2f01d45a 100644
--- a/kanji/08052-Kaisho.svg
+++ b/kanji/08052-Kaisho.svg
@@ -46,7 +46,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08052-Kaisho-s6" kvg:type="㇑" d="M38.01,20c0.77,1.25,0.85,1.46,0.85,2.85s0.12,64.03,0.12,75.4"/>
 	</g>
 	<g id="kvg:08052-Kaisho-g2" kvg:element="舌" kvg:position="right">
-		<g id="kvg:08052-Kaisho-g3" kvg:position="top">
+		<g id="kvg:08052-Kaisho-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:08052-Kaisho-s7" kvg:type="㇒" d="M87.5,14.5c0,1.25-0.8,2.57-1.44,2.95C80,21,71.6,25.67,51,30.25"/>
 			<path id="kvg:08052-Kaisho-s8" kvg:type="㇐" d="M45.5,46.11c1.1,0.24,3.84,0.31,4.93,0.24c9.46-0.53,30.4-3.74,43.48-3.89c1.83-0.02,2.93,0.12,3.84,0.24"/>
 			<path id="kvg:08052-Kaisho-s9" kvg:type="㇑a" d="M69.75,27.75c0.36,0.4,1.13,2.97,1.2,3.77c0.13,1.48-0.04,30.63-0.12,35.73"/>
diff --git a/kanji/08052-KaishoVt3.svg b/kanji/08052-KaishoVt3.svg
index f80eea426..95e04b3a1 100644
--- a/kanji/08052-KaishoVt3.svg
+++ b/kanji/08052-KaishoVt3.svg
@@ -46,7 +46,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08052-KaishoVt3-s6" kvg:type="㇀" d="M11.75,75.75c0.75,0.5,2.59,0.39,3.21,0.17c2.49-0.9,17.96-7.22,21.79-8.66"/>
 	</g>
 	<g id="kvg:08052-KaishoVt3-g2" kvg:element="舌" kvg:position="right">
-		<g id="kvg:08052-KaishoVt3-g3" kvg:position="top">
+		<g id="kvg:08052-KaishoVt3-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:08052-KaishoVt3-s7" kvg:type="㇒" d="M87.5,14.5c0,1.25-0.8,2.57-1.44,2.95C80,21,71.6,25.67,51,30.25"/>
 			<path id="kvg:08052-KaishoVt3-s8" kvg:type="㇐" d="M45.5,46.11c1.1,0.24,3.84,0.31,4.93,0.24c9.46-0.53,30.4-3.74,43.48-3.89c1.83-0.02,2.93,0.12,3.84,0.24"/>
 			<path id="kvg:08052-KaishoVt3-s9" kvg:type="㇑a" d="M69.75,27.75c0.36,0.4,1.13,2.97,1.2,3.77c0.13,1.48-0.04,30.63-0.12,35.73"/>
diff --git a/kanji/08052.svg b/kanji/08052.svg
index cfc7b1317..d20bc8f56 100644
--- a/kanji/08052.svg
+++ b/kanji/08052.svg
@@ -46,7 +46,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08052-s6" kvg:type="㇑" d="M38.01,20c0.77,1.25,0.85,1.46,0.85,2.85s0.12,64.03,0.12,75.4"/>
 	</g>
 	<g id="kvg:08052-g2" kvg:element="舌" kvg:position="right">
-		<g id="kvg:08052-g3" kvg:position="top">
+		<g id="kvg:08052-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:08052-s7" kvg:type="㇒" d="M87.5,14.5c0,1.25-0.8,2.57-1.44,2.95C80,21,71.6,25.67,51,30.25"/>
 			<path id="kvg:08052-s8" kvg:type="㇐" d="M45.5,46.11c1.1,0.24,3.84,0.31,4.93,0.24c9.46-0.53,30.4-3.74,43.48-3.89c1.83-0.02,2.93,0.12,3.84,0.24"/>
 			<path id="kvg:08052-s9" kvg:type="㇑a" d="M69.75,27.75c0.36,0.4,1.13,2.97,1.2,3.77c0.13,1.48-0.04,30.63-0.12,35.73"/>
diff --git a/kanji/0820c.svg b/kanji/0820c.svg
index 32e8e267a..500b88f50 100644
--- a/kanji/0820c.svg
+++ b/kanji/0820c.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_0820c" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0820c" kvg:element="舌" kvg:radical="general">
-	<g id="kvg:0820c-g1" kvg:position="top">
+	<g id="kvg:0820c-g1" kvg:element="千" kvg:position="top">
 		<path id="kvg:0820c-s1" kvg:type="㇒" d="M67.12,11.5c-0.25,1.12-1,2.25-2.27,3.11c-5.1,3.46-18.98,9.89-37.47,15.41"/>
 		<path id="kvg:0820c-s2" kvg:type="㇐" d="M14.63,48.81c1.8,0.41,6.32,0.64,8.09,0.41c17.66-2.34,47.03-6.22,66.36-6.71c3-0.08,4.8,0.19,6.3,0.4"/>
 		<path id="kvg:0820c-s3" kvg:type="㇑a" d="M52.56,25.26c1.21,1.21,1.76,2.99,1.76,4.58c0,4.28,0,29.41,0,38.91"/>
diff --git a/kanji/0820d.svg b/kanji/0820d.svg
index 540073aa9..0259b1337 100644
--- a/kanji/0820d.svg
+++ b/kanji/0820d.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0820d-s2" kvg:type="㇏" d="M52.5,15c9.5,7.5,34.54,28.51,37.73,30.13c3.25,1.66,4.31,1.96,5.77,2.12"/>
 	</g>
 	<g id="kvg:0820d-g2" kvg:element="舌" kvg:variant="true" kvg:position="bottom" kvg:radical="general">
-		<g id="kvg:0820d-g3" kvg:position="top">
+		<g id="kvg:0820d-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:0820d-s3" kvg:type="㇐" d="M35.52,41.85c0.7,0.23,3.5,0.8,4.21,0.73c3.31-0.31,15.08-1.75,28.81-2.57c1.08-0.06,2.07,0.05,2.97,0.24"/>
 			<path id="kvg:0820d-s4" kvg:type="㇐" d="M21.55,58.95c1.2,0.39,5.15,0.6,6.37,0.51c7-0.51,28.01-2.86,50.78-3.75c1.5-0.06,4.78-0.16,7.01,0.18"/>
 			<path id="kvg:0820d-s5" kvg:type="㇑" d="M52.22,43.57c0.89,0.85,0.89,2.76,0.89,3.43c0,4.75,0.44,22.07,0.22,26.82"/>
diff --git a/kanji/08210.svg b/kanji/08210.svg
index 3860d6f56..1b8c736a9 100644
--- a/kanji/08210.svg
+++ b/kanji/08210.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_08210" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08210" kvg:element="舐">
 	<g id="kvg:08210-g1" kvg:element="舌" kvg:position="left" kvg:radical="general">
-		<g id="kvg:08210-g2" kvg:position="top">
+		<g id="kvg:08210-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:08210-s1" kvg:type="㇒" d="M40.69,15.83c0.08,0.46-0.62,2.2-1.07,2.69C36.19,22.3,27.5,29.22,12.31,34.46"/>
 			<path id="kvg:08210-s2" kvg:type="㇐" d="M9.08,46.42c0.75,0.21,3.67,0.58,5.67,0.5c6.64-0.28,23.52-2.23,28.5-2.5c1.24-0.07,3.25-0.17,4.67,0.33"/>
 			<path id="kvg:08210-s3" kvg:type="㇑a" d="M27.08,30.08c0.53,0.35,1.9,1.46,2,2.17c0.2,1.31,0.11,28.48,0,33"/>
diff --git a/kanji/08212.svg b/kanji/08212.svg
index 4f6281fe3..1cc0acf6b 100644
--- a/kanji/08212.svg
+++ b/kanji/08212.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08212-s2" kvg:type="㇏" d="M34.14,16.71c5.83,2.47,13.27,9.05,16.11,15.29"/>
 		</g>
 		<g id="kvg:08212-g3" kvg:element="舌" kvg:variant="true" kvg:position="bottom" kvg:radical="general">
-			<g id="kvg:08212-g4" kvg:position="top">
+			<g id="kvg:08212-g4" kvg:element="千" kvg:position="top">
 				<path id="kvg:08212-s3" kvg:type="㇐" d="M21,40.22c1.89,0,2.75,0.11,3.36,0.07c5.46-0.39,10.76-1.93,17.19-2.21c0.93-0.04,1.13-0.07,2.7-0.07"/>
 				<path id="kvg:08212-s4" kvg:type="㇐" d="M12.09,55.59c0.77,0.42,3.33,0.63,4.12,0.56c7.14-0.64,22.38-3.24,31.53-3.47c0.97-0.02,3.09-0.17,4.54,0.2"/>
 				<path id="kvg:08212-s5" kvg:type="㇑" d="M32.45,41.69c1.24,0.78,1.24,2.52,1.24,3.14c0,4.35,0.12,19.63-0.19,23.98"/>
diff --git a/kanji/08216-Kaisho.svg b/kanji/08216-Kaisho.svg
index 5504d0d44..3c792f014 100644
--- a/kanji/08216-Kaisho.svg
+++ b/kanji/08216-Kaisho.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08216-Kaisho-s2" kvg:type="㇏" d="M31.81,20.71C35.02,22.28,43.48,31.24,45,35.08"/>
 		</g>
 		<g id="kvg:08216-Kaisho-g3" kvg:element="舌" kvg:variant="true" kvg:position="bottom" kvg:radical="general">
-			<g id="kvg:08216-Kaisho-g4" kvg:position="top">
+			<g id="kvg:08216-Kaisho-g4" kvg:element="千" kvg:position="top">
 				<path id="kvg:08216-Kaisho-s3" kvg:type="㇐" d="M17.42,43.58c1.33,0.67,3.08,0.67,4.67,0.5c4.74-0.5,9.12-0.54,14.67-1.33c1.75-0.25,2.25-0.25,4-0.17"/>
 				<path id="kvg:08216-Kaisho-s4" kvg:type="㇐" d="M12.75,59.42c0.64,0.42,3.33,0.55,3.98,0.48c5.88-0.64,17.99-2.76,25.52-2.98c0.8-0.02,2.98,0.13,4.17,0.5"/>
 				<path id="kvg:08216-Kaisho-s5" kvg:type="㇑" d="M28.37,44.44c1.39,0.81,1.39,2.63,1.39,3.28c0,4.53,0.14,20.48-0.21,25.01"/>
diff --git a/kanji/08216.svg b/kanji/08216.svg
index 17fc6cdde..b2260a8ec 100644
--- a/kanji/08216.svg
+++ b/kanji/08216.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08216-s2" kvg:type="㇏" d="M31.81,20.71C35.02,22.28,43.48,31.24,45,35.08"/>
 		</g>
 		<g id="kvg:08216-g3" kvg:element="舌" kvg:variant="true" kvg:position="bottom" kvg:radical="general">
-			<g id="kvg:08216-g4" kvg:position="top">
+			<g id="kvg:08216-g4" kvg:element="千" kvg:position="top">
 				<path id="kvg:08216-s3" kvg:type="㇐" d="M17.42,43.58c1.33,0.67,3.08,0.67,4.67,0.5c4.74-0.5,9.12-0.54,14.67-1.33c1.75-0.25,2.25-0.25,4-0.17"/>
 				<path id="kvg:08216-s4" kvg:type="㇐" d="M12.75,59.42c0.64,0.42,3.33,0.55,3.98,0.48c5.88-0.64,17.99-2.76,25.52-2.98c0.8-0.02,2.98,0.13,4.17,0.5"/>
 				<path id="kvg:08216-s5" kvg:type="㇑" d="M28.37,44.44c1.39,0.81,1.39,2.63,1.39,3.28c0,4.53,0.14,20.48-0.21,25.01"/>
diff --git a/kanji/08218-Kaisho.svg b/kanji/08218-Kaisho.svg
index a207e6c9b..c851889f3 100644
--- a/kanji/08218-Kaisho.svg
+++ b/kanji/08218-Kaisho.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08218-Kaisho-s2" kvg:type="㇏" d="M35.89,21.96C40,23.75,45.25,28.5,47.25,33"/>
 		</g>
 		<g id="kvg:08218-Kaisho-g3" kvg:element="舌" kvg:variant="true" kvg:position="bottom" kvg:radical="tradit">
-			<g id="kvg:08218-Kaisho-g4" kvg:position="top">
+			<g id="kvg:08218-Kaisho-g4" kvg:element="千" kvg:position="top">
 				<path id="kvg:08218-Kaisho-s3" kvg:type="㇐" d="M21,43.22c1.89,0,2.75,0.11,3.36,0.07c5.46-0.39,10.76-1.93,17.19-2.21c0.93-0.04,1.13-0.07,2.7-0.07"/>
 				<path id="kvg:08218-Kaisho-s4" kvg:type="㇐" d="M14.09,59.59c0.77,0.42,3.33,0.63,4.12,0.56c7.14-0.64,17.88-3.24,27.03-3.47c0.97-0.02,3.09-0.17,4.54,0.2"/>
 				<path id="kvg:08218-Kaisho-s5" kvg:type="㇑" d="M31.95,44.69c1.24,0.78,1.24,2.52,1.24,3.14c0,4.35,0.12,19.63-0.19,23.98"/>
diff --git a/kanji/08218.svg b/kanji/08218.svg
index ea68e2839..bc64111b2 100644
--- a/kanji/08218.svg
+++ b/kanji/08218.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08218-s2" kvg:type="㇏" d="M36.39,22.21c4.36,2.41,8.36,7.04,10.86,11.29"/>
 		</g>
 		<g id="kvg:08218-g3" kvg:element="舌" kvg:variant="true" kvg:position="bottom" kvg:radical="tradit">
-			<g id="kvg:08218-g4" kvg:position="top">
+			<g id="kvg:08218-g4" kvg:element="千" kvg:position="top">
 				<path id="kvg:08218-s3" kvg:type="㇐" d="M21.5,43.22c1.55,0.15,3.11,0.19,4.64-0.04C30.62,42.5,34,42,39.37,40.99c1.6-0.3,3.25-0.22,4.88-0.22"/>
 				<path id="kvg:08218-s4" kvg:type="㇐" d="M14.09,59.59c2.49,0.44,4.97,0.17,7.44-0.3c5.93-0.73,12.35-1.79,19.85-2.45c2.63-0.23,5.27-0.21,7.9,0.04"/>
 				<path id="kvg:08218-s5" kvg:type="㇑" d="M31.95,44.44c0.99,0.99,1.24,1.93,1.24,3.14c0,4.35,0.12,19.88-0.19,24.23"/>
diff --git a/kanji/086de.svg b/kanji/086de.svg
index 39a7f2ee7..52cf2b98e 100644
--- a/kanji/086de.svg
+++ b/kanji/086de.svg
@@ -52,7 +52,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:086de-s6" kvg:type="㇔" d="M36.75,63c2.58,2.81,6.66,11.53,7.31,15.89"/>
 	</g>
 	<g id="kvg:086de-g5" kvg:element="舌" kvg:position="right">
-		<g id="kvg:086de-g6" kvg:position="top">
+		<g id="kvg:086de-g6" kvg:element="千" kvg:position="top">
 			<path id="kvg:086de-s7" kvg:type="㇒" d="M86.25,14.25c0.09,0.4-0.71,2.52-1.23,2.95c-3.95,3.29-14,8.73-31.52,13.3"/>
 			<path id="kvg:086de-s8" kvg:type="㇐" d="M47.33,47.66c1.02,0.34,3.58,0.43,4.6,0.34c8.82-0.75,29.71-3.77,41.91-3.97c1.71-0.03,2.73,0.16,3.58,0.34"/>
 			<path id="kvg:086de-s9" kvg:type="㇑a" d="M69.42,27.5c0.55,0.38,1.72,2.87,1.83,3.64c0.21,1.43-0.07,30.06-0.18,35"/>
diff --git a/kanji/08a71.svg b/kanji/08a71.svg
index bafdc2fc0..a988f3bbe 100644
--- a/kanji/08a71.svg
+++ b/kanji/08a71.svg
@@ -49,7 +49,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:08a71-g3" kvg:element="舌" kvg:position="right" kvg:phon="舌">
-		<g id="kvg:08a71-g4" kvg:position="top">
+		<g id="kvg:08a71-g4" kvg:element="千" kvg:position="top">
 			<path id="kvg:08a71-s8" kvg:type="㇒" d="M81.75,13.75c-0.12,1.25-0.79,2.39-1.66,3.06c-4.84,3.69-15.34,9.94-29.34,14.94"/>
 			<path id="kvg:08a71-s9" kvg:type="㇐" d="M45.39,45.8c1.55,0.34,4.36,0.62,6.73,0.34C62.8,44.9,76.37,43.07,91,42.23c2.28-0.13,4.49-0.01,6.75,0.29"/>
 			<path id="kvg:08a71-s10" kvg:type="㇑a" d="M68.87,27.19c1.4,1.4,1.85,3.06,1.85,4.88c0,1.44-0.21,28.18-0.21,35.16"/>
diff --git a/kanji/08f9e-Kaisho.svg b/kanji/08f9e-Kaisho.svg
index 40aa1375b..4bcadfb59 100644
--- a/kanji/08f9e-Kaisho.svg
+++ b/kanji/08f9e-Kaisho.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_08f9e-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08f9e-Kaisho" kvg:element="辞">
 	<g id="kvg:08f9e-Kaisho-g1" kvg:element="舌" kvg:position="left" kvg:radical="nelson">
-		<g id="kvg:08f9e-Kaisho-g2" kvg:position="top">
+		<g id="kvg:08f9e-Kaisho-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:08f9e-Kaisho-s1" kvg:type="㇒" d="M38.78,15.75c0.07,0.35-0.52,2.18-0.89,2.55c-2.86,2.85-10.14,7.54-22.83,11.5"/>
 			<path id="kvg:08f9e-Kaisho-s2" kvg:type="㇐" d="M12.03,45.21c0.86,0.31,3.01,0.46,3.86,0.31c6.53-1.13,22.85-3.52,28.57-3.93c1.43-0.1,2.29,0.15,3.01,0.31"/>
 			<path id="kvg:08f9e-Kaisho-s3" kvg:type="㇑a" d="M30.21,25.37c0.43,0.35,1.35,2.63,1.44,3.33c0.16,1.31-0.05,28.17-0.14,32.69"/>
diff --git a/kanji/08f9e.svg b/kanji/08f9e.svg
index 7e802a605..c44f8b028 100644
--- a/kanji/08f9e.svg
+++ b/kanji/08f9e.svg
@@ -38,7 +38,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_08f9e" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08f9e" kvg:element="辞">
 	<g id="kvg:08f9e-g1" kvg:element="舌" kvg:position="left" kvg:radical="nelson">
-		<g id="kvg:08f9e-g2" kvg:position="top">
+		<g id="kvg:08f9e-g2" kvg:element="千" kvg:position="top">
 			<path id="kvg:08f9e-s1" kvg:type="㇒" d="M38.75,16.12c0.12,1-0.41,1.82-1.39,2.67c-2.87,2.49-10.15,6.61-22.86,10.08"/>
 			<path id="kvg:08f9e-s2" kvg:type="㇐" d="M12.03,45.21c1.01,0.31,3.56,0.2,4.56,0.06c9.57-1.27,21.08-3.02,27.83-3.43c1.69-0.1,2.71-0.1,3.55,0.06"/>
 			<path id="kvg:08f9e-s3" kvg:type="㇑a" d="M30.46,26.37c0.83,0.83,1.19,2.13,1.19,3.58c0,8.05,0.11,25.05,0.11,31.69"/>
diff --git a/kanji/0929b.svg b/kanji/0929b.svg
index 7c9932c24..7e81a05a7 100644
--- a/kanji/0929b.svg
+++ b/kanji/0929b.svg
@@ -48,7 +48,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0929b-s8" kvg:type="㇀/㇐" d="M15,91.81c1.28,0.92,2.82,0.69,4.62,0.23c1.33-0.34,11.54-5.28,24.88-10.79"/>
 	</g>
 	<g id="kvg:0929b-g2" kvg:element="舌" kvg:position="right">
-		<g id="kvg:0929b-g3" kvg:position="top">
+		<g id="kvg:0929b-g3" kvg:element="千" kvg:position="top">
 			<path id="kvg:0929b-s9" kvg:type="㇒" d="M87.75,16.75c0.09,0.39-0.66,2.48-1.19,2.86C81.75,23,72.99,28.06,56,32.5"/>
 			<path id="kvg:0929b-s10" kvg:type="㇐" d="M50.33,49.16c1.02,0.34,3.58,0.43,4.6,0.34c8.82-0.75,27.71-2.27,39.91-2.47c1.71-0.03,2.73,0.16,3.58,0.34"/>
 			<path id="kvg:0929b-s11" kvg:type="㇑a" d="M71.92,31.5c0.55,0.38,1.72,2.87,1.83,3.64c0.21,1.43-0.07,28.06-0.18,33"/>
diff --git a/kanji/095ca-Kaisho.svg b/kanji/095ca-Kaisho.svg
index 6c227311d..e79f2c54f 100644
--- a/kanji/095ca-Kaisho.svg
+++ b/kanji/095ca-Kaisho.svg
@@ -58,7 +58,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:095ca-Kaisho-s11" kvg:type="㇀" d="M29.6,88.29c1.36,0.86,3,0.9,3.86-0.17c2.5-3.11,5-6.91,7.27-10.88"/>
 		</g>
 		<g id="kvg:095ca-Kaisho-g6" kvg:element="舌" kvg:position="right">
-			<g id="kvg:095ca-Kaisho-g7" kvg:position="top">
+			<g id="kvg:095ca-Kaisho-g7" kvg:element="千" kvg:position="top">
 				<path id="kvg:095ca-Kaisho-s12" kvg:type="㇒" d="M71.35,43c0.06,0.25-0.49,1.58-0.84,1.85c-2.7,2.07-9.54,5.49-21.5,8.37"/>
 				<path id="kvg:095ca-Kaisho-s13" kvg:type="㇐" d="M44.83,62.67c0.78,0.26,2.74,0.39,3.51,0.26c5.93-0.95,23.16-2.19,29.95-2.92c1.29-0.14,2.08,0.13,2.73,0.26"/>
 				<path id="kvg:095ca-Kaisho-s14" kvg:type="㇑a" d="M60.03,52.01c0.36,0.25,1.12,1.86,1.19,2.35c0.13,0.92-0.04,17.33-0.12,20.52"/>
diff --git a/kanji/095ca.svg b/kanji/095ca.svg
index a00e6e54e..070438e22 100644
--- a/kanji/095ca.svg
+++ b/kanji/095ca.svg
@@ -58,7 +58,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:095ca-s11" kvg:type="㇀" d="M29.6,88.29c1.36,0.86,3,0.9,3.86-0.17c2.5-3.11,5-6.91,7.27-10.88"/>
 		</g>
 		<g id="kvg:095ca-g6" kvg:element="舌" kvg:position="right">
-			<g id="kvg:095ca-g7" kvg:position="top">
+			<g id="kvg:095ca-g7" kvg:element="千" kvg:position="top">
 				<path id="kvg:095ca-s12" kvg:type="㇒" d="M71.35,43c0.06,0.25-0.49,1.58-0.84,1.85c-2.7,2.07-9.54,5.49-21.5,8.37"/>
 				<path id="kvg:095ca-s13" kvg:type="㇐" d="M44.83,62.67c0.78,0.26,2.74,0.39,3.51,0.26c5.93-0.95,23.16-2.19,29.95-2.92c1.29-0.14,2.08,0.13,2.73,0.26"/>
 				<path id="kvg:095ca-s14" kvg:type="㇑a" d="M60.03,52.01c0.36,0.25,1.12,1.86,1.19,2.35c0.13,0.92-0.04,17.33-0.12,20.52"/>