From 5122b3a3db829e4fb33f897ec61581aa40edee4a Mon Sep 17 00:00:00 2001
From: Ben Bullock <benkasminbullock@gmail.com>
Date: Thu, 31 Mar 2022 06:29:42 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Add=20a=20grouping=20for=20sub=20elements?=
 =?UTF-8?q?=20of=20=E7=A6=B8=20in=20079bb.svg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kanji/079bb.svg | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kanji/079bb.svg b/kanji/079bb.svg
index 19e46958e..a0624304e 100644
--- a/kanji/079bb.svg
+++ b/kanji/079bb.svg
@@ -54,10 +54,14 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:079bb-g6" kvg:element="禸" kvg:variant="true">
-		<path id="kvg:079bb-s7" kvg:type="㇑" d="m19.983739,63.351836c1.856191,1.006241,2.191885,2.408554,1.935177,4.067781-0.17772,1.220334-0.197467,15.393338-0.07899,24.053429,0.03949,3.211406-0.157974,4.999089-0.157974,5.748417"/>
-		<path id="kvg:079bb-s8" kvg:type="㇆a" d="m23.893587,64.668512c7.720963,-0.631576,41.507581,-4.206941,53.237125,-5.27741,5.924012,-0.535234,10.070821,0.642281,9.912847,4.121304-0.276453,5.812645-0.671388,19.792965-2.152391,25.445039-2.251124,8.52093-8.412097,3.661003-10.860689,1.905434"/>
-		<path id="kvg:079bb-s9" kvg:type="㇜" d="m55.468573,50.795239c1.026829,1.198925,1.461257,2.173052,0.651642,3.564661-4.304783,7.407643-9.24146,15.16854-15.65914,22.554773-2.152391,2.472783-1.007082,3.050836,2.922513,1.926844,9.182219,-2.622648,10.663222,-3.157883,21.997833,-5.941101"/>
-		<path id="kvg:079bb-s10" kvg:type="㇔" d="m61.945494,68.522199c4.087568,1.680636,9.359939,6.358584,11.591317,9.537876"/>
+		<g id="kvg:079bb-g7" kvg:element="冂">
+			<path id="kvg:079bb-s7" kvg:type="㇑" d="m19.983739,63.351836c1.856191,1.006241,2.191885,2.408554,1.935177,4.067781-0.17772,1.220334-0.197467,15.393338-0.07899,24.053429,0.03949,3.211406-0.157974,4.999089-0.157974,5.748417"/>
+			<path id="kvg:079bb-s8" kvg:type="㇆a" d="m23.893587,64.668512c7.720963,-0.631576,41.507581,-4.206941,53.237125,-5.27741,5.924012,-0.535234,10.070821,0.642281,9.912847,4.121304-0.276453,5.812645-0.671388,19.792965-2.152391,25.445039-2.251124,8.52093-8.412097,3.661003-10.860689,1.905434"/>
+		</g>
+		<g id="kvg:079bb-g8" kvg:element="厶">
+			<path id="kvg:079bb-s9" kvg:type="㇜" d="m55.468573,50.795239c1.026829,1.198925,1.461257,2.173052,0.651642,3.564661-4.304783,7.407643-9.24146,15.16854-15.65914,22.554773-2.152391,2.472783-1.007082,3.050836,2.922513,1.926844,9.182219,-2.622648,10.663222,-3.157883,21.997833,-5.941101"/>
+			<path id="kvg:079bb-s10" kvg:type="㇔" d="m61.945494,68.522199c4.087568,1.680636,9.359939,6.358584,11.591317,9.537876"/>
+		</g>
 	</g>
 </g>
 </g>

From 5852d22af4ad8cd9bf509fc4788192b1adb08711 Mon Sep 17 00:00:00 2001
From: Ben Bullock <benkasminbullock@gmail.com>
Date: Thu, 31 Mar 2022 08:50:43 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Split=20=E7=A6=B8=20into=20component=20grou?=
 =?UTF-8?q?ps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kanji/04e82.svg             | 16 ++++++++++------
 kanji/05076-Kaisho.svg      |  8 +++++---
 kanji/052f5-Kaisho.svg      | 10 ++++++----
 kanji/052f5.svg             | 10 ++++++----
 kanji/05631.svg             |  8 +++++---
 kanji/05bd3-Kaisho.svg      |  8 +++++---
 kanji/05bd3.svg             |  8 +++++---
 kanji/05c5e.svg             |  8 +++++---
 kanji/05d4e-Kaisho.svg      |  8 +++++---
 kanji/05d4e.svg             |  8 +++++---
 kanji/0611a-Kaisho.svg      | 10 ++++++----
 kanji/0611a.svg             | 10 ++++++----
 kanji/064d2.svg             |  6 ++++--
 kanji/06f13-Kaisho.svg      | 12 ++++++++----
 kanji/07658-Kaisho.svg      |  8 +++++---
 kanji/07658.svg             |  8 +++++---
 kanji/0792a-Kaisho.svg      |  8 +++++---
 kanji/0792a.svg             |  8 +++++---
 kanji/079b9.svg             |  8 +++++---
 kanji/079ba-Kaisho.svg      |  8 +++++---
 kanji/079ba.svg             |  8 +++++---
 kanji/079bd.svg             |  6 ++++--
 kanji/07aca-Kaisho.svg      | 12 ++++++++----
 kanji/07aca-KaishoHzFst.svg | 12 ++++++++----
 kanji/07aca.svg             | 12 ++++++++----
 kanji/07c6c-Kaisho.svg      | 10 ++++++----
 kanji/07c6c.svg             | 10 ++++++----
 kanji/07cf2-Kaisho.svg      |  8 +++++---
 kanji/07cf2.svg             |  8 +++++---
 kanji/0842c-Kaisho.svg      |  8 +++++---
 kanji/0842c.svg             |  8 +++++---
 kanji/085d5-Kaisho.svg      |  8 +++++---
 kanji/085d5.svg             |  8 +++++---
 kanji/08823-Kaisho.svg      |  8 +++++---
 kanji/08823.svg             |  8 +++++---
 kanji/08fad-Kaisho.svg      | 24 ++++++++++++++----------
 kanji/08fad.svg             | 24 ++++++++++++++----------
 kanji/09047-Kaisho.svg      | 10 ++++++----
 kanji/09047.svg             | 10 ++++++----
 kanji/09081-Kaisho.svg      | 10 ++++++----
 kanji/09081.svg             | 10 ++++++----
 kanji/09685-Kaisho.svg      |  8 +++++---
 kanji/09685.svg             |  8 +++++---
 kanji/096e2-Kaisho.svg      | 10 ++++++----
 kanji/096e2.svg             | 10 ++++++----
 kanji/09b51.svg             |  6 ++++--
 kanji/09ed0.svg             |  8 +++++---
 kanji/09f72-HzFst.svg       |  8 +++++---
 kanji/09f72.svg             |  8 +++++---
 49 files changed, 289 insertions(+), 177 deletions(-)

diff --git a/kanji/04e82.svg b/kanji/04e82.svg
index 259663d22..11337227d 100644
--- a/kanji/04e82.svg
+++ b/kanji/04e82.svg
@@ -52,18 +52,22 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:04e82-g5" kvg:position="bottom">
 			<g id="kvg:04e82-g6" kvg:element="禸">
-				<path id="kvg:04e82-s7" kvg:type="㇑" d="M15.03,52.3c1.04,0.65,1.86,2.43,1.86,3.61c0,7.59,0.04,30.84,0.04,40.34"/>
-				<path id="kvg:04e82-s8" kvg:type="㇆" d="M16.36,53.53C22.5,53,45.93,50.08,47.79,49.5c2.17-0.68,3.61,1.67,3.53,3.68c-0.19,4.87-0.64,28.32-0.64,37.43c0,8-2.43,5.39-6.34,1.44"/>
-				<path id="kvg:04e82-s9" kvg:type="㇜" d="M32.19,53.25c0.34,0.31,0.29,0.96-0.14,1.46c-2.05,2.4-6.8,6.59-7.55,7.58s-0.25,1.74,1.75,1.34c2.23-0.45,11.44-3.91,16.13-4.68"/>
-				<path id="kvg:04e82-s10" kvg:type="㇔" d="M39.05,54.39c1.89,1.17,4.88,4.79,5.35,6.6"/>
+				<g id="kvg:04e82-g7" kvg:element="冂">
+					<path id="kvg:04e82-s7" kvg:type="㇑" d="M15.03,52.3c1.04,0.65,1.86,2.43,1.86,3.61c0,7.59,0.04,30.84,0.04,40.34"/>
+					<path id="kvg:04e82-s8" kvg:type="㇆" d="M16.36,53.53C22.5,53,45.93,50.08,47.79,49.5c2.17-0.68,3.61,1.67,3.53,3.68c-0.19,4.87-0.64,28.32-0.64,37.43c0,8-2.43,5.39-6.34,1.44"/>
+				</g>
+				<g id="kvg:04e82-g8" kvg:element="厶">
+					<path id="kvg:04e82-s9" kvg:type="㇜" d="M32.19,53.25c0.34,0.31,0.29,0.96-0.14,1.46c-2.05,2.4-6.8,6.59-7.55,7.58s-0.25,1.74,1.75,1.34c2.23-0.45,11.44-3.91,16.13-4.68"/>
+					<path id="kvg:04e82-s10" kvg:type="㇔" d="M39.05,54.39c1.89,1.17,4.88,4.79,5.35,6.6"/>
+				</g>
 			</g>
-			<g id="kvg:04e82-g7" kvg:element="又">
+			<g id="kvg:04e82-g9" kvg:element="又">
 				<path id="kvg:04e82-s11" kvg:type="㇇" d="M24.12,71.61c0.76,0.16,0.86,0.41,2.38,0.16c1.52-0.24,12.46-3.35,13.51-3.59c1.05-0.24,1.87,0.92,1.43,1.78C36.5,79.5,31.5,85,23.5,90.5"/>
 				<path id="kvg:04e82-s12" kvg:type="㇏" d="M28.56,77.58c3.9,1.19,9.14,4.14,12.22,7.72"/>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:04e82-g8" kvg:element="乙" kvg:variant="true" kvg:position="right" kvg:radical="general">
+	<g id="kvg:04e82-g10" kvg:element="乙" kvg:variant="true" kvg:position="right" kvg:radical="general">
 		<path id="kvg:04e82-s13" kvg:type="㇟" d="M65.99,16.87c0.76,0.88,1.55,2.59,1.58,4.43c0.16,8.19-0.42,57.14-0.42,62.7c0,10.25,2.85,11.53,16.39,11.53c10.96,0,12.35-2.53,12.35-9.12"/>
 	</g>
 </g>
diff --git a/kanji/05076-Kaisho.svg b/kanji/05076-Kaisho.svg
index 684bb20b7..6265a3e11 100644
--- a/kanji/05076-Kaisho.svg
+++ b/kanji/05076-Kaisho.svg
@@ -51,9 +51,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:05076-Kaisho-g5" kvg:element="禸">
-			<path id="kvg:05076-Kaisho-s7" kvg:type="㇑" d="M37.38,55.34c1.49,0.69,2.46,2.58,2.66,3.81C41.5,68,43.04,88.74,43.88,95.5"/>
-			<path id="kvg:05076-Kaisho-s8" kvg:type="㇆" d="M39.99,58.23c7.39-0.96,49.22-4.97,50.67-5.31c3.11-0.72,5.17,1.76,5.06,3.88c-0.27,5.13-3.61,27.11-5.92,33.67c-2.3,6.52-3.17,5-5.92-0.06"/>
-			<g id="kvg:05076-Kaisho-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:05076-Kaisho-g6" kvg:element="冂">
+				<path id="kvg:05076-Kaisho-s7" kvg:type="㇑" d="M37.38,55.34c1.49,0.69,2.46,2.58,2.66,3.81C41.5,68,43.04,88.74,43.88,95.5"/>
+				<path id="kvg:05076-Kaisho-s8" kvg:type="㇆" d="M39.99,58.23c7.39-0.96,49.22-4.97,50.67-5.31c3.11-0.72,5.17,1.76,5.06,3.88c-0.27,5.13-3.61,27.11-5.92,33.67c-2.3,6.52-3.17,5-5.92-0.06"/>
+			</g>
+			<g id="kvg:05076-Kaisho-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:05076-Kaisho-s9" kvg:type="㇑" d="M64.02,19.23c0.55,0.88,1.4,1.75,1.4,3.3c-0.01,6.8,0.23,49.21,0.23,51.3"/>
 			</g>
 			<path id="kvg:05076-Kaisho-s10" kvg:type="６" d="M51.54,77.45c1.45,1.21,3.07,1.88,4.36,1.45c3.63-1.21,17.53-6.28,25.13-8.45"/>
diff --git a/kanji/052f5-Kaisho.svg b/kanji/052f5-Kaisho.svg
index ba4246949..2577b304f 100644
--- a/kanji/052f5-Kaisho.svg
+++ b/kanji/052f5-Kaisho.svg
@@ -58,9 +58,11 @@ kvg:type CDATA #IMPLIED >
 					</g>
 				</g>
 				<g id="kvg:052f5-Kaisho-g8" kvg:element="禸">
-					<path id="kvg:052f5-Kaisho-s10" kvg:type="㇑" d="M22.38,65.11c0.59,0.34,1,1.34,1.04,2.01c0.2,3.31,1.37,19.97,1.7,23.64"/>
-					<path id="kvg:052f5-Kaisho-s11" kvg:type="㇆" d="M23.42,66.16c4.66-0.79,31.52-4.03,32.45-4.08c1.4-0.08,2.62,1.05,2.58,3.12c-0.12,5.48-2.22,16.95-3.72,21.93c-1.57,5.24-3.83,3.61-5.56,0.66"/>
-					<g id="kvg:052f5-Kaisho-g9" kvg:element="田" kvg:part="2" kvg:variant="true">
+					<g id="kvg:052f5-Kaisho-g9" kvg:element="冂">
+						<path id="kvg:052f5-Kaisho-s10" kvg:type="㇑" d="M22.38,65.11c0.59,0.34,1,1.34,1.04,2.01c0.2,3.31,1.37,19.97,1.7,23.64"/>
+						<path id="kvg:052f5-Kaisho-s11" kvg:type="㇆" d="M23.42,66.16c4.66-0.79,31.52-4.03,32.45-4.08c1.4-0.08,2.62,1.05,2.58,3.12c-0.12,5.48-2.22,16.95-3.72,21.93c-1.57,5.24-3.83,3.61-5.56,0.66"/>
+					</g>
+					<g id="kvg:052f5-Kaisho-g10" kvg:element="田" kvg:part="2" kvg:variant="true">
 						<path id="kvg:052f5-Kaisho-s12" kvg:type="㇑" d="M39.33,42.55c0.3,0.6,0.78,1.19,0.78,2.28c0,4.79,0.13,29.7,0.13,31.17"/>
 					</g>
 					<path id="kvg:052f5-Kaisho-s13" kvg:type="６" d="M30.55,78.83c0.81,0.81,1.71,1.24,2.42,0.9c2.02-0.95,10.32-5.3,14.55-7.04"/>
@@ -69,7 +71,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 	</g>
-	<g id="kvg:052f5-Kaisho-g10" kvg:element="力" kvg:position="right" kvg:radical="tradit">
+	<g id="kvg:052f5-Kaisho-g11" kvg:element="力" kvg:position="right" kvg:radical="tradit">
 		<path id="kvg:052f5-Kaisho-s15" kvg:type="㇆" d="M63.01,40.31c1.09,0.55,2.45,0.48,3.4,0.29c7.09-1.36,21.89-3.56,26.18-4.12c2.79-0.36,3.77,1.66,3.41,4.19c-1.26,9.08-5.26,36.58-12.72,49.3c-2.97,5.07-6.32,0.25-7.45-0.55"/>
 		<path id="kvg:052f5-Kaisho-s16" kvg:type="㇒" d="M78.21,15.18c0.54,1.32,0.65,1.28,0.38,3.92C76.53,38.69,70.75,79,56.64,93.65"/>
 	</g>
diff --git a/kanji/052f5.svg b/kanji/052f5.svg
index 986b6b58a..c104ad8cc 100644
--- a/kanji/052f5.svg
+++ b/kanji/052f5.svg
@@ -58,9 +58,11 @@ kvg:type CDATA #IMPLIED >
 					</g>
 				</g>
 				<g id="kvg:052f5-g8" kvg:element="禸">
-					<path id="kvg:052f5-s10" kvg:type="㇑" d="M22.38,65.11c0.59,0.34,1,1.34,1.04,2.01c0.2,3.31,1.37,19.97,1.7,23.64"/>
-					<path id="kvg:052f5-s11" kvg:type="㇆" d="M23.42,66.16c4.66-0.79,31.52-4.03,32.45-4.08c1.4-0.08,2.62,1.05,2.58,3.12c-0.12,5.48-2.22,16.95-3.72,21.93c-1.57,5.24-3.83,3.61-5.56,0.66"/>
-					<g id="kvg:052f5-g9" kvg:element="田" kvg:part="2" kvg:variant="true">
+					<g id="kvg:052f5-g9" kvg:element="冂">
+						<path id="kvg:052f5-s10" kvg:type="㇑" d="M22.38,65.11c0.59,0.34,1,1.34,1.04,2.01c0.2,3.31,1.37,19.97,1.7,23.64"/>
+						<path id="kvg:052f5-s11" kvg:type="㇆" d="M23.42,66.16c4.66-0.79,31.52-4.03,32.45-4.08c1.4-0.08,2.62,1.05,2.58,3.12c-0.12,5.48-2.22,16.95-3.72,21.93c-1.57,5.24-3.83,3.61-5.56,0.66"/>
+					</g>
+					<g id="kvg:052f5-g10" kvg:element="田" kvg:part="2" kvg:variant="true">
 						<path id="kvg:052f5-s12" kvg:type="㇑" d="M39.33,42.55c0.3,0.6,0.78,1.19,0.78,2.28c0,4.79,0.13,29.7,0.13,31.17"/>
 					</g>
 					<path id="kvg:052f5-s13" kvg:type="６" d="M30.55,78.83c0.81,0.81,1.71,1.24,2.42,0.9c2.02-0.95,10.32-5.3,14.55-7.04"/>
