diff --git a/kanji/09a30-Kaisho.svg b/kanji/09a30-Kaisho.svg
index acdf64122..986a7e3b0 100644
--- a/kanji/09a30-Kaisho.svg
+++ b/kanji/09a30-Kaisho.svg
@@ -38,38 +38,34 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_09a30-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:09a30-Kaisho" kvg:element="騰">
 	<g id="kvg:09a30-Kaisho-g1" kvg:element="月" kvg:variant="true" kvg:original="肉" kvg:position="left" kvg:radical="nelson">
-		<path id="kvg:09a30-Kaisho-s1" kvg:type="㇓" d="M18.88,20.24c0.47,0.95,0.79,1.88,0.95,2.8c0.16,0.92,0.14,25.9-0.37,33.63c-0.72,11-1.45,22.08-8.21,34.72"/>
-		<path id="kvg:09a30-Kaisho-s2" kvg:type="㇆a" d="M20.77,21.31c1.89-0.06,10.95-2.34,12.36-2.46c2.52-0.23,3.16,1.31,3.16,2.67c0,3.23-0.47,46.22-0.47,64.55c0,12.61-5.32,3.55-6.94,2.04"/>
-		<path id="kvg:09a30-Kaisho-s3" kvg:type="㇐a" d="M20.77,40.7c2.65-0.23,4.77-0.73,7.39-1.16c0.72-0.12,1.43-0.23,2.13-0.34"/>
-		<path id="kvg:09a30-Kaisho-s4" kvg:type="㇐a" d="M20.72,59.65c2.38-0.05,4.75-0.41,7.1-0.72c0.69-0.09,1.4-0.18,2.1-0.28"/>
+		<g id="kvg:09a30-Kaisho-g2" kvg:element="朕" kvg:part="1">
+			<path id="kvg:09a30-Kaisho-s1" kvg:type="㇓" d="M18.88,20.24c0.47,0.95,0.79,1.88,0.95,2.8c0.16,0.92,0.14,25.9-0.37,33.63c-0.72,11-1.45,22.08-8.21,34.72"/>
+			<path id="kvg:09a30-Kaisho-s2" kvg:type="㇆a" d="M20.77,21.31c1.89-0.06,10.95-2.34,12.36-2.46c2.52-0.23,3.16,1.31,3.16,2.67c0,3.23-0.47,46.22-0.47,64.55c0,12.61-5.32,3.55-6.94,2.04"/>
+			<path id="kvg:09a30-Kaisho-s3" kvg:type="㇐a" d="M20.77,40.7c2.65-0.23,4.77-0.73,7.39-1.16c0.72-0.12,1.43-0.23,2.13-0.34"/>
+			<path id="kvg:09a30-Kaisho-s4" kvg:type="㇐a" d="M20.72,59.65c2.38-0.05,4.75-0.41,7.1-0.72c0.69-0.09,1.4-0.18,2.1-0.28"/>
+		</g>
 	</g>
-	<g id="kvg:09a30-Kaisho-g2" kvg:position="right">
-		<g id="kvg:09a30-Kaisho-g3" kvg:position="top">
+	<g id="kvg:09a30-Kaisho-g3" kvg:element="駦" kvg:position="right">
+		<g id="kvg:09a30-Kaisho-g4" kvg:element="龹" kvg:position="top">
 			<path id="kvg:09a30-Kaisho-s5" kvg:type="㇔" d="M48.02,19.09c2.04,1.5,5.26,6.18,5.77,8.52"/>
 			<path id="kvg:09a30-Kaisho-s6" kvg:type="㇒" d="M81.28,15.64c0.02,0.25,0.04,0.64-0.04,1c-0.46,2.11-3.13,6.74-6.77,9.57"/>
