diff --git a/kanji/02ec3.svg b/kanji/02ec3.svg
index 9aca87333..e2328b39c 100644
--- a/kanji/02ec3.svg
+++ b/kanji/02ec3.svg
@@ -35,7 +35,7 @@ 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_06817" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_02ec3" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:02ec3" kvg:element="⻃">
 	<g id="kvg:02ec3-g1" kvg:element="西" kvg:variant="true" kvg:original="襾">
 		<path id="kvg:02ec3-s1" kvg:type="㇐" d="M28.5,14.64c2.88,0.61,5.57,0.75,8,0.54c9.43-0.82,26.58-2.66,35.74-3.19c2.77-0.16,5.79-0.4,8.51,0.27"/>
diff --git a/kanji/04f34-HzFst.svg b/kanji/04f34-HzFst.svg
index f813f44db..4ebeb81ec 100644
--- a/kanji/04f34-HzFst.svg
+++ b/kanji/04f34-HzFst.svg
@@ -35,7 +35,7 @@ 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_04e0a-HzFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_04f34-HzFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:04f34-HzFst" kvg:element="伴">
 	<g id="kvg:04f34-HzFst-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
 		<path id="kvg:04f34-HzFst-s1" kvg:type="㇒" d="M35.73,14.89c0.14,1.15,0,2.34-0.38,3.76c-2.39,8.93-11.65,26.46-22.8,38.57"/>
@@ -50,7 +50,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_04e0a-HzFst" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_04f34-HzFst" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 27.50 15.50)">1</text>
 	<text transform="matrix(1 0 0 1 22.50 55.50)">2</text>
 	<text transform="matrix(1 0 0 1 44.50 20.50)">3</text>
diff --git a/kanji/05099-Insatsu.svg b/kanji/05099-Insatsu.svg
index 4e183f38d..f70a8d5ac 100644
--- a/kanji/05099-Insatsu.svg
+++ b/kanji/05099-Insatsu.svg
@@ -35,7 +35,7 @@ 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_05099" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_05099-Insatsu" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05099-Insatsu" kvg:element="備">
 	<g id="kvg:05099-Insatsu-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
 		<path id="kvg:05099-Insatsu-s1" kvg:type="㇒" d="M35.25,15c0.25,2-0.07,3.37-0.87,5.08C29.25,31,23.75,42.5,12,55.79"/>
@@ -61,7 +61,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_05099" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_05099-Insatsu" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 27.50 15.50)">1</text>
 	<text transform="matrix(1 0 0 1 20.50 55.50)">2</text>
 	<text transform="matrix(1 0 0 1 42.50 21.50)">3</text>
diff --git a/kanji/05099-InsatsuKaisho.svg b/kanji/05099-InsatsuKaisho.svg
index 6a42dbdad..32270be21 100644
--- a/kanji/05099-InsatsuKaisho.svg
+++ b/kanji/05099-InsatsuKaisho.svg
@@ -35,7 +35,7 @@ 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_05099-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_05099-InsatsuKaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05099-InsatsuKaisho" kvg:element="備">
 	<g id="kvg:05099-InsatsuKaisho-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
 		<path id="kvg:05099-InsatsuKaisho-s1" kvg:type="㇒" d="M35.25,15c0.25,2-0.07,4.62-0.87,6.33C29.25,32.25,22.75,42.5,11,55.79"/>
@@ -61,7 +61,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_05099-Kaisho" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_05099-InsatsuKaisho" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 27.50 15.50)">1</text>
 	<text transform="matrix(1 0 0 1 20.50 55.50)">2</text>
 	<text transform="matrix(1 0 0 1 42.50 21.50)">3</text>
diff --git a/kanji/05099-Kaisho.svg b/kanji/05099-Kaisho.svg
index eeda13ca0..c04bd2491 100644
--- a/kanji/05099-Kaisho.svg
+++ b/kanji/05099-Kaisho.svg
@@ -35,7 +35,7 @@ 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_05099-HyougaiKaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_05099-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05099-Kaisho" kvg:element="備">
 	<g id="kvg:05099-Kaisho-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
 		<path id="kvg:05099-Kaisho-s1" kvg:type="㇒" d="M35.25,15c0.25,2-0.07,4.62-0.87,6.33C29.25,32.25,22.75,42.5,11,55.79"/>