@@ -69,7 +71,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 	</g>
-	<g id="kvg:052f5-g10" kvg:element="力" kvg:position="right" kvg:radical="tradit">
+	<g id="kvg:052f5-g11" kvg:element="力" kvg:position="right" kvg:radical="tradit">
 		<path id="kvg:052f5-s15" kvg:type="㇆" d="M63.01,40.31c1.09,0.55,2.45,0.48,3.4,0.29c7.09-1.36,21.89-3.56,26.18-4.12c2.79-0.36,3.77,1.66,3.41,4.19c-1.26,9.08-5.26,36.58-12.72,49.3c-2.97,5.07-6.32,0.25-7.45-0.55"/>
 		<path id="kvg:052f5-s16" kvg:type="㇒" d="M78.21,15.18c0.54,1.32,0.65,1.28,0.38,3.92C76.53,38.69,70.75,79,56.64,93.65"/>
 	</g>
diff --git a/kanji/05631.svg b/kanji/05631.svg
index 789ab9e84..dc4510fd3 100644
--- a/kanji/05631.svg
+++ b/kanji/05631.svg
@@ -58,9 +58,11 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:05631-s10" kvg:type="㇐b" d="M56.56,59.09c5.79-0.52,17.41-1.56,26.65-2.2c1.47-0.1,2.88-0.19,4.17-0.27"/>
 			</g>
 			<g id="kvg:05631-g7" kvg:element="禸" kvg:variant="true">
-				<path id="kvg:05631-s11" kvg:type="㇑" d="M48.24,68.39c0.81,0.81,1.1,1.96,1.16,2.82c0.24,3.51,0.38,12.99,0.44,19.04c0.03,2.76,0.04,4.81,0.04,5.25"/>
-				<path id="kvg:05631-s12" kvg:type="㇆a" d="M49.97,69.63c7.28-0.83,30.19-2.84,39.04-3.79c4.47-0.47,6.13-0.07,5.75,4.78c-0.62,8.13-1.09,13.54-3.13,19.82C89.5,97,86.5,92.5,85.38,90.83"/>
-				<g id="kvg:05631-g8" kvg:element="虫" kvg:part="2">
+				<g id="kvg:05631-g8" kvg:element="冂">
+					<path id="kvg:05631-s11" kvg:type="㇑" d="M48.24,68.39c0.81,0.81,1.1,1.96,1.16,2.82c0.24,3.51,0.38,12.99,0.44,19.04c0.03,2.76,0.04,4.81,0.04,5.25"/>
+					<path id="kvg:05631-s12" kvg:type="㇆a" d="M49.97,69.63c7.28-0.83,30.19-2.84,39.04-3.79c4.47-0.47,6.13-0.07,5.75,4.78c-0.62,8.13-1.09,13.54-3.13,19.82C89.5,97,86.5,92.5,85.38,90.83"/>
+				</g>
+				<g id="kvg:05631-g9" kvg:element="虫" kvg:part="2">
 					<path id="kvg:05631-s13" kvg:type="㇑a" d="M68.52,41.48c0.88,0.88,1.21,2.15,1.21,3.62c0,4.04-0.04,29.77-0.04,34.18"/>
 					<path id="kvg:05631-s14" kvg:type="㇀" d="M58.38,81.34c0.62,1.03,1.5,1.28,2.96,0.95c4.85-1.11,17.9-4.35,19.36-4.78"/>
 					<path id="kvg:05631-s15" kvg:type="㇔" d="M79.12,72.62c1.91,1.95,4.94,8.04,5.42,11.07"/>
diff --git a/kanji/05bd3-Kaisho.svg b/kanji/05bd3-Kaisho.svg
index f9c86a785..7137fc431 100644
--- a/kanji/05bd3-Kaisho.svg
+++ b/kanji/05bd3-Kaisho.svg
@@ -54,9 +54,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:05bd3-Kaisho-g6" kvg:element="禸">
-			<path id="kvg:05bd3-Kaisho-s8" kvg:type="㇑" d="M24.08,67.14c0.67,0.61,1.74,2.76,1.81,3.64c0.35,4.33,3.38,21.91,3.95,26.73"/>
-			<path id="kvg:05bd3-Kaisho-s9" kvg:type="㇆" d="M25.89,69.33c8.09-1.03,54.84-6.09,56.46-6.17c2.43-0.1,4.55,1.38,4.48,4.09c-0.2,7.18-2.25,19.63-4.85,26.17c-2.73,6.87-4.04,4.08-7.05,0.21"/>
-			<g id="kvg:05bd3-Kaisho-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:05bd3-Kaisho-g7" kvg:element="冂">
+				<path id="kvg:05bd3-Kaisho-s8" kvg:type="㇑" d="M24.08,67.14c0.67,0.61,1.74,2.76,1.81,3.64c0.35,4.33,3.38,21.91,3.95,26.73"/>
+				<path id="kvg:05bd3-Kaisho-s9" kvg:type="㇆" d="M25.89,69.33c8.09-1.03,54.84-6.09,56.46-6.17c2.43-0.1,4.55,1.38,4.48,4.09c-0.2,7.18-2.25,19.63-4.85,26.17c-2.73,6.87-4.04,4.08-7.05,0.21"/>
+			</g>
+			<g id="kvg:05bd3-Kaisho-g8" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:05bd3-Kaisho-s10" kvg:type="㇑" d="M51.77,38.85c0.49,0.69,1.27,1.36,1.27,2.6c-0.01,5.45,0.21,37.83,0.21,39.51"/>
 			</g>
 			<path id="kvg:05bd3-Kaisho-s11" kvg:type="６" d="M37.12,83.72c1.51,0.95,3.18,1.45,4.52,1.05c3.76-1.12,19.21-6.22,27.09-8.27"/>
diff --git a/kanji/05bd3.svg b/kanji/05bd3.svg
index c4eb796a2..4a1a435e2 100644
--- a/kanji/05bd3.svg
+++ b/kanji/05bd3.svg
@@ -54,9 +54,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:05bd3-g6" kvg:element="禸">
-			<path id="kvg:05bd3-s8" kvg:type="㇑" d="M24.33,67.14c0.95,0.95,1.42,2.77,1.56,3.64c0.83,5.22,1.98,13.08,2.83,18.97c0.55,3.82,0.98,6.82,1.12,7.75"/>
-			<path id="kvg:05bd3-s9" kvg:type="㇆" d="M26.14,69.33c18.11-2.46,40.99-4.83,56.46-6.17c2.42-0.21,4.55,1.38,4.48,4.09c-0.2,7.18-2.5,19.63-5.1,26.17c-2.73,6.87-4.48,3.58-7.05,0.21"/>
-			<g id="kvg:05bd3-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:05bd3-g7" kvg:element="冂">
+				<path id="kvg:05bd3-s8" kvg:type="㇑" d="M24.33,67.14c0.95,0.95,1.42,2.77,1.56,3.64c0.83,5.22,1.98,13.08,2.83,18.97c0.55,3.82,0.98,6.82,1.12,7.75"/>
+				<path id="kvg:05bd3-s9" kvg:type="㇆" d="M26.14,69.33c18.11-2.46,40.99-4.83,56.46-6.17c2.42-0.21,4.55,1.38,4.48,4.09c-0.2,7.18-2.5,19.63-5.1,26.17c-2.73,6.87-4.48,3.58-7.05,0.21"/>
+			</g>
+			<g id="kvg:05bd3-g8" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:05bd3-s10" kvg:type="㇑" d="M52.02,38.6c0.88,0.88,1.27,2.11,1.27,3.35c-0.01,5.45-0.04,36.88-0.04,38.55"/>
 			</g>
 			<path id="kvg:05bd3-s11" kvg:type="６" d="M37.12,84.97c1.51,0.95,3.18,0.7,4.52,0.3c3.76-1.12,14.64-4.28,25.49-8.15"/>
diff --git a/kanji/05c5e.svg b/kanji/05c5e.svg
index d235aaae1..004226204 100644
--- a/kanji/05c5e.svg
+++ b/kanji/05c5e.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:05c5e-s7" kvg:type="㇐b" d="M43.88,58.49c6.9-0.64,21.87-2.8,32.64-3.73c1.28-0.11,2.51-0.2,3.66-0.28"/>
 		</g>
 		<g id="kvg:05c5e-g5" kvg:element="禸" kvg:variant="true">
-			<path id="kvg:05c5e-s8" kvg:type="㇑" d="M33.09,66.64c0.82,0.82,1.54,1.99,1.71,3.08c0.65,4.2,1.98,16.55,2.73,23.25c0.27,2.4,0.45,4.11,0.45,4.53"/>
-			<path id="kvg:05c5e-s9" kvg:type="㇆a" d="M35.38,69.38c8.16-0.87,41.61-4.79,51-5.87c4.26-0.49,5.81,0.23,5.39,4.63c-0.84,8.9-2.73,18.26-4.74,24.81c-1.9,6.18-4.15,2.68-6.75-0.61"/>
-			<g id="kvg:05c5e-g6" kvg:element="虫" kvg:part="2">
+			<g id="kvg:05c5e-g6" kvg:element="冂">
+				<path id="kvg:05c5e-s8" kvg:type="㇑" d="M33.09,66.64c0.82,0.82,1.54,1.99,1.71,3.08c0.65,4.2,1.98,16.55,2.73,23.25c0.27,2.4,0.45,4.11,0.45,4.53"/>
+				<path id="kvg:05c5e-s9" kvg:type="㇆a" d="M35.38,69.38c8.16-0.87,41.61-4.79,51-5.87c4.26-0.49,5.81,0.23,5.39,4.63c-0.84,8.9-2.73,18.26-4.74,24.81c-1.9,6.18-4.15,2.68-6.75-0.61"/>
+			</g>
+			<g id="kvg:05c5e-g7" kvg:element="虫" kvg:part="2">
 				<path id="kvg:05c5e-s10" kvg:type="㇑a" d="M58.23,38.23c0.96,0.96,1.64,2.4,1.64,3.87c0,4.04-0.01,32.27-0.01,38.43"/>
 				<path id="kvg:05c5e-s11" kvg:type="㇀" d="M48.09,84.45c0.55,0.56,1.67,0.91,2.21,0.72c5.46-1.86,20.26-7.96,21.91-8.67"/>
 				<path id="kvg:05c5e-s12" kvg:type="㇔" d="M69.49,72.24c2.73,1.93,7.31,7.95,8,10.96"/>
diff --git a/kanji/05d4e-Kaisho.svg b/kanji/05d4e-Kaisho.svg
index 563c49daf..187d9b1ce 100644
--- a/kanji/05d4e-Kaisho.svg
+++ b/kanji/05d4e-Kaisho.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:05d4e-Kaisho-g5" kvg:element="禸">
-			<path id="kvg:05d4e-Kaisho-s8" kvg:type="㇑" d="M47.01,54.54c0.8,0.66,1.37,2.47,1.43,3.65c0.27,5.81,0.85,32.22,1.29,38.69"/>
-			<path id="kvg:05d4e-Kaisho-s9" kvg:type="㇆" d="M48.94,58.76c6.4-0.79,42.62-4.94,43.9-4.92c1.93,0.03,3.6,2.16,3.54,5.77c-0.17,9.57-1.81,23.48-4.08,31.96c-1.79,6.68-4.54,3.18-6.58-0.23"/>
-			<g id="kvg:05d4e-Kaisho-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:05d4e-Kaisho-g6" kvg:element="冂">
+				<path id="kvg:05d4e-Kaisho-s8" kvg:type="㇑" d="M47.01,54.54c0.8,0.66,1.37,2.47,1.43,3.65c0.27,5.81,0.85,32.22,1.29,38.69"/>
+				<path id="kvg:05d4e-Kaisho-s9" kvg:type="㇆" d="M48.94,58.76c6.4-0.79,42.62-4.94,43.9-4.92c1.93,0.03,3.6,2.16,3.54,5.77c-0.17,9.57-1.81,23.48-4.08,31.96c-1.79,6.68-4.54,3.18-6.58-0.23"/>
+			</g>
+			<g id="kvg:05d4e-Kaisho-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:05d4e-Kaisho-s10" kvg:type="㇑" d="M69.16,18.39c0.42,0.9,1.07,1.79,1.07,3.35c-0.02,6.87,0.11,50.14,0.1,52.25"/>
 			</g>
 			<path id="kvg:05d4e-Kaisho-s11" kvg:type="６" d="M56.39,75.42c1.34,0.85,2.82,1.34,4.01,1.05c3.34-0.8,17.07-4.49,24.07-5.91"/>
diff --git a/kanji/05d4e.svg b/kanji/05d4e.svg
index 77c202273..60e7a8942 100644
--- a/kanji/05d4e.svg
+++ b/kanji/05d4e.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:05d4e-g5" kvg:element="禸">
-			<path id="kvg:05d4e-s8" kvg:type="㇑" d="M47.01,54.54c0.8,0.66,1.37,2.47,1.43,3.65c0.27,5.81,0.85,32.22,1.29,38.69"/>
-			<path id="kvg:05d4e-s9" kvg:type="㇆" d="M48.94,58.76c6.4-0.79,42.62-4.94,43.9-4.92c1.93,0.03,3.6,2.16,3.54,5.77c-0.17,9.57-1.81,23.48-4.08,31.96c-1.79,6.68-4.54,3.18-6.58-0.23"/>
-			<g id="kvg:05d4e-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:05d4e-g6" kvg:element="冂">
+				<path id="kvg:05d4e-s8" kvg:type="㇑" d="M47.01,54.54c0.8,0.66,1.37,2.47,1.43,3.65c0.27,5.81,0.85,32.22,1.29,38.69"/>
+				<path id="kvg:05d4e-s9" kvg:type="㇆" d="M48.94,58.76c6.4-0.79,42.62-4.94,43.9-4.92c1.93,0.03,3.6,2.16,3.54,5.77c-0.17,9.57-1.81,23.48-4.08,31.96c-1.79,6.68-4.54,3.18-6.58-0.23"/>
+			</g>
+			<g id="kvg:05d4e-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:05d4e-s10" kvg:type="㇑" d="M69.16,18.39c0.42,0.9,1.07,1.79,1.07,3.35c-0.02,6.87,0.11,50.14,0.1,52.25"/>
 			</g>
 			<path id="kvg:05d4e-s11" kvg:type="６" d="M56.39,75.42c1.34,0.85,2.82,1.34,4.01,1.05c3.34-0.8,17.07-4.49,24.07-5.91"/>
diff --git a/kanji/0611a-Kaisho.svg b/kanji/0611a-Kaisho.svg
index 8430fc366..1de221e97 100644
--- a/kanji/0611a-Kaisho.svg
+++ b/kanji/0611a-Kaisho.svg
@@ -47,16 +47,18 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:0611a-Kaisho-g4" kvg:element="禸">
-			<path id="kvg:0611a-Kaisho-s5" kvg:type="㇑" d="M25.66,45.32c0.96,0.36,1.65,1.43,1.72,2.15c0.33,3.52,2.26,18.63,2.8,22.55"/>
-			<path id="kvg:0611a-Kaisho-s6" kvg:type="㇆" d="M27.38,47.51c7.67-0.84,51.03-5.36,52.57-5.42c2.31-0.09,4.32,1.12,4.25,3.32C84,51.25,83,59.75,80.54,65.07c-2.58,5.59-3.83,3.32-6.68,0.17"/>
-			<g id="kvg:0611a-Kaisho-g5" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:0611a-Kaisho-g5" kvg:element="冂">
+				<path id="kvg:0611a-Kaisho-s5" kvg:type="㇑" d="M25.66,45.32c0.96,0.36,1.65,1.43,1.72,2.15c0.33,3.52,2.26,18.63,2.8,22.55"/>
+				<path id="kvg:0611a-Kaisho-s6" kvg:type="㇆" d="M27.38,47.51c7.67-0.84,51.03-5.36,52.57-5.42c2.31-0.09,4.32,1.12,4.25,3.32C84,51.25,83,59.75,80.54,65.07c-2.58,5.59-3.83,3.32-6.68,0.17"/>
+			</g>
+			<g id="kvg:0611a-Kaisho-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:0611a-Kaisho-s7" kvg:type="㇑" d="M52.72,16.98c0.5,0.64,1.29,1.27,1.28,2.43c-0.01,5.1,0.21,35.41,0.21,36.98"/>
 			</g>
 			<path id="kvg:0611a-Kaisho-s8" kvg:type="６" d="M39.92,59.96c1.33,0.86,2.81,1.32,3.99,0.96c3.32-1.02,16.97-5.65,23.93-7.51"/>
 			<path id="kvg:0611a-Kaisho-s9" kvg:type="㇔" d="M63.65,49.06c3.03,1.54,7.82,6.43,8.57,8.92"/>
 		</g>
 	</g>
