diff --git a/kanji/0621a-HzFst.svg b/kanji/0621a-HzFst.svg
index 5038bd934..6c6ad743d 100644
--- a/kanji/0621a-HzFst.svg
+++ b/kanji/0621a-HzFst.svg
@@ -37,38 +37,44 @@ 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_0621a-HzFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0621a-HzFst" kvg:element="戚">
-	<g id="kvg:0621a-HzFst-g1" kvg:element="厂">
-		<path id="kvg:0621a-HzFst-s1" kvg:type="㇒" d="M25.51,33.39c0.05,1.46-0.05,3.76-0.09,5.86c-0.39,19.61-5.16,47.84-15.36,56.96"/>
-		<g id="kvg:0621a-HzFst-g2" kvg:element="戈" kvg:part="1" kvg:radical="general">
-			<g id="kvg:0621a-HzFst-g3" kvg:element="弋" kvg:part="1">
-				<path id="kvg:0621a-HzFst-s2" kvg:type="㇐" d="M21.25,32.2c1.52,0.54,4.31,0.69,5.82,0.54C37.25,31.75,63.5,28,79.69,27.51c2.53-0.08,4.05,0.26,5.31,0.53"/>
+	<g id="kvg:0621a-HzFst-g1" kvg:element="戊" kvg:part="1" kvg:position="⿵A">
+		<g id="kvg:0621a-HzFst-g2" kvg:element="厂">
+			<path id="kvg:0621a-HzFst-s1" kvg:type="㇒" d="M25.51,33.39c0.05,1.46-0.05,3.76-0.09,5.86c-0.39,19.61-5.16,47.84-15.36,56.96"/>
+			<g id="kvg:0621a-HzFst-g3" kvg:element="戈" kvg:part="1" kvg:radical="general">
+				<g id="kvg:0621a-HzFst-g4" kvg:element="弋" kvg:part="1">
+					<path id="kvg:0621a-HzFst-s2" kvg:type="㇐" d="M21.25,32.2c1.52,0.54,4.31,0.69,5.82,0.54C37.25,31.75,63.5,28,79.69,27.51c2.53-0.08,4.05,0.26,5.31,0.53"/>
+				</g>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:0621a-HzFst-g4" kvg:element="上">
-		<g id="kvg:0621a-HzFst-g5" kvg:element="卜" kvg:original="ト">
-			<path id="kvg:0621a-HzFst-s3" kvg:type="㇐/㇔" d="M43.66,47.45c1.6-0.12,8.88-1.41,9.75-1.41c0.87,0,2.05,0,2.77,0.12"/>
-			<path id="kvg:0621a-HzFst-s4" kvg:type="㇑" d="M41.5,38.13c0.57,0.3,1.78,2.22,1.89,2.81c0.11,0.59-0.07,14.12-0.19,17.82"/>
+	<g id="kvg:0621a-HzFst-g5" kvg:element="尗" kvg:position="⿵B">
+		<g id="kvg:0621a-HzFst-g6" kvg:element="上">
+			<g id="kvg:0621a-HzFst-g7" kvg:element="卜" kvg:original="ト">
+				<path id="kvg:0621a-HzFst-s3" kvg:type="㇐/㇔" d="M43.66,47.45c1.6-0.12,8.88-1.41,9.75-1.41c0.87,0,2.05,0,2.77,0.12"/>
+				<path id="kvg:0621a-HzFst-s4" kvg:type="㇑" d="M41.5,38.13c0.57,0.3,1.78,2.22,1.89,2.81c0.11,0.59-0.07,14.12-0.19,17.82"/>
+			</g>
+			<g id="kvg:0621a-HzFst-g8" kvg:element="一">
+				<path id="kvg:0621a-HzFst-s5" kvg:type="㇐" d="M27.9,59c0.52,0.16,2.46,0.68,2.98,0.66c4.63-0.16,16.63-1.41,25.18-1.92c0.86-0.05,2.7,0,3.8,0.66"/>
+			</g>
 		</g>