-			<g id="kvg:09a30-Kaisho-g4" kvg:element="二">
-				<g id="kvg:09a30-Kaisho-g5" kvg:position="top">
-					<path id="kvg:09a30-Kaisho-s7" kvg:type="㇐" d="M46.78,32.85c0.71,0.27,2.02,0.31,2.74,0.27c5.98-0.37,28.36-3.06,32.76-2.74c1.19,0.08,1.9,0.13,2.5,0.26"/>
-				</g>
-				<g id="kvg:09a30-Kaisho-g6" kvg:element="大" kvg:part="1" kvg:position="bottom">
-					<path id="kvg:09a30-Kaisho-s8" kvg:type="㇐" d="M42,44.39c1.15,0.38,3.27,0.42,4.42,0.38c8.32-0.27,29.32-3.02,41.78-3.69c1.92-0.1,3.08,0.18,4.04,0.38"/>
-				</g>
+			<g id="kvg:09a30-Kaisho-g5" kvg:element="二">
+				<path id="kvg:09a30-Kaisho-s7" kvg:type="㇐" d="M46.78,32.85c0.71,0.27,2.02,0.31,2.74,0.27c5.98-0.37,28.36-3.06,32.76-2.74c1.19,0.08,1.9,0.13,2.5,0.26"/>
+				<path id="kvg:09a30-Kaisho-s8" kvg:type="㇐" d="M42,44.39c1.15,0.38,3.27,0.42,4.42,0.38c8.32-0.27,29.32-3.02,41.78-3.69c1.92-0.1,3.08,0.18,4.04,0.38"/>
 			</g>
-			<g id="kvg:09a30-Kaisho-g7" kvg:element="大" kvg:part="2">
-				<g id="kvg:09a30-Kaisho-g8" kvg:element="人">
-					<path id="kvg:09a30-Kaisho-s9" kvg:type="㇒" d="M65.8,14.5c0.06,1.14,0.18,3.28-0.13,4.59C61.75,35.75,55.5,50.75,42.25,63.04"/>
-					<path id="kvg:09a30-Kaisho-s10" kvg:type="㇏" d="M67.5,35.5c2.25,0.5,20.18,17.48,24.03,20.34c1.3,0.97,2.42,1.38,3.72,1.66"/>
-				</g>
+			<g id="kvg:09a30-Kaisho-g6" kvg:element="人">
+				<path id="kvg:09a30-Kaisho-s9" kvg:type="㇒" d="M65.8,14.5c0.06,1.14,0.18,3.28-0.13,4.59C61.75,35.75,55.5,50.75,42.25,63.04"/>
+				<path id="kvg:09a30-Kaisho-s10" kvg:type="㇏" d="M67.5,35.5c2.25,0.5,20.18,17.48,24.03,20.34c1.3,0.97,2.42,1.38,3.72,1.66"/>
 			</g>
 		</g>
-		<g id="kvg:09a30-Kaisho-g9" kvg:element="馬" kvg:position="bottom" kvg:radical="tradit">
+		<g id="kvg:09a30-Kaisho-g7" kvg:element="馬" kvg:position="bottom" kvg:radical="tradit">
 			<path id="kvg:09a30-Kaisho-s11" kvg:type="㇑" d="M54.69,52.25c0.25,0.2,0.53,1.34,0.53,1.69c0,3.61,0.03,19.09-0.13,24.77"/>
 			<path id="kvg:09a30-Kaisho-s12" kvg:type="㇐b" d="M55.96,53.77c6.22-0.71,20.73-2.63,23.4-3.02c0.93-0.13,2.51-0.29,2.98-0.19"/>
 			<path id="kvg:09a30-Kaisho-s13" kvg:type="㇑a" d="M68.2,52.42c0.25,0.2,0.46,0.49,0.46,0.84c0,3.61,0.03,16.91-0.13,22.59"/>
 			<path id="kvg:09a30-Kaisho-s14" kvg:type="㇐b" d="M55.68,61.78c6.22-0.71,19.62-2.09,22.29-2.47c0.93-0.14,2.51-0.29,2.98-0.19"/>
 			<path id="kvg:09a30-Kaisho-s15" kvg:type="㇐b" d="M55.82,69.39c6.22-0.71,19.62-2.08,22.29-2.47c0.93-0.13,2.51-0.29,2.98-0.19"/>
 			<path id="kvg:09a30-Kaisho-s16" kvg:type="㇆a" d="M55.1,78.21c7.87-1.29,27.77-3.48,32.13-3.95c2.84-0.31,4.07,1.4,3.78,3.55c-0.82,6.09-3.59,12.21-5.78,16.01c-3.05,5.3-4.02,2.85-6.9-0.03"/>
