diff --git a/tests/reference/5_1_6/test_v5-schematic_(no_L).pdf b/tests/reference/5_1_6/test_v5-schematic_(no_L).pdf
index 79843505..f6e9746c 100644
Binary files a/tests/reference/5_1_6/test_v5-schematic_(no_L).pdf and b/tests/reference/5_1_6/test_v5-schematic_(no_L).pdf differ
diff --git a/tests/reference/5_1_6/test_v5-schematic_(no_L).svg b/tests/reference/5_1_6/test_v5-schematic_(no_L).svg
index ee0b0375..a6cf5898 100644
--- a/tests/reference/5_1_6/test_v5-schematic_(no_L).svg
+++ b/tests/reference/5_1_6/test_v5-schematic_(no_L).svg
@@ -7,7 +7,7 @@
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="1.1"
   width="29.700220cm" height="21.000720cm" viewBox="0 0 116930 82680">
-<title>SVG Picture created as test_v5.svg date 2020/09/06 17:55:29 </title>
+<title>SVG Picture created as test_v5.svg date 2021/04/22 17:14:03 </title>
   <desc>Picture generated by Eeschema-SVG </desc>
 <g style="fill:#000000; fill-opacity:1;stroke:#000000; stroke-opacity:1;
 stroke-linecap:round; stroke-linejoin:round;"
@@ -976,7 +976,7 @@ stroke:#840000; stroke-width:60; stroke-opacity:1;
 stroke-linecap:round; stroke-linejoin:round;">
 <text x="70080" y="77420"
 textLength="17930" font-size="780" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">KiCad E.D.A.  eeschema 5.1.6+dfsg1-1</text>
+text-anchor="start" opacity="0">KiCad E.D.A.  eeschema 5.1.9+dfsg1-1</text>
 <path d="M70250 77390
 L70250 76800
 " />
@@ -1257,28 +1257,28 @@ L82780 77360
 L82800 77340
 L82800 77390
 " />
-<path d="M83340 76800
-L83230 76800
-L83170 76830
-L83140 76860
-L83090 76940
-L83060 77050
-L83060 77280
-L83090 77340
-L83110 77360
-L83170 77390
-L83280 77390
-L83340 77360
-L83370 77340
-L83390 77280
+<path d="M83110 77390
+L83230 77390
+L83280 77360
+L83310 77340
+L83370 77250
 L83390 77140
-L83370 77080
-L83340 77050
-L83280 77030
-L83170 77030
-L83110 77050
-L83090 77080
-L83060 77140
+L83390 76910
+L83370 76860
+L83340 76830
+L83280 76800
+L83170 76800
+L83110 76830
+L83090 76860
+L83060 76910
+L83060 77050
+L83090 77110
+L83110 77140
+L83170 77170
+L83280 77170
+L83340 77140
+L83370 77110
+L83390 77050
 " />
 <path d="M83650 77170
 L84100 77170
@@ -5164,6 +5164,77 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g >
 </g>
 <g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M15500.4 32500 A250 250 0.0 0 0 15500.4 32000" />
+<path d="M15500.4 32000 A250 250 0.0 0 0 15500.4 31500" />
+<path d="M15500.4 31500 A250 250 0.0 0 0 15500.4 31000" />
+<path d="M15500.4 31000 A250 250 0.0 0 0 15500.4 30500" />
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15250,33000
+15750,30000
+" /> 
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15250,30000
+15750,33000
+" /> 
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M15500 30500
+L15500 30000
+" />
+<path d="M15500 32500
+L15500 33000
+" />
+</g>
+<g style="fill:#008484; fill-opacity:0.0; 
+stroke:#008484; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<text x="16550" y="31310"
+textLength="910" font-size="660" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">L1</text>
+<path d="M16460 31280
+L16220 31280
+L16220 30780
+" />
+<path d="M16890 31280
+L16600 31280
+" />
+<path d="M16750 31280
+L16750 30780
+L16700 30850
+L16650 30900
+L16600 30920
+" />
+<text x="16260" y="32220"
+textLength="460" font-size="660" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">L</text>
+<path d="M16410 32190
+L16170 32190
+L16170 31690
+" />
+</g>
+</g>
+<g style="fill:#008484; fill-opacity:0.0; 
+stroke:#008484; stroke-width:0; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g >
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:0; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:100; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 <rect x="12000" y="34100" width="2000" height="800" rx="0" />
@@ -5182,7 +5253,7 @@ L11500 34500
 stroke:#008484; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 <text x="13000" y="32700"
