diff --git a/kanji/07d20-Kaisho.svg b/kanji/07d20-Kaisho.svg
index cb60588a9..8e8768d18 100644
--- a/kanji/07d20-Kaisho.svg
+++ b/kanji/07d20-Kaisho.svg
@@ -37,23 +37,17 @@ 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_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:position="top">
-		<g id="kvg:07d20-Kaisho-g2" kvg:element="三">
-			<g id="kvg:07d20-Kaisho-g3" kvg:element="一" 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>
+	<g id="kvg:07d20-Kaisho-g1" kvg:element="龶" kvg:position="top">
+		<g id="kvg:07d20-Kaisho-g2" kvg:element="三" 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-g4" kvg:element="三" kvg:position="bottom">
-			<g id="kvg:07d20-Kaisho-g5" kvg:element="一">
-				<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"/>
-			</g>
-			<g id="kvg:07d20-Kaisho-g6" kvg:element="一">
-				<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>
+		<g id="kvg:07d20-Kaisho-g3" kvg:element="三" 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>
 	</g>
-	<g id="kvg:07d20-Kaisho-g7" kvg:element="糸" kvg:position="bottom" kvg:radical="general">
+	<g id="kvg:07d20-Kaisho-g4" kvg:element="糸" kvg:position="bottom" kvg:radical="general">
 		<path id="kvg:07d20-Kaisho-s5" kvg:type="㇜" d="M49.19,45.07c-3.14,3.94-7.88,9.69-10.88,11.8c-0.61,0.44-0.59,2.1,0,2.27c3.14,0.91,6.59,2.42,9.28,4.09"/>
 		<path id="kvg:07d20-Kaisho-s6" kvg:type="㇜" d="M65.07,44.94c0.36,0.49,0.04,3.14-0.5,3.62c-7.47,6.71-17.1,15.05-25.64,23.07c-1.15,1.08-0.71,1.64,0.71,1.31c5.95-1.37,23.71-4.89,31.36-6.2"/>
 		<path id="kvg:07d20-Kaisho-s7" kvg:type="㇔" d="M65.5,62.35c4.03,1.75,10.41,7.18,11.41,9.9"/>
diff --git a/kanji/07d20-KaishoVtLst.svg b/kanji/07d20-KaishoVtLst.svg
index e73b6fadf..02f798eeb 100644
--- a/kanji/07d20-KaishoVtLst.svg
+++ b/kanji/07d20-KaishoVtLst.svg
@@ -37,23 +37,15 @@ 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_07d20-KaishoVtLst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:07d20-KaishoVtLst" kvg:element="素">
-	<g id="kvg:07d20-KaishoVtLst-g1" kvg:position="top">
+	<g id="kvg:07d20-KaishoVtLst-g1" kvg:element="龶" kvg:position="top">
 		<g id="kvg:07d20-KaishoVtLst-g2" kvg:element="三">
-			<g id="kvg:07d20-KaishoVtLst-g3" kvg:element="一" kvg:position="top">
-				<path id="kvg:07d20-KaishoVtLst-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>
-		</g>
-		<g id="kvg:07d20-KaishoVtLst-g4" kvg:element="三" kvg:position="bottom">
-			<g id="kvg:07d20-KaishoVtLst-g5" kvg:element="一">
-				<path id="kvg:07d20-KaishoVtLst-s2" 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"/>
-			</g>
-			<g id="kvg:07d20-KaishoVtLst-g6" kvg:element="一">
-				<path id="kvg:07d20-KaishoVtLst-s3" 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>
-			<path id="kvg:07d20-KaishoVtLst-s4" 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"/>
+			<path id="kvg:07d20-KaishoVtLst-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"/>
+			<path id="kvg:07d20-KaishoVtLst-s2" 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-KaishoVtLst-s3" 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>
+		<path id="kvg:07d20-KaishoVtLst-s4" 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>
-	<g id="kvg:07d20-KaishoVtLst-g7" kvg:element="糸" kvg:position="bottom" kvg:radical="general">
+	<g id="kvg:07d20-KaishoVtLst-g3" kvg:element="糸" kvg:position="bottom" kvg:radical="general">
 		<path id="kvg:07d20-KaishoVtLst-s5" kvg:type="㇜" d="M49.19,45.07c-3.14,3.94-7.88,9.69-10.88,11.8c-0.61,0.44-0.59,2.1,0,2.27c3.14,0.91,6.59,2.42,9.28,4.09"/>
 		<path id="kvg:07d20-KaishoVtLst-s6" kvg:type="㇜" d="M65.07,44.94c0.36,0.49,0.04,3.14-0.5,3.62c-7.47,6.71-17.1,15.05-25.64,23.07c-1.15,1.08-0.71,1.64,0.71,1.31c5.95-1.37,23.71-4.89,31.36-6.2"/>
 		<path id="kvg:07d20-KaishoVtLst-s7" kvg:type="㇔" d="M65.5,62.35c4.03,1.75,10.41,7.18,11.41,9.9"/>