-			<g id="kvg:09a30-Kaisho-g10" kvg:element="灬" kvg:variant="true" kvg:original="火">
+			<g id="kvg:09a30-Kaisho-g8" kvg:element="灬" kvg:variant="true" kvg:original="火">
 				<path id="kvg:09a30-Kaisho-s17" kvg:type="㇔" d="M48.35,84.71c0.24,4.05-0.17,8.95-0.89,11.49"/>
 				<path id="kvg:09a30-Kaisho-s18" kvg:type="㇔" d="M57.49,83.62c1.95,1.53,3.79,5.75,4.28,8.13"/>
 				<path id="kvg:09a30-Kaisho-s19" kvg:type="㇔" d="M67.39,82.36c1.49,1.12,3.84,4.59,4.21,6.33"/>
diff --git a/kanji/09a30-KaishoVt6.svg b/kanji/09a30-KaishoVt6.svg
index bb8408656..8bf69b3c1 100644
--- a/kanji/09a30-KaishoVt6.svg
+++ b/kanji/09a30-KaishoVt6.svg
@@ -43,33 +43,27 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:09a30-KaishoVt6-s3" kvg:type="㇐a" d="M20.77,40.7c2.65-0.23,4.77-0.73,7.39-1.16c0.72-0.12,1.43-0.23,2.13-0.34"/>
 		<path id="kvg:09a30-KaishoVt6-s4" kvg:type="㇐a" d="M20.72,59.65c2.38-0.05,4.75-0.41,7.1-0.72c0.69-0.09,1.4-0.18,2.1-0.28"/>
 	</g>
-	<g id="kvg:09a30-KaishoVt6-g2" kvg:position="right">
-		<g id="kvg:09a30-KaishoVt6-g3" kvg:position="top">
+	<g id="kvg:09a30-KaishoVt6-g2" kvg:element="駦" kvg:position="right">
+		<g id="kvg:09a30-KaishoVt6-g3" kvg:element="龹" kvg:position="top">
 			<path id="kvg:09a30-KaishoVt6-s5" kvg:type="㇔" d="M48.02,19.09c2.04,1.5,5.26,6.18,5.77,8.52"/>
 			<path id="kvg:09a30-KaishoVt6-s6" kvg:type="㇒" d="M81.28,15.64c0.02,0.25,0.04,0.64-0.04,1c-0.46,2.11-3.13,6.74-6.77,9.57"/>
 			<g id="kvg:09a30-KaishoVt6-g4" kvg:element="二">
-				<g id="kvg:09a30-KaishoVt6-g5" kvg:position="top">
-					<path id="kvg:09a30-KaishoVt6-s7" kvg:type="㇐" d="M46.78,32.85c0.71,0.27,2.02,0.31,2.74,0.27c5.98-0.37,28.36-3.06,32.76-2.74c1.19,0.08,1.9,0.13,2.5,0.26"/>
-				</g>
-				<g id="kvg:09a30-KaishoVt6-g6" kvg:element="大" kvg:part="1" kvg:position="bottom">
-					<path id="kvg:09a30-KaishoVt6-s8" kvg:type="㇐" d="M42,44.39c1.15,0.38,3.27,0.42,4.42,0.38c8.32-0.27,29.32-3.02,41.78-3.69c1.92-0.1,3.08,0.18,4.04,0.38"/>
-				</g>
+				<path id="kvg:09a30-KaishoVt6-s7" kvg:type="㇐" d="M46.78,32.85c0.71,0.27,2.02,0.31,2.74,0.27c5.98-0.37,28.36-3.06,32.76-2.74c1.19,0.08,1.9,0.13,2.5,0.26"/>
+				<path id="kvg:09a30-KaishoVt6-s8" kvg:type="㇐" d="M42,44.39c1.15,0.38,3.27,0.42,4.42,0.38c8.32-0.27,29.32-3.02,41.78-3.69c1.92-0.1,3.08,0.18,4.04,0.38"/>
 			</g>
