diff --git a/kanji/05191-Kaisho.svg b/kanji/05191-Kaisho.svg
index cec16118a..666b4f311 100644
--- a/kanji/05191-Kaisho.svg
+++ b/kanji/05191-Kaisho.svg
@@ -38,14 +38,14 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_05191-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05191-Kaisho" kvg:element="冑">
 	<g id="kvg:05191-Kaisho-g1" kvg:element="由" kvg:variant="true" kvg:position="top">
-		<g id="kvg:05191-Kaisho-g2" kvg:element="田" kvg:partial="true">
+		<g id="kvg:05191-Kaisho-g2" kvg:element="日" kvg:part="1" kvg:partial="true">
 			<path id="kvg:05191-Kaisho-s1" kvg:type="㇑" d="M25.71,20.26c0.58,0.64,1.03,1.31,1.17,1.87c1.12,4.62,3.24,15.58,3.9,24.08"/>
 			<path id="kvg:05191-Kaisho-s2" kvg:type="㇕" d="M27.67,21.51c10.47-1.15,47-3.02,53.63-3.47c2.43-0.17,3.34,1.17,3.21,2.41c-0.49,4.53-1.95,15.24-3.48,22.7"/>
-			<path id="kvg:05191-Kaisho-s3" kvg:type="㇑" d="M52.36,8.5c1.16,0.8,1.85,1.95,1.85,3c0.04,10.36,0.21,27.82,0.21,30.52"/>
+		</g>
+		<path id="kvg:05191-Kaisho-s3" kvg:type="㇑" d="M52.36,8.5c1.16,0.8,1.85,1.95,1.85,3c0.04,10.36,0.21,27.82,0.21,30.52"/>
+		<g id="kvg:05191-Kaisho-g3" kvg:element="日" kvg:part="1" kvg:partial="true">
 			<path id="kvg:05191-Kaisho-s4" kvg:type="㇐" d="M28.75,31.83c12.33-0.93,24.71-1.36,37.05-1.99c1.53-0.08,3.01-0.15,4.42-0.23"/>
-			<g id="kvg:05191-Kaisho-g3" kvg:element="丨">
-				<path id="kvg:05191-Kaisho-s5" kvg:type="㇐" d="M30.75,44.06c7.31-0.33,41.54-3.02,50.36-3.14"/>
-			</g>
+			<path id="kvg:05191-Kaisho-s5" kvg:type="㇐" d="M30.75,44.06c7.31-0.33,41.54-3.02,50.36-3.14"/>
 		</g>
 	</g>
 	<g id="kvg:05191-Kaisho-g4" kvg:element="月" kvg:variant="true" kvg:original="肉" kvg:position="bottom" kvg:radical="nelson">
diff --git a/kanji/05191-KaishoVtLst.svg b/kanji/05191-KaishoVtLst.svg
index 9837218dc..45110dd4b 100644
--- a/kanji/05191-KaishoVtLst.svg
+++ b/kanji/05191-KaishoVtLst.svg
@@ -38,14 +38,14 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_05191-KaishoVtLst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05191-KaishoVtLst" kvg:element="冑">
 	<g id="kvg:05191-KaishoVtLst-g1" kvg:element="由" kvg:variant="true" kvg:position="top">
-		<g id="kvg:05191-KaishoVtLst-g2" kvg:element="田" kvg:partial="true">
+		<g id="kvg:05191-KaishoVtLst-g2" kvg:element="日" kvg:partial="true">
 			<path id="kvg:05191-KaishoVtLst-s1" kvg:type="㇑" d="M25.71,20.26c0.58,0.64,1.03,1.31,1.17,1.87c1.12,4.62,3.24,15.58,3.9,24.08"/>
 			<path id="kvg:05191-KaishoVtLst-s2" kvg:type="㇕" d="M27.67,21.51c10.47-1.15,47-3.02,53.63-3.47c2.43-0.17,3.34,1.17,3.21,2.41c-0.49,4.53-1.95,15.24-3.48,22.7"/>
 			<path id="kvg:05191-KaishoVtLst-s3" kvg:type="㇐" d="M28.75,31.83c12.33-0.93,24.71-1.36,37.05-1.99c1.53-0.08,3.01-0.15,4.42-0.23"/>
 			<path id="kvg:05191-KaishoVtLst-s4" kvg:type="㇐" d="M30.75,44.06c7.31-0.33,41.54-3.02,50.36-3.14"/>
