diff --git a/kanji/06efe-Kaisho.svg b/kanji/06efe-Kaisho.svg
index 5530c4655..3a04e15ea 100644
--- a/kanji/06efe-Kaisho.svg
+++ b/kanji/06efe-Kaisho.svg
@@ -44,32 +44,30 @@ kvg:type CDATA #IMPLIED >
 	</g>
 	<g id="kvg:06efe-Kaisho-g2" kvg:element="袞" kvg:position="right">
 		<g id="kvg:06efe-Kaisho-g3" kvg:element="哀" kvg:part="1" kvg:position="top">
-			<g id="kvg:06efe-Kaisho-g4" kvg:element="裏">
-				<g id="kvg:06efe-Kaisho-g5" kvg:element="衣" kvg:part="1">
-					<g id="kvg:06efe-Kaisho-g6" kvg:element="亠">
-						<path id="kvg:06efe-Kaisho-s4" kvg:type="㇑a" d="M61.43,10.85c2.23,1.9,4.37,4.9,5.41,7.87"/>
-						<path id="kvg:06efe-Kaisho-s5" kvg:type="㇐" d="M40.11,24.74c1.29,0.12,4.22,0.8,5.47,0.63c10.1-1.33,29.57-2.64,43.29-2.98c2.12-0.05,3.2,0.05,4.78,0.81"/>
-					</g>
+			<g id="kvg:06efe-Kaisho-g4" kvg:element="衣" kvg:part="1">
+				<g id="kvg:06efe-Kaisho-g5" kvg:element="亠">
+					<path id="kvg:06efe-Kaisho-s4" kvg:type="㇑a" d="M61.43,10.85c2.23,1.9,4.37,4.9,5.41,7.87"/>
+					<path id="kvg:06efe-Kaisho-s5" kvg:type="㇐" d="M40.11,24.74c1.29,0.12,4.22,0.8,5.47,0.63c10.1-1.33,29.57-2.64,43.29-2.98c2.12-0.05,3.2,0.05,4.78,0.81"/>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:06efe-Kaisho-g7" kvg:position="bottom">
-			<g id="kvg:06efe-Kaisho-g8" kvg:element="八">
-				<g id="kvg:06efe-Kaisho-g9" kvg:position="left">
+		<g id="kvg:06efe-Kaisho-g6" kvg:position="bottom">
+			<g id="kvg:06efe-Kaisho-g7" kvg:element="八">
+				<g id="kvg:06efe-Kaisho-g8" kvg:position="left">
 					<path id="kvg:06efe-Kaisho-s6" kvg:type="㇒" d="M54.69,29.39c0.04,0.32,0.09,0.83-0.08,1.28c-1,2.71-6.74,8.65-14.6,12.29"/>
 				</g>
-				<g id="kvg:06efe-Kaisho-g10" kvg:position="right">
+				<g id="kvg:06efe-Kaisho-g9" kvg:position="right">
 					<path id="kvg:06efe-Kaisho-s7" kvg:type="㇏" d="M74.44,28.33c6.26,2.19,16.17,8.98,17.74,12.38"/>
 				</g>
 			</g>
-			<g id="kvg:06efe-Kaisho-g11" kvg:element="哀" kvg:part="2">
-				<g id="kvg:06efe-Kaisho-g12" kvg:element="口">
+			<g id="kvg:06efe-Kaisho-g10" kvg:element="哀" kvg:part="2">
+				<g id="kvg:06efe-Kaisho-g11" kvg:element="口">
 					<path id="kvg:06efe-Kaisho-s8" kvg:type="㇑" d="M49.74,42.47c0.32,0.29,0.66,0.54,0.8,0.91c1.13,2.91,2.06,10.37,2.83,15.59"/>
 					<path id="kvg:06efe-Kaisho-s9" kvg:type="㇕b" d="M51.76,43.46c7.95-1.22,22.95-2.79,27.05-3.2c1.5-0.15,2.9,2.02,2.68,2.9c-0.89,3.66-1.57,5.54-3.05,11.67"/>
 					<path id="kvg:06efe-Kaisho-s10" kvg:type="㇐b" d="M54.1,57.11c4.81-0.46,20.1-1.35,26.21-1.82"/>
 				</g>
 			</g>