-	<g id="kvg:0611a-Kaisho-g6" kvg:element="心" kvg:position="bottom" kvg:radical="general">
+	<g id="kvg:0611a-Kaisho-g7" kvg:element="心" kvg:position="bottom" kvg:radical="general">
 		<path id="kvg:0611a-Kaisho-s10" kvg:type="㇔" d="M25.33,79.07c0.28,2.28-2.78,12.36-5,16.17"/>
 		<path id="kvg:0611a-Kaisho-s11" kvg:type="㇟b" d="M34.25,75.5c10.25,14.5,15,21,42.46,20.93c8.54-0.02,8.54-4.18,2.64-7.51"/>
 		<path id="kvg:0611a-Kaisho-s12" kvg:type="㇔a" d="M55.77,72.75c1.62,3,5.86,9.69,6.87,5.46"/>
diff --git a/kanji/0611a.svg b/kanji/0611a.svg
index 180306923..8862b2855 100644
--- a/kanji/0611a.svg
+++ b/kanji/0611a.svg
@@ -47,16 +47,18 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:0611a-g4" kvg:element="禸">
-			<path id="kvg:0611a-s5" kvg:type="㇑" d="M26.29,45.19c0.82,0.82,1.26,1.92,1.32,2.63c0.39,4.42,0.99,10.66,1.71,16.69c0.26,2.16,0.48,3.96,0.61,4.99"/>
-			<path id="kvg:0611a-s6" kvg:type="㇆a" d="M28.38,47.51c7.67-0.84,50.03-5.36,51.57-5.42c3.32-0.12,4.33,1.99,4.18,4.91c-0.31,5.71-1.33,13.22-3.58,18.07c-2.58,5.59-3.83,3.32-6.68,0.17"/>
-			<g id="kvg:0611a-g5" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:0611a-g5" kvg:element="冂">
+				<path id="kvg:0611a-s5" kvg:type="㇑" d="M26.29,45.19c0.82,0.82,1.26,1.92,1.32,2.63c0.39,4.42,0.99,10.66,1.71,16.69c0.26,2.16,0.48,3.96,0.61,4.99"/>
+				<path id="kvg:0611a-s6" kvg:type="㇆a" d="M28.38,47.51c7.67-0.84,50.03-5.36,51.57-5.42c3.32-0.12,4.33,1.99,4.18,4.91c-0.31,5.71-1.33,13.22-3.58,18.07c-2.58,5.59-3.83,3.32-6.68,0.17"/>
+			</g>
+			<g id="kvg:0611a-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:0611a-s7" kvg:type="㇑a" d="M52.97,17.48c0.77,0.77,1.03,1.77,1.03,2.93c0,6.46,0.12,32.44,0.12,35.96"/>
 			</g>
 			<path id="kvg:0611a-s8" kvg:type="㇀" d="M40.67,60.21c0.95,1.04,2.56,0.82,3.74,0.46c3.32-1.02,15.21-4.66,23.43-7.26"/>
 			<path id="kvg:0611a-s9" kvg:type="㇔" d="M63.65,49.06c3.03,1.54,7.82,6.43,8.57,8.92"/>
 		</g>
 	</g>
-	<g id="kvg:0611a-g6" kvg:element="心" kvg:position="bottom" kvg:radical="general">
+	<g id="kvg:0611a-g7" kvg:element="心" kvg:position="bottom" kvg:radical="general">
 		<path id="kvg:0611a-s10" kvg:type="㇔" d="M25.37,79.12c0.29,2.24-2.94,12.13-5.29,15.86"/>
 		<path id="kvg:0611a-s11" kvg:type="㇟b" d="M34.75,75.5c10.25,14.5,15,21,42.46,20.93c8.54-0.02,9.79-3.56,2.64-7.51"/>
 		<path id="kvg:0611a-s12" kvg:type="㇔a" d="M55.77,72.75c2.36,4.38,6.11,8.69,7.12,4.46"/>
diff --git a/kanji/064d2.svg b/kanji/064d2.svg
index 821dc0b7c..e2d85c85f 100644
--- a/kanji/064d2.svg
+++ b/kanji/064d2.svg
@@ -65,8 +65,10 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:064d2-g10" kvg:element="禸">
-				<path id="kvg:064d2-s12" kvg:type="㇑" d="M 44.31,69.53 c 0.58,1.17 1.43,2.67 1.52,3.52 0.45,4.18 1.05,17.06 1.79,24.95"/>
-				<path id="kvg:064d2-s13" kvg:type="㇆" d="M 46.2,72.92 c 6.87,-0.49 41.73,-3.47 43,-3.7 2.71,-0.5 4.51,1.21 4.41,2.68 -0.24,3.53 -2.63,18.7 -4.77,23.19 -2.67,5.6 -3.64,3.45 -6.04,-0.04"/>
+				<g id="kvg:064d2-g11" kvg:element="冂">
+					<path id="kvg:064d2-s12" kvg:type="㇑" d="M 44.31,69.53 c 0.58,1.17 1.43,2.67 1.52,3.52 0.45,4.18 1.05,17.06 1.79,24.95"/>
+					<path id="kvg:064d2-s13" kvg:type="㇆" d="M 46.2,72.92 c 6.87,-0.49 41.73,-3.47 43,-3.7 2.71,-0.5 4.51,1.21 4.41,2.68 -0.24,3.53 -2.63,18.7 -4.77,23.19 -2.67,5.6 -3.64,3.45 -6.04,-0.04"/>
+				</g>
 				<path id="kvg:064d2-s14" kvg:type="㇜" d="M 66.82,64.44 c 0.31,0.37 0.53,1.35 0.31,1.81 -1.698221,8.215971 -3.110634,13.119673 -5.831759,18.788548"/>
 				<path id="kvg:064d2-s15" kvg:type="㇜" d="M 55.109673,86.347873 c 4.05,-0.62 13.5,-3.2 21.53,-4.47"/>
 				<path id="kvg:064d2-s16" kvg:type="㇔" d="M 73.33,76.32 c 2.66,1.8 6.88,7.38 7.54,10.18"/>
diff --git a/kanji/06f13-Kaisho.svg b/kanji/06f13-Kaisho.svg
index c3baff8e3..097c901e4 100644
--- a/kanji/06f13-Kaisho.svg
+++ b/kanji/06f13-Kaisho.svg
@@ -60,10 +60,14 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:06f13-Kaisho-g8" kvg:element="禸">
-			<path id="kvg:06f13-Kaisho-s10" kvg:type="㇑" d="M42.9,61.73c0.75,0.9,0.88,2.34,1.01,3.98C44.25,70,45.66,96.29,45.66,99"/>
-			<path id="kvg:06f13-Kaisho-s11" kvg:type="㇆" d="M44.13,63.46c6.68-0.76,46.19-2.96,47.52-2.96c1.93,0,3.16,0.57,3.16,2.27c0,3.59-2.07,23.36-3.35,28.72c-2.06,8.65-5.45,3.74-7.24,1.94"/>
-			<path id="kvg:06f13-Kaisho-s12" kvg:type="㇑" d="M66.54,53.25c0.29,0.5,0.37,2.46,0.1,3.08c-3.88,8.92-8.29,15.85-12.27,21.57c-1.26,1.81-1.25,3.35,0.58,2.81c8.3-2.46,15.55-4.46,22.99-6.56"/>
-			<path id="kvg:06f13-Kaisho-s13" kvg:type="㇐" d="M73.08,66.81c3.08,2.76,7.96,11.36,8.73,15.66"/>
+			<g id="kvg:06f13-Kaisho-g9" kvg:element="冂">
+				<path id="kvg:06f13-Kaisho-s10" kvg:type="㇑" d="M42.9,61.73c0.75,0.9,0.88,2.34,1.01,3.98C44.25,70,45.66,96.29,45.66,99"/>
+				<path id="kvg:06f13-Kaisho-s11" kvg:type="㇆" d="M44.13,63.46c6.68-0.76,46.19-2.96,47.52-2.96c1.93,0,3.16,0.57,3.16,2.27c0,3.59-2.07,23.36-3.35,28.72c-2.06,8.65-5.45,3.74-7.24,1.94"/>
+			</g>
+			<g id="kvg:06f13-Kaisho-g10" kvg:element="厶">
+				<path id="kvg:06f13-Kaisho-s12" kvg:type="㇑" d="M66.54,53.25c0.29,0.5,0.37,2.46,0.1,3.08c-3.88,8.92-8.29,15.85-12.27,21.57c-1.26,1.81-1.25,3.35,0.58,2.81c8.3-2.46,15.55-4.46,22.99-6.56"/>
+				<path id="kvg:06f13-Kaisho-s13" kvg:type="㇐" d="M73.08,66.81c3.08,2.76,7.96,11.36,8.73,15.66"/>
+			</g>
 		</g>
 	</g>
 </g>
diff --git a/kanji/07658-Kaisho.svg b/kanji/07658-Kaisho.svg
index 4b2f7b24c..0248a55c5 100644
--- a/kanji/07658-Kaisho.svg
+++ b/kanji/07658-Kaisho.svg
@@ -60,9 +60,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07658-Kaisho-g7" kvg:element="禸">
-				<path id="kvg:07658-Kaisho-s13" kvg:type="㇑" d="M37.69,72.61c0.8,0.34,1.37,1.34,1.43,2.01c0.28,3.31,1.88,18.47,2.33,22.14"/>
-				<path id="kvg:07658-Kaisho-s14" kvg:type="㇆" d="M39.12,73.66c6.39-0.79,45.54-3.03,46.82-3.08c1.92-0.08,3.6,1.05,3.54,3.12c-0.16,5.48-1.99,14.45-4.04,19.43c-2.15,5.24-4.19,3.11-6.57,0.16"/>
-				<g id="kvg:07658-Kaisho-g8" kvg:element="田" kvg:part="2" kvg:variant="true">
+				<g id="kvg:07658-Kaisho-g8" kvg:element="冂">
+					<path id="kvg:07658-Kaisho-s13" kvg:type="㇑" d="M37.69,72.61c0.8,0.34,1.37,1.34,1.43,2.01c0.28,3.31,1.88,18.47,2.33,22.14"/>
+					<path id="kvg:07658-Kaisho-s14" kvg:type="㇆" d="M39.12,73.66c6.39-0.79,45.54-3.03,46.82-3.08c1.92-0.08,3.6,1.05,3.54,3.12c-0.16,5.48-1.99,14.45-4.04,19.43c-2.15,5.24-4.19,3.11-6.57,0.16"/>
+				</g>
+				<g id="kvg:07658-Kaisho-g9" kvg:element="田" kvg:part="2" kvg:variant="true">
 					<path id="kvg:07658-Kaisho-s15" kvg:type="㇑" d="M61.24,46.05c0.42,0.6,1.07,1.19,1.07,2.28c-0.01,4.79,0.18,33.2,0.18,34.67"/>
 				</g>
 				<path id="kvg:07658-Kaisho-s16" kvg:type="６" d="M51.83,86.4c1.16,0.75,2.44,1.15,3.47,0.83c2.89-0.89,14.75-4.93,20.8-6.55"/>
diff --git a/kanji/07658.svg b/kanji/07658.svg
index 58c516549..83a29a4cd 100644
--- a/kanji/07658.svg
+++ b/kanji/07658.svg
@@ -60,9 +60,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07658-g7" kvg:element="禸">
-				<path id="kvg:07658-s13" kvg:type="㇑" d="M37.69,72.61c0.8,0.34,1.37,1.34,1.43,2.01c0.28,3.31,1.88,18.47,2.33,22.14"/>
-				<path id="kvg:07658-s14" kvg:type="㇆" d="M39.12,73.66c6.39-0.79,45.54-3.03,46.82-3.08c1.92-0.08,3.6,1.05,3.54,3.12c-0.16,5.48-1.99,14.45-4.04,19.43c-2.15,5.24-4.19,3.11-6.57,0.16"/>
-				<g id="kvg:07658-g8" kvg:element="田" kvg:part="2" kvg:variant="true">
+				<g id="kvg:07658-g8" kvg:element="冂">
+					<path id="kvg:07658-s13" kvg:type="㇑" d="M37.69,72.61c0.8,0.34,1.37,1.34,1.43,2.01c0.28,3.31,1.88,18.47,2.33,22.14"/>
+					<path id="kvg:07658-s14" kvg:type="㇆" d="M39.12,73.66c6.39-0.79,45.54-3.03,46.82-3.08c1.92-0.08,3.6,1.05,3.54,3.12c-0.16,5.48-1.99,14.45-4.04,19.43c-2.15,5.24-4.19,3.11-6.57,0.16"/>
+				</g>
+				<g id="kvg:07658-g9" kvg:element="田" kvg:part="2" kvg:variant="true">
 					<path id="kvg:07658-s15" kvg:type="㇑" d="M61.24,46.05c0.42,0.6,1.07,1.19,1.07,2.28c-0.01,4.79,0.18,33.2,0.18,34.67"/>
 				</g>
 				<path id="kvg:07658-s16" kvg:type="６" d="M51.83,86.4c1.16,0.75,2.44,1.15,3.47,0.83c2.89-0.89,14.75-4.93,20.8-6.55"/>
diff --git a/kanji/0792a-Kaisho.svg b/kanji/0792a-Kaisho.svg
index 4f3018698..fb69657b5 100644
--- a/kanji/0792a-Kaisho.svg
+++ b/kanji/0792a-Kaisho.svg
@@ -68,9 +68,11 @@ kvg:type CDATA #IMPLIED >
 						</g>
 					</g>
 					<g id="kvg:0792a-Kaisho-g11" kvg:element="禸">
-						<path id="kvg:0792a-Kaisho-s15" kvg:type="㇑" d="M53.52,66.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,1.01,22.74,1.5,27.76"/>
-						<path id="kvg:0792a-Kaisho-s16" kvg:type="㇆" d="M55.25,69.3c5.48-0.81,39.01-4.17,40.1-4.23c1.65-0.08,3.09,1.08,3.04,3.21c-0.13,5.64-2.85,20.34-4.61,25.46c-1.85,5.39-4.24,2.2-6.28-0.84"/>
-						<g id="kvg:0792a-Kaisho-g12" kvg:element="田" kvg:part="2" kvg:variant="true">
+						<g id="kvg:0792a-Kaisho-g12" kvg:element="冂">
+							<path id="kvg:0792a-Kaisho-s15" kvg:type="㇑" d="M53.52,66.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,1.01,22.74,1.5,27.76"/>
+							<path id="kvg:0792a-Kaisho-s16" kvg:type="㇆" d="M55.25,69.3c5.48-0.81,39.01-4.17,40.1-4.23c1.65-0.08,3.09,1.08,3.04,3.21c-0.13,5.64-2.85,20.34-4.61,25.46c-1.85,5.39-4.24,2.2-6.28-0.84"/>
+						</g>
+						<g id="kvg:0792a-Kaisho-g13" kvg:element="田" kvg:part="2" kvg:variant="true">
 							<path id="kvg:0792a-Kaisho-s17" kvg:type="㇑" d="M73.87,41.86c0.36,0.62,0.92,1.22,0.92,2.35c-0.01,4.92,0.15,32.66,0.15,34.17"/>
 						</g>
 						<path id="kvg:0792a-Kaisho-s18" kvg:type="６" d="M62.22,80.88c1.12,0.78,2.36,1.19,3.35,0.86c2.79-0.91,14.27-5.08,20.12-6.75"/>
diff --git a/kanji/0792a.svg b/kanji/0792a.svg
index ea220f640..157702ea0 100644
--- a/kanji/0792a.svg
+++ b/kanji/0792a.svg
@@ -68,9 +68,11 @@ kvg:type CDATA #IMPLIED >
 						</g>
 					</g>
 					<g id="kvg:0792a-g11" kvg:element="禸">
-						<path id="kvg:0792a-s15" kvg:type="㇑" d="M53.52,66.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,1.01,22.74,1.5,27.76"/>
-						<path id="kvg:0792a-s16" kvg:type="㇆" d="M55.25,69.3c5.48-0.81,39.01-4.17,40.1-4.23c1.65-0.08,3.09,1.08,3.04,3.21c-0.13,5.64-2.85,20.34-4.61,25.46c-1.85,5.39-4.24,2.2-6.28-0.84"/>
-						<g id="kvg:0792a-g12" kvg:element="田" kvg:part="2" kvg:variant="true">
+						<g id="kvg:0792a-g12" kvg:element="冂">
+							<path id="kvg:0792a-s15" kvg:type="㇑" d="M53.52,66.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,1.01,22.74,1.5,27.76"/>
+							<path id="kvg:0792a-s16" kvg:type="㇆" d="M55.25,69.3c5.48-0.81,39.01-4.17,40.1-4.23c1.65-0.08,3.09,1.08,3.04,3.21c-0.13,5.64-2.85,20.34-4.61,25.46c-1.85,5.39-4.24,2.2-6.28-0.84"/>
+						</g>
+						<g id="kvg:0792a-g13" kvg:element="田" kvg:part="2" kvg:variant="true">
 							<path id="kvg:0792a-s17" kvg:type="㇑" d="M73.87,41.86c0.36,0.62,0.92,1.22,0.92,2.35c-0.01,4.92,0.15,32.66,0.15,34.17"/>
 						</g>
 						<path id="kvg:0792a-s18" kvg:type="６" d="M62.22,80.88c1.12,0.78,2.36,1.19,3.35,0.86c2.79-0.91,14.27-5.08,20.12-6.75"/>
