diff --git a/kanji/05ba4.svg b/kanji/05ba4.svg
index 2c05f596d..a28ad4da7 100644
--- a/kanji/05ba4.svg
+++ b/kanji/05ba4.svg
@@ -46,9 +46,11 @@ kvg:type CDATA #IMPLIED >
 	</g>
 	<g id="kvg:05ba4-g3" kvg:element="至" kvg:position="bottom" kvg:phon="至">
 		<path id="kvg:05ba4-s4" kvg:type="㇐" d="M33.3,39.35c1.41,0.36,3.27,0.54,5.4,0.36C47,39,60,37.62,68.44,36.82c2.33-0.22,3.76,0.17,4.93,0.35"/>
-		<path id="kvg:05ba4-s5" kvg:type="㇜" d="M49.81,41.34c0.19,1.41-0.31,2.78-1.15,4.01c-2.47,3.58-5.42,7.38-9.88,11.94c-2.9,2.96-2.35,3.53,0.8,2.99c7.36-1.25,20.85-5.07,32.44-7.12"/>
-		<path id="kvg:05ba4-s6" kvg:type="㇔" d="M66.12,46.88c4.47,2.36,9.62,7.88,11.57,12.2"/>
-		<g id="kvg:05ba4-g4" kvg:element="土">
+		<g id="kvg:05ba4-g4" kvg:element="厶">
+			<path id="kvg:05ba4-s5" kvg:type="㇜" d="M49.81,41.34c0.19,1.41-0.31,2.78-1.15,4.01c-2.47,3.58-5.42,7.38-9.88,11.94c-2.9,2.96-2.35,3.53,0.8,2.99c7.36-1.25,20.85-5.07,32.44-7.12"/>
+			<path id="kvg:05ba4-s6" kvg:type="㇔" d="M66.12,46.88c4.47,2.36,9.62,7.88,11.57,12.2"/>
+		</g>
+		<g id="kvg:05ba4-g5" kvg:element="土">
 			<path id="kvg:05ba4-s7" kvg:type="㇐" d="M31.25,78.06c1.75,0.25,4.47,0.39,6.2,0.25c10.18-0.81,24.05-2.69,32.43-3.14c2.91-0.16,4.66,0.12,6.11,0.25"/>
 			<path id="kvg:05ba4-s8" kvg:type="㇑a" d="M52.03,63.25c1.47,1.25,2.3,2.94,2.25,5c-0.2,8.64-0.05,25.35-0.05,26.25"/>
 			<path id="kvg:05ba4-s9" kvg:type="㇐" d="M19.64,96.76c2.05,0.5,4.57,0.65,6.6,0.5c20.14-1.51,41.23-3.3,56.97-3.3c3.41,0,5.46,0.24,7.16,0.49"/>
diff --git a/kanji/05c4b.svg b/kanji/05c4b.svg
index 0b01d8ef1..f87b42718 100644
--- a/kanji/05c4b.svg
+++ b/kanji/05c4b.svg
@@ -44,9 +44,11 @@ kvg:type CDATA #IMPLIED >
 	</g>
 	<g id="kvg:05c4b-g2" kvg:element="至" kvg:position="tarec">
 		<path id="kvg:05c4b-s4" kvg:type="㇐" d="M37.26,46.35c1.84,0.26,4.73,0.21,6.56,0.01c10.55-1.11,19.85-1.86,33.26-2.99c3.05-0.26,4.91-0.12,6.45,0.01"/>