-			<g id="kvg:06efe-Kaisho-g13" kvg:element="衣" kvg:part="2">
+			<g id="kvg:06efe-Kaisho-g12" kvg:element="衣" kvg:part="2">
 				<path id="kvg:06efe-Kaisho-s11" kvg:type="㇒" d="M62.53,58.41c0.08,0.56-0.08,2.08-0.65,2.75C57.75,66,50,75,35.56,82.17"/>
 				<path id="kvg:06efe-Kaisho-s12" kvg:type="㇙" d="M53.12,74.75c0.38,0.46,0.79,0.9,0.78,1.7c-0.02,10.04-0.75,15.88-0.75,17.58c0,1.7,1.93,2.17,3.1,0.89c1.18-1.27,13.26-10.07,14.83-11.34"/>
 				<path id="kvg:06efe-Kaisho-s13" kvg:type="㇒" d="M85.2,62.39c0.03,0.27,0.3,1.3,0.13,1.65c-1.05,2.22-4.34,5.4-9.69,9.82"/>
diff --git a/kanji/06efe.svg b/kanji/06efe.svg
index 68702cfd7..8c0183367 100644
--- a/kanji/06efe.svg
+++ b/kanji/06efe.svg
@@ -44,32 +44,30 @@ kvg:type CDATA #IMPLIED >
 	</g>
 	<g id="kvg:06efe-g2" kvg:element="袞" kvg:position="right">
 		<g id="kvg:06efe-g3" kvg:element="哀" kvg:part="1" kvg:position="top">
-			<g id="kvg:06efe-g4" kvg:element="裏">
-				<g id="kvg:06efe-g5" kvg:element="衣" kvg:part="1">
-					<g id="kvg:06efe-g6" kvg:element="亠">
-						<path id="kvg:06efe-s4" kvg:type="㇑a" d="M63.14,11.35c0.83,0.57,2.21,2.79,2.21,3.93c0,4.21-0.26,4.42-0.11,7.98"/>
-						<path id="kvg:06efe-s5" kvg:type="㇐" d="M40.11,24.74c1.29,0.12,4.22,0.8,5.47,0.63c10.1-1.33,29.57-2.64,43.29-2.98c2.12-0.05,3.2,0.05,4.78,0.81"/>
-					</g>
+			<g id="kvg:06efe-g4" kvg:element="衣" kvg:part="1">
+				<g id="kvg:06efe-g5" kvg:element="亠">
+					<path id="kvg:06efe-s4" kvg:type="㇑a" d="M63.14,11.35c0.83,0.57,2.21,2.79,2.21,3.93c0,4.21-0.26,4.42-0.11,7.98"/>
+					<path id="kvg:06efe-s5" kvg:type="㇐" d="M40.11,24.74c1.29,0.12,4.22,0.8,5.47,0.63c10.1-1.33,29.57-2.64,43.29-2.98c2.12-0.05,3.2,0.05,4.78,0.81"/>
 				</g>
 			</g>
 		</g>
-		<g id="kvg:06efe-g7" kvg:position="bottom">
-			<g id="kvg:06efe-g8" kvg:element="八">
-				<g id="kvg:06efe-g9" kvg:position="left">
+		<g id="kvg:06efe-g6" kvg:position="bottom">
+			<g id="kvg:06efe-g7" kvg:element="八">
+				<g id="kvg:06efe-g8" kvg:position="left">
 					<path id="kvg:06efe-s6" kvg:type="㇒" d="M54.69,29.39c0.04,0.32,0.09,0.83-0.08,1.28c-1,2.71-6.74,8.65-14.6,12.29"/>
 				</g>
-				<g id="kvg:06efe-g10" kvg:position="right">
+				<g id="kvg:06efe-g9" kvg:position="right">
 					<path id="kvg:06efe-s7" kvg:type="㇏" d="M74.44,28.33c6.26,2.19,16.17,8.98,17.74,12.38"/>
 				</g>
 			</g>