diff --git a/kanji/079b9.svg b/kanji/079b9.svg
index cfb737807..9fd87be1d 100644
--- a/kanji/079b9.svg
+++ b/kanji/079b9.svg
@@ -46,9 +46,11 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:079b9-s4" kvg:type="㇐" d="M32.52,55.72c9.9-1,32.36-2.53,46.21-3.46"/>
 	</g>
 	<g id="kvg:079b9-g3" kvg:element="禸" kvg:variant="true" kvg:radical="general">
-		<path id="kvg:079b9-s5" kvg:type="㇑" d="M21.25,65.91c0.72,0.61,1.32,1.58,1.46,2.69c0.79,6.65,3.24,30.06,3.24,31.9"/>
-		<path id="kvg:079b9-s6" kvg:type="㇆a" d="M22.21,67.63c9.1-0.49,62.53-3.71,64.32-3.95c3.22-0.43,3.95,1.07,3.73,3.47C89.25,78,87,87,84.03,94.94c-1.59,4.24-4.07,2.33-6.94,0.73"/>
-		<g id="kvg:079b9-g4" kvg:element="虫" kvg:part="2">
+		<g id="kvg:079b9-g4" kvg:element="冂">
+			<path id="kvg:079b9-s5" kvg:type="㇑" d="M21.25,65.91c0.72,0.61,1.32,1.58,1.46,2.69c0.79,6.65,3.24,30.06,3.24,31.9"/>
+			<path id="kvg:079b9-s6" kvg:type="㇆a" d="M22.21,67.63c9.1-0.49,62.53-3.71,64.32-3.95c3.22-0.43,3.95,1.07,3.73,3.47C89.25,78,87,87,84.03,94.94c-1.59,4.24-4.07,2.33-6.94,0.73"/>
+		</g>
+		<g id="kvg:079b9-g5" kvg:element="虫" kvg:part="2">
 			<path id="kvg:079b9-s7" kvg:type="㇑" d="M52.52,22.25c0.99,0.38,1.78,2.18,1.78,2.96c0,5.04,0.5,49.72,0.3,54.44"/>
 			<path id="kvg:079b9-s8" kvg:type="㇐" d="M37.92,83.92c0.71,0.7,2.14,1.13,2.83,0.9c6.99-2.32,25.65-7.43,27.76-8.31"/>
 			<path id="kvg:079b9-s9" kvg:type="㇔" d="M65.34,71.2c3.5,2.41,9.05,9.91,9.93,13.66"/>
diff --git a/kanji/079ba-Kaisho.svg b/kanji/079ba-Kaisho.svg
index e7ac97ebf..8059d4eb9 100644
--- a/kanji/079ba-Kaisho.svg
+++ b/kanji/079ba-Kaisho.svg
@@ -46,9 +46,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:079ba-Kaisho-g3" kvg:element="禸" kvg:radical="general">
-		<path id="kvg:079ba-Kaisho-s5" kvg:type="㇑" d="M20.78,56.39c0.72,0.86,2.45,2.57,2.61,3.8C24.25,66.75,28,92.25,28.98,99"/>
-		<path id="kvg:079ba-Kaisho-s6" kvg:type="㇆" d="M23.35,59.79c8.65-0.96,58.1-4.96,59.8-5.3c3.64-0.72,6.05,1.76,5.92,3.88C88.75,63.5,85,85.5,82.13,92c-3.58,8.12-4.88,5-8.1-0.06"/>
-		<g id="kvg:079ba-Kaisho-g4" kvg:element="田" kvg:part="2" kvg:variant="true">
+		<g id="kvg:079ba-Kaisho-g4" kvg:element="冂">
+			<path id="kvg:079ba-Kaisho-s5" kvg:type="㇑" d="M20.78,56.39c0.72,0.86,2.45,2.57,2.61,3.8C24.25,66.75,28,92.25,28.98,99"/>
+			<path id="kvg:079ba-Kaisho-s6" kvg:type="㇆" d="M23.35,59.79c8.65-0.96,58.1-4.96,59.8-5.3c3.64-0.72,6.05,1.76,5.92,3.88C88.75,63.5,85,85.5,82.13,92c-3.58,8.12-4.88,5-8.1-0.06"/>
+		</g>
+		<g id="kvg:079ba-Kaisho-g5" kvg:element="田" kvg:part="2" kvg:variant="true">
 			<path id="kvg:079ba-Kaisho-s7" kvg:type="㇑" d="M52.44,16.59C53,17.5,53.89,18.4,53.88,20c-0.01,7.03,0.24,50.84,0.24,53"/>
 		</g>
 		<path id="kvg:079ba-Kaisho-s8" kvg:type="６" d="M38,77.25c1.5,1.25,3.17,1.94,4.5,1.5C46.25,77.5,61.15,72.25,69,70"/>
diff --git a/kanji/079ba.svg b/kanji/079ba.svg
index 254272831..7fe423f92 100644
--- a/kanji/079ba.svg
+++ b/kanji/079ba.svg
@@ -46,9 +46,11 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:079ba-g3" kvg:element="禸" kvg:radical="general">
-		<path id="kvg:079ba-s5" kvg:type="㇑" d="M20.78,56.39c0.72,0.86,2.45,2.57,2.61,3.8C24.25,66.75,28,92.25,28.98,99"/>
-		<path id="kvg:079ba-s6" kvg:type="㇆" d="M23.35,59.79c8.65-0.96,58.1-4.96,59.8-5.3c3.64-0.72,6.05,1.76,5.92,3.88C88.75,63.5,85,85.5,82.13,92c-3.58,8.12-4.88,5-8.1-0.06"/>
-		<g id="kvg:079ba-g4" kvg:element="田" kvg:part="2" kvg:variant="true">
+		<g id="kvg:079ba-g4" kvg:element="冂">
+			<path id="kvg:079ba-s5" kvg:type="㇑" d="M20.78,56.39c0.72,0.86,2.45,2.57,2.61,3.8C24.25,66.75,28,92.25,28.98,99"/>
+			<path id="kvg:079ba-s6" kvg:type="㇆" d="M23.35,59.79c8.65-0.96,58.1-4.96,59.8-5.3c3.64-0.72,6.05,1.76,5.92,3.88C88.75,63.5,85,85.5,82.13,92c-3.58,8.12-4.88,5-8.1-0.06"/>
+		</g>
+		<g id="kvg:079ba-g5" kvg:element="田" kvg:part="2" kvg:variant="true">
 			<path id="kvg:079ba-s7" kvg:type="㇑" d="M52.44,16.59C53,17.5,53.89,18.4,53.88,20c-0.01,7.03,0.24,50.84,0.24,53"/>
 		</g>
 		<path id="kvg:079ba-s8" kvg:type="６" d="M38,77.25c1.5,1.25,3.17,1.94,4.5,1.5C46.25,77.5,61.15,72.25,69,70"/>
diff --git a/kanji/079bd.svg b/kanji/079bd.svg
index fb49a0dd9..c974dd266 100644
--- a/kanji/079bd.svg
+++ b/kanji/079bd.svg
@@ -59,8 +59,10 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:079bd-g8" kvg:element="禸" kvg:radical="tradit">
-			<path id="kvg:079bd-s9" kvg:type="㇑" d="M 24.77,67.95 c 1.08,1.08 1.29,2.71 1.41,3.65 0.44,3.56 1.13,12.68 1.74,21.03 0.18,2.5 0.36,4.93 0.51,7.12"/>
-			<path id="kvg:079bd-s10" kvg:type="㇆" d="M 26.89,70.54 c 7.97,-0.5 44.64,-3.2 53,-3.89 4.61,-0.38 6.57,0.9 5.86,5.75 -0.9,6.2 -3.37,17.35 -5.4,23.01 -2.38,6.64 -4.56,3.82 -7.57,-0.05"/>
+			<g id="kvg:079bd-g9" kvg:element="冂">
+				<path id="kvg:079bd-s9" kvg:type="㇑" d="M 24.77,67.95 c 1.08,1.08 1.29,2.71 1.41,3.65 0.44,3.56 1.13,12.68 1.74,21.03 0.18,2.5 0.36,4.93 0.51,7.12"/>
+				<path id="kvg:079bd-s10" kvg:type="㇆" d="M 26.89,70.54 c 7.97,-0.5 44.64,-3.2 53,-3.89 4.61,-0.38 6.57,0.9 5.86,5.75 -0.9,6.2 -3.37,17.35 -5.4,23.01 -2.38,6.64 -4.56,3.82 -7.57,-0.05"/>
+			</g>
 			<path id="kvg:079bd-s11" kvg:type="㇜" d="M 53.63,62 c -0.13,1.38 -0.57,2.21 -1.13,3.2 -1.848221,5.99726 -3.36499,10.535808 -4.993047,15.264519"/>
 			<path id="kvg:079bd-s12" kvg:type="㇜" d="M 43.29,82.84 C 50,81.5 56,80.38 65.75,78.62"/>
 			<path id="kvg:079bd-s13" kvg:type="㇔" d="M 61.54,71.34 c 3.72,2.36 9.12,9.96 10.05,13.63"/>
diff --git a/kanji/07aca-Kaisho.svg b/kanji/07aca-Kaisho.svg
index 813777822..ca9b15905 100644
--- a/kanji/07aca-Kaisho.svg
+++ b/kanji/07aca-Kaisho.svg
@@ -74,10 +74,14 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07aca-Kaisho-s17" kvg:type="㇒" d="M71,51.89c0.03,0.3,0.05,0.77-0.05,1.19c-0.6,2.51-4.02,8.01-8.72,11.38"/>
 			<path id="kvg:07aca-Kaisho-s18" kvg:type="㇏" d="M71.1,57.08c3.24,0.99,8.36,4.09,9.17,5.63"/>
 			<g id="kvg:07aca-Kaisho-g11" kvg:element="禸">
-				<path id="kvg:07aca-Kaisho-s19" kvg:type="㇑" d="M50.71,70.85c0.62,1.09,1.54,2.48,1.64,3.27c0.48,3.87,1.13,16.82,1.93,24.14"/>
-				<path id="kvg:07aca-Kaisho-s20" kvg:type="㇆" d="M51.73,71.69c6.25-0.49,37.96-2.99,39.11-3.23c2.47-0.5,4.1,1.22,4.01,2.7c-0.21,3.56-2.39,18.85-4.34,23.37c-2.43,5.64-3.31,3.47-5.49-0.04"/>
-				<path id="kvg:07aca-Kaisho-s21" kvg:type="㇜" d="M 69.305619,72.754335 c -1.243842,3.114086 -3.828378,6.947698 -9.025362,13.180899 -1.06,1.61 -1.06,1.96 0.49,1.61 C 64.020257,86.795234 72.75,83.38 79.2,81.86"/>
-				<path id="kvg:07aca-Kaisho-s22" kvg:type="㇔" d="M74.5,75.75c3.26,2.03,8.43,8.34,9.25,11.5"/>
+				<g id="kvg:07aca-Kaisho-g12" kvg:element="冂">
+					<path id="kvg:07aca-Kaisho-s19" kvg:type="㇑" d="M50.71,70.85c0.62,1.09,1.54,2.48,1.64,3.27c0.48,3.87,1.13,16.82,1.93,24.14"/>
+					<path id="kvg:07aca-Kaisho-s20" kvg:type="㇆" d="M51.73,71.69c6.25-0.49,37.96-2.99,39.11-3.23c2.47-0.5,4.1,1.22,4.01,2.7c-0.21,3.56-2.39,18.85-4.34,23.37c-2.43,5.64-3.31,3.47-5.49-0.04"/>
+				</g>
+				<g id="kvg:07aca-Kaisho-g13" kvg:element="厶">
+					<path id="kvg:07aca-Kaisho-s21" kvg:type="㇜" d="M 69.305619,72.754335 c -1.243842,3.114086 -3.828378,6.947698 -9.025362,13.180899 -1.06,1.61 -1.06,1.96 0.49,1.61 C 64.020257,86.795234 72.75,83.38 79.2,81.86"/>
+					<path id="kvg:07aca-Kaisho-s22" kvg:type="㇔" d="M74.5,75.75c3.26,2.03,8.43,8.34,9.25,11.5"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/07aca-KaishoHzFst.svg b/kanji/07aca-KaishoHzFst.svg
index e18b9fe19..fa9fe86d8 100644
--- a/kanji/07aca-KaishoHzFst.svg
+++ b/kanji/07aca-KaishoHzFst.svg
@@ -74,10 +74,14 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07aca-KaishoHzFst-s17" kvg:type="㇒" d="M71,51.89c0.03,0.3,0.05,0.77-0.05,1.19c-0.6,2.51-4.02,8.01-8.72,11.38"/>
 			<path id="kvg:07aca-KaishoHzFst-s18" kvg:type="㇏" d="M71.1,57.08c3.24,0.99,8.36,4.09,9.17,5.63"/>
 			<g id="kvg:07aca-KaishoHzFst-g11" kvg:element="禸">
-				<path id="kvg:07aca-KaishoHzFst-s19" kvg:type="㇑" d="M50.71,70.85c0.62,1.09,1.54,2.48,1.64,3.27c0.48,3.87,1.13,16.82,1.93,24.14"/>
-				<path id="kvg:07aca-KaishoHzFst-s20" kvg:type="㇆" d="M51.73,71.69c6.25-0.49,37.96-2.99,39.11-3.23c2.47-0.5,4.1,1.22,4.01,2.7c-0.21,3.56-2.39,18.85-4.34,23.37c-2.43,5.64-3.31,3.47-5.49-0.04"/>
-				<path id="kvg:07aca-KaishoHzFst-s21" kvg:type="㇜" d="M 69.305619,72.754335 c -1.243842,3.114086 -3.828378,6.947698 -9.025362,13.180899 -1.06,1.61 -1.06,1.96 0.49,1.61 C 64.020257,86.795234 72.75,83.38 79.2,81.86"/>
-				<path id="kvg:07aca-KaishoHzFst-s22" kvg:type="㇔" d="M74.5,75.75c3.26,2.03,8.43,8.34,9.25,11.5"/>
+				<g id="kvg:07aca-KaishoHzFst-g12" kvg:element="冂">
+					<path id="kvg:07aca-KaishoHzFst-s19" kvg:type="㇑" d="M50.71,70.85c0.62,1.09,1.54,2.48,1.64,3.27c0.48,3.87,1.13,16.82,1.93,24.14"/>
+					<path id="kvg:07aca-KaishoHzFst-s20" kvg:type="㇆" d="M51.73,71.69c6.25-0.49,37.96-2.99,39.11-3.23c2.47-0.5,4.1,1.22,4.01,2.7c-0.21,3.56-2.39,18.85-4.34,23.37c-2.43,5.64-3.31,3.47-5.49-0.04"/>
+				</g>
+				<g id="kvg:07aca-KaishoHzFst-g13" kvg:element="厶">
+					<path id="kvg:07aca-KaishoHzFst-s21" kvg:type="㇜" d="M 69.305619,72.754335 c -1.243842,3.114086 -3.828378,6.947698 -9.025362,13.180899 -1.06,1.61 -1.06,1.96 0.49,1.61 C 64.020257,86.795234 72.75,83.38 79.2,81.86"/>
+					<path id="kvg:07aca-KaishoHzFst-s22" kvg:type="㇔" d="M74.5,75.75c3.26,2.03,8.43,8.34,9.25,11.5"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/07aca.svg b/kanji/07aca.svg
index f542a5a6b..73f5eb24d 100644
--- a/kanji/07aca.svg
+++ b/kanji/07aca.svg
@@ -74,10 +74,14 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07aca-s17" kvg:type="㇒" d="M 71,51.89 c 0.03,0.3 0.05,0.77 -0.05,1.19 -0.6,2.51 -4.02,8.01 -8.72,11.38"/>
 			<path id="kvg:07aca-s18" kvg:type="㇏" d="M 71.1,57.08 c 3.24,0.99 8.36,4.09 9.17,5.63"/>
 			<g id="kvg:07aca-g11" kvg:element="禸">
-				<path id="kvg:07aca-s19" kvg:type="㇑" d="M 50.71,70.85 c 0.62,1.09 1.54,2.48 1.64,3.27 0.48,3.87 1.13,16.82 1.93,24.14"/>
-				<path id="kvg:07aca-s20" kvg:type="㇆" d="M 51.73,71.69 c 6.25,-0.49 37.96,-2.99 39.11,-3.23 2.47,-0.5 4.1,1.22 4.01,2.7 -0.21,3.56 -2.39,18.85 -4.34,23.37 -2.43,5.64 -3.31,3.47 -5.49,-0.04"/>
-				<path id="kvg:07aca-s21" kvg:type="㇜" d="M 69.305619,72.754335 c -1.243842,3.114086 -3.828378,6.947698 -9.025362,13.180899 -1.06,1.61 -1.06,1.96 0.49,1.61 C 64.020257,86.795234 72.75,83.38 79.2,81.86"/>
-				<path id="kvg:07aca-s22" kvg:type="㇔" d="M 74.5,75.75 c 3.26,2.03 8.43,8.34 9.25,11.5"/>
+				<g id="kvg:07aca-g12" kvg:element="冂">
+					<path id="kvg:07aca-s19" kvg:type="㇑" d="M 50.71,70.85 c 0.62,1.09 1.54,2.48 1.64,3.27 0.48,3.87 1.13,16.82 1.93,24.14"/>
+					<path id="kvg:07aca-s20" kvg:type="㇆" d="M 51.73,71.69 c 6.25,-0.49 37.96,-2.99 39.11,-3.23 2.47,-0.5 4.1,1.22 4.01,2.7 -0.21,3.56 -2.39,18.85 -4.34,23.37 -2.43,5.64 -3.31,3.47 -5.49,-0.04"/>
+				</g>
+				<g id="kvg:07aca-g13" kvg:element="厶">
+					<path id="kvg:07aca-s21" kvg:type="㇜" d="M 69.305619,72.754335 c -1.243842,3.114086 -3.828378,6.947698 -9.025362,13.180899 -1.06,1.61 -1.06,1.96 0.49,1.61 C 64.020257,86.795234 72.75,83.38 79.2,81.86"/>
+					<path id="kvg:07aca-s22" kvg:type="㇔" d="M 74.5,75.75 c 3.26,2.03 8.43,8.34 9.25,11.5"/>
+				</g>
 			</g>
 		</g>
 	</g>
