diff --git a/kanji/082d3-Insatsu.svg b/kanji/082d3-Insatsu.svg
index aedefedf4..1b8ee8f95 100644
--- a/kanji/082d3-Insatsu.svg
+++ b/kanji/082d3-Insatsu.svg
@@ -35,31 +35,31 @@ 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_082d3" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:082d3" kvg:element="苓">
-	<g id="kvg:082d3-g1" kvg:element="艹" kvg:variant="true" kvg:original="艸" kvg:position="top" kvg:radical="general">
-		<path id="kvg:082d3-s1" kvg:type="㇐" d="M16.5,22.74c1.41,0.56,3.04,0.67,4.45,0.56c12.93-1.01,50.97-4.71,65.87-4.78c2.34-0.01,3.75,0.26,4.92,0.54"/>
-		<path id="kvg:082d3-s2" kvg:type="㇑a" d="M36.25,11c1.75,1.43,2.31,1.87,2.5,2.75C40.5,22,40,29,40.5,32"/>
-		<path id="kvg:082d3-s3" kvg:type="㇑a" d="M67.25,8.75c1.12,1,1.87,2.52,1.5,4c-1.12,4.5-1.88,11.5-3.5,17.25"/>
+<g id="kvg:StrokePaths_082d3-Insatsu" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:082d3-Insatsu" kvg:element="苓">
+	<g id="kvg:082d3-Insatsu-g1" kvg:element="艹" kvg:variant="true" kvg:original="艸" kvg:position="top" kvg:radical="general">
+		<path id="kvg:082d3-Insatsu-s1" kvg:type="㇐" d="M16.5,22.74c1.41,0.56,3.04,0.67,4.45,0.56c12.93-1.01,50.97-4.71,65.87-4.78c2.34-0.01,3.75,0.26,4.92,0.54"/>
+		<path id="kvg:082d3-Insatsu-s2" kvg:type="㇑a" d="M36.25,11c1.75,1.43,2.31,1.87,2.5,2.75C40.5,22,40,29,40.5,32"/>
+		<path id="kvg:082d3-Insatsu-s3" kvg:type="㇑a" d="M67.25,8.75c1.12,1,1.87,2.52,1.5,4c-1.12,4.5-1.88,11.5-3.5,17.25"/>
 	</g>
-	<g id="kvg:082d3-g2" kvg:element="令" kvg:position="bottom">
-		<g id="kvg:082d3-g3" kvg:element="人" kvg:position="top">
-			<path id="kvg:082d3-s4" kvg:type="㇒" d="M52.13,27.5c0.11,0.9,0.49,2.36-0.22,3.62c-4.49,7.93-18.73,24.16-35.41,33.8"/>
-			<path id="kvg:082d3-s5" kvg:type="㇏" d="M52.6,30.57c6.44,4.56,29.9,23.01,35.34,26.8c1.85,1.29,4.22,1.84,6.06,2.2"/>
+	<g id="kvg:082d3-Insatsu-g2" kvg:element="令" kvg:position="bottom">
+		<g id="kvg:082d3-Insatsu-g3" kvg:element="人" kvg:position="top">
+			<path id="kvg:082d3-Insatsu-s4" kvg:type="㇒" d="M52.13,27.5c0.11,0.9,0.49,2.36-0.22,3.62c-4.49,7.93-18.73,24.16-35.41,33.8"/>
+			<path id="kvg:082d3-Insatsu-s5" kvg:type="㇏" d="M52.6,30.57c6.44,4.56,29.9,23.01,35.34,26.8c1.85,1.29,4.22,1.84,6.06,2.2"/>
 		</g>
-		<g id="kvg:082d3-g4" kvg:position="bottom">
-			<g id="kvg:082d3-g5" kvg:element="一">
-				<path id="kvg:082d3-s6" kvg:type="一" d="M 38.81375,56.548542 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 23.29875,-1.76 28.69875,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
+		<g id="kvg:082d3-Insatsu-g4" kvg:position="bottom">
+			<g id="kvg:082d3-Insatsu-g5" kvg:element="一">
+				<path id="kvg:082d3-Insatsu-s6" kvg:type="一" d="M 38.81375,56.548542 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 23.29875,-1.76 28.69875,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
 			</g>