diff --git a/kanji/07d20.svg b/kanji/07d20.svg
index 7a0d9e6b3..f1f20753a 100644
--- a/kanji/07d20.svg
+++ b/kanji/07d20.svg
@@ -37,23 +37,17 @@ 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_07d20" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:07d20" kvg:element="素">
-	<g id="kvg:07d20-g1" kvg:position="top">
+	<g id="kvg:07d20-g1" kvg:element="龶" kvg:position="top">
 		<g id="kvg:07d20-g2" kvg:element="三" kvg:part="1">
-			<g id="kvg:07d20-g3" kvg:element="一" kvg:position="top">
-				<path id="kvg:07d20-s1" kvg:type="㇐" d="M34.13,23.42c2.37,0.58,4.27,0.34,6.25,0.12c7.13-0.77,19.82-2.6,26.27-3.38c1.98-0.24,4.35-0.41,5.98-0.02"/>
-			</g>
+			<path id="kvg:07d20-s1" kvg:type="㇐" d="M34.13,23.42c2.37,0.58,4.27,0.34,6.25,0.12c7.13-0.77,19.82-2.6,26.27-3.38c1.98-0.24,4.35-0.41,5.98-0.02"/>
 		</g>
 		<path id="kvg:07d20-s2" kvg:type="㇑a" d="M52.31,12.38c0.84,0.84,1.51,2.24,1.51,3.92c0,5.69-0.15,18.56-0.07,26.69"/>
-		<g id="kvg:07d20-g4" kvg:element="三" kvg:part="2" kvg:position="bottom">
-			<g id="kvg:07d20-g5" kvg:element="一">
-				<path id="kvg:07d20-s3" kvg:type="㇐" d="M31.13,34.53c2.75,0.47,4.79,0.21,7.01-0.04c7.63-0.86,21.9-2.81,29.25-3.73c2.33-0.29,4.99-0.51,6.99-0.14"/>
-			</g>
-			<g id="kvg:07d20-g6" kvg:element="一">
-				<path id="kvg:07d20-s4" kvg:type="㇐" d="M15.63,46c2.97,0.61,6,0.52,8.98,0.24c14.46-1.37,45.4-4.64,58.89-5.36c3.32-0.18,7.75-0.13,11,0.6"/>
-			</g>
+		<g id="kvg:07d20-g3" kvg:element="三" kvg:part="2" kvg:position="bottom">
+			<path id="kvg:07d20-s3" kvg:type="㇐" d="M31.13,34.53c2.75,0.47,4.79,0.21,7.01-0.04c7.63-0.86,21.9-2.81,29.25-3.73c2.33-0.29,4.99-0.51,6.99-0.14"/>
+			<path id="kvg:07d20-s4" kvg:type="㇐" d="M15.63,46c2.97,0.61,6,0.52,8.98,0.24c14.46-1.37,45.4-4.64,58.89-5.36c3.32-0.18,7.75-0.13,11,0.6"/>
 		</g>
 	</g>
-	<g id="kvg:07d20-g7" kvg:element="糸" kvg:position="bottom" kvg:radical="general">
+	<g id="kvg:07d20-g4" kvg:element="糸" kvg:position="bottom" kvg:radical="general">
 		<path id="kvg:07d20-s5" kvg:type="㇜" d="M47.44,45.32c0.18,0.8,0.07,1.73-0.48,2.34c-2.21,2.46-4.08,4.71-8.64,8.96c-1.01,0.94-1.06,2.37,0.5,2.77c3.17,0.8,6.09,2.17,8.78,3.84"/>
 		<path id="kvg:07d20-s6" kvg:type="㇜" d="M64.82,45.44C65,46.5,64.5,48,63.57,49.06c-7.09,8.13-15.2,14.19-24.64,22.07c-1.21,1.01-0.96,1.89,0.46,1.56c5.95-1.37,22.46-4.39,30.11-5.7"/>
 		<path id="kvg:07d20-s7" kvg:type="㇔" d="M65.5,62.6c4.03,1.75,10.41,7.18,11.41,9.9"/>