diff --git a/kanji/088c1-Kaisho.svg b/kanji/088c1-Kaisho.svg
index ea36c7183..24e81322b 100644
--- a/kanji/088c1-Kaisho.svg
+++ b/kanji/088c1-Kaisho.svg
@@ -37,39 +37,43 @@ 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_088c1-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:088c1-Kaisho" kvg:element="裁">
-	<g id="kvg:088c1-Kaisho-g1" kvg:element="土" kvg:part="1">
-		<g id="kvg:088c1-Kaisho-g2" kvg:element="十" kvg:radical="nelson">
-			<path id="kvg:088c1-Kaisho-s1" kvg:type="㇐" d="M23.13,25.88c0.98,0.26,2.78,0.32,3.76,0.26c6.86-0.38,15.86-2.25,22.3-2.83c1.62-0.14,2.62,0.12,3.43,0.26"/>
-			<path id="kvg:088c1-Kaisho-s2" kvg:type="㇑" d="M38.92,13.12c0.12,0.29,1.77,1.52,1.77,3.39c0,12,0.14,5.5,0.14,21.36"/>
-		</g>
-		<g id="kvg:088c1-Kaisho-g3" kvg:element="戈" kvg:part="1">
-			<g id="kvg:088c1-Kaisho-g4" kvg:element="弋" kvg:part="1">
-				<path id="kvg:088c1-Kaisho-s3" kvg:type="㇐" d="M13.38,41.23c1.52,0.54,4.31,0.72,5.82,0.54C40,39.25,71,34.25,87.81,33.54c2.53-0.11,4.05,0.26,5.31,0.53"/>
+	<g id="kvg:088c1-Kaisho-g1" kvg:element="𢦏" kvg:position="kamae">
+		<g id="kvg:088c1-Kaisho-g2" kvg:element="土" kvg:part="1">
+			<g id="kvg:088c1-Kaisho-g3" kvg:element="十" kvg:radical="nelson">
+				<path id="kvg:088c1-Kaisho-s1" kvg:type="㇐" d="M23.13,25.88c0.98,0.26,2.78,0.32,3.76,0.26c6.86-0.38,15.86-2.25,22.3-2.83c1.62-0.14,2.62,0.12,3.43,0.26"/>
+				<path id="kvg:088c1-Kaisho-s2" kvg:type="㇑" d="M38.92,13.12c0.12,0.29,1.77,1.52,1.77,3.39c0,12,0.14,5.5,0.14,21.36"/>
+			</g>
+			<g id="kvg:088c1-Kaisho-g4" kvg:element="戈" kvg:part="1">
+				<g id="kvg:088c1-Kaisho-g5" kvg:element="弋" kvg:part="1">
+					<path id="kvg:088c1-Kaisho-s3" kvg:type="㇐" d="M13.38,41.23c1.52,0.54,4.31,0.72,5.82,0.54C40,39.25,71,34.25,87.81,33.54c2.53-0.11,4.05,0.26,5.31,0.53"/>
+				</g>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:088c1-Kaisho-g5" kvg:element="衣" kvg:radical="tradit">
-		<g id="kvg:088c1-Kaisho-g6" kvg:element="亠" kvg:position="top">
+	<g id="kvg:088c1-Kaisho-g6" kvg:element="衣" kvg:position="kamaec" kvg:radical="tradit">
+		<g id="kvg:088c1-Kaisho-g7" kvg:element="亠" kvg:position="top">
 			<path id="kvg:088c1-Kaisho-s4" kvg:type="㇑a" d="M37.28,44.25c2.33,1.05,5.66,5.15,6.15,7.16"/>
 			<path id="kvg:088c1-Kaisho-s5" kvg:type="㇐" d="M18.75,57.11c1.01,0.06,3.31,0.39,4.29,0.33C34,56.75,44.75,55.25,54.4,53.78c1.64-0.25,2.51-0.47,3.75-0.09"/>
 		</g>
-		<g id="kvg:088c1-Kaisho-g7" kvg:position="bottom">
+		<g id="kvg:088c1-Kaisho-g8" kvg:position="bottom">
 			<path id="kvg:088c1-Kaisho-s6" kvg:type="㇒" d="M37.02,57.82c0.07,0.59,0.27,1.58-0.13,2.38c-2.57,5.17-10.96,14.61-23.85,22.77"/>
 			<path id="kvg:088c1-Kaisho-s7" kvg:type="㇙" d="M29.41,73.13c0.31,0.33,0.64,0.66,0.64,1.24c-0.02,7.33-0.14,12.96-0.14,14.19c0,1.24,0.75,1.94,1.71,1.01c0.96-0.93,10.17-10.34,11.44-11.27"/>
 			<path id="kvg:088c1-Kaisho-s8" kvg:type="㇒" d="M56.18,59.96c0.02,0.21,0.21,1.01,0.09,1.29c-0.73,1.73-3.02,4.21-6.76,7.66"/>
 			<path id="kvg:088c1-Kaisho-s9" kvg:type="㇏" d="M42.12,65.56c6.88,4.19,12.63,9.69,18.21,18.18"/>
 		</g>
 	</g>