-			<g id="kvg:06efe-g11" kvg:element="哀" kvg:part="2">
-				<g id="kvg:06efe-g12" kvg:element="口">
+			<g id="kvg:06efe-g10" kvg:element="哀" kvg:part="2">
+				<g id="kvg:06efe-g11" kvg:element="口">
 					<path id="kvg:06efe-s8" kvg:type="㇑" d="M49.74,42.47c0.32,0.29,0.66,0.54,0.8,0.91c1.13,2.91,2.06,10.37,2.83,15.59"/>
 					<path id="kvg:06efe-s9" kvg:type="㇕b" d="M51.76,43.46c7.95-1.22,22.95-2.79,27.05-3.2c1.5-0.15,2.9,2.02,2.68,2.9c-0.89,3.66-1.57,5.54-3.05,11.67"/>
 					<path id="kvg:06efe-s10" kvg:type="㇐b" d="M54.1,57.11c4.81-0.46,20.1-1.35,26.21-1.82"/>
 				</g>
 			</g>
-			<g id="kvg:06efe-g13" kvg:element="衣" kvg:part="2">
+			<g id="kvg:06efe-g12" kvg:element="衣" kvg:part="2">
 				<path id="kvg:06efe-s11" kvg:type="㇒" d="M62.53,58.41c0.08,0.56-0.08,2.08-0.65,2.75C57.75,66,50,75,35.56,82.17"/>
 				<path id="kvg:06efe-s12" kvg:type="㇙" d="M53.12,74.75c0.38,0.46,0.79,0.9,0.78,1.7c-0.02,10.04-0.75,15.88-0.75,17.58c0,1.7,1.93,2.17,3.1,0.89c1.18-1.27,13.26-10.07,14.83-11.34"/>
 				<path id="kvg:06efe-s13" kvg:type="㇒" d="M85.2,62.39c0.03,0.27,0.3,1.3,0.13,1.65c-1.05,2.22-4.34,5.4-9.69,9.82"/>
diff --git a/kanji/0889e-Kaisho.svg b/kanji/0889e-Kaisho.svg
index 25c1cc1a7..eb41419f9 100644
--- a/kanji/0889e-Kaisho.svg
+++ b/kanji/0889e-Kaisho.svg
@@ -38,32 +38,30 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_0889e-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0889e-Kaisho" kvg:element="袞">
 	<g id="kvg:0889e-Kaisho-g1" kvg:element="哀" kvg:part="1" kvg:position="top">
-		<g id="kvg:0889e-Kaisho-g2" kvg:element="裏">
-			<g id="kvg:0889e-Kaisho-g3" kvg:element="衣" kvg:part="1" kvg:radical="tradit">
-				<g id="kvg:0889e-Kaisho-g4" kvg:element="亠" kvg:radical="nelson">
-					<path id="kvg:0889e-Kaisho-s1" kvg:type="㇑a" d="M49.18,9.35c2.69,1.15,5.57,4.9,7.13,7.87"/>
-					<path id="kvg:0889e-Kaisho-s2" kvg:type="㇐" d="M21.25,25.54c1.35,0.1,4.42,0.65,5.72,0.52c10.57-1.09,43.17-4.58,57.52-4.86c2.22-0.04,3.35,0.04,5,0.66"/>
-				</g>
+		<g id="kvg:0889e-Kaisho-g2" kvg:element="衣" kvg:part="1" kvg:radical="tradit">
+			<g id="kvg:0889e-Kaisho-g3" kvg:element="亠" kvg:radical="nelson">
+				<path id="kvg:0889e-Kaisho-s1" kvg:type="㇑a" d="M49.18,9.35c2.69,1.15,5.57,4.9,7.13,7.87"/>
+				<path id="kvg:0889e-Kaisho-s2" kvg:type="㇐" d="M21.25,25.54c1.35,0.1,4.42,0.65,5.72,0.52c10.57-1.09,43.17-4.58,57.52-4.86c2.22-0.04,3.35,0.04,5,0.66"/>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:0889e-Kaisho-g5" kvg:position="bottom">
-		<g id="kvg:0889e-Kaisho-g6" kvg:element="八">
-			<g id="kvg:0889e-Kaisho-g7" kvg:position="left">
+	<g id="kvg:0889e-Kaisho-g4" kvg:position="bottom">
+		<g id="kvg:0889e-Kaisho-g5" kvg:element="八">
+			<g id="kvg:0889e-Kaisho-g6" kvg:position="left">
 				<path id="kvg:0889e-Kaisho-s3" kvg:type="㇒" d="M41.75,27.89c0.06,0.39,0.28,1.1-0.12,1.57C38,33.75,32,39,20.81,44.47"/>
 			</g>
