diff --git a/kanji/050c5.svg b/kanji/050c5.svg
index 01d6c26a9..5aa0a5f6d 100644
--- a/kanji/050c5.svg
+++ b/kanji/050c5.svg
@@ -35,44 +35,44 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_050c5-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:050c5-Jinmei" kvg:element="僅">
-	<g id="kvg:050c5-Jinmei-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
-		<path id="kvg:050c5-Jinmei-s1" kvg:type="㇒" d="M30.01,17.39c0.11,1.1,0.19,2.48-0.1,3.84c-1.85,8.56-8.99,25.13-17.61,36.73"/>
-		<path id="kvg:050c5-Jinmei-s2" kvg:type="㇑" d="M24.53,41.5c0.59,0.61,0.76,1.97,0.76,3.23c0,13.02-0.29,43.15-0.29,51.9"/>
+<g id="kvg:StrokePaths_050c5" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:050c5" kvg:element="僅">
+	<g id="kvg:050c5-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
+		<path id="kvg:050c5-s1" kvg:type="㇒" d="M30.01,17.39c0.11,1.1,0.19,2.48-0.1,3.84c-1.85,8.56-8.99,25.13-17.61,36.73"/>
+		<path id="kvg:050c5-s2" kvg:type="㇑" d="M24.53,41.5c0.59,0.61,0.76,1.97,0.76,3.23c0,13.02-0.29,43.15-0.29,51.9"/>
 	</g>
-	<g id="kvg:050c5-Jinmei-g2" kvg:position="right">
-		<g id="kvg:050c5-Jinmei-g3" kvg:position="top">
-			<g id="kvg:050c5-Jinmei-g4" kvg:element="艹" kvg:variant="true" kvg:original="艸">
-				<path id="kvg:050c5-Jinmei-s3" kvg:type="㇐" d="M38.25,26.81c1.75,0.44,3.51,0.46,4.92,0.34c10.58-0.9,32.33-3.15,44.95-4.41c2.32-0.23,3.72,0.4,4.89,0.82"/>
-				<path id="kvg:050c5-Jinmei-s4" kvg:type="㇑a" d="M51.04,14.55c0.52,0.54,1.3,1.72,1.38,2.53c0.7,7.6,0.8,17.63,1,20.39"/>
-				<path id="kvg:050c5-Jinmei-s5" kvg:type="㇑a" d="M76.13,12.37c0.12,1,0.52,3.05,0.27,4.39c-1.47,7.9-2.14,11.29-3.74,18.73"/>
+	<g id="kvg:050c5-g2" kvg:position="right">
+		<g id="kvg:050c5-g3" kvg:position="top">
+			<g id="kvg:050c5-g4" kvg:element="艹" kvg:variant="true" kvg:original="艸">
+				<path id="kvg:050c5-s3" kvg:type="㇐" d="M38.25,26.81c1.75,0.44,3.51,0.46,4.92,0.34c10.58-0.9,32.33-3.15,44.95-4.41c2.32-0.23,3.72,0.4,4.89,0.82"/>
+				<path id="kvg:050c5-s4" kvg:type="㇑a" d="M51.04,14.55c0.52,0.54,1.3,1.72,1.38,2.53c0.7,7.6,0.8,17.63,1,20.39"/>
+				<path id="kvg:050c5-s5" kvg:type="㇑a" d="M76.13,12.37c0.12,1,0.52,3.05,0.27,4.39c-1.47,7.9-2.14,11.29-3.74,18.73"/>
 			</g>
-			<path id="kvg:050c5-Jinmei-s6" kvg:type="㇐" d="M54.36,36.85c2.88-0.21,14.64-1.3,18.3-1.51"/>
+			<path id="kvg:050c5-s6" kvg:type="㇐" d="M54.36,36.85c2.88-0.21,14.64-1.3,18.3-1.51"/>
 		</g>
 	</g>
-	<g id="kvg:050c5-Jinmei-g5" kvg:position="bottom">
-		<path id="kvg:050c5-Jinmei-s7" kvg:type="㇑" d="M43.25,43.45c0.38,0.3,0.77,0.55,0.94,0.93c1.32,2.98,2.4,11.2,3.3,16.55"/>
-		<path id="kvg:050c5-Jinmei-s8" kvg:type="㇕" d="M45.12,44.98c9.31-1.25,33.88-4.89,38.67-5.31c1.76-0.15,2.81,1.55,2.56,2.46c-1.04,3.75-2.73,7.47-4.96,12.88"/>
-		<path id="kvg:050c5-Jinmei-s9" kvg:type="㇐" d="M47.36,58.46c5.64-0.47,28.63-3.01,35.79-3.49"/>
-		<path id="kvg:050c5-Jinmei-s10" kvg:type="㇑" d="M62.72,36.48c1.03,1.02,1.25,2.1,1.25,3.29c0,3.73-0.25,42.98-0.25,52.16"/>
-		<g id="kvg:050c5-Jinmei-g6" kvg:element="三">
-			<g id="kvg:050c5-Jinmei-g7" kvg:element="一" kvg:position="top">
-				<path id="kvg:050c5-Jinmei-s11" kvg:type="㇐" d="M46.88,70.5c0.55,0.17,2.22,0.2,2.77,0.17c5.06-0.31,21.01-1.79,28.64-2.66c0.91-0.1,2.5,0.08,2.96,0.16"/>
+	<g id="kvg:050c5-g5" kvg:position="bottom">
+		<path id="kvg:050c5-s7" kvg:type="㇑" d="M43.25,43.45c0.38,0.3,0.77,0.55,0.94,0.93c1.32,2.98,2.4,11.2,3.3,16.55"/>
+		<path id="kvg:050c5-s8" kvg:type="㇕" d="M45.12,44.98c9.31-1.25,33.88-4.89,38.67-5.31c1.76-0.15,2.81,1.55,2.56,2.46c-1.04,3.75-2.73,7.47-4.96,12.88"/>
+		<path id="kvg:050c5-s9" kvg:type="㇐" d="M47.36,58.46c5.64-0.47,28.63-3.01,35.79-3.49"/>
+		<path id="kvg:050c5-s10" kvg:type="㇑" d="M62.72,36.48c1.03,1.02,1.25,2.1,1.25,3.29c0,3.73-0.25,42.98-0.25,52.16"/>
+		<g id="kvg:050c5-g6" kvg:element="三">
+			<g id="kvg:050c5-g7" kvg:element="一" kvg:position="top">
+				<path id="kvg:050c5-s11" kvg:type="㇐" d="M 42.307775,70.989881 c 0.55,0.17 3.689644,0.2 4.239644,0.17 5.06,-0.31 28.848099,-2.279881 36.478099,-3.149881 1.399881,0.226587 3.80635,0.08 4.26635,0.16"/>
 			</g>
-			<g id="kvg:050c5-Jinmei-g8" kvg:position="bottom">
-				<g id="kvg:050c5-Jinmei-g9" kvg:element="一">
-					<path id="kvg:050c5-Jinmei-s12" kvg:type="㇐" d="M45,81.34c0.72,0.24,4.26,0.26,4.98,0.24c9.55-0.31,20.48-2.51,29.68-3.14c1.19-0.08,3.27,0.11,3.87,0.23"/>
+			<g id="kvg:050c5-g8" kvg:position="bottom">
+				<g id="kvg:050c5-g9" kvg:element="一">
+					<path id="kvg:050c5-s12" kvg:type="㇐" d="M45,81.34c0.72,0.24,4.26,0.26,4.98,0.24c9.55-0.31,20.48-2.51,29.68-3.14c1.19-0.08,3.27,0.11,3.87,0.23"/>
 				</g>
-				<g id="kvg:050c5-Jinmei-g10" kvg:element="一">
-					<path id="kvg:050c5-Jinmei-s13" kvg:type="㇐" d="M37.38,93.99c1.05,0.35,2.47,1.06,3.52,0.95c16.31-1.81,33.32-3.3,48.34-3.58c1.75-0.03,4.8,0.17,5.68,0.34"/>
+				<g id="kvg:050c5-g10" kvg:element="一">
+					<path id="kvg:050c5-s13" kvg:type="㇐" d="M37.38,93.99c1.05,0.35,2.47,1.06,3.52,0.95c16.31-1.81,33.32-3.3,48.34-3.58c1.75-0.03,4.8,0.17,5.68,0.34"/>
 				</g>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_050c5-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_050c5" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 21.85 16.85)">1</text>
 	<text transform="matrix(1 0 0 1 17.50 59.50)">2</text>
 	<text transform="matrix(1 0 0 1 36.50 23.50)">3</text>
@@ -83,8 +83,8 @@ kvg:type CDATA #IMPLIED >
 	<text transform="matrix(1 0 0 1 46.50 41.50)">8</text>
 	<text transform="matrix(1 0 0 1 50.50 55.50)">9</text>
 	<text transform="matrix(1 0 0 1 67.50 50.50)">10</text>
-	<text transform="matrix(1 0 0 1 37.50 70.50)">11</text>
-	<text transform="matrix(1 0 0 1 35.25 81.50)">12</text>
+	<text transform="matrix(1 0 0 1 33 69)">11</text>
+	<text transform="matrix(1 0 0 1 33 82)">12</text>
 	<text transform="matrix(1 0 0 1 33.50 91.50)">13</text>
 </g>
 </svg>
diff --git a/kanji/05632.svg b/kanji/05632.svg
index 6559a967e..1797d68cd 100644
--- a/kanji/05632.svg
+++ b/kanji/05632.svg
@@ -61,11 +61,11 @@ kvg:type CDATA #IMPLIED >
 				</g>
 			</g>
 		</g>
-		<g id="kvg:05632-g8" kvg:element="月" kvg:position="right">
+		<g id="kvg:05632-g8" kvg:element="月" kvg:variant="true" kvg:position="right">
 			<path id="kvg:05632-s12" kvg:type="㇒" d="M74.47,18.47c0.62,1.03,1.24,2.05,1.24,3.1c0,3.93-0.23,24.01-0.29,26.33c-0.28,10.62-0.92,29.85-10.38,44.85"/>
 			<path id="kvg:05632-s13" kvg:type="㇆a" d="M76.23,20.47c1.94-0.25,14.62-2.44,16.06-2.72c2.59-0.5,3.56,3.27,3.24,4.78c-0.31,1.45-0.49,47.06-0.49,67.43c0,8.04-5.48,1.29-7.09-0.73"/>
-			<path id="kvg:05632-s14" kvg:type="㇐a" d="M75.73,40.84C81.75,40,88.5,39.25,94.9,38.37"/>
-			<path id="kvg:05632-s15" kvg:type="㇐a" d="M75.21,60.71c5.18-0.75,13.87-1.46,19.86-1.97"/>
+			<path id="kvg:05632-s14" kvg:type="㇔/㇐" d="M81,39c2.98,2.07,7,5.5,9.11,9.19"/>
+			<path id="kvg:05632-s15" kvg:type="㇔/㇐" d="M81,60c3.56,2.1,7.74,6.88,9,9.75"/>
 		</g>
 	</g>
 </g>
@@ -84,7 +84,7 @@ kvg:type CDATA #IMPLIED >
 	<text transform="matrix(1 0 0 1 42.50 69.88)">11</text>
 	<text transform="matrix(1 0 0 1 63.50 21.50)">12</text>
 	<text transform="matrix(1 0 0 1 78.50 16.50)">13</text>
-	<text transform="matrix(1 0 0 1 79.50 36.50)">14</text>
-	<text transform="matrix(1 0 0 1 79.25 56.50)">15</text>
+	<text transform="matrix(1 0 0 1 82 39)">14</text>
+	<text transform="matrix(1 0 0 1 82 60)">15</text>
 </g>
 </svg>
diff --git a/kanji/05a29.svg b/kanji/05a29.svg
index 163a790cb..7a8146bd5 100644
--- a/kanji/05a29.svg
+++ b/kanji/05a29.svg
@@ -35,36 +35,36 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_05a29-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:05a29-Jinmei" kvg:element="娩">
-	<g id="kvg:05a29-Jinmei-g1" kvg:element="女" kvg:variant="true" kvg:position="left" kvg:radical="general">
-		<path id="kvg:05a29-Jinmei-s1" kvg:type="㇛" d="M26.48,25.37c0.39,1.07,1.08,2.82,0.89,4.36c-0.98,7.59-4.32,26.09-8.63,34.97c-0.89,1.82,0.39,2.57,0.89,2.7c8.63,2.35,16.38,8.35,21.63,16.19"/>
-		<path id="kvg:05a29-Jinmei-s2" kvg:type="㇒" d="M39.25,39.98c0.08,1.25,0.14,4.27-0.16,6.08c-2.43,14.61-9.45,35.32-26.84,46.19"/>
-		<path id="kvg:05a29-Jinmei-s3" kvg:type="㇀/㇐" d="M10,50.59c0.75,0.97,1.83,1.55,3.75,0.93c5.5-1.77,17-5.02,28.75-8.43"/>
+<g id="kvg:StrokePaths_05a29" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:05a29" kvg:element="娩">
+	<g id="kvg:05a29-g1" kvg:element="女" kvg:variant="true" kvg:position="left" kvg:radical="general">
+		<path id="kvg:05a29-s1" kvg:type="㇛" d="M26.48,25.37c0.39,1.07,1.08,2.82,0.89,4.36c-0.98,7.59-4.32,26.09-8.63,34.97c-0.89,1.82,0.39,2.57,0.89,2.7c8.63,2.35,16.38,8.35,21.63,16.19"/>
+		<path id="kvg:05a29-s2" kvg:type="㇒" d="M39.25,39.98c0.08,1.25,0.14,4.27-0.16,6.08c-2.43,14.61-9.45,35.32-26.84,46.19"/>
+		<path id="kvg:05a29-s3" kvg:type="㇀/㇐" d="M10,50.59c0.75,0.97,1.83,1.55,3.75,0.93c5.5-1.77,17-5.02,28.75-8.43"/>
 	</g>