diff --git a/kanji/07c6c-Kaisho.svg b/kanji/07c6c-Kaisho.svg
index 8c432663d..88dbadba4 100644
--- a/kanji/07c6c-Kaisho.svg
+++ b/kanji/07c6c-Kaisho.svg
@@ -68,15 +68,17 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07c6c-Kaisho-g11" kvg:element="禸">
-				<path id="kvg:07c6c-Kaisho-s13" kvg:type="㇑" d="M14.86,69.24c0.39,1.26,1.16,2.49,1.16,3.86C16,77,17.72,96.37,17.7,98.74"/>
-				<path id="kvg:07c6c-Kaisho-s14" kvg:type="㇆" d="M15.51,71.37c4.74-0.68,33.54-4.89,34.49-4.89c1.37,0,2.25,0.5,2.25,2.03c0,3.21-2.23,19.97-3.13,24.76c-1.45,7.75-4.87,2.85-6.14,1.25"/>
+				<g id="kvg:07c6c-Kaisho-g12" kvg:element="冂">
+					<path id="kvg:07c6c-Kaisho-s13" kvg:type="㇑" d="M14.86,69.24c0.39,1.26,1.16,2.49,1.16,3.86C16,77,17.72,96.37,17.7,98.74"/>
+					<path id="kvg:07c6c-Kaisho-s14" kvg:type="㇆" d="M15.51,71.37c4.74-0.68,33.54-4.89,34.49-4.89c1.37,0,2.25,0.5,2.25,2.03c0,3.21-2.23,19.97-3.13,24.76c-1.45,7.75-4.87,2.85-6.14,1.25"/>
+				</g>
 				<path id="kvg:07c6c-Kaisho-s15" kvg:type="㇑" d="M 33.631452,62.979673 C 33.216993,68.060618 31.650451,75.68444 28.707566,82.533231"/>
 				<path id="kvg:07c6c-Kaisho-s16" kvg:type="㇐" d="M25.72,84.65c4.53-1.65,7.17-2.4,15.03-4.73"/>
 				<path id="kvg:07c6c-Kaisho-s17" kvg:type="㇔" d="M37.51,73.85c2.02,2.01,5.23,8.27,5.74,11.4"/>
 			</g>
 		</g>
-		<g id="kvg:07c6c-Kaisho-g12" kvg:element="隹" kvg:position="right">
-			<g id="kvg:07c6c-Kaisho-g13" kvg:element="亻" kvg:variant="true" kvg:original="人">
+		<g id="kvg:07c6c-Kaisho-g13" kvg:element="隹" kvg:position="right">
+			<g id="kvg:07c6c-Kaisho-g14" kvg:element="亻" kvg:variant="true" kvg:original="人">
 				<path id="kvg:07c6c-Kaisho-s18" kvg:type="㇒" d="M66.88,30.73c0.15,1.38-0.04,3.19-0.51,4.38c-2.99,7.55-6.77,13.95-13.62,23.14"/>
 				<path id="kvg:07c6c-Kaisho-s19" kvg:type="㇑" d="M61.88,47.9c0.18,0.74,0.31,2.36,0.33,3.5c0.1,10.2-0.14,42.29-0.06,47.6"/>
 			</g>
diff --git a/kanji/07c6c.svg b/kanji/07c6c.svg
index 3c6e8e3a7..ba39053cf 100644
--- a/kanji/07c6c.svg
+++ b/kanji/07c6c.svg
@@ -68,15 +68,17 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:07c6c-g11" kvg:element="禸">
-				<path id="kvg:07c6c-s13" kvg:type="㇑" d="M 14.86,69.24 c 0.39,1.26 1.16,2.49 1.16,3.86 -0.02,3.9 1.7,23.27 1.68,25.64"/>
-				<path id="kvg:07c6c-s14" kvg:type="㇆" d="M 15.51,71.37 c 4.74,-0.68 33.54,-4.89 34.49,-4.89 1.37,0 2.25,0.5 2.25,2.03 0,3.21 -2.23,19.97 -3.13,24.76 -1.45,7.75 -4.87,2.85 -6.14,1.25"/>
+				<g id="kvg:07c6c-g12" kvg:element="冂">
+					<path id="kvg:07c6c-s13" kvg:type="㇑" d="M 14.86,69.24 c 0.39,1.26 1.16,2.49 1.16,3.86 -0.02,3.9 1.7,23.27 1.68,25.64"/>
+					<path id="kvg:07c6c-s14" kvg:type="㇆" d="M 15.51,71.37 c 4.74,-0.68 33.54,-4.89 34.49,-4.89 1.37,0 2.25,0.5 2.25,2.03 0,3.21 -2.23,19.97 -3.13,24.76 -1.45,7.75 -4.87,2.85 -6.14,1.25"/>
+				</g>
 				<path id="kvg:07c6c-s15" kvg:type="㇑" d="M 33.631452,62.979673 C 33.216993,68.060618 31.650451,75.68444 28.707566,82.533231"/>
 				<path id="kvg:07c6c-s16" kvg:type="㇐" d="M 25.72,84.65 C 30.25,83 32.89,82.25 40.75,79.92"/>
 				<path id="kvg:07c6c-s17" kvg:type="㇔" d="M 37.51,73.85 c 2.02,2.01 5.23,8.27 5.74,11.4"/>
 			</g>
 		</g>
-		<g id="kvg:07c6c-g12" kvg:element="隹" kvg:position="right">
-			<g id="kvg:07c6c-g13" kvg:element="亻" kvg:variant="true" kvg:original="人">
+		<g id="kvg:07c6c-g13" kvg:element="隹" kvg:position="right">
+			<g id="kvg:07c6c-g14" kvg:element="亻" kvg:variant="true" kvg:original="人">
 				<path id="kvg:07c6c-s18" kvg:type="㇒" d="M 66.88,30.73 c 0.15,1.38 -0.04,3.19 -0.51,4.38 -2.99,7.55 -6.77,13.95 -13.62,23.14"/>
 				<path id="kvg:07c6c-s19" kvg:type="㇑" d="M 61.88,47.9 c 0.18,0.74 0.31,2.36 0.33,3.5 0.1,10.2 -0.14,42.29 -0.06,47.6"/>
 			</g>
diff --git a/kanji/07cf2-Kaisho.svg b/kanji/07cf2-Kaisho.svg
index 0d89b39c6..b9c629ac7 100644
--- a/kanji/07cf2-Kaisho.svg
+++ b/kanji/07cf2-Kaisho.svg
@@ -67,9 +67,11 @@ kvg:type CDATA #IMPLIED >
 						</g>
 					</g>
 					<g id="kvg:07cf2-Kaisho-g10" kvg:element="禸">
-						<path id="kvg:07cf2-Kaisho-s16" kvg:type="㇑" d="M55.48,68.44c0.65,0.4,1.11,1.61,1.16,2.41c0.22,3.97,1.03,20.98,1.39,25.39"/>
-						<path id="kvg:07cf2-Kaisho-s17" kvg:type="㇆" d="M56.67,70.89c6.83-0.89,36.28-3.9,37.36-3.97c1.62-0.1,3.04,1.14,3.01,3.43c-0.08,6.08-1.7,15.43-3.38,20.98c-1.76,5.83-3.16,3.48-5.19,0.22"/>
-						<g id="kvg:07cf2-Kaisho-g11" kvg:element="田" kvg:part="2" kvg:variant="true">
+						<g id="kvg:07cf2-Kaisho-g11" kvg:element="冂">
+							<path id="kvg:07cf2-Kaisho-s16" kvg:type="㇑" d="M55.48,68.44c0.65,0.4,1.11,1.61,1.16,2.41c0.22,3.97,1.03,20.98,1.39,25.39"/>
+							<path id="kvg:07cf2-Kaisho-s17" kvg:type="㇆" d="M56.67,70.89c6.83-0.89,36.28-3.9,37.36-3.97c1.62-0.1,3.04,1.14,3.01,3.43c-0.08,6.08-1.7,15.43-3.38,20.98c-1.76,5.83-3.16,3.48-5.19,0.22"/>
+						</g>
+						<g id="kvg:07cf2-Kaisho-g12" kvg:element="田" kvg:part="2" kvg:variant="true">
 							<path id="kvg:07cf2-Kaisho-s18" kvg:type="㇑" d="M74.51,42.36c0.27,0.59,0.69,1.17,0.69,2.24c0,4.7,0.12,32.59,0.12,34.03"/>
 						</g>
 						<path id="kvg:07cf2-Kaisho-s19" kvg:type="６" d="M64.62,80.86c1.03,0.5,2.17,0.77,3.08,0.56c2.56-0.59,13.11-3.29,18.48-4.38"/>
diff --git a/kanji/07cf2.svg b/kanji/07cf2.svg
index 001c52bdc..d2e7f313b 100644
--- a/kanji/07cf2.svg
+++ b/kanji/07cf2.svg
@@ -67,9 +67,11 @@ kvg:type CDATA #IMPLIED >
 						</g>
 					</g>
 					<g id="kvg:07cf2-g10" kvg:element="禸">
-						<path id="kvg:07cf2-s16" kvg:type="㇑" d="M55.48,68.44c0.65,0.4,1.11,1.61,1.16,2.41c0.22,3.97,1.03,20.98,1.39,25.39"/>
-						<path id="kvg:07cf2-s17" kvg:type="㇆" d="M56.67,70.89c6.83-0.89,36.28-3.9,37.36-3.97c1.62-0.1,3.04,1.14,3.01,3.43c-0.08,6.08-1.7,15.43-3.38,20.98c-1.76,5.83-3.16,3.48-5.19,0.22"/>
-						<g id="kvg:07cf2-g11" kvg:element="田" kvg:part="2" kvg:variant="true">
+						<g id="kvg:07cf2-g11" kvg:element="冂">
+							<path id="kvg:07cf2-s16" kvg:type="㇑" d="M55.48,68.44c0.65,0.4,1.11,1.61,1.16,2.41c0.22,3.97,1.03,20.98,1.39,25.39"/>
+							<path id="kvg:07cf2-s17" kvg:type="㇆" d="M56.67,70.89c6.83-0.89,36.28-3.9,37.36-3.97c1.62-0.1,3.04,1.14,3.01,3.43c-0.08,6.08-1.7,15.43-3.38,20.98c-1.76,5.83-3.16,3.48-5.19,0.22"/>
+						</g>
+						<g id="kvg:07cf2-g12" kvg:element="田" kvg:part="2" kvg:variant="true">
 							<path id="kvg:07cf2-s18" kvg:type="㇑" d="M74.51,42.36c0.27,0.59,0.69,1.17,0.69,2.24c0,4.7,0.12,32.59,0.12,34.03"/>
 						</g>
 						<path id="kvg:07cf2-s19" kvg:type="６" d="M64.62,80.86c1.03,0.5,2.17,0.77,3.08,0.56c2.56-0.59,13.11-3.29,18.48-4.38"/>
diff --git a/kanji/0842c-Kaisho.svg b/kanji/0842c-Kaisho.svg
index d033d6da1..783f1bc97 100644
--- a/kanji/0842c-Kaisho.svg
+++ b/kanji/0842c-Kaisho.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:0842c-Kaisho-g5" kvg:element="禸">
-			<path id="kvg:0842c-Kaisho-s8" kvg:type="㇑" d="M20.67,66.33c0.83,0.92,1.42,2.71,1.5,3.67c0.41,4.67,1.18,23.3,1.83,28.5"/>
-			<path id="kvg:0842c-Kaisho-s9" kvg:type="㇆" d="M22.33,69.17c9.03-1.04,60.03-5.26,61.83-5.33c2.72-0.11,6.29,0.57,6.21,3.31C90.15,74.41,89.33,83,87,90.17c-2.35,7.22-4.33,6.17-8.83,3.17"/>
-			<g id="kvg:0842c-Kaisho-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:0842c-Kaisho-g6" kvg:element="冂">
+				<path id="kvg:0842c-Kaisho-s8" kvg:type="㇑" d="M20.67,66.33c0.83,0.92,1.42,2.71,1.5,3.67c0.41,4.67,1.18,23.3,1.83,28.5"/>
+				<path id="kvg:0842c-Kaisho-s9" kvg:type="㇆" d="M22.33,69.17c9.03-1.04,60.03-5.26,61.83-5.33c2.72-0.11,6.29,0.57,6.21,3.31C90.15,74.41,89.33,83,87,90.17c-2.35,7.22-4.33,6.17-8.83,3.17"/>
+			</g>
+			<g id="kvg:0842c-Kaisho-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:0842c-Kaisho-s10" kvg:type="㇑" d="M52.33,34.5c0.57,0.74,1.54,2.6,1.54,3.93C53.86,44.26,54,80.04,54,81.83"/>
 			</g>
 			<path id="kvg:0842c-Kaisho-s11" kvg:type="６" d="M37.67,84.83c1.33,0.92,3.09,1.37,4.5,1c3.96-1.03,20.55-5.28,28.83-7.17"/>
diff --git a/kanji/0842c.svg b/kanji/0842c.svg
index d3c47a0ef..904d6daf7 100644
--- a/kanji/0842c.svg
+++ b/kanji/0842c.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:0842c-g5" kvg:element="禸">
-			<path id="kvg:0842c-s8" kvg:type="㇑" d="M20.67,66.33c0.83,0.92,1.42,2.71,1.5,3.67c0.41,4.67,1.18,23.3,1.83,28.5"/>
-			<path id="kvg:0842c-s9" kvg:type="㇆" d="M22.33,69.17c9.03-1.04,60.03-5.26,61.83-5.33c2.72-0.11,6.29,0.57,6.21,3.31C90.15,74.41,89.33,83,87,90.17c-2.35,7.22-4.33,6.17-8.83,3.17"/>
-			<g id="kvg:0842c-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:0842c-g6" kvg:element="冂">
+				<path id="kvg:0842c-s8" kvg:type="㇑" d="M20.67,66.33c0.83,0.92,1.42,2.71,1.5,3.67c0.41,4.67,1.18,23.3,1.83,28.5"/>
+				<path id="kvg:0842c-s9" kvg:type="㇆" d="M22.33,69.17c9.03-1.04,60.03-5.26,61.83-5.33c2.72-0.11,6.29,0.57,6.21,3.31C90.15,74.41,89.33,83,87,90.17c-2.35,7.22-4.33,6.17-8.83,3.17"/>
+			</g>
+			<g id="kvg:0842c-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:0842c-s10" kvg:type="㇑" d="M52.33,34.5c0.57,0.74,1.54,2.6,1.54,3.93C53.86,44.26,54,80.04,54,81.83"/>
 			</g>
 			<path id="kvg:0842c-s11" kvg:type="６" d="M37.67,84.83c1.33,0.92,3.09,1.37,4.5,1c3.96-1.03,20.55-5.28,28.83-7.17"/>
diff --git a/kanji/085d5-Kaisho.svg b/kanji/085d5-Kaisho.svg
index c462519a0..f4edff2ea 100644
--- a/kanji/085d5-Kaisho.svg
+++ b/kanji/085d5-Kaisho.svg
@@ -67,9 +67,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:085d5-Kaisho-g10" kvg:element="禸">
-				<path id="kvg:085d5-Kaisho-s14" kvg:type="㇑" d="M52.2,62.28c0.46,0.72,1.56,2.15,1.66,3.18C54.41,70.96,54,88,54.42,97.5"/>
-				<path id="kvg:085d5-Kaisho-s15" kvg:type="㇆" d="M53.83,65.13c5.5-0.8,35.47-4.16,36.55-4.44c2.32-0.6,3.85,1.47,3.77,3.25c-0.2,4.3-2.59,22.74-4.41,28.19c-2.28,6.81-4.61,3.69-6.65-0.55"/>
-				<g id="kvg:085d5-Kaisho-g11" kvg:element="田" kvg:part="2" kvg:variant="true">
+				<g id="kvg:085d5-Kaisho-g11" kvg:element="冂">
+					<path id="kvg:085d5-Kaisho-s14" kvg:type="㇑" d="M52.2,62.28c0.46,0.72,1.56,2.15,1.66,3.18C54.41,70.96,54,88,54.42,97.5"/>
+					<path id="kvg:085d5-Kaisho-s15" kvg:type="㇆" d="M53.83,65.13c5.5-0.8,35.47-4.16,36.55-4.44c2.32-0.6,3.85,1.47,3.77,3.25c-0.2,4.3-2.59,22.74-4.41,28.19c-2.28,6.81-4.61,3.69-6.65-0.55"/>
+				</g>
+				<g id="kvg:085d5-Kaisho-g12" kvg:element="田" kvg:part="2" kvg:variant="true">
 					<path id="kvg:085d5-Kaisho-s16" kvg:type="㇑" d="M70.38,31.68c0.35,0.73,0.9,1.45,0.9,2.74c0,5.66,0.15,40.91,0.15,42.66"/>
 				</g>
 				<path id="kvg:085d5-Kaisho-s17" kvg:type="６" d="M60.9,79c0.93,1.01,1.97,1.57,2.8,1.21c2.33-1.01,13.59-4.73,18.47-6.54"/>