-		<path id="kvg:05c4b-s5" kvg:type="㇜" d="M56.93,48.43c0.32,1.44-0.3,2.57-1.2,3.46c-4.7,4.65-5.6,5.7-11.59,10.52c-1.93,1.55-1.55,3.22,1.53,2.64c8.21-1.55,17.84-3.3,29.32-5.69"/>
-		<path id="kvg:05c4b-s6" kvg:type="㇔" d="M70.5,52.62C74.6,54.81,81.1,61.6,82.12,65"/>
-		<g id="kvg:05c4b-g3" kvg:element="土">
+		<g id="kvg:05c4b-g3" kvg:element="厶">
+			<path id="kvg:05c4b-s5" kvg:type="㇜" d="M56.93,48.43c0.32,1.44-0.3,2.57-1.2,3.46c-4.7,4.65-5.6,5.7-11.59,10.52c-1.93,1.55-1.55,3.22,1.53,2.64c8.21-1.55,17.84-3.3,29.32-5.69"/>
+			<path id="kvg:05c4b-s6" kvg:type="㇔" d="M70.5,52.62C74.6,54.81,81.1,61.6,82.12,65"/>
+		</g>
+		<g id="kvg:05c4b-g4" kvg:element="土">
 			<path id="kvg:05c4b-s7" kvg:type="㇐" d="M39.25,78.38c1.28,0.22,3.64,0.31,4.9,0.22C52.5,78,67.38,76,77.18,75.76c2.13-0.05,3.41,0.1,4.47,0.21"/>
 			<path id="kvg:05c4b-s8" kvg:type="㇑a" d="M58.08,64.24c1.17,0.76,1.46,2.13,1.46,3.92c0,6.03-0.04,21-0.04,22.72"/>
 			<path id="kvg:05c4b-s9" kvg:type="㇐" d="M28.97,93.1c2.56,0.65,5.48,0.73,7.45,0.65c19.63-0.87,31.17-2.62,51.31-2.77c3.24-0.02,5.18,0.31,6.81,0.63"/>
diff --git a/kanji/05e44.svg b/kanji/05e44.svg
index dac7164df..97b814626 100644
--- a/kanji/05e44.svg
+++ b/kanji/05e44.svg
@@ -50,9 +50,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:05e44-g4" kvg:element="至" kvg:position="tarec">
 			<path id="kvg:05e44-s7" kvg:type="㇐" d="M55.91,43.1c0.69,0.3,1.95,0.32,2.64,0.3c9.11-0.35,22.01-3.15,32.27-3.84c1.15-0.08,1.83,0.14,2.41,0.29"/>
-			<path id="kvg:05e44-s8" kvg:type="㇜" d="M68.2,45.41c0.4,0.41,0,2.26-0.26,2.76c-1.94,3.58-4.99,7.58-9.2,11.05c-1.76,1.45-1.17,2.99,1.34,2.48c5.85-1.19,17.13-4.38,26.36-6.34"/>
-			<path id="kvg:05e44-s9" kvg:type="㇔" d="M80.47,49.02c3.63,2.4,9.37,9.88,10.28,13.61"/>
-			<g id="kvg:05e44-g5" kvg:element="土">
+			<g id="kvg:05e44-g5" kvg:element="厶">
+				<path id="kvg:05e44-s8" kvg:type="㇜" d="M68.2,45.41c0.4,0.41,0,2.26-0.26,2.76c-1.94,3.58-4.99,7.58-9.2,11.05c-1.76,1.45-1.17,2.99,1.34,2.48c5.85-1.19,17.13-4.38,26.36-6.34"/>
+				<path id="kvg:05e44-s9" kvg:type="㇔" d="M80.47,49.02c3.63,2.4,9.37,9.88,10.28,13.61"/>
+			</g>
+			<g id="kvg:05e44-g6" kvg:element="土">
 				<path id="kvg:05e44-s10" kvg:type="㇐" d="M55.16,77.02c0.78,0.29,2.2,0.35,2.97,0.29c6.75-0.52,23.87-2.73,31.13-2.73c1.29,0,2.07,0.13,2.71,0.28"/>
 				<path id="kvg:05e44-s11" kvg:type="㇑a" d="M72.04,64.78c0.08,0.17,1.1,2.45,1.08,3.52C73,74.37,73,89.6,73,91.33"/>
 				<path id="kvg:05e44-s12" kvg:type="㇐" d="M48.25,92.23c1.03,0.34,2.92,0.32,3.94,0.34c9.06,0.18,21.84-2.21,41.54-2.3c1.72-0.01,2.74,0.16,3.6,0.33"/>
diff --git a/kanji/063e1.svg b/kanji/063e1.svg
index 36118227f..739450056 100644
--- a/kanji/063e1.svg
+++ b/kanji/063e1.svg
@@ -50,9 +50,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:063e1-g4" kvg:element="至" kvg:position="tarec">
 			<path id="kvg:063e1-s7" kvg:type="㇐" d="M55.53,46.27c1.61,0.57,3.93,0.33,5.59,0.11c8.38-1.12,14.63-2.01,22.38-3.08c1.87-0.26,3.84-0.37,5.7,0.02"/>
