diff --git a/kanji/061cb-Kaisho.svg b/kanji/061cb-Kaisho.svg
index 4bb6cfdfa1..fc2cb0a737 100644
--- a/kanji/061cb-Kaisho.svg
+++ b/kanji/061cb-Kaisho.svg
@@ -37,57 +37,53 @@ 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_061cb-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:061cb-Kaisho" kvg:element="懋">
-	<g id="kvg:061cb-Kaisho-g1" kvg:element="楙" kvg:position="top">
-		<g id="kvg:061cb-Kaisho-g2" kvg:element="木" kvg:position="left">
-			<path id="kvg:061cb-Kaisho-s1" kvg:type="㇐" d="M11,25.94c0.62,0.16,2.51,0.14,4.17,0c5.83-0.48,13.12-1.79,19.38-2.11c1.66-0.09,2.92-0.48,3.96-0.32"/>
-			<path id="kvg:061cb-Kaisho-s2" kvg:type="㇑" d="M25,11.7c1.25,0.37,2,1.65,2.25,2.39C27.5,14.82,27,52.42,27,57.02c0,8.23-4,2.73-4.75,1.98"/>
-			<path id="kvg:061cb-Kaisho-s3" kvg:type="㇒" d="M27.25,27.32C24.57,35.29,16.58,48.65,11,53.17"/>
-			<path id="kvg:061cb-Kaisho-s4" kvg:type="㇔/㇏" d="M29,33.25c3.03,1.94,6.27,5.82,8,9.21"/>
+  <g id="kvg:061cb-Kaisho-g1" kvg:element="矛">
+	<g id="kvg:061cb-Kaisho-g2" kvg:element="予">
+	  <g id="kvg:061cb-Kaisho-g3" kvg:element="マ" kvg:position="top">
+		<path id="kvg:061cb-Kaisho-s1" kvg:type="㇇" d="M38.92,13.39c0.54,0.26,3.36,1.17,4.31,1.05C46.75,14,58.4,11.7,60.38,11.37c1.98-0.33,2.66,1.37,1.47,2.43c-2.03,1.83-7.21,7.52-8.46,8.82"/>
+		<path id="kvg:061cb-Kaisho-s2" kvg:type="㇔" d="M44.64,20.65c2.53,0.79,9.07,3.84,10.26,5.91"/>
+	  </g>
+	  <g id="kvg:061cb-Kaisho-g4" kvg:element="了" kvg:position="bottom">
+		<path id="kvg:061cb-Kaisho-s3" kvg:type="㇇" d="M38.09,29.84c0.59,0.15,1.47,0.78,3.96,0.51c5.1-0.55,16.03-2.21,20.91-2.88C70,26.5,64.5,32,61.55,35.7"/>
+		<g id="kvg:061cb-Kaisho-g5" kvg:element="亅">
+		  <path id="kvg:061cb-Kaisho-s4" kvg:type="㇚" d="M54.36,29.47c0,6.3,0.21,13.77,0.21,26.03c0,8.44-5.08,1.25-6.36,0.03"/>
 		</g>