-			<g id="kvg:082d3-g6" kvg:element="卩" kvg:original="マ">
-				<path id="kvg:082d3-s7" kvg:type="㇆" d="M  31.736272,67.174506 c 0.770572,0.752146 2.109971,0.936178 3.326853,0.950286 3.089776,0.03582 41.947291,-4.02 43.467291,-4.17 1.52,-0.15 4.28,-0.29 3.95,2.89 -0.43,4.17 -1.771667,10.902292 -5.091667,17.822292 -1.89,3.94 -3.18,3.45 -6.23,0.46"/>
-				<path id="kvg:082d3-s8" kvg:type="㇑" d="M 48.3,68.3 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,6.959729 -0.02436,17.789477 -0.18,27.355633"/>
+			<g id="kvg:082d3-Insatsu-g6" kvg:element="卩" kvg:original="マ">
+				<path id="kvg:082d3-Insatsu-s7" kvg:type="㇆" d="M  31.736272,67.174506 c 0.770572,0.752146 2.109971,0.936178 3.326853,0.950286 3.089776,0.03582 41.947291,-4.02 43.467291,-4.17 1.52,-0.15 4.28,-0.29 3.95,2.89 -0.43,4.17 -1.771667,10.902292 -5.091667,17.822292 -1.89,3.94 -3.18,3.45 -6.23,0.46"/>
+				<path id="kvg:082d3-Insatsu-s8" kvg:type="㇑" d="M 48.3,68.3 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,6.959729 -0.02436,17.789477 -0.18,27.355633"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_082d3" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_082d3-Insatsu" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 9.50 23.50)">1</text>
 	<text transform="matrix(1 0 0 1 28.66 11.85)">2</text>
 	<text transform="matrix(1 0 0 1 59.71 12.85)">3</text>
diff --git a/kanji/086c9-Insatsu.svg b/kanji/086c9-Insatsu.svg
index b8b3d56bd..47213a351 100644
--- a/kanji/086c9-Insatsu.svg
+++ b/kanji/086c9-Insatsu.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_086c9" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:086c9" kvg:element="蛉">
-	<g id="kvg:086c9-g1" kvg:element="虫" kvg:position="left" kvg:radical="general">
-		<g id="kvg:086c9-g2" kvg:element="中">
-			<g id="kvg:086c9-g3" kvg:element="口">
-				<path id="kvg:086c9-s1" kvg:type="㇑" d="M12.76,39.4c0.44,0.51,0.98,1.4,1.08,2.06c0.83,5.79,1.29,11.54,2.97,22.43"/>
-				<path id="kvg:086c9-s2" kvg:type="㇕b" d="M14.16,41.48c6.65-0.97,20.23-2.83,25.04-3.2c1.88-0.14,2.74,1.38,2.51,2.83c-0.8,4.98-1.4,9.34-2.7,17.62"/>
-				<path id="kvg:086c9-s3" kvg:type="㇐b" d="M17.06,61.93c5.35-0.98,16.19-2.68,24.26-3.39"/>
+<g id="kvg:StrokePaths_086c9-Insatsu" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:086c9-Insatsu" kvg:element="蛉">
+	<g id="kvg:086c9-Insatsu-g1" kvg:element="虫" kvg:position="left" kvg:radical="general">
+		<g id="kvg:086c9-Insatsu-g2" kvg:element="中">
+			<g id="kvg:086c9-Insatsu-g3" kvg:element="口">
+				<path id="kvg:086c9-Insatsu-s1" kvg:type="㇑" d="M12.76,39.4c0.44,0.51,0.98,1.4,1.08,2.06c0.83,5.79,1.29,11.54,2.97,22.43"/>
+				<path id="kvg:086c9-Insatsu-s2" kvg:type="㇕b" d="M14.16,41.48c6.65-0.97,20.23-2.83,25.04-3.2c1.88-0.14,2.74,1.38,2.51,2.83c-0.8,4.98-1.4,9.34-2.7,17.62"/>
+				<path id="kvg:086c9-Insatsu-s3" kvg:type="㇐b" d="M17.06,61.93c5.35-0.98,16.19-2.68,24.26-3.39"/>
 			</g>
-			<g id="kvg:086c9-g4" kvg:element="丨">
-				<path id="kvg:086c9-s4" kvg:type="㇑a" d="M25.92,20.25c1.08,1,2.26,2.75,2.26,4.47c0,4.78-0.2,42.28-0.2,55.66"/>
+			<g id="kvg:086c9-Insatsu-g4" kvg:element="丨">
+				<path id="kvg:086c9-Insatsu-s4" kvg:type="㇑a" d="M25.92,20.25c1.08,1,2.26,2.75,2.26,4.47c0,4.78-0.2,42.28-0.2,55.66"/>
 			</g>
 		</g>
-		<path id="kvg:086c9-s5" kvg:type="㇀" d="M11.57,88.77c0.6,1.16,2.46,1.11,3.06,0.82c0.6-0.29,22.04-13.65,25.76-15.97"/>
-		<path id="kvg:086c9-s6" kvg:type="㇔" d="M37.25,66.75c2.42,3.03,6.7,10.93,7.31,15.64"/>
+		<path id="kvg:086c9-Insatsu-s5" kvg:type="㇀" d="M11.57,88.77c0.6,1.16,2.46,1.11,3.06,0.82c0.6-0.29,22.04-13.65,25.76-15.97"/>
+		<path id="kvg:086c9-Insatsu-s6" kvg:type="㇔" d="M37.25,66.75c2.42,3.03,6.7,10.93,7.31,15.64"/>
 	</g>