-			<g id="kvg:05191-KaishoVtLst-g3" kvg:element="丨">
-				<path id="kvg:05191-KaishoVtLst-s5" kvg:type="㇑" d="M52.36,8.5c1.16,0.8,1.85,1.95,1.85,3c0.04,10.36,0.21,27.82,0.21,30.52"/>
-			</g>
+		</g>
+		<g id="kvg:05191-KaishoVtLst-g3" kvg:element="丨">
+			<path id="kvg:05191-KaishoVtLst-s5" kvg:type="㇑" d="M52.36,8.5c1.16,0.8,1.85,1.95,1.85,3c0.04,10.36,0.21,27.82,0.21,30.52"/>
 		</g>
 	</g>
 	<g id="kvg:05191-KaishoVtLst-g4" kvg:element="月" kvg:variant="true" kvg:original="肉" kvg:position="bottom" kvg:radical="nelson">
diff --git a/kanji/0536e.svg b/kanji/0536e.svg
index 630d3b716..ed383d8f6 100644
--- a/kanji/0536e.svg
+++ b/kanji/0536e.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:0536e-s2" kvg:type="㇒" d="M26.5,23.5c0.5,1.25,0.83,2.4,0.92,4.86C28,43.75,27.5,78,14.81,95.47"/>
 	</g>
 	<path id="kvg:0536e-s3" kvg:type="㇐" d="M27.63,39.73c1.87-0.23,4.3-0.35,5.82-0.46C51.25,38,70.5,35,83.06,33.54c2.51-0.29,4.05,0.26,5.31,0.53"/>
-	<g id="kvg:0536e-g2" kvg:element="卩" kvg:radical="general">
+	<g id="kvg:0536e-g2" kvg:element="㔾" kvg:radical="general">
 		<path id="kvg:0536e-s4" kvg:type="㇆" d="M40.65,51.1c0.7,0.13,2.58,0.41,4.02,0.3c5.58-0.41,21.57-2.13,23.47-2.6c2.84-0.7,4.69,1.22,4.57,4.02c-0.19,4.75-2.1,15.4-5.83,22.95c-2.72,5.51-5.14,0.67-5.67,0.4"/>
 		<path id="kvg:0536e-s5" kvg:type="㇟/㇑" d="M43.49,52.11c0.96,1.62,0.78,3.03,0.78,5.53c0,14.92,0.28,14.02,0.28,21.6c0,15.25,2.66,15.71,22.87,15.71c20.99,0,23.72-1.28,23.72-12.44"/>
 	</g>
diff --git a/kanji/0537f-Hyougai.svg b/kanji/0537f-Hyougai.svg
index dc5e8b600..d2e7fa8b0 100644
--- a/kanji/0537f-Hyougai.svg
+++ b/kanji/0537f-Hyougai.svg
@@ -53,10 +53,8 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:0537f-Hyougai-s8" kvg:type="㇔" d="M56.62,64.89c3.06,2.94,8.13,12.48,9.53,20.11"/>
 		</g>
 		<g id="kvg:0537f-Hyougai-g5" kvg:element="卩" kvg:position="right" kvg:radical="general">
-			<g id="kvg:0537f-Hyougai-g6" kvg:element="厶" kvg:variant="true" kvg:original="厶">
-				<path id="kvg:0537f-Hyougai-s9" kvg:type="㇆" d="M70.33,24.59c1.95,0.52,3.89,0.55,5.82,0.08c4.27-0.66,10.56-1.74,13.2-2.17c3.29-0.53,5.25,0.45,5.01,4.25c-0.32,5.22-2.31,25.82-3.68,33.03c-2.12,11.09-5.74,0.87-6.19,0.52"/>
-				<path id="kvg:0537f-Hyougai-s10" kvg:type="㇑" d="M73.73,25.65c0.81,0.81,1.31,1.98,1.31,3.32c0,0.82-0.03,37.69-0.04,56.28c0,4.73,0,8.28,0,9.75"/>
-			</g>
+			<path id="kvg:0537f-Hyougai-s9" kvg:type="㇆" d="M70.33,24.59c1.95,0.52,3.89,0.55,5.82,0.08c4.27-0.66,10.56-1.74,13.2-2.17c3.29-0.53,5.25,0.45,5.01,4.25c-0.32,5.22-2.31,25.82-3.68,33.03c-2.12,11.09-5.74,0.87-6.19,0.52"/>
+			<path id="kvg:0537f-Hyougai-s10" kvg:type="㇑" d="M73.73,25.65c0.81,0.81,1.31,1.98,1.31,3.32c0,0.82-0.03,37.69-0.04,56.28c0,4.73,0,8.28,0,9.75"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/0537f-HyougaiKaisho.svg b/kanji/0537f-HyougaiKaisho.svg
index b3b855e30..2fce9ae1a 100644
--- a/kanji/0537f-HyougaiKaisho.svg
+++ b/kanji/0537f-HyougaiKaisho.svg
@@ -53,10 +53,8 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:0537f-HyougaiKaisho-s8" kvg:type="㇔" d="M56.62,64.89c3.06,2.94,8.13,12.48,9.53,20.11"/>
 		</g>
 		<g id="kvg:0537f-HyougaiKaisho-g5" kvg:element="卩" kvg:position="right" kvg:radical="general">