-textLength="1010" font-size="660" lengthAdjust="spacingAndGlyphs"
+textLength="1040" font-size="660" lengthAdjust="spacingAndGlyphs"
 text-anchor="middle" opacity="0">R1</text>
 <path d="M12910 32670
 L12750 32430
@@ -5238,77 +5309,6 @@ stroke:#840000; stroke-width:0; stroke-opacity:1;
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M15500.4 32500 A250 250 0.0 0 0 15500.4 32000" />
-<path d="M15500.4 32000 A250 250 0.0 0 0 15500.4 31500" />
-<path d="M15500.4 31500 A250 250 0.0 0 0 15500.4 31000" />
-<path d="M15500.4 31000 A250 250 0.0 0 0 15500.4 30500" />
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:300; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:300; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15250,33000
-15750,30000
-" /> 
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:300; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15250,30000
-15750,33000
-" /> 
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M15500 30500
-L15500 30000
-" />
-<path d="M15500 32500
-L15500 33000
-" />
-</g>
-<g style="fill:#008484; fill-opacity:0.0; 
-stroke:#008484; stroke-width:60; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="16500" y="31310"
-textLength="940" font-size="660" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">L1</text>
-<path d="M16410 31280
-L16170 31280
-L16170 30780
-" />
-<path d="M16840 31280
-L16550 31280
-" />
-<path d="M16700 31280
-L16700 30780
-L16650 30850
-L16600 30900
-L16550 30920
-" />
-<text x="16260" y="32220"
-textLength="460" font-size="660" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">L</text>
-<path d="M16410 32190
-L16170 32190
-L16170 31690
-" />
-</g>
-</g>
-<g style="fill:#008484; fill-opacity:0.0; 
-stroke:#008484; stroke-width:0; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<g >
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:0; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:200; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 <path style="fill:#840000; fill-opacity:0.0; 
@@ -5535,7 +5535,22 @@ L17990 37670
 </g>
 </g>
 <g style="fill:#008484; fill-opacity:0.0; 
-stroke:#008484; stroke-width:60; stroke-opacity:1; 
+stroke:#008484; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:430,430;">
+<path d="M14900 55000
+L9900 55000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
@@ -5585,6 +5600,179 @@ L30000 10000
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
+<path d="M35000 50000
+L35000 55000
+" />
+<path d="M35000 55000
+L30000 55000
+" />
+<path d="M30000 55000
+L30000 50000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#00FF00; fill-opacity:0.0; 
+stroke:#00FF00; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#00FF00; fill-opacity:0.0; 
+stroke:#00FF00; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:630,630,10,630;">
+<path d="M20100 57000
+L25100 57000
+" />
+</g>
+<g style="fill:#00FF00; fill-opacity:0.0; 
+stroke:#00FF00; stroke-width:300; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#00FF00; fill-opacity:0.0; 
+stroke:#00FF00; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:430,430;">
+<path d="M9900 50000
+L14900 50000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:430,430;">
+<path d="M14900 50000
+L14900 55000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:430,430;">
+<path d="M9900 55000
+L9900 50000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:150,150;">
+<path d="M20000 50000
+L25000 50000
+" />
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:150,150;">
+<path d="M25000 50000
+L25000 55000
+" />
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:150,150;">
+<path d="M25000 55000
+L20000 55000
+" />
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:150,150;">
+<path d="M20000 55000
+L20000 50000
+" />
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M30000 50000
+L35000 50000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:10,430;">
+<path d="M25100 57000
+L25100 62000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF00FF; fill-opacity:0.0; 
+stroke:#FF00FF; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M25100 62000
+L20100 62000
+" />
+</g>
+<g style="fill:#FF00FF; fill-opacity:0.0; 
+stroke:#FF00FF; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:430,430;">
+<path d="M20100 62000
+L20100 57000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:120; stroke-opacity:1; 
@@ -5593,15 +5781,15 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#000084; fill-opacity:0.0; 
 stroke:#000084; stroke-width:120; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
+<path d="M25000 10000
+L25000 15000
+" />
 <path d="M20000 15000
 L20000 10000
 " />
 <path d="M25000 15000
 L20000 15000
 " />
-<path d="M25000 10000
-L25000 15000
-" />
 <path d="M20000 10000
 L25000 10000
 " />
@@ -5613,9 +5801,6 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#008400; fill-opacity:0.0; 
 stroke:#008400; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<path d="M39000 36500
-L39000 40500
-" />
 <path d="M51000 36500
 L39000 36500
 " />