-	<g id="kvg:05a29-Jinmei-g2" kvg:element="免" kvg:position="right">
-		<g id="kvg:05a29-Jinmei-g3" kvg:position="top">
-			<g id="kvg:05a29-Jinmei-g4" kvg:element="𠂊" kvg:variant="true" kvg:original="勹">
-				<path id="kvg:05a29-Jinmei-s4" kvg:type="㇒" d="M62.89,12.9c0.04,0.5,0.08,1.28-0.08,1.99c-0.92,4.2-6.17,13.43-13.38,19.08"/>
-				<path id="kvg:05a29-Jinmei-s5" kvg:type="㇇" d="M59.85,23c2.05,0,19.79-4.09,21.94-4.33c1.85-0.2,2.3,1.69,1.53,2.71c-3.25,4.27-7.05,8.88-12.19,15.72"/>
+	<g id="kvg:05a29-g2" kvg:element="免" kvg:position="right">
+		<g id="kvg:05a29-g3" kvg:position="top">
+			<g id="kvg:05a29-g4" kvg:element="𠂊" kvg:variant="true" kvg:original="勹">
+				<path id="kvg:05a29-s4" kvg:type="㇒" d="M62.89,12.9c0.04,0.5,0.08,1.28-0.08,1.99c-0.92,4.2-6.17,13.43-13.38,19.08"/>
+				<path id="kvg:05a29-s5" kvg:type="㇇" d="M59.85,23c2.05,0,19.79-4.09,21.94-4.33c1.85-0.2,2.3,1.69,1.53,2.71c-3.25,4.27-7.05,8.88-12.19,15.72"/>
 			</g>
-			<path id="kvg:05a29-Jinmei-s6" kvg:type="㇑" d="M49.51,41.1c0.38,0.47,0.78,0.86,0.94,1.45c1.33,4.66,2.26,12.32,3.17,20.69"/>
-			<path id="kvg:05a29-Jinmei-s7" kvg:type="㇕" d="M50.4,42.71c9.4-1.96,34.3-4.53,39.15-5.19c1.77-0.24,2.84,1.43,2.58,2.85c-1.05,5.87-1.63,11.13-4,19.4"/>
-			<path id="kvg:05a29-Jinmei-s8" kvg:type="㇑" d="M69.38,42.5c0.57,1,0.9,2.5,0.9,3.75c0,4.75,0,10.5,0,12.5"/>
-			<path id="kvg:05a29-Jinmei-s9" kvg:type="㇐" d="M53.38,61.25c3.8-0.5,31.05-3.25,35.24-3.5"/>
+			<path id="kvg:05a29-s6" kvg:type="㇑" d="M49.51,41.1c0.38,0.47,0.78,0.86,0.94,1.45c1.33,4.66,2.26,12.32,3.17,20.69"/>
+			<path id="kvg:05a29-s7" kvg:type="㇕" d="M50.4,42.71c9.4-1.96,34.3-4.53,39.15-5.19c1.77-0.24,2.84,1.43,2.58,2.85c-1.05,5.87-1.63,11.13-4,19.4"/>
+			<path id="kvg:05a29-s8" kvg:type="㇑" d="M69.38,42.5c0.57,1,0.9,2.5,0.9,3.75c0,4.75,0,10.5,0,12.5"/>
+			<path id="kvg:05a29-s9" kvg:type="㇐" d="M53.38,61.25c3.8-0.5,31.05-3.25,35.24-3.5"/>
 		</g>
-		<g id="kvg:05a29-Jinmei-g5" kvg:element="儿" kvg:original="八" kvg:position="bottom">
-			<g id="kvg:05a29-Jinmei-g6" kvg:element="丿" kvg:position="left">
-				<path id="kvg:05a29-Jinmei-s10" kvg:type="㇒" d="M68.23,57.75c0.08,0.92,0.18,2.38-0.17,3.7c-2.1,7.81-12.04,27.01-30.64,35.46"/>
+		<g id="kvg:05a29-g5" kvg:element="儿" kvg:original="八" kvg:position="bottom">
+			<g id="kvg:05a29-g6" kvg:element="丿" kvg:position="left">
+				<path id="kvg:05a29-s10" kvg:type="㇒" d="M68.23,57.75c0.08,0.92,0.18,2.38-0.17,3.7c-2.1,7.81-12.04,27.01-30.64,35.46"/>
 			</g>
-			<g id="kvg:05a29-Jinmei-g7" kvg:position="right">
-				<path id="kvg:05a29-Jinmei-s11" kvg:type="㇟" d="M72.44,62.37c0.49,1.05,0.87,2.29,0.9,3.91c0.13,7.23-0.34,14.15-0.34,19.07c0,7.65,2.51,10.19,12.55,10.19c10.21,0,11.85-1.03,11.85-8.06"/>
+			<g id="kvg:05a29-g7" kvg:position="right">
+				<path id="kvg:05a29-s11" kvg:type="㇟" d="M72.44,62.37c0.49,1.05,0.87,2.29,0.9,3.91c0.13,7.23-0.34,14.15-0.34,19.07c0,7.65,2.51,10.19,12.55,10.19c10.21,0,11.85-1.03,11.85-8.06"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_05a29-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_05a29" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 19.50 24.63)">1</text>
 	<text transform="matrix(1 0 0 1 1.50 51.55)">2</text>
 	<text transform="matrix(1 0 0 1 35.50 35.50)">3</text>
diff --git a/kanji/0633d.svg b/kanji/0633d.svg
index 02aac6b3f..48d251849 100644
--- a/kanji/0633d.svg
+++ b/kanji/0633d.svg
@@ -35,36 +35,36 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_0633d-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:0633d-Jinmei" kvg:element="挽">
-	<g id="kvg:0633d-Jinmei-g1" kvg:element="扌" kvg:variant="true" kvg:original="手" kvg:position="left" kvg:radical="general">
-		<path id="kvg:0633d-Jinmei-s1" kvg:type="㇐" d="M11.5,39.42c2.08,0.25,1.77,0.55,4,0.25c5.5-0.75,13-2.5,22.17-3.67"/>
-		<path id="kvg:0633d-Jinmei-s2" kvg:type="㇚" d="M26.27,13.5c0.48,0.92,1.67,2.49,1.76,5.52c0.4,14.55,0.24,63.44,0.24,68.4c0,14.25-6.32,3.53-7.77,2"/>
-		<path id="kvg:0633d-Jinmei-s3" kvg:type="㇀" d="M10.5,66.22c2.73,2.12,4.49,1.15,7.22-0.67c1.61-1.07,11.45-8.25,18.28-13.39"/>
+<g id="kvg:StrokePaths_0633d" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:0633d" kvg:element="挽">
+	<g id="kvg:0633d-g1" kvg:element="扌" kvg:variant="true" kvg:original="手" kvg:position="left" kvg:radical="general">
+		<path id="kvg:0633d-s1" kvg:type="㇐" d="M11.5,39.42c2.08,0.25,1.77,0.55,4,0.25c5.5-0.75,13-2.5,22.17-3.67"/>
+		<path id="kvg:0633d-s2" kvg:type="㇚" d="M26.27,13.5c0.48,0.92,1.67,2.49,1.76,5.52c0.4,14.55,0.24,63.44,0.24,68.4c0,14.25-6.32,3.53-7.77,2"/>
+		<path id="kvg:0633d-s3" kvg:type="㇀" d="M10.5,66.22c2.73,2.12,4.49,1.15,7.22-0.67c1.61-1.07,11.45-8.25,18.28-13.39"/>
 	</g>
-	<g id="kvg:0633d-Jinmei-g2" kvg:element="免" kvg:position="right">
-		<g id="kvg:0633d-Jinmei-g3" kvg:position="top">
-			<g id="kvg:0633d-Jinmei-g4" kvg:element="𠂊" kvg:variant="true" kvg:original="勹">
-				<path id="kvg:0633d-Jinmei-s4" kvg:type="㇒" d="M59.89,14.4c0.04,0.48,0.08,1.25-0.08,1.95c-0.95,4.1-6.4,13.11-13.87,18.62"/>
-				<path id="kvg:0633d-Jinmei-s5" kvg:type="㇇" d="M57.85,22.5c2.05,0,16.29-2.59,18.44-2.83c1.85-0.2,2.8,1.69,2.03,2.71c-3.25,4.27-7.55,8.38-12.69,15.22"/>
+	<g id="kvg:0633d-g2" kvg:element="免" kvg:position="right">
+		<g id="kvg:0633d-g3" kvg:position="top">
+			<g id="kvg:0633d-g4" kvg:element="𠂊" kvg:variant="true" kvg:original="勹">
+				<path id="kvg:0633d-s4" kvg:type="㇒" d="M59.89,14.4c0.04,0.48,0.08,1.25-0.08,1.95c-0.95,4.1-6.4,13.11-13.87,18.62"/>
+				<path id="kvg:0633d-s5" kvg:type="㇇" d="M57.85,22.5c2.05,0,16.29-2.59,18.44-2.83c1.85-0.2,2.8,1.69,2.03,2.71c-3.25,4.27-7.55,8.38-12.69,15.22"/>
 			</g>
-			<path id="kvg:0633d-Jinmei-s6" kvg:type="㇑" d="M46.51,40.6c0.38,0.47,0.78,0.86,0.94,1.45c1.33,4.66,2.26,10.32,3.17,18.69"/>
-			<path id="kvg:0633d-Jinmei-s7" kvg:type="㇕" d="M47.4,42.71c9.4-1.96,32.8-5.53,37.65-6.19c1.77-0.24,2.84,2.43,2.58,3.85c-1.05,5.87-2.4,10.13-5.5,18.4"/>
-			<path id="kvg:0633d-Jinmei-s8" kvg:type="㇑" d="M65.38,40.5c0.57,1,0.9,3,0.9,4.25c0,4.75,0,10.5,0,12.5"/>
-			<path id="kvg:0633d-Jinmei-s9" kvg:type="㇐" d="M50.88,59.75c3.8-0.5,28.05-2.75,32.24-3"/>
+			<path id="kvg:0633d-s6" kvg:type="㇑" d="M46.51,40.6c0.38,0.47,0.78,0.86,0.94,1.45c1.33,4.66,2.26,10.32,3.17,18.69"/>
+			<path id="kvg:0633d-s7" kvg:type="㇕" d="M47.4,42.71c9.4-1.96,32.8-5.53,37.65-6.19c1.77-0.24,2.84,2.43,2.58,3.85c-1.05,5.87-2.4,10.13-5.5,18.4"/>
+			<path id="kvg:0633d-s8" kvg:type="㇑" d="M65.38,40.5c0.57,1,0.9,3,0.9,4.25c0,4.75,0,10.5,0,12.5"/>
+			<path id="kvg:0633d-s9" kvg:type="㇐" d="M50.88,59.75c3.8-0.5,28.05-2.75,32.24-3"/>
 		</g>
-		<g id="kvg:0633d-Jinmei-g5" kvg:element="儿" kvg:original="八" kvg:position="bottom">
-			<g id="kvg:0633d-Jinmei-g6" kvg:element="丿" kvg:position="left">
-				<path id="kvg:0633d-Jinmei-s10" kvg:type="㇒" d="M63.98,61.75c0.08,0.77,0.18,1.99-0.17,3.09c-2.05,6.52-11.75,22.52-29.9,29.58"/>
+		<g id="kvg:0633d-g5" kvg:element="儿" kvg:original="八" kvg:position="bottom">
+			<g id="kvg:0633d-g6" kvg:element="丿" kvg:position="left">
+				<path id="kvg:0633d-s10" kvg:type="㇒" d="M63.98,61.75c0.08,0.77,0.18,1.99-0.17,3.09c-2.05,6.52-11.75,22.52-29.9,29.58"/>
 			</g>
-			<g id="kvg:0633d-Jinmei-g7" kvg:position="right">
-				<path id="kvg:0633d-Jinmei-s11" kvg:type="㇟" d="M69.44,60.37c0.54,1.05,0.98,2.29,1.01,3.91c0.15,7.23-0.39,15.15-0.39,20.07c0,7.9,0.94,10.19,12.97,10.19c12.22,0,13.86-2.53,13.86-10.06"/>
+			<g id="kvg:0633d-g7" kvg:position="right">
+				<path id="kvg:0633d-s11" kvg:type="㇟" d="M69.44,60.37c0.54,1.05,0.98,2.29,1.01,3.91c0.15,7.23-0.39,15.15-0.39,20.07c0,7.9,0.94,10.19,12.97,10.19c12.22,0,13.86-2.53,13.86-10.06"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_0633d-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_0633d" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 5.50 40.50)">1</text>
 	<text transform="matrix(1 0 0 1 18.19 13.50)">2</text>
 	<text transform="matrix(1 0 0 1 2.50 67.50)">3</text>
diff --git a/kanji/06357.svg b/kanji/06357.svg
index 8909f92ed..a353ee417 100644
--- a/kanji/06357.svg
+++ b/kanji/06357.svg
@@ -55,10 +55,9 @@ kvg:type CDATA #IMPLIED >
 			<g id="kvg:06357-g6" kvg:element="小">
 				<path id="kvg:06357-s8" kvg:type="㇚" d="M69.36,45.5c0.08,0.24,1.14,1.24,1.14,2.75c0,8.75-0.23,15.72-0.23,18.19c0,8.06-4.53,2.31-6.17,0.31"/>
 				<path id="kvg:06357-s9" kvg:type="㇒" d="M57.03,53.25c0.04,0.42,0.16,1.12-0.08,1.7c-1.74,4.23-9.11,12.4-15.09,16.3"/>
-				<path id="kvg:06357-s10" kvg:type="㇔" d="M83.43,52.5c5.71,2.5,12.66,8.37,14.09,12.26"/>
 			</g>
 			<g id="kvg:06357-g7" kvg:element="丿">