-			<path id="kvg:063e1-s8" kvg:type="㇜" d="M70.43,47.79c0.07,0.96-0.32,1.71-0.97,2.41c-3.96,4.3-6.43,6.46-11.13,10.29c-1.58,1.29-1.66,2.67,0.85,2.11c8.19-1.85,15.94-3.23,25.43-5.31"/>
-			<path id="kvg:063e1-s9" kvg:type="㇔" d="M80.62,52.25c2.92,1.89,7.53,7.77,8.26,10.72"/>
-			<g id="kvg:063e1-g5" kvg:element="土">
+			<g id="kvg:063e1-g5" kvg:element="厶">
+				<path id="kvg:063e1-s8" kvg:type="㇜" d="M70.43,47.79c0.07,0.96-0.32,1.71-0.97,2.41c-3.96,4.3-6.43,6.46-11.13,10.29c-1.58,1.29-1.66,2.67,0.85,2.11c8.19-1.85,15.94-3.23,25.43-5.31"/>
+				<path id="kvg:063e1-s9" kvg:type="㇔" d="M80.62,52.25c2.92,1.89,7.53,7.77,8.26,10.72"/>
+			</g>
+			<g id="kvg:063e1-g6" kvg:element="土">
 				<path id="kvg:063e1-s10" kvg:type="㇐" d="M53.57,76.26c1.61,0.49,3.91,0.29,5.55,0.1c5.99-0.7,19.14-2,26-2.41c1.72-0.1,3.47-0.21,5.17,0.1"/>
 				<path id="kvg:063e1-s11" kvg:type="㇑a" d="M69.84,64.12c0.77,0.77,1.24,2.07,1.24,3.08C71.08,73,71,87,71,89.12"/>
 				<path id="kvg:063e1-s12" kvg:type="㇐" d="M46.08,91.27c2.43,0.67,5.45,0.61,7.93,0.34c7.31-0.78,21.75-2.14,37.11-2.34c2.54-0.03,4.84,0.09,7.33,0.5"/>
diff --git a/kanji/06981.svg b/kanji/06981.svg
index 89d5662a0..8548fbb12 100644
--- a/kanji/06981.svg
+++ b/kanji/06981.svg
@@ -53,9 +53,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:06981-g5" kvg:element="至" kvg:position="bottom">
 			<path id="kvg:06981-s8" kvg:type="㇐" d="M49.31,42.28c0.97,0.45,2.76,0.55,3.73,0.45c7.21-0.73,22.21-2.98,31.14-3.19c1.62-0.04,2.6,0.21,3.41,0.44"/>
-			<path id="kvg:06981-s9" kvg:type="㇜" d="M63.91,44.41c0.43,0.36,0.15,2.06-0.24,2.41C59,51,57.25,52.25,51.25,56.67c-1.81,1.34-1.79,2.53,0.89,2.09c6.25-1.04,21.49-3.32,31.34-5.04"/>
-			<path id="kvg:06981-s10" kvg:type="㇔" d="M76,47.53c5.08,2.56,11.88,9.28,13.15,13.27"/>
-			<g id="kvg:06981-g6" kvg:element="土">
+			<g id="kvg:06981-g6" kvg:element="厶">
+				<path id="kvg:06981-s9" kvg:type="㇜" d="M63.91,44.41c0.43,0.36,0.15,2.06-0.24,2.41C59,51,57.25,52.25,51.25,56.67c-1.81,1.34-1.79,2.53,0.89,2.09c6.25-1.04,21.49-3.32,31.34-5.04"/>
+				<path id="kvg:06981-s10" kvg:type="㇔" d="M76,47.53c5.08,2.56,11.88,9.28,13.15,13.27"/>
+			</g>
+			<g id="kvg:06981-g7" kvg:element="土">
 				<path id="kvg:06981-s11" kvg:type="㇐" d="M49.1,77c0.97,0.29,2.76,0.4,3.73,0.29c8.92-1.04,24.42-3.29,33.36-3.73c1.62-0.08,2.6,0.14,3.41,0.28"/>
 				<path id="kvg:06981-s12" kvg:type="㇑a" d="M67.65,61.87c0.11,0.31,1.71,1.6,1.68,3.55c-0.18,11.16-0.03,23.54-0.03,26.73"/>
 				<path id="kvg:06981-s13" kvg:type="㇐" d="M42.57,93.58c1.41,0.28,3.99,0.33,5.4,0.28c15.68-0.64,22.51-1.97,43.5-2.17c2.34-0.02,3.75,0.13,4.92,0.27"/>