-		<g id="kvg:061cb-Kaisho-g3" kvg:position="right">
-			<g id="kvg:061cb-Kaisho-g4" kvg:element="矛">
-				<g id="kvg:061cb-Kaisho-g5" kvg:element="予">
-					<g id="kvg:061cb-Kaisho-g6" kvg:element="マ" kvg:position="top">
-						<path id="kvg:061cb-Kaisho-s5" kvg:type="㇇" d="M38.92,13.39c0.54,0.26,3.36,1.17,4.31,1.05C46.75,14,58.4,11.7,60.38,11.37c1.98-0.33,2.66,1.37,1.47,2.43c-2.03,1.83-7.21,7.52-8.46,8.82"/>
-						<path id="kvg:061cb-Kaisho-s6" kvg:type="㇔" d="M44.64,20.65c2.53,0.79,9.07,3.84,10.26,5.91"/>
-					</g>
-					<g id="kvg:061cb-Kaisho-g7" kvg:element="了" kvg:position="bottom">
-						<path id="kvg:061cb-Kaisho-s7" kvg:type="㇇" d="M38.09,29.84c0.59,0.15,1.47,0.78,3.96,0.51c5.1-0.55,16.03-2.21,20.91-2.88C70,26.5,64.5,32,61.55,35.7"/>
-						<g id="kvg:061cb-Kaisho-g8" kvg:element="亅">
-							<path id="kvg:061cb-Kaisho-s8" kvg:type="㇚" d="M54.36,29.47c0,6.3,0.21,13.77,0.21,26.03c0,8.44-5.08,1.25-6.36,0.03"/>
-						</g>
-					</g>
-				</g>
-				<g id="kvg:061cb-Kaisho-g9" kvg:element="丿">
-					<path id="kvg:061cb-Kaisho-s9" kvg:type="㇒" d="M53.49,30.17c0.05,0.5,0.28,1.34-0.1,2.01c-3.01,5.34-7.37,12.09-17.15,19.21"/>
-				</g>
-			</g>
-			<g id="kvg:061cb-Kaisho-g10" kvg:element="木">
-				<path id="kvg:061cb-Kaisho-s10" kvg:type="㇐" d="M67.75,23.06c0.46,0.14,1.45,0.22,2.67,0.14c4.31-0.28,11.36-1.75,19.78-2.44c1.22-0.1,2.29-0.14,3.05,0"/>
-				<path id="kvg:061cb-Kaisho-s11" kvg:type="㇑" d="M77.75,10.5c1.25,0.37,2,1.65,2.25,2.39c0.25,0.73-0.25,38.27-0.25,42.86c0,8.5-4,3-5,2"/>
-				<path id="kvg:061cb-Kaisho-s12" kvg:type="㇒" d="M79.75,24.12c-2.8,9.45-11.51,22.6-18,27.45"/>
-				<path id="kvg:061cb-Kaisho-s13" kvg:type="㇏" d="M80.25,26.57c4.1,7.75,10.65,17.7,13.98,20.77c0.95,0.87,1.48,1.47,2.27,1.77"/>
-			</g>
-		</g>
-	</g>
-	<g id="kvg:061cb-Kaisho-g11" kvg:element="心" kvg:position="bottom" kvg:radical="general">
-		<path id="kvg:061cb-Kaisho-s14" kvg:type="㇔" d="M24.31,77.88c0.41,2.21-4.06,11.98-7.31,15.67"/>
-		<path id="kvg:061cb-Kaisho-s15" kvg:type="㇟b" d="M34,72.07c6.58,13.79,16.97,25.26,42.33,25.43c12.23,0.08,13.03-3.18,2.83-9.45"/>
-		<path id="kvg:061cb-Kaisho-s16" kvg:type="㇔a" d="M55.33,73.07c2.02,4.65,4.97,9.31,7.13,2.18"/>
-		<path id="kvg:061cb-Kaisho-s17" kvg:type="㇔" d="M81.3,70.55c4.63,2.07,8.09,3.96,11.85,10.36"/>
-	</g>
+	  </g>
+	  <g id="kvg:061cb-Kaisho-g6" kvg:element="丿">
+	    <path id="kvg:061cb-Kaisho-s5" kvg:type="㇒" d="M53.49,30.17c0.05,0.5,0.28,1.34-0.1,2.01c-3.01,5.34-7.37,12.09-17.15,19.21"/>
+	  </g>
+    </g>
+  </g>
+  <g id="kvg:061cb-Kaisho-g7" kvg:element="木" kvg:position="left">
+	<path id="kvg:061cb-Kaisho-s6" kvg:type="㇐" d="M11,25.94c0.62,0.16,2.51,0.14,4.17,0c5.83-0.48,13.12-1.79,19.38-2.11c1.66-0.09,2.92-0.48,3.96-0.32"/>
+	<path id="kvg:061cb-Kaisho-s7"  kvg:type="㇑" d="M25,11.7c1.25,0.37,2,1.65,2.25,2.39C27.5,14.82,27,52.42,27,57.02c0,8.23-4,2.73-4.75,1.98"/>
+	<path id="kvg:061cb-Kaisho-s8" kvg:type="㇒" d="M27.25,27.32C24.57,35.29,16.58,48.65,11,53.17"/>
+	<path id="kvg:061cb-Kaisho-s9" kvg:type="㇔/㇏" d="M29,33.25c3.03,1.94,6.27,5.82,8,9.21"/>
+  </g>
+  <g id="kvg:061cb-Kaisho-g8" kvg:element="木" kvg:position="right">
+	<path id="kvg:061cb-Kaisho-s10" kvg:type="㇐" d="M67.75,23.06c0.46,0.14,1.45,0.22,2.67,0.14c4.31-0.28,11.36-1.75,19.78-2.44c1.22-0.1,2.29-0.14,3.05,0"/>
+	<path id="kvg:061cb-Kaisho-s11" kvg:type="㇑" d="M77.75,10.5c1.25,0.37,2,1.65,2.25,2.39c0.25,0.73-0.25,38.27-0.25,42.86c0,8.5-4,3-5,2"/>
+	<path id="kvg:061cb-Kaisho-s12" kvg:type="㇒" d="M79.75,24.12c-2.8,9.45-11.51,22.6-18,27.45"/>
+	<path id="kvg:061cb-Kaisho-s13" kvg:type="㇏" d="M80.25,26.57c4.1,7.75,10.65,17.7,13.98,20.77c0.95,0.87,1.48,1.47,2.27,1.77"/>
+  </g>
+  <g id="kvg:061cb-Kaisho-g11" kvg:element="心" kvg:position="bottom" kvg:radical="general">
+	<path id="kvg:061cb-Kaisho-s14" kvg:type="㇔" d="M24.31,77.88c0.41,2.21-4.06,11.98-7.31,15.67"/>
+	<path id="kvg:061cb-Kaisho-s15" kvg:type="㇟b" d="M34,72.07c6.58,13.79,16.97,25.26,42.33,25.43c12.23,0.08,13.03-3.18,2.83-9.45"/>
+	<path id="kvg:061cb-Kaisho-s16" kvg:type="㇔a" d="M55.33,73.07c2.02,4.65,4.97,9.31,7.13,2.18"/>
+	<path id="kvg:061cb-Kaisho-s17" kvg:type="㇔" d="M81.3,70.55c4.63,2.07,8.09,3.96,11.85,10.36"/>
+  </g>
 </g>
 </g>
 <g id="kvg:StrokeNumbers_061cb-Kaisho" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 4.50 25.50)">1</text>
