diff --git a/kanji/060f1.svg b/kanji/060f1.svg
index 5f913bce2..5bf470e2a 100644
--- a/kanji/060f1.svg
+++ b/kanji/060f1.svg
@@ -48,7 +48,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:060f1-s5" kvg:type="㇛" d="M70.6,13.87c0.4,1.13-0.02,2.7-0.36,3.45c-1.74,3.93-3.99,7.68-8.91,13.5c-0.48,0.56-0.23,0.78,0.21,1.1c5.21,3.83,8.21,8.08,10.6,14.74"/>
 			<path id="kvg:060f1-s6" kvg:type="㇛" d="M87.42,12.71c0.33,0.79,0.29,1.67,0.15,2.45c-0.82,4.34-3.32,8.84-8.7,15.5c-0.46,0.57-0.2,0.74,0.21,1.1C85,37,87,41.25,89.18,47.16"/>
 		</g>
-		<g id="kvg:060f1-g4" kvg:position="bottom">
+		<g id="kvg:060f1-g4" kvg:element="囟" kvg:position="bottom">
 			<path id="kvg:060f1-s7" kvg:type="㇒" d="M63.78,47.14c0.02,0.37,0.05,0.95-0.04,1.47c-0.53,3.11-3.55,9.93-7.68,14.1"/>
 			<path id="kvg:060f1-s8" kvg:type="㇑" d="M47.49,61.6c0.3,0.58,0.8,1.98,0.97,2.71c1.34,6.01,3.1,21.69,3.93,32.89"/>
 			<path id="kvg:060f1-s9" kvg:type="㇕" d="M48.38,63.91c10.39-1.51,30.2-4.08,37.96-5.35c2.85-0.47,4.31,1.18,4.16,2.84c-0.54,6.06-2.86,23.06-4.16,33.18"/>
diff --git a/kanji/07459-VtLst.svg b/kanji/07459-VtLst.svg
index 2b7e511ae..2950603c7 100644
--- a/kanji/07459-VtLst.svg
+++ b/kanji/07459-VtLst.svg
@@ -49,7 +49,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07459-VtLst-s6" kvg:type="㇛" d="M75.1,11.37c0.4,1.13-0.02,2.7-0.36,3.45c-1.74,3.93-4.99,10.18-9.91,16c-0.48,0.56-0.23,0.78,0.21,1.1c5.21,3.83,9.96,7.83,13.6,14.24"/>
 			<path id="kvg:07459-VtLst-s7" kvg:type="㇛" d="M91.92,11.21c0.33,0.79,0.29,1.67,0.15,2.45c-0.82,4.34-5.32,9.34-10.7,16c-0.46,0.57-0.26,0.82,0.21,1.1C89,35.25,94,41.75,96.18,47.66"/>
 		</g>
-		<g id="kvg:07459-VtLst-g4" kvg:position="bottom">
+		<g id="kvg:07459-VtLst-g4" kvg:element="囟" kvg:position="bottom">
 			<path id="kvg:07459-VtLst-s8" kvg:type="㇒" d="M70.78,47.89c0.03,0.31,0.05,0.79-0.05,1.24c-0.61,2.61-4.12,8.33-8.92,11.84"/>
 			<path id="kvg:07459-VtLst-s9" kvg:type="㇑" d="M48.99,61.79c0.32,0.61,0.88,2.1,1.06,2.87c1.47,6.36,2.89,22.95,3.8,34.81"/>
 			<path id="kvg:07459-VtLst-s10" kvg:type="㇕" d="M49.97,64.23c11.36-1.6,33.01-4.32,41.49-5.66c3.11-0.5,4.71,1.25,4.55,3c-0.59,6.41-3.13,24.4-4.55,35.11"/>
diff --git a/kanji/07459.svg b/kanji/07459.svg
index 9acbee824..7fccf587d 100644
--- a/kanji/07459.svg
+++ b/kanji/07459.svg
@@ -49,7 +49,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07459-s6" kvg:type="㇛" d="M75.1,11.37c0.4,1.13-0.02,2.7-0.36,3.45c-1.74,3.93-4.99,10.18-9.91,16c-0.48,0.56-0.23,0.78,0.21,1.1c5.21,3.83,9.96,7.83,13.6,14.24"/>
 			<path id="kvg:07459-s7" kvg:type="㇛" d="M91.92,11.21c0.33,0.79,0.29,1.67,0.15,2.45c-0.82,4.34-5.32,9.34-10.7,16c-0.46,0.57-0.26,0.82,0.21,1.1C89,35.25,94,41.75,96.18,47.66"/>
 		</g>
-		<g id="kvg:07459-g4" kvg:position="bottom">
+		<g id="kvg:07459-g4" kvg:element="囟" kvg:position="bottom">
 			<path id="kvg:07459-s8" kvg:type="㇒" d="M70.78,47.89c0.03,0.31,0.05,0.79-0.05,1.24c-0.61,2.61-4.12,8.33-8.92,11.84"/>
 			<path id="kvg:07459-s9" kvg:type="㇑" d="M48.99,61.79c0.32,0.61,0.88,2.1,1.06,2.87c1.47,6.36,2.89,22.95,3.8,34.81"/>
 			<path id="kvg:07459-s10" kvg:type="㇕" d="M49.97,64.23c11.36-1.6,33.01-4.32,41.49-5.66c3.11-0.5,4.71,1.25,4.55,3c-0.59,6.41-3.13,24.4-4.55,35.11"/>