-		<g id="kvg:0621a-HzFst-g6" kvg:element="一">
-			<path id="kvg:0621a-HzFst-s5" kvg:type="㇐" d="M27.9,59c0.52,0.16,2.46,0.68,2.98,0.66c4.63-0.16,16.63-1.41,25.18-1.92c0.86-0.05,2.7,0,3.8,0.66"/>
+		<g id="kvg:0621a-HzFst-g9" kvg:element="小">
+			<path id="kvg:0621a-HzFst-s6" kvg:type="㇚" d="M43,61.87c0.06,0.31,0.76,1.61,0.81,3.56c0.26,9.39-0.17,20.77-0.17,23.97c0,7.26-4.65,0.97-5.62,0.16"/>
+			<path id="kvg:0621a-HzFst-s7" kvg:type="㇒" d="M34.33,71.46c0.03,0.41,0.07,1.07-0.07,1.66c-0.8,3.51-5.42,11.21-11.74,15.93"/>
+			<path id="kvg:0621a-HzFst-s8" kvg:type="㇔" d="M49.95,68.83c2.3,2.23,5.96,9.19,6.53,12.66"/>
 		</g>
 	</g>
-	<g id="kvg:0621a-HzFst-g7" kvg:element="小">
-		<path id="kvg:0621a-HzFst-s6" kvg:type="㇚" d="M43,61.87c0.06,0.31,0.76,1.61,0.81,3.56c0.26,9.39-0.17,20.77-0.17,23.97c0,7.26-4.65,0.97-5.62,0.16"/>
-		<path id="kvg:0621a-HzFst-s7" kvg:type="㇒" d="M34.33,71.46c0.03,0.41,0.07,1.07-0.07,1.66c-0.8,3.51-5.42,11.21-11.74,15.93"/>
-		<path id="kvg:0621a-HzFst-s8" kvg:type="㇔" d="M49.95,68.83c2.3,2.23,5.96,9.19,6.53,12.66"/>
-	</g>
-	<g id="kvg:0621a-HzFst-g8" kvg:element="戈" kvg:part="2" kvg:radical="general">
-		<g id="kvg:0621a-HzFst-g9" kvg:element="弋" kvg:part="2">
-			<path id="kvg:0621a-HzFst-s9" kvg:type="㇂" d="M57.75,13c1.5,1.78,2.2,2.26,2.45,6.09c1.93,29.96,11.77,62.62,29.49,74.47c5.85,3.92,5,1.41,4.25-6.46"/>
-		</g>
-		<g id="kvg:0621a-HzFst-g10" kvg:element="丿">
-			<path id="kvg:0621a-HzFst-s10" kvg:type="㇒" d="M81.47,44.64c0.09,1.13,0.37,2.97-0.17,4.54c-4.63,13.45-13.05,32.06-30.49,44.78"/>
-		</g>
-		<g id="kvg:0621a-HzFst-g11" kvg:element="弋" kvg:part="3">
-			<g id="kvg:0621a-HzFst-g12" kvg:element="丶">
-				<path id="kvg:0621a-HzFst-s11" kvg:type="㇔" d="M73.5,13.25c3.18,1.45,8.27,4.76,9.75,7.25"/>
+	<g id="kvg:0621a-HzFst-g10" kvg:element="戊" kvg:part="2" kvg:position="⿵A">
+		<g id="kvg:0621a-HzFst-g11" kvg:element="戈" kvg:part="2" kvg:radical="general">
+			<g id="kvg:0621a-HzFst-g12" kvg:element="弋" kvg:part="2">
+				<path id="kvg:0621a-HzFst-s9" kvg:type="㇂" d="M57.75,13c1.5,1.78,2.2,2.26,2.45,6.09c1.93,29.96,11.77,62.62,29.49,74.47c5.85,3.92,5,1.41,4.25-6.46"/>
+			</g>
+			<g id="kvg:0621a-HzFst-g13" kvg:element="丿">
+				<path id="kvg:0621a-HzFst-s10" kvg:type="㇒" d="M81.47,44.64c0.09,1.13,0.37,2.97-0.17,4.54c-4.63,13.45-13.05,32.06-30.49,44.78"/>
+			</g>
+			<g id="kvg:0621a-HzFst-g14" kvg:element="弋" kvg:part="3">
+				<g id="kvg:0621a-HzFst-g15" kvg:element="丶">
+					<path id="kvg:0621a-HzFst-s11" kvg:type="㇔" d="M73.5,13.25c3.18,1.45,8.27,4.76,9.75,7.25"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/0621a.svg b/kanji/0621a.svg
index 35dc54e14..4673ed608 100644
--- a/kanji/0621a.svg
+++ b/kanji/0621a.svg
@@ -37,38 +37,44 @@ 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_0621a" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0621a" kvg:element="戚">
-	<g id="kvg:0621a-g1" kvg:element="厂">
-		<path id="kvg:0621a-s1" kvg:type="㇒" d="M24.26,33.64c0.86,0.86,1.2,2.23,1.16,3.61C24.62,62.62,21,84,10.06,96.22"/>
-		<g id="kvg:0621a-g2" kvg:element="戈" kvg:part="1" kvg:radical="general">
-			<g id="kvg:0621a-g3" kvg:element="弋" kvg:part="1">
-				<path id="kvg:0621a-s2" kvg:type="㇐" d="M21.25,32.2c3.68,0.73,7.35,0.73,11.02-0.03c10.93-1.27,29.19-3.67,42.86-4.46c3.38-0.36,6.76-0.25,10.12,0.33"/>
+	<g id="kvg:0621a-g1" kvg:element="戊" kvg:part="1" kvg:position="⿵A">
+		<g id="kvg:0621a-g2" kvg:element="厂">
+			<path id="kvg:0621a-s1" kvg:type="㇒" d="M24.26,33.64c0.86,0.86,1.2,2.23,1.16,3.61C24.62,62.62,21,84,10.06,96.22"/>
+			<g id="kvg:0621a-g3" kvg:element="戈" kvg:part="1" kvg:radical="general">
+				<g id="kvg:0621a-g4" kvg:element="弋" kvg:part="1">
+					<path id="kvg:0621a-s2" kvg:type="㇐" d="M21.25,32.2c3.68,0.73,7.35,0.73,11.02-0.03c10.93-1.27,29.19-3.67,42.86-4.46c3.38-0.36,6.76-0.25,10.12,0.33"/>
+				</g>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:0621a-g4" kvg:element="上">
-		<g id="kvg:0621a-g5" kvg:element="卜" kvg:original="ト">
-			<path id="kvg:0621a-s3" kvg:type="㇑" d="M42,38.13c0.94,0.94,1.14,2.37,1.14,3.31c0,0.6,0.06,12.31,0.06,16.32"/>
-			<path id="kvg:0621a-s4" kvg:type="㇔" d="M44.16,47.45c1.42-0.1,7.27-0.93,9.21-1.12c1.1-0.1,2.2-0.07,3.31,0.08"/>
+	<g id="kvg:0621a-g5" kvg:element="尗" kvg:position="⿵B">
+		<g id="kvg:0621a-g6" kvg:element="上">
+			<g id="kvg:0621a-g7" kvg:element="卜" kvg:original="ト">
+				<path id="kvg:0621a-s3" kvg:type="㇑" d="M42,38.13c0.94,0.94,1.14,2.37,1.14,3.31c0,0.6,0.06,12.31,0.06,16.32"/>
+				<path id="kvg:0621a-s4" kvg:type="㇔" d="M44.16,47.45c1.42-0.1,7.27-0.93,9.21-1.12c1.1-0.1,2.2-0.07,3.31,0.08"/>
+			</g>
+			<g id="kvg:0621a-g8" kvg:element="一">
+				<path id="kvg:0621a-s5" kvg:type="㇐" d="M27.9,59c1.86,0.6,3.77,0.86,5.73,0.76c4.96-0.34,13-1.31,19.75-1.83c2.17-0.3,4.33-0.23,6.48,0.22"/>
+			</g>
 		</g>