@@ -5625,6 +5810,9 @@ L51000 36500
 <path d="M50000 32500
 L51000 32500
 " />
+<path d="M39000 36500
+L39000 40500
+" />
 <path d="M39000 40500
 L40000 40500
 " />
@@ -5711,65 +5899,11 @@ L9000 16000
 L16000 16000
 " />
 </g>
-<g style="fill:#008400; fill-opacity:0.0; 
-stroke:#008400; stroke-width:100; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#848400; fill-opacity:0.0; 
-stroke:#848400; stroke-width:100; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90 22000 24640)">
-<text x="22000" y="24890"
-textLength="1540" font-size="660" lengthAdjust="spacingAndGlyphs"
-text-anchor="end" opacity="0">L3D</text>
-</g>
-<path d="M22220 25830
-L22220 26070
-L21720 26010
-" />
-<path d="M21720 25650
-L21720 25340
-L21910 25530
-L21910 25460
-L21940 25410
-L21960 25390
-L22010 25380
-L22130 25390
-L22170 25420
-L22200 25450
-L22220 25500
-L22220 25640
-L22200 25690
-L22170 25710
-" />
-<path d="M22220 25190
-L21720 25130
-L21720 25010
-L21750 24940
-L21790 24900
-L21840 24880
-L21940 24870
-L22010 24880
-L22100 24910
-L22150 24940
-L22200 24990
-L22220 25070
-L22220 25190
-" />
-<path style="fill:#848400; fill-opacity:0.0; 
-stroke:#848400; stroke-width:100; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 22250,24000
-22250,24500
-21750,24500
-21750,24000
-Z" /> 
-</g>
 <g style="fill:#848400; fill-opacity:0.0; 
 stroke:#848400; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 <text x="20900" y="23250"
-textLength="1440" font-size="660" lengthAdjust="spacingAndGlyphs"
+textLength="1370" font-size="660" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">L3A</text>
 <path d="M19910 23220
 L19670 23220
@@ -5918,6 +6052,52 @@ d="M 22500,23000
 23000,23000
 22750,23250
 Z" /> 
+<g transform="rotate(-90 22000 24640)">
+<text x="22000" y="24890"
+textLength="1620" font-size="660" lengthAdjust="spacingAndGlyphs"
+text-anchor="end" opacity="0">L3D</text>
+</g>
+<path d="M22220 25830
+L22220 26070
+L21720 26010
+" />
+<path d="M21720 25650
+L21720 25340
+L21910 25530
+L21910 25460
+L21940 25410
+L21960 25390
+L22010 25380
+L22130 25390
+L22170 25420
+L22200 25450
+L22220 25500
+L22220 25640
+L22200 25690
+L22170 25710
+" />
+<path d="M22220 25190
+L21720 25130
+L21720 25010
+L21750 24940
+L21790 24900
+L21840 24880
+L21940 24870
+L22010 24880
+L22100 24910
+L22150 24940
+L22200 24990
+L22220 25070
+L22220 25190
+" />
+<path style="fill:#848400; fill-opacity:0.0; 
+stroke:#848400; stroke-width:100; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 22250,24000
+22250,24500
+21750,24500
+21750,24000
+Z" /> 
 </g>
 <g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:100; stroke-opacity:1; 
@@ -5972,9 +6152,53 @@ Z" />
 <g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
+<text x="14690" y="23250"
+textLength="1410" font-size="660" lengthAdjust="spacingAndGlyphs"
+text-anchor="end" opacity="0">L2A</text>
+<path d="M13700 23220
+L13460 23220
+L13460 22720
+" />
+<path d="M13850 22770
+L13870 22750
+L13920 22720
+L14040 22720
+L14080 22750
+L14110 22770
+L14130 22820
+L14130 22860
+L14110 22940
+L13820 23220
+L14130 23220
+" />
+<path d="M14320 23080
+L14560 23080
+" />
+<path d="M14270 23220
+L14440 22720
+L14610 23220
+" />
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:100; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:100; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15000,23000
+14750,22560
+13210,22560
+13210,23000
+13210,23440
+14750,23440
+Z" /> 
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
 <g transform="rotate(-90 15500 21900)">
 <text x="15500" y="22150"
-textLength="1590" font-size="660" lengthAdjust="spacingAndGlyphs"
+textLength="1540" font-size="660" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">L2B</text>
 </g>
 <path d="M15720 21500
@@ -6076,56 +6300,12 @@ Z" />
 <g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="14690" y="23250"