diff --git a/kanji/078af.svg b/kanji/078af.svg
index b9c1f933d..a48d7ecc8 100644
--- a/kanji/078af.svg
+++ b/kanji/078af.svg
@@ -46,7 +46,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:078af-s5" kvg:type="㇐b" d="M23.59,78.2c5.24-0.54,9.52-1.02,16.41-1.69"/>
 		</g>
 	</g>
-	<g id="kvg:078af-g3" kvg:position="right">
+	<g id="kvg:078af-g3" kvg:element="囟" kvg:position="right">
 		<g id="kvg:078af-g4" kvg:element="巛">
 			<path id="kvg:078af-s6" kvg:type="㇛" d="M57.07,13.25c0.15,1.05,0.45,1.78,0.14,2.67C55.25,21.5,54,25.5,47.23,33.77c-0.91,1.11-0.46,0.8,0,1.11C53.75,39.25,55.75,43,59.44,50"/>
 			<path id="kvg:078af-s7" kvg:type="㇛" d="M73.9,11.87c0.52,1.12,0.73,2.56,0.54,3.4c-1.18,5.23-3.66,10.56-10.03,16.29c-0.62,0.55-0.3,0.76,0.28,1.09c6.73,3.77,10.61,8.46,13.71,15.02"/>
diff --git a/kanji/07be6-Kaisho.svg b/kanji/07be6-Kaisho.svg
index 513d3a37b..4e872275e 100644
--- a/kanji/07be6-Kaisho.svg
+++ b/kanji/07be6-Kaisho.svg
@@ -50,22 +50,24 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:07be6-Kaisho-g4" kvg:element="𣬉" kvg:position="bottom">
-		<path id="kvg:07be6-Kaisho-s7" kvg:type="㇒" d="M46.78,27.14c0.02,0.22,0.04,0.57-0.04,0.88c-0.49,1.86-3.32,5.94-7.18,8.44"/>
-		<path id="kvg:07be6-Kaisho-s8" kvg:type="㇑" d="M22.99,36.1c0.24,0.37,0.64,1.26,0.77,1.72c1.07,3.82,2.47,13.77,3.13,20.88"/>
-		<path id="kvg:07be6-Kaisho-s9" kvg:type="㇕" d="M23.88,37.91c11.87-1.16,47.7-2.58,55.46-3.85c2.85-0.47,4.31,1.18,4.16,2.84c-0.54,6.06-1.36,9.06-2.66,19.18"/>
-		<g id="kvg:07be6-Kaisho-g5" kvg:element="乂">
-			<g id="kvg:07be6-Kaisho-g6" kvg:element="丿">
-				<path id="kvg:07be6-Kaisho-s10" kvg:type="㇒" d="M61.74,38.39c0.06,0.35,0.13,0.9-0.12,1.4c-1.53,2.96-10.3,9.45-22.31,13.42"/>
+		<g id="kvg:07be6-Kaisho-g5" kvg:element="囟">
+			<path id="kvg:07be6-Kaisho-s7" kvg:type="㇒" d="M46.78,27.14c0.02,0.22,0.04,0.57-0.04,0.88c-0.49,1.86-3.32,5.94-7.18,8.44"/>
+			<path id="kvg:07be6-Kaisho-s8" kvg:type="㇑" d="M22.99,36.1c0.24,0.37,0.64,1.26,0.77,1.72c1.07,3.82,2.47,13.77,3.13,20.88"/>
+			<path id="kvg:07be6-Kaisho-s9" kvg:type="㇕" d="M23.88,37.91c11.87-1.16,47.7-2.58,55.46-3.85c2.85-0.47,4.31,1.18,4.16,2.84c-0.54,6.06-1.36,9.06-2.66,19.18"/>
+			<g id="kvg:07be6-Kaisho-g6" kvg:element="乂">
+				<g id="kvg:07be6-Kaisho-g7" kvg:element="丿">
+					<path id="kvg:07be6-Kaisho-s10" kvg:type="㇒" d="M61.74,38.39c0.06,0.35,0.13,0.9-0.12,1.4c-1.53,2.96-10.3,9.45-22.31,13.42"/>
+				</g>
+				<path id="kvg:07be6-Kaisho-s11" kvg:type="㇏" d="M39.77,42.08c8.4,1.61,21.69,6.63,23.79,9.13"/>
 			</g>
-			<path id="kvg:07be6-Kaisho-s11" kvg:type="㇏" d="M39.77,42.08c8.4,1.61,21.69,6.63,23.79,9.13"/>
 		</g>
 		<path id="kvg:07be6-Kaisho-s12" kvg:type="㇐" d="M26.93,57.57C34.41,56.93,69,55,80.84,54.68"/>
