diff --git a/kanji/07f86-Kaisho.svg b/kanji/07f86-Kaisho.svg
index d30f3410a..648d0d2df 100644
--- a/kanji/07f86-Kaisho.svg
+++ b/kanji/07f86-Kaisho.svg
@@ -37,8 +37,8 @@ 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_07f86-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:07f86-Kaisho" kvg:element="羆">
-	<g id="kvg:07f86-Kaisho-g1" kvg:element="罷" kvg:part="1">
-		<g id="kvg:07f86-Kaisho-g2" kvg:element="罒" kvg:variant="true" kvg:original="网" kvg:position="top" kvg:radical="general" kvg:radicalForm="true">
+	<g id="kvg:07f86-Kaisho-g1" kvg:element="罒" kvg:variant="true" kvg:original="网" kvg:position="top" kvg:radical="general" kvg:radicalForm="true">
+		<g id="kvg:07f86-Kaisho-g2" kvg:element="罷" kvg:part="1">
 			<path id="kvg:07f86-Kaisho-s1" kvg:type="㇑" d="M21.83,13.76c0.37,0.29,1.25,1.03,1.41,1.39C24.52,18,26.06,25.87,26.94,31"/>
 			<path id="kvg:07f86-Kaisho-s2" kvg:type="㇕" d="M23.13,15.06C33.5,13.75,73,11.75,83.37,11.23c1.42-0.07,3.34,0.94,2.96,2.49c-0.8,3.25-2.75,8.82-4.86,13.45"/>
 			<path id="kvg:07f86-Kaisho-s3" kvg:type="㇑" d="M43.72,14.1c0.23,1.76,1.84,10.33,2.08,12.31"/>
@@ -47,8 +47,8 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:07f86-Kaisho-g3" kvg:element="熊" kvg:position="bottom">
-		<g id="kvg:07f86-Kaisho-g4" kvg:element="罷" kvg:part="2" kvg:position="top">
-			<g id="kvg:07f86-Kaisho-g5" kvg:element="能" kvg:position="left">
+		<g id="kvg:07f86-Kaisho-g4" kvg:element="能" kvg:position="left">
+			<g id="kvg:07f86-Kaisho-g5" kvg:element="罷" kvg:part="2">
 				<g id="kvg:07f86-Kaisho-g6" kvg:position="left">
 					<g id="kvg:07f86-Kaisho-g7" kvg:element="厶" kvg:position="top">
 						<path id="kvg:07f86-Kaisho-s6" kvg:type="㇜" d="M33.77,31.19c0.29,0.28,0.15,2.03-0.02,2.39c-2.11,4.5-5.72,7.56-9.66,10.72c-1.25,1-0.75,2.22,1.08,2c3.83-0.47,18.26-4.02,24.02-4.52"/>
diff --git a/kanji/08129-Kaisho.svg b/kanji/08129-Kaisho.svg
index b6b6be524..05c2cf8b8 100644
--- a/kanji/08129-Kaisho.svg
+++ b/kanji/08129-Kaisho.svg
@@ -37,35 +37,37 @@ 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_08129-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08129-Kaisho" kvg:element="脩">
-	<g id="kvg:08129-Kaisho-g1" kvg:element="攸" kvg:part="1" kvg:variant="true">
-		<g id="kvg:08129-Kaisho-g2" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="nelson">
-			<path id="kvg:08129-Kaisho-s1" kvg:type="㇒" d="M32,14.75c0.24,2.17-0.07,5.01-0.85,6.87C26.19,33.48,19.89,44.61,8.5,59.04"/>
-			<path id="kvg:08129-Kaisho-s2" kvg:type="㇑" d="M23.78,43.25c0.47,1,1.19,1.94,1.25,3.23C25.61,58.96,24.02,86.75,24.5,94"/>
-		</g>
-		<g id="kvg:08129-Kaisho-g3" kvg:element="丨" kvg:position="right">
-			<path id="kvg:08129-Kaisho-s3" kvg:type="㇑" d="M36.52,30.08c0.98,0.92,1.67,1.99,1.76,5.02c0.4,14.55-0.02,39.69-0.02,44.65"/>
+	<g id="kvg:08129-Kaisho-g1" kvg:position="left">
+		<g id="kvg:08129-Kaisho-g2" kvg:element="攸" kvg:part="1" kvg:variant="true">
+			<g id="kvg:08129-Kaisho-g3" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="nelson">
+				<path id="kvg:08129-Kaisho-s1" kvg:type="㇒" d="M32,14.75c0.24,2.17-0.07,5.01-0.85,6.87C26.19,33.48,19.89,44.61,8.5,59.04"/>
+				<path id="kvg:08129-Kaisho-s2" kvg:type="㇑" d="M23.78,43.25c0.47,1,1.19,1.94,1.25,3.23C25.61,58.96,24.02,86.75,24.5,94"/>
+			</g>
+			<g id="kvg:08129-Kaisho-g4" kvg:element="丨" kvg:position="right">
+				<path id="kvg:08129-Kaisho-s3" kvg:type="㇑" d="M36.52,30.08c0.98,0.92,1.67,1.99,1.76,5.02c0.4,14.55-0.02,39.69-0.02,44.65"/>
+			</g>
 		</g>
 	</g>
