diff --git a/tests/board_samples/kicad_6/deeper.kicad_sch b/tests/board_samples/kicad_6/deeper.kicad_sch
index aa5c1bbf..ba7d5667 100644
--- a/tests/board_samples/kicad_6/deeper.kicad_sch
+++ b/tests/board_samples/kicad_6/deeper.kicad_sch
@@ -2,18 +2,7 @@
 
   (uuid 3b838d52-596d-4e4d-a6ac-e4c8e7621137)
 
-  (paper "A4")
-
-  (title_block
-    (title "")
-    (date "")
-    (rev "")
-    (company "")
-    (comment 1 "")
-    (comment 2 "")
-    (comment 3 "")
-    (comment 4 "")
-  )
+  (paper "A4" portrait)
 
   (lib_symbols
     (symbol "Device:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
@@ -58,7 +47,7 @@
   )
 
 
-  (symbol (lib_id "Device:R") (at 139.7 80.01 0)
+  (symbol (lib_id "Device:R") (at 139.7 80.01 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f3bbcff)
     (property "Reference" "R3" (id 0) (at 141.478 78.8416 0)
diff --git a/tests/board_samples/kicad_6/sub-sheet.kicad_sch b/tests/board_samples/kicad_6/sub-sheet.kicad_sch
index b725f0bc..3314a4de 100644
--- a/tests/board_samples/kicad_6/sub-sheet.kicad_sch
+++ b/tests/board_samples/kicad_6/sub-sheet.kicad_sch
@@ -2,18 +2,7 @@
 
   (uuid 5b2b5c7d-f943-4634-9f0a-e9561705c49d)
 
-  (paper "A4")
-
-  (title_block
-    (title "")
-    (date "")
-    (rev "")
-    (company "")
-    (comment 1 "")
-    (comment 2 "")
-    (comment 3 "")
-    (comment 4 "")
-  )
+  (paper "User" 297.002 210.007)
 
   (lib_symbols
     (symbol "74xx:74LS04" (in_bom yes) (on_board yes)
@@ -311,7 +300,7 @@
     (uuid 77ed3941-d133-4aef-a9af-5a39322d14eb)
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 96.52 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 96.52 63.5 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34307a)
     (property "Reference" "U1" (id 0) (at 96.52 55.4482 0))
@@ -324,9 +313,21 @@
     )
     (pin "1" (uuid f1e9ac99-f8d4-4d05-beb3-290dccb8d277))
     (pin "2" (uuid 014c98b2-ac35-4831-825d-74c6fa5ddc67))
+    (pin "3" (uuid 2282aa17-25e5-4b18-b436-0d5d8b80c271))
+    (pin "4" (uuid 779d408a-048e-4117-b37b-52b0f8855fe0))
+    (pin "5" (uuid 0209c2aa-e6bb-4fb6-ad76-6e4b9b1b16f7))
+    (pin "6" (uuid 867bfffe-ae91-4651-94e5-196c3c600344))
+    (pin "8" (uuid 46124aee-812d-4b49-8b07-54040860b90b))
+    (pin "9" (uuid bfb61142-9bc3-4e95-89e6-4ced14b533f1))
+    (pin "10" (uuid c37c1333-9b31-4605-8469-7903812fede5))
+    (pin "11" (uuid f638fbb1-32ba-4d92-b985-ace474e20207))
+    (pin "12" (uuid 0105483f-ed6d-4621-a345-4f843c0072bf))
+    (pin "13" (uuid 052e0faa-99fa-4dba-8771-a6a810a9615f))
+    (pin "14" (uuid cad197d5-2063-47e9-a3da-c0da8b26e6ec))
+    (pin "7" (uuid a5eca4b9-9690-4686-9caf-8a9265e35104))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 114.3 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 114.3 63.5 0) (unit 2)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f344a0e)
     (property "Reference" "U1" (id 0) (at 114.3 55.4482 0))
@@ -337,11 +338,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 114.3 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 7eb5089c-0f47-4b87-beab-8ff80b20792f))
+    (pin "2" (uuid 60102715-3c93-4a15-8674-20c8b7c57be4))
     (pin "3" (uuid c1630947-26ec-4031-96dd-f1cdf939d3a7))
     (pin "4" (uuid e2858b6c-d9d5-4bfd-a26d-d7110c9ff81c))
+    (pin "5" (uuid 8e8bdbab-9511-4475-9eff-1510f6b5ad23))
+    (pin "6" (uuid 6ae8ec3f-43b9-4112-bfd5-128204c7759e))
+    (pin "8" (uuid cf6c2bfe-fd20-4797-a562-aefcd563a7af))
+    (pin "9" (uuid 99a6c8b8-68c2-479d-ad69-5f387013f1da))
+    (pin "10" (uuid 349db570-c21f-46f9-80d4-b68f3473ae15))
+    (pin "11" (uuid 76d634a3-0256-4a17-8718-470b7e39e4ac))
+    (pin "12" (uuid 72b533b9-dc1e-46c5-a29d-c8b49a52ce5d))
+    (pin "13" (uuid 132268c6-c19f-48f6-8da5-42a0ba313cd0))
+    (pin "14" (uuid 5cd18a01-4203-4bf0-961c-09af1ded6848))
+    (pin "7" (uuid 612772b8-33ef-4e45-abaa-4fba74ec3e0b))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 132.08 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 132.08 63.5 0) (unit 3)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f345e39)
     (property "Reference" "U1" (id 0) (at 132.08 55.4482 0))
@@ -352,11 +365,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 132.08 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid bbac1062-acc9-427d-9486-84613968193d))
+    (pin "2" (uuid aa6fbc5d-962a-421b-b0f8-5cc0634fa940))
+    (pin "3" (uuid ee86faf1-b781-415c-a773-7ffd42b4ccac))
+    (pin "4" (uuid f60b38a1-6bcf-4425-85f9-40dd840f097e))
     (pin "5" (uuid 9a609661-5895-4db4-a600-14bffdacc16e))
     (pin "6" (uuid f6c777f1-b4a6-4529-9b29-67dfedcb1744))
+    (pin "8" (uuid d6ee852a-2125-4cbb-b4c0-2c1f7b3da0fd))
+    (pin "9" (uuid 66b18884-be07-4547-81e4-598e8796b478))
+    (pin "10" (uuid 23b24c2d-06bc-4f64-bbba-4a1836993bd3))
+    (pin "11" (uuid ab204973-c25f-4438-a480-b6256c3846e5))
+    (pin "12" (uuid b7d46009-86c1-4915-8882-efed73321a1b))
+    (pin "13" (uuid ae6c4a1d-7821-456a-9178-e99999733573))
+    (pin "14" (uuid bb4b6efa-8944-40e5-8681-42c8086dfb79))
+    (pin "7" (uuid 7b67e898-9526-4fba-8f77-59962db970c7))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 149.86 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 149.86 63.5 0) (unit 4)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f346e8b)
     (property "Reference" "U1" (id 0) (at 149.86 55.4482 0))
@@ -367,11 +392,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 149.86 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 2905dd4f-e9df-4c8d-9d14-37e5474058d3))
+    (pin "2" (uuid 909aa50b-4012-4e97-bcca-8dbd688e9e99))
+    (pin "3" (uuid 8520760e-f968-483e-8989-07d96ff7c0bd))
+    (pin "4" (uuid 472927d7-713d-4434-aae2-cab12a79506c))
+    (pin "5" (uuid 5c2e0337-2447-4117-8a69-8ab7a6736b16))
+    (pin "6" (uuid 44dcea25-62da-41dc-8e4e-72c45198747e))
     (pin "8" (uuid 47d49bdd-bacb-468f-bcfb-647fd9ccff38))
     (pin "9" (uuid 71c84a4a-5d81-46df-a82f-84ff433708b7))
+    (pin "10" (uuid ccbabbc8-3805-4494-9f79-0e7c58491280))
+    (pin "11" (uuid 5f478e4e-1c37-417f-802a-dcd64da6ec69))
+    (pin "12" (uuid f4169419-5cd3-4db1-860a-b37e557bc728))
+    (pin "13" (uuid 0eb475d7-7c32-41bc-a947-f6e04adbfa7d))
+    (pin "14" (uuid c3d6c577-12ce-4f2f-84bd-dda13a8fe40f))
+    (pin "7" (uuid 2843c226-58ef-4dc8-ad8f-3fcb74143c53))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 167.64 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 167.64 63.5 0) (unit 5)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f348270)
     (property "Reference" "U1" (id 0) (at 167.64 55.4482 0))
@@ -382,11 +419,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 167.64 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 50c06431-98b4-4782-9bc2-1f48dd66012e))
+    (pin "2" (uuid 237913c0-554e-4f92-9454-74fca47a4ff0))
+    (pin "3" (uuid 22591fce-1b7c-432b-9f65-ca786ad38164))
+    (pin "4" (uuid cf7394f4-fb02-417b-8fcd-f7a746f2f953))
+    (pin "5" (uuid 1c6ed6bd-b27d-4107-a50a-c5fa1ca815a8))
+    (pin "6" (uuid c9913a2d-9fdc-477b-99fb-40ae623b387f))
+    (pin "8" (uuid 1dd5c978-2ace-45f7-9c90-88b9fc1a4ffc))
+    (pin "9" (uuid 9a40e5da-1346-4d0c-af28-5a2601f44304))
     (pin "10" (uuid 01fec0dc-78cf-4a7d-851f-e24a9edd4a86))
     (pin "11" (uuid 92e30d01-6115-49a3-bead-4b8b74d533c9))
+    (pin "12" (uuid 7092ba6d-f06a-417d-9814-317dd365bfc4))
+    (pin "13" (uuid bce2b649-7e95-435b-ad4a-9467fe595946))
+    (pin "14" (uuid cee262bb-8369-447b-8bc6-8fc7e99304ba))
+    (pin "7" (uuid d69f10fe-7d7e-437f-89c6-5d4591a60c24))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 185.42 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 185.42 63.5 0) (unit 6)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f348d95)
     (property "Reference" "U1" (id 0) (at 185.42 55.4482 0))
@@ -397,11 +446,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 185.42 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid c1de8072-85af-41fb-bbae-891234fe6286))
+    (pin "2" (uuid 92eba779-7a6c-4f2f-bf8a-9d01b4559540))
+    (pin "3" (uuid 87aa64d0-4063-42a0-8b26-e6afc8ae74de))
+    (pin "4" (uuid 57d78745-19ee-4265-be9f-6570894e3e61))
+    (pin "5" (uuid 924bfea8-9b40-4840-882f-6d467382007a))
+    (pin "6" (uuid 6353b9ee-662c-49d5-8069-f7d044044c97))
+    (pin "8" (uuid 9711c471-9fef-4c47-a8bb-dbb7861fc7f5))
+    (pin "9" (uuid 4875c4e7-8ec2-47f1-a20e-42413b9c1e4a))
+    (pin "10" (uuid 0d8c1296-05ab-46c9-b16d-99728b6eacd6))
+    (pin "11" (uuid 41727653-a496-48b3-ac11-0e25bdbe5198))
     (pin "12" (uuid b9a8ff4c-342a-4f44-bfb4-1b1895e9679b))
     (pin "13" (uuid 29941c34-ddd5-4a9c-bdef-5bf81398f604))
+    (pin "14" (uuid c589a3b6-28de-47c0-87df-1950ce799f45))
+    (pin "7" (uuid f0358a25-a450-4144-94fb-900372ab12a7))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 139.7 88.9 0)
+  (symbol (lib_id "74xx:74LS04") (at 139.7 88.9 0) (unit 7)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34a12f)
     (property "Reference" "U1" (id 0) (at 145.542 87.7316 0)
@@ -416,11 +477,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 139.7 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 6202c74f-4d05-4660-b905-0e5ca6889128))
+    (pin "2" (uuid 011a7ac5-7a54-4c9a-97b1-3c71ef0bed96))
+    (pin "3" (uuid 98b08e85-9973-4c19-9269-2dcea15b1681))
+    (pin "4" (uuid f023d9a1-53db-47ae-bc98-ce0c0852432d))
+    (pin "5" (uuid a1064e68-0e5f-40e9-9c19-682469444ee6))
+    (pin "6" (uuid 819e8bc3-d0a5-4ab9-ad3b-83fcfff57d5f))
+    (pin "8" (uuid ff2b7b52-4097-4d64-8511-d7ac105c5a57))
+    (pin "9" (uuid f85ce822-c4cd-4bc6-8c31-cfad683d10ae))
+    (pin "10" (uuid a4bb7bae-f982-4b25-a9eb-bc556b618638))
+    (pin "11" (uuid 84529ab6-9a65-4c87-b095-7a53fb755e2c))
+    (pin "12" (uuid 3d1ca20e-431d-45c0-9443-c5f597b34af3))
+    (pin "13" (uuid 2bd0a9eb-83dd-424f-92d0-bd4297676cbf))
     (pin "14" (uuid bf0862f0-7b4d-4da4-a5e8-91a9bdbee56f))
     (pin "7" (uuid 0639e567-d45a-4c84-98fa-a167b211ae20))
   )
 