diff --git a/kanji/085d5.svg b/kanji/085d5.svg
index fc4e9aa34..0f40c5714 100644
--- a/kanji/085d5.svg
+++ b/kanji/085d5.svg
@@ -67,9 +67,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:085d5-g10" kvg:element="禸">
-				<path id="kvg:085d5-s14" kvg:type="㇑" d="M52.2,62.28c0.46,0.72,1.56,2.15,1.66,3.18C54.41,70.96,54,88,54.42,97.5"/>
-				<path id="kvg:085d5-s15" kvg:type="㇆" d="M53.83,65.13c5.5-0.8,35.47-4.16,36.55-4.44c2.32-0.6,3.85,1.47,3.77,3.25c-0.2,4.3-2.59,22.74-4.41,28.19c-2.28,6.81-4.61,3.69-6.65-0.55"/>
-				<g id="kvg:085d5-g11" kvg:element="田" kvg:part="2" kvg:variant="true">
+				<g id="kvg:085d5-g11" kvg:element="冂">
+					<path id="kvg:085d5-s14" kvg:type="㇑" d="M52.2,62.28c0.46,0.72,1.56,2.15,1.66,3.18C54.41,70.96,54,88,54.42,97.5"/>
+					<path id="kvg:085d5-s15" kvg:type="㇆" d="M53.83,65.13c5.5-0.8,35.47-4.16,36.55-4.44c2.32-0.6,3.85,1.47,3.77,3.25c-0.2,4.3-2.59,22.74-4.41,28.19c-2.28,6.81-4.61,3.69-6.65-0.55"/>
+				</g>
+				<g id="kvg:085d5-g12" kvg:element="田" kvg:part="2" kvg:variant="true">
 					<path id="kvg:085d5-s16" kvg:type="㇑" d="M70.38,31.68c0.35,0.73,0.9,1.45,0.9,2.74c0,5.66,0.15,40.91,0.15,42.66"/>
 				</g>
 				<path id="kvg:085d5-s17" kvg:type="６" d="M60.9,79c0.93,1.01,1.97,1.57,2.8,1.21c2.33-1.01,13.59-4.73,18.47-6.54"/>
diff --git a/kanji/08823-Kaisho.svg b/kanji/08823-Kaisho.svg
index 32ba78beb..9d59afabb 100644
--- a/kanji/08823-Kaisho.svg
+++ b/kanji/08823-Kaisho.svg
@@ -73,9 +73,11 @@ kvg:type CDATA #IMPLIED >
 						</g>
 					</g>
 					<g id="kvg:08823-Kaisho-g13" kvg:element="禸">
-						<path id="kvg:08823-Kaisho-s16" kvg:type="㇑" d="M54.65,70.69c0.64,0.35,1.09,1.38,1.14,2.07c0.22,3.4-0.14,18.24-0.14,22.76"/>
-						<path id="kvg:08823-Kaisho-s17" kvg:type="㇆" d="M55.79,71.8c5.09-0.81,35.4-4.17,36.42-4.23c1.53-0.08,2.87,1.08,2.82,3.21C94.9,76.41,94.75,86,93.6,91.24c-1.21,5.53-4.6,2.26-6.94,0.16"/>
-						<g id="kvg:08823-Kaisho-g14" kvg:element="田" kvg:part="2" kvg:variant="true">
+						<g id="kvg:08823-Kaisho-g14" kvg:element="冂">
+							<path id="kvg:08823-Kaisho-s16" kvg:type="㇑" d="M54.65,70.69c0.64,0.35,1.09,1.38,1.14,2.07c0.22,3.4-0.14,18.24-0.14,22.76"/>
+							<path id="kvg:08823-Kaisho-s17" kvg:type="㇆" d="M55.79,71.8c5.09-0.81,35.4-4.17,36.42-4.23c1.53-0.08,2.87,1.08,2.82,3.21C94.9,76.41,94.75,86,93.6,91.24c-1.21,5.53-4.6,2.26-6.94,0.16"/>
+						</g>
+						<g id="kvg:08823-Kaisho-g15" kvg:element="田" kvg:part="2" kvg:variant="true">
 							<path id="kvg:08823-Kaisho-s18" kvg:type="㇑" d="M72.62,46.36c0.33,0.62,0.85,1.22,0.85,2.35c0,4.92,0.64,29.16,0.64,30.67"/>
 						</g>
 						<path id="kvg:08823-Kaisho-s19" kvg:type="６" d="M62.12,82.99c1.03,0.69,2.17,1.06,3.08,0.77c2.56-0.81,13.1-4.52,18.47-6.02"/>
diff --git a/kanji/08823.svg b/kanji/08823.svg
index 51e5c8a37..7ea9422f3 100644
--- a/kanji/08823.svg
+++ b/kanji/08823.svg
@@ -73,9 +73,11 @@ kvg:type CDATA #IMPLIED >
 						</g>
 					</g>
 					<g id="kvg:08823-g13" kvg:element="禸">
-						<path id="kvg:08823-s16" kvg:type="㇑" d="M54.65,70.69c0.64,0.35,1.09,1.38,1.14,2.07c0.22,3.4-0.14,18.24-0.14,22.76"/>
-						<path id="kvg:08823-s17" kvg:type="㇆" d="M55.79,71.8c5.09-0.81,35.4-4.17,36.42-4.23c1.53-0.08,2.87,1.08,2.82,3.21C94.9,76.41,94.75,86,93.6,91.24c-1.21,5.53-4.6,2.26-6.94,0.16"/>
-						<g id="kvg:08823-g14" kvg:element="田" kvg:part="2" kvg:variant="true">
+						<g id="kvg:08823-g14" kvg:element="冂">
+							<path id="kvg:08823-s16" kvg:type="㇑" d="M54.65,70.69c0.64,0.35,1.09,1.38,1.14,2.07c0.22,3.4-0.14,18.24-0.14,22.76"/>
+							<path id="kvg:08823-s17" kvg:type="㇆" d="M55.79,71.8c5.09-0.81,35.4-4.17,36.42-4.23c1.53-0.08,2.87,1.08,2.82,3.21C94.9,76.41,94.75,86,93.6,91.24c-1.21,5.53-4.6,2.26-6.94,0.16"/>
+						</g>
+						<g id="kvg:08823-g15" kvg:element="田" kvg:part="2" kvg:variant="true">
 							<path id="kvg:08823-s18" kvg:type="㇑" d="M72.62,46.36c0.33,0.62,0.85,1.22,0.85,2.35c0,4.92,0.64,29.16,0.64,30.67"/>
 						</g>
 						<path id="kvg:08823-s19" kvg:type="６" d="M62.12,82.99c1.03,0.69,2.17,1.06,3.08,0.77c2.56-0.81,13.1-4.52,18.47-6.02"/>
diff --git a/kanji/08fad-Kaisho.svg b/kanji/08fad-Kaisho.svg
index b0bf9d5fb..36d924d9b 100644
--- a/kanji/08fad-Kaisho.svg
+++ b/kanji/08fad-Kaisho.svg
@@ -52,30 +52,34 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:08fad-Kaisho-g5" kvg:position="bottom">
 			<g id="kvg:08fad-Kaisho-g6" kvg:element="禸">
-				<path id="kvg:08fad-Kaisho-s7" kvg:type="㇑" d="M17.53,50.8c1.04,0.65,1.86,2.43,1.86,3.61c0,7.59,0.04,34.34,0.04,43.84"/>
-				<path id="kvg:08fad-Kaisho-s8" kvg:type="㇆" d="M19.86,52.53C26,52,45.93,49.58,47.79,49c2.17-0.68,3.61,1.67,3.54,3.68c-0.19,4.87-0.64,29.82-0.64,38.93c0,8-2.43,5.39-6.34,1.44"/>
-				<path id="kvg:08fad-Kaisho-s9" kvg:type="㇜" d="M33.86,52.25c0.28,0.32,0.24,0.98-0.12,1.49c-1.73,2.46-5.23,7.24-5.87,8.26c-0.63,1.02-0.21,1.79,1.48,1.37c1.88-0.46,7.64-2.62,11.6-3.79"/>
-				<path id="kvg:08fad-Kaisho-s10" kvg:type="㇔" d="M39.05,56.64c1.54,1.03,3.97,4.25,4.35,5.85"/>
+				<g id="kvg:08fad-Kaisho-g7" kvg:element="冂">
+					<path id="kvg:08fad-Kaisho-s7" kvg:type="㇑" d="M17.53,50.8c1.04,0.65,1.86,2.43,1.86,3.61c0,7.59,0.04,34.34,0.04,43.84"/>
+					<path id="kvg:08fad-Kaisho-s8" kvg:type="㇆" d="M19.86,52.53C26,52,45.93,49.58,47.79,49c2.17-0.68,3.61,1.67,3.54,3.68c-0.19,4.87-0.64,29.82-0.64,38.93c0,8-2.43,5.39-6.34,1.44"/>
+				</g>
+				<g id="kvg:08fad-Kaisho-g8" kvg:element="厶">
+					<path id="kvg:08fad-Kaisho-s9" kvg:type="㇜" d="M33.86,52.25c0.28,0.32,0.24,0.98-0.12,1.49c-1.73,2.46-5.23,7.24-5.87,8.26c-0.63,1.02-0.21,1.79,1.48,1.37c1.88-0.46,7.64-2.62,11.6-3.79"/>
+					<path id="kvg:08fad-Kaisho-s10" kvg:type="㇔" d="M39.05,56.64c1.54,1.03,3.97,4.25,4.35,5.85"/>
+				</g>
 			</g>
-			<g id="kvg:08fad-Kaisho-g7" kvg:element="又">
+			<g id="kvg:08fad-Kaisho-g9" kvg:element="又">
 				<path id="kvg:08fad-Kaisho-s11" kvg:type="㇇" d="M27.12,71.11c0.76,0.16,0.86,0.41,2.38,0.16c1.52-0.24,11.46-2.35,12.51-2.59s1.87,0.92,1.43,1.78C38.5,80,33.5,87,25.5,92.5"/>
 				<path id="kvg:08fad-Kaisho-s12" kvg:type="㇏" d="M30.56,76.83c3.9,1.3,9.14,4.54,12.22,8.47"/>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:08fad-Kaisho-g8" kvg:element="辛" kvg:position="right" kvg:radical="tradit">
-		<g id="kvg:08fad-Kaisho-g9" kvg:element="立" kvg:position="top">
-			<g id="kvg:08fad-Kaisho-g10" kvg:element="亠" kvg:position="top">
+	<g id="kvg:08fad-Kaisho-g10" kvg:element="辛" kvg:position="right" kvg:radical="tradit">
+		<g id="kvg:08fad-Kaisho-g11" kvg:element="立" kvg:position="top">
+			<g id="kvg:08fad-Kaisho-g12" kvg:element="亠" kvg:position="top">
 				<path id="kvg:08fad-Kaisho-s13" kvg:type="㇑a" d="M71.05,10.25c2.45,1.5,4.7,4.75,5.12,7.31"/>
 				<path id="kvg:08fad-Kaisho-s14" kvg:type="㇐" d="M57.83,24.2c1.2,0.33,2.6,0.38,3.8,0.33c6.77-0.28,16.56-2.53,26.8-2.77c2-0.05,3.2,0.16,4.2,0.32"/>
 			</g>
-			<g id="kvg:08fad-Kaisho-g11" kvg:position="bottom">
+			<g id="kvg:08fad-Kaisho-g13" kvg:position="bottom">
 				<path id="kvg:08fad-Kaisho-s15" kvg:type="㇔" d="M62.4,29.75c3.52,4.94,5.12,9.99,5.43,13.25"/>
 				<path id="kvg:08fad-Kaisho-s16" kvg:type="㇒" d="M85.11,25.25c0.58,0.58,0.65,1.96,0.58,2.44c-0.47,3.32-4.4,12.77-5.57,15.31"/>
 				<path id="kvg:08fad-Kaisho-s17" kvg:type="㇐" d="M56.25,47.02c1.4,0.63,3.03,0.71,4.44,0.63c7.06-0.4,23.56-2.15,29.65-2.42c2.34-0.1,3.74,0.3,4.91,0.62"/>
 			</g>
 		</g>
-		<g id="kvg:08fad-Kaisho-g12" kvg:element="十" kvg:position="bottom">
+		<g id="kvg:08fad-Kaisho-g14" kvg:element="十" kvg:position="bottom">
 			<path id="kvg:08fad-Kaisho-s18" kvg:type="㇐" d="M57.38,66.95c0.95,0.47,2.68,0.53,3.64,0.47c6.5-0.42,21.95-1.92,28.83-2.4c1.58-0.11,2.53,0.22,3.32,0.46"/>
 			<path id="kvg:08fad-Kaisho-s19" kvg:type="㇑" d="M72.64,49.63c0.66,0.52,1.68,2.62,1.68,4.96c0,6.05-0.19,43.24-0.22,44.79"/>
 		</g>
diff --git a/kanji/08fad.svg b/kanji/08fad.svg
index 63f9602f4..b1a6a09bf 100644
--- a/kanji/08fad.svg
+++ b/kanji/08fad.svg
@@ -52,30 +52,34 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:08fad-g5" kvg:position="bottom">
 			<g id="kvg:08fad-g6" kvg:element="禸">
-				<path id="kvg:08fad-s7" kvg:type="㇑" d="M17.53,50.8c1.04,0.65,1.86,2.43,1.86,3.61c0,7.59,0.04,34.34,0.04,43.84"/>
-				<path id="kvg:08fad-s8" kvg:type="㇆" d="M19.86,52.53C26,52,45.93,49.58,47.79,49c2.17-0.68,3.61,1.67,3.54,3.68c-0.19,4.87-0.64,29.82-0.64,38.93c0,8-2.43,5.39-6.34,1.44"/>
-				<path id="kvg:08fad-s9" kvg:type="㇜" d="M33.86,52.25c0.28,0.32,0.24,0.98-0.12,1.49c-1.73,2.46-5.23,7.24-5.87,8.26c-0.63,1.02-0.21,1.79,1.48,1.37c1.88-0.46,7.64-2.62,11.6-3.79"/>
-				<path id="kvg:08fad-s10" kvg:type="㇔" d="M39.05,56.64c1.54,1.03,3.97,4.25,4.35,5.85"/>
+				<g id="kvg:08fad-g7" kvg:element="冂">
+					<path id="kvg:08fad-s7" kvg:type="㇑" d="M17.53,50.8c1.04,0.65,1.86,2.43,1.86,3.61c0,7.59,0.04,34.34,0.04,43.84"/>
+					<path id="kvg:08fad-s8" kvg:type="㇆" d="M19.86,52.53C26,52,45.93,49.58,47.79,49c2.17-0.68,3.61,1.67,3.54,3.68c-0.19,4.87-0.64,29.82-0.64,38.93c0,8-2.43,5.39-6.34,1.44"/>
+				</g>
+				<g id="kvg:08fad-g8" kvg:element="厶">
+					<path id="kvg:08fad-s9" kvg:type="㇜" d="M33.86,52.25c0.28,0.32,0.24,0.98-0.12,1.49c-1.73,2.46-5.23,7.24-5.87,8.26c-0.63,1.02-0.21,1.79,1.48,1.37c1.88-0.46,7.64-2.62,11.6-3.79"/>
+					<path id="kvg:08fad-s10" kvg:type="㇔" d="M39.05,56.64c1.54,1.03,3.97,4.25,4.35,5.85"/>
+				</g>
 			</g>
-			<g id="kvg:08fad-g7" kvg:element="又">
+			<g id="kvg:08fad-g9" kvg:element="又">
 				<path id="kvg:08fad-s11" kvg:type="㇇" d="M27.12,71.11c0.76,0.16,0.86,0.41,2.38,0.16c1.52-0.24,11.46-2.35,12.51-2.59s1.87,0.92,1.43,1.78C38.5,80,33.5,87,25.5,92.5"/>
 				<path id="kvg:08fad-s12" kvg:type="㇏" d="M30.56,76.83c3.9,1.3,9.14,4.54,12.22,8.47"/>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:08fad-g8" kvg:element="辛" kvg:position="right" kvg:radical="tradit">
-		<g id="kvg:08fad-g9" kvg:element="立" kvg:position="top">
-			<g id="kvg:08fad-g10" kvg:element="亠" kvg:position="top">
+	<g id="kvg:08fad-g10" kvg:element="辛" kvg:position="right" kvg:radical="tradit">
+		<g id="kvg:08fad-g11" kvg:element="立" kvg:position="top">
+			<g id="kvg:08fad-g12" kvg:element="亠" kvg:position="top">
 				<path id="kvg:08fad-s13" kvg:type="㇑a" d="M72.24,10.75c1.19,1.1,1.78,1.1,1.78,3.65c0,2.56,0,4.74,0,8.1"/>
 				<path id="kvg:08fad-s14" kvg:type="㇐" d="M57.83,24.2c1.2,0.33,2.6,0.38,3.8,0.33c6.77-0.28,16.56-2.53,26.8-2.77c2-0.05,3.2,0.16,4.2,0.32"/>
 			</g>