-	<g id="kvg:086c9-g5" kvg:element="令" kvg:position="right">
-		<g id="kvg:086c9-g6" kvg:element="人" kvg:position="top">
-			<path id="kvg:086c9-s7" kvg:type="㇒" d="M67.15,12.5c0.07,1.01,0.3,2.66-0.14,4.07C64.25,25.5,55.5,43.75,45.25,54.6"/>
-			<path id="kvg:086c9-s8" kvg:type="㇏" d="M67.17,17.29c4.53,5.36,21,27.04,24.82,31.5c1.3,1.51,2.96,2.16,4.26,2.59"/>
+	<g id="kvg:086c9-Insatsu-g5" kvg:element="令" kvg:position="right">
+		<g id="kvg:086c9-Insatsu-g6" kvg:element="人" kvg:position="top">
+			<path id="kvg:086c9-Insatsu-s7" kvg:type="㇒" d="M67.15,12.5c0.07,1.01,0.3,2.66-0.14,4.07C64.25,25.5,55.5,43.75,45.25,54.6"/>
+			<path id="kvg:086c9-Insatsu-s8" kvg:type="㇏" d="M67.17,17.29c4.53,5.36,21,27.04,24.82,31.5c1.3,1.51,2.96,2.16,4.26,2.59"/>
 		</g>
-		<g id="kvg:086c9-g7" kvg:position="bottom">
-			<g id="kvg:086c9-g8" kvg:element="一">
-				<path id="kvg:086c9-s9" kvg:type="一" d="M 57.5 49.7 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 13.08,-1.76 18.48,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
+		<g id="kvg:086c9-Insatsu-g7" kvg:position="bottom">
+			<g id="kvg:086c9-Insatsu-g8" kvg:element="一">
+				<path id="kvg:086c9-Insatsu-s9" kvg:type="一" d="M 57.5 49.7 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 13.08,-1.76 18.48,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
 			</g>
-			<g id="kvg:086c9-g9" kvg:element="卩" kvg:original="マ">
-				<path id="kvg:086c9-s10" kvg:type="㇆" d="M 56.6 59.7 c 0.61,0.15,3,1,4.21,0.87c3.29-0.37,17.99-4.02,19.51-4.17c1.52-0.15,4.28-0.29,3.95,2.89c-0.43,4.17-2.68,16.92-6,23.84c-1.89,3.94-3.18,3.45-6.23,0.46"/>
-				<path id="kvg:086c9-s11" kvg:type="㇑" d="M 63.8 60.7 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,13.545146 0.202719,23.466557 -0.18,37.006667"/>
+			<g id="kvg:086c9-Insatsu-g9" kvg:element="卩" kvg:original="マ">
+				<path id="kvg:086c9-Insatsu-s10" kvg:type="㇆" d="M 56.6 59.7 c 0.61,0.15,3,1,4.21,0.87c3.29-0.37,17.99-4.02,19.51-4.17c1.52-0.15,4.28-0.29,3.95,2.89c-0.43,4.17-2.68,16.92-6,23.84c-1.89,3.94-3.18,3.45-6.23,0.46"/>
+				<path id="kvg:086c9-Insatsu-s11" kvg:type="㇑" d="M 63.8 60.7 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,13.545146 0.202719,23.466557 -0.18,37.006667"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_086c9" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_086c9-Insatsu" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 6.50 46.50)">1</text>
 	<text transform="matrix(1 0 0 1 15.50 37.50)">2</text>
 	<text transform="matrix(1 0 0 1 19.50 58.85)">3</text>
