diff --git a/kanji/04ead.svg b/kanji/04ead.svg
index 87f8a6023..5876da013 100644
--- a/kanji/04ead.svg
+++ b/kanji/04ead.svg
@@ -37,31 +37,27 @@ 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_04ead" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:04ead" kvg:element="亭">
-	<g id="kvg:04ead-g1" kvg:element="高" kvg:part="1" kvg:partial="true" kvg:position="top">
-		<g id="kvg:04ead-g2" kvg:element="亠" kvg:radical="general">
-			<path id="kvg:04ead-s1" kvg:type="㇑a" d="M52.79,9.61c1.13,1.13,1.34,2.32,1.34,3.27c0,3.49,0.09,4.25,0.09,7.31"/>
-			<path id="kvg:04ead-s2" kvg:type="㇐" d="M22,23.83c2.62,0.67,5.28,0.72,8.13,0.4c11.13-1.23,35.9-3.83,48.5-4.39c2.66-0.12,5.09-0.2,7.62,0.75"/>
+	<g id="kvg:04ead-g1" kvg:element="亠" kvg:position="top" kvg:radical="general">
+		<path id="kvg:04ead-s1" kvg:type="㇑a" d="M52.79,9.61c1.13,1.13,1.34,2.32,1.34,3.27c0,3.49,0.09,4.25,0.09,7.31"/>
+		<path id="kvg:04ead-s2" kvg:type="㇐" d="M22,23.83c2.62,0.67,5.28,0.72,8.13,0.4c11.13-1.23,35.9-3.83,48.5-4.39c2.66-0.12,5.09-0.2,7.62,0.75"/>
+	</g>
+	<g id="kvg:04ead-g2" kvg:position="bottom">
+		<g id="kvg:04ead-g3" kvg:element="口">
+			<path id="kvg:04ead-s3" kvg:type="㇑" d="M35.64,33.39c0.82,0.51,1.52,1.25,1.59,2.24c0.82,2.52,1.95,6.15,2.67,9.4c0.21,0.95,0.41,1.87,0.61,2.72"/>
+			<path id="kvg:04ead-s4" kvg:type="㇕b" d="M37.56,34.13c6.53-0.88,21.98-3.2,29.69-4.19c3.62-0.46,5.6-0.24,4.46,3.99c-0.58,2.14-1.3,4.11-2.54,8.02"/>
+			<path id="kvg:04ead-s5" kvg:type="㇐b" d="M40.97,45.69c5.75-0.77,18.06-2.32,25.78-3.18c1.71-0.19,3.22-0.35,4.42-0.45"/>
 		</g>
 	</g>
-	<g id="kvg:04ead-g3" kvg:position="bottom">
-		<g id="kvg:04ead-g4" kvg:element="高" kvg:part="1" kvg:partial="true">
-			<g id="kvg:04ead-g5" kvg:element="口">
-				<path id="kvg:04ead-s3" kvg:type="㇑" d="M35.64,33.39c0.82,0.51,1.52,1.25,1.59,2.24c0.82,2.52,1.95,6.15,2.67,9.4c0.21,0.95,0.41,1.87,0.61,2.72"/>
-				<path id="kvg:04ead-s4" kvg:type="㇕b" d="M37.56,34.13c6.53-0.88,21.98-3.2,29.69-4.19c3.62-0.46,5.6-0.24,4.46,3.99c-0.58,2.14-1.3,4.11-2.54,8.02"/>
-				<path id="kvg:04ead-s5" kvg:type="㇐b" d="M40.97,45.69c5.75-0.77,18.06-2.32,25.78-3.18c1.71-0.19,3.22-0.35,4.42-0.45"/>
-			</g>
+	<g id="kvg:04ead-g4" kvg:element="冖">
+		<path id="kvg:04ead-s6" kvg:type="㇔" d="M22.29,55.69c-0.11,3.81-2.82,13.79-3.79,16.06"/>
+		<path id="kvg:04ead-s7" kvg:type="㇖b" d="M23.22,57.75C34,57,67.48,51.96,85.19,51.5c9.56-0.25,4.06,5.75-0.69,9.5"/>
+	</g>
+	<g id="kvg:04ead-g5" kvg:element="丁" kvg:phon="丁">
+		<g id="kvg:04ead-g6" kvg:element="一">
+			<path id="kvg:04ead-s8" kvg:type="㇐" d="M29.27,70.84c2.15,0.84,5.32,0.46,7.53,0.21c9.47-1.07,24.6-3.02,35.21-3.79c2.58-0.19,5.18-0.24,7.73,0.36"/>
 		</g>