-		<g id="kvg:07be6-Kaisho-g7" kvg:element="比">
-			<g id="kvg:07be6-Kaisho-g8" kvg:position="left">
+		<g id="kvg:07be6-Kaisho-g8" kvg:element="比">
+			<g id="kvg:07be6-Kaisho-g9" kvg:position="left">
 				<path id="kvg:07be6-Kaisho-s13" kvg:type="㇐b" d="M27.88,76.38c7.31-0.38,13.67-1.72,20.04-2.35c1.87-0.19,3.06-0.18,4.02-0.07"/>
 				<path id="kvg:07be6-Kaisho-s14" kvg:type="㇙" d="M26.5,64.66c1,0.63,1.37,1.78,1.37,2.64c0,2.34-0.32,26.49-0.32,30.13c0,3.06-0.16,4.36,4.03,1.75c5.92-3.68,11.67-6.68,17.06-9.21"/>
 			</g>
-			<g id="kvg:07be6-Kaisho-g9" kvg:element="匕" kvg:position="right">
+			<g id="kvg:07be6-Kaisho-g10" kvg:element="匕" kvg:position="right">
 				<path id="kvg:07be6-Kaisho-s15" kvg:type="㇒" d="M60.13,75.63c7.31-0.38,13.67-1.72,20.04-2.35c1.87-0.19,3.06-0.18,4.02-0.07"/>
 				<path id="kvg:07be6-Kaisho-s16" kvg:type="㇟" d="M57.78,61.5c1.18,0.58,1.69,2.59,1.69,3.33c0,1.94-0.27,23.04-0.27,25.32c0,6.85,2.79,9.18,16.77,9.18c7.96,0,12.01-0.92,14.05-3.06"/>
 			</g>
diff --git a/kanji/07be6.svg b/kanji/07be6.svg
index 2ce5680f4..f7e5873f3 100644
--- a/kanji/07be6.svg
+++ b/kanji/07be6.svg
@@ -50,22 +50,24 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:07be6-g4" kvg:element="𣬉" kvg:position="bottom">
-		<path id="kvg:07be6-s7" kvg:type="㇒" d="M46.78,27.14c0.02,0.22,0.04,0.57-0.04,0.88c-0.49,1.86-3.32,5.94-7.18,8.44"/>
-		<path id="kvg:07be6-s8" kvg:type="㇑" d="M22.99,36.1c0.24,0.37,0.64,1.26,0.77,1.72c1.07,3.82,2.47,13.77,3.13,20.88"/>
-		<path id="kvg:07be6-s9" kvg:type="㇕" d="M23.88,37.91c11.87-1.16,47.7-2.58,55.46-3.85c2.85-0.47,4.31,1.18,4.16,2.84c-0.54,6.06-1.36,9.06-2.66,19.18"/>
-		<g id="kvg:07be6-g5" kvg:element="乂">
-			<g id="kvg:07be6-g6" kvg:element="丿">
-				<path id="kvg:07be6-s10" kvg:type="㇒" d="M61.74,38.39c0.06,0.35,0.13,0.9-0.12,1.4c-1.53,2.96-10.3,9.45-22.31,13.42"/>
+		<g id="kvg:07be6-g5" kvg:element="囟">
+			<path id="kvg:07be6-s7" kvg:type="㇒" d="M46.78,27.14c0.02,0.22,0.04,0.57-0.04,0.88c-0.49,1.86-3.32,5.94-7.18,8.44"/>
+			<path id="kvg:07be6-s8" kvg:type="㇑" d="M22.99,36.1c0.24,0.37,0.64,1.26,0.77,1.72c1.07,3.82,2.47,13.77,3.13,20.88"/>
+			<path id="kvg:07be6-s9" kvg:type="㇕" d="M23.88,37.91c11.87-1.16,47.7-2.58,55.46-3.85c2.85-0.47,4.31,1.18,4.16,2.84c-0.54,6.06-1.36,9.06-2.66,19.18"/>
+			<g id="kvg:07be6-g6" kvg:element="乂">
+				<g id="kvg:07be6-g7" kvg:element="丿">
+					<path id="kvg:07be6-s10" kvg:type="㇒" d="M61.74,38.39c0.06,0.35,0.13,0.9-0.12,1.4c-1.53,2.96-10.3,9.45-22.31,13.42"/>
+				</g>
+				<path id="kvg:07be6-s11" kvg:type="㇏" d="M39.77,42.08c8.4,1.61,21.69,6.63,23.79,9.13"/>
 			</g>
-			<path id="kvg:07be6-s11" kvg:type="㇏" d="M39.77,42.08c8.4,1.61,21.69,6.63,23.79,9.13"/>
 		</g>
 		<path id="kvg:07be6-s12" kvg:type="㇐" d="M26.93,57.57C34.41,56.93,69,55,80.84,54.68"/>