diff --git a/kanji/06e25.svg b/kanji/06e25.svg
index 01aa88956..7bd615e63 100644
--- a/kanji/06e25.svg
+++ b/kanji/06e25.svg
@@ -50,9 +50,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:06e25-g4" kvg:element="至" kvg:position="tarec">
 			<path id="kvg:06e25-s7" kvg:type="㇐" d="M50.91,45.86c1.71,0.64,4.23,0.29,5.98,0.06c8.33-1.12,17.16-2.1,25.11-2.75c2.01-0.16,4.03-0.45,6.01-0.01"/>
-			<path id="kvg:06e25-s8" kvg:type="㇜" d="M66.99,47.39c0.01,1.11-0.22,1.76-0.76,2.38c-3.61,4.11-6.48,6.73-10.68,9.72c-1.75,1.25-1.64,3.6,0.83,3.01c6.74-1.62,15.87-3.5,25.57-5.91"/>
-			<path id="kvg:06e25-s9" kvg:type="㇔" d="M78.24,51.52c3.36,1.96,8.68,8.06,9.52,11.11"/>
-			<g id="kvg:06e25-g5" kvg:element="土">
+			<g id="kvg:06e25-g5" kvg:element="厶">
+				<path id="kvg:06e25-s8" kvg:type="㇜" d="M66.99,47.39c0.01,1.11-0.22,1.76-0.76,2.38c-3.61,4.11-6.48,6.73-10.68,9.72c-1.75,1.25-1.64,3.6,0.83,3.01c6.74-1.62,15.87-3.5,25.57-5.91"/>
+				<path id="kvg:06e25-s9" kvg:type="㇔" d="M78.24,51.52c3.36,1.96,8.68,8.06,9.52,11.11"/>
+			</g>
+			<g id="kvg:06e25-g6" kvg:element="土">
 				<path id="kvg:06e25-s10" kvg:type="㇐" d="M47.85,76.12c2.13,0.68,4.9,0.25,7.05-0.02c8.04-1.02,18.98-1.85,27.36-2.45c2.26-0.16,4.67-0.27,6.92,0.16"/>
 				<path id="kvg:06e25-s11" kvg:type="㇑a" d="M66.43,64.27c0.96,0.96,1.18,2.11,1.18,3.59c0,5.77-0.11,19.75-0.11,21.4"/>
 				<path id="kvg:06e25-s12" kvg:type="㇐" d="M40.31,90.99c2.57,0.74,5.55,0.83,8.19,0.55c9.96-1.07,27.13-2.04,41.39-2.59c2.92-0.11,6.36,0.17,8.7,0.78"/>
diff --git a/kanji/0815f.svg b/kanji/0815f.svg
index 6d3445c32..8c594735c 100644
--- a/kanji/0815f.svg
+++ b/kanji/0815f.svg
@@ -53,9 +53,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:0815f-g5" kvg:element="至" kvg:position="bottom">
 			<path id="kvg:0815f-s8" kvg:type="㇐" d="M47.75,40.58c0.67,0.37,3.99,1.21,4.67,1.18c8.91-0.43,24.08-2.26,34.67-3.18c1.12-0.1,3.77,0.15,4.33,0.33"/>