-	<g id="kvg:08129-Kaisho-g4" kvg:position="right">
-		<g id="kvg:08129-Kaisho-g5" kvg:element="攸" kvg:part="1" kvg:variant="true" kvg:position="top">
-			<g id="kvg:08129-Kaisho-g6" kvg:element="攵" kvg:variant="true" kvg:original="攴">
-				<g id="kvg:08129-Kaisho-g7" kvg:position="top">
+	<g id="kvg:08129-Kaisho-g5" kvg:position="right">
+		<g id="kvg:08129-Kaisho-g6" kvg:element="攵" kvg:variant="true" kvg:original="攴">
+			<g id="kvg:08129-Kaisho-g7" kvg:element="攸" kvg:part="1" kvg:variant="true" kvg:position="top">
+				<g id="kvg:08129-Kaisho-g8" kvg:position="top">
 					<path id="kvg:08129-Kaisho-s4" kvg:type="㇒" d="M60.6,12.39c0.04,0.46,0.24,1.22-0.08,1.85C58.5,18.31,53.01,27.54,46,33.16"/>
 					<path id="kvg:08129-Kaisho-s5" kvg:type="㇐" d="M58.47,24.37c0.03-0.08,1.71,0.23,2.31,0.21c6.28-0.24,19.02-3.1,28.6-3.48c1.08-0.04,1.74-0.01,2.02,0.04"/>
 				</g>
-				<g id="kvg:08129-Kaisho-g8" kvg:element="乂" kvg:position="bottom">
-					<g id="kvg:08129-Kaisho-g9" kvg:element="丿">
+				<g id="kvg:08129-Kaisho-g9" kvg:element="乂" kvg:position="bottom">
+					<g id="kvg:08129-Kaisho-g10" kvg:element="丿">
 						<path id="kvg:08129-Kaisho-s6" kvg:type="㇒" d="M78.04,24.88c-0.29,1.12,0.08,2.23-0.72,3.27C69.75,38,59,46.5,43.62,51"/>
 					</g>
 					<path id="kvg:08129-Kaisho-s7" kvg:type="㇏" d="M54,29.45c7,4.55,24,13.3,37.87,20.05c2.17,1.06,3.75,0.87,5.63,0.95"/>
 				</g>
 			</g>