-		<g id="kvg:07be6-g7" kvg:element="比">
-			<g id="kvg:07be6-g8" kvg:position="left">
+		<g id="kvg:07be6-g8" kvg:element="比">
+			<g id="kvg:07be6-g9" kvg:position="left">
 				<path id="kvg:07be6-s13" kvg:type="㇐b" d="M27.88,76.38c7.31-0.38,13.67-1.72,20.04-2.35c1.87-0.19,3.06-0.18,4.02-0.07"/>
 				<path id="kvg:07be6-s14" kvg:type="㇙" d="M26.5,64.66c1,0.63,1.37,1.78,1.37,2.64c0,2.34-0.32,26.49-0.32,30.13c0,3.06-0.16,4.36,4.03,1.75c5.92-3.68,11.67-6.68,17.06-9.21"/>
 			</g>
-			<g id="kvg:07be6-g9" kvg:element="匕" kvg:position="right">
+			<g id="kvg:07be6-g10" kvg:element="匕" kvg:position="right">
 				<path id="kvg:07be6-s15" kvg:type="㇒" d="M82.21,65.94c0.26,0.63,0.54,1.94-0.28,2.79C80,70.75,68.96,77.46,61.12,80.89"/>
 				<path id="kvg:07be6-s16" kvg:type="㇟" d="M57.78,61.5c1.18,0.58,1.69,2.59,1.69,3.33c0,1.94-0.27,23.04-0.27,25.32c0,6.85,2.79,9.18,16.77,9.18c14.53,0,16.04-3.08,16.04-10.97"/>
 			</g>
diff --git a/kanji/08166-Kaisho.svg b/kanji/08166-Kaisho.svg
index 0d3cbcff5..32247b136 100644
--- a/kanji/08166-Kaisho.svg
+++ b/kanji/08166-Kaisho.svg
@@ -49,7 +49,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08166-Kaisho-s6" kvg:type="㇛" d="M71.08,13.08c0.44,1.05-1.23,4.42-1.5,5.17c-1.33,3.67-2.67,5-7.48,11.11c-0.46,0.58-0.25,0.72,0.24,1.03c5.75,3.56,9.07,7.51,11.71,13.69"/>
 			<path id="kvg:08166-Kaisho-s7" kvg:type="㇛" d="M88.25,13.42c0.31,0.73-0.72,2.98-1,3.67c-1.5,3.67-2.79,3.73-7.83,9.83c-0.43,0.53-0.89,1.33-0.5,1.67c5.54,4.81,8.3,10.07,10.35,15.49"/>
 		</g>
-		<g id="kvg:08166-Kaisho-g4" kvg:position="bottom">
+		<g id="kvg:08166-Kaisho-g4" kvg:element="囟" kvg:position="bottom">
 			<path id="kvg:08166-Kaisho-s8" kvg:type="㇒" d="M66.69,43.06c0.03,0.33,0.06,0.86-0.05,1.33c-0.67,2.81-4.54,8.97-9.83,12.74"/>
 			<path id="kvg:08166-Kaisho-s9" kvg:type="㇑" d="M47.92,58.75c1.08,1,2.11,3.14,2.23,3.95c1.02,6.68,2.64,22.58,3.27,35.05"/>
 			<path id="kvg:08166-Kaisho-s10" kvg:type="㇕" d="M50.92,60.58c9.44-1.65,28.45-3.29,35.5-4.67c2.59-0.51,3.63,2.87,3.5,4.67c-0.49,6.59-1.82,24.66-3,35.67"/>
diff --git a/kanji/08166.svg b/kanji/08166.svg
index c7326b72e..8086ce2f4 100644
--- a/kanji/08166.svg
+++ b/kanji/08166.svg
@@ -49,7 +49,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08166-s6" kvg:type="㇛" d="M71.08,13.08c0.44,1.05-1.23,4.42-1.5,5.17c-1.33,3.67-2.67,5-7.48,11.11c-0.46,0.58-0.25,0.72,0.24,1.03c5.75,3.56,9.07,7.51,11.71,13.69"/>
 			<path id="kvg:08166-s7" kvg:type="㇛" d="M88.25,13.42c0.31,0.73-0.72,2.98-1,3.67c-1.5,3.67-2.79,3.73-7.83,9.83c-0.43,0.53-0.89,1.33-0.5,1.67c5.54,4.81,8.3,10.07,10.35,15.49"/>
 		</g>
-		<g id="kvg:08166-g4" kvg:position="bottom">
+		<g id="kvg:08166-g4" kvg:element="囟" kvg:position="bottom">
 			<path id="kvg:08166-s8" kvg:type="㇒" d="M66.69,43.06c0.03,0.33,0.06,0.86-0.05,1.33c-0.67,2.81-4.54,8.97-9.83,12.74"/>
 			<path id="kvg:08166-s9" kvg:type="㇑" d="M47.92,58.75c1.08,1,2.11,3.14,2.23,3.95c1.02,6.68,2.64,22.58,3.27,35.05"/>
 			<path id="kvg:08166-s10" kvg:type="㇕" d="M50.92,60.58c9.44-1.65,28.45-3.29,35.5-4.67c2.59-0.51,3.63,2.87,3.5,4.67c-0.49,6.59-1.82,24.66-3,35.67"/>