-	<g id="kvg:088c1-Kaisho-g8" kvg:element="戈" kvg:part="2">
-		<g id="kvg:088c1-Kaisho-g9" kvg:element="弋" kvg:part="2">
-			<path id="kvg:088c1-Kaisho-s10" kvg:type="㇂" d="M55.75,10c1.56,1.84,2.68,2.35,3.03,6.31C61.5,47,72.25,81.5,89.67,94.17c5.89,4.28,5.26,0.79,4.48-7.36"/>
-		</g>
-		<g id="kvg:088c1-Kaisho-g10" kvg:element="丿">
-			<path id="kvg:088c1-Kaisho-s11" kvg:type="㇒" d="M82.72,44.39c0.08,1.25,0.27,3.24-0.17,5.01c-2.81,11.35-12.01,34.39-27.75,48.57"/>
-		</g>
-		<g id="kvg:088c1-Kaisho-g11" kvg:element="弋" kvg:part="3">
-			<g id="kvg:088c1-Kaisho-g12" kvg:element="丶">
-				<path id="kvg:088c1-Kaisho-s12" kvg:type="㇔" d="M73.75,14.75c3.18,1.85,8.27,6.08,9.75,9.25"/>
+	<g id="kvg:088c1-Kaisho-g9" kvg:element="𢦏" kvg:position="kamae">
+		<g id="kvg:088c1-Kaisho-g10" kvg:element="戈" kvg:part="2">
+			<g id="kvg:088c1-Kaisho-g11" kvg:element="弋" kvg:part="2">
+				<path id="kvg:088c1-Kaisho-s10" kvg:type="㇂" d="M55.75,10c1.56,1.84,2.68,2.35,3.03,6.31C61.5,47,72.25,81.5,89.67,94.17c5.89,4.28,5.26,0.79,4.48-7.36"/>
+			</g>
+			<g id="kvg:088c1-Kaisho-g12" kvg:element="丿">
+				<path id="kvg:088c1-Kaisho-s11" kvg:type="㇒" d="M82.72,44.39c0.08,1.25,0.27,3.24-0.17,5.01c-2.81,11.35-12.01,34.39-27.75,48.57"/>
+			</g>
+			<g id="kvg:088c1-Kaisho-g13" kvg:element="弋" kvg:part="3">
+				<g id="kvg:088c1-Kaisho-g14" kvg:element="丶">
+					<path id="kvg:088c1-Kaisho-s12" kvg:type="㇔" d="M73.75,14.75c3.18,1.85,8.27,6.08,9.75,9.25"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/088c1.svg b/kanji/088c1.svg
index ef1333377..17db435b9 100644
--- a/kanji/088c1.svg
+++ b/kanji/088c1.svg
@@ -37,39 +37,43 @@ 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_088c1" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:088c1" kvg:element="裁">
-	<g id="kvg:088c1-g1" kvg:element="土" kvg:part="1" kvg:phon="土戈1">
-		<g id="kvg:088c1-g2" kvg:element="十" kvg:radical="nelson">
-			<path id="kvg:088c1-s1" kvg:type="㇐" d="M23.63,25.63c1.68,0.45,3.54,0.3,5.24,0.16c6.57-0.5,14.34-1.94,20.32-2.48c1.62-0.14,2.87-0.12,3.68,0.01"/>
-			<path id="kvg:088c1-s2" kvg:type="㇑a" d="M39.42,12.87c0.67,0.67,1.27,2.13,1.27,3.64c0,3.5,0.14,16.5,0.14,21.36"/>
-		</g>
-		<g id="kvg:088c1-g3" kvg:element="戈" kvg:part="1">
-			<g id="kvg:088c1-g4" kvg:element="弋" kvg:part="1">
-				<path id="kvg:088c1-s3" kvg:type="㇐" d="M13.13,40.73c3.12,1.11,7.15,0.64,10.37,0.23c19.02-2.41,44.54-6.14,60.62-7.21c3.07-0.2,5.99-0.32,9.01,0.33"/>
+	<g id="kvg:088c1-g1" kvg:element="𢦏" kvg:position="kamae">
+		<g id="kvg:088c1-g2" kvg:element="土" kvg:part="1" kvg:phon="土戈1">
+			<g id="kvg:088c1-g3" kvg:element="十" kvg:radical="nelson">
+				<path id="kvg:088c1-s1" kvg:type="㇐" d="M23.63,25.63c1.68,0.45,3.54,0.3,5.24,0.16c6.57-0.5,14.34-1.94,20.32-2.48c1.62-0.14,2.87-0.12,3.68,0.01"/>
+				<path id="kvg:088c1-s2" kvg:type="㇑a" d="M39.42,12.87c0.67,0.67,1.27,2.13,1.27,3.64c0,3.5,0.14,16.5,0.14,21.36"/>
+			</g>
+			<g id="kvg:088c1-g4" kvg:element="戈" kvg:part="1">
+				<g id="kvg:088c1-g5" kvg:element="弋" kvg:part="1">
+					<path id="kvg:088c1-s3" kvg:type="㇐" d="M13.13,40.73c3.12,1.11,7.15,0.64,10.37,0.23c19.02-2.41,44.54-6.14,60.62-7.21c3.07-0.2,5.99-0.32,9.01,0.33"/>
+				</g>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:088c1-g5" kvg:element="衣" kvg:radical="tradit">
-		<g id="kvg:088c1-g6" kvg:element="亠" kvg:position="top">
+	<g id="kvg:088c1-g6" kvg:element="衣" kvg:position="kamaec" kvg:radical="tradit">
+		<g id="kvg:088c1-g7" kvg:element="亠" kvg:position="top">
 			<path id="kvg:088c1-s4" kvg:type="㇑a" d="M39.85,44.5c0.7,0.7,1.22,2.12,1.22,3.58c0,2.76-0.11,3.67-0.11,6.28"/>
 			<path id="kvg:088c1-s5" kvg:type="㇐" d="M19,56.97c2.31,0.14,4.56,0.32,6.89,0.1c9.99-0.95,18.74-2.32,27.37-3.39c1.66-0.2,3.27-0.4,4.9,0.1"/>
 		</g>