-			<g id="kvg:09a30-KaishoVt6-g7" kvg:element="大" kvg:part="2">
-				<g id="kvg:09a30-KaishoVt6-g8" kvg:element="人">
-					<path id="kvg:09a30-KaishoVt6-s9" kvg:type="㇒" d="M65.8,14.5c0.06,1.14,0.18,3.28-0.13,4.59C61.75,35.75,55.5,50.75,42.25,63.04"/>
-					<path id="kvg:09a30-KaishoVt6-s10" kvg:type="㇏" d="M67.5,35.5c2.25,0.5,20.18,17.48,24.03,20.34c1.3,0.97,2.42,1.38,3.72,1.66"/>
-				</g>
+			<g id="kvg:09a30-KaishoVt6-g5" kvg:element="人">
+				<path id="kvg:09a30-KaishoVt6-s9" kvg:type="㇒" d="M65.8,14.5c0.06,1.14,0.18,3.28-0.13,4.59C61.75,35.75,55.5,50.75,42.25,63.04"/>
+				<path id="kvg:09a30-KaishoVt6-s10" kvg:type="㇏" d="M67.5,35.5c2.25,0.5,20.18,17.48,24.03,20.34c1.3,0.97,2.42,1.38,3.72,1.66"/>
 			</g>
 		</g>
-		<g id="kvg:09a30-KaishoVt6-g9" kvg:element="馬" kvg:position="bottom" kvg:radical="tradit">
+		<g id="kvg:09a30-KaishoVt6-g6" kvg:element="馬" kvg:position="bottom" kvg:radical="tradit">
 			<path id="kvg:09a30-KaishoVt6-s11" kvg:type="㇑" d="M54.69,52.25c0.25,0.2,0.53,1.34,0.53,1.69c0,3.61,0.03,19.09-0.13,24.77"/>
 			<path id="kvg:09a30-KaishoVt6-s12" kvg:type="㇐b" d="M55.96,53.77c6.22-0.71,20.73-2.63,23.4-3.02c0.93-0.13,2.51-0.29,2.98-0.19"/>
 			<path id="kvg:09a30-KaishoVt6-s13" kvg:type="㇐b" d="M55.68,61.78c6.22-0.71,19.62-2.09,22.29-2.47c0.93-0.14,2.51-0.29,2.98-0.19"/>
 			<path id="kvg:09a30-KaishoVt6-s14" kvg:type="㇐b" d="M55.82,69.39c6.22-0.71,19.62-2.08,22.29-2.47c0.93-0.13,2.51-0.29,2.98-0.19"/>
 			<path id="kvg:09a30-KaishoVt6-s15" kvg:type="㇆a" d="M55.1,78.21c7.87-1.29,27.77-3.48,32.13-3.95c2.84-0.31,4.07,1.4,3.78,3.55c-0.82,6.09-3.59,12.21-5.78,16.01c-3.05,5.3-4.02,2.85-6.9-0.03"/>
 			<path id="kvg:09a30-KaishoVt6-s16" kvg:type="㇑a" d="M68.2,52.42c0.25,0.2,0.46,0.49,0.46,0.84c0,3.61,0.03,16.91-0.13,22.59"/>
-			<g id="kvg:09a30-KaishoVt6-g10" kvg:element="灬" kvg:variant="true" kvg:original="火">
+			<g id="kvg:09a30-KaishoVt6-g7" kvg:element="灬" kvg:variant="true" kvg:original="火">
 				<path id="kvg:09a30-KaishoVt6-s17" kvg:type="㇔" d="M48.35,84.71c0.24,4.05-0.17,8.95-0.89,11.49"/>
 				<path id="kvg:09a30-KaishoVt6-s18" kvg:type="㇔" d="M57.49,83.62c1.95,1.53,3.79,5.75,4.28,8.13"/>
 				<path id="kvg:09a30-KaishoVt6-s19" kvg:type="㇔" d="M67.39,82.36c1.49,1.12,3.84,4.59,4.21,6.33"/>