-		<g id="kvg:04ead-g6" kvg:element="冖">
-			<path id="kvg:04ead-s6" kvg:type="㇔" d="M22.29,55.69c-0.11,3.81-2.82,13.79-3.79,16.06"/>
-			<path id="kvg:04ead-s7" kvg:type="㇖b" d="M23.22,57.75C34,57,67.48,51.96,85.19,51.5c9.56-0.25,4.06,5.75-0.69,9.5"/>
-		</g>
-		<g id="kvg:04ead-g7" kvg:element="丁" kvg:phon="丁">
-			<g id="kvg:04ead-g8" kvg:element="一">
-				<path id="kvg:04ead-s8" kvg:type="㇐" d="M29.27,70.84c2.15,0.84,5.32,0.46,7.53,0.21c9.47-1.07,24.6-3.02,35.21-3.79c2.58-0.19,5.18-0.24,7.73,0.36"/>
-			</g>
-			<g id="kvg:04ead-g9" kvg:element="亅">
-				<path id="kvg:04ead-s9" kvg:type="㇚" d="M55.01,70.79c0.85,0.85,1.08,1.96,1.08,3.44c0,9.74-0.09,17.33-0.09,20.64c0,9.3-5.88,1.12-7.36-0.75"/>
-			</g>
+		<g id="kvg:04ead-g7" kvg:element="亅">
+			<path id="kvg:04ead-s9" kvg:type="㇚" d="M55.01,70.79c0.85,0.85,1.08,1.96,1.08,3.44c0,9.74-0.09,17.33-0.09,20.64c0,9.3-5.88,1.12-7.36-0.75"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/054c9.svg b/kanji/054c9.svg
index f040a37cf..c7a461f60 100644
--- a/kanji/054c9.svg
+++ b/kanji/054c9.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_054c9" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:054c9" kvg:element="哉">
-	<g id="kvg:054c9-g1" kvg:element="土" kvg:part="1">
+	<g id="kvg:054c9-g1" kvg:element="𢦏" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:054c9-g2" kvg:element="十" kvg:radical="nelson">
 			<path id="kvg:054c9-s1" kvg:type="㇐" d="M21,31.16c0.98,0.26,2.78,0.32,3.76,0.26c6.86-0.38,14.86-1.75,21.3-2.33c1.62-0.14,2.62-0.38,3.43-0.24"/>
 			<path id="kvg:054c9-s2" kvg:type="㇑" d="M36.3,14.9c0.84,0.84,1.02,2.27,1.02,4.14c0,6.09-0.07,19.69-0.07,25.96"/>
@@ -48,21 +48,23 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 	</g>
-	<g id="kvg:054c9-g5" kvg:element="口" kvg:radical="tradit">
+	<g id="kvg:054c9-g5" kvg:element="口" kvg:position="kamaec" kvg:radical="tradit">
 		<path id="kvg:054c9-s4" kvg:type="㇑" d="M21.89,61.42c0.97,0.97,1.35,2.6,1.65,4.33c0.76,4.33,1.47,10.33,2.23,15.77c0.23,1.65,0.46,3.25,0.7,4.73"/>
 		<path id="kvg:054c9-s5" kvg:type="㇕b" d="M24.07,63.21c6.86-0.95,13.51-2.47,20.05-3.58c4.32-0.73,6.39-0.3,5.24,4.4c-1.02,4.21-1.82,8.15-3.46,15.52"/>
 		<path id="kvg:054c9-s6" kvg:type="㇐b" d="M26.86,82.53c4.94-0.56,10.07-1.08,17-1.7c1.39-0.13,2.85-0.26,4.39-0.39"/>
 	</g>