-		<g id="kvg:088c1-g7" kvg:position="bottom">
+		<g id="kvg:088c1-g8" kvg:position="bottom">
 			<path id="kvg:088c1-s6" kvg:type="㇒" d="M36.77,58.82c0.07,0.59,0.16,1.67-0.38,2.38C32,67,26.5,73.38,13.29,82.97"/>
 			<path id="kvg:088c1-s7" kvg:type="㇙" d="M28.91,73.38c0.79,0.79,1.14,1.87,1.14,3.24c0,3.25-0.14,7.38-0.14,11.19c0,1.24,1.23,1.92,2.21,1.01c3.38-3.08,7.25-7.58,10.94-10.52"/>
 			<path id="kvg:088c1-s8" kvg:type="㇒" d="M56.18,59.96c0.02,0.21,0.21,1.01,0.09,1.29c-0.73,1.73-3.02,4.21-6.76,7.66"/>
 			<path id="kvg:088c1-s9" kvg:type="㇔/㇏" d="M42.12,65.56c6.88,4.19,12.63,9.69,18.21,18.18"/>
 		</g>
 	</g>
-	<g id="kvg:088c1-g8" kvg:element="戈" kvg:part="2" kvg:phon="土戈2">
-		<g id="kvg:088c1-g9" kvg:element="弋" kvg:part="2">
-			<path id="kvg:088c1-s10" kvg:type="㇂" d="M56.75,9.5c1.56,1.84,2.23,3.35,2.53,7.31c2.59,33.44,11.84,61.69,30.64,77.86c5.52,4.75,5.01,0.29,4.23-7.86"/>
-		</g>
-		<g id="kvg:088c1-g10" kvg:element="丿">
-			<path id="kvg:088c1-s11" kvg:type="㇒" d="M82.97,44.64c0.4,1.48,0.33,3-0.17,4.76c-3.43,12.1-12.26,34.39-28,48.57"/>
-		</g>
-		<g id="kvg:088c1-g11" kvg:element="弋" kvg:part="3">
-			<g id="kvg:088c1-g12" kvg:element="丶">
-				<path id="kvg:088c1-s12" kvg:type="㇔" d="M74.25,15c3.18,1.85,8.27,6.08,9.75,9.25"/>
+	<g id="kvg:088c1-g9" kvg:element="𢦏" kvg:position="kamae">
+		<g id="kvg:088c1-g10" kvg:element="戈" kvg:part="2" kvg:phon="土戈2">
+			<g id="kvg:088c1-g11" kvg:element="弋" kvg:part="2">
+				<path id="kvg:088c1-s10" kvg:type="㇂" d="M56.75,9.5c1.56,1.84,2.23,3.35,2.53,7.31c2.59,33.44,11.84,61.69,30.64,77.86c5.52,4.75,5.01,0.29,4.23-7.86"/>
+			</g>
+			<g id="kvg:088c1-g12" kvg:element="丿">
+				<path id="kvg:088c1-s11" kvg:type="㇒" d="M82.97,44.64c0.4,1.48,0.33,3-0.17,4.76c-3.43,12.1-12.26,34.39-28,48.57"/>
+			</g>
+			<g id="kvg:088c1-g13" kvg:element="弋" kvg:part="3">
+				<g id="kvg:088c1-g14" kvg:element="丶">
+					<path id="kvg:088c1-s12" kvg:type="㇔" d="M74.25,15c3.18,1.85,8.27,6.08,9.75,9.25"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/08cb3-Kaisho.svg b/kanji/08cb3-Kaisho.svg
index 4d08623a1..ebf412745 100644
--- a/kanji/08cb3-Kaisho.svg
+++ b/kanji/08cb3-Kaisho.svg
@@ -37,7 +37,7 @@ 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_08cb3-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08cb3-Kaisho" kvg:element="貳">
-	<g id="kvg:08cb3-Kaisho-g1" kvg:element="弍" kvg:part="1">
+	<g id="kvg:08cb3-Kaisho-g1" kvg:element="弍" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:08cb3-Kaisho-g2" kvg:element="弋" kvg:part="1" kvg:radical="nelson">
 			<path id="kvg:08cb3-Kaisho-s1" kvg:type="㇐" d="M12.75,32.2c1.52,0.54,4.31,0.69,5.82,0.54C29,31.75,69,27.75,82.69,26.51c2.52-0.23,4.05,0.26,5.31,0.53"/>
 		</g>