-	<text transform="matrix(1 0 0 1 17.50 12.50)">2</text>
-	<text transform="matrix(1 0 0 1 16.50 36.50)">3</text>
-	<text transform="matrix(1 0 0 1 31.50 33.50)">4</text>
-	<text transform="matrix(1 0 0 1 36.50 9.50)">5</text>
-	<text transform="matrix(1 0 0 1 39.50 22.50)">6</text>
-	<text transform="matrix(1 0 0 1 42.50 28.50)">7</text>
-	<text transform="matrix(1 0 0 1 56.50 38.50)">8</text>
-	<text transform="matrix(1 0 0 1 42.50 38.50)">9</text>
+	<text transform="matrix(1 0 0 1 36.50 9.50)">1</text>
+	<text transform="matrix(1 0 0 1 39.50 22.50)">2</text>
+	<text transform="matrix(1 0 0 1 42.50 28.50)">3</text>
+	<text transform="matrix(1 0 0 1 56.50 38.50)">4</text>
+	<text transform="matrix(1 0 0 1 42.50 38.50)">5</text>
+	<text transform="matrix(1 0 0 1 4.50 25.50)">6</text>
+	<text transform="matrix(1 0 0 1 17.50 12.50)">7</text>
+	<text transform="matrix(1 0 0 1 16.50 36.50)">8</text>
+	<text transform="matrix(1 0 0 1 31.50 33.50)">9</text>
 	<text transform="matrix(1 0 0 1 65.50 20.50)">10</text>
 	<text transform="matrix(1 0 0 1 68.00 10.50)">11</text>
 	<text transform="matrix(1 0 0 1 68.50 31.50)">12</text>