-			<g id="kvg:0889e-Kaisho-g8" kvg:position="right">
+			<g id="kvg:0889e-Kaisho-g7" kvg:position="right">
 				<path id="kvg:0889e-Kaisho-s4" kvg:type="㇏" d="M65.02,28.08c6.63,2.05,17.13,8.44,18.79,11.63"/>
 			</g>
 		</g>
-		<g id="kvg:0889e-Kaisho-g9" kvg:element="哀" kvg:part="2">
-			<g id="kvg:0889e-Kaisho-g10" kvg:element="口">
+		<g id="kvg:0889e-Kaisho-g8" kvg:element="哀" kvg:part="2">
+			<g id="kvg:0889e-Kaisho-g9" kvg:element="口">
 				<path id="kvg:0889e-Kaisho-s5" kvg:type="㇑" d="M32.25,44.47c0.41,0.29,0.84,0.54,1.02,0.91c1.44,2.91,2.63,10.37,3.61,15.59"/>
 				<path id="kvg:0889e-Kaisho-s6" kvg:type="㇕b" d="M34.83,45.46c10.13-1.22,29.26-3.29,34.48-3.7c1.91-0.15,3.06,1.52,2.79,2.4c-1.13,3.66-2,5.04-3.89,11.17"/>
 				<path id="kvg:0889e-Kaisho-s7" kvg:type="㇐b" d="M37.81,59.11c6.14-0.46,24.99-2.85,32.78-3.32"/>
 			</g>
 		</g>
-		<g id="kvg:0889e-Kaisho-g11" kvg:element="衣" kvg:part="2" kvg:radical="tradit">
+		<g id="kvg:0889e-Kaisho-g10" kvg:element="衣" kvg:part="2" kvg:radical="tradit">
 			<path id="kvg:0889e-Kaisho-s8" kvg:type="㇒" d="M46.97,61.66c0.09,0.55,0.36,1.48-0.18,2.23c-3.45,4.84-13.17,14.53-31.98,21.29"/>
 			<path id="kvg:0889e-Kaisho-s9" kvg:type="㇙" d="M39.75,75.75c0.48,0.46,1,0.9,1,1.7c-0.03,10.04-0.32,14.88-0.32,16.58c0,1.7,1.18,2.67,2.68,1.39s14.35-11.07,16.35-12.34"/>
 			<path id="kvg:0889e-Kaisho-s10" kvg:type="㇒" d="M79.32,57.89c0.04,0.33,0.47,1.61,0.2,2.05c-1.65,2.75-6.8,6.69-15.21,12.17"/>
diff --git a/kanji/0889e.svg b/kanji/0889e.svg
index 5e3307133..f701961fa 100644
--- a/kanji/0889e.svg
+++ b/kanji/0889e.svg
@@ -38,32 +38,30 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_0889e" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0889e" kvg:element="袞">
 	<g id="kvg:0889e-g1" kvg:element="哀" kvg:part="1" kvg:position="top">