-	<g id="kvg:054c9-g6" kvg:element="戈" kvg:part="2">
-		<g id="kvg:054c9-g7" kvg:element="弋" kvg:part="2">
-			<path id="kvg:054c9-s7" kvg:type="㇂" d="M56.62,12.03c1.56,1.84,2.18,3.1,2.53,7.06c2.72,30.69,11.97,59.53,30.39,73.86c5.74,4.47,5.26,1.79,4.48-6.36"/>
-		</g>
-		<g id="kvg:054c9-g8" kvg:element="丿">
-			<path id="kvg:054c9-s8" kvg:type="㇒" d="M83.07,51.93c0.1,0.97-0.41,2.53-0.95,3.91c-3.46,8.86-14.54,26.6-33.94,37.67"/>
-		</g>
-		<g id="kvg:054c9-g9" kvg:element="弋" kvg:part="3">
-			<g id="kvg:054c9-g10" kvg:element="丶">
-				<path id="kvg:054c9-s9" kvg:type="㇔" d="M71.87,17.28c4.58,2.94,8.5,6.47,11.25,11.75"/>
+	<g id="kvg:054c9-g6" kvg:element="𢦏" kvg:part="2" kvg:position="kamae">
+		<g id="kvg:054c9-g7" kvg:element="戈" kvg:part="2">
+			<g id="kvg:054c9-g8" kvg:element="弋" kvg:part="2">
+				<path id="kvg:054c9-s7" kvg:type="㇂" d="M56.62,12.03c1.56,1.84,2.18,3.1,2.53,7.06c2.72,30.69,11.97,59.53,30.39,73.86c5.74,4.47,5.26,1.79,4.48-6.36"/>
+			</g>
+			<g id="kvg:054c9-g9" kvg:element="丿">
+				<path id="kvg:054c9-s8" kvg:type="㇒" d="M83.07,51.93c0.1,0.97-0.41,2.53-0.95,3.91c-3.46,8.86-14.54,26.6-33.94,37.67"/>
+			</g>
+			<g id="kvg:054c9-g10" kvg:element="弋" kvg:part="3">
+				<g id="kvg:054c9-g11" kvg:element="丶">
+					<path id="kvg:054c9-s9" kvg:type="㇔" d="M71.87,17.28c4.58,2.94,8.5,6.47,11.25,11.75"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/0685f-Kaisho.svg b/kanji/0685f-Kaisho.svg
index f27a2a853..0b2a07703 100644
--- a/kanji/0685f-Kaisho.svg
+++ b/kanji/0685f-Kaisho.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0685f-Kaisho-s3" kvg:type="㇒" d="M29.94,41.28c-5.66,13.84-8.81,19.69-17.58,31.81"/>
 		<path id="kvg:0685f-Kaisho-s4" kvg:type="㇔/㇏" d="M32.97,45.4c2.3,1.37,6.09,4.95,8.03,7.6"/>
 	</g>
-	<g id="kvg:0685f-Kaisho-g2" kvg:element="戔" kvg:variant="true" kvg:position="right">
+	<g id="kvg:0685f-Kaisho-g2" kvg:element="戋" kvg:variant="true" kvg:position="right">
 		<g id="kvg:0685f-Kaisho-g3" kvg:element="三" kvg:part="1">
 			<g id="kvg:0685f-Kaisho-g4" kvg:element="一" kvg:position="top">
 				<path id="kvg:0685f-Kaisho-s5" kvg:type="㇐" d="M48.24,30.9c1.04,0.38,2.97,0.56,4,0.38c3.65-0.64,22.31-4.16,28.94-5.38c1.05-0.19,1.92,0.2,2.55,0.2"/>
diff --git a/kanji/07455-VtLst.svg b/kanji/07455-VtLst.svg
index b33995a07..5762cf0de 100644
--- a/kanji/07455-VtLst.svg
+++ b/kanji/07455-VtLst.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:07455-VtLst-s3" kvg:type="㇐" d="M10.25,82.75c1.75,1.25,3.08,0.74,4.5,0C20,80,26,76.5,34,71.75"/>
 		<path id="kvg:07455-VtLst-s4" kvg:type="㇑" d="M22.07,27.52c0.87,0.88,1.48,2.78,1.48,3.48c0,5.95,0.52,42.62,0.35,46.57"/>
 	</g>