-  (symbol (lib_id "power:VCC") (at 139.7 76.2 0)
+  (symbol (lib_id "power:VCC") (at 139.7 76.2 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34bc05)
     (property "Reference" "#PWR01" (id 0) (at 139.7 80.01 0)
@@ -436,7 +509,7 @@
     (pin "1" (uuid 0030af45-9cbd-4108-9b0f-2e3885996ada))
   )
 
-  (symbol (lib_id "power:GND") (at 139.7 101.6 0)
+  (symbol (lib_id "power:GND") (at 139.7 101.6 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34c535)
     (property "Reference" "#PWR02" (id 0) (at 139.7 107.95 0)
diff --git a/tests/board_samples/kicad_6/test_v5.kicad_sch b/tests/board_samples/kicad_6/test_v5.kicad_sch
index ebf7a97a..0babc855 100644
--- a/tests/board_samples/kicad_6/test_v5.kicad_sch
+++ b/tests/board_samples/kicad_6/test_v5.kicad_sch
@@ -120,10 +120,10 @@
     )
     (symbol "Device:R_US" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "R" (id 0) (at 2.54 0 90)
-        (effects (font (size 1.27 1.27)))
+        (effects (font (size 1.27 1.27)) (justify right))
       )
       (property "Value" "R_US" (id 1) (at -2.54 0 90)
-        (effects (font (size 1.27 1.27)))
+        (effects (font (size 1.27 1.27)) (justify right))
       )
       (property "Footprint" "" (id 2) (at 1.016 -0.254 90)
         (effects (font (size 1.27 1.27)) hide)
@@ -140,7 +140,11 @@
       (property "ki_fp_filters" "R_*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "R_US_0_1"
+      (symbol "R_US_0_0"
+        (bezier (pts  (xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905))
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
         (polyline
           (pts
             (xy 0 -2.286)
@@ -157,17 +161,6 @@
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 0 -0.762)
-            (xy 1.016 -1.143)
-            (xy 0 -1.524)
-            (xy -1.016 -1.905)
-            (xy 0 -2.286)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
         (polyline
           (pts
             (xy 0 0.762)
@@ -195,6 +188,18 @@
         (pin passive line (at 0 3.81 270) (length 1.27)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
+          (alternate "Patita 1" passive line)
+        )
+        (pin passive line (at 0 -3.81 90) (length 1.27)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "R_US_1_2"
+        (pin passive line (at 0 3.81 270) (length 1.27)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+          (alternate "Patita 1" passive line)
         )
         (pin passive line (at 0 -3.81 90) (length 1.27)
           (name "~" (effects (font (size 1.27 1.27))))
@@ -1726,8 +1731,8 @@
     (pin "2" (uuid 15129e2c-3876-4c0d-83a8-7e8db04bdace))
   )
 
-  (symbol (lib_id "Device:R_US") (at 39.37 95.25 180) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R_US") (at 39.37 95.25 180) (unit 1) (convert 2)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005f3409f7)
     (property "Reference" "R2" (id 0) (at 41.0972 94.0816 0)
       (effects (font (size 1.27 1.27)) (justify right))
diff --git a/tests/reference/6_0_4/deeper.kicad_sch b/tests/reference/6_0_4/deeper.kicad_sch
index d410cf80..2b0864f2 100644
--- a/tests/reference/6_0_4/deeper.kicad_sch
+++ b/tests/reference/6_0_4/deeper.kicad_sch
@@ -2,10 +2,7 @@
 
   (uuid 3b838d52-596d-4e4d-a6ac-e4c8e7621137)
 
-  (paper "A4")
-
-  (title_block
-  )
+  (paper "A4" portrait)
 
   (lib_symbols
     (symbol "Device:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
@@ -49,7 +46,7 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 139.7 80.01 0)
+  (symbol (lib_id "Device:R") (at 139.7 80.01 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f3bbcff)
     (property "Reference" "R3" (id 0) (at 141.478 78.8416 0)
diff --git a/tests/reference/6_0_4/sub-sheet.kicad_sch b/tests/reference/6_0_4/sub-sheet.kicad_sch
index 70d99f89..eda41639 100644
--- a/tests/reference/6_0_4/sub-sheet.kicad_sch
+++ b/tests/reference/6_0_4/sub-sheet.kicad_sch
@@ -2,10 +2,7 @@
 
   (uuid 5b2b5c7d-f943-4634-9f0a-e9561705c49d)
 
-  (paper "A4")
-
-  (title_block
-  )
+  (paper "User" 297.002 210.007)
 
   (lib_symbols
     (symbol "74xx:74LS04" (in_bom yes) (on_board yes)
@@ -302,7 +299,7 @@
     (uuid 77ed3941-d133-4aef-a9af-5a39322d14eb)
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 96.52 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 96.52 63.5 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34307a)
     (property "Reference" "U1" (id 0) (at 96.52 55.4482 0))
@@ -315,9 +312,21 @@
     )
     (pin "1" (uuid f1e9ac99-f8d4-4d05-beb3-290dccb8d277))
     (pin "2" (uuid 014c98b2-ac35-4831-825d-74c6fa5ddc67))
+    (pin "3" (uuid 2282aa17-25e5-4b18-b436-0d5d8b80c271))
+    (pin "4" (uuid 779d408a-048e-4117-b37b-52b0f8855fe0))
+    (pin "5" (uuid 0209c2aa-e6bb-4fb6-ad76-6e4b9b1b16f7))
+    (pin "6" (uuid 867bfffe-ae91-4651-94e5-196c3c600344))
+    (pin "8" (uuid 46124aee-812d-4b49-8b07-54040860b90b))
+    (pin "9" (uuid bfb61142-9bc3-4e95-89e6-4ced14b533f1))
+    (pin "10" (uuid c37c1333-9b31-4605-8469-7903812fede5))
+    (pin "11" (uuid f638fbb1-32ba-4d92-b985-ace474e20207))
+    (pin "12" (uuid 0105483f-ed6d-4621-a345-4f843c0072bf))
+    (pin "13" (uuid 052e0faa-99fa-4dba-8771-a6a810a9615f))
+    (pin "14" (uuid cad197d5-2063-47e9-a3da-c0da8b26e6ec))
+    (pin "7" (uuid a5eca4b9-9690-4686-9caf-8a9265e35104))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 114.3 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 114.3 63.5 0) (unit 2)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f344a0e)
     (property "Reference" "U1" (id 0) (at 114.3 55.4482 0))
@@ -328,11 +337,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 114.3 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 7eb5089c-0f47-4b87-beab-8ff80b20792f))
+    (pin "2" (uuid 60102715-3c93-4a15-8674-20c8b7c57be4))
     (pin "3" (uuid c1630947-26ec-4031-96dd-f1cdf939d3a7))
     (pin "4" (uuid e2858b6c-d9d5-4bfd-a26d-d7110c9ff81c))
+    (pin "5" (uuid 8e8bdbab-9511-4475-9eff-1510f6b5ad23))
+    (pin "6" (uuid 6ae8ec3f-43b9-4112-bfd5-128204c7759e))
+    (pin "8" (uuid cf6c2bfe-fd20-4797-a562-aefcd563a7af))
+    (pin "9" (uuid 99a6c8b8-68c2-479d-ad69-5f387013f1da))
+    (pin "10" (uuid 349db570-c21f-46f9-80d4-b68f3473ae15))
+    (pin "11" (uuid 76d634a3-0256-4a17-8718-470b7e39e4ac))
+    (pin "12" (uuid 72b533b9-dc1e-46c5-a29d-c8b49a52ce5d))
+    (pin "13" (uuid 132268c6-c19f-48f6-8da5-42a0ba313cd0))
+    (pin "14" (uuid 5cd18a01-4203-4bf0-961c-09af1ded6848))
+    (pin "7" (uuid 612772b8-33ef-4e45-abaa-4fba74ec3e0b))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 132.08 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 132.08 63.5 0) (unit 3)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f345e39)
     (property "Reference" "U1" (id 0) (at 132.08 55.4482 0))
@@ -343,11 +364,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 132.08 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid bbac1062-acc9-427d-9486-84613968193d))
+    (pin "2" (uuid aa6fbc5d-962a-421b-b0f8-5cc0634fa940))
+    (pin "3" (uuid ee86faf1-b781-415c-a773-7ffd42b4ccac))
+    (pin "4" (uuid f60b38a1-6bcf-4425-85f9-40dd840f097e))
     (pin "5" (uuid 9a609661-5895-4db4-a600-14bffdacc16e))
     (pin "6" (uuid f6c777f1-b4a6-4529-9b29-67dfedcb1744))
+    (pin "8" (uuid d6ee852a-2125-4cbb-b4c0-2c1f7b3da0fd))
+    (pin "9" (uuid 66b18884-be07-4547-81e4-598e8796b478))
+    (pin "10" (uuid 23b24c2d-06bc-4f64-bbba-4a1836993bd3))
+    (pin "11" (uuid ab204973-c25f-4438-a480-b6256c3846e5))
+    (pin "12" (uuid b7d46009-86c1-4915-8882-efed73321a1b))
+    (pin "13" (uuid ae6c4a1d-7821-456a-9178-e99999733573))
+    (pin "14" (uuid bb4b6efa-8944-40e5-8681-42c8086dfb79))
+    (pin "7" (uuid 7b67e898-9526-4fba-8f77-59962db970c7))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 149.86 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 149.86 63.5 0) (unit 4)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f346e8b)
     (property "Reference" "U1" (id 0) (at 149.86 55.4482 0))
@@ -358,11 +391,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 149.86 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 2905dd4f-e9df-4c8d-9d14-37e5474058d3))
+    (pin "2" (uuid 909aa50b-4012-4e97-bcca-8dbd688e9e99))
+    (pin "3" (uuid 8520760e-f968-483e-8989-07d96ff7c0bd))
+    (pin "4" (uuid 472927d7-713d-4434-aae2-cab12a79506c))
+    (pin "5" (uuid 5c2e0337-2447-4117-8a69-8ab7a6736b16))
+    (pin "6" (uuid 44dcea25-62da-41dc-8e4e-72c45198747e))
     (pin "8" (uuid 47d49bdd-bacb-468f-bcfb-647fd9ccff38))
     (pin "9" (uuid 71c84a4a-5d81-46df-a82f-84ff433708b7))
+    (pin "10" (uuid ccbabbc8-3805-4494-9f79-0e7c58491280))
+    (pin "11" (uuid 5f478e4e-1c37-417f-802a-dcd64da6ec69))
+    (pin "12" (uuid f4169419-5cd3-4db1-860a-b37e557bc728))
+    (pin "13" (uuid 0eb475d7-7c32-41bc-a947-f6e04adbfa7d))
+    (pin "14" (uuid c3d6c577-12ce-4f2f-84bd-dda13a8fe40f))
+    (pin "7" (uuid 2843c226-58ef-4dc8-ad8f-3fcb74143c53))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 167.64 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 167.64 63.5 0) (unit 5)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f348270)
     (property "Reference" "U1" (id 0) (at 167.64 55.4482 0))
@@ -373,11 +418,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 167.64 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 50c06431-98b4-4782-9bc2-1f48dd66012e))
+    (pin "2" (uuid 237913c0-554e-4f92-9454-74fca47a4ff0))
+    (pin "3" (uuid 22591fce-1b7c-432b-9f65-ca786ad38164))
+    (pin "4" (uuid cf7394f4-fb02-417b-8fcd-f7a746f2f953))
+    (pin "5" (uuid 1c6ed6bd-b27d-4107-a50a-c5fa1ca815a8))
+    (pin "6" (uuid c9913a2d-9fdc-477b-99fb-40ae623b387f))
+    (pin "8" (uuid 1dd5c978-2ace-45f7-9c90-88b9fc1a4ffc))
+    (pin "9" (uuid 9a40e5da-1346-4d0c-af28-5a2601f44304))
     (pin "10" (uuid 01fec0dc-78cf-4a7d-851f-e24a9edd4a86))
     (pin "11" (uuid 92e30d01-6115-49a3-bead-4b8b74d533c9))
+    (pin "12" (uuid 7092ba6d-f06a-417d-9814-317dd365bfc4))
+    (pin "13" (uuid bce2b649-7e95-435b-ad4a-9467fe595946))
+    (pin "14" (uuid cee262bb-8369-447b-8bc6-8fc7e99304ba))
+    (pin "7" (uuid d69f10fe-7d7e-437f-89c6-5d4591a60c24))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 185.42 63.5 0)
+  (symbol (lib_id "74xx:74LS04") (at 185.42 63.5 0) (unit 6)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f348d95)
     (property "Reference" "U1" (id 0) (at 185.42 55.4482 0))