-			<g id="kvg:08129-Kaisho-g10" kvg:element="月" kvg:original="肉" kvg:position="bottom" kvg:radical="tradit">
-				<path id="kvg:08129-Kaisho-s8" kvg:type="㇑" d="M52.85,54.28c0.57,0.56,0.94,1.13,1.13,1.69c0.19,0.56,0.27,39.7,0.19,40.97"/>
-				<path id="kvg:08129-Kaisho-s9" kvg:type="㇆a" d="M55.12,55.91c2.26-0.14,23.02-2.52,24.7-2.68c3.02-0.28,4.15,1.83,3.77,2.68c-0.36,0.81-0.57,23.76-0.57,35.17c0,7.33-4.53,2.54-6.41,1.27"/>
-				<path id="kvg:08129-Kaisho-s10" kvg:type="㇐a" d="M55.12,66.76c4.64-0.51,8.78-0.99,13.43-1.43c1.24-0.12,2.48-0.23,3.69-0.34"/>
-				<path id="kvg:08129-Kaisho-s11" kvg:type="㇐a" d="M55.68,77.89c4.25-0.3,8.5-0.69,12.75-1.04c1.23-0.1,2.47-0.2,3.69-0.3"/>
-			</g>
+		</g>
+		<g id="kvg:08129-Kaisho-g11" kvg:element="月" kvg:original="肉" kvg:position="bottom" kvg:radical="tradit">
+			<path id="kvg:08129-Kaisho-s8" kvg:type="㇑" d="M52.85,54.28c0.57,0.56,0.94,1.13,1.13,1.69c0.19,0.56,0.27,39.7,0.19,40.97"/>
+			<path id="kvg:08129-Kaisho-s9" kvg:type="㇆a" d="M55.12,55.91c2.26-0.14,23.02-2.52,24.7-2.68c3.02-0.28,4.15,1.83,3.77,2.68c-0.36,0.81-0.57,23.76-0.57,35.17c0,7.33-4.53,2.54-6.41,1.27"/>
+			<path id="kvg:08129-Kaisho-s10" kvg:type="㇐a" d="M55.12,66.76c4.64-0.51,8.78-0.99,13.43-1.43c1.24-0.12,2.48-0.23,3.69-0.34"/>
+			<path id="kvg:08129-Kaisho-s11" kvg:type="㇐a" d="M55.68,77.89c4.25-0.3,8.5-0.69,12.75-1.04c1.23-0.1,2.47-0.2,3.69-0.3"/>
 		</g>
 	</g>
 </g>
diff --git a/kanji/096a8-Kaisho.svg b/kanji/096a8-Kaisho.svg
index f261b9664..976097ce6 100644
--- a/kanji/096a8-Kaisho.svg
+++ b/kanji/096a8-Kaisho.svg
@@ -37,14 +37,14 @@ 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_096a8-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:096a8-Kaisho" kvg:element="隨">
-	<g id="kvg:096a8-Kaisho-g1" kvg:element="隋" kvg:part="1">
-		<g id="kvg:096a8-Kaisho-g2" kvg:element="⻖" kvg:variant="true" kvg:original="阜" kvg:position="left" kvg:radical="general">
+	<g id="kvg:096a8-Kaisho-g1" kvg:element="⻖" kvg:variant="true" kvg:original="阜" kvg:position="left" kvg:radical="general">
+		<g id="kvg:096a8-Kaisho-g2" kvg:element="隋" kvg:part="1">
 			<path id="kvg:096a8-Kaisho-s1" kvg:type="㇇" d="M14.25,16.5c1.11,0.32,2.29,0.64,3.49,0.56c4.51-0.31,7.26-0.81,11.5-1.86c2.95-0.73,5.65,1.11,4.4,3.71c-1.26,2.6-6.59,15.21-8.79,18.92"/>
 			<path id="kvg:096a8-Kaisho-s2" kvg:type="㇁" d="M24.35,39.33C36.91,48.11,35,80.25,24.42,68.39"/>
 			<path id="kvg:096a8-Kaisho-s3" kvg:type="㇑" d="M15.89,16.71c0.36,1.54,0.1,3.95,0.31,5.04c0.2,1.09,0,68.44-0.2,75.25"/>
 		</g>
 	</g>
-	<g id="kvg:096a8-Kaisho-g3" kvg:position="right">
+	<g id="kvg:096a8-Kaisho-g3" kvg:element="遀" kvg:position="right">
 		<g id="kvg:096a8-Kaisho-g4" kvg:element="隋" kvg:part="2" kvg:position="nyoc">
 			<g id="kvg:096a8-Kaisho-g5" kvg:element="左" kvg:position="top">
 				<path id="kvg:096a8-Kaisho-s4" kvg:type="㇐" d="M56.85,21.3c1.25,0.17,2.5,0.34,3.62,0.26c9.82-0.72,17.05-1.62,29.28-2.38c1.72-0.11,2.62-0.11,4.02,0.22"/>