diff --git a/kanji/061cb.svg b/kanji/061cb.svg
index f7e2444955..5308a070cb 100644
--- a/kanji/061cb.svg
+++ b/kanji/061cb.svg
@@ -37,57 +37,53 @@ 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_061cb" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:061cb" kvg:element="懋">
-	<g id="kvg:061cb-g1" kvg:element="楙" kvg:position="top">
-		<g id="kvg:061cb-g2" kvg:element="木" kvg:position="left">
-			<path id="kvg:061cb-s1" kvg:type="㇐" d="M11,25.94c0.62,0.16,2.51,0.14,4.17,0c5.83-0.48,13.12-1.79,19.38-2.11c1.66-0.09,2.92-0.48,3.96-0.32"/>
-			<path id="kvg:061cb-s2" kvg:type="㇑" d="M25,11.7c1.25,0.37,2,1.65,2.25,2.39c0.25,0.73,0,41.84-0.25,46.43"/>
-			<path id="kvg:061cb-s3" kvg:type="㇒" d="M27.25,27.32C24.57,35.29,16.58,48.65,11,53.17"/>
-			<path id="kvg:061cb-s4" kvg:type="㇔/㇏" d="M29,33.25c3.03,1.94,6.27,5.82,8,9.21"/>
+  <g id="kvg:061cb-g1" kvg:element="矛">
+	<g id="kvg:061cb-g2" kvg:element="予">
+	  <g id="kvg:061cb-g3" kvg:element="マ" kvg:position="top">
+		<path id="kvg:061cb-s1" kvg:type="㇇" d="M38.92,13.39c0.54,0.26,3.36,1.17,4.31,1.05C46.75,14,58.4,11.7,60.38,11.37c1.98-0.33,2.66,1.37,1.47,2.43c-2.03,1.83-7.21,7.52-8.46,8.82"/>
+		<path id="kvg:061cb-s2" kvg:type="㇔" d="M44.64,20.65c2.53,0.79,9.07,3.84,10.26,5.91"/>
+	  </g>
+	  <g id="kvg:061cb-g4" kvg:element="了" kvg:position="bottom">
+		<path id="kvg:061cb-s3" kvg:type="㇇" d="M38.09,29.84c0.59,0.15,1.47,0.78,3.96,0.51c5.1-0.55,16.03-2.21,20.91-2.88C70,26.5,64.5,32,61.55,35.7"/>
+		<g id="kvg:061cb-g5" kvg:element="亅">
+		  <path id="kvg:061cb-s4" kvg:type="㇚" d="M54.36,29.47c0,6.3,0.21,13.77,0.21,26.03c0,8.44-5.08,1.25-6.36,0.03"/>
 		</g>