-				<path id="kvg:06357-s11" kvg:type="㇒" d="M85.48,60.14c0.13,0.89,0.39,2.32-0.27,3.58C79.74,74.14,58.68,91,37.31,98"/>
+				<path id="kvg:06357-s10" kvg:type="㇒" d="M 92.177034,52.288305 c 0.13,0.89 0.159068,3.012797 -1.193729,5.65839 -5.47,10.42 -31.379576,33.746102 -52.749576,40.746102"/>
 			</g>
 		</g>
 	</g>
@@ -74,7 +73,6 @@ kvg:type CDATA #IMPLIED >
 	<text transform="matrix(1 0 0 1 39.50 42.93)">7</text>
 	<text transform="matrix(1 0 0 1 63.25 52.00)">8</text>
 	<text transform="matrix(1 0 0 1 51.00 55.03)">9</text>
-	<text transform="matrix(1 0 0 1 74.25 51.00)">10</text>
-	<text transform="matrix(1 0 0 1 75.75 62.25)">11</text>
+	<text transform="matrix(1 0 0 1 79 56)">10</text>
 </g>
 </svg>
diff --git a/kanji/06897-HyougaiKaisho.svg b/kanji/06897-HyougaiKaisho.svg
deleted file mode 100644
index 1aa749888..000000000
--- a/kanji/06897-HyougaiKaisho.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2009/2010/2011 Ulrich Apel.
-This work is distributed under the conditions of the Creative Commons
-Attribution-Share Alike 3.0 Licence. This means you are free:
-* to Share - to copy, distribute and transmit the work
-* to Remix - to adapt the work
-
-Under the following conditions:
-* Attribution. You must attribute the work by stating your use of KanjiVG in
-  your own copyright header and linking to KanjiVG's website
-  (http://kanjivg.tagaini.net)
-* Share Alike. If you alter, transform, or build upon this work, you may
-  distribute the resulting work only under the same or similar license to this
-  one.
-
-See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
--->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
-<!ATTLIST g
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-kvg:element CDATA #IMPLIED
-kvg:variant CDATA #IMPLIED
-kvg:partial CDATA #IMPLIED
-kvg:original CDATA #IMPLIED
-kvg:part CDATA #IMPLIED
-kvg:number CDATA #IMPLIED
-kvg:tradForm CDATA #IMPLIED
-kvg:radicalForm CDATA #IMPLIED
-kvg:position CDATA #IMPLIED
-kvg:radical CDATA #IMPLIED
-kvg:phon CDATA #IMPLIED >
-<!ATTLIST path
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-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_06897-HyougaiKaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:06897-HyougaiKaisho" kvg:element="梗">
-	<g id="kvg:06897-HyougaiKaisho-g1" kvg:element="木" kvg:position="left" kvg:radical="general">
-		<path id="kvg:06897-HyougaiKaisho-s1" kvg:type="㇐" d="M13.28,39.72c0.35,0.24,2.39,0.41,3.31,0.31c3.94-0.41,15.12-2.21,21.45-3.41c0.92-0.17,1.15-0.24,1.73,0"/>
-		<path id="kvg:06897-HyougaiKaisho-s2" kvg:type="㇑" d="M27.36,15c0.91,0.47,2.04,2.75,2.04,4.92c0,0.95-0.3,68.73-0.3,69.58c0,12.5-4.85,2.5-6.1,1.25"/>
-		<path id="kvg:06897-HyougaiKaisho-s3" kvg:type="㇒" d="M28.94,42.28c-5.9,14.39-9.19,20.47-18.33,33.06"/>
-		<path id="kvg:06897-HyougaiKaisho-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,5.66,5.83,7.66,8.39"/>
-	</g>
-	<g id="kvg:06897-HyougaiKaisho-g2" kvg:element="更" kvg:position="right">
-		<path id="kvg:06897-HyougaiKaisho-s5" kvg:type="㇐" d="M47.09,21.1c0.84,0.58,2.35,0.58,3.2,0.58c7.46,0.07,28.38-4.23,36.85-4.4c1.39-0.03,2.23,0.28,2.92,0.57"/>
-		<g id="kvg:06897-HyougaiKaisho-g3" kvg:element="日">
-			<path id="kvg:06897-HyougaiKaisho-s6" kvg:type="㇑" d="M48.69,34.4c0.49,0.73,0.98,1.63,0.98,2.61s3.01,23.64,3.17,24.62"/>
-			<path id="kvg:06897-HyougaiKaisho-s7" kvg:type="㇕a" d="M50.5,35.58c2.77-0.12,34.96-4.56,37.49-4.71c2.11-0.12,3.32,1.6,2.71,5.26c-0.95,5.76-1.37,10.09-4.21,22.84"/>
-			<path id="kvg:06897-HyougaiKaisho-s8" kvg:type="㇐a" d="M51.43,47.24c6.32-1.14,12.79-1.67,19.18-2.31c1.92-0.19,3.81-0.37,5.61-0.54"/>
-			<path id="kvg:06897-HyougaiKaisho-s9" kvg:type="㇐a" d="M54.42,58.88c10.8-1.49,20.78-1.79,32.3-2.94"/>
-		</g>
-		<g id="kvg:06897-HyougaiKaisho-g4" kvg:element="乂">
-			<g id="kvg:06897-HyougaiKaisho-g5" kvg:element="丿">
-				<path id="kvg:06897-HyougaiKaisho-s10" kvg:type="㇒" d="M69.22,21.75c0.68,1.41,0.64,2.59,0.64,4.63c0,32.48-0.61,56.87-27.58,69.16"/>
-			</g>
-			<path id="kvg:06897-HyougaiKaisho-s11" kvg:type="㇏" d="M51.99,66.76c7.74,1.51,31.3,21.37,37.62,25.04c2.14,1.24,3.98,1.78,6.12,2.13"/>
-		</g>
-	</g>
-</g>
-</g>
-<g id="kvg:StrokeNumbers_06897-HyougaiKaisho" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 5.85 41.85)">1</text>
-	<text transform="matrix(1 0 0 1 18.50 15.50)">2</text>
-	<text transform="matrix(1 0 0 1 18.50 51.50)">3</text>
-	<text transform="matrix(1 0 0 1 35.50 46.50)">4</text>
-	<text transform="matrix(1 0 0 1 46.50 18.50)">5</text>
-	<text transform="matrix(1 0 0 1 43.50 45.25)">6</text>
-	<text transform="matrix(1 0 0 1 52.25 32.50)">7</text>
-	<text transform="matrix(1 0 0 1 55.25 44.50)">8</text>
-	<text transform="matrix(1 0 0 1 56.50 55.50)">9</text>
-	<text transform="matrix(1 0 0 1 59.50 29.50)">10</text>
-	<text transform="matrix(1 0 0 1 43.50 70.50)">11</text>
-</g>
-</svg>
diff --git a/kanji/06897-Hyougai.svg b/kanji/06897-Jinmei.svg
similarity index 50%
rename from kanji/06897-Hyougai.svg
rename to kanji/06897-Jinmei.svg
index bdc2b726a..bdf80a26b 100644
--- a/kanji/06897-Hyougai.svg
+++ b/kanji/06897-Jinmei.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (C) 2009/2010/2011 Ulrich Apel.
-This work is distributed under the conditions of the Creative Commons
+This work is distributed under the conditions of the Creative Commons 
 Attribution-Share Alike 3.0 Licence. This means you are free:
 * to Share - to copy, distribute and transmit the work
 * to Remix - to adapt the work
@@ -35,32 +35,32 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_06897-Hyougai" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:06897-Hyougai" kvg:element="梗">
-	<g id="kvg:06897-Hyougai-g1" kvg:element="木" kvg:position="left" kvg:radical="general">
-		<path id="kvg:06897-Hyougai-s1" kvg:type="㇐" d="M12.53,39.22c2.2,0.37,4.41,0.42,6.63,0.14c4.32-0.61,12.47-1.86,18.02-2.55c1.47-0.18,3.12-0.29,4.59-0.19"/>
-		<path id="kvg:06897-Hyougai-s2" kvg:type="㇑" d="M28.11,15.5c0.88,0.88,1.29,2.62,1.29,4.42c0,0.77-0.02,45.7-0.02,65.83c0,4.58,0,7.9,0,9.12"/>
-		<path id="kvg:06897-Hyougai-s3" kvg:type="㇒" d="M28.94,40.28c-0.31,2.34-1.46,5.52-2.14,7.11c-4.69,10.93-8.21,16.96-16.19,27.95"/>
-		<path id="kvg:06897-Hyougai-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,6.03,5.73,7.66,8.64"/>
+<g id="kvg:StrokePaths_06897-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:06897-Jinmei" kvg:element="梗">
+	<g id="kvg:06897-Jinmei-g1" kvg:element="木" kvg:position="left" kvg:radical="general">
+		<path id="kvg:06897-Jinmei-s1" kvg:type="㇐" d="M13.28,39.72c0.35,0.24,2.39,0.41,3.31,0.31c3.94-0.41,15.12-2.21,21.45-3.41c0.92-0.17,1.15-0.24,1.73,0"/>
+		<path id="kvg:06897-Jinmei-s2" kvg:type="㇑" d="M27.36,15c0.91,0.47,2.04,2.75,2.04,4.92c0,0.95-0.12,68.75-0.3,74.58"/>
+		<path id="kvg:06897-Jinmei-s3" kvg:type="㇒" d="M28.94,42.28c-5.9,14.39-9.19,20.47-18.33,33.06"/>
+		<path id="kvg:06897-Jinmei-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,5.66,5.83,7.66,8.39"/>
 	</g>
-	<g id="kvg:06897-Hyougai-g2" kvg:element="更" kvg:position="right">
-		<path id="kvg:06897-Hyougai-s5" kvg:type="㇐" d="M47.09,21.35c3.35,0.58,6.6-0.05,10.03-0.44C65,20,74.64,18.32,81.86,17.65c3.01-0.28,6.14-0.4,8.7-0.05"/>
-		<g id="kvg:06897-Hyougai-g3" kvg:element="日">
-			<path id="kvg:06897-Hyougai-s6" kvg:type="㇑" d="M48.44,34.4c0.83,0.83,1.1,1.64,1.23,2.61c0.37,2.61,1.41,10.54,2.21,16.74c0.43,3.3,0.79,6.12,0.96,7.38"/>
-			<path id="kvg:06897-Hyougai-s7" kvg:type="㇕a" d="M50.5,35.58c4.49-0.59,25.35-3.12,33.75-4.11c4.79-0.56,7,1.41,6.3,5.79c-0.64,4-1.4,7.96-2.64,14.34c-0.42,2.15-0.89,4.57-1.43,7.37"/>
-			<path id="kvg:06897-Hyougai-s8" kvg:type="㇐a" d="M52.18,47.24c10.69-1.61,28.82-3.36,36.06-3.69"/>
-			<path id="kvg:06897-Hyougai-s9" kvg:type="㇐a" d="M54.42,58.88c9.6-1.09,18.71-1.88,31.8-2.69"/>
+	<g id="kvg:06897-Jinmei-g2" kvg:element="更" kvg:position="right">
+		<path id="kvg:06897-Jinmei-s5" kvg:type="㇐" d="M47.09,21.1c0.84,0.58,2.35,0.58,3.2,0.58c7.46,0.07,28.38-4.23,36.85-4.4c1.39-0.03,2.23,0.28,2.92,0.57"/>
+		<g id="kvg:06897-Jinmei-g3" kvg:element="日">
+			<path id="kvg:06897-Jinmei-s6" kvg:type="㇑" d="M48.69,34.4c0.49,0.73,0.98,1.63,0.98,2.61s3.01,23.64,3.17,24.62"/>
+			<path id="kvg:06897-Jinmei-s7" kvg:type="㇕a" d="M50.5,35.58c2.77-0.12,34.96-4.56,37.49-4.71c2.11-0.12,3.32,1.6,2.71,5.26c-0.95,5.76-1.37,10.09-4.21,22.84"/>
+			<path id="kvg:06897-Jinmei-s8" kvg:type="㇐a" d="M51.43,47.24c6.98-1.25,32.06-3.69,36.31-3.69"/>
+			<path id="kvg:06897-Jinmei-s9" kvg:type="㇐a" d="M54.42,58.88c10.8-1.49,20.78-1.79,32.3-2.94"/>
 		</g>
-		<g id="kvg:06897-Hyougai-g4" kvg:element="乂">
-			<g id="kvg:06897-Hyougai-g5" kvg:element="丿">
-				<path id="kvg:06897-Hyougai-s10" kvg:type="㇒" d="M68.97,21.75c1.08,1.08,1.17,2.59,1.14,4.63c-0.61,39.37-1.36,54.99-27.83,69.16"/>
+		<g id="kvg:06897-Jinmei-g4" kvg:element="乂">
+			<g id="kvg:06897-Jinmei-g5" kvg:element="丿">
+				<path id="kvg:06897-Jinmei-s10" kvg:type="㇒" d="M69.22,21.75c0.68,1.41,0.64,2.59,0.64,4.63c0,32.48-0.61,56.87-27.58,69.16"/>
 			</g>
-			<path id="kvg:06897-Hyougai-s11" kvg:type="㇏" d="M51.99,66.51c6.04,1.18,21.5,14.93,31.08,22.15c3.4,2.66,6.79,4.5,11.15,5.52"/>
+			<path id="kvg:06897-Jinmei-s11" kvg:type="㇏" d="M55.25,64.25C60,72,83.29,88.14,89.61,91.8c2.14,1.24,3.98,1.78,6.12,2.13"/>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_06897-Hyougai" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_06897-Jinmei" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 5.85 41.85)">1</text>
 	<text transform="matrix(1 0 0 1 18.50 15.50)">2</text>
 	<text transform="matrix(1 0 0 1 18.50 51.50)">3</text>