@@ -61,7 +61,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_05099-HyougaiKaisho" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_05099-Kaisho" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 27.50 15.50)">1</text>
 	<text transform="matrix(1 0 0 1 20.50 55.50)">2</text>
 	<text transform="matrix(1 0 0 1 42.50 21.50)">3</text>
diff --git a/kanji/05099.svg b/kanji/05099.svg
index b3a31507b..949debde7 100644
--- a/kanji/05099.svg
+++ b/kanji/05099.svg
@@ -35,7 +35,7 @@ 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_05099-Hyougai" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_05099" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05099" kvg:element="備">
 	<g id="kvg:05099-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
 		<path id="kvg:05099-s1" kvg:type="㇒" d="M35.25,15c0.25,2-0.07,3.37-0.87,5.08C29.25,31,23.75,42.5,12,55.79"/>
@@ -61,7 +61,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_05099-Hyougai" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_05099" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 27.50 15.50)">1</text>
 	<text transform="matrix(1 0 0 1 20.50 55.50)">2</text>
 	<text transform="matrix(1 0 0 1 42.50 21.50)">3</text>
diff --git a/kanji/05118-VtFst.svg b/kanji/05118-VtFst.svg
index aad39e365..7d77622e9 100644
--- a/kanji/05118-VtFst.svg
+++ b/kanji/05118-VtFst.svg
@@ -35,7 +35,7 @@ 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_05118" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_05118-VtFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:05118-VtFst" kvg:element="儘">
 	<g id="kvg:05118-VtFst-g1" kvg:element="亻" kvg:variant="true" kvg:original="人" kvg:position="left" kvg:radical="general">
 		<path id="kvg:05118-VtFst-s1" kvg:type="㇒" d="M30.01,15.39c0.12,1.25,0.2,2.81-0.1,4.34c-1.95,9.67-9.5,28.38-18.59,41.49"/>
@@ -71,7 +71,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_05118" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_05118-VtFst" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 22.85 15.85)">1</text>
 	<text transform="matrix(1 0 0 1 20.50 57.50)">2</text>
 	<text transform="matrix(1 0 0 1 40.50 19.50)">3</text>
diff --git a/kanji/058d7-VtFst.svg b/kanji/058d7-VtFst.svg
index 696c654f6..a1e3c9e2a 100644
--- a/kanji/058d7-VtFst.svg
+++ b/kanji/058d7-VtFst.svg
@@ -35,7 +35,7 @@ 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_058d7" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_058d7-VtFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:058d7-VtFst" kvg:element="壗">
 	<g id="kvg:058d7-VtFst-g1" kvg:element="土" kvg:variant="true" kvg:position="left" kvg:radical="general">
 		<path id="kvg:058d7-VtFst-s1" kvg:type="㇐" d="M10,45.14c0.76,0.38,2.24,0.46,3,0.36c4.82-0.66,16.65-2.89,22-3.5c1.25-0.14,2.62-0.18,3.25,0.01"/>
@@ -72,7 +72,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_058d7" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_058d7-VtFst" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 2.00 47.13)">1</text>
 	<text transform="matrix(1 0 0 1 15.75 19.80)">2</text>
 	<text transform="matrix(1 0 0 1 0.50 82.48)">3</text>
diff --git a/kanji/063d2-MdFst.svg b/kanji/063d2-MdFst.svg
index 3dfa3ba5c..9bc030fad 100644
--- a/kanji/063d2-MdFst.svg
+++ b/kanji/063d2-MdFst.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:063d2-MdFst-s2" kvg:type="㇚" d="M25.77,11.83c0.48,0.92,1.67,2.49,1.76,5.52c0.4,14.55-0.26,66.66-0.26,71.62c0,11.53-6.21,2.5-7.71,1.25"/>
 		<path id="kvg:063d2-MdFst-s3" kvg:type="㇀" d="M10.5,62.71c1.25,1.29,2.98,1.02,4.79,0.2c1.07-0.49,19.67-10.82,24.21-13.16"/>
 	</g>