-			<g id="kvg:0537f-HyougaiKaisho-g6" kvg:element="厶" kvg:variant="true" kvg:original="厶">
-				<path id="kvg:0537f-HyougaiKaisho-s9" kvg:type="㇆" d="M70.08,24.59c1.17,0.16,2.21,0.54,3.42,0.41c4.5-0.5,15.54-2.78,16.74-2.92c1.51-0.17,3.77-0.35,3.92,3.3c0.07,1.74-1.95,26.41-3.47,34.39c-2.12,11.09-5.74,0.87-6.19,0.52"/>
-				<path id="kvg:0537f-HyougaiKaisho-s10" kvg:type="㇑" d="M73.73,25.4c0.73,0.51,1.17,2.3,1.31,3.32c0.14,1.02,0,60.14-0.15,66.53"/>
-			</g>
+			<path id="kvg:0537f-HyougaiKaisho-s9" kvg:type="㇆" d="M70.08,24.59c1.17,0.16,2.21,0.54,3.42,0.41c4.5-0.5,15.54-2.78,16.74-2.92c1.51-0.17,3.77-0.35,3.92,3.3c0.07,1.74-1.95,26.41-3.47,34.39c-2.12,11.09-5.74,0.87-6.19,0.52"/>
+			<path id="kvg:0537f-HyougaiKaisho-s10" kvg:type="㇑" d="M73.73,25.4c0.73,0.51,1.17,2.3,1.31,3.32c0.14,1.02,0,60.14-0.15,66.53"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/0537f-Kaisho.svg b/kanji/0537f-Kaisho.svg
index 3e2f9b36e..0d0853f41 100644
--- a/kanji/0537f-Kaisho.svg
+++ b/kanji/0537f-Kaisho.svg
@@ -55,10 +55,8 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:0537f-Kaisho-s10" kvg:type="㇐" d="M44.3,84.55c4.35-0.3,15.12-2.58,19.33-2.37c1.13,0.05,1.82,0.08,2.39,0.17"/>
 		</g>
 		<g id="kvg:0537f-Kaisho-g5" kvg:element="卩" kvg:position="right" kvg:radical="general">
-			<g id="kvg:0537f-Kaisho-g6" kvg:element="厶" kvg:variant="true" kvg:original="厶">
-				<path id="kvg:0537f-Kaisho-s11" kvg:type="㇆" d="M70.08,24.59c1.17,0.16,2.21,0.54,3.42,0.41c4.5-0.5,15.54-2.78,16.74-2.92c1.51-0.17,3.77-0.35,3.92,3.3c0.07,1.74-1.95,26.41-3.47,34.39c-2.12,11.09-5.74,0.87-6.19,0.52"/>
-				<path id="kvg:0537f-Kaisho-s12" kvg:type="㇑" d="M73.73,25.4c0.73,0.51,1.17,2.3,1.31,3.32c0.14,1.02,0,60.14-0.15,66.53"/>
-			</g>
+			<path id="kvg:0537f-Kaisho-s11" kvg:type="㇆" d="M70.08,24.59c1.17,0.16,2.21,0.54,3.42,0.41c4.5-0.5,15.54-2.78,16.74-2.92c1.51-0.17,3.77-0.35,3.92,3.3c0.07,1.74-1.95,26.41-3.47,34.39c-2.12,11.09-5.74,0.87-6.19,0.52"/>
+			<path id="kvg:0537f-Kaisho-s12" kvg:type="㇑" d="M73.73,25.4c0.73,0.51,1.17,2.3,1.31,3.32c0.14,1.02,0,60.14-0.15,66.53"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/0537f.svg b/kanji/0537f.svg
index f895abd67..a0f84eab7 100644
--- a/kanji/0537f.svg
+++ b/kanji/0537f.svg
@@ -55,10 +55,8 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:0537f-s10" kvg:type="㇐" d="M45.05,84.55c3.47-0.24,9.53-1.74,14.58-2.23c1.85-0.18,3.78-0.26,5.64,0.03"/>
 		</g>
 		<g id="kvg:0537f-g5" kvg:element="卩" kvg:position="right" kvg:radical="general">