diff --git a/kanji/084d6-Kaisho.svg b/kanji/084d6-Kaisho.svg
index 2b4f84c5d..74a0ac269 100644
--- a/kanji/084d6-Kaisho.svg
+++ b/kanji/084d6-Kaisho.svg
@@ -43,22 +43,24 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:084d6-Kaisho-s3" kvg:type="㇑a" d="M67.75,9.75c1.12,1,1.37,2.52,1,4c-1.12,4.5-1.88,8.5-3.5,14.25"/>
 	</g>
 	<g id="kvg:084d6-Kaisho-g2" kvg:element="𣬉" kvg:position="bottom">
-		<path id="kvg:084d6-Kaisho-s4" kvg:type="㇒" d="M50.04,26c0.01,0.17,0.03,0.45-0.02,0.69c-0.31,1.46-2.06,4.67-4.46,6.63"/>
-		<path id="kvg:084d6-Kaisho-s5" kvg:type="㇑" d="M23.99,33.84c0.23,0.39,0.63,1.33,0.76,1.83c1.05,4.05,2.44,14.6,3.09,22.15"/>
-		<path id="kvg:084d6-Kaisho-s6" kvg:type="㇕" d="M24.87,35.75C36.59,34.52,68.5,33,79.14,32.17c2.85-0.22,4.26,1.25,4.11,3.01c-0.53,6.43-0.75,11.32-2.63,19.84"/>
-		<g id="kvg:084d6-Kaisho-g3" kvg:element="乂">
-			<g id="kvg:084d6-Kaisho-g4" kvg:element="丿">
-				<path id="kvg:084d6-Kaisho-s7" kvg:type="㇒" d="M62.74,35.25c0.06,0.38,0.13,0.98-0.12,1.52c-1.48,3.21-9.96,10.25-21.57,14.55"/>
+		<g id="kvg:084d6-Kaisho-g3" kvg:element="囟">
+			<path id="kvg:084d6-Kaisho-s4" kvg:type="㇒" d="M50.04,26c0.01,0.17,0.03,0.45-0.02,0.69c-0.31,1.46-2.06,4.67-4.46,6.63"/>
+			<path id="kvg:084d6-Kaisho-s5" kvg:type="㇑" d="M23.99,33.84c0.23,0.39,0.63,1.33,0.76,1.83c1.05,4.05,2.44,14.6,3.09,22.15"/>
+			<path id="kvg:084d6-Kaisho-s6" kvg:type="㇕" d="M24.87,35.75C36.59,34.52,68.5,33,79.14,32.17c2.85-0.22,4.26,1.25,4.11,3.01c-0.53,6.43-0.75,11.32-2.63,19.84"/>
+			<g id="kvg:084d6-Kaisho-g4" kvg:element="乂">
+				<g id="kvg:084d6-Kaisho-g5" kvg:element="丿">
+					<path id="kvg:084d6-Kaisho-s7" kvg:type="㇒" d="M62.74,35.25c0.06,0.38,0.13,0.98-0.12,1.52c-1.48,3.21-9.96,10.25-21.57,14.55"/>
+				</g>
+				<path id="kvg:084d6-Kaisho-s8" kvg:type="㇏" d="M43.27,39.94c7.69,1.79,19.87,7.35,21.79,10.13"/>
 			</g>
-			<path id="kvg:084d6-Kaisho-s8" kvg:type="㇏" d="M43.27,39.94c7.69,1.79,19.87,7.35,21.79,10.13"/>
 		</g>
 		<path id="kvg:084d6-Kaisho-s9" kvg:type="㇐" d="M27.88,56.61c7.39-0.68,41.05-2.73,52.74-3.07"/>
-		<g id="kvg:084d6-Kaisho-g5" kvg:element="比">
-			<g id="kvg:084d6-Kaisho-g6" kvg:position="left">
+		<g id="kvg:084d6-Kaisho-g6" kvg:element="比">
+			<g id="kvg:084d6-Kaisho-g7" kvg:position="left">
 				<path id="kvg:084d6-Kaisho-s10" kvg:type="㇐b" d="M27.88,73.73c7.31-0.38,12.67-1.22,19.04-1.85c1.87-0.19,3.06-0.18,4.02-0.07"/>
 				<path id="kvg:084d6-Kaisho-s11" kvg:type="㇙" d="M26,62.01c1,0.63,1.37,1.78,1.37,2.64c0,2.34-0.32,25.99-0.32,29.63c0,3.06-0.16,4.36,4.03,1.75c5.92-3.68,11.67-6.68,17.06-9.21"/>
 			</g>
-			<g id="kvg:084d6-Kaisho-g7" kvg:element="匕" kvg:position="right">
+			<g id="kvg:084d6-Kaisho-g8" kvg:element="匕" kvg:position="right">
 				<path id="kvg:084d6-Kaisho-s12" kvg:type="㇒" d="M59.88,73.61c8.5-0.42,14.73-1.37,22.13-2.08c2.17-0.21,3.56-0.21,4.67-0.08"/>
 				<path id="kvg:084d6-Kaisho-s13" kvg:type="㇟" d="M57.78,58.86c1.18,0.58,1.69,2.59,1.69,3.33c0,1.94-0.27,24.04-0.27,26.32c0,6.85,2.79,8.68,16.77,8.68c8.18,0,12.24-0.98,14.21-3.24"/>
 			</g>