diff --git a/kanji/09234-Insatsu.svg b/kanji/09234-Insatsu.svg
index 7c77242da..cbf501671 100644
--- a/kanji/09234-Insatsu.svg
+++ b/kanji/09234-Insatsu.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_09234" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:09234" kvg:element="鈴">
-	<g id="kvg:09234-g1" kvg:element="金" kvg:position="left" kvg:radical="general">
-		<path id="kvg:09234-s1" kvg:type="㇒" d="M30,14.24c0,1.14-0.05,2.19-0.42,3.28c-1.92,5.7-11.22,20-19.61,28.6"/>
-		<path id="kvg:09234-s2" kvg:type="㇔/㇏" d="M32.39,20.21C37.38,22.75,42.5,26.12,46,31.25"/>
-		<path id="kvg:09234-s3" kvg:type="㇐" d="M19.75,39.75c1.41,0,2.22,0.08,3.63-0.08c3.72-0.42,9.05-1.41,14.01-2.24c1.22-0.2,2.62-0.18,3.86-0.18"/>
-		<path id="kvg:09234-s4" kvg:type="㇐" d="M12.59,54.81c1.49,0.82,3.72,0.64,5.31,0.45c5.45-0.67,14.01-2.19,20.35-3.02c1.5-0.2,3.27-0.65,4.77-0.26"/>
-		<path id="kvg:09234-s5" kvg:type="㇑a" d="M28.7,41.44c0.99,0.99,1.24,1.81,1.24,3.14c0,4.35,0.06,28.92,0.06,37.98"/>
-		<path id="kvg:09234-s6" kvg:type="㇔" d="M16.14,68.26c2.9,3.82,4.31,7.96,4.9,10.19"/>
-		<path id="kvg:09234-s7" kvg:type="㇒" d="M42.48,62.8c0.28,0.69,0.1,1.77-0.18,2.29c-1.29,2.41-2.04,3.78-5.63,8.69"/>
-		<path id="kvg:09234-s8" kvg:type="㇀/㇐" d="M12.75,88.27c1.24,1.24,2.12,1.48,4.18,0.74c1.29-0.47,12.32-4.63,24.82-9.76"/>
+<g id="kvg:StrokePaths_09234-Insatsu" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:09234-Insatsu" kvg:element="鈴">
+	<g id="kvg:09234-Insatsu-g1" kvg:element="金" kvg:position="left" kvg:radical="general">
+		<path id="kvg:09234-Insatsu-s1" kvg:type="㇒" d="M30,14.24c0,1.14-0.05,2.19-0.42,3.28c-1.92,5.7-11.22,20-19.61,28.6"/>
+		<path id="kvg:09234-Insatsu-s2" kvg:type="㇔/㇏" d="M32.39,20.21C37.38,22.75,42.5,26.12,46,31.25"/>
+		<path id="kvg:09234-Insatsu-s3" kvg:type="㇐" d="M19.75,39.75c1.41,0,2.22,0.08,3.63-0.08c3.72-0.42,9.05-1.41,14.01-2.24c1.22-0.2,2.62-0.18,3.86-0.18"/>
+		<path id="kvg:09234-Insatsu-s4" kvg:type="㇐" d="M12.59,54.81c1.49,0.82,3.72,0.64,5.31,0.45c5.45-0.67,14.01-2.19,20.35-3.02c1.5-0.2,3.27-0.65,4.77-0.26"/>
+		<path id="kvg:09234-Insatsu-s5" kvg:type="㇑a" d="M28.7,41.44c0.99,0.99,1.24,1.81,1.24,3.14c0,4.35,0.06,28.92,0.06,37.98"/>
+		<path id="kvg:09234-Insatsu-s6" kvg:type="㇔" d="M16.14,68.26c2.9,3.82,4.31,7.96,4.9,10.19"/>
+		<path id="kvg:09234-Insatsu-s7" kvg:type="㇒" d="M42.48,62.8c0.28,0.69,0.1,1.77-0.18,2.29c-1.29,2.41-2.04,3.78-5.63,8.69"/>
+		<path id="kvg:09234-Insatsu-s8" kvg:type="㇀/㇐" d="M12.75,88.27c1.24,1.24,2.12,1.48,4.18,0.74c1.29-0.47,12.32-4.63,24.82-9.76"/>
 	</g>
-	<g id="kvg:09234-g2" kvg:element="令" kvg:position="right" kvg:phon="令">
-		<g id="kvg:09234-g3" kvg:element="人" kvg:position="top">
-			<path id="kvg:09234-s9" kvg:type="㇒" d="M67.9,13c0.07,1.01-0.2,2.16-0.64,3.57C64.5,25.5,55.75,44,45.5,54.85"/>
-			<path id="kvg:09234-s10" kvg:type="㇏" d="M68.17,17.79c3.99,4.43,15.65,19.54,21.95,26.96c1.93,2.27,4.04,3.86,6.38,5.62"/>
+	<g id="kvg:09234-Insatsu-g2" kvg:element="令" kvg:position="right" kvg:phon="令">
+		<g id="kvg:09234-Insatsu-g3" kvg:element="人" kvg:position="top">
+			<path id="kvg:09234-Insatsu-s9" kvg:type="㇒" d="M67.9,13c0.07,1.01-0.2,2.16-0.64,3.57C64.5,25.5,55.75,44,45.5,54.85"/>
+			<path id="kvg:09234-Insatsu-s10" kvg:type="㇏" d="M68.17,17.79c3.99,4.43,15.65,19.54,21.95,26.96c1.93,2.27,4.04,3.86,6.38,5.62"/>
 		</g>
-		<g id="kvg:09234-g4" kvg:position="bottom">
-			<g id="kvg:09234-g5" kvg:element="一">
-				<path id="kvg:09234-s11" kvg:type="一" d="M 58.6 48.2 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 13.08,-1.76 18.48,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
+		<g id="kvg:09234-Insatsu-g4" kvg:position="bottom">
+			<g id="kvg:09234-Insatsu-g5" kvg:element="一">
+				<path id="kvg:09234-Insatsu-s11" kvg:type="一" d="M 58.6 48.2 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 13.08,-1.76 18.48,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
 			</g>