@@ -388,11 +445,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 185.42 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid c1de8072-85af-41fb-bbae-891234fe6286))
+    (pin "2" (uuid 92eba779-7a6c-4f2f-bf8a-9d01b4559540))
+    (pin "3" (uuid 87aa64d0-4063-42a0-8b26-e6afc8ae74de))
+    (pin "4" (uuid 57d78745-19ee-4265-be9f-6570894e3e61))
+    (pin "5" (uuid 924bfea8-9b40-4840-882f-6d467382007a))
+    (pin "6" (uuid 6353b9ee-662c-49d5-8069-f7d044044c97))
+    (pin "8" (uuid 9711c471-9fef-4c47-a8bb-dbb7861fc7f5))
+    (pin "9" (uuid 4875c4e7-8ec2-47f1-a20e-42413b9c1e4a))
+    (pin "10" (uuid 0d8c1296-05ab-46c9-b16d-99728b6eacd6))
+    (pin "11" (uuid 41727653-a496-48b3-ac11-0e25bdbe5198))
     (pin "12" (uuid b9a8ff4c-342a-4f44-bfb4-1b1895e9679b))
     (pin "13" (uuid 29941c34-ddd5-4a9c-bdef-5bf81398f604))
+    (pin "14" (uuid c589a3b6-28de-47c0-87df-1950ce799f45))
+    (pin "7" (uuid f0358a25-a450-4144-94fb-900372ab12a7))
   )
 