-	<g id="kvg:063d2-MdFst-g2" kvg:position="right" kvg:element="臿">
+	<g id="kvg:063d2-MdFst-g2" kvg:element="臿" kvg:position="right">
 		<g id="kvg:063d2-MdFst-g3" kvg:element="千">
 			<g id="kvg:063d2-MdFst-g4" kvg:element="丿" kvg:position="top">
 				<path id="kvg:063d2-MdFst-s4" kvg:type="㇒" d="M85.59,12.67c0.1,0.38-0.81,2.4-1.4,2.81c-4.49,3.14-15.92,8.33-35.85,12.7"/>
diff --git a/kanji/06b43-MdFst.svg b/kanji/06b43-MdFst.svg
index 230b522af..3f8645308 100644
--- a/kanji/06b43-MdFst.svg
+++ b/kanji/06b43-MdFst.svg
@@ -37,7 +37,7 @@ 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_06b43-MdFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:06b43-MdFst" kvg:element="歃">
-	<g id="kvg:06b43-MdFst-g1" kvg:position="left" kvg:element="臿">
+	<g id="kvg:06b43-MdFst-g1" kvg:element="臿" kvg:position="left">
 		<g id="kvg:06b43-MdFst-g2" kvg:element="千">
 			<g id="kvg:06b43-MdFst-g3" kvg:element="丿" kvg:position="top">
 				<path id="kvg:06b43-MdFst-s1" kvg:type="㇒" d="M45.15,14.67c0.08,0.34-0.64,2.14-1.11,2.5c-3.58,2.8-12.67,7.41-28.53,11.3"/>
diff --git a/kanji/076e1-VtFst.svg b/kanji/076e1-VtFst.svg
index 7d5c0f478..83a3218e0 100644
--- a/kanji/076e1-VtFst.svg
+++ b/kanji/076e1-VtFst.svg
@@ -35,7 +35,7 @@ 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_076e1" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:StrokePaths_076e1-VtFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:076e1-VtFst" kvg:element="盡">
 	<g id="kvg:076e1-VtFst-g1" kvg:position="top">
 		<g id="kvg:076e1-VtFst-g2" kvg:element="聿" kvg:partial="true" kvg:position="top">
@@ -65,7 +65,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 </g>
 </g>
-<g id="kvg:StrokeNumbers_076e1" style="font-size:8;fill:#808080">
+<g id="kvg:StrokeNumbers_076e1-VtFst" style="font-size:8;fill:#808080">
 	<text transform="matrix(1 0 0 1 22.75 20.50)">1</text>
 	<text transform="matrix(1 0 0 1 6.50 32.50)">2</text>
 	<text transform="matrix(1 0 0 1 22.75 43.50)">3</text>
diff --git a/kanji/08258-VtLst.svg b/kanji/08258-VtLst.svg
index 7f695d10c..6b82374de 100644
--- a/kanji/08258-VtLst.svg
+++ b/kanji/08258-VtLst.svg
@@ -47,7 +47,7 @@ kvg:type CDATA #IMPLIED >
 	</g>
 	<g id="kvg:08258-VtLst-g2" kvg:element="叟" kvg:position="right">
 		<g id="kvg:08258-VtLst-g3" kvg:position="top">
-			<g id="kvg:08258-VtLst-g4" kvg:element="𦥑" kvg:original="臼" kvg:variant="true">
+			<g id="kvg:08258-VtLst-g4" kvg:element="𦥑" kvg:variant="true" kvg:original="臼">
 				<path id="kvg:08258-VtLst-s7" kvg:type="㇒" d="M58.77,18.87c0.03,0.16-0.66,1.3-0.85,1.48c-2.48,2.33-4.29,3.59-9.93,5.45"/>
 				<path id="kvg:08258-VtLst-s8" kvg:type="㇑" d="M45.42,25.08c1.58,0.92,2.35,2.39,2.5,3.83c0.53,5.26,1.97,14.21,2.5,21.33"/>
 				<path id="kvg:08258-VtLst-s9" kvg:type="㇐" d="M49.42,36.08c2.9-0.32,7.14-1.33,7.83-1.33c0.69,0,3.28,0.17,3.83,0.17"/>