-			<g id="kvg:09234-g6" kvg:element="卩" kvg:original="マ">
-				<path id="kvg:09234-s12" kvg:type="㇆" d="M 57.7 58.2 c 0.61,0.15,3,1,4.21,0.87c3.29-0.37,17.99-4.02,19.51-4.17c1.52-0.15,4.28-0.29,3.95,2.89c-0.43,4.17-2.68,16.92-6,23.84c-1.89,3.94-3.18,3.45-6.23,0.46"/>
-				<path id="kvg:09234-s13" kvg:type="㇑" d="M 64.9 59.2 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,13.545146 0.202719,23.466557 -0.18,37.006667"/>
+			<g id="kvg:09234-Insatsu-g6" kvg:element="卩" kvg:original="マ">
+				<path id="kvg:09234-Insatsu-s12" kvg:type="㇆" d="M 57.7 58.2 c 0.61,0.15,3,1,4.21,0.87c3.29-0.37,17.99-4.02,19.51-4.17c1.52-0.15,4.28-0.29,3.95,2.89c-0.43,4.17-2.68,16.92-6,23.84c-1.89,3.94-3.18,3.45-6.23,0.46"/>
+				<path id="kvg:09234-Insatsu-s13" kvg:type="㇑" d="M 64.9 59.2 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,13.545146 0.202719,23.466557 -0.18,37.006667"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_09234" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_09234-Insatsu" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 22.25 15.25)">1</text>
 	<text transform="matrix(1 0 0 1 37.25 20.25)">2</text>
 	<text transform="matrix(1 0 0 1 25.25 35.80)">3</text>
diff --git a/kanji/096f6-Insatsu.svg b/kanji/096f6-Insatsu.svg
index 3df4fc153..c44eb75e4 100644
--- a/kanji/096f6-Insatsu.svg
+++ b/kanji/096f6-Insatsu.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_096f6" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:096f6" kvg:element="零">
-	<g id="kvg:096f6-g1" kvg:element="雨" kvg:variant="true" kvg:position="top" kvg:radical="general">
-		<path id="kvg:096f6-s1" kvg:type="㇐" d="M33.21,16.07c2.36,0.32,4.67,0.13,7.03-0.08c7-0.64,17.79-1.78,26.14-2.39c2.44-0.18,4.94-0.51,7.37-0.1"/>
-		<path id="kvg:096f6-s2" kvg:type="㇔/㇑" d="M20.29,26.75c-0.2,4.96-1.94,10.46-3.23,15.47"/>
-		<path id="kvg:096f6-s3" kvg:type="㇖b/㇆" d="M21.02,29.53c23.36-2.4,47.23-5.28,65.79-5.71c8.03-0.19,3.38,4.46-0.78,8.61"/>
-		<path id="kvg:096f6-s4" kvg:type="㇑" d="M52.98,17.84c0.97,0.97,1.07,2.04,1.07,3.32c0,0.24,0.03,9.92,0.04,16.34c0.01,3.11,0.01,5.45,0.01,5.59"/>
-		<path id="kvg:096f6-s5" kvg:type="㇔" d="M33.88,34.88c2.8,0.75,6.61,3.01,8.13,4.26"/>
-		<path id="kvg:096f6-s6" kvg:type="㇔" d="M28.6,44.26c3.52,0.89,8.95,4.15,10.86,5.63"/>
-		<path id="kvg:096f6-s7" kvg:type="㇔" d="M66.68,33.27c3.41,1.4,7.28,4.19,8.65,5.36"/>
-		<path id="kvg:096f6-s8" kvg:type="㇔" d="M65.88,44.88c3.13,0.99,7.41,3.97,9.11,5.62"/>
+<g id="kvg:StrokePaths_096f6-Insatsu" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:096f6-Insatsu" kvg:element="零">
+	<g id="kvg:096f6-Insatsu-g1" kvg:element="雨" kvg:variant="true" kvg:position="top" kvg:radical="general">
+		<path id="kvg:096f6-Insatsu-s1" kvg:type="㇐" d="M33.21,16.07c2.36,0.32,4.67,0.13,7.03-0.08c7-0.64,17.79-1.78,26.14-2.39c2.44-0.18,4.94-0.51,7.37-0.1"/>
+		<path id="kvg:096f6-Insatsu-s2" kvg:type="㇔/㇑" d="M20.29,26.75c-0.2,4.96-1.94,10.46-3.23,15.47"/>
+		<path id="kvg:096f6-Insatsu-s3" kvg:type="㇖b/㇆" d="M21.02,29.53c23.36-2.4,47.23-5.28,65.79-5.71c8.03-0.19,3.38,4.46-0.78,8.61"/>
+		<path id="kvg:096f6-Insatsu-s4" kvg:type="㇑" d="M52.98,17.84c0.97,0.97,1.07,2.04,1.07,3.32c0,0.24,0.03,9.92,0.04,16.34c0.01,3.11,0.01,5.45,0.01,5.59"/>
+		<path id="kvg:096f6-Insatsu-s5" kvg:type="㇔" d="M33.88,34.88c2.8,0.75,6.61,3.01,8.13,4.26"/>
+		<path id="kvg:096f6-Insatsu-s6" kvg:type="㇔" d="M28.6,44.26c3.52,0.89,8.95,4.15,10.86,5.63"/>
+		<path id="kvg:096f6-Insatsu-s7" kvg:type="㇔" d="M66.68,33.27c3.41,1.4,7.28,4.19,8.65,5.36"/>
+		<path id="kvg:096f6-Insatsu-s8" kvg:type="㇔" d="M65.88,44.88c3.13,0.99,7.41,3.97,9.11,5.62"/>
 	</g>