-		<g id="kvg:0889e-g2" kvg:element="裏">
-			<g id="kvg:0889e-g3" kvg:element="衣" kvg:part="1" kvg:radical="tradit">
-				<g id="kvg:0889e-g4" kvg:element="亠" kvg:radical="nelson">
-					<path id="kvg:0889e-s1" kvg:type="㇑a" d="M51.25,9.35c1.06,0.57,2.81,2.79,2.81,3.93c0,4.21-0.33,6.42-0.14,9.98"/>
-					<path id="kvg:0889e-s2" kvg:type="㇐" d="M21.25,25.54c1.35,0.1,4.42,0.65,5.72,0.52c10.57-1.09,43.17-4.58,57.52-4.86c2.22-0.04,3.35,0.04,5,0.66"/>
-				</g>
+		<g id="kvg:0889e-g2" kvg:element="衣" kvg:part="1" kvg:radical="tradit">
+			<g id="kvg:0889e-g3" kvg:element="亠" kvg:radical="nelson">
+				<path id="kvg:0889e-s1" kvg:type="㇑a" d="M51.25,9.35c1.06,0.57,2.81,2.79,2.81,3.93c0,4.21-0.33,6.42-0.14,9.98"/>
+				<path id="kvg:0889e-s2" kvg:type="㇐" d="M21.25,25.54c1.35,0.1,4.42,0.65,5.72,0.52c10.57-1.09,43.17-4.58,57.52-4.86c2.22-0.04,3.35,0.04,5,0.66"/>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:0889e-g5" kvg:position="bottom">
-		<g id="kvg:0889e-g6" kvg:element="八">
-			<g id="kvg:0889e-g7" kvg:position="left">
+	<g id="kvg:0889e-g4" kvg:position="bottom">
+		<g id="kvg:0889e-g5" kvg:element="八">
+			<g id="kvg:0889e-g6" kvg:position="left">
 				<path id="kvg:0889e-s3" kvg:type="㇒" d="M41.75,27.89c0.06,0.39,0.28,1.1-0.12,1.57C38,33.75,32,39,20.81,44.47"/>
 			</g>
-			<g id="kvg:0889e-g8" kvg:position="right">
+			<g id="kvg:0889e-g7" kvg:position="right">
 				<path id="kvg:0889e-s4" kvg:type="㇏" d="M65.02,28.08c6.63,2.05,17.13,8.44,18.79,11.63"/>
 			</g>
 		</g>
-		<g id="kvg:0889e-g9" kvg:element="哀" kvg:part="2">
-			<g id="kvg:0889e-g10" kvg:element="口">
+		<g id="kvg:0889e-g8" kvg:element="哀" kvg:part="2">
+			<g id="kvg:0889e-g9" kvg:element="口">
 				<path id="kvg:0889e-s5" kvg:type="㇑" d="M32.25,44.47c0.41,0.29,0.84,0.54,1.02,0.91c1.44,2.91,2.63,10.37,3.61,15.59"/>
 				<path id="kvg:0889e-s6" kvg:type="㇕b" d="M34.83,45.46c10.13-1.22,29.26-3.29,34.48-3.7c1.91-0.15,3.06,1.52,2.79,2.4c-1.13,3.66-2,5.04-3.89,11.17"/>
 				<path id="kvg:0889e-s7" kvg:type="㇐b" d="M37.81,59.11c6.14-0.46,24.99-2.85,32.78-3.32"/>
 			</g>
 		</g>
-		<g id="kvg:0889e-g11" kvg:element="衣" kvg:part="2" kvg:radical="tradit">
+		<g id="kvg:0889e-g10" kvg:element="衣" kvg:part="2" kvg:radical="tradit">
 			<path id="kvg:0889e-s8" kvg:type="㇒" d="M46.97,61.66c0.09,0.55,0.36,1.48-0.18,2.23c-3.45,4.84-13.17,14.53-31.98,21.29"/>
 			<path id="kvg:0889e-s9" kvg:type="㇙" d="M39.75,75.75c0.48,0.46,1,0.9,1,1.7c-0.03,10.04-0.32,14.88-0.32,16.58c0,1.7,1.18,2.67,2.68,1.39s14.35-11.07,16.35-12.34"/>
 			<path id="kvg:0889e-s10" kvg:type="㇒" d="M79.32,57.89c0.04,0.33,0.47,1.61,0.2,2.05c-1.65,2.75-6.8,6.69-15.21,12.17"/>