diff --git a/kanji/06897-JinmeiKaisho.svg b/kanji/06897-JinmeiKaisho.svg
new file mode 100644
index 000000000..a13437c2a
--- /dev/null
+++ b/kanji/06897-JinmeiKaisho.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2009/2010/2011 Ulrich Apel.
+This work is distributed under the conditions of the Creative Commons 
+Attribution-Share Alike 3.0 Licence. This means you are free:
+* to Share - to copy, distribute and transmit the work
+* to Remix - to adapt the work
+
+Under the following conditions:
+* Attribution. You must attribute the work by stating your use of KanjiVG in
+  your own copyright header and linking to KanjiVG's website
+  (http://kanjivg.tagaini.net)
+* Share Alike. If you alter, transform, or build upon this work, you may
+  distribute the resulting work only under the same or similar license to this
+  one.
+
+See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
+-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
+<!ATTLIST g
+xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
+kvg:element CDATA #IMPLIED
+kvg:variant CDATA #IMPLIED
+kvg:partial CDATA #IMPLIED
+kvg:original CDATA #IMPLIED
+kvg:part CDATA #IMPLIED
+kvg:number CDATA #IMPLIED
+kvg:tradForm CDATA #IMPLIED
+kvg:radicalForm CDATA #IMPLIED
+kvg:position CDATA #IMPLIED
+kvg:radical CDATA #IMPLIED
+kvg:phon CDATA #IMPLIED >
+<!ATTLIST path
+xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
+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_06897-JinmeiKaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:06897-JinmeiKaisho" kvg:element="梗">
+	<g id="kvg:06897-JinmeiKaisho-g1" kvg:element="木" kvg:position="left" kvg:radical="general">
+		<path id="kvg:06897-JinmeiKaisho-s1" kvg:type="㇐" d="M13.28,39.72c0.35,0.24,2.39,0.41,3.31,0.31c3.94-0.41,15.12-2.21,21.45-3.41c0.92-0.17,1.15-0.24,1.73,0"/>
+		<path id="kvg:06897-JinmeiKaisho-s2" kvg:type="㇑" d="M27.36,15c0.91,0.47,2.04,2.75,2.04,4.92c0,0.95-0.3,63.75-0.3,69.58c0,13.25-6.47,3.38-7.6,2.25"/>
+		<path id="kvg:06897-JinmeiKaisho-s3" kvg:type="㇒" d="M28.94,42.28c-5.9,14.39-9.19,20.47-18.33,33.06"/>
+		<path id="kvg:06897-JinmeiKaisho-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,5.66,5.83,7.66,8.39"/>
+	</g>
+	<g id="kvg:06897-JinmeiKaisho-g2" kvg:element="更" kvg:position="right">
+		<path id="kvg:06897-JinmeiKaisho-s5" kvg:type="㇐" d="M47.09,21.1c0.84,0.58,2.35,0.58,3.2,0.58c7.46,0.07,28.38-4.23,36.85-4.4c1.39-0.03,2.23,0.28,2.92,0.57"/>
+		<g id="kvg:06897-JinmeiKaisho-g3" kvg:element="日">
+			<path id="kvg:06897-JinmeiKaisho-s6" kvg:type="㇑" d="M48.69,34.4c0.49,0.73,0.98,1.63,0.98,2.61s3.01,23.64,3.17,24.62"/>
+			<path id="kvg:06897-JinmeiKaisho-s7" kvg:type="㇕a" d="M50.5,35.58c2.77-0.12,34.96-4.56,37.49-4.71c2.11-0.12,3.32,1.6,2.71,5.26c-0.95,5.76-1.37,10.09-4.21,22.84"/>
+			<path id="kvg:06897-JinmeiKaisho-s8" kvg:type="㇐a" d="M51.43,47.24c6.32-1.14,16.29-2.17,22.68-2.81c1.92-0.19,3.81-0.37,5.61-0.54"/>
+			<path id="kvg:06897-JinmeiKaisho-s9" kvg:type="㇐a" d="M54.42,58.88c10.8-1.49,20.78-1.79,32.3-2.94"/>
+		</g>
+		<g id="kvg:06897-JinmeiKaisho-g4" kvg:element="乂">
+			<g id="kvg:06897-JinmeiKaisho-g5" kvg:element="丿">
+				<path id="kvg:06897-JinmeiKaisho-s10" kvg:type="㇒" d="M69.22,21.75c0.68,1.41,0.64,2.59,0.64,4.63c0,32.48-0.61,56.87-27.58,69.16"/>
+			</g>
+			<path id="kvg:06897-JinmeiKaisho-s11" kvg:type="㇏" d="M55.25,64.25C60,72,83.29,88.14,89.61,91.8c2.14,1.24,3.98,1.78,6.12,2.13"/>
+		</g>
+	</g>
+</g>
+</g>
+<g id="kvg:StrokeNumbers_06897-JinmeiKaisho" style="font-size:8;fill:#808080">
+	<text transform="matrix(1 0 0 1 5.85 41.85)">1</text>
+	<text transform="matrix(1 0 0 1 18.50 15.50)">2</text>
+	<text transform="matrix(1 0 0 1 18.50 51.50)">3</text>
+	<text transform="matrix(1 0 0 1 35.50 46.50)">4</text>
+	<text transform="matrix(1 0 0 1 46.50 18.50)">5</text>
+	<text transform="matrix(1 0 0 1 43.50 45.25)">6</text>
+	<text transform="matrix(1 0 0 1 52.25 32.50)">7</text>
+	<text transform="matrix(1 0 0 1 55.25 44.50)">8</text>
+	<text transform="matrix(1 0 0 1 56.50 55.50)">9</text>
+	<text transform="matrix(1 0 0 1 59.50 29.50)">10</text>
+	<text transform="matrix(1 0 0 1 43.50 70.50)">11</text>
+</g>
+</svg>
diff --git a/kanji/06897-Kaisho.svg b/kanji/06897-Kaisho.svg
index 52d6d3231..844e58350 100644
--- a/kanji/06897-Kaisho.svg
+++ b/kanji/06897-Kaisho.svg
@@ -39,7 +39,7 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:06897-Kaisho" kvg:element="梗">
 	<g id="kvg:06897-Kaisho-g1" kvg:element="木" kvg:position="left" kvg:radical="general">
 		<path id="kvg:06897-Kaisho-s1" kvg:type="㇐" d="M13.28,39.72c0.35,0.24,2.39,0.41,3.31,0.31c3.94-0.41,15.12-2.21,21.45-3.41c0.92-0.17,1.15-0.24,1.73,0"/>
-		<path id="kvg:06897-Kaisho-s2" kvg:type="㇑" d="M27.36,15c0.91,0.47,2.04,2.75,2.04,4.92c0,0.95-0.3,63.75-0.3,69.58c0,13.25-6.47,3.38-7.6,2.25"/>
+		<path id="kvg:06897-Kaisho-s2" kvg:type="㇑" d="M27.36,15c0.91,0.47,2.04,2.75,2.04,4.92c0,0.95-0.3,68.73-0.3,69.58c0,12.5-4.85,2.5-6.1,1.25"/>
 		<path id="kvg:06897-Kaisho-s3" kvg:type="㇒" d="M28.94,42.28c-5.9,14.39-9.19,20.47-18.33,33.06"/>
 		<path id="kvg:06897-Kaisho-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,5.66,5.83,7.66,8.39"/>
 	</g>
@@ -48,14 +48,14 @@ kvg:type CDATA #IMPLIED >
 		<g id="kvg:06897-Kaisho-g3" kvg:element="日">
 			<path id="kvg:06897-Kaisho-s6" kvg:type="㇑" d="M48.69,34.4c0.49,0.73,0.98,1.63,0.98,2.61s3.01,23.64,3.17,24.62"/>
 			<path id="kvg:06897-Kaisho-s7" kvg:type="㇕a" d="M50.5,35.58c2.77-0.12,34.96-4.56,37.49-4.71c2.11-0.12,3.32,1.6,2.71,5.26c-0.95,5.76-1.37,10.09-4.21,22.84"/>
-			<path id="kvg:06897-Kaisho-s8" kvg:type="㇐a" d="M51.43,47.24c6.32-1.14,16.29-2.17,22.68-2.81c1.92-0.19,3.81-0.37,5.61-0.54"/>
+			<path id="kvg:06897-Kaisho-s8" kvg:type="㇐a" d="M51.43,47.24c6.32-1.14,12.79-1.67,19.18-2.31c1.92-0.19,3.81-0.37,5.61-0.54"/>
 			<path id="kvg:06897-Kaisho-s9" kvg:type="㇐a" d="M54.42,58.88c10.8-1.49,20.78-1.79,32.3-2.94"/>
 		</g>
 		<g id="kvg:06897-Kaisho-g4" kvg:element="乂">
 			<g id="kvg:06897-Kaisho-g5" kvg:element="丿">
 				<path id="kvg:06897-Kaisho-s10" kvg:type="㇒" d="M69.22,21.75c0.68,1.41,0.64,2.59,0.64,4.63c0,32.48-0.61,56.87-27.58,69.16"/>
 			</g>
-			<path id="kvg:06897-Kaisho-s11" kvg:type="㇏" d="M55.25,64.25C60,72,83.29,88.14,89.61,91.8c2.14,1.24,3.98,1.78,6.12,2.13"/>
+			<path id="kvg:06897-Kaisho-s11" kvg:type="㇏" d="M51.99,66.76c7.74,1.51,31.3,21.37,37.62,25.04c2.14,1.24,3.98,1.78,6.12,2.13"/>
 		</g>
 	</g>
 </g>
@@ -71,6 +71,6 @@ kvg:type CDATA #IMPLIED >
 	<text transform="matrix(1 0 0 1 55.25 44.50)">8</text>
 	<text transform="matrix(1 0 0 1 56.50 55.50)">9</text>
 	<text transform="matrix(1 0 0 1 59.50 29.50)">10</text>
-	<text transform="matrix(1 0 0 1 43.50 70.50)">11</text>
+	<text transform="matrix(1 0 0 1 41.5 70.50)">11</text>
 </g>
 </svg>
diff --git a/kanji/06897.svg b/kanji/06897.svg
index 61cfc63e7..0953bdc61 100644
--- a/kanji/06897.svg
+++ b/kanji/06897.svg
@@ -38,24 +38,24 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_06897" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:06897" kvg:element="梗">
 	<g id="kvg:06897-g1" kvg:element="木" kvg:position="left" kvg:radical="general">
-		<path id="kvg:06897-s1" kvg:type="㇐" d="M13.28,39.72c0.35,0.24,2.39,0.41,3.31,0.31c3.94-0.41,15.12-2.21,21.45-3.41c0.92-0.17,1.15-0.24,1.73,0"/>
-		<path id="kvg:06897-s2" kvg:type="㇑" d="M27.36,15c0.91,0.47,2.04,2.75,2.04,4.92c0,0.95-0.12,68.75-0.3,74.58"/>
-		<path id="kvg:06897-s3" kvg:type="㇒" d="M28.94,42.28c-5.9,14.39-9.19,20.47-18.33,33.06"/>
-		<path id="kvg:06897-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,5.66,5.83,7.66,8.39"/>
+		<path id="kvg:06897-s1" kvg:type="㇐" d="M12.53,39.22c2.2,0.37,4.41,0.42,6.63,0.14c4.32-0.61,12.47-1.86,18.02-2.55c1.47-0.18,3.12-0.29,4.59-0.19"/>
+		<path id="kvg:06897-s2" kvg:type="㇑" d="M28.11,15.5c0.88,0.88,1.29,2.62,1.29,4.42c0,0.77-0.02,45.7-0.02,65.83c0,4.58,0,7.9,0,9.12"/>
+		<path id="kvg:06897-s3" kvg:type="㇒" d="M28.94,40.28c-0.31,2.34-1.46,5.52-2.14,7.11c-4.69,10.93-8.21,16.96-16.19,27.95"/>
+		<path id="kvg:06897-s4" kvg:type="㇔/㇏" d="M32.97,47.9c2.37,1.32,6.03,5.73,7.66,8.64"/>
 	</g>
 	<g id="kvg:06897-g2" kvg:element="更" kvg:position="right">
-		<path id="kvg:06897-s5" kvg:type="㇐" d="M47.09,21.1c0.84,0.58,2.35,0.58,3.2,0.58c7.46,0.07,28.38-4.23,36.85-4.4c1.39-0.03,2.23,0.28,2.92,0.57"/>
+		<path id="kvg:06897-s5" kvg:type="㇐" d="M47.09,21.35c3.35,0.58,6.6-0.05,10.03-0.44C65,20,74.64,18.32,81.86,17.65c3.01-0.28,6.14-0.4,8.7-0.05"/>
 		<g id="kvg:06897-g3" kvg:element="日">
-			<path id="kvg:06897-s6" kvg:type="㇑" d="M48.69,34.4c0.49,0.73,0.98,1.63,0.98,2.61s3.01,23.64,3.17,24.62"/>
-			<path id="kvg:06897-s7" kvg:type="㇕a" d="M50.5,35.58c2.77-0.12,34.96-4.56,37.49-4.71c2.11-0.12,3.32,1.6,2.71,5.26c-0.95,5.76-1.37,10.09-4.21,22.84"/>
-			<path id="kvg:06897-s8" kvg:type="㇐a" d="M51.43,47.24c6.98-1.25,32.06-3.69,36.31-3.69"/>
-			<path id="kvg:06897-s9" kvg:type="㇐a" d="M54.42,58.88c10.8-1.49,20.78-1.79,32.3-2.94"/>
+			<path id="kvg:06897-s6" kvg:type="㇑" d="M48.44,34.4c0.83,0.83,1.1,1.64,1.23,2.61c0.37,2.61,1.41,10.54,2.21,16.74c0.43,3.3,0.79,6.12,0.96,7.38"/>
+			<path id="kvg:06897-s7" kvg:type="㇕a" d="M50.5,35.58c4.49-0.59,25.35-3.12,33.75-4.11c4.79-0.56,7,1.41,6.3,5.79c-0.64,4-1.4,7.96-2.64,14.34c-0.42,2.15-0.89,4.57-1.43,7.37"/>
+			<path id="kvg:06897-s8" kvg:type="㇐a" d="M52.18,47.24c10.69-1.61,28.82-3.36,36.06-3.69"/>
+			<path id="kvg:06897-s9" kvg:type="㇐a" d="M54.42,58.88c9.6-1.09,18.71-1.88,31.8-2.69"/>
 		</g>
 		<g id="kvg:06897-g4" kvg:element="乂">
 			<g id="kvg:06897-g5" kvg:element="丿">
-				<path id="kvg:06897-s10" kvg:type="㇒" d="M69.22,21.75c0.68,1.41,0.64,2.59,0.64,4.63c0,32.48-0.61,56.87-27.58,69.16"/>
+				<path id="kvg:06897-s10" kvg:type="㇒" d="M68.97,21.75c1.08,1.08,1.17,2.59,1.14,4.63c-0.61,39.37-1.36,54.99-27.83,69.16"/>
 			</g>
-			<path id="kvg:06897-s11" kvg:type="㇏" d="M55.25,64.25C60,72,83.29,88.14,89.61,91.8c2.14,1.24,3.98,1.78,6.12,2.13"/>
+			<path id="kvg:06897-s11" kvg:type="㇏" d="M51.99,66.51c6.04,1.18,21.5,14.93,31.08,22.15c3.4,2.66,6.79,4.5,11.15,5.52"/>
 		</g>
 	</g>
 </g>
@@ -71,6 +71,6 @@ kvg:type CDATA #IMPLIED >
 	<text transform="matrix(1 0 0 1 55.25 44.50)">8</text>
 	<text transform="matrix(1 0 0 1 56.50 55.50)">9</text>
 	<text transform="matrix(1 0 0 1 59.50 29.50)">10</text>
-	<text transform="matrix(1 0 0 1 43.50 70.50)">11</text>
+	<text transform="matrix(1 0 0 1 41.5 70.50)">11</text>
 </g>
 </svg>
diff --git a/kanji/06c72.svg b/kanji/06c72.svg
index 2544702fa..2a538531b 100644
--- a/kanji/06c72.svg
+++ b/kanji/06c72.svg
@@ -35,26 +35,26 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_06c72-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:06c72-Jinmei" kvg:element="汲">
-	<g id="kvg:06c72-Jinmei-g1" kvg:element="氵" kvg:variant="true" kvg:original="水" kvg:position="left" kvg:radical="general">
-		<path id="kvg:06c72-Jinmei-s1" kvg:type="㇔" d="M20.63,17.25c4.45,1.47,11.5,6.05,12.62,8.34"/>
-		<path id="kvg:06c72-Jinmei-s2" kvg:type="㇔" d="M14,42.5c4.77,1.41,12.31,5.8,13.5,8"/>
-		<path id="kvg:06c72-Jinmei-s3" kvg:type="㇀" d="M16.75,87.21c1.5,1.31,3.31,1.36,4.25-0.25c2.75-4.7,5.5-10.45,8-16.45"/>
+<g id="kvg:StrokePaths_06c72" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:06c72" kvg:element="汲">
+	<g id="kvg:06c72-g1" kvg:element="氵" kvg:variant="true" kvg:original="水" kvg:position="left" kvg:radical="general">
+		<path id="kvg:06c72-s1" kvg:type="㇔" d="M20.63,17.25c4.45,1.47,11.5,6.05,12.62,8.34"/>
+		<path id="kvg:06c72-s2" kvg:type="㇔" d="M14,42.5c4.77,1.41,12.31,5.8,13.5,8"/>
+		<path id="kvg:06c72-s3" kvg:type="㇀" d="M16.75,87.21c1.5,1.31,3.31,1.36,4.25-0.25c2.75-4.7,5.5-10.45,8-16.45"/>
 	</g>
-	<g id="kvg:06c72-Jinmei-g2" kvg:element="及" kvg:variant="true" kvg:position="right">
-		<g id="kvg:06c72-Jinmei-g3" kvg:element="丿">
-			<path id="kvg:06c72-Jinmei-s4" kvg:type="㇒" d="M54.27,25.93c1.23,1.18,1.33,3.67,1.06,5.7c-1.97,15.03-8.04,39.05-20.95,54.53"/>
+	<g id="kvg:06c72-g2" kvg:element="及" kvg:variant="true" kvg:position="right">
+		<g id="kvg:06c72-g3" kvg:element="丿">
+			<path id="kvg:06c72-s4" kvg:type="㇒" d="M54.27,25.93c1.23,1.18,1.33,3.67,1.06,5.7c-1.97,15.03-8.04,39.05-20.95,54.53"/>
 		</g>
-		<path id="kvg:06c72-Jinmei-s5" kvg:type="㇇" d="M44.75,23c2.5,1,3.67,1.14,6.25,0.75c5-0.75,20.75-4.75,24.75-6S81.69,17.72,81,21c-1,4.75-5,15.5-6.75,21.5"/>
-		<g id="kvg:06c72-Jinmei-g4" kvg:element="又" kvg:variant="true">
-			<path id="kvg:06c72-Jinmei-s6" kvg:type="㇇" d="M56.25,45.25C64.75,44.25,80,42,84,41.5c2.73-0.34,3.67,1.23,3,3.5c-5.75,19.5-23.25,40.5-42.25,47.5"/>
-			<path id="kvg:06c72-Jinmei-s7" kvg:type="㇏" d="M53.75,51.25C61,57.81,83.29,84.32,90.59,89.01c2.34,1.5,3.84,2.7,5.91,3.24"/>
+		<path id="kvg:06c72-s5" kvg:type="㇇" d="M44.75,23c2.5,1,3.67,1.14,6.25,0.75c5-0.75,20.75-4.75,24.75-6S81.69,17.72,81,21c-1,4.75-5,15.5-6.75,21.5"/>
+		<g id="kvg:06c72-g4" kvg:element="又" kvg:variant="true">
+			<path id="kvg:06c72-s6" kvg:type="㇇" d="M56.25,45.25C64.75,44.25,80,42,84,41.5c2.73-0.34,3.67,1.23,3,3.5c-5.75,19.5-23.25,40.5-42.25,47.5"/>
+			<path id="kvg:06c72-s7" kvg:type="㇏" d="M53.75,51.25C61,57.81,83.29,84.32,90.59,89.01c2.34,1.5,3.84,2.7,5.91,3.24"/>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_06c72-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_06c72" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 13.50 17.50)">1</text>
 	<text transform="matrix(1 0 0 1 6.50 43.50)">2</text>
 	<text transform="matrix(1 0 0 1 9.25 91.50)">3</text>
diff --git a/kanji/07259-Hyougai.svg b/kanji/07259-Hyougai.svg
deleted file mode 100644
index 78469e8be..000000000
--- a/kanji/07259-Hyougai.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2009/2010/2011 Ulrich Apel.
-This work is distributed under the conditions of the Creative Commons
-Attribution-Share Alike 3.0 Licence. This means you are free:
-* to Share - to copy, distribute and transmit the work
-* to Remix - to adapt the work
-
-Under the following conditions:
-* Attribution. You must attribute the work by stating your use of KanjiVG in
-  your own copyright header and linking to KanjiVG's website
-  (http://kanjivg.tagaini.net)
-* Share Alike. If you alter, transform, or build upon this work, you may
-  distribute the resulting work only under the same or similar license to this
-  one.
-
-See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
--->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
-<!ATTLIST g
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-kvg:element CDATA #IMPLIED
-kvg:variant CDATA #IMPLIED
-kvg:partial CDATA #IMPLIED
-kvg:original CDATA #IMPLIED
-kvg:part CDATA #IMPLIED
-kvg:number CDATA #IMPLIED
-kvg:tradForm CDATA #IMPLIED
-kvg:radicalForm CDATA #IMPLIED
-kvg:position CDATA #IMPLIED
-kvg:radical CDATA #IMPLIED
-kvg:phon CDATA #IMPLIED >
-<!ATTLIST path
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-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_07259-Hyougai" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:07259-Hyougai" kvg:element="牙" kvg:radical="general">
-	<path id="kvg:07259-Hyougai-s1" kvg:type="㇐" d="M27.97,20.19C30.76,20.76,33.57,20.83,36.39,20.42C46.98,19.65,68.43,17.92,79.88,17.33C82.38,17.04,84.86,17.15,87.33,17.66"/>
-	<path id="kvg:07259-Hyougai-s2" kvg:type="㇗" d="M36.027035,29.002327C36.63294,29.740801,36.617442,30.948089,36.202703,31.897194C33.8193,37.443339,28.818986,48.888158,27.971296,50.896405C29.526062,51.996416,32.83576,51.913128,36.128742,51.475862C52.000248,49.383234,67.988763,47.686228,85.439898,46.905397C88.766311,46.759641,92.084367,46.593064,95.410781,47.03033"/>
-	<g id="kvg:07259-Hyougai-g1" kvg:element="亅">
-		<path id="kvg:07259-Hyougai-s3" kvg:type="㇚" d="M65.42,21.38C66.58,22.54,66.82,24.12,66.82,26.37C66.82,45.46,66.78,82.25,66.78,88.75C66.78,101.75,58.73,90.72,57.06,89.08"/>
-	</g>
-	<g id="kvg:07259-Hyougai-g2" kvg:element="丿">
-		<path id="kvg:07259-Hyougai-s4" kvg:type="㇒" d="M63.97,48.73C63.68,50.34,63.08,51.8,62.15,53.1C55.58,63.23,37.77,79.16,13.25,90"/>
-	</g>
-</g>
-</g>
-<g id="kvg:StrokeNumbers_07259-Hyougai" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 31.50 17.50)">1</text>
-	<text transform="matrix(1 0 0 1 25.50 30.13)">2</text>
-	<text transform="matrix(1 0 0 1 57.50 29.75)">3</text>
-	<text transform="matrix(1 0 0 1 46.75 59.75)">4</text>
-</g>
-</svg>
diff --git a/kanji/07bb8-Jinmei.svg b/kanji/07bb8-Jinmei.svg
deleted file mode 100644
index 9e467839d..000000000
--- a/kanji/07bb8-Jinmei.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2009/2010/2011 Ulrich Apel.
-This work is distributed under the conditions of the Creative Commons
-Attribution-Share Alike 3.0 Licence. This means you are free:
-* to Share - to copy, distribute and transmit the work
-* to Remix - to adapt the work
-
-Under the following conditions:
-* Attribution. You must attribute the work by stating your use of KanjiVG in
-  your own copyright header and linking to KanjiVG's website
-  (http://kanjivg.tagaini.net)
-* Share Alike. If you alter, transform, or build upon this work, you may
-  distribute the resulting work only under the same or similar license to this
-  one.
-
-See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
--->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
-<!ATTLIST g
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-kvg:element CDATA #IMPLIED
-kvg:variant CDATA #IMPLIED
-kvg:partial CDATA #IMPLIED
-kvg:original CDATA #IMPLIED
-kvg:part CDATA #IMPLIED
-kvg:number CDATA #IMPLIED
-kvg:tradForm CDATA #IMPLIED
-kvg:radicalForm CDATA #IMPLIED
-kvg:position CDATA #IMPLIED
-kvg:radical CDATA #IMPLIED
-kvg:phon CDATA #IMPLIED >
-<!ATTLIST path
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-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_07bb8-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:07bb8-Jinmei" kvg:element="箸">
-	<g id="kvg:07bb8-Jinmei-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
-		<g id="kvg:07bb8-Jinmei-g2" kvg:position="left">
-			<path id="kvg:07bb8-Jinmei-s1" kvg:type="㇒" d="M26.5,12.25c0.03,0.49,0.07,1.28-0.06,1.99c-0.77,4.19-5.17,13.38-11.19,19.01"/>
-			<path id="kvg:07bb8-Jinmei-s2" kvg:type="㇐b" d="M27.73,21.29C31.44,21.29,44.84,18,49,18"/>
-			<path id="kvg:07bb8-Jinmei-s3" kvg:type="㇔/㇑" d="M34.27,22.83c2.04,1.7,5.28,6.99,5.79,9.63"/>
-		</g>
-		<g id="kvg:07bb8-Jinmei-g3" kvg:position="right">
-			<path id="kvg:07bb8-Jinmei-s4" kvg:type="㇒" d="M60.75,10c0.02,0.36,0.1,0.94-0.05,1.44c-1.07,3.78-4.03,9.17-7.96,13.81"/>
-			<path id="kvg:07bb8-Jinmei-s5" kvg:type="㇐b" d="M60.98,17.66c4.73,0,24.08-3.57,29.4-3.57"/>
-			<path id="kvg:07bb8-Jinmei-s6" kvg:type="㇒/㇚" d="M71.78,18.75c0.01,0.26,0.03,0.68-0.03,1.06c-0.34,2.24-2.31,7.17-5,10.19"/>
-		</g>
-	</g>
-	<g id="kvg:07bb8-Jinmei-g4" kvg:element="者" kvg:variant="true" kvg:position="bottom">
-		<g id="kvg:07bb8-Jinmei-g5" kvg:element="耂" kvg:original="老" kvg:partial="true">
-			<g id="kvg:07bb8-Jinmei-g6" kvg:element="土">
-				<path id="kvg:07bb8-Jinmei-s7" kvg:type="㇐" d="M33,42.6c0.77,0.26,2.19,0.3,2.96,0.26c8.79-0.42,23.04-3.4,31.71-3.58c1.29-0.03,2.06,0.12,2.71,0.25"/>
-				<path id="kvg:07bb8-Jinmei-s8" kvg:type="㇑a" d="M51.92,31.37c0.12,0.23,1.65,1.21,1.77,2.68C54.26,41.11,54,51.99,54,54.4"/>
-				<path id="kvg:07bb8-Jinmei-s9" kvg:type="㇐" d="M15.75,58.79c1.75,0.37,4.44,0.69,6.01,0.55c8.74-0.77,58.24-6.62,68.37-6.79c2.61-0.04,4.18,0.26,5.49,0.54"/>
-			</g>
-			<path id="kvg:07bb8-Jinmei-s10" kvg:type="㇒" d="M81.59,31.52c0.17,1.04,0.93,2.94-0.34,4.17C64.84,51.49,46,66.25,17.81,79.4"/>
-		</g>
-		<path id="kvg:07bb8-Jinmei-s11" kvg:type="㇔" d="M59.5,58.75c2.84,1.19,7.35,4.87,8.06,6.72"/>
-		<g id="kvg:07bb8-Jinmei-g7" kvg:element="日">
-			<path id="kvg:07bb8-Jinmei-s12" kvg:type="㇑" d="M42.77,69.73c0.45,0.71,0.91,1.06,0.91,2c0,0.94,1.2,25.88,1.2,26.35s0.15,0.47,0.3,1.41"/>
-			<path id="kvg:07bb8-Jinmei-s13" kvg:type="㇕a" d="M44.43,71.35c4.09-0.19,31.44-4.45,32.25-4.5c1.94-0.12,3.19,1.31,3.04,2c-0.31,1.41-0.46,16.24-0.45,26.59c0,1.06-0.15,1.53-0.15,2.23"/>
-			<path id="kvg:07bb8-Jinmei-s14" kvg:type="㇐a" d="M44.88,84.1c4.12-0.6,29.28-4.03,33.19-4.03"/>
-			<path id="kvg:07bb8-Jinmei-s15" kvg:type="㇐a" d="M46.22,96.86c7.05-0.51,23.06-1.86,31.84-2.29"/>
-		</g>
-	</g>
-</g>
-</g>
-<g id="kvg:StrokeNumbers_07bb8-Jinmei" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 18.50 11.50)">1</text>
-	<text transform="matrix(1 0 0 1 31.50 17.50)">2</text>
-	<text transform="matrix(1 0 0 1 28.50 29.50)">3</text>
-	<text transform="matrix(1 0 0 1 52.50 9.40)">4</text>
-	<text transform="matrix(1 0 0 1 65.50 14.50)">5</text>
-	<text transform="matrix(1 0 0 1 62.50 25.25)">6</text>
-	<text transform="matrix(1 0 0 1 26.50 43.18)">7</text>
-	<text transform="matrix(1 0 0 1 44.50 34.50)">8</text>
-	<text transform="matrix(1 0 0 1 8.25 59.03)">9</text>
-	<text transform="matrix(1 0 0 1 76.50 28.50)">10</text>
-	<text transform="matrix(1 0 0 1 65.50 62.50)">11</text>
-	<text transform="matrix(1 0 0 1 34.50 79.50)">12</text>
-	<text transform="matrix(1 0 0 1 51.50 67.50)">13</text>
-	<text transform="matrix(1 0 0 1 47.50 80.50)">14</text>
-	<text transform="matrix(1 0 0 1 48.33 94.43)">15</text>
-</g>
-</svg>
diff --git a/kanji/07bb8-JinmeiKaisho.svg b/kanji/07bb8-JinmeiKaisho.svg
deleted file mode 100644
index 02b9ce95a..000000000
--- a/kanji/07bb8-JinmeiKaisho.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2009/2010/2011 Ulrich Apel.
-This work is distributed under the conditions of the Creative Commons
-Attribution-Share Alike 3.0 Licence. This means you are free:
-* to Share - to copy, distribute and transmit the work
-* to Remix - to adapt the work
-
-Under the following conditions:
-* Attribution. You must attribute the work by stating your use of KanjiVG in
-  your own copyright header and linking to KanjiVG's website
-  (http://kanjivg.tagaini.net)
-* Share Alike. If you alter, transform, or build upon this work, you may
-  distribute the resulting work only under the same or similar license to this
-  one.
-
-See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
--->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
-<!ATTLIST g
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-kvg:element CDATA #IMPLIED
-kvg:variant CDATA #IMPLIED
-kvg:partial CDATA #IMPLIED
-kvg:original CDATA #IMPLIED
-kvg:part CDATA #IMPLIED
-kvg:number CDATA #IMPLIED
-kvg:tradForm CDATA #IMPLIED
-kvg:radicalForm CDATA #IMPLIED
-kvg:position CDATA #IMPLIED
-kvg:radical CDATA #IMPLIED
-kvg:phon CDATA #IMPLIED >
-<!ATTLIST path
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-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_07bb8-JinmeiKaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:07bb8-JinmeiKaisho" kvg:element="箸">
-	<g id="kvg:07bb8-JinmeiKaisho-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
-		<g id="kvg:07bb8-JinmeiKaisho-g2" kvg:position="left">
-			<path id="kvg:07bb8-JinmeiKaisho-s1" kvg:type="㇒" d="M26.5,12.25c0.03,0.49,0.07,1.28-0.06,1.99c-0.77,4.19-5.17,13.38-11.19,19.01"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s2" kvg:type="㇐b" d="M27.73,21.29C31.44,21.29,44.84,18,49,18"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s3" kvg:type="㇔/㇑" d="M34.27,22.83c2.04,1.7,5.28,6.99,5.79,9.63"/>
-		</g>
-		<g id="kvg:07bb8-JinmeiKaisho-g3" kvg:position="right">
-			<path id="kvg:07bb8-JinmeiKaisho-s4" kvg:type="㇒" d="M60.75,10c0.02,0.36,0.1,0.94-0.05,1.44c-1.07,3.78-4.03,9.17-7.96,13.81"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s5" kvg:type="㇐b" d="M60.98,17.66c4.73,0,24.08-3.57,29.4-3.57"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s6" kvg:type="㇒/㇚" d="M71.78,18.75c0.01,0.26,0.03,0.68-0.03,1.06c-0.34,2.24-2.31,7.17-5,10.19"/>
-		</g>
-	</g>
-	<g id="kvg:07bb8-JinmeiKaisho-g4" kvg:element="者" kvg:variant="true" kvg:position="bottom">
-		<g id="kvg:07bb8-JinmeiKaisho-g5" kvg:element="耂" kvg:original="老" kvg:partial="true">
-			<g id="kvg:07bb8-JinmeiKaisho-g6" kvg:element="土">
-				<path id="kvg:07bb8-JinmeiKaisho-s7" kvg:type="㇐" d="M33,42.6c0.77,0.26,2.19,0.3,2.96,0.26c8.79-0.42,23.04-3.4,31.71-3.58c1.29-0.03,2.06,0.12,2.71,0.25"/>
-				<path id="kvg:07bb8-JinmeiKaisho-s8" kvg:type="㇑a" d="M51.92,31.37c0.12,0.23,1.65,1.21,1.77,2.68C54.26,41.11,54,51.99,54,54.4"/>
-				<path id="kvg:07bb8-JinmeiKaisho-s9" kvg:type="㇐" d="M15.75,58.79c1.75,0.37,4.44,0.69,6.01,0.55c8.74-0.77,58.24-6.62,68.37-6.79c2.61-0.04,4.18,0.26,5.49,0.54"/>
-			</g>
-			<path id="kvg:07bb8-JinmeiKaisho-s10" kvg:type="㇒" d="M81.59,31.52c0.17,1.04,0.93,2.94-0.34,4.17C64.84,51.49,46,66.25,17.81,79.4"/>
-		</g>
-		<path id="kvg:07bb8-JinmeiKaisho-s11" kvg:type="㇔" d="M59.5,58.75c2.84,1.19,7.35,4.87,8.06,6.72"/>
-		<g id="kvg:07bb8-JinmeiKaisho-g7" kvg:element="日">
-			<path id="kvg:07bb8-JinmeiKaisho-s12" kvg:type="㇑" d="M42.77,69.73c0.45,0.71,0.91,1.06,0.91,2c0,0.94,1.2,25.88,1.2,26.35s0.15,0.47,0.3,1.41"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s13" kvg:type="㇕a" d="M44.43,71.35c4.09-0.19,31.44-4.45,32.25-4.5c1.94-0.12,3.19,1.31,3.04,2c-0.31,1.41-0.46,16.24-0.45,26.59c0,1.06-0.15,1.53-0.15,2.23"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s14" kvg:type="㇐a" d="M44.88,84.1c5.55-0.81,11.11-1.53,16.67-2.24c1.82-0.23,3.64-0.46,5.38-0.67"/>
-			<path id="kvg:07bb8-JinmeiKaisho-s15" kvg:type="㇐a" d="M46.22,96.86c7.05-0.51,23.06-1.86,31.84-2.29"/>
-		</g>
-	</g>
-</g>
-</g>
-<g id="kvg:StrokeNumbers_07bb8-JinmeiKaisho" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 18.50 11.50)">1</text>
-	<text transform="matrix(1 0 0 1 31.50 17.50)">2</text>
-	<text transform="matrix(1 0 0 1 28.50 29.50)">3</text>
-	<text transform="matrix(1 0 0 1 52.50 9.40)">4</text>
-	<text transform="matrix(1 0 0 1 65.50 14.50)">5</text>
-	<text transform="matrix(1 0 0 1 62.50 25.25)">6</text>
-	<text transform="matrix(1 0 0 1 26.50 43.18)">7</text>
-	<text transform="matrix(1 0 0 1 44.50 34.50)">8</text>
-	<text transform="matrix(1 0 0 1 8.25 59.03)">9</text>
-	<text transform="matrix(1 0 0 1 76.50 28.50)">10</text>
-	<text transform="matrix(1 0 0 1 65.50 62.50)">11</text>
-	<text transform="matrix(1 0 0 1 34.50 79.50)">12</text>
-	<text transform="matrix(1 0 0 1 51.50 67.50)">13</text>
-	<text transform="matrix(1 0 0 1 47.50 80.50)">14</text>
-	<text transform="matrix(1 0 0 1 48.33 94.43)">15</text>
-</g>
-</svg>
diff --git a/kanji/07bb8.svg b/kanji/07bb8.svg
index 9e467839d..c48df5064 100644
--- a/kanji/07bb8.svg
+++ b/kanji/07bb8.svg
@@ -35,40 +35,40 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_07bb8-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:07bb8-Jinmei" kvg:element="箸">
-	<g id="kvg:07bb8-Jinmei-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
-		<g id="kvg:07bb8-Jinmei-g2" kvg:position="left">
-			<path id="kvg:07bb8-Jinmei-s1" kvg:type="㇒" d="M26.5,12.25c0.03,0.49,0.07,1.28-0.06,1.99c-0.77,4.19-5.17,13.38-11.19,19.01"/>
-			<path id="kvg:07bb8-Jinmei-s2" kvg:type="㇐b" d="M27.73,21.29C31.44,21.29,44.84,18,49,18"/>
-			<path id="kvg:07bb8-Jinmei-s3" kvg:type="㇔/㇑" d="M34.27,22.83c2.04,1.7,5.28,6.99,5.79,9.63"/>
+<g id="kvg:StrokePaths_07bb8" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:07bb8" kvg:element="箸">
+	<g id="kvg:07bb8-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
+		<g id="kvg:07bb8-g2" kvg:position="left">
+			<path id="kvg:07bb8-s1" kvg:type="㇒" d="M26.5,12.25c0.03,0.49,0.07,1.28-0.06,1.99c-0.77,4.19-5.17,13.38-11.19,19.01"/>
+			<path id="kvg:07bb8-s2" kvg:type="㇐b" d="M27.73,21.29C31.44,21.29,44.84,18,49,18"/>
+			<path id="kvg:07bb8-s3" kvg:type="㇔/㇑" d="M34.27,22.83c2.04,1.7,5.28,6.99,5.79,9.63"/>
 		</g>
-		<g id="kvg:07bb8-Jinmei-g3" kvg:position="right">
-			<path id="kvg:07bb8-Jinmei-s4" kvg:type="㇒" d="M60.75,10c0.02,0.36,0.1,0.94-0.05,1.44c-1.07,3.78-4.03,9.17-7.96,13.81"/>
-			<path id="kvg:07bb8-Jinmei-s5" kvg:type="㇐b" d="M60.98,17.66c4.73,0,24.08-3.57,29.4-3.57"/>
-			<path id="kvg:07bb8-Jinmei-s6" kvg:type="㇒/㇚" d="M71.78,18.75c0.01,0.26,0.03,0.68-0.03,1.06c-0.34,2.24-2.31,7.17-5,10.19"/>
+		<g id="kvg:07bb8-g3" kvg:position="right">
+			<path id="kvg:07bb8-s4" kvg:type="㇒" d="M60.75,10c0.02,0.36,0.1,0.94-0.05,1.44c-1.07,3.78-4.03,9.17-7.96,13.81"/>
+			<path id="kvg:07bb8-s5" kvg:type="㇐b" d="M60.98,17.66c4.73,0,24.08-3.57,29.4-3.57"/>
+			<path id="kvg:07bb8-s6" kvg:type="㇒/㇚" d="M71.78,18.75c0.01,0.26,0.03,0.68-0.03,1.06c-0.34,2.24-2.31,7.17-5,10.19"/>
 		</g>
 	</g>
-	<g id="kvg:07bb8-Jinmei-g4" kvg:element="者" kvg:variant="true" kvg:position="bottom">
-		<g id="kvg:07bb8-Jinmei-g5" kvg:element="耂" kvg:original="老" kvg:partial="true">
-			<g id="kvg:07bb8-Jinmei-g6" kvg:element="土">
-				<path id="kvg:07bb8-Jinmei-s7" kvg:type="㇐" d="M33,42.6c0.77,0.26,2.19,0.3,2.96,0.26c8.79-0.42,23.04-3.4,31.71-3.58c1.29-0.03,2.06,0.12,2.71,0.25"/>
-				<path id="kvg:07bb8-Jinmei-s8" kvg:type="㇑a" d="M51.92,31.37c0.12,0.23,1.65,1.21,1.77,2.68C54.26,41.11,54,51.99,54,54.4"/>
-				<path id="kvg:07bb8-Jinmei-s9" kvg:type="㇐" d="M15.75,58.79c1.75,0.37,4.44,0.69,6.01,0.55c8.74-0.77,58.24-6.62,68.37-6.79c2.61-0.04,4.18,0.26,5.49,0.54"/>
+	<g id="kvg:07bb8-g4" kvg:element="者" kvg:variant="true" kvg:position="bottom">
+		<g id="kvg:07bb8-g5" kvg:element="耂" kvg:original="老" kvg:partial="true">
+			<g id="kvg:07bb8-g6" kvg:element="土">
+				<path id="kvg:07bb8-s7" kvg:type="㇐" d="M33,42.6c0.77,0.26,2.19,0.3,2.96,0.26c8.79-0.42,23.04-3.4,31.71-3.58c1.29-0.03,2.06,0.12,2.71,0.25"/>
+				<path id="kvg:07bb8-s8" kvg:type="㇑a" d="M51.92,31.37c0.12,0.23,1.65,1.21,1.77,2.68C54.26,41.11,54,51.99,54,54.4"/>
+				<path id="kvg:07bb8-s9" kvg:type="㇐" d="M15.75,58.79c1.75,0.37,4.44,0.69,6.01,0.55c8.74-0.77,58.24-6.62,68.37-6.79c2.61-0.04,4.18,0.26,5.49,0.54"/>
 			</g>
-			<path id="kvg:07bb8-Jinmei-s10" kvg:type="㇒" d="M81.59,31.52c0.17,1.04,0.93,2.94-0.34,4.17C64.84,51.49,46,66.25,17.81,79.4"/>
+			<path id="kvg:07bb8-s10" kvg:type="㇒" d="M81.59,31.52c0.17,1.04,0.93,2.94-0.34,4.17C64.84,51.49,46,66.25,17.81,79.4"/>
 		</g>
-		<path id="kvg:07bb8-Jinmei-s11" kvg:type="㇔" d="M59.5,58.75c2.84,1.19,7.35,4.87,8.06,6.72"/>
-		<g id="kvg:07bb8-Jinmei-g7" kvg:element="日">
-			<path id="kvg:07bb8-Jinmei-s12" kvg:type="㇑" d="M42.77,69.73c0.45,0.71,0.91,1.06,0.91,2c0,0.94,1.2,25.88,1.2,26.35s0.15,0.47,0.3,1.41"/>
-			<path id="kvg:07bb8-Jinmei-s13" kvg:type="㇕a" d="M44.43,71.35c4.09-0.19,31.44-4.45,32.25-4.5c1.94-0.12,3.19,1.31,3.04,2c-0.31,1.41-0.46,16.24-0.45,26.59c0,1.06-0.15,1.53-0.15,2.23"/>
-			<path id="kvg:07bb8-Jinmei-s14" kvg:type="㇐a" d="M44.88,84.1c4.12-0.6,29.28-4.03,33.19-4.03"/>
-			<path id="kvg:07bb8-Jinmei-s15" kvg:type="㇐a" d="M46.22,96.86c7.05-0.51,23.06-1.86,31.84-2.29"/>
+		<path id="kvg:07bb8-s11" kvg:type="㇔" d="M59.5,58.75c2.84,1.19,7.35,4.87,8.06,6.72"/>
+		<g id="kvg:07bb8-g7" kvg:element="日">
+			<path id="kvg:07bb8-s12" kvg:type="㇑" d="M42.77,69.73c0.45,0.71,0.91,1.06,0.91,2c0,0.94,1.2,25.88,1.2,26.35s0.15,0.47,0.3,1.41"/>
+			<path id="kvg:07bb8-s13" kvg:type="㇕a" d="M44.43,71.35c4.09-0.19,31.44-4.45,32.25-4.5c1.94-0.12,3.19,1.31,3.04,2c-0.31,1.41-0.46,16.24-0.45,26.59c0,1.06-0.15,1.53-0.15,2.23"/>
+			<path id="kvg:07bb8-s14" kvg:type="㇐a" d="M44.88,84.1c4.12-0.6,29.28-4.03,33.19-4.03"/>
+			<path id="kvg:07bb8-s15" kvg:type="㇐a" d="M46.22,96.86c7.05-0.51,23.06-1.86,31.84-2.29"/>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_07bb8-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_07bb8" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 18.50 11.50)">1</text>
 	<text transform="matrix(1 0 0 1 31.50 17.50)">2</text>
 	<text transform="matrix(1 0 0 1 28.50 29.50)">3</text>
diff --git a/kanji/07bc7.svg b/kanji/07bc7.svg
index 221e3b2b2..db4795fa2 100644
--- a/kanji/07bc7.svg
+++ b/kanji/07bc7.svg
@@ -35,48 +35,48 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_07bc7-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:07bc7-Jinmei" kvg:element="篇">
-	<g id="kvg:07bc7-Jinmei-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
-		<g id="kvg:07bc7-Jinmei-g2" kvg:position="left">
-			<path id="kvg:07bc7-Jinmei-s1" kvg:type="㇒" d="M29.5,11c0.07,1.18-0.08,2.21-0.42,3.35c-1.32,4.44-5.46,11.02-10.59,16.9"/>
-			<path id="kvg:07bc7-Jinmei-s2" kvg:type="㇐b" d="M30.48,20.38c2.89,0,10.5-1.6,16.03-2.31c1.93-0.25,3.61-0.16,4.74-0.16"/>
-			<path id="kvg:07bc7-Jinmei-s3" kvg:type="㇔/㇑" d="M37.77,22.33c1.6,1.44,4.14,5.9,4.54,8.13"/>
+<g id="kvg:StrokePaths_07bc7" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:07bc7" kvg:element="篇">
+	<g id="kvg:07bc7-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
+		<g id="kvg:07bc7-g2" kvg:position="left">
+			<path id="kvg:07bc7-s1" kvg:type="㇒" d="M29.5,11c0.07,1.18-0.08,2.21-0.42,3.35c-1.32,4.44-5.46,11.02-10.59,16.9"/>
+			<path id="kvg:07bc7-s2" kvg:type="㇐b" d="M30.48,20.38c2.89,0,10.5-1.6,16.03-2.31c1.93-0.25,3.61-0.16,4.74-0.16"/>
+			<path id="kvg:07bc7-s3" kvg:type="㇔/㇑" d="M37.77,22.33c1.6,1.44,4.14,5.9,4.54,8.13"/>
 		</g>
-		<g id="kvg:07bc7-Jinmei-g3" kvg:position="right">
-			<path id="kvg:07bc7-Jinmei-s4" kvg:type="㇒" d="M62.75,9.75c0.11,0.93-0.03,1.81-0.42,2.65c-1.4,4-4.31,9.59-8.33,14.1"/>
-			<path id="kvg:07bc7-Jinmei-s5" kvg:type="㇐b" d="M62.98,18.16c3.68,0,14.09-1.56,21.04-2.25c1.98-0.2,3.68-0.32,4.86-0.32"/>
-			<path id="kvg:07bc7-Jinmei-s6" kvg:type="㇒/㇚" d="M74.27,20.5c0.05,0.51-0.04,0.99-0.29,1.44c-0.8,1.77-2.61,4.19-5.98,6.81"/>
+		<g id="kvg:07bc7-g3" kvg:position="right">
+			<path id="kvg:07bc7-s4" kvg:type="㇒" d="M62.75,9.75c0.11,0.93-0.03,1.81-0.42,2.65c-1.4,4-4.31,9.59-8.33,14.1"/>
+			<path id="kvg:07bc7-s5" kvg:type="㇐b" d="M62.98,18.16c3.68,0,14.09-1.56,21.04-2.25c1.98-0.2,3.68-0.32,4.86-0.32"/>
+			<path id="kvg:07bc7-s6" kvg:type="㇒/㇚" d="M74.27,20.5c0.05,0.51-0.04,0.99-0.29,1.44c-0.8,1.77-2.61,4.19-5.98,6.81"/>
 		</g>
 	</g>
-	<g id="kvg:07bc7-Jinmei-g4" kvg:element="扁" kvg:variant="true" kvg:position="bottom">
-		<g id="kvg:07bc7-Jinmei-g5" kvg:element="戸" kvg:position="tare">
-			<path id="kvg:07bc7-Jinmei-s7" kvg:type="㇒/㇐" d="M76.72,30.5c-1.35,1.25-2.57,1.74-4.02,2.03c-11.07,2.22-22.95,3.6-39.45,5.26"/>
-			<path id="kvg:07bc7-Jinmei-s8" kvg:type="㇒" d="M30.69,36.7c0.93,0.93,1.12,2.25,1.06,4.22c-0.8,24.67-2.92,41-17.16,54.8"/>
-			<path id="kvg:07bc7-Jinmei-s9" kvg:type="㇕" d="M32.25,47.58c12.77-1.49,35.27-4.31,44.75-5.07c3.02-0.24,5.42,0.26,4.08,3.73c-1.12,2.9-1.33,3.64-2.48,7.76"/>
-			<path id="kvg:07bc7-Jinmei-s10" kvg:type="㇐" d="M31.43,59.81c12.7-1.31,26.95-2.69,42.7-4.17c2.9-0.27,5.51-0.42,7.63-0.49"/>
+	<g id="kvg:07bc7-g4" kvg:element="扁" kvg:variant="true" kvg:position="bottom">
+		<g id="kvg:07bc7-g5" kvg:element="戸" kvg:position="tare">
+			<path id="kvg:07bc7-s7" kvg:type="㇒/㇐" d="M76.72,30.5c-1.35,1.25-2.57,1.74-4.02,2.03c-11.07,2.22-22.95,3.6-39.45,5.26"/>
+			<path id="kvg:07bc7-s8" kvg:type="㇒" d="M30.69,36.7c0.93,0.93,1.12,2.25,1.06,4.22c-0.8,24.67-2.92,41-17.16,54.8"/>
+			<path id="kvg:07bc7-s9" kvg:type="㇕" d="M32.25,47.58c12.77-1.49,35.27-4.31,44.75-5.07c3.02-0.24,5.42,0.26,4.08,3.73c-1.12,2.9-1.33,3.64-2.48,7.76"/>
+			<path id="kvg:07bc7-s10" kvg:type="㇐" d="M31.43,59.81c12.7-1.31,26.95-2.69,42.7-4.17c2.9-0.27,5.51-0.42,7.63-0.49"/>
 		</g>
-		<g id="kvg:07bc7-Jinmei-g6" kvg:element="冊">
-			<g id="kvg:07bc7-Jinmei-g7" kvg:element="冂">
-				<path id="kvg:07bc7-Jinmei-s11" kvg:type="㇑" d="M33.74,68.5c1,1,1.34,2.63,1.41,3.88c0.3,5.81,0.77,15.58,1.14,22.26c0.12,2.21,0.23,4.09,0.33,5.37"/>
-				<path id="kvg:07bc7-Jinmei-s12" kvg:type="㇆a" d="M35.78,70.48c5.76-0.39,39.02-4.22,45.07-4.96c3.37-0.41,4.92,1.19,4.6,4.37c-0.7,7-3.55,21.75-4.61,25.27c-1.57,5.25-3.86,1.99-5.82,0.63"/>
+		<g id="kvg:07bc7-g6" kvg:element="冊">
+			<g id="kvg:07bc7-g7" kvg:element="冂">
+				<path id="kvg:07bc7-s11" kvg:type="㇑" d="M33.74,68.5c1,1,1.34,2.63,1.41,3.88c0.3,5.81,0.77,15.58,1.14,22.26c0.12,2.21,0.23,4.09,0.33,5.37"/>
+				<path id="kvg:07bc7-s12" kvg:type="㇆a" d="M35.78,70.48c5.76-0.39,39.02-4.22,45.07-4.96c3.37-0.41,4.92,1.19,4.6,4.37c-0.7,7-3.55,21.75-4.61,25.27c-1.57,5.25-3.86,1.99-5.82,0.63"/>
 			</g>
-			<g id="kvg:07bc7-Jinmei-g8" kvg:element="廾" kvg:variant="true">
-				<g id="kvg:07bc7-Jinmei-g9" kvg:element="十" kvg:part="1" kvg:variant="true">
-					<path id="kvg:07bc7-Jinmei-s13" kvg:type="㇐" d="M36.71,83.2c10.79-1.08,29.41-3.33,46.1-4.13"/>
+			<g id="kvg:07bc7-g8" kvg:element="廾" kvg:variant="true">
+				<g id="kvg:07bc7-g9" kvg:element="十" kvg:part="1" kvg:variant="true">
+					<path id="kvg:07bc7-s13" kvg:type="㇐" d="M36.71,83.2c10.79-1.08,29.41-3.33,46.1-4.13"/>
 				</g>
-				<g id="kvg:07bc7-Jinmei-g10" kvg:element="丿" kvg:variant="true">
-					<path id="kvg:07bc7-Jinmei-s14" kvg:type="㇑" d="M49.65,72.05c0.9,0.9,1.14,2.07,1.14,3.17c0,1.53,0.04,10.2,0.06,16.28c0.01,1.96,0.01,3.66,0.01,4.76"/>
+				<g id="kvg:07bc7-g10" kvg:element="丿" kvg:variant="true">
+					<path id="kvg:07bc7-s14" kvg:type="㇑" d="M49.65,72.05c0.9,0.9,1.14,2.07,1.14,3.17c0,1.53,0.04,10.2,0.06,16.28c0.01,1.96,0.01,3.66,0.01,4.76"/>
 				</g>
-				<g id="kvg:07bc7-Jinmei-g11" kvg:element="十" kvg:part="2" kvg:variant="true">
-					<path id="kvg:07bc7-Jinmei-s15" kvg:type="㇑" d="M65,70.13c0.93,0.93,0.89,1.62,0.89,2.92c0,2.51,0.04,10.96,0.05,16.83c0.01,2.19,0.01,4.01,0.01,5.04"/>
+				<g id="kvg:07bc7-g11" kvg:element="十" kvg:part="2" kvg:variant="true">
+					<path id="kvg:07bc7-s15" kvg:type="㇑" d="M65,70.13c0.93,0.93,0.89,1.62,0.89,2.92c0,2.51,0.04,10.96,0.05,16.83c0.01,2.19,0.01,4.01,0.01,5.04"/>
 				</g>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_07bc7-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_07bc7" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 21.50 10.50)">1</text>
 	<text transform="matrix(1 0 0 1 33.50 16.50)">2</text>
 	<text transform="matrix(1 0 0 1 31.50 29.50)">3</text>
diff --git a/kanji/07c3e.svg b/kanji/07c3e.svg
index 3bb6f7fa0..2184e77b7 100644
--- a/kanji/07c3e.svg
+++ b/kanji/07c3e.svg
@@ -35,58 +35,58 @@ xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
 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_07c3e-Jinmei" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:07c3e-Jinmei" kvg:element="簾">
-	<g id="kvg:07c3e-Jinmei-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
-		<g id="kvg:07c3e-Jinmei-g2" kvg:position="left">
-			<path id="kvg:07c3e-Jinmei-s1" kvg:type="㇒" d="M30.5,11.75c0.04,0.44,0.08,1.12-0.07,1.75c-0.89,3.69-5.97,11.79-12.93,16.75"/>
-			<path id="kvg:07c3e-Jinmei-s2" kvg:type="㇐b" d="M29.23,20.79c3.71,0,16.11-2.29,20.27-2.29"/>
-			<path id="kvg:07c3e-Jinmei-s3" kvg:type="㇔/㇑" d="M35.52,21.83c1.6,1.44,4.14,5.9,4.54,8.13"/>
+<g id="kvg:StrokePaths_07c3e" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:07c3e" kvg:element="簾">
+	<g id="kvg:07c3e-g1" kvg:element="竹" kvg:variant="true" kvg:position="top" kvg:radical="general">
+		<g id="kvg:07c3e-g2" kvg:position="left">
+			<path id="kvg:07c3e-s1" kvg:type="㇒" d="M30.5,11.75c0.04,0.44,0.08,1.12-0.07,1.75c-0.89,3.69-5.97,11.79-12.93,16.75"/>
+			<path id="kvg:07c3e-s2" kvg:type="㇐b" d="M29.23,20.79c3.71,0,16.11-2.29,20.27-2.29"/>
+			<path id="kvg:07c3e-s3" kvg:type="㇔/㇑" d="M35.52,21.83c1.6,1.44,4.14,5.9,4.54,8.13"/>
 		</g>
-		<g id="kvg:07c3e-Jinmei-g3" kvg:position="right">
-			<path id="kvg:07c3e-Jinmei-s4" kvg:type="㇒" d="M61.75,11c0.03,0.31,0.11,0.81-0.05,1.25c-1.2,3.28-4.53,7.96-8.95,12"/>
-			<path id="kvg:07c3e-Jinmei-s5" kvg:type="㇐b" d="M59.98,19.16c4.73,0,22.08-3.57,27.4-3.57"/>
-			<path id="kvg:07c3e-Jinmei-s6" kvg:type="㇒/㇚" d="M73.78,18.25c0.01,0.24,0.03,0.61-0.03,0.95c-0.36,2-2.42,6.37-5.25,9.05"/>
+		<g id="kvg:07c3e-g3" kvg:position="right">
+			<path id="kvg:07c3e-s4" kvg:type="㇒" d="M61.75,11c0.03,0.31,0.11,0.81-0.05,1.25c-1.2,3.28-4.53,7.96-8.95,12"/>
+			<path id="kvg:07c3e-s5" kvg:type="㇐b" d="M59.98,19.16c4.73,0,22.08-3.57,27.4-3.57"/>
+			<path id="kvg:07c3e-s6" kvg:type="㇒/㇚" d="M73.78,18.25c0.01,0.24,0.03,0.61-0.03,0.95c-0.36,2-2.42,6.37-5.25,9.05"/>
 		</g>
 	</g>
-	<g id="kvg:07c3e-Jinmei-g4" kvg:element="廉" kvg:position="bottom">
-		<g id="kvg:07c3e-Jinmei-g5" kvg:element="广" kvg:position="tare">
-			<path id="kvg:07c3e-Jinmei-s7" kvg:type="㇑a" d="M51.99,26.38c0.6,0.27,1.86,2.01,1.98,2.54c0.12,0.54,0.06,3.24-0.06,6.59"/>
-			<g id="kvg:07c3e-Jinmei-g6" kvg:element="厂">
-				<path id="kvg:07c3e-Jinmei-s8" kvg:type="㇐" d="M24.07,37.59c1.44,0.45,4.09,0.53,5.53,0.45c15-0.76,35.89-3.8,49.48-4.81c2.39-0.18,3.84,0.22,5.05,0.45"/>
-				<path id="kvg:07c3e-Jinmei-s9" kvg:type="㇒" d="M28.69,39.92c0.04,1.28,0.09,3.3-0.08,5.14c-1.02,10.84-3.32,37.14-14.33,48.81"/>
+	<g id="kvg:07c3e-g4" kvg:element="廉" kvg:position="bottom">
+		<g id="kvg:07c3e-g5" kvg:element="广" kvg:position="tare">
+			<path id="kvg:07c3e-s7" kvg:type="㇑a" d="M51.99,26.38c0.6,0.27,1.86,2.01,1.98,2.54c0.12,0.54,0.06,3.24-0.06,6.59"/>
+			<g id="kvg:07c3e-g6" kvg:element="厂">
+				<path id="kvg:07c3e-s8" kvg:type="㇐" d="M24.07,37.59c1.44,0.45,4.09,0.53,5.53,0.45c15-0.76,35.89-3.8,49.48-4.81c2.39-0.18,3.84,0.22,5.05,0.45"/>
+				<path id="kvg:07c3e-s9" kvg:type="㇒" d="M28.69,39.92c0.04,1.28,0.09,3.3-0.08,5.14c-1.02,10.84-3.32,37.14-14.33,48.81"/>
 			</g>
 		</g>
-		<g id="kvg:07c3e-Jinmei-g7" kvg:element="兼">
-			<g id="kvg:07c3e-Jinmei-g8" kvg:element="八" kvg:variant="true" kvg:position="top">
-				<g id="kvg:07c3e-Jinmei-g9" kvg:position="left">
-					<path id="kvg:07c3e-Jinmei-s10" kvg:type="㇔" d="M50.24,38.25c0.03,0.18,0.06,0.46-0.05,0.71c-0.67,1.5-4.47,4.78-9.68,6.79"/>
+		<g id="kvg:07c3e-g7" kvg:element="兼">
+			<g id="kvg:07c3e-g8" kvg:element="八" kvg:variant="true" kvg:position="top">
+				<g id="kvg:07c3e-g9" kvg:position="left">
+					<path id="kvg:07c3e-s10" kvg:type="㇔" d="M50.24,38.25c0.03,0.18,0.06,0.46-0.05,0.71c-0.67,1.5-4.47,4.78-9.68,6.79"/>
 				</g>
-				<g id="kvg:07c3e-Jinmei-g10" kvg:position="right">
-					<path id="kvg:07c3e-Jinmei-s11" kvg:type="㇒" d="M66.83,36.73c0.03,0.18,0.07,0.47-0.07,0.73c-0.81,1.55-5.43,4.95-11.77,7.03"/>
+				<g id="kvg:07c3e-g10" kvg:position="right">
+					<path id="kvg:07c3e-s11" kvg:type="㇒" d="M66.83,36.73c0.03,0.18,0.07,0.47-0.07,0.73c-0.81,1.55-5.43,4.95-11.77,7.03"/>
 				</g>
 			</g>
-			<g id="kvg:07c3e-Jinmei-g11" kvg:position="bottom">
-				<path id="kvg:07c3e-Jinmei-s12" kvg:type="㇐" d="M32.38,51.14c1.01,0.35,2.85,0.42,3.85,0.35C42.98,51,68.13,47.7,78.17,47c1.67-0.12,2.68,0.17,3.52,0.34"/>
-				<g id="kvg:07c3e-Jinmei-g12" kvg:element="⺕" kvg:variant="true" kvg:original="彑">
-					<path id="kvg:07c3e-Jinmei-s13" kvg:type="㇕" d="M35.55,58.73c1.44,0.17,2.22,0.51,4.1,0.33c10.25-0.99,26.13-3.6,35.35-4.1c1.84-0.1,2.87,1.16,2.46,2.81c-1.1,4.42-2.01,6.46-3.43,13.84"/>
-					<path id="kvg:07c3e-Jinmei-s14" kvg:type="㇐" d="M32.75,67.16c1.84,0.17,3.29,0.48,5.33,0.33c17.84-1.32,30.97-3.2,43.63-4.2c2.25-0.18,4.1,0.33,5.12,0.5"/>
-					<path id="kvg:07c3e-Jinmei-s15" kvg:type="㇐c" d="M34.77,75.5c1.02,0.1,2.87,0.36,4.1,0.3c11.27-0.5,23.52-2.92,33.77-3.12c1.64-0.03,2.67,0,3.9,0.1"/>
+			<g id="kvg:07c3e-g11" kvg:position="bottom">
+				<path id="kvg:07c3e-s12" kvg:type="㇐" d="M32.38,51.14c1.01,0.35,2.85,0.42,3.85,0.35C42.98,51,68.13,47.7,78.17,47c1.67-0.12,2.68,0.17,3.52,0.34"/>
+				<g id="kvg:07c3e-g12" kvg:element="⺕" kvg:variant="true" kvg:original="彑">
+					<path id="kvg:07c3e-s13" kvg:type="㇕" d="M35.55,58.73c1.44,0.17,2.22,0.51,4.1,0.33c10.25-0.99,26.13-3.6,35.35-4.1c1.84-0.1,2.87,1.16,2.46,2.81c-1.1,4.42-2.01,6.46-3.43,13.84"/>
+					<path id="kvg:07c3e-s14" kvg:type="㇐" d="M32.75,67.16c1.84,0.17,3.29,0.48,5.33,0.33c17.84-1.32,30.97-3.2,43.63-4.2c2.25-0.18,4.1,0.33,5.12,0.5"/>
+					<path id="kvg:07c3e-s15" kvg:type="㇐c" d="M34.77,75.5c1.02,0.1,2.87,0.36,4.1,0.3c11.27-0.5,23.52-2.92,33.77-3.12c1.64-0.03,2.67,0,3.9,0.1"/>
 				</g>
-				<g id="kvg:07c3e-Jinmei-g13" kvg:element="丨">
-					<path id="kvg:07c3e-Jinmei-s16" kvg:type="㇑" d="M48.04,42.44c0.94,0.38,1.5,1.72,1.69,2.48c0.19,0.76,0,49.81-0.19,54.58"/>
+				<g id="kvg:07c3e-g13" kvg:element="丨">
+					<path id="kvg:07c3e-s16" kvg:type="㇑" d="M48.04,42.44c0.94,0.38,1.5,1.72,1.69,2.48c0.19,0.76,0,49.81-0.19,54.58"/>
 				</g>
-				<g id="kvg:07c3e-Jinmei-g14" kvg:element="丨">
-					<path id="kvg:07c3e-Jinmei-s17" kvg:type="㇑" d="M61.05,42.15c0.94,0.38,1.5,1.72,1.69,2.48c0.19,0.76,0,50.33-0.19,55.1"/>
+				<g id="kvg:07c3e-g14" kvg:element="丨">
+					<path id="kvg:07c3e-s17" kvg:type="㇑" d="M61.05,42.15c0.94,0.38,1.5,1.72,1.69,2.48c0.19,0.76,0,50.33-0.19,55.1"/>
 				</g>
-				<path id="kvg:07c3e-Jinmei-s18" kvg:type="㇒" d="M49.3,76.3c-4.3,6.87-15.49,16.59-24.44,20.48"/>
-				<path id="kvg:07c3e-Jinmei-s19" kvg:type="㇏" d="M62.89,74.29c3.98,2.76,21.46,15.81,25.79,18.52c1.47,0.92,2.73,1.31,4.2,1.58"/>
+				<path id="kvg:07c3e-s18" kvg:type="㇒" d="M49.3,76.3c-4.3,6.87-15.49,16.59-24.44,20.48"/>
+				<path id="kvg:07c3e-s19" kvg:type="㇏" d="M62.89,74.29c3.98,2.76,21.46,15.81,25.79,18.52c1.47,0.92,2.73,1.31,4.2,1.58"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_07c3e-Jinmei" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_07c3e" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 23.50 11.50)">1</text>
 	<text transform="matrix(1 0 0 1 35.50 16.50)">2</text>
 	<text transform="matrix(1 0 0 1 29.50 29.50)">3</text>