diff --git a/kanji/084d6.svg b/kanji/084d6.svg
index 87cca0905..5c2897978 100644
--- a/kanji/084d6.svg
+++ b/kanji/084d6.svg
@@ -43,22 +43,24 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:084d6-s3" kvg:type="㇑a" d="M67.75,9.75c1.12,1,1.37,2.52,1,4c-1.12,4.5-1.88,8.5-3.5,14.25"/>
 	</g>
 	<g id="kvg:084d6-g2" kvg:element="𣬉" kvg:position="bottom">
-		<path id="kvg:084d6-s4" kvg:type="㇒" d="M50.04,26c0.01,0.17,0.03,0.45-0.02,0.69c-0.31,1.46-2.06,4.67-4.46,6.63"/>
-		<path id="kvg:084d6-s5" kvg:type="㇑" d="M23.99,33.84c0.23,0.39,0.63,1.33,0.76,1.83c1.05,4.05,2.44,14.6,3.09,22.15"/>
-		<path id="kvg:084d6-s6" kvg:type="㇕" d="M24.87,35.75C36.59,34.52,68.5,33,79.14,32.17c2.85-0.22,4.26,1.25,4.11,3.01c-0.53,6.43-0.75,11.32-2.63,19.84"/>
-		<g id="kvg:084d6-g3" kvg:element="乂">
-			<g id="kvg:084d6-g4" kvg:element="丿">
-				<path id="kvg:084d6-s7" kvg:type="㇒" d="M62.74,35.25c0.06,0.38,0.13,0.98-0.12,1.52c-1.48,3.21-9.96,10.25-21.57,14.55"/>
+		<g id="kvg:084d6-g3" kvg:element="囟">
+			<path id="kvg:084d6-s4" kvg:type="㇒" d="M50.04,26c0.01,0.17,0.03,0.45-0.02,0.69c-0.31,1.46-2.06,4.67-4.46,6.63"/>
+			<path id="kvg:084d6-s5" kvg:type="㇑" d="M23.99,33.84c0.23,0.39,0.63,1.33,0.76,1.83c1.05,4.05,2.44,14.6,3.09,22.15"/>
+			<path id="kvg:084d6-s6" kvg:type="㇕" d="M24.87,35.75C36.59,34.52,68.5,33,79.14,32.17c2.85-0.22,4.26,1.25,4.11,3.01c-0.53,6.43-0.75,11.32-2.63,19.84"/>
+			<g id="kvg:084d6-g4" kvg:element="乂">
+				<g id="kvg:084d6-g5" kvg:element="丿">
+					<path id="kvg:084d6-s7" kvg:type="㇒" d="M62.74,35.25c0.06,0.38,0.13,0.98-0.12,1.52c-1.48,3.21-9.96,10.25-21.57,14.55"/>
+				</g>
+				<path id="kvg:084d6-s8" kvg:type="㇏" d="M43.27,39.94c7.69,1.79,19.87,7.35,21.79,10.13"/>
 			</g>
-			<path id="kvg:084d6-s8" kvg:type="㇏" d="M43.27,39.94c7.69,1.79,19.87,7.35,21.79,10.13"/>
 		</g>
 		<path id="kvg:084d6-s9" kvg:type="㇐" d="M27.88,56.61c7.39-0.68,41.05-2.73,52.74-3.07"/>
-		<g id="kvg:084d6-g5" kvg:element="比">
-			<g id="kvg:084d6-g6" kvg:position="left">
+		<g id="kvg:084d6-g6" kvg:element="比">
+			<g id="kvg:084d6-g7" kvg:position="left">
 				<path id="kvg:084d6-s10" kvg:type="㇐b" d="M27.88,73.73c7.31-0.38,12.67-1.22,19.04-1.85c1.87-0.19,3.06-0.18,4.02-0.07"/>
 				<path id="kvg:084d6-s11" kvg:type="㇙" d="M26,62.01c1,0.63,1.37,1.78,1.37,2.64c0,2.34-0.32,25.99-0.32,29.63c0,3.06-0.16,4.36,4.03,1.75c5.92-3.68,11.67-6.68,17.06-9.21"/>
 			</g>
-			<g id="kvg:084d6-g7" kvg:element="匕" kvg:position="right">
+			<g id="kvg:084d6-g8" kvg:element="匕" kvg:position="right">
 				<path id="kvg:084d6-s12" kvg:type="㇒" d="M83.96,63.29c0.25,0.61-0.45,1.87-1.23,2.69c-1.87,1.96-12.54,8.44-20.11,11.76"/>
 				<path id="kvg:084d6-s13" kvg:type="㇟" d="M57.78,58.86c1.18,0.58,1.69,2.59,1.69,3.33c0,1.94-0.27,24.04-0.27,26.32c0,6.85,2.79,8.68,16.77,8.68c14.53,0,16.04-3.08,16.04-10.97"/>
 			</g>