-	<g id="kvg:07455-VtLst-g2" kvg:position="right">
+	<g id="kvg:07455-VtLst-g2" kvg:element="叚" kvg:position="right">
 		<path id="kvg:07455-VtLst-s5" kvg:type="㇑" d="M41.81,20.37c5.69-1.12,9.98-1.6,15.92-2.5c1.49-0.22,2.39,1.04,2.18,2.06c-0.89,4.25-2.66,13.57-3.24,18.28"/>
 		<path id="kvg:07455-VtLst-s6" kvg:type="㇕" d="M40.97,41.05c4.8-0.54,13.28-1.8,17.69-2.31"/>
 		<path id="kvg:07455-VtLst-s7" kvg:type="㇐" d="M39.14,17.9c0.86,0.85,1.75,2.31,1.86,3.64c0,15.96,0,66.21-0.25,74.21"/>
diff --git a/kanji/08469-Kaisho.svg b/kanji/08469-Kaisho.svg
index ac2bff04d..e0df0b9d0 100644
--- a/kanji/08469-Kaisho.svg
+++ b/kanji/08469-Kaisho.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08469-Kaisho-s2" kvg:type="㇑a" d="M35.17,12.33c1.08,0.42,2.35,1.7,2.5,2.5c1.08,5.92,1.33,11.92,2.17,16.5"/>
 		<path id="kvg:08469-Kaisho-s3" kvg:type="㇑a" d="M67,11.5c1,1,1.2,2.36,0.83,3.83c-1.12,4.5-2.54,9.92-4.17,15.67"/>
 	</g>
-	<g id="kvg:08469-Kaisho-g2" kvg:position="bottom">
+	<g id="kvg:08469-Kaisho-g2" kvg:element="皅" kvg:position="bottom">
 		<g id="kvg:08469-Kaisho-g3" kvg:element="白" kvg:position="left">
 			<g id="kvg:08469-Kaisho-g4" kvg:position="top">
 				<path id="kvg:08469-Kaisho-s4" kvg:type="㇔" d="M34.77,33.25c0.45,0.51,0.11,2.16-0.09,2.58c-1.47,3.09-5.56,7.9-10.5,11.42"/>
diff --git a/kanji/0846d-VtFst.svg b/kanji/0846d-VtFst.svg
index 26d980d40..be9cad41c 100644
--- a/kanji/0846d-VtFst.svg
+++ b/kanji/0846d-VtFst.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0846d-VtFst-s2" kvg:type="㇑a" d="M34.92,12.25c1.51,1.29,2,1.68,2.16,2.48c1.51,7.42,2.81,15.07,3.24,17.77"/>
 		<path id="kvg:0846d-VtFst-s3" kvg:type="㇑a" d="M66.39,10.75c0.33,1.01,0.77,1.76,0.4,2.99c-2.17,7.27-3.16,10.91-5.54,17.76"/>
 	</g>
-	<g id="kvg:0846d-VtFst-g2" kvg:position="bottom">
+	<g id="kvg:0846d-VtFst-g2" kvg:element="叚" kvg:position="bottom">
 		<path id="kvg:0846d-VtFst-s4" kvg:type="㇑" d="M20.64,37.91c1.1,0.7,1.72,3.91,1.87,5c0,13.16,0,48.88-0.31,55.47"/>
 		<path id="kvg:0846d-VtFst-s5" kvg:type="㇕" d="M22.4,40.95c7.24-0.92,16.7-2.64,24.26-3.39c1.9-0.18,3.04,0.85,2.77,1.7c-1.13,3.5-1.89,10.6-2.62,14.49"/>
 		<path id="kvg:0846d-VtFst-s6" kvg:type="㇐" d="M22.97,55.99c6.11-0.45,20.39-1.89,26.01-2.31"/>