-  (symbol (lib_id "74xx:74LS04") (at 139.7 88.9 0)
+  (symbol (lib_id "74xx:74LS04") (at 139.7 88.9 0) (unit 7)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34a12f)
     (property "Reference" "U1" (id 0) (at 145.542 87.7316 0)
@@ -407,11 +476,23 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS04" (id 3) (at 139.7 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 6202c74f-4d05-4660-b905-0e5ca6889128))
+    (pin "2" (uuid 011a7ac5-7a54-4c9a-97b1-3c71ef0bed96))
+    (pin "3" (uuid 98b08e85-9973-4c19-9269-2dcea15b1681))
+    (pin "4" (uuid f023d9a1-53db-47ae-bc98-ce0c0852432d))
+    (pin "5" (uuid a1064e68-0e5f-40e9-9c19-682469444ee6))
+    (pin "6" (uuid 819e8bc3-d0a5-4ab9-ad3b-83fcfff57d5f))
+    (pin "8" (uuid ff2b7b52-4097-4d64-8511-d7ac105c5a57))
+    (pin "9" (uuid f85ce822-c4cd-4bc6-8c31-cfad683d10ae))
+    (pin "10" (uuid a4bb7bae-f982-4b25-a9eb-bc556b618638))
+    (pin "11" (uuid 84529ab6-9a65-4c87-b095-7a53fb755e2c))
+    (pin "12" (uuid 3d1ca20e-431d-45c0-9443-c5f597b34af3))
+    (pin "13" (uuid 2bd0a9eb-83dd-424f-92d0-bd4297676cbf))
     (pin "14" (uuid bf0862f0-7b4d-4da4-a5e8-91a9bdbee56f))
     (pin "7" (uuid 0639e567-d45a-4c84-98fa-a167b211ae20))
   )
 
-  (symbol (lib_id "power:VCC") (at 139.7 76.2 0)
+  (symbol (lib_id "power:VCC") (at 139.7 76.2 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34bc05)
     (property "Reference" "#PWR?" (id 0) (at 139.7 80.01 0)
@@ -427,7 +508,7 @@
     (pin "1" (uuid 0030af45-9cbd-4108-9b0f-2e3885996ada))
   )
 
-  (symbol (lib_id "power:GND") (at 139.7 101.6 0)
+  (symbol (lib_id "power:GND") (at 139.7 101.6 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f34c535)
     (property "Reference" "#PWR?" (id 0) (at 139.7 107.95 0)
diff --git a/tests/reference/6_0_4/test_v5-schematic_(no_L).pdf b/tests/reference/6_0_4/test_v5-schematic_(no_L).pdf
index 0875654b..a736e0b9 100644
Binary files a/tests/reference/6_0_4/test_v5-schematic_(no_L).pdf and b/tests/reference/6_0_4/test_v5-schematic_(no_L).pdf differ
diff --git a/tests/reference/6_0_4/test_v5-schematic_(no_L).svg b/tests/reference/6_0_4/test_v5-schematic_(no_L).svg
index f7393b07..7f1614de 100644
--- a/tests/reference/6_0_4/test_v5-schematic_(no_L).svg
+++ b/tests/reference/6_0_4/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 2022/04/04 17:51:58 </title>
+<title>SVG Picture created as test_v5.svg date 2022/06/10 09:15:46 </title>
   <desc>Picture generated by Eeschema-SVG </desc>
 <g style="fill:#000000; fill-opacity:1.000000;stroke:#000000; stroke-opacity:1.000000;
 stroke-linecap:round; stroke-linejoin:round;"
@@ -661,8 +661,8 @@ L112205 76577
 " />
 <text x="70079.606299" y="77424.094488"
 textLength="21826.023622" font-size="787.401575" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">KiCad E.D.A.  eeschema 6.0.2+dfsg-1~bpo11+1</text>
-<g class="stroked-text"><desc>KiCad E.D.A.  eeschema 6.0.2+dfsg-1~bpo11+1</desc>
+text-anchor="start" opacity="0">KiCad E.D.A.  eeschema 6.0.5+dfsg-1~bpo11+1</text>
+<g class="stroked-text"><desc>KiCad E.D.A.  eeschema 6.0.5+dfsg-1~bpo11+1</desc>
 <path d="M70250 77395
 L70250 76805
 " />
@@ -962,17 +962,22 @@ L82792 77367
 L82820 77339
 L82820 77395
 " />
-<path d="M83073 76861
-L83101 76833
-L83157 76805
-L83298 76805
-L83354 76833
-L83382 76861
-L83411 76917
-L83411 76974
-L83382 77058
-L83045 77395
-L83411 77395
+<path d="M83382 76805
+L83101 76805
+L83073 77086
+L83101 77058
+L83157 77030
+L83298 77030
+L83354 77058
+L83382 77086
+L83411 77142
+L83411 77283
+L83382 77339
+L83354 77367
+L83298 77395
+L83157 77395
+L83101 77367
+L83073 77339
 " />
 <path d="M83664 77170
 L84114 77170
@@ -3765,44 +3770,44 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#006464; fill-opacity:0.0; 
 stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="49460.000000" y="32750.000000"
+<text x="49425.000000" y="32750.000000"
 textLength="1488.582677" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">OUT</text>
 <g class="stroked-text"><desc>OUT</desc>
-<path d="M48215 32226
-L48310 32226
-L48358 32250
-L48406 32297
-L48430 32392
-L48430 32559
-L48406 32654
-L48358 32702
-L48310 32726
-L48215 32726
-L48168 32702
-L48120 32654
-L48096 32559
-L48096 32392
-L48120 32297
-L48168 32250
-L48215 32226
+<path d="M48180 32226
+L48275 32226
+L48323 32250
+L48371 32297
+L48395 32392
+L48395 32559
+L48371 32654
+L48323 32702
+L48275 32726
+L48180 32726
+L48133 32702
+L48085 32654
+L48061 32559
+L48061 32392
+L48085 32297
+L48133 32250
+L48180 32226
 " />
-<path d="M48644 32226
-L48644 32630
-L48668 32678
-L48691 32702
-L48739 32726
-L48834 32726
-L48882 32702
-L48906 32678
-L48930 32630
-L48930 32226
+<path d="M48609 32226
+L48609 32630
+L48633 32678
+L48656 32702
+L48704 32726
+L48799 32726
+L48847 32702
+L48871 32678
+L48895 32630
+L48895 32226
 " />
-<path d="M49096 32226
-L49382 32226
+<path d="M49061 32226
+L49347 32226
 " />
-<path d="M49239 32726
-L49239 32226
+<path d="M49204 32726
+L49204 32226
 " />
 </g><path style="fill:#006464; fill-opacity:0.0; 
 stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
@@ -3813,17 +3818,17 @@ d="M 50000.000000,32500.000000
 49500.000000,32750.000000
 49750.000000,32750.000000
 Z" /> 
-<text x="40540.000000" y="32750.000000"
+<text x="40575.000000" y="32750.000000"
 textLength="821.889764" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">IN</text>
 <g class="stroked-text"><desc>IN</desc>
-<path d="M40689 32726
-L40689 32226
+<path d="M40724 32726
+L40724 32226
 " />
-<path d="M40927 32726
-L40927 32226
-L41212 32726
-L41212 32226
+<path d="M40962 32726
+L40962 32226
+L41247 32726
+L41247 32226
 " />
 </g><path style="fill:#006464; fill-opacity:0.0; 
 stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
@@ -4276,44 +4281,44 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#006464; fill-opacity:0.0; 
 stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="49460.000000" y="40750.000000"
+<text x="49425.000000" y="40750.000000"
 textLength="1488.582677" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">OUT</text>
 <g class="stroked-text"><desc>OUT</desc>
-<path d="M48215 40226
-L48310 40226
-L48358 40250
-L48406 40297
-L48430 40392
-L48430 40559
-L48406 40654
-L48358 40702
-L48310 40726
-L48215 40726
-L48168 40702
-L48120 40654
-L48096 40559
-L48096 40392
-L48120 40297
-L48168 40250
-L48215 40226
+<path d="M48180 40226
+L48275 40226
+L48323 40250
+L48371 40297
+L48395 40392
+L48395 40559
+L48371 40654
+L48323 40702
+L48275 40726
+L48180 40726
+L48133 40702
+L48085 40654
+L48061 40559
+L48061 40392
+L48085 40297
+L48133 40250
+L48180 40226
 " />
-<path d="M48644 40226
-L48644 40630
-L48668 40678
-L48691 40702
-L48739 40726
-L48834 40726
-L48882 40702
-L48906 40678
-L48930 40630
-L48930 40226
+<path d="M48609 40226
+L48609 40630
+L48633 40678
+L48656 40702
+L48704 40726
+L48799 40726
+L48847 40702
+L48871 40678
+L48895 40630
+L48895 40226
 " />
-<path d="M49096 40226
-L49382 40226
+<path d="M49061 40226
+L49347 40226
 " />
-<path d="M49239 40726
-L49239 40226
+<path d="M49204 40726
+L49204 40226
 " />
 </g><path style="fill:#006464; fill-opacity:0.0; 
 stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
@@ -4324,17 +4329,17 @@ d="M 50000.000000,40500.000000
 49500.000000,40750.000000
 49750.000000,40750.000000
 Z" /> 
-<text x="40540.000000" y="40750.000000"
+<text x="40575.000000" y="40750.000000"
 textLength="821.889764" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">IN</text>
 <g class="stroked-text"><desc>IN</desc>
-<path d="M40689 40726
-L40689 40226
+<path d="M40724 40726
+L40724 40226
 " />
-<path d="M40927 40726
-L40927 40226
-L41212 40726
-L41212 40226
+<path d="M40962 40726
+L40962 40226
+L41247 40726
+L41247 40226
 " />
 </g><path style="fill:#006464; fill-opacity:0.0; 
 stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
@@ -4785,295 +4790,6 @@ L50340 43573
 <g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,36600.000000
-15500.000000,36500.000000
-" /> 
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,38400.000000
-15500.000000,38500.000000
-" /> 
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,37200.000000
-15100.000000,37050.000000
-15500.000000,36900.000000
-15900.000000,36750.000000
-15500.000000,36600.000000
-" /> 
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,37800.000000
-15100.000000,37650.000000
-15500.000000,37500.000000
-15900.000000,37350.000000
-15500.000000,37200.000000
-" /> 
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,38400.000000
-15100.000000,38250.000000
-15500.000000,38100.000000
-15900.000000,37950.000000
-15500.000000,37800.000000
-" /> 
-<path d="M15500 38500
-L15500 39000
-" />
-<path d="M15500 36500
-L15500 36000
-" />
-</g>
-<g style="fill:#006464; fill-opacity:0.0; 
-stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="16699.330709" y="37290.000000"
-textLength="1036.181102" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">R2</text>
-<g class="stroked-text"><desc>R2</desc>
-<path d="M16615 37266
-L16449 37028
-" />
-<path d="M16330 37266
-L16330 36766
-L16520 36766
-L16568 36790
-L16592 36813
-L16615 36861
-L16615 36932
-L16592 36980
-L16568 37004
-L16520 37028
-L16330 37028
-" />
-<path d="M16806 36813
-L16830 36790
-L16877 36766
-L16996 36766
-L17044 36790
-L17068 36813
-L17092 36861
-L17092 36909
-L17068 36980
-L16782 37266
-L17092 37266
-" />
-</g><text x="17151.732283" y="38200.000000"
-textLength="1940.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">R_US</text>
-<g class="stroked-text"><desc>R_US</desc>
-<path d="M16615 38176
-L16449 37938
-" />
-<path d="M16330 38176
-L16330 37676
-L16520 37676
-L16568 37700
-L16592 37723
-L16615 37771
-L16615 37842
-L16592 37890
-L16568 37914
-L16520 37938
-L16330 37938
-" />
-<path d="M16711 38223
-L17092 38223
-" />
-<path d="M17211 37676
-L17211 38080
-L17235 38128
-L17258 38152
-L17306 38176
-L17401 38176
-L17449 38152
-L17473 38128
-L17496 38080
-L17496 37676
-" />
-<path d="M17711 38152
-L17782 38176
-L17901 38176
-L17949 38152
-L17973 38128
-L17996 38080
-L17996 38033
-L17973 37985
-L17949 37961
-L17901 37938
-L17806 37914
-L17758 37890
-L17735 37866
-L17711 37819
-L17711 37771
-L17735 37723
-L17758 37700
-L17806 37676
-L17925 37676
-L17996 37700
-" />
-</g></g>
-</g>
-<g style="fill:#006464; fill-opacity:0.0; 
-stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<g >
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M15500.436332 32499.999619 A250.000000 250.000000 0.0 0 0 15500.436332 32000.000381" />
-<path d="M15500.436332 31999.999619 A250.000000 250.000000 0.0 0 0 15500.436332 31500.000381" />
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:236.220472; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:236.220472; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,33000.000000
-15750.000000,30000.000000
-" /> 
-<path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:236.220472; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,30000.000000
-15750.000000,33000.000000
-" /> 
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M15500.436332 31499.999619 A250.000000 250.000000 0.0 0 0 15500.436332 31000.000381" />
-<path d="M15500.436332 30999.999619 A250.000000 250.000000 0.0 0 0 15500.436332 30500.000381" />
-<path d="M15500 30500
-L15500 30000
-" />
-<path d="M15500 32500
-L15500 33000
-" />
-</g>
-<g style="fill:#006464; fill-opacity:0.0; 
-stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="16501.732283" y="31289.960630"
-textLength="940.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">L1</text>
-<g class="stroked-text"><desc>L1</desc>
-<path d="M16418 31266
-L16180 31266
-L16180 30766
-" />
-<path d="M16846 31266
-L16561 31266
-" />
-<path d="M16704 31266
-L16704 30766
-L16656 30837
-L16608 30885
-L16561 30908
-" />
-</g><text x="16263.622047" y="32199.960630"
-textLength="464.763780" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">L</text>
-<g class="stroked-text"><desc>L</desc>
-<path d="M16418 32176
-L16180 32176
-L16180 31676
-" />
-</g></g>
-</g>
-<g style="fill:#006464; fill-opacity:0.0; 
-stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<g >
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<rect x="12000.000000" y="34100.000000" width="2000.000000" height="800.000000" rx="0.000000" />
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M14000 34500
-L14500 34500
-" />
-<path d="M12000 34500
-L11500 34500
-" />
-</g>
-<g style="fill:#006464; fill-opacity:0.0; 
-stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="13000.000000" y="32679.960630"
-textLength="1036.181102" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">R1</text>
-<g class="stroked-text"><desc>R1</desc>
-<path d="M12916 32656
-L12750 32418
-" />
-<path d="M12630 32656
-L12630 32156
-L12821 32156
-L12869 32179
-L12892 32203
-L12916 32251
-L12916 32322
-L12892 32370
-L12869 32394
-L12821 32418
-L12630 32418
-" />
-<path d="M13392 32656
-L13107 32656
-" />
-<path d="M13250 32656
-L13250 32156
-L13202 32227
-L13154 32275
-L13107 32298
-" />
-</g><text x="13000.000000" y="33589.960630"
-textLength="560.000000" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="middle" opacity="0">R</text>
-<g class="stroked-text"><desc>R</desc>
-<path d="M13154 33566
-L12988 33328
-" />
-<path d="M12869 33566
-L12869 33066
-L13059 33066
-L13107 33089
-L13130 33113
-L13154 33161
-L13154 33232
-L13130 33280
-L13107 33304
-L13059 33328
-L12869 33328
-" />
-</g></g>
-</g>
-<g style="fill:#006464; fill-opacity:0.0; 
-stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<g >
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:200.000000; stroke-opacity:1; 
@@ -5302,50 +5018,363 @@ L28082 35390
 </g></g>
 </g>
 <g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g >
+<path d="M15500.436332 32499.999619 A250.000000 250.000000 0.0 0 0 15500.436332 32000.000381" />
+<path d="M15500.436332 31999.999619 A250.000000 250.000000 0.0 0 0 15500.436332 31500.000381" />
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:236.220472; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:236.220472; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,33000.000000
+15750.000000,30000.000000
+" /> 
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:236.220472; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,30000.000000
+15750.000000,33000.000000
+" /> 
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M15500.436332 31499.999619 A250.000000 250.000000 0.0 0 0 15500.436332 31000.000381" />
+<path d="M15500.436332 30999.999619 A250.000000 250.000000 0.0 0 0 15500.436332 30500.000381" />
+<path d="M15500 30500
+L15500 30000
+" />
+<path d="M15500 32500
+L15500 33000
+" />
+</g>
+<g style="fill:#006464; fill-opacity:0.0; 
+stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<text x="16552.047244" y="31289.960630"
+textLength="940.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">L1</text>
+<g class="stroked-text"><desc>L1</desc>
+<path d="M16468 31266
+L16230 31266
+L16230 30766
+" />
+<path d="M16897 31266
+L16611 31266
+" />
+<path d="M16754 31266
+L16754 30766
+L16706 30837
+L16659 30885
+L16611 30908
+" />
+</g><text x="16263.622047" y="32199.960630"
+textLength="464.763780" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">L</text>
+<g class="stroked-text"><desc>L</desc>
+<path d="M16418 32176
+L16180 32176
+L16180 31676
+" />
+</g></g>
+</g>
+<g style="fill:#006464; fill-opacity:0.0; 
+stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g >
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
+<rect x="12000.000000" y="34100.000000" width="2000.000000" height="800.000000" rx="0.000000" />
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M14000 34500
+L14500 34500
+" />
+<path d="M12000 34500
+L11500 34500
+" />
+</g>
+<g style="fill:#006464; fill-opacity:0.0; 
+stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<text x="13000.000000" y="32679.960630"
+textLength="1036.181102" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">R1</text>
+<g class="stroked-text"><desc>R1</desc>
+<path d="M12916 32656
+L12750 32418
+" />
+<path d="M12630 32656
+L12630 32156
+L12821 32156
+L12869 32179
+L12892 32203
+L12916 32251
+L12916 32322
+L12892 32370
+L12869 32394
+L12821 32418
+L12630 32418
+" />
+<path d="M13392 32656
+L13107 32656
+" />
+<path d="M13250 32656
+L13250 32156
+L13202 32227
+L13154 32275
+L13107 32298
+" />
+</g><text x="13000.000000" y="33589.960630"
+textLength="560.000000" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">R</text>
+<g class="stroked-text"><desc>R</desc>
+<path d="M13154 33566
+L12988 33328
+" />
+<path d="M12869 33566
+L12869 33066
+L13059 33066
+L13107 33089
+L13130 33113
+L13154 33161
+L13154 33232
+L13130 33280
+L13107 33304
+L13059 33328
+L12869 33328
+" />
+</g></g>
+</g>
+<g style="fill:#006464; fill-opacity:0.0; 
+stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g >
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,37200.000000
+15464.842520,37185.944882
+15434.212598,37171.889764
+15407.952756,37157.834646
+15385.944882,37143.779528
+15368.070866,37129.724409
+15354.133858,37115.629921
+15343.976378,37101.574803
+15337.519685,37087.519685
+15334.566929,37073.464567
+15335.000000,37059.409449
+15338.622047,37045.314961
+15345.314961,37031.259843
+15354.960630,37017.204724
+15367.401575,37003.149606
+15382.480315,36989.094488
+15400.000000,36975.000000
+15419.921260,36960.944882
+15442.007874,36946.889764
+15466.141732,36932.834646
+15492.204724,36918.779528
+15519.960630,36904.724409
+15549.409449,36890.629921
+15580.275591,36876.574803
+15612.480315,36862.519685
+15645.866142,36848.464567
+15680.236220,36834.409449
+15715.551181,36820.314961
+15751.535433,36806.259843
+15788.149606,36792.204724
+15825.157480,36778.149606
+15862.519685,36764.094488
+15900.000000,36750.000000
+" /> 
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,36600.000000
+15500.000000,36500.000000
+" /> 
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,38400.000000
+15500.000000,38500.000000
+" /> 
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,37800.000000
+15100.000000,37650.000000
+15500.000000,37500.000000
+15900.000000,37350.000000
+15500.000000,37200.000000
+" /> 
+<path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,38400.000000
+15100.000000,38250.000000
+15500.000000,38100.000000
+15900.000000,37950.000000
+15500.000000,37800.000000
+" /> 
+<path d="M15500 38500
+L15500 39000
+" />
+<path d="M15500 36500
+L15500 36000
+" />
+</g>
+<g style="fill:#006464; fill-opacity:0.0; 
+stroke:#006464; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<text x="16699.330709" y="37290.000000"
+textLength="1036.181102" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">R2</text>
+<g class="stroked-text"><desc>R2</desc>
+<path d="M16615 37266
+L16449 37028
+" />
+<path d="M16330 37266
+L16330 36766
+L16520 36766
+L16568 36790
+L16592 36813
+L16615 36861
+L16615 36932
+L16592 36980
+L16568 37004
+L16520 37028
+L16330 37028
+" />
+<path d="M16806 36813
+L16830 36790
+L16877 36766
+L16996 36766
+L17044 36790
+L17068 36813
+L17092 36861
+L17092 36909
+L17068 36980
+L16782 37266
+L17092 37266
+" />
+</g><text x="17151.732283" y="38200.000000"
+textLength="1940.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="middle" opacity="0">R_US</text>
+<g class="stroked-text"><desc>R_US</desc>
+<path d="M16615 38176
+L16449 37938
+" />
+<path d="M16330 38176
+L16330 37676
+L16520 37676
+L16568 37700
+L16592 37723
+L16615 37771
+L16615 37842
+L16592 37890
+L16568 37914
+L16520 37938
+L16330 37938
+" />
+<path d="M16711 38223
+L17092 38223
+" />
+<path d="M17211 37676
+L17211 38080
+L17235 38128
+L17258 38152
+L17306 38176
+L17401 38176
+L17449 38152
+L17473 38128
+L17496 38080
+L17496 37676
+" />
+<path d="M17711 38152
+L17782 38176
+L17901 38176
+L17949 38152
+L17973 38128
+L17996 38080
+L17996 38033
+L17973 37985
+L17949 37961
+L17901 37938
+L17806 37914
+L17758 37890
+L17735 37866
+L17711 37819
+L17711 37771
+L17735 37723
+L17758 37700
+L17806 37676
+L17925 37676
+L17996 37700
+" />
+</g></g>
+</g>
+<g style="fill:#006464; fill-opacity:0.0; 
+stroke:#006464; stroke-width:100.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:100.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90.000000 22000.000000 24540.000000)">
-<text x="22000.000000" y="24790.000000"
+<g transform="rotate(-90.000000 22000.000000 24575.000000)">
+<text x="22000.000000" y="24825.000000"
 textLength="1541.574803" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">L3D</text>
 </g>
 <g class="stroked-text"><desc>L3D</desc>
-<path d="M22226 25726
-L22226 25964
-L21726 25902
+<path d="M22226 25761
+L22226 25999
+L21726 25937
 " />
-<path d="M21726 25544
-L21726 25235
-L21916 25425
-L21916 25354
-L21940 25309
-L21964 25288
-L22011 25271
-L22130 25285
-L22178 25315
-L22202 25342
-L22226 25393
-L22226 25535
-L22202 25580
-L22178 25601
+<path d="M21726 25579
+L21726 25270
+L21916 25460
+L21916 25389
+L21940 25344
+L21964 25323
+L22011 25306
+L22130 25320
+L22178 25350
+L22202 25377
+L22226 25428
+L22226 25570
+L22202 25615
+L22178 25636
 " />
-<path d="M22226 25083
-L21726 25021
-L21726 24902
-L21750 24833
-L21797 24791
-L21845 24774
-L21940 24762
-L22011 24771
-L22107 24806
-L22154 24836
-L22202 24890
-L22226 24964
-L22226 25083
+<path d="M22226 25118
+L21726 25056
+L21726 24937
+L21750 24868
+L21797 24826
+L21845 24809
+L21940 24797
+L22011 24806
+L22107 24841
+L22154 24871
+L22202 24925
+L22226 24999
+L22226 25118
 " />
 </g><path style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:100.000000; stroke-opacity:1; 
@@ -5363,35 +5392,35 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="20960.000000" y="23250.000000"
+<text x="20925.000000" y="23250.000000"
 textLength="1439.527559" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">L3A</text>
 <g class="stroked-text"><desc>L3A</desc>
-<path d="M19977 23226
-L19739 23226
-L19739 22726
+<path d="M19942 23226
+L19704 23226
+L19704 22726
 " />
-<path d="M20096 22726
-L20406 22726
-L20239 22916
-L20310 22916
-L20358 22940
-L20382 22964
-L20406 23011
-L20406 23130
-L20382 23178
-L20358 23202
-L20310 23226
-L20168 23226
-L20120 23202
-L20096 23178
+<path d="M20061 22726
+L20371 22726
+L20204 22916
+L20275 22916
+L20323 22940
+L20347 22964
+L20371 23011
+L20371 23130
+L20347 23178
+L20323 23202
+L20275 23226
+L20133 23226
+L20085 23202
+L20061 23178
 " />
-<path d="M20596 23083
-L20834 23083
+<path d="M20561 23083
+L20799 23083
 " />
-<path d="M20549 23226
-L20715 22726
-L20882 23226
+<path d="M20514 23226
+L20680 22726
+L20847 23226
 " />
 </g><path style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:60.000000; stroke-opacity:1; 
@@ -5406,45 +5435,45 @@ Z" />
 <g style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:100.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="23040.000000" y="23250.000000"
+<text x="23075.000000" y="23250.000000"
 textLength="1440.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">L3C</text>
 <g class="stroked-text"><desc>L3C</desc>
-<path d="M23462 23226
-L23224 23226
-L23224 22726
+<path d="M23497 23226
+L23259 23226
+L23259 22726
 " />
-<path d="M23581 22726
-L23890 22726
-L23724 22916
-L23795 22916
-L23843 22940
-L23866 22964
-L23890 23011
-L23890 23130
-L23866 23178
-L23843 23202
-L23795 23226
-L23652 23226
-L23605 23202
-L23581 23178
+<path d="M23616 22726
+L23925 22726
+L23759 22916
+L23830 22916
+L23878 22940
+L23901 22964
+L23925 23011
+L23925 23130
+L23901 23178
+L23878 23202
+L23830 23226
+L23687 23226
+L23640 23202
+L23616 23178
 " />
-<path d="M24390 23178
-L24366 23202
-L24295 23226
-L24247 23226
-L24176 23202
-L24128 23154
-L24105 23107
-L24081 23011
-L24081 22940
-L24105 22845
-L24128 22797
-L24176 22750
-L24247 22726
-L24295 22726
-L24366 22750
-L24390 22773
+<path d="M24425 23178
+L24401 23202
+L24330 23226
+L24282 23226
+L24211 23202
+L24163 23154
+L24140 23107
+L24116 23011
+L24116 22940
+L24140 22845
+L24163 22797
+L24211 22750
+L24282 22726
+L24330 22726
+L24401 22750
+L24425 22773
 " />
 </g><path style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:100.000000; stroke-opacity:1; 
@@ -5462,50 +5491,50 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90.000000 22000.000000 21460.000000)">
-<text x="22000.000000" y="21710.000000"
+<g transform="rotate(-90.000000 22000.000000 21425.000000)">
+<text x="22000.000000" y="21675.000000"
 textLength="1611.574803" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">L3B</text>
 </g>
 <g class="stroked-text"><desc>L3B</desc>
-<path d="M22226 21069
-L22226 21307
-L21726 21245
+<path d="M22226 21034
+L22226 21272
+L21726 21210
 " />
-<path d="M21726 20888
-L21726 20578
-L21916 20769
-L21916 20697
-L21940 20653
-L21964 20632
-L22011 20614
-L22130 20629
-L22178 20659
-L22202 20685
-L22226 20736
-L22226 20879
-L22202 20924
-L22178 20944
+<path d="M21726 20853
+L21726 20543
+L21916 20734
+L21916 20662
+L21940 20618
+L21964 20597
+L22011 20579
+L22130 20594
+L22178 20624
+L22202 20650
+L22226 20701
+L22226 20844
+L22202 20889
+L22178 20909
 " />
-<path d="M21964 20227
-L21988 20159
-L22011 20138
-L22059 20120
-L22130 20129
-L22178 20159
-L22202 20185
-L22226 20236
-L22226 20427
-L21726 20364
-L21726 20197
-L21750 20153
-L21773 20132
-L21821 20114
-L21869 20120
-L21916 20150
-L21940 20177
-L21964 20227
-L21964 20394
+<path d="M21964 20192
+L21988 20124
+L22011 20103
+L22059 20085
+L22130 20094
+L22178 20124
+L22202 20150
+L22226 20201
+L22226 20392
+L21726 20329
+L21726 20162
+L21750 20118
+L21773 20097
+L21821 20079
+L21869 20085
+L21916 20115
+L21940 20142
+L21964 20192
+L21964 20359
 " />
 </g><path style="fill:#725600; fill-opacity:0.0; 
 stroke:#725600; stroke-width:60.000000; stroke-opacity:1; 
@@ -5528,199 +5557,199 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90.000000 15535.748031 21875.000000)">
-<text x="15535.748031" y="22125.000000"
-textLength="1541.574803" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">L2B</text>
-</g>
-<g class="stroked-text"><desc>L2B</desc>
-<path d="M15761 21484
-L15761 21722
-L15261 21660
-" />
-<path d="M15309 21285
-L15285 21258
-L15261 21208
-L15261 21089
-L15285 21044
-L15309 21023
-L15357 21005
-L15404 21011
-L15476 21044
-L15761 21365
-L15761 21056
-" />
-<path d="M15500 20642
-L15523 20574
-L15547 20553
-L15595 20535
-L15666 20544
-L15714 20574
-L15738 20600
-L15761 20651
-L15761 20842
-L15261 20779
-L15261 20612
-L15285 20568
-L15309 20547
-L15357 20529
-L15404 20535
-L15452 20565
-L15476 20592
-L15500 20642
-L15500 20809
-" />
-</g><path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,22000.000000
-15937.637795,22000.000000
-15937.637795,20143.267717
-15500.000000,19768.267717
-15062.362205,20143.267717
-15062.362205,22000.000000
-Z" /> 
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90.000000 15535.748031 24125.000000)">
-<text x="15535.748031" y="24375.000000"
-textLength="1544.094488" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="end" opacity="0">L2D</text>
-</g>
-<g class="stroked-text"><desc>L2D</desc>
-<path d="M15761 25311
-L15761 25549
-L15261 25487
-" />
-<path d="M15309 25112
-L15285 25085
-L15261 25034
-L15261 24915
-L15285 24870
-L15309 24850
-L15357 24832
-L15404 24838
-L15476 24870
-L15761 25192
-L15761 24882
-" />
-<path d="M15761 24668
-L15261 24606
-L15261 24487
-L15285 24418
-L15333 24376
-L15380 24359
-L15476 24347
-L15547 24356
-L15642 24391
-L15690 24421
-L15738 24475
-L15761 24549
-L15761 24668
-" />
-</g><path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 15500.000000,24000.000000
-15024.881890,24000.000000
-15024.881890,25931.692913
-15500.000000,25931.692913
-15975.118110,25931.692913
-15975.118110,24000.000000
-Z" /> 
-<text x="16500.000000" y="23285.748031"
-textLength="1480.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">L2C</text>
-<g class="stroked-text"><desc>L2C</desc>
-<path d="M16922 23261
-L16684 23261
-L16684 22761
-" />
-<path d="M17065 22809
-L17088 22785
-L17136 22761
-L17255 22761
-L17303 22785
-L17326 22809
-L17350 22857
-L17350 22904
-L17326 22976
-L17041 23261
-L17350 23261
-" />
-<path d="M17850 23214
-L17826 23238
-L17755 23261
-L17707 23261
-L17636 23238
-L17588 23190
-L17565 23142
-L17541 23047
-L17541 22976
-L17565 22880
-L17588 22833
-L17636 22785
-L17707 22761
-L17755 22761
-L17826 22785
-L17850 22809
-" />
-</g><path style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;fill:none"
-d="M 16000.000000,23000.000000
-16375.000000,23475.118110
-18206.062992,23475.118110
-18581.062992,23000.000000
-18206.062992,22524.881890
-16375.000000,22524.881890
-Z" /> 
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:62.519685; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#840000; fill-opacity:0.0; 
-stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="14500.000000" y="23285.748031"
-textLength="1409.527559" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+<text x="14437.480315" y="23285.748031"
+textLength="1369.527559" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">L2A</text>
 <g class="stroked-text"><desc>L2A</desc>
-<path d="M13517 23261
-L13279 23261
-L13279 22761
+<path d="M13455 23261
+L13216 23261
+L13216 22761
 " />
-<path d="M13660 22809
-L13684 22785
-L13731 22761
-L13850 22761
-L13898 22785
-L13922 22809
-L13946 22857
-L13946 22904
-L13922 22976
-L13636 23261
-L13946 23261
+<path d="M13597 22809
+L13621 22785
+L13669 22761
+L13788 22761
+L13836 22785
+L13859 22809
+L13883 22857
+L13883 22904
+L13859 22976
+L13574 23261
+L13883 23261
 " />
-<path d="M14136 23119
-L14374 23119
+<path d="M14074 23119
+L14312 23119
 " />
-<path d="M14089 23261
-L14255 22761
-L14422 23261
+<path d="M14026 23261
+L14193 22761
+L14359 23261
 " />
 </g><path style="fill:#840000; fill-opacity:0.0; 
 stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;fill:none"
 d="M 15000.000000,23000.000000
-14625.000000,22562.362205
-12940.314961,22562.362205
-12940.314961,23000.000000
-12940.314961,23437.637795
-14625.000000,23437.637795
+14562.480315,22499.842520
+12752.755906,22499.842520
+12752.755906,23000.000000
+12752.755906,23500.157480
+14562.480315,23500.157480
+Z" /> 
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g transform="rotate(-90.000000 15535.748031 24187.519685)">
+<text x="15535.748031" y="24437.519685"
+textLength="1544.094488" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="end" opacity="0">L2D</text>
+</g>
+<g class="stroked-text"><desc>L2D</desc>
+<path d="M15761 25373
+L15761 25612
+L15261 25549
+" />
+<path d="M15309 25174
+L15285 25147
+L15261 25097
+L15261 24978
+L15285 24933
+L15309 24912
+L15357 24894
+L15404 24900
+L15476 24933
+L15761 25254
+L15761 24945
+" />
+<path d="M15761 24731
+L15261 24668
+L15261 24549
+L15285 24481
+L15333 24439
+L15380 24421
+L15476 24409
+L15547 24418
+L15642 24454
+L15690 24484
+L15738 24537
+L15761 24612
+L15761 24731
+" />
+</g><path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,24000.000000
+14962.362205,24000.000000
+14962.362205,26056.732283
+15500.000000,26056.732283
+16037.637795,26056.732283
+16037.637795,24000.000000
+Z" /> 
+<text x="16562.519685" y="23285.748031"
+textLength="1480.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="start" opacity="0">L2C</text>
+<g class="stroked-text"><desc>L2C</desc>
+<path d="M16984 23261
+L16746 23261
+L16746 22761
+" />
+<path d="M17127 22809
+L17151 22785
+L17198 22761
+L17317 22761
+L17365 22785
+L17389 22809
+L17413 22857
+L17413 22904
+L17389 22976
+L17103 23261
+L17413 23261
+" />
+<path d="M17913 23214
+L17889 23238
+L17817 23261
+L17770 23261
+L17698 23238
+L17651 23190
+L17627 23142
+L17603 23047
+L17603 22976
+L17627 22880
+L17651 22833
+L17698 22785
+L17770 22761
+L17817 22761
+L17889 22785
+L17913 22809
+" />
+</g><path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:100.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 16000.000000,23000.000000
+16437.519685,23537.637795
+18393.622047,23537.637795
+18831.141732,23000.000000
+18393.622047,22462.362205
+16437.519685,22462.362205
+Z" /> 
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:62.519685; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g transform="rotate(-90.000000 15535.748031 21812.480315)">
+<text x="15535.748031" y="22062.480315"
+textLength="1581.574803" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="start" opacity="0">L2B</text>
+</g>
+<g class="stroked-text"><desc>L2B</desc>
+<path d="M15761 21422
+L15761 21660
+L15261 21597
+" />
+<path d="M15309 21222
+L15285 21196
+L15261 21145
+L15261 21026
+L15285 20981
+L15309 20961
+L15357 20943
+L15404 20949
+L15476 20981
+L15761 21303
+L15761 20993
+" />
+<path d="M15500 20580
+L15523 20511
+L15547 20490
+L15595 20472
+L15666 20481
+L15714 20511
+L15738 20538
+L15761 20589
+L15761 20779
+L15261 20716
+L15261 20550
+L15285 20505
+L15309 20484
+L15357 20466
+L15404 20472
+L15452 20502
+L15476 20529
+L15500 20580
+L15500 20746
+" />
+</g><path style="fill:#840000; fill-opacity:0.0; 
+stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;fill:none"
+d="M 15500.000000,22000.000000
+16000.157480,22000.000000
+16000.157480,20018.228346
+15500.000000,19580.708661
+14999.842520,20018.228346
+14999.842520,22000.000000
 Z" /> 
 </g>
 <g style="fill:#840000; fill-opacity:0.0; 
@@ -5731,122 +5760,93 @@ stroke-linecap:round; stroke-linejoin:round;">
 stroke:#840000; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
-<g style="fill:#0F0F0F; fill-opacity:0.0; 
-stroke:#0F0F0F; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="9000.000000" y="25897.480315"
-textLength="943.464567" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">L1</text>
-<g class="stroked-text"><desc>L1</desc>
-<path d="M9387 25873
-L9149 25873
-L9149 25373
-" />
-<path d="M9815 25873
-L9530 25873
-" />
-<path d="M9672 25873
-L9672 25373
-L9625 25445
-L9577 25492
-L9530 25516
-" />
-</g></g>
-<g style="fill:#0F0F0F; fill-opacity:0.0; 
-stroke:#0F0F0F; stroke-width:62.519685; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0F0F0F; fill-opacity:0.0; 
-stroke:#0F0F0F; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
 <g style="fill:#000084; fill-opacity:0.0; 
 stroke:#000084; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="65000.000000" y="34897.480315"
-textLength="3536.181102" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+<text x="65000.000000" y="34862.480315"
+textLength="3538.700787" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">B{AELEM}</text>
 <g class="stroked-text"><desc>B{AELEM}</desc>
-<path d="M65315 34611
-L65387 34635
-L65410 34659
-L65434 34706
-L65434 34778
-L65410 34826
-L65387 34849
-L65339 34873
-L65149 34873
-L65149 34373
-L65315 34373
-L65363 34397
-L65387 34421
-L65410 34468
-L65410 34516
-L65387 34564
-L65363 34587
-L65315 34611
-L65149 34611
+<path d="M65315 34576
+L65387 34600
+L65410 34624
+L65434 34671
+L65434 34743
+L65410 34791
+L65387 34814
+L65339 34838
+L65149 34838
+L65149 34338
+L65315 34338
+L65363 34362
+L65387 34386
+L65410 34433
+L65410 34481
+L65387 34529
+L65363 34552
+L65315 34576
+L65149 34576
 " />
-<path d="M65791 35064
-L65768 35064
-L65720 35040
-L65696 34992
-L65696 34754
-L65672 34706
-L65625 34683
-L65672 34659
-L65696 34611
-L65696 34373
-L65720 34326
-L65768 34302
-L65791 34302
+<path d="M65791 35029
+L65768 35029
+L65720 35005
+L65696 34957
+L65696 34719
+L65672 34671
+L65625 34648
+L65672 34624
+L65696 34576
+L65696 34338
+L65720 34291
+L65768 34267
+L65791 34267
 " />
-<path d="M65958 34730
-L66196 34730
+<path d="M65958 34695
+L66196 34695
 " />
-<path d="M65910 34873
-L66077 34373
-L66244 34873
+<path d="M65910 34838
+L66077 34338
+L66244 34838
 " />
-<path d="M66410 34611
-L66577 34611
+<path d="M66410 34576
+L66577 34576
 " />
-<path d="M66649 34873
-L66410 34873
-L66410 34373
-L66649 34373
+<path d="M66649 34838
+L66410 34838
+L66410 34338
+L66649 34338
 " />
-<path d="M67101 34873
-L66863 34873
-L66863 34373
+<path d="M67101 34838
+L66863 34838
+L66863 34338
 " />
-<path d="M67268 34611
-L67434 34611
+<path d="M67268 34576
+L67434 34576
 " />
-<path d="M67506 34873
-L67268 34873
-L67268 34373
-L67506 34373
+<path d="M67506 34838
+L67268 34838
+L67268 34338
+L67506 34338
 " />
-<path d="M67720 34873
-L67720 34373
-L67887 34730
-L68053 34373
-L68053 34873
+<path d="M67720 34838
+L67720 34338
+L67887 34695
+L68053 34338
+L68053 34838
 " />
-<path d="M68244 35064
-L68268 35064
-L68315 35040
-L68339 34992
-L68339 34754
-L68363 34706
-L68410 34683
-L68363 34659
-L68339 34611
-L68339 34373
-L68315 34326
-L68268 34302
-L68244 34302
+<path d="M68244 35029
+L68268 35029
+L68315 35005
+L68339 34957
+L68339 34719
+L68363 34671
+L68410 34648
+L68363 34624
+L68339 34576
+L68339 34338
+L68315 34291
+L68268 34267
+L68244 34267
 " />
 </g></g>
 <g style="fill:#000084; fill-opacity:0.0; 
@@ -5860,52 +5860,52 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#0F0F0F; fill-opacity:0.0; 
 stroke:#0F0F0F; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="71500.000000" y="39397.480315"
+<text x="71500.000000" y="39362.480315"
 textLength="1702.874016" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">B.A1</text>
 <g class="stroked-text"><desc>B.A1</desc>
-<path d="M71815 39111
-L71887 39135
-L71910 39159
-L71934 39206
-L71934 39278
-L71910 39326
-L71887 39349
-L71839 39373
-L71649 39373
-L71649 38873
-L71815 38873
-L71863 38897
-L71887 38921
-L71910 38968
-L71910 39016
-L71887 39064
-L71863 39087
-L71815 39111
-L71649 39111
+<path d="M71815 39076
+L71887 39100
+L71910 39124
+L71934 39171
+L71934 39243
+L71910 39291
+L71887 39314
+L71839 39338
+L71649 39338
+L71649 38838
+L71815 38838
+L71863 38862
+L71887 38886
+L71910 38933
+L71910 38981
+L71887 39029
+L71863 39052
+L71815 39076
+L71649 39076
 " />
-<path d="M72149 39326
-L72172 39349
-L72149 39373
-L72125 39349
-L72149 39326
-L72149 39373
+<path d="M72149 39291
+L72172 39314
+L72149 39338
+L72125 39314
+L72149 39291
+L72149 39338
 " />
-<path d="M72363 39230
-L72601 39230
+<path d="M72363 39195
+L72601 39195
 " />
-<path d="M72315 39373
-L72482 38873
-L72649 39373
+<path d="M72315 39338
+L72482 38838
+L72649 39338
 " />
-<path d="M73077 39373
-L72791 39373
+<path d="M73077 39338
+L72791 39338
 " />
-<path d="M72934 39373
-L72934 38873
-L72887 38945
-L72839 38992
-L72791 39016
+<path d="M72934 39338
+L72934 38838
+L72887 38910
+L72839 38957
+L72791 38981
 " />
 </g></g>
 <g style="fill:#0F0F0F; fill-opacity:0.0; 
@@ -5915,65 +5915,90 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#0F0F0F; fill-opacity:0.0; 
 stroke:#0F0F0F; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<text x="71500.000000" y="40897.480315"
+<text x="71500.000000" y="40862.480315"
 textLength="1702.874016" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">B.A0</text>
 <g class="stroked-text"><desc>B.A0</desc>
-<path d="M71815 40611
-L71887 40635
-L71910 40659
-L71934 40706
-L71934 40778
-L71910 40826
-L71887 40849
-L71839 40873
-L71649 40873
-L71649 40373
-L71815 40373
-L71863 40397
-L71887 40421
-L71910 40468
-L71910 40516
-L71887 40564
-L71863 40587
-L71815 40611
-L71649 40611
+<path d="M71815 40576
+L71887 40600
+L71910 40624
+L71934 40671
+L71934 40743
+L71910 40791
+L71887 40814
+L71839 40838
+L71649 40838
+L71649 40338
+L71815 40338
+L71863 40362
+L71887 40386
+L71910 40433
+L71910 40481
+L71887 40529
+L71863 40552
+L71815 40576
+L71649 40576
 " />
-<path d="M72149 40826
-L72172 40849
-L72149 40873
-L72125 40849
-L72149 40826
-L72149 40873
+<path d="M72149 40791
+L72172 40814
+L72149 40838
+L72125 40814
+L72149 40791
+L72149 40838
 " />
-<path d="M72363 40730
-L72601 40730
+<path d="M72363 40695
+L72601 40695
 " />
-<path d="M72315 40873
-L72482 40373
-L72649 40873
+<path d="M72315 40838
+L72482 40338
+L72649 40838
 " />
-<path d="M72910 40373
-L72958 40373
-L73006 40397
-L73030 40421
-L73053 40468
-L73077 40564
-L73077 40683
-L73053 40778
-L73030 40826
-L73006 40849
-L72958 40873
-L72910 40873
-L72863 40849
-L72839 40826
-L72815 40778
-L72791 40683
-L72791 40564
-L72815 40468
-L72839 40421
-L72863 40397
-L72910 40373
+<path d="M72910 40338
+L72958 40338
+L73006 40362
+L73030 40386
+L73053 40433
+L73077 40529
+L73077 40648
+L73053 40743
+L73030 40791
+L73006 40814
+L72958 40838
+L72910 40838
+L72863 40814
+L72839 40791
+L72815 40743
+L72791 40648
+L72791 40529
+L72815 40433
+L72839 40386
+L72863 40362
+L72910 40338
+" />
+</g></g>
+<g style="fill:#0F0F0F; fill-opacity:0.0; 
+stroke:#0F0F0F; stroke-width:62.519685; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0F0F0F; fill-opacity:0.0; 
+stroke:#0F0F0F; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<text x="9000.000000" y="25862.480315"
+textLength="940.944882" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="start" opacity="0">L1</text>
+<g class="stroked-text"><desc>L1</desc>
+<path d="M9387 25838
+L9149 25838
+L9149 25338
+" />
+<path d="M9815 25838
+L9530 25838
+" />
+<path d="M9672 25838
+L9672 25338
+L9625 25410
+L9577 25457
+L9530 25481
 " />
 </g></g>
 <g style="fill:#0F0F0F; fill-opacity:0.0; 
@@ -5983,100 +6008,196 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:100.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90.000000 31860.000000 24000.000000)">
-<text x="31860.000000" y="24000.000000"
+<g transform="rotate(-90.000000 31825.000000 24000.000000)">
+<text x="31825.000000" y="24000.000000"
 textLength="4232.047244" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="end" opacity="0">Text box D</text>
 </g>
 <g class="stroked-text"><desc>Text box D</desc>
-<path d="M31336 28123
-L31336 27838
+<path d="M31301 28123
+L31301 27838
 " />
-<path d="M31836 28043
-L31336 27981
+<path d="M31801 28043
+L31301 27981
 " />
-<path d="M31812 27540
-L31836 27591
-L31836 27686
-L31812 27731
-L31764 27748
-L31574 27725
-L31526 27695
-L31502 27644
-L31502 27549
-L31526 27504
-L31574 27487
-L31621 27492
-L31669 27737
+<path d="M31777 27540
+L31801 27591
+L31801 27686
+L31777 27731
+L31729 27748
+L31539 27725
+L31491 27695
+L31467 27644
+L31467 27549
+L31491 27504
+L31539 27487
+L31586 27492
+L31634 27737
 " />
-<path d="M31836 27353
-L31502 27049
+<path d="M31801 27353
+L31467 27049
 " />
-<path d="M31502 27311
-L31836 27091
+<path d="M31467 27311
+L31801 27091
 " />
-<path d="M31502 26930
-L31502 26740
+<path d="M31467 26930
+L31467 26740
 " />
-<path d="M31336 26838
-L31764 26891
-L31812 26873
-L31836 26829
-L31836 26781
+<path d="M31301 26838
+L31729 26891
+L31777 26873
+L31801 26829
+L31801 26781
 " />
-<path d="M31836 26234
-L31336 26171
+<path d="M31801 26234
+L31301 26171
 " />
-<path d="M31526 26195
-L31502 26144
-L31502 26049
-L31526 26004
-L31550 25984
-L31598 25966
-L31740 25984
-L31788 26013
-L31812 26040
-L31836 26091
-L31836 26186
-L31812 26231
+<path d="M31491 26195
+L31467 26144
+L31467 26049
+L31491 26004
+L31515 25984
+L31563 25966
+L31705 25984
+L31753 26013
+L31777 26040
+L31801 26091
+L31801 26186
+L31777 26231
 " />
-<path d="M31836 25710
-L31812 25754
-L31788 25775
-L31740 25793
-L31598 25775
-L31550 25745
-L31526 25719
-L31502 25668
-L31502 25597
-L31526 25552
-L31550 25531
-L31598 25513
-L31740 25531
-L31788 25561
-L31812 25588
-L31836 25638
-L31836 25710
+<path d="M31801 25710
+L31777 25754
+L31753 25775
+L31705 25793
+L31563 25775
+L31515 25745
+L31491 25719
+L31467 25668
+L31467 25597
+L31491 25552
+L31515 25531
+L31563 25513
+L31705 25531
+L31753 25561
+L31777 25588
+L31801 25638
+L31801 25710
 " />
-<path d="M31836 25376
-L31502 25073
+<path d="M31801 25376
+L31467 25073
 " />
-<path d="M31502 25335
-L31836 25115
+<path d="M31467 25335
+L31801 25115
 " />
-<path d="M31836 24543
-L31336 24481
-L31336 24362
-L31360 24293
-L31407 24251
-L31455 24234
-L31550 24222
-L31621 24231
-L31717 24266
-L31764 24296
-L31812 24350
-L31836 24424
-L31836 24543
+<path d="M31801 24543
+L31301 24481
+L31301 24362
+L31325 24293
+L31372 24251
+L31420 24234
+L31515 24222
+L31586 24231
+L31682 24266
+L31729 24296
+L31777 24350
+L31801 24424
+L31801 24543
+" />
+</g><text x="36500.000000" y="23325.000000"
+textLength="4201.417323" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="end" opacity="0">Text box C</text>
+<g class="stroked-text"><desc>Text box C</desc>
+<path d="M32411 22801
+L32696 22801
+" />
+<path d="M32554 23301
+L32554 22801
+" />
+<path d="M33054 23277
+L33006 23301
+L32911 23301
+L32863 23277
+L32839 23229
+L32839 23039
+L32863 22991
+L32911 22967
+L33006 22967
+L33054 22991
+L33077 23039
+L33077 23086
+L32839 23134
+" />
+<path d="M33244 23301
+L33506 22967
+" />
+<path d="M33244 22967
+L33506 23301
+" />
+<path d="M33625 22967
+L33815 22967
+" />
+<path d="M33696 22801
+L33696 23229
+L33720 23277
+L33768 23301
+L33815 23301
+" />
+<path d="M34363 23301
+L34363 22801
+" />
+<path d="M34363 22991
+L34411 22967
+L34506 22967
+L34554 22991
+L34577 23015
+L34601 23063
+L34601 23205
+L34577 23253
+L34554 23277
+L34506 23301
+L34411 23301
+L34363 23277
+" />
+<path d="M34887 23301
+L34839 23277
+L34815 23253
+L34792 23205
+L34792 23063
+L34815 23015
+L34839 22991
+L34887 22967
+L34958 22967
+L35006 22991
+L35030 23015
+L35054 23063
+L35054 23205
+L35030 23253
+L35006 23277
+L34958 23301
+L34887 23301
+" />
+<path d="M35220 23301
+L35482 22967
+" />
+<path d="M35220 22967
+L35482 23301
+" />
+<path d="M36339 23253
+L36315 23277
+L36244 23301
+L36196 23301
+L36125 23277
+L36077 23229
+L36054 23182
+L36030 23086
+L36030 23015
+L36054 22920
+L36077 22872
+L36125 22825
+L36196 22801
+L36244 22801
+L36315 22825
+L36339 22848
 " />
 </g></g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
@@ -6086,339 +6207,203 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<g transform="rotate(-90.000000 31897.480315 22500.000000)">
-<text x="31897.480315" y="22500.000000"
-textLength="4302.047244" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+<text x="26500.000000" y="23362.480315"
+textLength="4130.000000" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
+text-anchor="start" opacity="0">Text box A</text>
+<g class="stroked-text"><desc>Text box A</desc>
+<path d="M26577 22838
+L26863 22838
+" />
+<path d="M26720 23338
+L26720 22838
+" />
+<path d="M27220 23314
+L27172 23338
+L27077 23338
+L27030 23314
+L27006 23267
+L27006 23076
+L27030 23029
+L27077 23005
+L27172 23005
+L27220 23029
+L27244 23076
+L27244 23124
+L27006 23171
+" />
+<path d="M27410 23338
+L27672 23005
+" />
+<path d="M27410 23005
+L27672 23338
+" />
+<path d="M27791 23005
+L27982 23005
+" />
+<path d="M27863 22838
+L27863 23267
+L27887 23314
+L27934 23338
+L27982 23338
+" />
+<path d="M28530 23338
+L28530 22838
+" />
+<path d="M28530 23029
+L28577 23005
+L28672 23005
+L28720 23029
+L28744 23052
+L28768 23100
+L28768 23243
+L28744 23291
+L28720 23314
+L28672 23338
+L28577 23338
+L28530 23314
+" />
+<path d="M29053 23338
+L29006 23314
+L28982 23291
+L28958 23243
+L28958 23100
+L28982 23052
+L29006 23029
+L29053 23005
+L29125 23005
+L29172 23029
+L29196 23052
+L29220 23100
+L29220 23243
+L29196 23291
+L29172 23314
+L29125 23338
+L29053 23338
+" />
+<path d="M29387 23338
+L29649 23005
+" />
+<path d="M29387 23005
+L29649 23338
+" />
+<path d="M30196 23195
+L30434 23195
+" />
+<path d="M30149 23338
+L30315 22838
+L30482 23338
+" />
+</g></g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:62.519685; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<g transform="rotate(-90.000000 31862.480315 22500.000000)">
+<text x="31862.480315" y="22500.000000"
+textLength="4232.047244" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
 text-anchor="start" opacity="0">Text box B</text>
 </g>
 <g class="stroked-text"><desc>Text box B</desc>
-<path d="M31373 22356
-L31373 22071
+<path d="M31338 22356
+L31338 22071
 " />
-<path d="M31873 22276
-L31373 22214
+<path d="M31838 22276
+L31338 22214
 " />
-<path d="M31849 21773
-L31873 21824
-L31873 21919
-L31849 21964
-L31802 21981
-L31611 21958
-L31564 21928
-L31540 21877
-L31540 21782
-L31564 21737
-L31611 21720
-L31659 21725
-L31706 21970
+<path d="M31814 21773
+L31838 21824
+L31838 21919
+L31814 21964
+L31767 21981
+L31576 21958
+L31529 21928
+L31505 21877
+L31505 21782
+L31529 21737
+L31576 21720
+L31624 21725
+L31671 21970
 " />
-<path d="M31873 21586
-L31540 21282
+<path d="M31838 21586
+L31505 21282
 " />
-<path d="M31540 21544
-L31873 21324
+<path d="M31505 21544
+L31838 21324
 " />
-<path d="M31540 21163
-L31540 20972
+<path d="M31505 21163
+L31505 20972
 " />
-<path d="M31373 21071
-L31802 21124
-L31849 21106
-L31873 21062
-L31873 21014
+<path d="M31338 21071
+L31767 21124
+L31814 21106
+L31838 21062
+L31838 21014
 " />
-<path d="M31873 20467
-L31373 20404
+<path d="M31838 20467
+L31338 20404
 " />
-<path d="M31564 20428
-L31540 20377
-L31540 20282
-L31564 20237
-L31587 20217
-L31635 20199
-L31778 20217
-L31826 20246
-L31849 20273
-L31873 20324
-L31873 20419
-L31849 20464
+<path d="M31529 20428
+L31505 20377
+L31505 20282
+L31529 20237
+L31552 20217
+L31600 20199
+L31743 20217
+L31791 20246
+L31814 20273
+L31838 20324
+L31838 20419
+L31814 20464
 " />
-<path d="M31873 19943
-L31849 19987
-L31826 20008
-L31778 20026
-L31635 20008
-L31587 19978
-L31564 19952
-L31540 19901
-L31540 19830
-L31564 19785
-L31587 19764
-L31635 19746
-L31778 19764
-L31826 19794
-L31849 19821
-L31873 19871
-L31873 19943
+<path d="M31838 19943
+L31814 19987
+L31791 20008
+L31743 20026
+L31600 20008
+L31552 19978
+L31529 19952
+L31505 19901
+L31505 19830
+L31529 19785
+L31552 19764
+L31600 19746
+L31743 19764
+L31791 19794
+L31814 19821
+L31838 19871
+L31838 19943
 " />
-<path d="M31873 19609
-L31540 19306
+<path d="M31838 19609
+L31505 19306
 " />
-<path d="M31540 19568
-L31873 19347
+<path d="M31505 19568
+L31838 19347
 " />
-<path d="M31611 18577
-L31635 18508
-L31659 18487
-L31706 18470
-L31778 18478
-L31826 18508
-L31849 18535
-L31873 18586
-L31873 18776
-L31373 18714
-L31373 18547
-L31397 18502
-L31421 18481
-L31468 18464
-L31516 18470
-L31564 18499
-L31587 18526
-L31611 18577
-L31611 18743
+<path d="M31576 18577
+L31600 18508
+L31624 18487
+L31671 18470
+L31743 18478
+L31791 18508
+L31814 18535
+L31838 18586
+L31838 18776
+L31338 18714
+L31338 18547
+L31362 18502
+L31386 18481
+L31433 18464
+L31481 18470
+L31529 18499
+L31552 18526
+L31576 18577
+L31576 18743
 " />
 </g></g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:62.519685; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="26500.000000" y="23397.480315"
-textLength="4060.000000" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="start" opacity="0">Text box A</text>
-<g class="stroked-text"><desc>Text box A</desc>
-<path d="M26577 22873
-L26863 22873
-" />
-<path d="M26720 23373
-L26720 22873
-" />
-<path d="M27220 23349
-L27172 23373
-L27077 23373
-L27030 23349
-L27006 23302
-L27006 23111
-L27030 23064
-L27077 23040
-L27172 23040
-L27220 23064
-L27244 23111
-L27244 23159
-L27006 23206
-" />
-<path d="M27410 23373
-L27672 23040
-" />
-<path d="M27410 23040
-L27672 23373
-" />
-<path d="M27791 23040
-L27982 23040
-" />
-<path d="M27863 22873
-L27863 23302
-L27887 23349
-L27934 23373
-L27982 23373
-" />
-<path d="M28530 23373
-L28530 22873
-" />
-<path d="M28530 23064
-L28577 23040
-L28672 23040
-L28720 23064
-L28744 23087
-L28768 23135
-L28768 23278
-L28744 23326
-L28720 23349
-L28672 23373
-L28577 23373
-L28530 23349
-" />
-<path d="M29053 23373
-L29006 23349
-L28982 23326
-L28958 23278
-L28958 23135
-L28982 23087
-L29006 23064
-L29053 23040
-L29125 23040
-L29172 23064
-L29196 23087
-L29220 23135
-L29220 23278
-L29196 23326
-L29172 23349
-L29125 23373
-L29053 23373
-" />
-<path d="M29387 23373
-L29649 23040
-" />
-<path d="M29387 23040
-L29649 23373
-" />
-<path d="M30196 23230
-L30434 23230
-" />
-<path d="M30149 23373
-L30315 22873
-L30482 23373
-" />
-</g></g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:100.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<text x="36500.000000" y="23360.000000"
-textLength="4131.417323" font-size="666.653543" lengthAdjust="spacingAndGlyphs"
-text-anchor="end" opacity="0">Text box C</text>
-<g class="stroked-text"><desc>Text box C</desc>
-<path d="M32411 22836
-L32696 22836
-" />
-<path d="M32554 23336
-L32554 22836
-" />
-<path d="M33054 23312
-L33006 23336
-L32911 23336
-L32863 23312
-L32839 23264
-L32839 23074
-L32863 23026
-L32911 23002
-L33006 23002
-L33054 23026
-L33077 23074
-L33077 23121
-L32839 23169
-" />
-<path d="M33244 23336
-L33506 23002
-" />
-<path d="M33244 23002
-L33506 23336
-" />
-<path d="M33625 23002
-L33815 23002
-" />
-<path d="M33696 22836
-L33696 23264
-L33720 23312
-L33768 23336
-L33815 23336
-" />
-<path d="M34363 23336
-L34363 22836
-" />
-<path d="M34363 23026
-L34411 23002
-L34506 23002
-L34554 23026
-L34577 23050
-L34601 23098
-L34601 23240
-L34577 23288
-L34554 23312
-L34506 23336
-L34411 23336
-L34363 23312
-" />
-<path d="M34887 23336
-L34839 23312
-L34815 23288
-L34792 23240
-L34792 23098
-L34815 23050
-L34839 23026
-L34887 23002
-L34958 23002
-L35006 23026
-L35030 23050
-L35054 23098
-L35054 23240
-L35030 23288
-L35006 23312
-L34958 23336
-L34887 23336
-" />
-<path d="M35220 23336
-L35482 23002
-" />
-<path d="M35220 23002
-L35482 23336
-" />
-<path d="M36339 23288
-L36315 23312
-L36244 23336
-L36196 23336
-L36125 23312
-L36077 23264
-L36054 23217
-L36030 23121
-L36030 23050
-L36054 22955
-L36077 22907
-L36125 22860
-L36196 22836
-L36244 22836
-L36315 22860
-L36339 22883
-" />
-</g></g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:200.000000,1000.000000;">
-<path d="M25100 57000
-L25100 62000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M35000 55000
-L30000 55000
-" />
-<path d="M30000 50000
-L35000 50000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:300.000000,300.000000;">
-<path d="M35000 10000
-L35000 15000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:300.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
@@ -6438,66 +6423,7 @@ stroke:#00FF00; stroke-width:300.000000; stroke-opacity:1;
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#00FF00; fill-opacity:0.0; 
-stroke:#00FF00; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M35000 50000
-L35000 55000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:1000.000000,1000.000000;">
-<path d="M9900 50000
-L14900 50000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-<path d="M30000 55000
-L30000 50000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:1000.000000,1000.000000;">
-<path d="M20100 62000
-L20100 57000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;">
-</g>
-<g style="fill:#FF00FF; fill-opacity:0.0; 
-stroke:#FF00FF; stroke-width:60.000000; 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.000000; stroke-opacity:1; 
+stroke:#00FF00; stroke-width:200.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
@@ -6507,8 +6433,8 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:1000.000000,1000.000000;">
-<path d="M14900 55000
-L9900 55000
+<path d="M14900 50000
+L14900 55000
 " />
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
@@ -6544,9 +6470,20 @@ stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
 stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:200.000000,1000.000000;">
+<path d="M25100 57000
+L25100 62000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:1000.000000,1000.000000;">
-<path d="M14900 50000
-L14900 55000
+<path d="M14900 55000
+L9900 55000
 " />
 </g>
 <g style="fill:#0000C2; fill-opacity:0.0; 
@@ -6557,17 +6494,89 @@ stroke-linecap:round; stroke-linejoin:round;">
 stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
-<g style="fill:#FF0000; fill-opacity:0.0; 
-stroke:#FF0000; stroke-width:60.000000; stroke-opacity:1; 
+<g style="fill:#FF00FF; fill-opacity:0.0; 
+stroke:#FF00FF; stroke-width:60.000000; 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.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
-<g style="fill:#FF0000; fill-opacity:0.0; 
-stroke:#FF0000; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:300.000000,300.000000;">
-<path d="M20000 50000
-L25000 50000
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:1000.000000,1000.000000;">
+<path d="M20100 62000
+L20100 57000
 " />
 </g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M30000 55000
+L30000 50000
+" />
+<path d="M35000 50000
+L35000 55000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:300.000000,300.000000;">
+<path d="M30000 15000
+L30000 10000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:300.000000,300.000000;">
+<path d="M35000 10000
+L35000 15000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+<path d="M30000 50000
+L35000 50000
+" />
+<path d="M35000 55000
+L30000 55000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:1000.000000,1000.000000;">
+<path d="M9900 50000
+L14900 50000
+" />
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:200.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#0000C2; fill-opacity:0.0; 
+stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
 <g style="fill:#FF0000; fill-opacity:0.0; 
 stroke:#FF0000; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
@@ -6647,30 +6656,37 @@ L30000 15000
 stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
-stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:300.000000,300.000000;">
-<path d="M30000 15000
-L30000 10000
-" />
-</g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:60.000000; stroke-opacity:1; 
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
-<g style="fill:#0000C2; fill-opacity:0.0; 
-stroke:#0000C2; stroke-width:120.000000; stroke-opacity:1; 
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;stroke-dasharray:300.000000,300.000000;">
+<path d="M20000 50000
+L25000 50000
+" />
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:60.000000; stroke-opacity:1; 
+stroke-linecap:round; stroke-linejoin:round;">
+</g>
+<g style="fill:#FF0000; fill-opacity:0.0; 
+stroke:#FF0000; stroke-width:120.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
 </g>
 <g style="fill:#000084; fill-opacity:0.0; 
 stroke:#000084; stroke-width:120.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
+<path d="M65000 35000
+L70000 35000
+" />
+<path d="M25000 10000
+L25000 15000
+" />
 <path d="M70000 38500
 L70000 40000
 " />
-<path d="M70000 35000
-L70000 38500
-" />
 <path d="M25000 10000
 L26000 9000
 " />
@@ -6680,24 +6696,21 @@ L25000 10000
 <path d="M25000 15000
 L20000 15000
 " />
-<path d="M65000 35000
-L70000 35000
-" />
 <path d="M25000 15000
 L26000 16000
 " />
 <path d="M20000 10000
 L19000 9000
 " />
-<path d="M25000 10000
-L25000 15000
-" />
 <path d="M20000 15000
 L19000 16000
 " />
 <path d="M20000 15000
 L20000 10000
 " />
+<path d="M70000 35000
+L70000 38500
+" />
 </g>
 <g style="fill:#000084; fill-opacity:0.0; 
 stroke:#000084; stroke-width:60.000000; stroke-opacity:1; 
@@ -6706,26 +6719,29 @@ stroke-linecap:round; stroke-linejoin:round;">
 <g style="fill:#009600; fill-opacity:0.0; 
 stroke:#009600; stroke-width:60.000000; stroke-opacity:1; 
 stroke-linecap:round; stroke-linejoin:round;">
-<path d="M71000 41000
-L75000 41000
+<path d="M50000 32500
+L51000 32500
 " />
-<path d="M50000 40500
-L51000 40500
-" />
-<path d="M51000 40500
-L51000 45000
-" />
-<path d="M39000 40500
-L40000 40500
-" />
-<path d="M51000 36500
-L39000 36500
+<path d="M10000 10000
+L15000 10000
 " />
 <path d="M38000 45000
 L38000 32500
 " />
-<path d="M10000 10000
-L15000 10000
+<path d="M51000 32500
+L51000 36500
+" />
+<path d="M51000 36500
+L39000 36500
+" />
+<path d="M10000 22000
+L10000 23000
+" />
+<path d="M39000 40500
+L40000 40500
+" />
+<path d="M50000 40500
+L51000 40500
 " />
 <path d="M51000 45000
 L38000 45000
@@ -6736,11 +6752,14 @@ L39000 40500
 <path d="M71000 39500
 L75000 39500
 " />
-<path d="M10000 23000
-L10000 24000
+<path d="M71000 41000
+L75000 41000
 " />
-<path d="M51000 32500
-L51000 36500
+<path d="M51000 40500
+L51000 45000
+" />
+<path d="M9000 23000
+L10000 23000
 " />
 <path d="M38000 32500
 L40000 32500
@@ -6751,41 +6770,35 @@ L15000 15000
 <path d="M10000 15000
 L10000 10000
 " />
-<path d="M9000 26000
-L11000 26000
-" />
-<path d="M50000 32500
-L51000 32500
-" />
 <path d="M15000 15000
 L10000 15000
 " />
-<path d="M9000 23000
-L10000 23000
-" />
-<path d="M10000 22000
-L10000 23000
-" />
 <path d="M10000 23000
 L11000 23000
 " />
+<path d="M9000 26000
+L11000 26000
+" />
+<path d="M10000 23000
+L10000 24000
+" />
 <path d="M15000 10000
 L16000 9000
 " />
-<path d="M70000 38500
-L71000 39500
-" />
-<path d="M70000 40000
-L71000 41000
-" />
 <path d="M15000 15000
 L16000 16000
 " />
+<path d="M10000 10000
+L9000 9000
+" />
 <path d="M10000 15000
 L9000 16000
 " />
-<path d="M10000 10000
-L9000 9000
+<path d="M70000 40000
+L71000 41000
+" />
+<path d="M70000 38500
+L71000 39500
 " />
 </g>
 <g style="fill:#000084; fill-opacity:0.0; 
diff --git a/tests/reference/6_0_4/test_v5.kicad_sch b/tests/reference/6_0_4/test_v5.kicad_sch
index e620409a..9ffe4814 100644
--- a/tests/reference/6_0_4/test_v5.kicad_sch
+++ b/tests/reference/6_0_4/test_v5.kicad_sch
@@ -120,10 +120,10 @@
     )
     (symbol "Device:R_US" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "R" (id 0) (at 2.54 0 90)
-        (effects (font (size 1.27 1.27)))
+        (effects (font (size 1.27 1.27)) (justify right))
       )
       (property "Value" "R_US" (id 1) (at -2.54 0 90)
-        (effects (font (size 1.27 1.27)))
+        (effects (font (size 1.27 1.27)) (justify right))
       )
       (property "Footprint" "" (id 2) (at 1.016 -0.254 90)
         (effects (font (size 1.27 1.27)) hide)
@@ -140,7 +140,16 @@
       (property "ki_fp_filters" "R_*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "R_US_0_1"
+      (symbol "R_US_0_0"
+        (bezier (pts
+            (xy 0 -0.762)
+            (xy 1.016 -1.143)
+            (xy 0 -1.524)
+            (xy -1.016 -1.905)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
         (polyline
           (pts
             (xy 0 -2.286)
@@ -157,17 +166,6 @@
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 0 -0.762)
-            (xy 1.016 -1.143)
-            (xy 0 -1.524)
-            (xy -1.016 -1.905)
-            (xy 0 -2.286)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
         (polyline
           (pts
             (xy 0 0.762)
@@ -195,6 +193,18 @@
         (pin passive line (at 0 3.81 270) (length 1.27)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
+          (alternate "Patita 1" passive line)
+        )
+        (pin passive line (at 0 -3.81 90) (length 1.27)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "R_US_1_2"
+        (pin passive line (at 0 3.81 270) (length 1.27)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+          (alternate "Patita 1" passive line)
         )
         (pin passive line (at 0 -3.81 90) (length 1.27)
           (name "~" (effects (font (size 1.27 1.27))))
@@ -1726,8 +1736,8 @@
     (pin "2" (uuid 15129e2c-3876-4c0d-83a8-7e8db04bdace))
   )
 
-  (symbol (lib_id "Device:R_US") (at 39.37 95.25 180) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "Device:R_US") (at 39.37 95.25 180) (unit 1) (convert 2)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005f3409f7)
     (property "Reference" "R2" (id 0) (at 41.0972 94.0816 0)
       (effects (font (size 1.27 1.27)) (justify right))
diff --git a/tests/reference/6_0_4/test_v5_wks-schematic_(no_L).pdf b/tests/reference/6_0_4/test_v5_wks-schematic_(no_L).pdf
index fcc51c21..9e5d1453 100644
Binary files a/tests/reference/6_0_4/test_v5_wks-schematic_(no_L).pdf and b/tests/reference/6_0_4/test_v5_wks-schematic_(no_L).pdf differ