diff --git a/kanji/08c94-Kaisho.svg b/kanji/08c94-Kaisho.svg
index 1e6c53ab3..7230fc39f 100644
--- a/kanji/08c94-Kaisho.svg
+++ b/kanji/08c94-Kaisho.svg
@@ -47,22 +47,24 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08c94-Kaisho-s7" kvg:type="㇒" d="M35.9,61.14c0.07,0.59,0.29,1.6-0.13,2.37c-3.1,5.67-11.53,15.18-23.52,22.68"/>
 	</g>
 	<g id="kvg:08c94-Kaisho-g2" kvg:element="𣬉" kvg:position="right">
-		<path id="kvg:08c94-Kaisho-s8" kvg:type="㇒" d="M67.14,10.89c0.03,0.3,0.06,0.77-0.05,1.19c-0.64,2.52-4.33,8.04-9.38,11.43"/>
-		<path id="kvg:08c94-Kaisho-s9" kvg:type="㇑" d="M49.99,24.61c0.28,0.47,0.75,1.61,0.9,2.2c1.25,4.87,2.39,16.58,3.16,25.66"/>
-		<path id="kvg:08c94-Kaisho-s10" kvg:type="㇕" d="M50.82,26.48c9.67-1.23,29.59-2.31,36.81-3.34c2.65-0.38,4.01,0.96,3.87,2.3c-0.5,4.91-2.66,18.69-3.87,26.89"/>
-		<g id="kvg:08c94-Kaisho-g3" kvg:element="乂">
-			<g id="kvg:08c94-Kaisho-g4" kvg:element="丿">
-				<path id="kvg:08c94-Kaisho-s11" kvg:type="㇒" d="M78.39,27.93c0.05,0.42,0.12,1.1-0.11,1.7c-1.32,3.59-8.89,11.48-19.24,16.31"/>
+		<g id="kvg:08c94-Kaisho-g3" kvg:element="囟">
+			<path id="kvg:08c94-Kaisho-s8" kvg:type="㇒" d="M67.14,10.89c0.03,0.3,0.06,0.77-0.05,1.19c-0.64,2.52-4.33,8.04-9.38,11.43"/>
+			<path id="kvg:08c94-Kaisho-s9" kvg:type="㇑" d="M49.99,24.61c0.28,0.47,0.75,1.61,0.9,2.2c1.25,4.87,2.39,16.58,3.16,25.66"/>
+			<path id="kvg:08c94-Kaisho-s10" kvg:type="㇕" d="M50.82,26.48c9.67-1.23,29.59-2.31,36.81-3.34c2.65-0.38,4.01,0.96,3.87,2.3c-0.5,4.91-2.66,18.69-3.87,26.89"/>
+			<g id="kvg:08c94-Kaisho-g4" kvg:element="乂">
+				<g id="kvg:08c94-Kaisho-g5" kvg:element="丿">
+					<path id="kvg:08c94-Kaisho-s11" kvg:type="㇒" d="M78.39,27.93c0.05,0.42,0.12,1.1-0.11,1.7c-1.32,3.59-8.89,11.48-19.24,16.31"/>
+				</g>
+				<path id="kvg:08c94-Kaisho-s12" kvg:type="㇏" d="M60.75,32.65c7.12,2.26,18.4,9.3,20.18,12.81"/>
 			</g>
-			<path id="kvg:08c94-Kaisho-s12" kvg:type="㇏" d="M60.75,32.65c7.12,2.26,18.4,9.3,20.18,12.81"/>
 		</g>
 		<path id="kvg:08c94-Kaisho-s13" kvg:type="㇐" d="M54.09,51.14c6.96-0.52,22.53-1.68,33.54-1.94"/>
-		<g id="kvg:08c94-Kaisho-g5" kvg:element="比">
-			<g id="kvg:08c94-Kaisho-g6" kvg:position="left">
+		<g id="kvg:08c94-Kaisho-g6" kvg:element="比">
+			<g id="kvg:08c94-Kaisho-g7" kvg:position="left">
 				<path id="kvg:08c94-Kaisho-s14" kvg:type="㇐b" d="M55.47,70.37c3.96-0.31,8.94-0.92,12.39-1.45c1.01-0.15,1.66-0.15,2.17-0.06"/>
 				<path id="kvg:08c94-Kaisho-s15" kvg:type="㇙" d="M53,58.43c0.71,0.56,1.33,1.66,1.33,2.43c0,2.11-0.23,27.88-0.23,31.16c0,2.76-0.12,3.57,2.87,1.58c3.53-2.35,8.28-5.6,11.36-7.29"/>
 			</g>
-			<g id="kvg:08c94-Kaisho-g7" kvg:element="匕" kvg:position="right">
+			<g id="kvg:08c94-Kaisho-g8" kvg:element="匕" kvg:position="right">
 				<path id="kvg:08c94-Kaisho-s16" kvg:type="㇒" d="M75.47,70.53c4.77-0.38,10.78-1.11,14.94-1.75c1.22-0.19,2-0.18,2.62-0.07"/>
 				<path id="kvg:08c94-Kaisho-s17" kvg:type="㇟" d="M73.16,56.5c0.83,0.59,1.54,2.54,1.54,3.29c0,1.97,0.1,25.39,0.1,27.71c0,8,1.2,9.33,10.76,9.33c5.27,0,8.15-0.23,9.57-2.35"/>
 			</g>