-textLength="1410" font-size="660" lengthAdjust="spacingAndGlyphs"
-text-anchor="end" opacity="0">L2A</text>
-<path d="M13700 23220
-L13460 23220
-L13460 22720
-" />
-<path d="M13850 22770
-L13870 22750
-L13920 22720
-L14040 22720
-L14080 22750
-L14110 22770
-L14130 22820
-L14130 22860
-L14110 22940
-L13820 23220
-L14130 23220
-" />
-<path d="M14320 23080
-L14560 23080
-" />
-<path d="M14270 23220
-L14440 22720
-L14610 23220
-" />
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:100; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:100; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15000,23000
-14750,22560
-13210,22560
-13210,23000
-13210,23440
-14750,23440
-Z" /> 
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#000000; fill-opacity:0.0; 
 stroke:#000000; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 <text x="9000" y="25900"
-textLength="940" font-size="660" lengthAdjust="spacingAndGlyphs"
+textLength="980" font-size="660" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">L1</text>
 <path d="M9380 25870
 L9140 25870
@@ -6242,108 +6422,98 @@ L31830 24350
 L31850 24430
 L31850 24550
 " />
-<text x="36500" y="23380"
-textLength="4200" font-size="660" lengthAdjust="spacingAndGlyphs"
-text-anchor="end" opacity="0">Text box C</text>
-<path d="M32410 22850
-L32690 22850
-" />
-<path d="M32550 23350
-L32550 22850
-" />
-<path d="M33050 23330
-L33000 23350
-L32910 23350
-L32860 23330
-L32830 23280
-L32830 23090
-L32860 23040
-L32910 23020
-L33000 23020
-L33050 23040
-L33070 23090
-L33070 23140
-L32830 23180
-" />
-<path d="M33240 23350
-L33500 23020
-" />
-<path d="M33240 23020
-L33500 23350
-" />
-<path d="M33620 23020
-L33810 23020
-" />
-<path d="M33690 22850
-L33690 23280
-L33720 23330
-L33760 23350
-L33810 23350
-" />
-<path d="M34360 23350
-L34360 22850
-" />
-<path d="M34360 23040
-L34410 23020
-L34500 23020
-L34550 23040
-L34570 23070
-L34600 23110
-L34600 23260
-L34570 23300
-L34550 23330
-L34500 23350
-L34410 23350
-L34360 23330
-" />
-<path d="M34880 23350
-L34830 23330
-L34810 23300
-L34790 23260
-L34790 23110
-L34810 23070
-L34830 23040
-L34880 23020
-L34950 23020
-L35000 23040
-L35030 23070
-L35050 23110
-L35050 23260
-L35030 23300
-L35000 23330
-L34950 23350
-L34880 23350
-" />
-<path d="M35220 23350
-L35480 23020
-" />
-<path d="M35220 23020
-L35480 23350
-" />
-<path d="M36330 23300
-L36310 23330
-L36240 23350
-L36190 23350
-L36120 23330
-L36070 23280
-L36050 23230
-L36030 23140
-L36030 23070
-L36050 22970
-L36070 22920
-L36120 22880
-L36190 22850
-L36240 22850
-L36310 22880
-L36330 22900
-" />
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:60; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
+<text x="26500" y="23400"
+textLength="4130" font-size="660" lengthAdjust="spacingAndGlyphs"
+text-anchor="start" opacity="0">Text box A</text>
+<path d="M26570 22870
+L26860 22870
+" />
+<path d="M26720 23370
+L26720 22870
+" />
+<path d="M27220 23350
+L27170 23370
+L27070 23370
+L27030 23350
+L27000 23300
+L27000 23110
+L27030 23060
+L27070 23040
+L27170 23040
+L27220 23060
+L27240 23110
+L27240 23160
+L27000 23200
+" />
+<path d="M27410 23370
+L27670 23040
+" />
+<path d="M27410 23040
+L27670 23370
+" />
+<path d="M27790 23040
+L27980 23040
+" />
+<path d="M27860 22870
+L27860 23300
+L27880 23350
+L27930 23370
+L27980 23370
+" />
+<path d="M28530 23370
+L28530 22870
+" />
+<path d="M28530 23060
+L28570 23040
+L28670 23040
+L28720 23060
+L28740 23090
+L28760 23130
+L28760 23280
+L28740 23320
+L28720 23350
+L28670 23370
+L28570 23370
+L28530 23350
+" />
+<path d="M29050 23370
+L29000 23350
+L28980 23320
+L28950 23280
+L28950 23130
+L28980 23090
+L29000 23060
+L29050 23040
+L29120 23040
+L29170 23060
+L29190 23090
+L29220 23130
+L29220 23280
+L29190 23320
+L29170 23350
+L29120 23370
+L29050 23370
+" />
+<path d="M29380 23370
+L29640 23040
+" />
+<path d="M29380 23040
+L29640 23370
+" />
+<path d="M30190 23230
+L30430 23230
+" />
+<path d="M30140 23370
+L30310 22870
+L30480 23370
+" />
 <g transform="rotate(-90 31900 22500)">
 <text x="31900" y="22500"