diff --git a/kanji/09a30.svg b/kanji/09a30.svg
index cb1cd0f84..b40286bb8 100644
--- a/kanji/09a30.svg
+++ b/kanji/09a30.svg
@@ -37,39 +37,33 @@ 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_09a30" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:09a30" kvg:element="騰">
-	<g id="kvg:09a30-g1" kvg:element="朕" kvg:part="1" kvg:position="left" kvg:phon="朕1">
-		<g id="kvg:09a30-g2" kvg:element="月" kvg:variant="true" kvg:original="肉" kvg:radical="nelson">
-			<path id="kvg:09a30-s1" kvg:type="㇓" d="M18.88,20.49c1,1,1.2,2.01,1.2,3.55c0,34.96-1.57,54.71-8.33,67.35"/>
-			<path id="kvg:09a30-s2" kvg:type="㇆a" d="M21.02,21.31c2.85-0.69,9.96-2.39,12.11-2.71c1.49-0.22,3.16,0.9,3.16,3.17c0,3.23,0.03,59.24,0.03,64.3c0,12.61-5.07,4.05-6.69,2.54"/>
-			<path id="kvg:09a30-s3" kvg:type="㇐a" d="M21.02,40.7c4.73-0.58,9.35-1.33,14.39-1.82"/>
-			<path id="kvg:09a30-s4" kvg:type="㇐a" d="M20.22,59.65c4.28-0.52,10.24-1.28,14.88-1.7"/>
-		</g>
+	<g id="kvg:09a30-g1" kvg:element="月" kvg:variant="true" kvg:original="肉" kvg:position="left" kvg:radical="nelson">
+		<path id="kvg:09a30-s1" kvg:type="㇓" d="M18.88,20.49c1,1,1.2,2.01,1.2,3.55c0,34.96-1.57,54.71-8.33,67.35"/>
+		<path id="kvg:09a30-s2" kvg:type="㇆a" d="M21.02,21.31c2.85-0.69,9.96-2.39,12.11-2.71c1.49-0.22,3.16,0.9,3.16,3.17c0,3.23,0.03,59.24,0.03,64.3c0,12.61-5.07,4.05-6.69,2.54"/>
+		<path id="kvg:09a30-s3" kvg:type="㇐a" d="M21.02,40.7c4.73-0.58,9.35-1.33,14.39-1.82"/>
+		<path id="kvg:09a30-s4" kvg:type="㇐a" d="M20.22,59.65c4.28-0.52,10.24-1.28,14.88-1.7"/>
 	</g>
-	<g id="kvg:09a30-g3" kvg:position="right">
-		<g id="kvg:09a30-g4" kvg:element="朕" kvg:part="2" kvg:position="top" kvg:phon="朕2">
+	<g id="kvg:09a30-g2" kvg:element="駦" kvg:position="right">
+		<g id="kvg:09a30-g3" kvg:element="龹" kvg:position="top">
 			<path id="kvg:09a30-s5" kvg:type="㇔" d="M49.02,19.09c2.04,1.5,5.26,6.18,5.77,8.52"/>
 			<path id="kvg:09a30-s6" kvg:type="㇒" d="M82.53,15.64c0.06,0.61-0.03,1.18-0.27,1.74c-1.02,2.37-3.29,5.41-6.55,8.84"/>