-			<path id="kvg:0815f-s9" kvg:type="㇜" d="M63.92,42.42c0.47,0.36,0.19,1.59-0.17,2c-3.75,4.33-6.5,6.83-11.19,12.13c-1.57,1.78-1.97,2.51,0.99,2.07c6.91-1.04,21.31-4,32.2-5.7"/>
-			<path id="kvg:0815f-s10" kvg:type="㇔" d="M76.92,44.67c5.77,3.33,13.5,12.05,14.94,17.24"/>
-			<g id="kvg:0815f-g6" kvg:element="土">
+			<g id="kvg:0815f-g6" kvg:element="厶">
+				<path id="kvg:0815f-s9" kvg:type="㇜" d="M63.92,42.42c0.47,0.36,0.19,1.59-0.17,2c-3.75,4.33-6.5,6.83-11.19,12.13c-1.57,1.78-1.97,2.51,0.99,2.07c6.91-1.04,21.31-4,32.2-5.7"/>
+				<path id="kvg:0815f-s10" kvg:type="㇔" d="M76.92,44.67c5.77,3.33,13.5,12.05,14.94,17.24"/>
+			</g>
+			<g id="kvg:0815f-g7" kvg:element="土">
 				<path id="kvg:0815f-s11" kvg:type="㇐" d="M47.42,73.58c0.83,0.26,2.83,1.17,5.5,1.17c3.39,0,26.58-2.75,34.17-3.17c1.38-0.08,4.15,0.03,4.83,0.17"/>
 				<path id="kvg:0815f-s12" kvg:type="㇑a" d="M66.75,61.75c1.5,1,2.35,2.32,2.33,4c-0.07,6.68,0.19,23.5,0.19,25.41"/>
 				<path id="kvg:0815f-s13" kvg:type="㇐" d="M43.58,92.58c2.17,0.42,4.19,0.38,5.17,0.33c10-0.42,33.5-1.92,46-2.67c1.49-0.09,2.75,0.75,4.17,1.33"/>
diff --git a/kanji/09f77.svg b/kanji/09f77.svg
index fa82edcad..968212404 100644
--- a/kanji/09f77.svg
+++ b/kanji/09f77.svg
@@ -82,9 +82,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:09f77-g14" kvg:element="至" kvg:position="tarec">
 			<path id="kvg:09f77-s19" kvg:type="㇐" d="M62.48,43.7c0.62,0.27,1.76,0.29,2.38,0.27c8.23-0.32,17.88-1.81,27.15-2.44c1.03-0.07,1.66,0.13,2.18,0.26"/>
-			<path id="kvg:09f77-s20" kvg:type="㇜" d="M74.23,45.53c0.36,0.38,0.07,2.13-0.24,2.53c-4.1,5.3-4.74,6.44-8.27,10.61c-1.35,1.59-1.53,3.67,0.76,3.2c5.34-1.09,15.15-4.49,23.57-6.28"/>
-			<path id="kvg:09f77-s21" kvg:type="㇔" d="M84.5,48.95c3.34,2.44,8.62,10.02,9.46,13.81"/>
-			<g id="kvg:09f77-g15" kvg:element="土">
+			<g id="kvg:09f77-g15" kvg:element="厶">
+				<path id="kvg:09f77-s20" kvg:type="㇜" d="M74.23,45.53c0.36,0.38,0.07,2.13-0.24,2.53c-4.1,5.3-4.74,6.44-8.27,10.61c-1.35,1.59-1.53,3.67,0.76,3.2c5.34-1.09,15.15-4.49,23.57-6.28"/>
+				<path id="kvg:09f77-s21" kvg:type="㇔" d="M84.5,48.95c3.34,2.44,8.62,10.02,9.46,13.81"/>
+			</g>
+			<g id="kvg:09f77-g16" kvg:element="土">
 				<path id="kvg:09f77-s22" kvg:type="㇐" d="M62.22,77.12c0.78,0.29,2.21,0.35,2.99,0.29c6.78-0.52,18.47-1.75,25.77-1.75c1.3,0,2.08,0.13,2.72,0.28"/>
 				<path id="kvg:09f77-s23" kvg:type="㇑a" d="M75.67,65.25c0.07,0.17,1.1,2.47,1.08,3.55c-0.12,6.14-0.12,21.51-0.12,23.26"/>
 				<path id="kvg:09f77-s24" kvg:type="㇐" d="M56.19,92.97c1.03,0.35,2.93,0.36,3.96,0.35c6.6-0.07,26.1-1.82,34.23-1.82c1.72,0,2.76,0.17,3.62,0.34"/>