@@ -46,7 +46,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08cb3-Kaisho-s3" kvg:type="㇐" d="M20.5,49.18c1.16,0.29,3.3,0.28,4.46,0.29c6.79,0.04,17.54-1.96,25.47-2.79c1.93-0.2,3.1,0.14,4.07,0.28"/>
 		</g>
 	</g>
-	<g id="kvg:08cb3-Kaisho-g4" kvg:element="貝" kvg:radical="tradit">
+	<g id="kvg:08cb3-Kaisho-g4" kvg:element="貝" kvg:position="kamaec" kvg:radical="tradit">
 		<g id="kvg:08cb3-Kaisho-g5" kvg:element="目" kvg:position="top">
 			<path id="kvg:08cb3-Kaisho-s4" kvg:type="㇑" d="M23.11,57.74c0.45,0.88,1.1,1.53,1.1,2.7c0,1.17,0.21,19.71-0.33,24.61"/>
 			<path id="kvg:08cb3-Kaisho-s5" kvg:type="㇕a" d="M24.96,58.76c2.53-0.15,21.79-2.02,24.1-2.19c1.92-0.15,2.95,0.81,2.95,1.9c0,2.67-0.57,24.79-0.57,25.67"/>
diff --git a/kanji/08cb3.svg b/kanji/08cb3.svg
index 3cf9399d1..1329f385c 100644
--- a/kanji/08cb3.svg
+++ b/kanji/08cb3.svg
@@ -37,7 +37,7 @@ 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_08cb3" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08cb3" kvg:element="貳">
-	<g id="kvg:08cb3-g1" kvg:element="弍" kvg:part="1">
+	<g id="kvg:08cb3-g1" kvg:element="弍" kvg:part="1" kvg:position="kamae">
 		<g id="kvg:08cb3-g2" kvg:element="弋" kvg:part="1" kvg:radical="nelson">
 			<path id="kvg:08cb3-s1" kvg:type="㇐" d="M12.75,32.2c1.52,0.54,4.31,0.69,5.82,0.54C29,31.75,69,27.75,82.69,26.51c2.52-0.23,4.05,0.26,5.31,0.53"/>
 		</g>
@@ -46,7 +46,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08cb3-s3" kvg:type="㇐" d="M20.5,49.18c1.16,0.29,3.3,0.28,4.46,0.29c6.79,0.04,17.54-1.96,25.47-2.79c1.93-0.2,3.1,0.14,4.07,0.28"/>
 		</g>
 	</g>
-	<g id="kvg:08cb3-g4" kvg:element="貝" kvg:radical="tradit">
+	<g id="kvg:08cb3-g4" kvg:element="貝" kvg:position="kamaec" kvg:radical="tradit">
 		<g id="kvg:08cb3-g5" kvg:element="目" kvg:position="top">
 			<path id="kvg:08cb3-s4" kvg:type="㇑" d="M23.11,57.74c0.45,0.88,1.1,1.53,1.1,2.7c0,1.17,0.21,19.71-0.33,24.61"/>
 			<path id="kvg:08cb3-s5" kvg:type="㇕a" d="M24.96,58.76c2.53-0.15,21.79-2.02,24.1-2.19c1.92-0.15,2.95,0.81,2.95,1.9c0,2.67-0.57,24.79-0.57,25.67"/>