-	<g id="kvg:096f6-g2" kvg:element="令" kvg:position="bottom" kvg:phon="令">
-		<g id="kvg:096f6-g3" kvg:element="人" kvg:position="top">
-			<path id="kvg:096f6-s9" kvg:type="㇒" d="M51.87,46.75c0,1.44-0.65,2.54-1.47,3.65c-5.17,7.05-16.3,16.71-35.15,27.28"/>
-			<path id="kvg:096f6-s10" kvg:type="㇏" d="M53.04,49.32c5.89,3.64,21.19,14.05,29.63,19.18c2.79,1.7,5.66,3.56,8.83,4.43"/>
+	<g id="kvg:096f6-Insatsu-g2" kvg:element="令" kvg:position="bottom" kvg:phon="令">
+		<g id="kvg:096f6-Insatsu-g3" kvg:element="人" kvg:position="top">
+			<path id="kvg:096f6-Insatsu-s9" kvg:type="㇒" d="M51.87,46.75c0,1.44-0.65,2.54-1.47,3.65c-5.17,7.05-16.3,16.71-35.15,27.28"/>
+			<path id="kvg:096f6-Insatsu-s10" kvg:type="㇏" d="M53.04,49.32c5.89,3.64,21.19,14.05,29.63,19.18c2.79,1.7,5.66,3.56,8.83,4.43"/>
 		</g>
-		<g id="kvg:096f6-g4" kvg:position="bottom">
-			<g id="kvg:096f6-g5" kvg:element="一">
-				<path id="kvg:096f6-s11" kvg:type="一" d="M 36.18875,70.596875 c 1.76,0.72 3.84,0.36 5.65,0.14 4.71875,-0.319375 21.822708,-0.851667 27.222708,-1.331667 1.88,-0.17 3.54,-0.23 5.37,0.21"/>
+		<g id="kvg:096f6-Insatsu-g4" kvg:position="bottom">
+			<g id="kvg:096f6-Insatsu-g5" kvg:element="一">
+				<path id="kvg:096f6-Insatsu-s11" kvg:type="一" d="M 36.18875,70.596875 c 1.76,0.72 3.84,0.36 5.65,0.14 4.71875,-0.319375 21.822708,-0.851667 27.222708,-1.331667 1.88,-0.17 3.54,-0.23 5.37,0.21"/>
 			</g>
-			<g id="kvg:096f6-g6" kvg:element="卩" kvg:original="マ">
-				<path id="kvg:096f6-s12" kvg:type="㇇/㇆" d="M 25.763074,78.93276 c 1.064167,0.604166 1.864582,0.716146 3.046197,0.586146 12.068026,-0.908399 36.172168,-0.834537 49.371459,-1.445002 1.525752,-0.07057 4.28,-0.29 3.95,2.89 -0.0042,2.552031 -0.263024,7.776431 -1.458333,10.867867 -1.375113,3.556466 -8.289374,2.76875 -12.701875,-1.356667"/>
-				<path id="kvg:096f6-s13" kvg:type="㇔/㇑" d="M 49.254967,79.830826 c 0.588999,0.588999 0.675995,0.715423 0.675995,2.215423 0.05897,3.510916 -0.228537,15.047044 -0.09283,19.610961"/>
+			<g id="kvg:096f6-Insatsu-g6" kvg:element="卩" kvg:original="マ">
+				<path id="kvg:096f6-Insatsu-s12" kvg:type="㇇/㇆" d="M 25.763074,78.93276 c 1.064167,0.604166 1.864582,0.716146 3.046197,0.586146 12.068026,-0.908399 36.172168,-0.834537 49.371459,-1.445002 1.525752,-0.07057 4.28,-0.29 3.95,2.89 -0.0042,2.552031 -0.263024,7.776431 -1.458333,10.867867 -1.375113,3.556466 -8.289374,2.76875 -12.701875,-1.356667"/>
+				<path id="kvg:096f6-Insatsu-s13" kvg:type="㇔/㇑" d="M 49.254967,79.830826 c 0.588999,0.588999 0.675995,0.715423 0.675995,2.215423 0.05897,3.510916 -0.228537,15.047044 -0.09283,19.610961"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_096f6" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_096f6-Insatsu" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 27.25 17.25)">1</text>
 	<text transform="matrix(1 0 0 1 13.25 27.25)">2</text>
 	<text transform="matrix(1 0 0 1 24.25 26.25)">3</text>