-		<g id="kvg:061cb-g3" kvg:position="right">
-			<g id="kvg:061cb-g4" kvg:element="矛">
-				<g id="kvg:061cb-g5" kvg:element="予">
-					<g id="kvg:061cb-g6" kvg:element="マ" kvg:position="top">
-						<path id="kvg:061cb-s5" kvg:type="㇇" d="M38.92,13.39c0.54,0.26,3.36,1.17,4.31,1.05C46.75,14,58.4,11.7,60.38,11.37c1.98-0.33,2.66,1.37,1.47,2.43c-2.03,1.83-7.21,7.52-8.46,8.82"/>
-						<path id="kvg:061cb-s6" kvg:type="㇔" d="M44.64,20.65c2.53,0.79,9.07,3.84,10.26,5.91"/>
-					</g>
-					<g id="kvg:061cb-g7" kvg:element="了" kvg:position="bottom">
-						<path id="kvg:061cb-s7" kvg:type="㇇" d="M38.09,29.84c0.59,0.15,1.47,0.78,3.96,0.51c5.1-0.55,16.03-2.21,20.91-2.88C70,26.5,64.5,32,61.55,35.7"/>
-						<g id="kvg:061cb-g8" kvg:element="亅">
-							<path id="kvg:061cb-s8" kvg:type="㇚" d="M54.36,29.47c0,6.3,0.21,13.77,0.21,26.03c0,8.44-5.08,1.25-6.36,0.03"/>
-						</g>
-					</g>
-				</g>
-				<g id="kvg:061cb-g9" kvg:element="丿">
-					<path id="kvg:061cb-s9" kvg:type="㇒" d="M53.49,30.17c0.05,0.5,0.28,1.34-0.1,2.01c-3.01,5.34-7.37,12.09-17.15,19.21"/>
-				</g>
-			</g>
-			<g id="kvg:061cb-g10" kvg:element="木">
-				<path id="kvg:061cb-s10" kvg:type="㇐" d="M67.75,23.06c0.46,0.14,1.45,0.22,2.67,0.14c4.31-0.28,11.36-1.75,19.78-2.44c1.22-0.1,2.29-0.14,3.05,0"/>
-				<path id="kvg:061cb-s11" kvg:type="㇑" d="M77.75,10.5c1.25,0.37,2,1.65,2.25,2.39c0.25,0.73,0,42.28-0.25,46.86"/>
-				<path id="kvg:061cb-s12" kvg:type="㇒" d="M79.75,24.12c-2.8,9.45-11.51,22.6-18,27.45"/>
-				<path id="kvg:061cb-s13" kvg:type="㇏" d="M80.25,26.57c4.1,7.75,10.65,17.7,13.98,20.77c0.95,0.87,1.48,1.47,2.27,1.77"/>
-			</g>
-		</g>
-	</g>
-	<g id="kvg:061cb-g11" kvg:element="心" kvg:position="bottom" kvg:radical="general">
-		<path id="kvg:061cb-s14" kvg:type="㇔" d="M24.31,77.88c0.41,2.21-4.06,11.98-7.31,15.67"/>
-		<path id="kvg:061cb-s15" kvg:type="㇟b" d="M34,72.07c6.58,13.79,16.97,25.26,42.33,25.43c12.23,0.08,13.03-3.18,2.83-9.45"/>
-		<path id="kvg:061cb-s16" kvg:type="㇔a" d="M55.33,73.07c2.02,4.65,4.97,9.31,7.13,2.18"/>
-		<path id="kvg:061cb-s17" kvg:type="㇔" d="M81.3,70.55c4.63,2.07,8.09,3.96,11.85,10.36"/>
-	</g>
+	  </g>
+	  <g id="kvg:061cb-g6" kvg:element="丿">
+	    <path id="kvg:061cb-s5" kvg:type="㇒" d="M53.49,30.17c0.05,0.5,0.28,1.34-0.1,2.01c-3.01,5.34-7.37,12.09-17.15,19.21"/>
+	  </g>
+    </g>
+  </g>
+  <g id="kvg:061cb-g7" kvg:element="木" kvg:position="left">
+	<path id="kvg:061cb-s6" kvg:type="㇐" d="M11,25.94c0.62,0.16,2.51,0.14,4.17,0c5.83-0.48,13.12-1.79,19.38-2.11c1.66-0.09,2.92-0.48,3.96-0.32"/>
+	<path id="kvg:061cb-s7" kvg:type="㇑" d="M25,11.7c1.25,0.37,2,1.65,2.25,2.39c0.25,0.73,0,41.84-0.25,46.43"/>
+	<path id="kvg:061cb-s8" kvg:type="㇒" d="M27.25,27.32C24.57,35.29,16.58,48.65,11,53.17"/>
+	<path id="kvg:061cb-s9" kvg:type="㇔/㇏" d="M29,33.25c3.03,1.94,6.27,5.82,8,9.21"/>
+  </g>
+  <g id="kvg:061cb-g8" kvg:element="木" kvg:position="right">
+	<path id="kvg:061cb-s10" kvg:type="㇐" d="M67.75,23.06c0.46,0.14,1.45,0.22,2.67,0.14c4.31-0.28,11.36-1.75,19.78-2.44c1.22-0.1,2.29-0.14,3.05,0"/>
+	<path id="kvg:061cb-s11" kvg:type="㇑" d="M77.75,10.5c1.25,0.37,2,1.65,2.25,2.39c0.25,0.73,0,42.28-0.25,46.86"/>
+	<path id="kvg:061cb-s12" kvg:type="㇒" d="M79.75,24.12c-2.8,9.45-11.51,22.6-18,27.45"/>
+	<path id="kvg:061cb-s13" kvg:type="㇏" d="M80.25,26.57c4.1,7.75,10.65,17.7,13.98,20.77c0.95,0.87,1.48,1.47,2.27,1.77"/>
+  </g>
+  <g id="kvg:061cb-g11" kvg:element="心" kvg:position="bottom" kvg:radical="general">
+	<path id="kvg:061cb-s14" kvg:type="㇔" d="M24.31,77.88c0.41,2.21-4.06,11.98-7.31,15.67"/>
+	<path id="kvg:061cb-s15" kvg:type="㇟b" d="M34,72.07c6.58,13.79,16.97,25.26,42.33,25.43c12.23,0.08,13.03-3.18,2.83-9.45"/>
+	<path id="kvg:061cb-s16" kvg:type="㇔a" d="M55.33,73.07c2.02,4.65,4.97,9.31,7.13,2.18"/>
+	<path id="kvg:061cb-s17" kvg:type="㇔" d="M81.3,70.55c4.63,2.07,8.09,3.96,11.85,10.36"/>
+  </g>
 </g>
 </g>
 <g id="kvg:StrokeNumbers_061cb" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 4.50 25.50)">1</text>