-			<g id="kvg:09a30-g5" kvg:element="二">
-				<g id="kvg:09a30-g6" kvg:position="top">
-					<path id="kvg:09a30-s7" kvg:type="㇐" d="M47.78,33.6c2.22,0.4,3.96,0.19,5.72,0.01c6.85-0.68,19.77-2.38,27.01-3.2c1.75-0.2,3.54-0.17,5.27,0.22"/>
-				</g>
-				<g id="kvg:09a30-g7" kvg:element="大" kvg:position="bottom">
-					<path id="kvg:09a30-s8" kvg:type="㇐" d="M43,44.39c2.28,0.76,4.79,0.48,7.14,0.19c10.01-1.24,26.57-3.34,37.74-4.11c2.17-0.15,4.22-0.19,6.37,0.23"/>
-					<g id="kvg:09a30-g8" kvg:element="人">
-						<path id="kvg:09a30-s9" kvg:type="㇒" d="M67.3,14.25c0.32,1.12,0.18,2.53-0.13,3.84C63.25,34.75,55.5,50,42.25,62.29"/>
-						<path id="kvg:09a30-s10" kvg:type="㇏" d="M69,33.25c2.93,2.93,12.8,13.66,18.83,19.65c2.13,2.12,4.04,3.72,6.92,5.6"/>
-					</g>
-				</g>
+			<g id="kvg:09a30-g4" kvg:element="二">
+				<path id="kvg:09a30-s7" kvg:type="㇐" d="M47.78,33.6c2.22,0.4,3.96,0.19,5.72,0.01c6.85-0.68,19.77-2.38,27.01-3.2c1.75-0.2,3.54-0.17,5.27,0.22"/>
+				<path id="kvg:09a30-s8" kvg:type="㇐" d="M43,44.39c2.28,0.76,4.79,0.48,7.14,0.19c10.01-1.24,26.57-3.34,37.74-4.11c2.17-0.15,4.22-0.19,6.37,0.23"/>
+			</g>
+			<g id="kvg:09a30-g5" kvg:element="人">
+				<path id="kvg:09a30-s9" kvg:type="㇒" d="M67.3,14.25c0.32,1.12,0.18,2.53-0.13,3.84C63.25,34.75,55.5,50,42.25,62.29"/>
+				<path id="kvg:09a30-s10" kvg:type="㇏" d="M69,33.25c2.93,2.93,12.8,13.66,18.83,19.65c2.13,2.12,4.04,3.72,6.92,5.6"/>
 			</g>
 		</g>
-		<g id="kvg:09a30-g9" kvg:element="馬" kvg:position="bottom" kvg:radical="tradit">
+		<g id="kvg:09a30-g6" kvg:element="馬" kvg:position="bottom" kvg:radical="tradit">
 			<path id="kvg:09a30-s11" kvg:type="㇑" d="M54.69,52c0.72,0.72,0.78,1.63,0.78,2.69c0,2.98-0.06,13.06-0.06,20.31c0,1.45-0.04,2.73-0.06,3.71"/>
 			<path id="kvg:09a30-s12" kvg:type="㇐b" d="M56.21,53.27c5.46-0.62,15.21-1.79,19.3-2.33c1.31-0.17,3.01-0.66,4.33-0.37"/>
 			<path id="kvg:09a30-s13" kvg:type="㇑a" d="M67.62,52.62c0.62,0.62,1.03,1.5,1.03,2.39c0,3.61-0.03,13.99-0.03,19.99"/>
 			<path id="kvg:09a30-s14" kvg:type="㇐b" d="M56.68,61.53c5.45-0.62,14.29-1.94,18.2-2.53c1.3-0.19,3.01-0.67,4.32-0.39"/>
 			<path id="kvg:09a30-s15" kvg:type="㇐b" d="M56.57,69.39c5.57-0.63,15.7-1.6,19.67-2.08c1.26-0.15,2.83-0.6,4.1-0.33"/>
 			<path id="kvg:09a30-s16" kvg:type="㇆a" d="M56.35,77.96c7.87-1.29,25.15-3.71,30.88-3.95c2.85-0.12,4.23,1.68,3.78,3.8c-1.39,6.57-3.59,12.21-5.78,16.01c-3.05,5.3-5.1,2.43-6.65,0.47"/>
-			<g id="kvg:09a30-g10" kvg:element="灬" kvg:variant="true" kvg:original="火">
+			<g id="kvg:09a30-g7" kvg:element="灬" kvg:variant="true" kvg:original="火">
 				<path id="kvg:09a30-s17" kvg:type="㇔" d="M48.62,85.21c0.29,4.05-0.21,8.95-1.05,11.49"/>
 				<path id="kvg:09a30-s18" kvg:type="㇔" d="M57.74,83.87c1.95,1.53,3.79,5.75,4.28,8.13"/>
 				<path id="kvg:09a30-s19" kvg:type="㇔" d="M67.64,82.36c1.49,1.12,3.84,4.59,4.21,6.33"/>