-			<g id="kvg:08fad-g11" kvg:position="bottom">
+			<g id="kvg:08fad-g13" kvg:position="bottom">
 				<path id="kvg:08fad-s15" kvg:type="㇔" d="M62.4,29.75c3.52,4.94,5.12,9.99,5.43,13.25"/>
 				<path id="kvg:08fad-s16" kvg:type="㇒" d="M85.11,25.25c0.58,0.58,0.65,1.96,0.58,2.44c-0.47,3.32-4.4,12.77-5.57,15.31"/>
 				<path id="kvg:08fad-s17" kvg:type="㇐" d="M56.25,47.02c1.4,0.63,3.03,0.71,4.44,0.63c7.06-0.4,23.56-2.15,29.65-2.42c2.34-0.1,3.74,0.3,4.91,0.62"/>
 			</g>
 		</g>
-		<g id="kvg:08fad-g12" kvg:element="十" kvg:position="bottom">
+		<g id="kvg:08fad-g14" kvg:element="十" kvg:position="bottom">
 			<path id="kvg:08fad-s18" kvg:type="㇐" d="M57.38,66.95c0.95,0.47,2.68,0.53,3.64,0.47c6.5-0.42,21.95-1.92,28.83-2.4c1.58-0.11,2.53,0.22,3.32,0.46"/>
 			<path id="kvg:08fad-s19" kvg:type="㇑" d="M72.64,49.63c0.66,0.52,1.68,2.62,1.68,4.96c0,6.05-0.19,43.24-0.22,44.79"/>
 		</g>
diff --git a/kanji/09047-Kaisho.svg b/kanji/09047-Kaisho.svg
index ab453cef0..05f680a34 100644
--- a/kanji/09047-Kaisho.svg
+++ b/kanji/09047-Kaisho.svg
@@ -47,16 +47,18 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:09047-Kaisho-g4" kvg:element="禸">
-			<path id="kvg:09047-Kaisho-s5" kvg:type="㇑" d="M42.05,49.97c1.25,0.58,2.13,2.17,2.22,3.21c0.43,5.12,2.43,21.61,3.13,27.31"/>
-			<path id="kvg:09047-Kaisho-s6" kvg:type="㇆" d="M44.24,52.85c6.17-0.81,42.12-4.2,43.33-4.48c2.6-0.61,4.32,1.49,4.22,3.28c-0.23,4.34-2.9,20.94-4.95,26.44c-2.55,6.87-3.49,4.22-5.78-0.05"/>
-			<g id="kvg:09047-Kaisho-g5" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:09047-Kaisho-g5" kvg:element="冂">
+				<path id="kvg:09047-Kaisho-s5" kvg:type="㇑" d="M42.05,49.97c1.25,0.58,2.13,2.17,2.22,3.21c0.43,5.12,2.43,21.61,3.13,27.31"/>
+				<path id="kvg:09047-Kaisho-s6" kvg:type="㇆" d="M44.24,52.85c6.17-0.81,42.12-4.2,43.33-4.48c2.6-0.61,4.32,1.49,4.22,3.28c-0.23,4.34-2.9,20.94-4.95,26.44c-2.55,6.87-3.49,4.22-5.78-0.05"/>
+			</g>
+			<g id="kvg:09047-Kaisho-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:09047-Kaisho-s7" kvg:type="㇑" d="M64.44,17.82c0.54,1.04,1.4,2.07,1.4,3.9c-0.01,8.04,0.23,41.32,0.23,43.8"/>
 			</g>
 			<path id="kvg:09047-Kaisho-s8" kvg:type="６" d="M54.34,68.11c1.07,1.06,2.26,1.64,3.21,1.27c2.68-1.06,13.67-5.92,19.27-7.82"/>
 			<path id="kvg:09047-Kaisho-s9" kvg:type="㇔" d="M73.45,56.34c2.5,2.25,6.47,9.26,7.1,12.76"/>
 		</g>
 	</g>
-	<g id="kvg:09047-Kaisho-g6" kvg:element="⻌" kvg:original="辶" kvg:position="nyo" kvg:radical="tradit">
+	<g id="kvg:09047-Kaisho-g7" kvg:element="⻌" kvg:original="辶" kvg:position="nyo" kvg:radical="tradit">
 		<path id="kvg:09047-Kaisho-s10" kvg:type="㇔" d="M20.71,19.25c3.63,1.74,9.38,7.17,10.29,9.88"/>
 		<path id="kvg:09047-Kaisho-s11" kvg:type="㇋" d="M14,50.75c2.25,1,3.75,0.5,4.75,0.25s8-3.5,9.5-4S32,48.25,31,49.75s-4,7.25-4.75,8.5s-0.5,3.5,1,5.25s2.75,3.75,3.5,5.25s0.75,2.75-0.75,4S21,81,19.5,81.5"/>
 		<path id="kvg:09047-Kaisho-s12" kvg:type="㇏a" d="M15.25,83c3-0.5,9-1.75,13.5-0.75s30.07,7.71,34.5,9c12,3.5,21.25,4.5,30.25,2.75"/>
diff --git a/kanji/09047.svg b/kanji/09047.svg
index 8e7fdd398..87afdadec 100644
--- a/kanji/09047.svg
+++ b/kanji/09047.svg
@@ -47,16 +47,18 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:09047-g4" kvg:element="禸">
-			<path id="kvg:09047-s5" kvg:type="㇑" d="M42.55,49.47c1.11,1.11,1.3,2.28,1.47,3.71c1.1,9.06,1.92,15.27,2.8,22.58c0.23,1.91,0.43,3.55,0.58,4.73"/>
-			<path id="kvg:09047-s6" kvg:type="㇆a" d="M44.99,52.1c5.43-0.71,33.3-3.42,40.77-4.25c3.92-0.44,6.36,0.28,5.89,4.8c-0.63,6.07-2.97,20.51-4.8,25.44c-2.55,6.87-5.1,1.79-6.78-0.3"/>
-			<g id="kvg:09047-g5" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:09047-g5" kvg:element="冂">
+				<path id="kvg:09047-s5" kvg:type="㇑" d="M42.55,49.47c1.11,1.11,1.3,2.28,1.47,3.71c1.1,9.06,1.92,15.27,2.8,22.58c0.23,1.91,0.43,3.55,0.58,4.73"/>
+				<path id="kvg:09047-s6" kvg:type="㇆a" d="M44.99,52.1c5.43-0.71,33.3-3.42,40.77-4.25c3.92-0.44,6.36,0.28,5.89,4.8c-0.63,6.07-2.97,20.51-4.8,25.44c-2.55,6.87-5.1,1.79-6.78-0.3"/>
+			</g>
+			<g id="kvg:09047-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:09047-s7" kvg:type="㇑a" d="M64.44,17.82c1,1,1.4,2.43,1.4,3.9c0,8.04-0.02,40.32-0.02,42.8"/>
 			</g>
 			<path id="kvg:09047-s8" kvg:type="㇀" d="M55.09,67.86c1.07,1.06,2.51,0.89,3.46,0.52c2.68-1.06,11.92-4.42,17.52-6.32"/>
 			<path id="kvg:09047-s9" kvg:type="㇔" d="M74.38,56.88c2.09,2.11,5.4,8.69,5.92,11.98"/>
 		</g>
 	</g>
-	<g id="kvg:09047-g6" kvg:element="⻌" kvg:original="辶" kvg:position="nyo" kvg:radical="tradit">
+	<g id="kvg:09047-g7" kvg:element="⻌" kvg:original="辶" kvg:position="nyo" kvg:radical="tradit">
 		<path id="kvg:09047-s10" kvg:type="㇔" d="M20.12,18.62c3.93,1.9,10.14,7.81,11.12,10.76"/>
 		<path id="kvg:09047-s11" kvg:type="㇋" d="M13,50.5c2.25,1,3.75,0.5,4.75,0.25s9.01-3.22,10.5-3.75c2.12-0.75,3.96,0.35,2.75,2.75c-7.12,14.12-7.62,9.62,0,19c1.06,1.3,1.25,2.75-0.25,4S21,81,19.5,81.5"/>
 		<path id="kvg:09047-s12" kvg:type="㇏a" d="M15.25,83c3-0.5,8.95-1.48,13.5-0.75c6.25,1,30.07,7.71,34.5,9c12,3.5,19.5,4.5,26.5,4.5"/>
diff --git a/kanji/09081-Kaisho.svg b/kanji/09081-Kaisho.svg
index b828c591e..1d956ded2 100644
--- a/kanji/09081-Kaisho.svg
+++ b/kanji/09081-Kaisho.svg
@@ -53,9 +53,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:09081-Kaisho-g6" kvg:element="禸">
-				<path id="kvg:09081-Kaisho-s8" kvg:type="㇑" d="M42.02,57.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,0.76,17.49,1,22.76"/>
-				<path id="kvg:09081-Kaisho-s9" kvg:type="㇆" d="M43.25,59.8c5.48-0.81,42.01-4.17,43.1-4.23c1.65-0.08,3,1.08,3.04,3.21c0.12,5.97-1.13,15.22-2.11,22.96c-0.71,5.66-4.24,1.7-6.28-1.34"/>
-				<g id="kvg:09081-Kaisho-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
+				<g id="kvg:09081-Kaisho-g7" kvg:element="冂">
+					<path id="kvg:09081-Kaisho-s8" kvg:type="㇑" d="M42.02,57.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,0.76,17.49,1,22.76"/>
+					<path id="kvg:09081-Kaisho-s9" kvg:type="㇆" d="M43.25,59.8c5.48-0.81,42.01-4.17,43.1-4.23c1.65-0.08,3,1.08,3.04,3.21c0.12,5.97-1.13,15.22-2.11,22.96c-0.71,5.66-4.24,1.7-6.28-1.34"/>
+				</g>
+				<g id="kvg:09081-Kaisho-g8" kvg:element="田" kvg:part="2" kvg:variant="true">
 					<path id="kvg:09081-Kaisho-s10" kvg:type="㇑" d="M63.87,31.36c0.36,0.62,0.92,1.22,0.92,2.35c-0.01,4.92,0.15,34.16,0.15,35.67"/>
 				</g>
 				<path id="kvg:09081-Kaisho-s11" kvg:type="６" d="M54.22,72.42c1.02,0.75,2.16,1.14,3.07,0.83c2.55-0.88,13.05-4.89,18.4-6.51"/>
@@ -63,7 +65,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 	</g>
-	<g id="kvg:09081-Kaisho-g8" kvg:element="辶" kvg:position="nyo" kvg:radical="general">
+	<g id="kvg:09081-Kaisho-g9" kvg:element="辶" kvg:position="nyo" kvg:radical="general">
 		<path id="kvg:09081-Kaisho-s13" kvg:type="㇔" d="M16.46,11.25C21.24,13.04,28.81,18.6,30,21.38"/>
 		<path id="kvg:09081-Kaisho-s14" kvg:type="㇔" d="M16.46,31.25c4.52,1.48,11.67,6.08,12.79,8.38"/>
 		<path id="kvg:09081-Kaisho-s15" kvg:type="㇋" d="M14.5,54.83c2.25,0.95,3.75,0.48,4.75,0.24c1-0.24,8.5-2.84,10-3.32c1.5-0.48,3.75,1.19,2.75,2.63c-1,1.43-4.36,5.21-6.75,7.62c-1.75,1.76-1.5,3.01,1,5.01c1.75,1.41,4.25,3.08,5,4.51C32,72.95,32,74.15,30.5,75.34c-1.5,1.2-9,8.38-10.5,8.86"/>
diff --git a/kanji/09081.svg b/kanji/09081.svg
index a81320317..a25ac1efb 100644
--- a/kanji/09081.svg
+++ b/kanji/09081.svg
@@ -53,9 +53,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 			<g id="kvg:09081-g6" kvg:element="禸">
-				<path id="kvg:09081-s8" kvg:type="㇑" d="M42.02,57.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,0.76,17.49,1,22.76"/>
-				<path id="kvg:09081-s9" kvg:type="㇆" d="M43.25,59.8c5.48-0.81,42.01-4.17,43.1-4.23c1.65-0.08,3,1.08,3.04,3.21c0.12,5.97-1.13,15.22-2.11,22.96c-0.71,5.66-4.24,1.7-6.28-1.34"/>
-				<g id="kvg:09081-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
+				<g id="kvg:09081-g7" kvg:element="冂">
+					<path id="kvg:09081-s8" kvg:type="㇑" d="M42.02,57.69c0.69,0.35,1.18,1.38,1.23,2.07c0.24,3.4,0.76,17.49,1,22.76"/>
+					<path id="kvg:09081-s9" kvg:type="㇆" d="M43.25,59.8c5.48-0.81,42.01-4.17,43.1-4.23c1.65-0.08,3,1.08,3.04,3.21c0.12,5.97-1.13,15.22-2.11,22.96c-0.71,5.66-4.24,1.7-6.28-1.34"/>
+				</g>
+				<g id="kvg:09081-g8" kvg:element="田" kvg:part="2" kvg:variant="true">
 					<path id="kvg:09081-s10" kvg:type="㇑" d="M63.87,31.36c0.36,0.62,0.92,1.22,0.92,2.35c-0.01,4.92,0.15,34.16,0.15,35.67"/>
 				</g>
 				<path id="kvg:09081-s11" kvg:type="６" d="M54.22,72.42c1.02,0.75,2.16,1.14,3.07,0.83c2.55-0.88,13.05-4.89,18.4-6.51"/>
@@ -63,7 +65,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 	</g>
-	<g id="kvg:09081-g8" kvg:element="辶" kvg:position="nyo" kvg:radical="general">
+	<g id="kvg:09081-g9" kvg:element="辶" kvg:position="nyo" kvg:radical="general">
 		<path id="kvg:09081-s13" kvg:type="㇔" d="M16.46,11.25C21.24,13.04,28.81,18.6,30,21.38"/>
 		<path id="kvg:09081-s14" kvg:type="㇔" d="M16.46,31.25c4.52,1.48,11.67,6.08,12.79,8.38"/>
 		<path id="kvg:09081-s15" kvg:type="㇋" d="M14.5,54.83c2.25,0.95,3.75,0.48,4.75,0.24c1-0.24,8.5-2.84,10-3.32c1.5-0.48,3.75,1.19,2.75,2.63c-1,1.43-4.36,5.21-6.75,7.62c-1.75,1.76-1.5,3.01,1,5.01c1.75,1.41,4.25,3.08,5,4.51C32,72.95,32,74.15,30.5,75.34c-1.5,1.2-9,8.38-10.5,8.86"/>
diff --git a/kanji/09685-Kaisho.svg b/kanji/09685-Kaisho.svg
index 83088a590..88bd379f2 100644
--- a/kanji/09685-Kaisho.svg
+++ b/kanji/09685-Kaisho.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:09685-Kaisho-g5" kvg:element="禸">
-			<path id="kvg:09685-Kaisho-s8" kvg:type="㇑" d="M40.32,55.49c1.39,0.63,2.37,2.35,2.47,3.48c0.48,5.54,2.76,28.85,3.54,35.03"/>
-			<path id="kvg:09685-Kaisho-s9" kvg:type="㇆" d="M42.76,58.11c6.86-0.88,46.72-5.04,48.07-5.35c2.89-0.66,4.8,1.61,4.7,3.55c-0.25,4.69-2.28,24.19-4.5,32.29c-2.11,7.67-3.88,5.08-6.43,0.45"/>
-			<g id="kvg:09685-Kaisho-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:09685-Kaisho-g6" kvg:element="冂">
+				<path id="kvg:09685-Kaisho-s8" kvg:type="㇑" d="M40.32,55.49c1.39,0.63,2.37,2.35,2.47,3.48c0.48,5.54,2.76,28.85,3.54,35.03"/>
+				<path id="kvg:09685-Kaisho-s9" kvg:type="㇆" d="M42.76,58.11c6.86-0.88,46.72-5.04,48.07-5.35c2.89-0.66,4.8,1.61,4.7,3.55c-0.25,4.69-2.28,24.19-4.5,32.29c-2.11,7.67-3.88,5.08-6.43,0.45"/>
+			</g>
+			<g id="kvg:09685-Kaisho-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:09685-Kaisho-s10" kvg:type="㇑" d="M65.45,19.21c0.45,0.87,1.15,1.74,1.15,3.28c-0.01,6.76,0.19,48.91,0.19,50.99"/>
 			</g>
 			<path id="kvg:09685-Kaisho-s11" kvg:type="６" d="M52.99,77.57c1.19,1.2,2.51,1.87,3.57,1.44c2.98-1.2,17.7-7.24,23.93-9.4"/>