-	<text transform="matrix(1 0 0 1 17.50 12.50)">2</text>
-	<text transform="matrix(1 0 0 1 16.50 36.50)">3</text>
-	<text transform="matrix(1 0 0 1 31.50 33.50)">4</text>
-	<text transform="matrix(1 0 0 1 36.50 9.50)">5</text>
-	<text transform="matrix(1 0 0 1 39.50 22.50)">6</text>
-	<text transform="matrix(1 0 0 1 42.50 28.50)">7</text>
-	<text transform="matrix(1 0 0 1 56.50 38.50)">8</text>
-	<text transform="matrix(1 0 0 1 42.50 38.50)">9</text>
+	<text transform="matrix(1 0 0 1 36.50 9.50)">1</text>
+	<text transform="matrix(1 0 0 1 39.50 22.50)">2</text>
+	<text transform="matrix(1 0 0 1 42.50 28.50)">3</text>
+	<text transform="matrix(1 0 0 1 56.50 38.50)">4</text>
+	<text transform="matrix(1 0 0 1 42.50 38.50)">5</text>
+	<text transform="matrix(1 0 0 1 4.50 25.50)">6</text>
+	<text transform="matrix(1 0 0 1 17.50 12.50)">7</text>
+	<text transform="matrix(1 0 0 1 16.50 36.50)">8</text>
+	<text transform="matrix(1 0 0 1 31.50 33.50)">9</text>
 	<text transform="matrix(1 0 0 1 65.50 20.50)">10</text>
 	<text transform="matrix(1 0 0 1 68.00 10.50)">11</text>
 	<text transform="matrix(1 0 0 1 68.50 31.50)">12</text>