diff --git a/kanji/09818-Insatsu.svg b/kanji/09818-Insatsu.svg
index ac781da52..8184c1cb3 100644
--- a/kanji/09818-Insatsu.svg
+++ b/kanji/09818-Insatsu.svg
@@ -35,43 +35,43 @@ 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_09818" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:09818" kvg:element="領">
-	<g id="kvg:09818-g1" kvg:element="令" kvg:position="left" kvg:phon="令">
-		<g id="kvg:09818-g2" kvg:element="人" kvg:position="top">
-			<path id="kvg:09818-s1" kvg:type="㇒" d="M30.75,18c0,1-0.23,1.88-0.61,2.85c-2.64,6.65-8.39,17.03-18.87,26.86"/>
-			<path id="kvg:09818-s2" kvg:type="㇔/㇏" d="M32,22.75c6,4,10.62,9.25,13.92,14.62"/>
+<g id="kvg:StrokePaths_09818-Insatsu" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:09818-Insatsu" kvg:element="領">
+	<g id="kvg:09818-Insatsu-g1" kvg:element="令" kvg:position="left" kvg:phon="令">
+		<g id="kvg:09818-Insatsu-g2" kvg:element="人" kvg:position="top">
+			<path id="kvg:09818-Insatsu-s1" kvg:type="㇒" d="M30.75,18c0,1-0.23,1.88-0.61,2.85c-2.64,6.65-8.39,17.03-18.87,26.86"/>
+			<path id="kvg:09818-Insatsu-s2" kvg:type="㇔/㇏" d="M32,22.75c6,4,10.62,9.25,13.92,14.62"/>
 		</g>
-		<g id="kvg:09818-g3" kvg:position="bottom">
-			<g id="kvg:09818-g4" kvg:element="一">
-				<path id="kvg:09818-s3" kvg:type="一" d="M 19.25,46.2 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 13.08,-1.76 18.48,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
+		<g id="kvg:09818-Insatsu-g3" kvg:position="bottom">
+			<g id="kvg:09818-Insatsu-g4" kvg:element="一">
+				<path id="kvg:09818-Insatsu-s3" kvg:type="一" d="M 19.25,46.2 c 0.796567,0.398856 1.99342,0.319857 3.120988,0.180143 5.4,-0.66 13.08,-1.76 18.48,-2.24 1.157425,-0.08971 2.576567,0.01086 3.52342,0.330429"/>
 			</g>
-			<g id="kvg:09818-g5" kvg:element="卩">
-				<path id="kvg:09818-s4" kvg:type="㇆" d="M 18.36,55.5 c 0.61,0.15,3,1,4.21,0.87c3.29-0.37,17.99-4.02,19.51-4.17c1.52-0.15,4.28-0.29,3.95,2.89c-0.43,4.17-2.68,16.92-6,23.84c-1.89,3.94-3.18,3.45-6.23,0.46"/>
-				<path id="kvg:09818-s5" kvg:type="㇑" d="M 25.54,56.5 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,13.545146 0.202719,23.466557 -0.18,37.006667"/>
+			<g id="kvg:09818-Insatsu-g5" kvg:element="卩">
+				<path id="kvg:09818-Insatsu-s4" kvg:type="㇆" d="M 18.36,55.5 c 0.61,0.15,3,1,4.21,0.87c3.29-0.37,17.99-4.02,19.51-4.17c1.52-0.15,4.28-0.29,3.95,2.89c-0.43,4.17-2.68,16.92-6,23.84c-1.89,3.94-3.18,3.45-6.23,0.46"/>
+				<path id="kvg:09818-Insatsu-s5" kvg:type="㇑" d="M 25.54,56.5 c 0.87,0.87 1.8,2 1.8,3.5 -0.219826,13.545146 0.202719,23.466557 -0.18,37.006667"/>
 			</g>
 		</g>
 	</g>