diff --git a/kanji/09685.svg b/kanji/09685.svg
index f50885ee5..de1bd4583 100644
--- a/kanji/09685.svg
+++ b/kanji/09685.svg
@@ -52,9 +52,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:09685-g5" kvg:element="禸">
-			<path id="kvg:09685-s8" kvg:type="㇑" d="M41.07,55.24c1.09,1.09,1.33,2.6,1.47,3.73c0.7,5.53,2.14,19.95,3.14,29.28c0.26,2.44,0.49,4.46,0.65,5.74"/>
-			<path id="kvg:09685-s9" kvg:type="㇆a" d="M43.51,57.61c6.86-0.88,44.62-4.61,47.32-4.85c2.95-0.27,4.8,1.74,4.7,4.55C95.36,62,93.5,80.5,91.27,88.59c-2.11,7.67-4.13,5.08-6.68,0.45"/>
-			<g id="kvg:09685-g6" kvg:element="田" kvg:part="2" kvg:variant="true">
+			<g id="kvg:09685-g6" kvg:element="冂">
+				<path id="kvg:09685-s8" kvg:type="㇑" d="M41.07,55.24c1.09,1.09,1.33,2.6,1.47,3.73c0.7,5.53,2.14,19.95,3.14,29.28c0.26,2.44,0.49,4.46,0.65,5.74"/>
+				<path id="kvg:09685-s9" kvg:type="㇆a" d="M43.51,57.61c6.86-0.88,44.62-4.61,47.32-4.85c2.95-0.27,4.8,1.74,4.7,4.55C95.36,62,93.5,80.5,91.27,88.59c-2.11,7.67-4.13,5.08-6.68,0.45"/>
+			</g>
+			<g id="kvg:09685-g7" kvg:element="田" kvg:part="2" kvg:variant="true">
 				<path id="kvg:09685-s10" kvg:type="㇑a" d="M65.45,19.71c0.92,0.92,1.15,1.99,1.15,3.53C66.59,30,66.54,71.4,66.54,73.48"/>
 			</g>
 			<path id="kvg:09685-s11" kvg:type="㇀" d="M52.99,77.82c1.19,1.2,2.76,0.87,3.82,0.44c2.98-1.2,16.95-5.99,23.18-8.15"/>
diff --git a/kanji/096e2-Kaisho.svg b/kanji/096e2-Kaisho.svg
index fa5662ce7..d80ee8165 100644
--- a/kanji/096e2-Kaisho.svg
+++ b/kanji/096e2-Kaisho.svg
@@ -55,15 +55,17 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:096e2-Kaisho-g7" kvg:element="禸" kvg:variant="true">
-			<path id="kvg:096e2-Kaisho-s7" kvg:type="㇑" d="M15.76,65.48c0.36,0.86,0.61,2.25,0.48,3.8c-0.12,1.56,0.12,25.87,0.12,28.47"/>
-			<path id="kvg:096e2-Kaisho-s8" kvg:type="㇆a" d="M16.24,67.21c4.61-0.69,30.14-5.46,31.06-5.46c1.33,0,2.18,0.52,2.18,2.08c0,3.28-0.74,20.92-1.62,25.83c-1.42,7.92-3.76,3.42-5,1.78"/>
+			<g id="kvg:096e2-Kaisho-g8" kvg:element="冂">
+				<path id="kvg:096e2-Kaisho-s7" kvg:type="㇑" d="M15.76,65.48c0.36,0.86,0.61,2.25,0.48,3.8c-0.12,1.56,0.12,25.87,0.12,28.47"/>
+				<path id="kvg:096e2-Kaisho-s8" kvg:type="㇆a" d="M16.24,67.21c4.61-0.69,30.14-5.46,31.06-5.46c1.33,0,2.18,0.52,2.18,2.08c0,3.28-0.74,20.92-1.62,25.83c-1.42,7.92-3.76,3.42-5,1.78"/>
+			</g>
 			<path id="kvg:096e2-Kaisho-s9" kvg:type="㇜" d="M 33.48,54 c 0.52,1.12 0.74,2.03 0.33,3.33 -1.288384,7.365808 -3.231125,13.166933 -4.809346,20.401288"/>
 			<path id="kvg:096e2-Kaisho-s10" kvg:type="㇜" d="M 23.236278,82.064008 c 4.65,-2.45 8.743558,-4.398875 14.483558,-6.998875"/>
 			<path id="kvg:096e2-Kaisho-s11" kvg:type="㇔" d="M36.51,70.31c2.07,1.57,5.35,6.46,5.87,8.91"/>
 		</g>
 	</g>
-	<g id="kvg:096e2-Kaisho-g8" kvg:element="隹" kvg:position="right" kvg:radical="general">
-		<g id="kvg:096e2-Kaisho-g9" kvg:element="亻" kvg:variant="true" kvg:original="人">
+	<g id="kvg:096e2-Kaisho-g9" kvg:element="隹" kvg:position="right" kvg:radical="general">
+		<g id="kvg:096e2-Kaisho-g10" kvg:element="亻" kvg:variant="true" kvg:original="人">
 			<path id="kvg:096e2-Kaisho-s12" kvg:type="㇒" d="M66.39,17c0.13,1.75-0.04,4.05-0.46,5.55c-2.67,9.57-6.06,17.67-12.18,29.32"/>
 			<path id="kvg:096e2-Kaisho-s13" kvg:type="㇑" d="M60.44,38.18c0.63,0.87,1.11,2.78,1.15,4.13c0.37,12.01-0.51,49.19-0.2,55.44"/>
 		</g>
diff --git a/kanji/096e2.svg b/kanji/096e2.svg
index b977bd54a..7f5468cd4 100644
--- a/kanji/096e2.svg
+++ b/kanji/096e2.svg
@@ -55,15 +55,17 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:096e2-g7" kvg:element="禸" kvg:variant="true">
-			<path id="kvg:096e2-s7" kvg:type="㇑" d="M 15.51,65.73 c 0.94,0.94 1.11,2.25 0.98,3.8 -0.09,1.14 -0.1,14.38 -0.04,22.47 0.02,3 -0.08,4.67 -0.08,5.37"/>
-			<path id="kvg:096e2-s8" kvg:type="㇆a" d="M 17.49,66.96 c 3.91,-0.59 21.02,-3.93 26.96,-4.93 3,-0.5 5.1,0.6 5.02,3.85 -0.14,5.43 -0.34,18.49 -1.09,23.77 -1.14,7.96 -4.26,3.42 -5.5,1.78"/>
+			<g id="kvg:096e2-g8" kvg:element="冂">
+				<path id="kvg:096e2-s7" kvg:type="㇑" d="M 15.51,65.73 c 0.94,0.94 1.11,2.25 0.98,3.8 -0.09,1.14 -0.1,14.38 -0.04,22.47 0.02,3 -0.08,4.67 -0.08,5.37"/>
+				<path id="kvg:096e2-s8" kvg:type="㇆a" d="M 17.49,66.96 c 3.91,-0.59 21.02,-3.93 26.96,-4.93 3,-0.5 5.1,0.6 5.02,3.85 -0.14,5.43 -0.34,18.49 -1.09,23.77 -1.14,7.96 -4.26,3.42 -5.5,1.78"/>
+			</g>
 			<path id="kvg:096e2-s9" kvg:type="㇜" d="M 33.48,54 c 0.52,1.12 0.74,2.03 0.33,3.33 -1.288384,7.365808 -3.231125,13.166933 -4.809346,20.401288"/>
 			<path id="kvg:096e2-s10" kvg:type="㇜" d="M 23.236278,82.064008 c 4.65,-2.45 8.743558,-4.398875 14.483558,-6.998875"/>
 			<path id="kvg:096e2-s11" kvg:type="㇔" d="M 36.76,70.56 c 2.07,1.57 4.74,5.94 5.87,8.91"/>
 		</g>
 	</g>
-	<g id="kvg:096e2-g8" kvg:element="隹" kvg:position="right" kvg:radical="general">
-		<g id="kvg:096e2-g9" kvg:element="亻" kvg:variant="true" kvg:original="人">
+	<g id="kvg:096e2-g9" kvg:element="隹" kvg:position="right" kvg:radical="general">
+		<g id="kvg:096e2-g10" kvg:element="亻" kvg:variant="true" kvg:original="人">
 			<path id="kvg:096e2-s12" kvg:type="㇒" d="M 66.89,17.5 c 0.13,1.75 -0.04,2.55 -0.46,4.05 -2.67,9.57 -6.81,18.7 -12.93,29.32"/>
 			<path id="kvg:096e2-s13" kvg:type="㇑" d="M 60.44,39.43 c 0.87,0.87 0.9,1.82 0.9,3.13 0,9.03 0,39.94 0,47.94 0,4.5 -0.09,5.88 -0.09,7.5"/>
 		</g>
diff --git a/kanji/09b51.svg b/kanji/09b51.svg
index 6181bf903..4998355f7 100644
--- a/kanji/09b51.svg
+++ b/kanji/09b51.svg
@@ -78,8 +78,10 @@ kvg:type CDATA #IMPLIED >
 		</g>
 	</g>
 	<g id="kvg:09b51-g13" kvg:element="禸">
-		<path id="kvg:09b51-s17" kvg:type="㇑" d="M 56.15,54.52 c 0.57,0.76 0.76,1.96 0.76,3.35 0,7.88 -0.17,26.35 -0.17,28.63"/>
-		<path id="kvg:09b51-s18" kvg:type="㇆" d="M 57.08,56.98 c 5.07,-0.64 29.81,-4.09 30.83,-4.09 1.47,0 2.4,0.48 2.4,1.91 0,3.02 0.19,19.96 0.2,25.31 0.01,7.44 -4.64,3.14 -6,1.63"/>
+		<g id="kvg:09b51-g14" kvg:element="冂">
+			<path id="kvg:09b51-s17" kvg:type="㇑" d="M 56.15,54.52 c 0.57,0.76 0.76,1.96 0.76,3.35 0,7.88 -0.17,26.35 -0.17,28.63"/>
+			<path id="kvg:09b51-s18" kvg:type="㇆" d="M 57.08,56.98 c 5.07,-0.64 29.81,-4.09 30.83,-4.09 1.47,0 2.4,0.48 2.4,1.91 0,3.02 0.19,19.96 0.2,25.31 0.01,7.44 -4.64,3.14 -6,1.63"/>
+		</g>
 		<path id="kvg:09b51-s19" kvg:type="㇜" d="M 72.72,47.79 c 0.22,0.42 0.28,2.07 0.07,2.59 -2.083107,7.5 -3.347874,11.513832 -5.03813,16.954299"/>
 		<path id="kvg:09b51-s20" kvg:type="㇜" d="M 64.803107,68.29397 c 3.39,-1.12 9.84,-2.13 14.56,-4.01"/>
 		<path id="kvg:09b51-s21" kvg:type="㇔" d="M 77,59.08 c 2.14,2.11 5.53,8.66 6.06,11.94"/>
diff --git a/kanji/09ed0.svg b/kanji/09ed0.svg
index f1c845842..6d08d2a1f 100644
--- a/kanji/09ed0.svg
+++ b/kanji/09ed0.svg
@@ -79,9 +79,11 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:09ed0-g13" kvg:element="禸">
-			<path id="kvg:09ed0-s19" kvg:type="㇑" d="M 53.2,60.02 c 0.49,1.02 1.07,2.63 1.15,4.49 0.22,4.84 0.64,29.97 0.64,33.03"/>
-			<path id="kvg:09ed0-s20" kvg:type="㇆" d="M 54.47,62.06 c 5.79,-0.67 36.19,-4.35 37.36,-4.35 1.67,0 2.74,0.5 2.74,2.01 0,3.18 -0.27,25.03 -0.27,31.59 0,9.69 -4.72,3.32 -6.28,1.72"/>
-			<g id="kvg:09ed0-g14" kvg:element="厶">
+			<g id="kvg:09ed0-g14" kvg:element="冂">
+				<path id="kvg:09ed0-s19" kvg:type="㇑" d="M 53.2,60.02 c 0.49,1.02 1.07,2.63 1.15,4.49 0.22,4.84 0.64,29.97 0.64,33.03"/>
+				<path id="kvg:09ed0-s20" kvg:type="㇆" d="M 54.47,62.06 c 5.79,-0.67 36.19,-4.35 37.36,-4.35 1.67,0 2.74,0.5 2.74,2.01 0,3.18 -0.27,25.03 -0.27,31.59 0,9.69 -4.72,3.32 -6.28,1.72"/>
+			</g>
+			<g id="kvg:09ed0-g15" kvg:element="厶">
 				<path id="kvg:09ed0-s21" kvg:type="㇜" d="M 73.97,49.78 c 0.25,0.51 0.32,2.49 0.08,3.11 -1.586769,9.57726 -1.639018,14.986605 -3.538691,23.107096"/>
 				<path id="kvg:09ed0-s22" kvg:type="㇜" d="M 64.554029,78.531595 c 3.87,-1.35 10.89,-3.36 16.27,-5.63"/>
 				<path id="kvg:09ed0-s23" kvg:type="㇔" d="M 78.43,66.55 c 2.44,2.43 6.31,9.98 6.92,13.76"/>
diff --git a/kanji/09f72-HzFst.svg b/kanji/09f72-HzFst.svg
index 2e5cd6215..72d346293 100644
--- a/kanji/09f72-HzFst.svg
+++ b/kanji/09f72-HzFst.svg
@@ -84,9 +84,11 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09f72-HzFst-s19" kvg:type="㇐" d="M63.81,49.32c6.73-0.88,19.99-1.81,29.4-2.63"/>
 		</g>
 		<g id="kvg:09f72-HzFst-g15" kvg:element="禸" kvg:variant="true">
-			<path id="kvg:09f72-HzFst-s20" kvg:type="㇑" d="M58.24,60.72c0.32,0.66,0.6,1.71,0.66,2.93c0.36,7.21,0.73,32.61,0.73,34.61"/>
-			<path id="kvg:09f72-HzFst-s21" kvg:type="㇆a" d="M59.72,63.09c5.38-0.5,32.93-4.71,34.01-4.75c2.27-0.09,3.19,1.09,3.2,3.56C97,73.5,96.75,83,96.02,93.77c-0.3,4.45-4.91,0.39-6.61-1.24"/>
-			<g id="kvg:09f72-HzFst-g16" kvg:element="虫" kvg:part="2">
+			<g id="kvg:09f72-HzFst-g16" kvg:element="冂">
+				<path id="kvg:09f72-HzFst-s20" kvg:type="㇑" d="M58.24,60.72c0.32,0.66,0.6,1.71,0.66,2.93c0.36,7.21,0.73,32.61,0.73,34.61"/>
+				<path id="kvg:09f72-HzFst-s21" kvg:type="㇆a" d="M59.72,63.09c5.38-0.5,32.93-4.71,34.01-4.75c2.27-0.09,3.19,1.09,3.2,3.56C97,73.5,96.75,83,96.02,93.77c-0.3,4.45-4.91,0.39-6.61-1.24"/>
+			</g>
+			<g id="kvg:09f72-HzFst-g17" kvg:element="虫" kvg:part="2">
 				<path id="kvg:09f72-HzFst-s22" kvg:type="㇑" d="M75.52,24.16c0.67,0.39,1.21,2.23,1.21,3.04c0,5.17,0.34,45.27,0.21,50.12"/>
 				<path id="kvg:09f72-HzFst-s23" kvg:type="㇐" d="M67.29,80.12c0.46,0.54,1.41,0.87,1.86,0.7c4.59-1.79,16.66-6.69,18.05-7.36"/>
 				<path id="kvg:09f72-HzFst-s24" kvg:type="㇔" d="M84.04,68.5c2.21,2.14,5.7,8.82,6.25,12.15"/>
diff --git a/kanji/09f72.svg b/kanji/09f72.svg
index a078c1b2d..d9ac7b959 100644
--- a/kanji/09f72.svg
+++ b/kanji/09f72.svg
@@ -84,9 +84,11 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09f72-s19" kvg:type="㇐" d="M63.81,49.32c6.73-0.88,19.99-1.81,29.4-2.63"/>
 		</g>
 		<g id="kvg:09f72-g15" kvg:element="禸" kvg:variant="true">
-			<path id="kvg:09f72-s20" kvg:type="㇑" d="M58.24,60.72c0.32,0.66,0.6,1.71,0.66,2.93c0.36,7.21,0.73,32.61,0.73,34.61"/>
-			<path id="kvg:09f72-s21" kvg:type="㇆a" d="M59.72,63.09c5.38-0.5,32.93-4.71,34.01-4.75c2.27-0.09,3.19,1.09,3.2,3.56C97,73.5,96.75,83,96.02,93.77c-0.3,4.45-4.91,0.39-6.61-1.24"/>
-			<g id="kvg:09f72-g16" kvg:element="虫" kvg:part="2">
+			<g id="kvg:09f72-g16" kvg:element="冂">
+				<path id="kvg:09f72-s20" kvg:type="㇑" d="M58.24,60.72c0.32,0.66,0.6,1.71,0.66,2.93c0.36,7.21,0.73,32.61,0.73,34.61"/>
+				<path id="kvg:09f72-s21" kvg:type="㇆a" d="M59.72,63.09c5.38-0.5,32.93-4.71,34.01-4.75c2.27-0.09,3.19,1.09,3.2,3.56C97,73.5,96.75,83,96.02,93.77c-0.3,4.45-4.91,0.39-6.61-1.24"/>
+			</g>
+			<g id="kvg:09f72-g17" kvg:element="虫" kvg:part="2">
 				<path id="kvg:09f72-s22" kvg:type="㇑" d="M75.52,24.16c0.67,0.39,1.21,2.23,1.21,3.04c0,5.17,0.34,45.27,0.21,50.12"/>
 				<path id="kvg:09f72-s23" kvg:type="㇐" d="M67.29,80.12c0.46,0.54,1.41,0.87,1.86,0.7c4.59-1.79,16.66-6.69,18.05-7.36"/>
 				<path id="kvg:09f72-s24" kvg:type="㇔" d="M84.04,68.5c2.21,2.14,5.7,8.82,6.25,12.15"/>