-textLength="4310" font-size="660" lengthAdjust="spacingAndGlyphs"
+textLength="4230" font-size="660" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">Text box B</text>
 </g>
 <path d="M31370 22350
@@ -6441,90 +6611,104 @@ L31590 18520
 L31610 18570
 L31610 18740
 " />
-<text x="26500" y="23400"
-textLength="4060" font-size="660" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">Text box A</text>
-<path d="M26570 22870
-L26860 22870
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:100; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<text x="36500" y="23380"
+textLength="4130" font-size="660" lengthAdjust="spacingAndGlyphs"
+text-anchor="end" opacity="0">Text box C</text>
+<path d="M32410 22850
+L32690 22850
 " />
-<path d="M26720 23370
-L26720 22870
+<path d="M32550 23350
+L32550 22850
 " />
-<path d="M27220 23350
-L27170 23370
-L27070 23370
-L27030 23350
-L27000 23300
-L27000 23110
-L27030 23060
-L27070 23040
-L27170 23040
-L27220 23060
-L27240 23110
-L27240 23160
-L27000 23200
+<path d="M33050 23330
+L33000 23350
+L32910 23350
+L32860 23330
+L32830 23280
+L32830 23090
+L32860 23040
+L32910 23020
+L33000 23020
+L33050 23040
+L33070 23090
+L33070 23140
+L32830 23180
 " />
-<path d="M27410 23370
-L27670 23040
+<path d="M33240 23350
+L33500 23020
 " />
-<path d="M27410 23040
-L27670 23370
+<path d="M33240 23020
+L33500 23350
 " />
-<path d="M27790 23040
-L27980 23040
+<path d="M33620 23020
+L33810 23020
 " />
-<path d="M27860 22870
-L27860 23300
-L27880 23350
-L27930 23370
-L27980 23370
+<path d="M33690 22850
+L33690 23280
+L33720 23330
+L33760 23350
+L33810 23350
 " />
-<path d="M28530 23370
-L28530 22870
+<path d="M34360 23350
+L34360 22850
 " />
-<path d="M28530 23060
-L28570 23040
-L28670 23040
-L28720 23060
-L28740 23090
-L28760 23130
-L28760 23280
-L28740 23320
-L28720 23350
-L28670 23370
-L28570 23370
-L28530 23350
+<path d="M34360 23040
+L34410 23020
+L34500 23020
+L34550 23040
+L34570 23070
+L34600 23110
+L34600 23260
+L34570 23300
+L34550 23330
+L34500 23350
+L34410 23350
+L34360 23330
 " />
-<path d="M29050 23370
-L29000 23350
-L28980 23320
-L28950 23280
-L28950 23130
-L28980 23090
-L29000 23060
-L29050 23040
-L29120 23040
-L29170 23060
-L29190 23090
-L29220 23130
-L29220 23280
-L29190 23320
-L29170 23350
-L29120 23370
-L29050 23370
+<path d="M34880 23350
+L34830 23330
+L34810 23300
+L34790 23260
+L34790 23110
+L34810 23070
+L34830 23040
+L34880 23020
+L34950 23020
+L35000 23040
+L35030 23070
+L35050 23110
+L35050 23260
+L35030 23300
+L35000 23330
+L34950 23350
+L34880 23350
 " />
-<path d="M29380 23370
-L29640 23040
+<path d="M35220 23350
+L35480 23020
 " />
-<path d="M29380 23040
-L29640 23370
+<path d="M35220 23020
+L35480 23350
 " />
-<path d="M30190 23230
-L30430 23230
-" />
-<path d="M30140 23370
-L30310 22870
-L30480 23370
+<path d="M36330 23300
+L36310 23330
+L36240 23350
+L36190 23350
+L36120 23330
+L36070 23280
+L36050 23230
+L36030 23140
+L36030 23070
+L36050 22970
+L36070 22920
+L36120 22880
+L36190 22850
+L36240 22850
+L36310 22880
+L36330 22900
 " />
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0;