-	<g id="kvg:09818-g6" kvg:element="頁" kvg:position="right" kvg:radical="general">
-		<path id="kvg:09818-s6" kvg:type="㇐" d="M49.12,18.03c2.01,0.47,5.15,0.32,7.01,0.11c9.52-1.09,23.68-2.87,32.75-3.66c2.32-0.2,4.49-0.44,6.76,0.2"/>
-		<path id="kvg:09818-s7" kvg:type="㇒" d="M71.19,20.49c0.04,0.87-0.04,1.72-0.27,2.56c-1.3,2.95-2.42,6.45-4.55,10.83"/>
-		<g id="kvg:09818-g7" kvg:element="貝">
-			<g id="kvg:09818-g8" kvg:element="目" kvg:position="top">
-				<path id="kvg:09818-s8" kvg:type="㇑" d="M56.16,34.89c0.85,0.85,1.44,2.28,1.44,3.65c0,1.08-0.1,24.43-0.06,34.97c0.01,2.8,0.03,4.68,0.06,4.97"/>
-				<path id="kvg:09818-s9" kvg:type="㇕a" d="M58.16,36.25c2.74-0.17,24.04-2.73,26.53-2.93c2.08-0.17,3.54,1.06,3.54,3.15c0,2.82-0.05,20.59-0.05,35.03c0,1.72,0,3.4,0,4.99"/>
-				<path id="kvg:09818-s10" kvg:type="㇐a" d="M58.86,48.7c7.14-0.95,22.37-2.84,28.23-3.21"/>
-				<path id="kvg:09818-s11" kvg:type="㇐a" d="M58.58,61.98c9.54-1.36,21.25-2.25,28.73-2.73"/>
-				<path id="kvg:09818-s12" kvg:type="㇐a" d="M58.79,75.75c8.46-0.75,20.51-2.16,28.48-2.67"/>
+	<g id="kvg:09818-Insatsu-g6" kvg:element="頁" kvg:position="right" kvg:radical="general">
+		<path id="kvg:09818-Insatsu-s6" kvg:type="㇐" d="M49.12,18.03c2.01,0.47,5.15,0.32,7.01,0.11c9.52-1.09,23.68-2.87,32.75-3.66c2.32-0.2,4.49-0.44,6.76,0.2"/>
+		<path id="kvg:09818-Insatsu-s7" kvg:type="㇒" d="M71.19,20.49c0.04,0.87-0.04,1.72-0.27,2.56c-1.3,2.95-2.42,6.45-4.55,10.83"/>
+		<g id="kvg:09818-Insatsu-g7" kvg:element="貝">
+			<g id="kvg:09818-Insatsu-g8" kvg:element="目" kvg:position="top">
+				<path id="kvg:09818-Insatsu-s8" kvg:type="㇑" d="M56.16,34.89c0.85,0.85,1.44,2.28,1.44,3.65c0,1.08-0.1,24.43-0.06,34.97c0.01,2.8,0.03,4.68,0.06,4.97"/>
+				<path id="kvg:09818-Insatsu-s9" kvg:type="㇕a" d="M58.16,36.25c2.74-0.17,24.04-2.73,26.53-2.93c2.08-0.17,3.54,1.06,3.54,3.15c0,2.82-0.05,20.59-0.05,35.03c0,1.72,0,3.4,0,4.99"/>
+				<path id="kvg:09818-Insatsu-s10" kvg:type="㇐a" d="M58.86,48.7c7.14-0.95,22.37-2.84,28.23-3.21"/>
+				<path id="kvg:09818-Insatsu-s11" kvg:type="㇐a" d="M58.58,61.98c9.54-1.36,21.25-2.25,28.73-2.73"/>
+				<path id="kvg:09818-Insatsu-s12" kvg:type="㇐a" d="M58.79,75.75c8.46-0.75,20.51-2.16,28.48-2.67"/>
 			</g>
-			<g id="kvg:09818-g9" kvg:position="bottom">
-				<path id="kvg:09818-s13" kvg:type="㇒" d="M64.77,82.29c0,0.96-0.23,1.8-1,2.74c-3.02,3.72-8.52,7.72-15.17,11.47"/>
-				<path id="kvg:09818-s14" kvg:type="㇔" d="M81.39,82.54c5.7,3.64,12.44,10.24,14,13.43"/>
+			<g id="kvg:09818-Insatsu-g9" kvg:position="bottom">
+				<path id="kvg:09818-Insatsu-s13" kvg:type="㇒" d="M64.77,82.29c0,0.96-0.23,1.8-1,2.74c-3.02,3.72-8.52,7.72-15.17,11.47"/>
+				<path id="kvg:09818-Insatsu-s14" kvg:type="㇔" d="M81.39,82.54c5.7,3.64,12.44,10.24,14,13.43"/>
 			</g>
 		</g>
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_09818" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_09818-Insatsu" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 23.25 19.63)">1</text>
 	<text transform="matrix(1 0 0 1 36.50 23.50)">2</text>
 	<text transform="matrix(1 0 0 1 21.77 43.1)">3</text>