-			<g id="kvg:0537f-g6" kvg:element="厶" kvg:original="厶">
-				<path id="kvg:0537f-s11" kvg:type="㇆" d="M70.08,24.59c1.29,0.53,2.71,0.54,3.92,0.41c3.72-0.41,11.76-1.87,15.09-2.44c3.29-0.56,5.51,0.02,5.29,3.96c-0.27,4.8-2.05,25.94-3.44,33.26c-2.12,11.09-5.44,2.72-6.19,1.27"/>
-				<path id="kvg:0537f-s12" kvg:type="㇑" d="M73.98,26.15c0.94,0.94,1.06,1.98,1.06,3.57c0,0.8-0.03,35.66-0.04,54.53C75,86.03,75,94.31,75,95.38"/>
-			</g>
+			<path id="kvg:0537f-s11" kvg:type="㇆" d="M70.08,24.59c1.29,0.53,2.71,0.54,3.92,0.41c3.72-0.41,11.76-1.87,15.09-2.44c3.29-0.56,5.51,0.02,5.29,3.96c-0.27,4.8-2.05,25.94-3.44,33.26c-2.12,11.09-5.44,2.72-6.19,1.27"/>
+			<path id="kvg:0537f-s12" kvg:type="㇑" d="M73.98,26.15c0.94,0.94,1.06,1.98,1.06,3.57c0,0.8-0.03,35.66-0.04,54.53C75,86.03,75,94.31,75,95.38"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/0548e.svg b/kanji/0548e.svg
index d0b95985a..8d75ac9ee 100644
--- a/kanji/0548e.svg
+++ b/kanji/0548e.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:0548e" kvg:element="咎">
 	<g id="kvg:0548e-g1" kvg:element="处" kvg:position="top">
 		<g id="kvg:0548e-g2" kvg:element="夂" kvg:position="left">
-			<g id="kvg:0548e-g3" kvg:element="各">
+			<g id="kvg:0548e-g3" kvg:element="各" kvg:part="1">
 				<path id="kvg:0548e-s1" kvg:type="㇒" d="M33.77,12.08c0.06,0.73,0.29,1.94-0.11,2.94c-3.1,7.68-10.03,19.13-19.75,28.71"/>
 				<path id="kvg:0548e-s2" kvg:type="㇇" d="M31.6,22.57c0.33,0.04,1.76,0,2.71-0.11c3.14-0.35,11.46-2.59,15.94-3.68c3.08-0.75,3.95,0.85,3.16,2.89C49.11,32.81,34.67,58,13.77,68.7"/>
 				<path id="kvg:0548e-s3" kvg:type="㇏" d="M24.98,34.91C35.42,35.16,62.33,55,84.33,63.31c3.46,1.31,6.22,2.05,9.57,2.46"/>
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:0548e-g5" kvg:element="口" kvg:radical="general">
-		<g id="kvg:0548e-g6" kvg:element="各">
+		<g id="kvg:0548e-g6" kvg:element="各" kvg:part="2">
 			<path id="kvg:0548e-s6" kvg:type="㇑" d="M31.67,70.08c0.39,0.46,0.78,0.84,0.96,1.42c1.35,4.55,2.92,18.62,3.84,26.8"/>
 			<path id="kvg:0548e-s7" kvg:type="㇕b" d="M33.08,72.63c10.91-1.54,34.28-3.42,38.83-4.02c1.66-0.22,2.66,1.29,2.42,2.58c-0.98,5.32-3.21,14.26-4.67,21.61"/>
 			<path id="kvg:0548e-s8" kvg:type="㇐b" d="M36.65,95.32c5.34-0.68,27.88-1.79,35.21-2.83"/>