diff --git a/kanji/091dc.svg b/kanji/091dc.svg
index b0d4b327d..4ff3959c3 100644
--- a/kanji/091dc.svg
+++ b/kanji/091dc.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:091dc-s2" kvg:type="㇔" d="M67.75,15.86c8.28,4.2,13.11,8.7,17.25,13.81"/>
 		<g id="kvg:091dc-g2" kvg:element="金" kvg:part="1" kvg:radical="tradit">
 			<path id="kvg:091dc-s3" kvg:type="㇒" d="M66.29,24.18c0.21,0.82,0.19,2.21-1.07,3.48C54.5,38.5,37.75,50,13.75,58.47"/>
-			<path id="kvg:091dc-s4" kvg:type="㇏" d="M41.75,28.97c4.73,0,31.75,19.87,45.39,25.79c2.56,1.11,4.21,1.61,7.36,2.29"/>
+			<path id="kvg:091dc-s4" kvg:type="㇏" d="M 41.75,28.97 c 7.843307,3.534025 32.423148,19.365139 46.063148,25.285139 2.56,1.11 2.695418,1.10514 6.686852,2.794861"/>
 		</g>
 	</g>
 	<g id="kvg:091dc-g3" kvg:element="金" kvg:part="2" kvg:position="bottom" kvg:radical="tradit">