diff --git a/kanji/08c94.svg b/kanji/08c94.svg
index 070c77ef4..ba6552767 100644
--- a/kanji/08c94.svg
+++ b/kanji/08c94.svg
@@ -47,22 +47,24 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:08c94-s7" kvg:type="㇒" d="M35.9,61.14c0.07,0.59,0.29,1.6-0.13,2.37c-3.1,5.67-11.53,15.18-23.52,22.68"/>
 	</g>
 	<g id="kvg:08c94-g2" kvg:element="𣬉" kvg:position="right">
-		<path id="kvg:08c94-s8" kvg:type="㇒" d="M67.14,10.89c0.03,0.3,0.06,0.77-0.05,1.19c-0.64,2.52-4.33,8.04-9.38,11.43"/>
-		<path id="kvg:08c94-s9" kvg:type="㇑" d="M49.99,24.61c0.28,0.47,0.75,1.61,0.9,2.2c1.25,4.87,2.39,16.58,3.16,25.66"/>
-		<path id="kvg:08c94-s10" kvg:type="㇕" d="M50.82,26.48c9.67-1.23,29.59-2.31,36.81-3.34c2.65-0.38,4.01,0.96,3.87,2.3c-0.5,4.91-2.66,18.69-3.87,26.89"/>
-		<g id="kvg:08c94-g3" kvg:element="乂">
-			<g id="kvg:08c94-g4" kvg:element="丿">
-				<path id="kvg:08c94-s11" kvg:type="㇒" d="M78.39,27.93c0.05,0.42,0.12,1.1-0.11,1.7c-1.32,3.59-8.89,11.48-19.24,16.31"/>
+		<g id="kvg:08c94-g3" kvg:element="囟">
+			<path id="kvg:08c94-s8" kvg:type="㇒" d="M67.14,10.89c0.03,0.3,0.06,0.77-0.05,1.19c-0.64,2.52-4.33,8.04-9.38,11.43"/>
+			<path id="kvg:08c94-s9" kvg:type="㇑" d="M49.99,24.61c0.28,0.47,0.75,1.61,0.9,2.2c1.25,4.87,2.39,16.58,3.16,25.66"/>
+			<path id="kvg:08c94-s10" kvg:type="㇕" d="M50.82,26.48c9.67-1.23,29.59-2.31,36.81-3.34c2.65-0.38,4.01,0.96,3.87,2.3c-0.5,4.91-2.66,18.69-3.87,26.89"/>
+			<g id="kvg:08c94-g4" kvg:element="乂">
+				<g id="kvg:08c94-g5" kvg:element="丿">
+					<path id="kvg:08c94-s11" kvg:type="㇒" d="M78.39,27.93c0.05,0.42,0.12,1.1-0.11,1.7c-1.32,3.59-8.89,11.48-19.24,16.31"/>
+				</g>
+				<path id="kvg:08c94-s12" kvg:type="㇏" d="M60.75,32.65c7.12,2.26,18.4,9.3,20.18,12.81"/>
 			</g>
-			<path id="kvg:08c94-s12" kvg:type="㇏" d="M60.75,32.65c7.12,2.26,18.4,9.3,20.18,12.81"/>
 		</g>
 		<path id="kvg:08c94-s13" kvg:type="㇐" d="M54.09,51.14c6.96-0.52,22.53-1.68,33.54-1.94"/>
-		<g id="kvg:08c94-g5" kvg:element="比">
-			<g id="kvg:08c94-g6" kvg:position="left">
+		<g id="kvg:08c94-g6" kvg:element="比">
+			<g id="kvg:08c94-g7" kvg:position="left">
 				<path id="kvg:08c94-s14" kvg:type="㇐b" d="M55.47,70.37c3.96-0.31,8.94-0.92,12.39-1.45c1.01-0.15,1.66-0.15,2.17-0.06"/>
 				<path id="kvg:08c94-s15" kvg:type="㇙" d="M53,58.43c0.71,0.56,1.33,1.66,1.33,2.43c0,2.11-0.23,27.88-0.23,31.16c0,2.76-0.12,3.57,2.87,1.58c3.53-2.35,8.28-5.6,11.36-7.29"/>
 			</g>
-			<g id="kvg:08c94-g7" kvg:element="匕" kvg:position="right">
+			<g id="kvg:08c94-g8" kvg:element="匕" kvg:position="right">
 				<path id="kvg:08c94-s16" kvg:type="㇒" d="M93.56,61.77c0.2,0.6,0.06,2.52-0.83,3.17c-2.48,1.81-9.27,7.87-15.23,11.15"/>
 				<path id="kvg:08c94-s17" kvg:type="㇟" d="M73.16,56.5c0.83,0.59,1.54,2.54,1.54,3.29c0,1.97,0.1,25.39,0.1,27.71c0,8,1.2,9.33,10.76,9.33c8.44,0,10.75-0.58,10.75-8.57"/>
 			</g>