-		<g id="kvg:0621a-g6" kvg:element="一">
-			<path id="kvg:0621a-s5" kvg:type="㇐" d="M27.9,59c1.86,0.6,3.77,0.86,5.73,0.76c4.96-0.34,13-1.31,19.75-1.83c2.17-0.3,4.33-0.23,6.48,0.22"/>
+		<g id="kvg:0621a-g9" kvg:element="小">
+			<path id="kvg:0621a-s6" kvg:type="㇚" d="M42.75,61.62c0.81,0.82,1.06,2.26,1.06,3.56c0,9.4-0.06,21.62-0.06,24.82c0,7.26-4.75,0.37-5.72-0.44"/>
+			<path id="kvg:0621a-s7" kvg:type="㇒" d="M34.33,71.46c0.1,1.04-0.02,2.06-0.48,3C31.62,79,28.5,84.25,22.52,89.3"/>
+			<path id="kvg:0621a-s8" kvg:type="㇔" d="M49.95,68.83c2.3,2.23,5.71,9.19,6.28,12.66"/>
 		</g>
 	</g>
-	<g id="kvg:0621a-g7" kvg:element="小">
-		<path id="kvg:0621a-s6" kvg:type="㇚" d="M42.75,61.62c0.81,0.82,1.06,2.26,1.06,3.56c0,9.4-0.06,21.62-0.06,24.82c0,7.26-4.75,0.37-5.72-0.44"/>
-		<path id="kvg:0621a-s7" kvg:type="㇒" d="M34.33,71.46c0.1,1.04-0.02,2.06-0.48,3C31.62,79,28.5,84.25,22.52,89.3"/>
-		<path id="kvg:0621a-s8" kvg:type="㇔" d="M49.95,68.83c2.3,2.23,5.71,9.19,6.28,12.66"/>
-	</g>
-	<g id="kvg:0621a-g8" kvg:element="戈" kvg:part="2" kvg:radical="general">
-		<g id="kvg:0621a-g9" kvg:element="弋" kvg:part="2">
-			<path id="kvg:0621a-s9" kvg:type="㇂" d="M58.25,13.25c1.12,1.12,1.7,3,1.95,6.09c2.3,28.53,11.05,57.91,26.99,70.62c8.22,6.56,7.32,3.66,6.75-3.11"/>
-		</g>
-		<g id="kvg:0621a-g10" kvg:element="丿">
-			<path id="kvg:0621a-s10" kvg:type="㇒" d="M82.47,45.39c0.09,1.13-0.35,2.48-0.92,4.04c-5.8,15.69-16.17,35.06-30.74,44.53"/>
-		</g>
-		<g id="kvg:0621a-g11" kvg:element="弋" kvg:part="3">
-			<g id="kvg:0621a-g12" kvg:element="丶">
-				<path id="kvg:0621a-s11" kvg:type="㇔" d="M73.5,13.25c3.18,1.45,8.27,5.01,9.75,7.5"/>
+	<g id="kvg:0621a-g10" kvg:element="戊" kvg:part="2" kvg:position="⿵A">
+		<g id="kvg:0621a-g11" kvg:element="戈" kvg:part="2" kvg:radical="general">
+			<g id="kvg:0621a-g12" kvg:element="弋" kvg:part="2">
+				<path id="kvg:0621a-s9" kvg:type="㇂" d="M58.25,13.25c1.12,1.12,1.7,3,1.95,6.09c2.3,28.53,11.05,57.91,26.99,70.62c8.22,6.56,7.32,3.66,6.75-3.11"/>
+			</g>
+			<g id="kvg:0621a-g13" kvg:element="丿">
+				<path id="kvg:0621a-s10" kvg:type="㇒" d="M82.47,45.39c0.09,1.13-0.35,2.48-0.92,4.04c-5.8,15.69-16.17,35.06-30.74,44.53"/>
+			</g>
+			<g id="kvg:0621a-g14" kvg:element="弋" kvg:part="3">
+				<g id="kvg:0621a-g15" kvg:element="丶">
+					<path id="kvg:0621a-s11" kvg:type="㇔" d="M73.5,13.25c3.18,1.45,8.27,5.01,9.75,7.5"/>
+				</g>
 			</g>
 		</g>
 	</g>