diff --git a/pcb/diplexer.kicad_pcb b/pcb/diplexer.kicad_pcb
index fca7920..f26004a 100644
--- a/pcb/diplexer.kicad_pcb
+++ b/pcb/diplexer.kicad_pcb
@@ -1,11 +1,11 @@
-(kicad_pcb (version 20171130) (host pcbnew "(6.0.0-rc1-dev-163-g630631b41)")
+(kicad_pcb (version 20171130) (host pcbnew "(6.0.0-rc1-dev)")
 
   (general
     (thickness 1.6)
-    (drawings 24)
+    (drawings 30)
     (tracks 532)
     (zones 0)
-    (modules 32)
+    (modules 35)
     (nets 17)
   )
 
@@ -14,7 +14,7 @@
     (0 F.Cu signal)
     (31 B.Cu signal)
     (32 B.Adhes user)
-    (33 F.Adhes user hide)
+    (33 F.Adhes user)
     (34 B.Paste user)
     (35 F.Paste user)
     (36 B.SilkS user)
@@ -42,6 +42,8 @@
     (zone_clearance 0.3)
     (zone_45_only no)
     (trace_min 0.2)
+    (segment_width 0.2)
+    (edge_width 0.15)
     (via_size 0.8)
     (via_drill 0.4)
     (via_min_size 0.4)
@@ -51,20 +53,18 @@
     (uvias_allowed no)
     (uvia_min_size 0.2)
     (uvia_min_drill 0.1)
-    (edge_width 0.15)
-    (segment_width 0.2)
     (pcb_text_width 0.3)
     (pcb_text_size 1.5 1.5)
     (mod_edge_width 0.15)
     (mod_text_size 1.2 1.2)
     (mod_text_width 0.2)
-    (pad_size 1.5 1.5)
-    (pad_drill 0)
+    (pad_size 5 5)
+    (pad_drill 3.2)
     (pad_to_mask_clearance 0.2)
     (aux_axis_origin 120 43)
     (visible_elements FFFFFF7F)
     (pcbplotparams
-      (layerselection 0x010fc_ffffffff)
+      (layerselection 0x010f8_ffffffff)
       (usegerberextensions true)
       (usegerberattributes false)
       (usegerberadvancedattributes false)
@@ -135,6 +135,52 @@
     (add_net VCC)
   )
 
+  (module TestPoint:TestPoint_Loop_D3.80mm_Drill2.8mm (layer F.Cu) (tedit 5B6DF693) (tstamp 5B6E0815)
+    (at 131 85)
+    (descr "wire loop as test point, loop diameter 3.8mm, hole diameter 2.8mm")
+    (tags "test point wire loop bead")
+    (fp_text reference REF** (at 0.5 3.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value TestPoint_Loop_D3.80mm_Drill2.8mm (at 0 -3.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.3) (end -1.9 0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start -1.9 0.3) (end 1.9 0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start 1.9 0.3) (end 1.9 -0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start 1.9 -0.3) (end -1.9 -0.3) (layer F.Fab) (width 0.12))
+    (fp_circle (center 0 0) (end 2.9 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.7 0) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0.5 3.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 3.2) (layers *.Cu *.Mask)
+      (net 2 GND))
+  )
+
+  (module TestPoint:TestPoint_Loop_D3.80mm_Drill2.8mm (layer F.Cu) (tedit 5B6DF6AB) (tstamp 5B6E07C2)
+    (at 185 48)
+    (descr "wire loop as test point, loop diameter 3.8mm, hole diameter 2.8mm")
+    (tags "test point wire loop bead")
+    (fp_text reference REF** (at 0.5 3.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value TestPoint_Loop_D3.80mm_Drill2.8mm (at 0 -3.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.3) (end -1.9 0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start -1.9 0.3) (end 1.9 0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start 1.9 0.3) (end 1.9 -0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start 1.9 -0.3) (end -1.9 -0.3) (layer F.Fab) (width 0.12))
+    (fp_circle (center 0 0) (end 2.9 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.7 0) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0.5 3.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 3.2) (layers *.Cu *.Mask)
+      (net 2 GND))
+  )
+
   (module Capacitor_SMD:CP_Elec_6.3x5.3 (layer F.Cu) (tedit 5B3026A2) (tstamp 5B7E7287)
     (at 152.27 52 90)
     (descr "SMT capacitor, aluminium electrolytic, 6.3x5.3, Cornell Dubilier Electronics ")
@@ -2151,6 +2197,101 @@
       (xy -9.226193 -6.713586) (xy -9.169358 -6.756565)) (layer B.SilkS) (width 0.01))
   )
 
+  (module TestPoint:TestPoint_Loop_D3.80mm_Drill2.8mm (layer F.Cu) (tedit 5B6DF633) (tstamp 5B6E079D)
+    (at 185 85)
+    (descr "wire loop as test point, loop diameter 3.8mm, hole diameter 2.8mm")
+    (tags "test point wire loop bead")
+    (fp_text reference REF** (at 0.5 3.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value TestPoint_Loop_D3.80mm_Drill2.8mm (at 0 -3.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0.5 3.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.7 0) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 0 0) (end 2.9 0) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 -0.3) (end -1.9 -0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start 1.9 0.3) (end 1.9 -0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start -1.9 0.3) (end 1.9 0.3) (layer F.Fab) (width 0.12))
+    (fp_line (start -1.9 -0.3) (end -1.9 0.3) (layer F.Fab) (width 0.12))
+    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 3.2) (layers *.Cu *.Mask)
+      (net 2 GND))
+  )
+
+  (dimension 11 (width 0.3) (layer F.CrtYd)
+    (gr_text "11.000 mm" (at 125.5 98.1) (layer F.CrtYd)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 120 92) (xy 120 96.586421)))
+    (feature2 (pts (xy 131 92) (xy 131 96.586421)))
+    (crossbar (pts (xy 131 96) (xy 120 96)))
+    (arrow1a (pts (xy 120 96) (xy 121.126504 95.413579)))
+    (arrow1b (pts (xy 120 96) (xy 121.126504 96.586421)))
+    (arrow2a (pts (xy 131 96) (xy 129.873496 95.413579)))
+    (arrow2b (pts (xy 131 96) (xy 129.873496 96.586421)))
+  )
+  (dimension 54 (width 0.3) (layer F.CrtYd)
+    (gr_text "54.000 mm" (at 158 98.1) (layer F.CrtYd)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 131 92) (xy 131 96.586421)))
+    (feature2 (pts (xy 185 92) (xy 185 96.586421)))
+    (crossbar (pts (xy 185 96) (xy 131 96)))
+    (arrow1a (pts (xy 131 96) (xy 132.126504 95.413579)))
+    (arrow1b (pts (xy 131 96) (xy 132.126504 96.586421)))
+    (arrow2a (pts (xy 185 96) (xy 183.873496 95.413579)))
+    (arrow2b (pts (xy 185 96) (xy 183.873496 96.586421)))
+  )
+  (dimension 11 (width 0.3) (layer F.CrtYd)
+    (gr_text "11.000 mm" (at 190.5 98.1) (layer F.CrtYd)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 185 92) (xy 185 96.586421)))
+    (feature2 (pts (xy 196 92) (xy 196 96.586421)))
+    (crossbar (pts (xy 196 96) (xy 185 96)))
+    (arrow1a (pts (xy 185 96) (xy 186.126504 95.413579)))
+    (arrow1b (pts (xy 185 96) (xy 186.126504 96.586421)))
+    (arrow2a (pts (xy 196 96) (xy 194.873496 95.413579)))
+    (arrow2b (pts (xy 196 96) (xy 194.873496 96.586421)))
+  )
+  (dimension 37 (width 0.3) (layer F.CrtYd)
+    (gr_text "37.000 mm" (at 215.1 66.5 90) (layer F.CrtYd)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 209 48) (xy 213.586421 48)))
+    (feature2 (pts (xy 209 85) (xy 213.586421 85)))
+    (crossbar (pts (xy 213 85) (xy 213 48)))
+    (arrow1a (pts (xy 213 48) (xy 213.586421 49.126504)))
+    (arrow1b (pts (xy 213 48) (xy 212.413579 49.126504)))
+    (arrow2a (pts (xy 213 85) (xy 213.586421 83.873496)))
+    (arrow2b (pts (xy 213 85) (xy 212.413579 83.873496)))
+  )
+  (dimension 5 (width 0.3) (layer F.CrtYd)
+    (gr_text "5.000 mm" (at 215.1 87.5 90) (layer F.CrtYd)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 209 85) (xy 213.586421 85)))
+    (feature2 (pts (xy 209 90) (xy 213.586421 90)))
+    (crossbar (pts (xy 213 90) (xy 213 85)))
+    (arrow1a (pts (xy 213 85) (xy 213.586421 86.126504)))
+    (arrow1b (pts (xy 213 85) (xy 212.413579 86.126504)))
+    (arrow2a (pts (xy 213 90) (xy 213.586421 88.873496)))
+    (arrow2b (pts (xy 213 90) (xy 212.413579 88.873496)))
+  )
+  (dimension 5 (width 0.3) (layer F.CrtYd)
+    (gr_text "5.000 mm" (at 215.1 45.5 270) (layer F.CrtYd)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 209 48) (xy 213.586421 48)))
+    (feature2 (pts (xy 209 43) (xy 213.586421 43)))
+    (crossbar (pts (xy 213 43) (xy 213 48)))
+    (arrow1a (pts (xy 213 48) (xy 212.413579 46.873496)))
+    (arrow1b (pts (xy 213 48) (xy 213.586421 46.873496)))
+    (arrow2a (pts (xy 213 43) (xy 212.413579 44.126504)))
+    (arrow2b (pts (xy 213 43) (xy 213.586421 44.126504)))
+  )
   (gr_text OUT (at 128.27 77.47) (layer F.SilkS)
     (effects (font (size 1.5 1.5) (thickness 0.3)))
   )
@@ -2166,7 +2307,7 @@
   (gr_text "Satnogs Diplexer" (at 150.495 70.485) (layer F.SilkS)
     (effects (font (size 2 2) (thickness 0.3)))
   )
-  (gr_text "Sebastian Schumb DL1SSK 2018" (at 132.715 86.995) (layer B.SilkS)
+  (gr_text "Sebastian Schumb DL1SSK 2018" (at 145 87) (layer B.SilkS)
     (effects (font (size 0.8 0.8) (thickness 0.2)) (justify mirror))
   )
   (gr_text OUT (at 128.905 77.47) (layer B.SilkS)
@@ -2749,7 +2890,7 @@
   (segment (start 185.42 70.39) (end 180.34 70.39) (width 1.5) (layer F.Cu) (net 16))
   (segment (start 180.34 70.39) (end 177.07 70.39) (width 1.5) (layer F.Cu) (net 16))
 
-  (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5B6A0420) (hatch edge 0.508)
+  (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5B6E1021) (hatch edge 0.508)
     (connect_pads (clearance 0.3))
     (min_thickness 0.254)
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.75))
@@ -2768,58 +2909,73 @@
         (xy 193.308 73.338) (xy 193.288 73.338) (xy 193.288 74.77625) (xy 193.44675 74.935) (xy 195.498001 74.935)
         (xy 195.498001 80.005) (xy 193.44675 80.005) (xy 193.288 80.16375) (xy 193.288 81.602) (xy 193.308 81.602)
         (xy 193.308 82.098) (xy 193.288 82.098) (xy 193.288 83.53625) (xy 193.44675 83.695) (xy 195.498001 83.695)
-        (xy 195.498001 89.498) (xy 120.502 89.498) (xy 120.502 83.695) (xy 122.33325 83.695) (xy 122.492 83.53625)
-        (xy 122.492 82.098) (xy 122.988 82.098) (xy 122.988 83.53625) (xy 123.14675 83.695) (xy 125.406309 83.695)
-        (xy 125.639698 83.598327) (xy 125.818327 83.419699) (xy 125.915 83.18631) (xy 125.915 82.25675) (xy 189.865 82.25675)
+        (xy 195.498001 89.498) (xy 120.502 89.498) (xy 120.502 87.316148) (xy 129.034577 87.316148) (xy 129.327492 87.723932)
+        (xy 130.497207 88.156626) (xy 131.743469 88.108753) (xy 132.672508 87.723932) (xy 132.965423 87.316148) (xy 183.034577 87.316148)
+        (xy 183.327492 87.723932) (xy 184.497207 88.156626) (xy 185.743469 88.108753) (xy 186.672508 87.723932) (xy 186.965423 87.316148)
+        (xy 185 85.350725) (xy 183.034577 87.316148) (xy 132.965423 87.316148) (xy 131 85.350725) (xy 129.034577 87.316148)
+        (xy 120.502 87.316148) (xy 120.502 84.497207) (xy 127.843374 84.497207) (xy 127.891247 85.743469) (xy 128.276068 86.672508)
+        (xy 128.683852 86.965423) (xy 130.649275 85) (xy 131.350725 85) (xy 133.316148 86.965423) (xy 133.723932 86.672508)
+        (xy 134.156626 85.502793) (xy 134.117999 84.497207) (xy 181.843374 84.497207) (xy 181.891247 85.743469) (xy 182.276068 86.672508)
+        (xy 182.683852 86.965423) (xy 184.649275 85) (xy 185.350725 85) (xy 187.316148 86.965423) (xy 187.723932 86.672508)
+        (xy 188.156626 85.502793) (xy 188.108753 84.256531) (xy 187.723932 83.327492) (xy 187.316148 83.034577) (xy 185.350725 85)
+        (xy 184.649275 85) (xy 182.683852 83.034577) (xy 182.276068 83.327492) (xy 181.843374 84.497207) (xy 134.117999 84.497207)
+        (xy 134.108753 84.256531) (xy 133.723932 83.327492) (xy 133.316148 83.034577) (xy 131.350725 85) (xy 130.649275 85)
+        (xy 128.683852 83.034577) (xy 128.276068 83.327492) (xy 127.843374 84.497207) (xy 120.502 84.497207) (xy 120.502 83.695)
+        (xy 122.33325 83.695) (xy 122.492 83.53625) (xy 122.492 82.098) (xy 122.988 82.098) (xy 122.988 83.53625)
+        (xy 123.14675 83.695) (xy 125.406309 83.695) (xy 125.639698 83.598327) (xy 125.818327 83.419699) (xy 125.915 83.18631)
+        (xy 125.915 82.683852) (xy 129.034577 82.683852) (xy 131 84.649275) (xy 132.965423 82.683852) (xy 183.034577 82.683852)
+        (xy 185 84.649275) (xy 186.965423 82.683852) (xy 186.672508 82.276068) (xy 186.620286 82.25675) (xy 189.865 82.25675)
         (xy 189.865 83.18631) (xy 189.961673 83.419699) (xy 190.140302 83.598327) (xy 190.373691 83.695) (xy 192.63325 83.695)
-        (xy 192.792 83.53625) (xy 192.792 82.098) (xy 190.02375 82.098) (xy 189.865 82.25675) (xy 125.915 82.25675)
-        (xy 125.75625 82.098) (xy 122.988 82.098) (xy 122.492 82.098) (xy 122.472 82.098) (xy 122.472 81.602)
-        (xy 122.492 81.602) (xy 122.492 80.16375) (xy 122.988 80.16375) (xy 122.988 81.602) (xy 125.75625 81.602)
-        (xy 125.915 81.44325) (xy 125.915 80.51369) (xy 189.865 80.51369) (xy 189.865 81.44325) (xy 190.02375 81.602)
-        (xy 192.792 81.602) (xy 192.792 80.16375) (xy 192.63325 80.005) (xy 190.373691 80.005) (xy 190.140302 80.101673)
-        (xy 189.961673 80.280301) (xy 189.865 80.51369) (xy 125.915 80.51369) (xy 125.818327 80.280301) (xy 125.639698 80.101673)
-        (xy 125.406309 80.005) (xy 123.14675 80.005) (xy 122.988 80.16375) (xy 122.492 80.16375) (xy 122.33325 80.005)
-        (xy 120.502 80.005) (xy 120.502 74.935) (xy 122.33325 74.935) (xy 122.492 74.77625) (xy 122.492 73.338)
-        (xy 122.988 73.338) (xy 122.988 74.77625) (xy 123.14675 74.935) (xy 125.406309 74.935) (xy 125.639698 74.838327)
-        (xy 125.818327 74.659699) (xy 125.915 74.42631) (xy 125.915 73.49675) (xy 189.865 73.49675) (xy 189.865 74.42631)
-        (xy 189.961673 74.659699) (xy 190.140302 74.838327) (xy 190.373691 74.935) (xy 192.63325 74.935) (xy 192.792 74.77625)
-        (xy 192.792 73.338) (xy 190.02375 73.338) (xy 189.865 73.49675) (xy 125.915 73.49675) (xy 125.75625 73.338)
-        (xy 122.988 73.338) (xy 122.492 73.338) (xy 122.472 73.338) (xy 122.472 72.842) (xy 122.492 72.842)
-        (xy 122.492 71.40375) (xy 122.988 71.40375) (xy 122.988 72.842) (xy 125.75625 72.842) (xy 125.915 72.68325)
-        (xy 125.915 71.75369) (xy 189.865 71.75369) (xy 189.865 72.68325) (xy 190.02375 72.842) (xy 192.792 72.842)
-        (xy 192.792 71.40375) (xy 192.63325 71.245) (xy 190.373691 71.245) (xy 190.140302 71.341673) (xy 189.961673 71.520301)
-        (xy 189.865 71.75369) (xy 125.915 71.75369) (xy 125.818327 71.520301) (xy 125.639698 71.341673) (xy 125.406309 71.245)
-        (xy 123.14675 71.245) (xy 122.988 71.40375) (xy 122.492 71.40375) (xy 122.33325 71.245) (xy 120.502 71.245)
-        (xy 120.502 52.95) (xy 125.084635 52.95) (xy 125.084635 56.45) (xy 125.117775 56.616607) (xy 125.21215 56.75785)
-        (xy 125.353393 56.852225) (xy 125.52 56.885365) (xy 129.02 56.885365) (xy 129.186607 56.852225) (xy 129.32785 56.75785)
-        (xy 129.422225 56.616607) (xy 129.455365 56.45) (xy 129.455365 53.34) (xy 157.549943 53.34) (xy 157.641292 53.799242)
-        (xy 157.901431 54.188569) (xy 158.290758 54.448708) (xy 158.75 54.540057) (xy 159.209242 54.448708) (xy 159.500296 54.254232)
-        (xy 163.047529 50.707) (xy 168.422471 50.707) (xy 169.003 51.28753) (xy 169.003001 56.399076) (xy 169.003 56.399081)
-        (xy 169.003001 61.100809) (xy 168.927775 61.213393) (xy 168.894635 61.38) (xy 168.894635 63.08) (xy 168.927775 63.246607)
-        (xy 169.003 63.35919) (xy 169.003001 68.720809) (xy 168.927775 68.833393) (xy 168.894635 69) (xy 168.894635 70.7)
-        (xy 168.927775 70.866607) (xy 169.02215 71.00785) (xy 169.163393 71.102225) (xy 169.33 71.135365) (xy 171.03 71.135365)
-        (xy 171.196607 71.102225) (xy 171.33785 71.00785) (xy 171.432225 70.866607) (xy 171.465365 70.7) (xy 171.465365 70.088206)
-        (xy 171.517093 70.34826) (xy 171.799335 70.770665) (xy 172.22174 71.052907) (xy 172.594231 71.127) (xy 172.845769 71.127)
-        (xy 173.21826 71.052907) (xy 173.640665 70.770665) (xy 173.922907 70.34826) (xy 174.022017 69.85) (xy 173.922907 69.35174)
-        (xy 173.640665 68.929335) (xy 173.21826 68.647093) (xy 172.845769 68.573) (xy 172.594231 68.573) (xy 172.22174 68.647093)
-        (xy 171.799335 68.929335) (xy 171.517093 69.35174) (xy 171.465365 69.611794) (xy 171.465365 69) (xy 171.432225 68.833393)
-        (xy 171.357 68.72081) (xy 171.357 63.35919) (xy 171.432225 63.246607) (xy 171.465365 63.08) (xy 171.465365 62.468206)
-        (xy 171.517093 62.72826) (xy 171.799335 63.150665) (xy 172.22174 63.432907) (xy 172.594231 63.507) (xy 172.845769 63.507)
-        (xy 173.21826 63.432907) (xy 173.640665 63.150665) (xy 173.922907 62.72826) (xy 174.022017 62.23) (xy 173.922907 61.73174)
-        (xy 173.640665 61.309335) (xy 173.21826 61.027093) (xy 172.845769 60.953) (xy 172.594231 60.953) (xy 172.22174 61.027093)
-        (xy 171.799335 61.309335) (xy 171.517093 61.73174) (xy 171.465365 61.991794) (xy 171.465365 61.38) (xy 171.432225 61.213393)
-        (xy 171.357 61.10081) (xy 171.357 59.39675) (xy 189.865 59.39675) (xy 189.865 60.32631) (xy 189.961673 60.559699)
-        (xy 190.140302 60.738327) (xy 190.373691 60.835) (xy 192.63325 60.835) (xy 192.792 60.67625) (xy 192.792 59.238)
-        (xy 190.02375 59.238) (xy 189.865 59.39675) (xy 171.357 59.39675) (xy 171.357 57.65369) (xy 189.865 57.65369)
-        (xy 189.865 58.58325) (xy 190.02375 58.742) (xy 192.792 58.742) (xy 192.792 57.30375) (xy 192.63325 57.145)
-        (xy 190.373691 57.145) (xy 190.140302 57.241673) (xy 189.961673 57.420301) (xy 189.865 57.65369) (xy 171.357 57.65369)
-        (xy 171.357 50.915915) (xy 171.380057 50.799999) (xy 171.357 50.684084) (xy 171.357 50.68408) (xy 171.347586 50.63675)
-        (xy 189.865 50.63675) (xy 189.865 51.56631) (xy 189.961673 51.799699) (xy 190.140302 51.978327) (xy 190.373691 52.075)
-        (xy 192.63325 52.075) (xy 192.792 51.91625) (xy 192.792 50.478) (xy 190.02375 50.478) (xy 189.865 50.63675)
-        (xy 171.347586 50.63675) (xy 171.288709 50.340758) (xy 171.028569 49.951431) (xy 170.930299 49.885769) (xy 169.938219 48.89369)
-        (xy 189.865 48.89369) (xy 189.865 49.82325) (xy 190.02375 49.982) (xy 192.792 49.982) (xy 192.792 48.54375)
-        (xy 192.63325 48.385) (xy 190.373691 48.385) (xy 190.140302 48.481673) (xy 189.961673 48.660301) (xy 189.865 48.89369)
-        (xy 169.938219 48.89369) (xy 169.824234 48.779706) (xy 169.758569 48.681431) (xy 169.369242 48.421291) (xy 169.02592 48.353)
+        (xy 192.792 83.53625) (xy 192.792 82.098) (xy 190.02375 82.098) (xy 189.865 82.25675) (xy 186.620286 82.25675)
+        (xy 185.502793 81.843374) (xy 184.256531 81.891247) (xy 183.327492 82.276068) (xy 183.034577 82.683852) (xy 132.965423 82.683852)
+        (xy 132.672508 82.276068) (xy 131.502793 81.843374) (xy 130.256531 81.891247) (xy 129.327492 82.276068) (xy 129.034577 82.683852)
+        (xy 125.915 82.683852) (xy 125.915 82.25675) (xy 125.75625 82.098) (xy 122.988 82.098) (xy 122.492 82.098)
+        (xy 122.472 82.098) (xy 122.472 81.602) (xy 122.492 81.602) (xy 122.492 80.16375) (xy 122.988 80.16375)
+        (xy 122.988 81.602) (xy 125.75625 81.602) (xy 125.915 81.44325) (xy 125.915 80.51369) (xy 189.865 80.51369)
+        (xy 189.865 81.44325) (xy 190.02375 81.602) (xy 192.792 81.602) (xy 192.792 80.16375) (xy 192.63325 80.005)
+        (xy 190.373691 80.005) (xy 190.140302 80.101673) (xy 189.961673 80.280301) (xy 189.865 80.51369) (xy 125.915 80.51369)
+        (xy 125.818327 80.280301) (xy 125.639698 80.101673) (xy 125.406309 80.005) (xy 123.14675 80.005) (xy 122.988 80.16375)
+        (xy 122.492 80.16375) (xy 122.33325 80.005) (xy 120.502 80.005) (xy 120.502 74.935) (xy 122.33325 74.935)
+        (xy 122.492 74.77625) (xy 122.492 73.338) (xy 122.988 73.338) (xy 122.988 74.77625) (xy 123.14675 74.935)
+        (xy 125.406309 74.935) (xy 125.639698 74.838327) (xy 125.818327 74.659699) (xy 125.915 74.42631) (xy 125.915 73.49675)
+        (xy 189.865 73.49675) (xy 189.865 74.42631) (xy 189.961673 74.659699) (xy 190.140302 74.838327) (xy 190.373691 74.935)
+        (xy 192.63325 74.935) (xy 192.792 74.77625) (xy 192.792 73.338) (xy 190.02375 73.338) (xy 189.865 73.49675)
+        (xy 125.915 73.49675) (xy 125.75625 73.338) (xy 122.988 73.338) (xy 122.492 73.338) (xy 122.472 73.338)
+        (xy 122.472 72.842) (xy 122.492 72.842) (xy 122.492 71.40375) (xy 122.988 71.40375) (xy 122.988 72.842)
+        (xy 125.75625 72.842) (xy 125.915 72.68325) (xy 125.915 71.75369) (xy 189.865 71.75369) (xy 189.865 72.68325)
+        (xy 190.02375 72.842) (xy 192.792 72.842) (xy 192.792 71.40375) (xy 192.63325 71.245) (xy 190.373691 71.245)
+        (xy 190.140302 71.341673) (xy 189.961673 71.520301) (xy 189.865 71.75369) (xy 125.915 71.75369) (xy 125.818327 71.520301)
+        (xy 125.639698 71.341673) (xy 125.406309 71.245) (xy 123.14675 71.245) (xy 122.988 71.40375) (xy 122.492 71.40375)
+        (xy 122.33325 71.245) (xy 120.502 71.245) (xy 120.502 52.95) (xy 125.084635 52.95) (xy 125.084635 56.45)
+        (xy 125.117775 56.616607) (xy 125.21215 56.75785) (xy 125.353393 56.852225) (xy 125.52 56.885365) (xy 129.02 56.885365)
+        (xy 129.186607 56.852225) (xy 129.32785 56.75785) (xy 129.422225 56.616607) (xy 129.455365 56.45) (xy 129.455365 53.34)
+        (xy 157.549943 53.34) (xy 157.641292 53.799242) (xy 157.901431 54.188569) (xy 158.290758 54.448708) (xy 158.75 54.540057)
+        (xy 159.209242 54.448708) (xy 159.500296 54.254232) (xy 163.047529 50.707) (xy 168.422471 50.707) (xy 169.003 51.28753)
+        (xy 169.003001 56.399076) (xy 169.003 56.399081) (xy 169.003001 61.100809) (xy 168.927775 61.213393) (xy 168.894635 61.38)
+        (xy 168.894635 63.08) (xy 168.927775 63.246607) (xy 169.003 63.35919) (xy 169.003001 68.720809) (xy 168.927775 68.833393)
+        (xy 168.894635 69) (xy 168.894635 70.7) (xy 168.927775 70.866607) (xy 169.02215 71.00785) (xy 169.163393 71.102225)
+        (xy 169.33 71.135365) (xy 171.03 71.135365) (xy 171.196607 71.102225) (xy 171.33785 71.00785) (xy 171.432225 70.866607)
+        (xy 171.465365 70.7) (xy 171.465365 70.088206) (xy 171.517093 70.34826) (xy 171.799335 70.770665) (xy 172.22174 71.052907)
+        (xy 172.594231 71.127) (xy 172.845769 71.127) (xy 173.21826 71.052907) (xy 173.640665 70.770665) (xy 173.922907 70.34826)
+        (xy 174.022017 69.85) (xy 173.922907 69.35174) (xy 173.640665 68.929335) (xy 173.21826 68.647093) (xy 172.845769 68.573)
+        (xy 172.594231 68.573) (xy 172.22174 68.647093) (xy 171.799335 68.929335) (xy 171.517093 69.35174) (xy 171.465365 69.611794)
+        (xy 171.465365 69) (xy 171.432225 68.833393) (xy 171.357 68.72081) (xy 171.357 63.35919) (xy 171.432225 63.246607)
+        (xy 171.465365 63.08) (xy 171.465365 62.468206) (xy 171.517093 62.72826) (xy 171.799335 63.150665) (xy 172.22174 63.432907)
+        (xy 172.594231 63.507) (xy 172.845769 63.507) (xy 173.21826 63.432907) (xy 173.640665 63.150665) (xy 173.922907 62.72826)
+        (xy 174.022017 62.23) (xy 173.922907 61.73174) (xy 173.640665 61.309335) (xy 173.21826 61.027093) (xy 172.845769 60.953)
+        (xy 172.594231 60.953) (xy 172.22174 61.027093) (xy 171.799335 61.309335) (xy 171.517093 61.73174) (xy 171.465365 61.991794)
+        (xy 171.465365 61.38) (xy 171.432225 61.213393) (xy 171.357 61.10081) (xy 171.357 59.39675) (xy 189.865 59.39675)
+        (xy 189.865 60.32631) (xy 189.961673 60.559699) (xy 190.140302 60.738327) (xy 190.373691 60.835) (xy 192.63325 60.835)
+        (xy 192.792 60.67625) (xy 192.792 59.238) (xy 190.02375 59.238) (xy 189.865 59.39675) (xy 171.357 59.39675)
+        (xy 171.357 57.65369) (xy 189.865 57.65369) (xy 189.865 58.58325) (xy 190.02375 58.742) (xy 192.792 58.742)
+        (xy 192.792 57.30375) (xy 192.63325 57.145) (xy 190.373691 57.145) (xy 190.140302 57.241673) (xy 189.961673 57.420301)
+        (xy 189.865 57.65369) (xy 171.357 57.65369) (xy 171.357 50.915915) (xy 171.380057 50.799999) (xy 171.357 50.684084)
+        (xy 171.357 50.68408) (xy 171.288709 50.340758) (xy 171.272266 50.316148) (xy 183.034577 50.316148) (xy 183.327492 50.723932)
+        (xy 184.497207 51.156626) (xy 185.743469 51.108753) (xy 186.672508 50.723932) (xy 186.735131 50.63675) (xy 189.865 50.63675)
+        (xy 189.865 51.56631) (xy 189.961673 51.799699) (xy 190.140302 51.978327) (xy 190.373691 52.075) (xy 192.63325 52.075)
+        (xy 192.792 51.91625) (xy 192.792 50.478) (xy 190.02375 50.478) (xy 189.865 50.63675) (xy 186.735131 50.63675)
+        (xy 186.965423 50.316148) (xy 185 48.350725) (xy 183.034577 50.316148) (xy 171.272266 50.316148) (xy 171.028569 49.951431)
+        (xy 170.930299 49.885769) (xy 169.824234 48.779706) (xy 169.758569 48.681431) (xy 169.369242 48.421291) (xy 169.02592 48.353)
         (xy 169.025915 48.353) (xy 168.91 48.329943) (xy 168.794085 48.353) (xy 162.67592 48.353) (xy 162.56 48.329942)
         (xy 162.100757 48.421291) (xy 161.917485 48.54375) (xy 161.711431 48.681431) (xy 161.645767 48.779704) (xy 157.835768 52.589704)
         (xy 157.641292 52.880758) (xy 157.549943 53.34) (xy 129.455365 53.34) (xy 129.455365 52.95) (xy 129.422225 52.783393)
@@ -2833,12 +2989,20 @@
         (xy 132.32785 47.94215) (xy 132.186607 47.847775) (xy 132.02 47.814635) (xy 128.52 47.814635) (xy 128.353393 47.847775)
         (xy 128.21215 47.94215) (xy 128.117775 48.083393) (xy 128.084635 48.25) (xy 126.455365 48.25) (xy 126.422225 48.083393)
         (xy 126.32785 47.94215) (xy 126.186607 47.847775) (xy 126.02 47.814635) (xy 122.52 47.814635) (xy 122.353393 47.847775)
-        (xy 122.21215 47.94215) (xy 122.117775 48.083393) (xy 122.084635 48.25) (xy 120.502 48.25) (xy 120.502 43.502)
-        (xy 195.498 43.502)
+        (xy 122.21215 47.94215) (xy 122.117775 48.083393) (xy 122.084635 48.25) (xy 120.502 48.25) (xy 120.502 47.497207)
+        (xy 181.843374 47.497207) (xy 181.891247 48.743469) (xy 182.276068 49.672508) (xy 182.683852 49.965423) (xy 184.649275 48)
+        (xy 185.350725 48) (xy 187.316148 49.965423) (xy 187.723932 49.672508) (xy 188.012027 48.89369) (xy 189.865 48.89369)
+        (xy 189.865 49.82325) (xy 190.02375 49.982) (xy 192.792 49.982) (xy 192.792 48.54375) (xy 192.63325 48.385)
+        (xy 190.373691 48.385) (xy 190.140302 48.481673) (xy 189.961673 48.660301) (xy 189.865 48.89369) (xy 188.012027 48.89369)
+        (xy 188.156626 48.502793) (xy 188.108753 47.256531) (xy 187.723932 46.327492) (xy 187.316148 46.034577) (xy 185.350725 48)
+        (xy 184.649275 48) (xy 182.683852 46.034577) (xy 182.276068 46.327492) (xy 181.843374 47.497207) (xy 120.502 47.497207)
+        (xy 120.502 45.683852) (xy 183.034577 45.683852) (xy 185 47.649275) (xy 186.965423 45.683852) (xy 186.672508 45.276068)
+        (xy 185.502793 44.843374) (xy 184.256531 44.891247) (xy 183.327492 45.276068) (xy 183.034577 45.683852) (xy 120.502 45.683852)
+        (xy 120.502 43.502) (xy 195.498 43.502)
       )
     )
   )
-  (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 5B6A041D) (hatch edge 0.508)
+  (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 5B6E101E) (hatch edge 0.508)
     (connect_pads (clearance 0.3))
     (min_thickness 0.254)
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.75))
@@ -2883,7 +3047,13 @@
         (xy 189.865 80.544606) (xy 189.865 81.44325) (xy 190.02375 81.602) (xy 192.792 81.602) (xy 192.792 81.582)
         (xy 193.288 81.582) (xy 193.288 81.602) (xy 193.308 81.602) (xy 193.308 82.098) (xy 193.288 82.098)
         (xy 193.288 83.53625) (xy 193.44675 83.695) (xy 195.498001 83.695) (xy 195.498001 89.498) (xy 120.502 89.498)
-        (xy 120.502 83.98175) (xy 137.095 83.98175) (xy 137.095 84.276309) (xy 137.191673 84.509698) (xy 137.370301 84.688327)
+        (xy 120.502 87.316148) (xy 129.034577 87.316148) (xy 129.327492 87.723932) (xy 130.497207 88.156626) (xy 131.743469 88.108753)
+        (xy 132.672508 87.723932) (xy 132.965423 87.316148) (xy 183.034577 87.316148) (xy 183.327492 87.723932) (xy 184.497207 88.156626)
+        (xy 185.743469 88.108753) (xy 186.672508 87.723932) (xy 186.965423 87.316148) (xy 185 85.350725) (xy 183.034577 87.316148)
+        (xy 132.965423 87.316148) (xy 131 85.350725) (xy 129.034577 87.316148) (xy 120.502 87.316148) (xy 120.502 84.497207)
+        (xy 127.843374 84.497207) (xy 127.891247 85.743469) (xy 128.276068 86.672508) (xy 128.683852 86.965423) (xy 130.649275 85)
+        (xy 131.350725 85) (xy 133.316148 86.965423) (xy 133.723932 86.672508) (xy 134.156626 85.502793) (xy 134.108753 84.256531)
+        (xy 133.994935 83.98175) (xy 137.095 83.98175) (xy 137.095 84.276309) (xy 137.191673 84.509698) (xy 137.370301 84.688327)
         (xy 137.60369 84.785) (xy 138.02325 84.785) (xy 138.182 84.62625) (xy 138.182 83.823) (xy 138.678 83.823)
         (xy 138.678 84.62625) (xy 138.83675 84.785) (xy 139.25631 84.785) (xy 139.489699 84.688327) (xy 139.668327 84.509698)
         (xy 139.765 84.276309) (xy 139.765 83.98175) (xy 147.255 83.98175) (xy 147.255 84.276309) (xy 147.351673 84.509698)
@@ -2898,267 +3068,276 @@
         (xy 169.324699 85.288327) (xy 169.503327 85.109698) (xy 169.6 84.876309) (xy 169.6 84.44425) (xy 173.3 84.44425)
         (xy 173.3 84.876309) (xy 173.396673 85.109698) (xy 173.575301 85.288327) (xy 173.80869 85.385) (xy 174.85325 85.385)
         (xy 175.012 85.22625) (xy 175.012 84.2855) (xy 175.508 84.2855) (xy 175.508 85.22625) (xy 175.66675 85.385)
-        (xy 176.71131 85.385) (xy 176.944699 85.288327) (xy 177.123327 85.109698) (xy 177.22 84.876309) (xy 177.22 84.44425)
-        (xy 177.06125 84.2855) (xy 175.508 84.2855) (xy 175.012 84.2855) (xy 173.45875 84.2855) (xy 173.3 84.44425)
-        (xy 169.6 84.44425) (xy 169.44125 84.2855) (xy 167.888 84.2855) (xy 167.392 84.2855) (xy 165.83875 84.2855)
-        (xy 165.68 84.44425) (xy 161.98 84.44425) (xy 161.82125 84.2855) (xy 160.268 84.2855) (xy 159.772 84.2855)
-        (xy 158.21875 84.2855) (xy 158.06 84.44425) (xy 149.855436 84.44425) (xy 149.925 84.276309) (xy 149.925 83.98175)
-        (xy 149.76625 83.823) (xy 148.838 83.823) (xy 148.342 83.823) (xy 147.41375 83.823) (xy 147.255 83.98175)
-        (xy 139.765 83.98175) (xy 139.60625 83.823) (xy 138.678 83.823) (xy 138.182 83.823) (xy 137.25375 83.823)
-        (xy 137.095 83.98175) (xy 120.502 83.98175) (xy 120.502 83.695) (xy 122.33325 83.695) (xy 122.492 83.53625)
-        (xy 122.492 82.098) (xy 122.988 82.098) (xy 122.988 83.53625) (xy 123.14675 83.695) (xy 125.406309 83.695)
-        (xy 125.639698 83.598327) (xy 125.818327 83.419699) (xy 125.915 83.18631) (xy 125.915 82.25675) (xy 125.75625 82.098)
-        (xy 122.988 82.098) (xy 122.492 82.098) (xy 122.472 82.098) (xy 122.472 81.602) (xy 122.492 81.602)
-        (xy 122.492 81.582) (xy 122.988 81.582) (xy 122.988 81.602) (xy 125.75625 81.602) (xy 125.915 81.44325)
-        (xy 125.915 80.51369) (xy 125.842045 80.337561) (xy 126.589803 79.589803) (xy 126.617333 79.548601) (xy 126.627 79.5)
-        (xy 126.627 78.647) (xy 128.15408 78.647) (xy 128.27 78.670058) (xy 128.38592 78.647) (xy 130.734924 78.647)
-        (xy 130.766805 78.807278) (xy 130.915374 79.029626) (xy 131.137722 79.178195) (xy 131.4 79.230365) (xy 132.325 79.230365)
-        (xy 132.587278 79.178195) (xy 132.809626 79.029626) (xy 132.958195 78.807278) (xy 133.010365 78.545) (xy 133.010365 76.395)
-        (xy 133.689635 76.395) (xy 133.689635 78.545) (xy 133.741805 78.807278) (xy 133.890374 79.029626) (xy 134.112722 79.178195)
-        (xy 134.375 79.230365) (xy 135.3 79.230365) (xy 135.562278 79.178195) (xy 135.784626 79.029626) (xy 135.933195 78.807278)
-        (xy 135.965076 78.647) (xy 137.253001 78.647) (xy 137.253 81.415919) (xy 137.294635 81.625232) (xy 137.294635 81.850001)
-        (xy 137.346805 82.112278) (xy 137.495373 82.334627) (xy 137.564885 82.381073) (xy 137.370301 82.461673) (xy 137.191673 82.640302)
-        (xy 137.095 82.873691) (xy 137.095 83.16825) (xy 137.25375 83.327) (xy 138.182 83.327) (xy 138.182 83.307)
-        (xy 138.678 83.307) (xy 138.678 83.327) (xy 139.60625 83.327) (xy 139.765 83.16825) (xy 139.765 82.873691)
-        (xy 139.668327 82.640302) (xy 139.489699 82.461673) (xy 139.295115 82.381073) (xy 139.364627 82.334627) (xy 139.513195 82.112278)
-        (xy 139.565365 81.850001) (xy 139.565365 81.625233) (xy 139.607 81.41592) (xy 139.607 78.647) (xy 140.894924 78.647)
-        (xy 140.926805 78.807278) (xy 141.075374 79.029626) (xy 141.297722 79.178195) (xy 141.56 79.230365) (xy 142.485 79.230365)
-        (xy 142.747278 79.178195) (xy 142.969626 79.029626) (xy 143.118195 78.807278) (xy 143.170365 78.545) (xy 143.170365 76.395)
-        (xy 143.849635 76.395) (xy 143.849635 78.545) (xy 143.901805 78.807278) (xy 144.050374 79.029626) (xy 144.272722 79.178195)
-        (xy 144.535 79.230365) (xy 145.46 79.230365) (xy 145.722278 79.178195) (xy 145.944626 79.029626) (xy 146.093195 78.807278)
-        (xy 146.125076 78.647) (xy 147.413001 78.647) (xy 147.413 81.415919) (xy 147.454635 81.625232) (xy 147.454635 81.850001)
-        (xy 147.506805 82.112278) (xy 147.655373 82.334627) (xy 147.724885 82.381073) (xy 147.530301 82.461673) (xy 147.351673 82.640302)
-        (xy 147.255 82.873691) (xy 147.255 83.16825) (xy 147.41375 83.327) (xy 148.342 83.327) (xy 148.342 83.307)
-        (xy 148.838 83.307) (xy 148.838 83.327) (xy 149.76625 83.327) (xy 149.894559 83.198691) (xy 158.06 83.198691)
-        (xy 158.06 83.63075) (xy 158.21875 83.7895) (xy 159.772 83.7895) (xy 159.772 82.84875) (xy 160.268 82.84875)
-        (xy 160.268 83.7895) (xy 161.82125 83.7895) (xy 161.98 83.63075) (xy 161.98 83.198691) (xy 165.68 83.198691)
-        (xy 165.68 83.63075) (xy 165.83875 83.7895) (xy 167.392 83.7895) (xy 167.392 82.84875) (xy 167.888 82.84875)
-        (xy 167.888 83.7895) (xy 169.44125 83.7895) (xy 169.6 83.63075) (xy 169.6 83.198691) (xy 173.3 83.198691)
-        (xy 173.3 83.63075) (xy 173.45875 83.7895) (xy 175.012 83.7895) (xy 175.012 82.84875) (xy 175.508 82.84875)
-        (xy 175.508 83.7895) (xy 177.06125 83.7895) (xy 177.22 83.63075) (xy 177.22 83.198691) (xy 177.123327 82.965302)
-        (xy 176.944699 82.786673) (xy 176.71131 82.69) (xy 175.66675 82.69) (xy 175.508 82.84875) (xy 175.012 82.84875)
-        (xy 174.85325 82.69) (xy 173.80869 82.69) (xy 173.575301 82.786673) (xy 173.396673 82.965302) (xy 173.3 83.198691)
-        (xy 169.6 83.198691) (xy 169.503327 82.965302) (xy 169.324699 82.786673) (xy 169.09131 82.69) (xy 168.04675 82.69)
-        (xy 167.888 82.84875) (xy 167.392 82.84875) (xy 167.23325 82.69) (xy 166.18869 82.69) (xy 165.955301 82.786673)
-        (xy 165.776673 82.965302) (xy 165.68 83.198691) (xy 161.98 83.198691) (xy 161.883327 82.965302) (xy 161.704699 82.786673)
-        (xy 161.47131 82.69) (xy 160.42675 82.69) (xy 160.268 82.84875) (xy 159.772 82.84875) (xy 159.61325 82.69)
-        (xy 158.56869 82.69) (xy 158.335301 82.786673) (xy 158.156673 82.965302) (xy 158.06 83.198691) (xy 149.894559 83.198691)
-        (xy 149.925 83.16825) (xy 149.925 82.873691) (xy 149.828327 82.640302) (xy 149.649699 82.461673) (xy 149.455115 82.381073)
-        (xy 149.524627 82.334627) (xy 149.576662 82.25675) (xy 189.865 82.25675) (xy 189.865 83.18631) (xy 189.961673 83.419699)
-        (xy 190.140302 83.598327) (xy 190.373691 83.695) (xy 192.63325 83.695) (xy 192.792 83.53625) (xy 192.792 82.098)
-        (xy 190.02375 82.098) (xy 189.865 82.25675) (xy 149.576662 82.25675) (xy 149.673195 82.112278) (xy 149.725365 81.850001)
-        (xy 149.725365 81.625233) (xy 149.767 81.41592) (xy 149.767 78.647) (xy 151.054924 78.647) (xy 151.086805 78.807278)
-        (xy 151.235374 79.029626) (xy 151.457722 79.178195) (xy 151.72 79.230365) (xy 152.645 79.230365) (xy 152.907278 79.178195)
-        (xy 153.129626 79.029626) (xy 153.278195 78.807278) (xy 153.330365 78.545) (xy 153.330365 76.395) (xy 154.009635 76.395)
-        (xy 154.009635 78.545) (xy 154.061805 78.807278) (xy 154.210374 79.029626) (xy 154.432722 79.178195) (xy 154.695 79.230365)
-        (xy 155.62 79.230365) (xy 155.882278 79.178195) (xy 156.104626 79.029626) (xy 156.253195 78.807278) (xy 156.285076 78.647)
-        (xy 158.843001 78.647) (xy 158.843 79.934924) (xy 158.682722 79.966805) (xy 158.460374 80.115374) (xy 158.311805 80.337722)
-        (xy 158.259635 80.6) (xy 158.259635 81.525) (xy 158.311805 81.787278) (xy 158.460374 82.009626) (xy 158.682722 82.158195)
-        (xy 158.945 82.210365) (xy 161.095 82.210365) (xy 161.357278 82.158195) (xy 161.579626 82.009626) (xy 161.728195 81.787278)
-        (xy 161.780365 81.525) (xy 161.780365 80.6) (xy 161.728195 80.337722) (xy 161.579626 80.115374) (xy 161.357278 79.966805)
-        (xy 161.197 79.934924) (xy 161.197 78.647) (xy 162.69592 78.647) (xy 162.905233 78.605365) (xy 163.130001 78.605365)
-        (xy 163.392278 78.553195) (xy 163.614627 78.404627) (xy 163.763195 78.182278) (xy 163.815365 77.920001) (xy 163.815365 77.019999)
-        (xy 163.844635 77.019999) (xy 163.844635 77.920001) (xy 163.896805 78.182278) (xy 164.045373 78.404627) (xy 164.267722 78.553195)
-        (xy 164.529999 78.605365) (xy 164.754767 78.605365) (xy 164.96408 78.647) (xy 166.463 78.647) (xy 166.463001 79.934924)
-        (xy 166.302722 79.966805) (xy 166.080374 80.115374) (xy 165.931805 80.337722) (xy 165.879635 80.6) (xy 165.879635 81.525)
-        (xy 165.931805 81.787278) (xy 166.080374 82.009626) (xy 166.302722 82.158195) (xy 166.565 82.210365) (xy 168.715 82.210365)
-        (xy 168.977278 82.158195) (xy 169.199626 82.009626) (xy 169.348195 81.787278) (xy 169.400365 81.525) (xy 169.400365 80.6)
-        (xy 169.348195 80.337722) (xy 169.199626 80.115374) (xy 168.977278 79.966805) (xy 168.817 79.934924) (xy 168.817 78.647)
-        (xy 170.31592 78.647) (xy 170.525233 78.605365) (xy 170.750001 78.605365) (xy 171.012278 78.553195) (xy 171.234627 78.404627)
-        (xy 171.383195 78.182278) (xy 171.435365 77.920001) (xy 171.435365 77.019999) (xy 171.464635 77.019999) (xy 171.464635 77.920001)
-        (xy 171.516805 78.182278) (xy 171.665373 78.404627) (xy 171.887722 78.553195) (xy 172.149999 78.605365) (xy 172.374767 78.605365)
-        (xy 172.58408 78.647) (xy 174.083 78.647) (xy 174.083001 79.934924) (xy 173.922722 79.966805) (xy 173.700374 80.115374)
-        (xy 173.551805 80.337722) (xy 173.499635 80.6) (xy 173.499635 81.525) (xy 173.551805 81.787278) (xy 173.700374 82.009626)
-        (xy 173.922722 82.158195) (xy 174.185 82.210365) (xy 176.335 82.210365) (xy 176.597278 82.158195) (xy 176.819626 82.009626)
-        (xy 176.968195 81.787278) (xy 177.020365 81.525) (xy 177.020365 80.6) (xy 176.968195 80.337722) (xy 176.819626 80.115374)
-        (xy 176.597278 79.966805) (xy 176.437 79.934924) (xy 176.437 78.647) (xy 180.47592 78.647) (xy 180.685233 78.605365)
-        (xy 180.910001 78.605365) (xy 181.172278 78.553195) (xy 181.394627 78.404627) (xy 181.543195 78.182278) (xy 181.595365 77.920001)
-        (xy 181.595365 77.019999) (xy 181.543195 76.757722) (xy 181.394627 76.535373) (xy 181.172278 76.386805) (xy 180.910001 76.334635)
-        (xy 180.685233 76.334635) (xy 180.47592 76.293) (xy 175.37592 76.293) (xy 175.26 76.269942) (xy 175.14408 76.293)
-        (xy 172.58408 76.293) (xy 172.374767 76.334635) (xy 172.149999 76.334635) (xy 171.887722 76.386805) (xy 171.665373 76.535373)
-        (xy 171.516805 76.757722) (xy 171.464635 77.019999) (xy 171.435365 77.019999) (xy 171.383195 76.757722) (xy 171.234627 76.535373)
-        (xy 171.012278 76.386805) (xy 170.750001 76.334635) (xy 170.525233 76.334635) (xy 170.31592 76.293) (xy 167.75592 76.293)
-        (xy 167.64 76.269942) (xy 167.52408 76.293) (xy 164.96408 76.293) (xy 164.754767 76.334635) (xy 164.529999 76.334635)
-        (xy 164.267722 76.386805) (xy 164.045373 76.535373) (xy 163.896805 76.757722) (xy 163.844635 77.019999) (xy 163.815365 77.019999)
-        (xy 163.763195 76.757722) (xy 163.614627 76.535373) (xy 163.392278 76.386805) (xy 163.130001 76.334635) (xy 162.905233 76.334635)
-        (xy 162.69592 76.293) (xy 160.13592 76.293) (xy 160.02 76.269942) (xy 159.90408 76.293) (xy 156.285076 76.293)
-        (xy 156.253195 76.132722) (xy 156.104626 75.910374) (xy 155.882278 75.761805) (xy 155.62 75.709635) (xy 154.695 75.709635)
-        (xy 154.432722 75.761805) (xy 154.210374 75.910374) (xy 154.061805 76.132722) (xy 154.009635 76.395) (xy 153.330365 76.395)
-        (xy 153.278195 76.132722) (xy 153.129626 75.910374) (xy 152.907278 75.761805) (xy 152.645 75.709635) (xy 151.72 75.709635)
-        (xy 151.457722 75.761805) (xy 151.235374 75.910374) (xy 151.086805 76.132722) (xy 151.054924 76.293) (xy 148.70592 76.293)
-        (xy 148.59 76.269942) (xy 148.47408 76.293) (xy 146.125076 76.293) (xy 146.093195 76.132722) (xy 145.944626 75.910374)
-        (xy 145.722278 75.761805) (xy 145.46 75.709635) (xy 144.535 75.709635) (xy 144.272722 75.761805) (xy 144.050374 75.910374)
-        (xy 143.901805 76.132722) (xy 143.849635 76.395) (xy 143.170365 76.395) (xy 143.118195 76.132722) (xy 142.969626 75.910374)
-        (xy 142.747278 75.761805) (xy 142.485 75.709635) (xy 141.56 75.709635) (xy 141.297722 75.761805) (xy 141.075374 75.910374)
-        (xy 140.926805 76.132722) (xy 140.894924 76.293) (xy 138.54592 76.293) (xy 138.43 76.269942) (xy 138.31408 76.293)
-        (xy 135.965076 76.293) (xy 135.933195 76.132722) (xy 135.784626 75.910374) (xy 135.562278 75.761805) (xy 135.3 75.709635)
-        (xy 134.375 75.709635) (xy 134.112722 75.761805) (xy 133.890374 75.910374) (xy 133.741805 76.132722) (xy 133.689635 76.395)
-        (xy 133.010365 76.395) (xy 132.958195 76.132722) (xy 132.809626 75.910374) (xy 132.587278 75.761805) (xy 132.325 75.709635)
-        (xy 131.4 75.709635) (xy 131.137722 75.761805) (xy 130.915374 75.910374) (xy 130.766805 76.132722) (xy 130.734924 76.293)
-        (xy 129.447 76.293) (xy 129.447 75.417528) (xy 130.797778 74.06675) (xy 176.835 74.06675) (xy 176.835 74.48631)
-        (xy 176.931673 74.719699) (xy 177.110302 74.898327) (xy 177.343691 74.995) (xy 177.63825 74.995) (xy 177.797 74.83625)
-        (xy 177.797 73.908) (xy 176.99375 73.908) (xy 176.835 74.06675) (xy 130.797778 74.06675) (xy 132.030838 72.83369)
-        (xy 176.835 72.83369) (xy 176.835 73.25325) (xy 176.99375 73.412) (xy 177.797 73.412) (xy 177.797 72.48375)
-        (xy 177.63825 72.325) (xy 177.343691 72.325) (xy 177.110302 72.421673) (xy 176.931673 72.600301) (xy 176.835 72.83369)
-        (xy 132.030838 72.83369) (xy 135.864528 69) (xy 168.894635 69) (xy 168.894635 70.7) (xy 168.927775 70.866607)
-        (xy 169.02215 71.00785) (xy 169.163393 71.102225) (xy 169.33 71.135365) (xy 171.03 71.135365) (xy 171.196607 71.102225)
-        (xy 171.33785 71.00785) (xy 171.432225 70.866607) (xy 171.465365 70.7) (xy 171.465365 70.088206) (xy 171.517093 70.34826)
-        (xy 171.799335 70.770665) (xy 172.22174 71.052907) (xy 172.594231 71.127) (xy 172.845769 71.127) (xy 173.21826 71.052907)
-        (xy 173.257033 71.027) (xy 176.042471 71.027) (xy 176.155767 71.140296) (xy 176.221431 71.238569) (xy 176.610758 71.498709)
-        (xy 176.95408 71.567) (xy 176.954084 71.567) (xy 177.069999 71.590057) (xy 177.185915 71.567) (xy 179.143001 71.567)
-        (xy 179.143 72.584974) (xy 178.979698 72.421673) (xy 178.746309 72.325) (xy 178.45175 72.325) (xy 178.293 72.48375)
-        (xy 178.293 73.412) (xy 178.313 73.412) (xy 178.313 73.908) (xy 178.293 73.908) (xy 178.293 74.83625)
-        (xy 178.45175 74.995) (xy 178.746309 74.995) (xy 178.979698 74.898327) (xy 179.158327 74.719699) (xy 179.238927 74.525115)
-        (xy 179.285373 74.594627) (xy 179.507722 74.743195) (xy 179.769999 74.795365) (xy 179.994767 74.795365) (xy 180.32 74.860058)
-        (xy 180.779241 74.768709) (xy 181.168569 74.508569) (xy 181.428709 74.119242) (xy 181.497 73.77592) (xy 181.497 71.567)
-        (xy 183.699815 71.567) (xy 183.711805 71.627278) (xy 183.860374 71.849626) (xy 184.082722 71.998195) (xy 184.345 72.050365)
-        (xy 186.495 72.050365) (xy 186.757278 71.998195) (xy 186.979626 71.849626) (xy 187.043728 71.75369) (xy 189.865 71.75369)
-        (xy 189.865 72.68325) (xy 190.02375 72.842) (xy 192.792 72.842) (xy 192.792 71.40375) (xy 192.63325 71.245)
-        (xy 190.373691 71.245) (xy 190.140302 71.341673) (xy 189.961673 71.520301) (xy 189.865 71.75369) (xy 187.043728 71.75369)
-        (xy 187.128195 71.627278) (xy 187.180365 71.365) (xy 187.180365 70.44) (xy 187.128195 70.177722) (xy 186.979626 69.955374)
-        (xy 186.757278 69.806805) (xy 186.495 69.754635) (xy 186.411027 69.754635) (xy 186.268569 69.541431) (xy 185.879242 69.281291)
-        (xy 185.53592 69.213) (xy 180.455915 69.213) (xy 180.339999 69.189943) (xy 180.224084 69.213) (xy 177.557528 69.213)
-        (xy 177.444234 69.099706) (xy 177.378569 69.001431) (xy 176.989242 68.741291) (xy 176.64592 68.673) (xy 176.645915 68.673)
-        (xy 176.53 68.649943) (xy 176.414085 68.673) (xy 173.257033 68.673) (xy 173.21826 68.647093) (xy 172.845769 68.573)
-        (xy 172.594231 68.573) (xy 172.22174 68.647093) (xy 171.799335 68.929335) (xy 171.517093 69.35174) (xy 171.465365 69.611794)
-        (xy 171.465365 69) (xy 171.432225 68.833393) (xy 171.33785 68.69215) (xy 171.196607 68.597775) (xy 171.03 68.564635)
-        (xy 169.33 68.564635) (xy 169.163393 68.597775) (xy 169.02215 68.69215) (xy 168.927775 68.833393) (xy 168.894635 69)
-        (xy 135.864528 69) (xy 138.917529 65.947) (xy 153.554085 65.947) (xy 153.67 65.970057) (xy 153.785915 65.947)
-        (xy 153.78592 65.947) (xy 154.129242 65.878709) (xy 154.518569 65.618569) (xy 154.584235 65.520293) (xy 158.724528 61.38)
-        (xy 168.894635 61.38) (xy 168.894635 63.08) (xy 168.927775 63.246607) (xy 169.02215 63.38785) (xy 169.163393 63.482225)
-        (xy 169.33 63.515365) (xy 171.03 63.515365) (xy 171.196607 63.482225) (xy 171.33785 63.38785) (xy 171.432225 63.246607)
-        (xy 171.465365 63.08) (xy 171.465365 62.468206) (xy 171.517093 62.72826) (xy 171.799335 63.150665) (xy 172.22174 63.432907)
-        (xy 172.594231 63.507) (xy 172.845769 63.507) (xy 173.21826 63.432907) (xy 173.257033 63.407) (xy 176.414085 63.407)
-        (xy 176.53 63.430057) (xy 176.645915 63.407) (xy 176.64592 63.407) (xy 176.989242 63.338709) (xy 177.378569 63.078569)
-        (xy 177.444234 62.980294) (xy 177.557528 62.867) (xy 180.224084 62.867) (xy 180.339999 62.890057) (xy 180.455915 62.867)
-        (xy 185.53592 62.867) (xy 185.879242 62.798709) (xy 186.268569 62.538569) (xy 186.411027 62.325365) (xy 186.495 62.325365)
-        (xy 186.757278 62.273195) (xy 186.979626 62.124626) (xy 187.128195 61.902278) (xy 187.180365 61.64) (xy 187.180365 60.715)
-        (xy 187.128195 60.452722) (xy 186.979626 60.230374) (xy 186.757278 60.081805) (xy 186.495 60.029635) (xy 184.345 60.029635)
-        (xy 184.082722 60.081805) (xy 183.860374 60.230374) (xy 183.711805 60.452722) (xy 183.699815 60.513) (xy 181.497 60.513)
-        (xy 181.497 59.39675) (xy 189.865 59.39675) (xy 189.865 60.32631) (xy 189.961673 60.559699) (xy 190.140302 60.738327)
-        (xy 190.373691 60.835) (xy 192.63325 60.835) (xy 192.792 60.67625) (xy 192.792 59.238) (xy 190.02375 59.238)
-        (xy 189.865 59.39675) (xy 181.497 59.39675) (xy 181.497 58.30408) (xy 181.428709 57.960758) (xy 181.168569 57.571431)
-        (xy 180.779241 57.311291) (xy 180.32 57.219942) (xy 179.994767 57.284635) (xy 179.769999 57.284635) (xy 179.507722 57.336805)
-        (xy 179.285373 57.485373) (xy 179.238927 57.554885) (xy 179.158327 57.360301) (xy 178.979698 57.181673) (xy 178.746309 57.085)
-        (xy 178.45175 57.085) (xy 178.293 57.24375) (xy 178.293 58.172) (xy 178.313 58.172) (xy 178.313 58.668)
-        (xy 178.293 58.668) (xy 178.293 59.59625) (xy 178.45175 59.755) (xy 178.746309 59.755) (xy 178.979698 59.658327)
-        (xy 179.143 59.495026) (xy 179.143001 60.513) (xy 177.185915 60.513) (xy 177.069999 60.489943) (xy 176.954084 60.513)
-        (xy 176.95408 60.513) (xy 176.610758 60.581291) (xy 176.221431 60.841431) (xy 176.155768 60.939703) (xy 176.042471 61.053)
-        (xy 173.257033 61.053) (xy 173.21826 61.027093) (xy 172.845769 60.953) (xy 172.594231 60.953) (xy 172.22174 61.027093)
-        (xy 171.799335 61.309335) (xy 171.517093 61.73174) (xy 171.465365 61.991794) (xy 171.465365 61.38) (xy 171.432225 61.213393)
-        (xy 171.33785 61.07215) (xy 171.196607 60.977775) (xy 171.03 60.944635) (xy 169.33 60.944635) (xy 169.163393 60.977775)
-        (xy 169.02215 61.07215) (xy 168.927775 61.213393) (xy 168.894635 61.38) (xy 158.724528 61.38) (xy 161.277778 58.82675)
-        (xy 176.835 58.82675) (xy 176.835 59.24631) (xy 176.931673 59.479699) (xy 177.110302 59.658327) (xy 177.343691 59.755)
-        (xy 177.63825 59.755) (xy 177.797 59.59625) (xy 177.797 58.668) (xy 176.99375 58.668) (xy 176.835 58.82675)
-        (xy 161.277778 58.82675) (xy 162.510838 57.59369) (xy 176.835 57.59369) (xy 176.835 58.01325) (xy 176.99375 58.172)
-        (xy 177.797 58.172) (xy 177.797 57.24375) (xy 177.63825 57.085) (xy 177.343691 57.085) (xy 177.110302 57.181673)
-        (xy 176.931673 57.360301) (xy 176.835 57.59369) (xy 162.510838 57.59369) (xy 164.317529 55.787) (xy 165.23592 55.787)
-        (xy 165.445233 55.745365) (xy 165.670001 55.745365) (xy 165.932278 55.693195) (xy 166.154627 55.544627) (xy 166.303195 55.322278)
-        (xy 166.355365 55.060001) (xy 166.355365 54.159999) (xy 166.384635 54.159999) (xy 166.384635 55.060001) (xy 166.436805 55.322278)
-        (xy 166.585373 55.544627) (xy 166.807722 55.693195) (xy 167.069999 55.745365) (xy 167.294767 55.745365) (xy 167.50408 55.787)
-        (xy 170.06408 55.787) (xy 170.18 55.810058) (xy 170.29592 55.787) (xy 172.85592 55.787) (xy 173.065233 55.745365)
-        (xy 173.290001 55.745365) (xy 173.552278 55.693195) (xy 173.774627 55.544627) (xy 173.923195 55.322278) (xy 173.975365 55.060001)
-        (xy 173.975365 54.159999) (xy 174.004635 54.159999) (xy 174.004635 55.060001) (xy 174.056805 55.322278) (xy 174.205373 55.544627)
-        (xy 174.427722 55.693195) (xy 174.689999 55.745365) (xy 174.914767 55.745365) (xy 175.12408 55.787) (xy 177.68408 55.787)
-        (xy 177.8 55.810058) (xy 177.91592 55.787) (xy 180.47592 55.787) (xy 180.685233 55.745365) (xy 180.910001 55.745365)
-        (xy 181.172278 55.693195) (xy 181.394627 55.544627) (xy 181.543195 55.322278) (xy 181.595365 55.060001) (xy 181.595365 54.159999)
-        (xy 181.543195 53.897722) (xy 181.394627 53.675373) (xy 181.172278 53.526805) (xy 180.910001 53.474635) (xy 180.685233 53.474635)
-        (xy 180.47592 53.433) (xy 178.977 53.433) (xy 178.977 52.145076) (xy 179.137278 52.113195) (xy 179.359626 51.964626)
-        (xy 179.508195 51.742278) (xy 179.560365 51.48) (xy 179.560365 50.555) (xy 179.508195 50.292722) (xy 179.359626 50.070374)
-        (xy 179.137278 49.921805) (xy 178.875 49.869635) (xy 176.725 49.869635) (xy 176.462722 49.921805) (xy 176.240374 50.070374)
-        (xy 176.091805 50.292722) (xy 176.039635 50.555) (xy 176.039635 51.48) (xy 176.091805 51.742278) (xy 176.240374 51.964626)
-        (xy 176.462722 52.113195) (xy 176.623 52.145076) (xy 176.623001 53.433) (xy 175.12408 53.433) (xy 174.914767 53.474635)
-        (xy 174.689999 53.474635) (xy 174.427722 53.526805) (xy 174.205373 53.675373) (xy 174.056805 53.897722) (xy 174.004635 54.159999)
-        (xy 173.975365 54.159999) (xy 173.923195 53.897722) (xy 173.774627 53.675373) (xy 173.552278 53.526805) (xy 173.290001 53.474635)
-        (xy 173.065233 53.474635) (xy 172.85592 53.433) (xy 171.357 53.433) (xy 171.357 52.145076) (xy 171.517278 52.113195)
-        (xy 171.739626 51.964626) (xy 171.888195 51.742278) (xy 171.940365 51.48) (xy 171.940365 50.555) (xy 171.888195 50.292722)
-        (xy 171.739626 50.070374) (xy 171.517278 49.921805) (xy 171.255 49.869635) (xy 169.105 49.869635) (xy 168.842722 49.921805)
-        (xy 168.620374 50.070374) (xy 168.471805 50.292722) (xy 168.419635 50.555) (xy 168.419635 51.48) (xy 168.471805 51.742278)
-        (xy 168.620374 51.964626) (xy 168.842722 52.113195) (xy 169.003 52.145076) (xy 169.003001 53.433) (xy 167.50408 53.433)
-        (xy 167.294767 53.474635) (xy 167.069999 53.474635) (xy 166.807722 53.526805) (xy 166.585373 53.675373) (xy 166.436805 53.897722)
-        (xy 166.384635 54.159999) (xy 166.355365 54.159999) (xy 166.303195 53.897722) (xy 166.154627 53.675373) (xy 165.932278 53.526805)
-        (xy 165.670001 53.474635) (xy 165.445233 53.474635) (xy 165.23592 53.433) (xy 163.945915 53.433) (xy 163.83 53.409943)
-        (xy 163.714084 53.433) (xy 163.71408 53.433) (xy 163.370758 53.501291) (xy 162.981431 53.761431) (xy 162.915767 53.859704)
-        (xy 153.182472 63.593) (xy 138.545915 63.593) (xy 138.43 63.569943) (xy 138.314084 63.593) (xy 138.31408 63.593)
-        (xy 137.970758 63.661291) (xy 137.581431 63.921431) (xy 137.515767 64.019704) (xy 127.519705 74.015767) (xy 127.421432 74.081431)
-        (xy 127.355768 74.179704) (xy 127.161292 74.470758) (xy 127.069943 74.93) (xy 127.093001 75.04592) (xy 127.093 76.293)
-        (xy 126.627 76.293) (xy 126.627 75.5) (xy 126.617333 75.451399) (xy 126.589803 75.410197) (xy 125.824471 74.644865)
-        (xy 125.915 74.42631) (xy 125.915 73.49675) (xy 125.75625 73.338) (xy 122.988 73.338) (xy 122.988 73.358)
-        (xy 122.492 73.358) (xy 122.492 73.338) (xy 122.472 73.338) (xy 122.472 72.842) (xy 122.492 72.842)
-        (xy 122.492 71.40375) (xy 122.988 71.40375) (xy 122.988 72.842) (xy 125.75625 72.842) (xy 125.915 72.68325)
-        (xy 125.915 71.75369) (xy 125.818327 71.520301) (xy 125.639698 71.341673) (xy 125.406309 71.245) (xy 123.14675 71.245)
-        (xy 122.988 71.40375) (xy 122.492 71.40375) (xy 122.33325 71.245) (xy 120.502 71.245) (xy 120.502 48.25)
-        (xy 122.084635 48.25) (xy 122.084635 51.75) (xy 122.117775 51.916607) (xy 122.21215 52.05785) (xy 122.353393 52.152225)
-        (xy 122.52 52.185365) (xy 123.093001 52.185365) (xy 123.093001 53.13408) (xy 123.069943 53.25) (xy 123.101758 53.409943)
-        (xy 123.161292 53.709242) (xy 123.183 53.74173) (xy 123.183 54.394085) (xy 123.159943 54.51) (xy 123.183 54.625915)
-        (xy 123.183 54.62592) (xy 123.251291 54.969242) (xy 123.511432 55.358569) (xy 123.609705 55.424233) (xy 123.635765 55.450293)
-        (xy 123.701431 55.548569) (xy 123.968472 55.727) (xy 124.090758 55.808709) (xy 124.55 55.900058) (xy 124.66592 55.877)
-        (xy 125.084635 55.877) (xy 125.084635 56.45) (xy 125.117775 56.616607) (xy 125.21215 56.75785) (xy 125.353393 56.852225)
-        (xy 125.52 56.885365) (xy 129.02 56.885365) (xy 129.186607 56.852225) (xy 129.32785 56.75785) (xy 129.422225 56.616607)
-        (xy 129.455365 56.45) (xy 129.455365 55.877) (xy 131.184085 55.877) (xy 131.3 55.900057) (xy 131.415915 55.877)
-        (xy 131.41592 55.877) (xy 131.759242 55.808709) (xy 131.881528 55.727) (xy 135.857946 55.727) (xy 135.9 55.735365)
-        (xy 136.562764 55.735365) (xy 136.75 55.772608) (xy 136.937236 55.735365) (xy 137.9 55.735365) (xy 138.066607 55.702225)
-        (xy 138.20785 55.60785) (xy 138.302225 55.466607) (xy 138.335365 55.3) (xy 138.335365 53.8) (xy 144.204635 53.8)
-        (xy 144.204635 55.3) (xy 144.237775 55.466607) (xy 144.33215 55.60785) (xy 144.473393 55.702225) (xy 144.64 55.735365)
-        (xy 146.64 55.735365) (xy 146.682054 55.727) (xy 151.034635 55.727) (xy 151.034635 56.55) (xy 151.067775 56.716607)
-        (xy 151.16215 56.85785) (xy 151.303393 56.952225) (xy 151.47 56.985365) (xy 153.07 56.985365) (xy 153.236607 56.952225)
-        (xy 153.37785 56.85785) (xy 153.472225 56.716607) (xy 153.505365 56.55) (xy 153.505365 55.877) (xy 157.274085 55.877)
-        (xy 157.39 55.900057) (xy 157.505915 55.877) (xy 157.50592 55.877) (xy 157.849242 55.808709) (xy 158.238569 55.548569)
-        (xy 158.304234 55.450294) (xy 159.500299 54.254231) (xy 159.598569 54.188569) (xy 159.690652 54.050758) (xy 159.852551 53.808458)
-        (xy 159.858709 53.799242) (xy 159.927 53.45592) (xy 159.927 53.455916) (xy 159.950057 53.340001) (xy 159.927 53.224085)
-        (xy 159.927 50.66408) (xy 159.885365 50.454767) (xy 159.885365 50.229999) (xy 159.833195 49.967722) (xy 159.684627 49.745373)
-        (xy 159.615115 49.698927) (xy 159.809699 49.618327) (xy 159.988327 49.439698) (xy 160.085 49.206309) (xy 160.085 48.91175)
-        (xy 159.92625 48.753) (xy 158.998 48.753) (xy 158.998 48.773) (xy 158.502 48.773) (xy 158.502 48.753)
-        (xy 157.57375 48.753) (xy 157.415 48.91175) (xy 157.415 49.206309) (xy 157.511673 49.439698) (xy 157.690301 49.618327)
-        (xy 157.884885 49.698927) (xy 157.815373 49.745373) (xy 157.666805 49.967722) (xy 157.614635 50.229999) (xy 157.614635 50.454772)
-        (xy 157.573001 50.66408) (xy 157.573 52.85247) (xy 156.902471 53.523) (xy 153.505365 53.523) (xy 153.505365 53.05)
-        (xy 153.472225 52.883393) (xy 153.37785 52.74215) (xy 153.236607 52.647775) (xy 153.07 52.614635) (xy 151.47 52.614635)
-        (xy 151.303393 52.647775) (xy 151.16215 52.74215) (xy 151.067775 52.883393) (xy 151.034635 53.05) (xy 151.034635 53.373)
-        (xy 146.682054 53.373) (xy 146.64 53.364635) (xy 144.64 53.364635) (xy 144.473393 53.397775) (xy 144.33215 53.49215)
-        (xy 144.237775 53.633393) (xy 144.204635 53.8) (xy 138.335365 53.8) (xy 138.302225 53.633393) (xy 138.20785 53.49215)
-        (xy 138.066607 53.397775) (xy 137.9 53.364635) (xy 135.9 53.364635) (xy 135.857946 53.373) (xy 131.565915 53.373)
-        (xy 131.449999 53.349943) (xy 131.334084 53.373) (xy 131.33408 53.373) (xy 130.990758 53.441291) (xy 130.868472 53.523)
-        (xy 129.455365 53.523) (xy 129.455365 52.95) (xy 129.422225 52.783393) (xy 129.32785 52.64215) (xy 129.186607 52.547775)
-        (xy 129.02 52.514635) (xy 125.52 52.514635) (xy 125.447 52.529156) (xy 125.447 52.185365) (xy 126.02 52.185365)
-        (xy 126.186607 52.152225) (xy 126.32785 52.05785) (xy 126.422225 51.916607) (xy 126.455365 51.75) (xy 126.455365 48.25)
-        (xy 128.084635 48.25) (xy 128.084635 51.75) (xy 128.117775 51.916607) (xy 128.21215 52.05785) (xy 128.353393 52.152225)
-        (xy 128.52 52.185365) (xy 132.02 52.185365) (xy 132.186607 52.152225) (xy 132.32785 52.05785) (xy 132.422225 51.916607)
-        (xy 132.455365 51.75) (xy 132.455365 51.177) (xy 133.154085 51.177) (xy 133.27 51.200057) (xy 133.385915 51.177)
-        (xy 133.38592 51.177) (xy 133.729242 51.108709) (xy 134.118569 50.848569) (xy 134.184234 50.750294) (xy 134.307528 50.627)
-        (xy 135.857946 50.627) (xy 135.9 50.635365) (xy 137.9 50.635365) (xy 138.066607 50.602225) (xy 138.20785 50.50785)
-        (xy 138.302225 50.366607) (xy 138.335365 50.2) (xy 138.335365 49.85675) (xy 144.005 49.85675) (xy 144.005 50.32631)
-        (xy 144.101673 50.559699) (xy 144.280302 50.738327) (xy 144.513691 50.835) (xy 145.23325 50.835) (xy 145.392 50.67625)
-        (xy 145.392 49.698) (xy 145.888 49.698) (xy 145.888 50.67625) (xy 146.04675 50.835) (xy 146.766309 50.835)
-        (xy 146.999698 50.738327) (xy 147.178327 50.559699) (xy 147.275 50.32631) (xy 147.275 49.85675) (xy 147.11625 49.698)
-        (xy 145.888 49.698) (xy 145.392 49.698) (xy 144.16375 49.698) (xy 144.005 49.85675) (xy 138.335365 49.85675)
-        (xy 138.335365 49.60675) (xy 150.835 49.60675) (xy 150.835 51.076309) (xy 150.931673 51.309698) (xy 151.110301 51.488327)
-        (xy 151.34369 51.585) (xy 151.86325 51.585) (xy 152.022 51.42625) (xy 152.022 49.448) (xy 152.518 49.448)
-        (xy 152.518 51.42625) (xy 152.67675 51.585) (xy 153.19631 51.585) (xy 153.429699 51.488327) (xy 153.608327 51.309698)
-        (xy 153.705 51.076309) (xy 153.705 49.60675) (xy 153.54625 49.448) (xy 152.518 49.448) (xy 152.022 49.448)
-        (xy 150.99375 49.448) (xy 150.835 49.60675) (xy 138.335365 49.60675) (xy 138.335365 48.7) (xy 138.310241 48.57369)
-        (xy 144.005 48.57369) (xy 144.005 49.04325) (xy 144.16375 49.202) (xy 145.392 49.202) (xy 145.392 48.22375)
-        (xy 145.888 48.22375) (xy 145.888 49.202) (xy 147.11625 49.202) (xy 147.275 49.04325) (xy 147.275 48.57369)
-        (xy 147.178327 48.340301) (xy 146.999698 48.161673) (xy 146.766309 48.065) (xy 146.04675 48.065) (xy 145.888 48.22375)
-        (xy 145.392 48.22375) (xy 145.23325 48.065) (xy 144.513691 48.065) (xy 144.280302 48.161673) (xy 144.101673 48.340301)
-        (xy 144.005 48.57369) (xy 138.310241 48.57369) (xy 138.302225 48.533393) (xy 138.20785 48.39215) (xy 138.066607 48.297775)
-        (xy 137.9 48.264635) (xy 135.9 48.264635) (xy 135.857946 48.273) (xy 133.935915 48.273) (xy 133.819999 48.249943)
-        (xy 133.704084 48.273) (xy 133.70408 48.273) (xy 133.360758 48.341291) (xy 132.971431 48.601431) (xy 132.905767 48.699704)
-        (xy 132.782471 48.823) (xy 132.455365 48.823) (xy 132.455365 48.25) (xy 132.422225 48.083393) (xy 132.32785 47.94215)
-        (xy 132.186607 47.847775) (xy 132.02 47.814635) (xy 128.52 47.814635) (xy 128.353393 47.847775) (xy 128.21215 47.94215)
-        (xy 128.117775 48.083393) (xy 128.084635 48.25) (xy 126.455365 48.25) (xy 126.422225 48.083393) (xy 126.32785 47.94215)
-        (xy 126.186607 47.847775) (xy 126.02 47.814635) (xy 122.52 47.814635) (xy 122.353393 47.847775) (xy 122.21215 47.94215)
-        (xy 122.117775 48.083393) (xy 122.084635 48.25) (xy 120.502 48.25) (xy 120.502 47.323691) (xy 150.835 47.323691)
-        (xy 150.835 48.79325) (xy 150.99375 48.952) (xy 152.022 48.952) (xy 152.022 46.97375) (xy 152.518 46.97375)
-        (xy 152.518 48.952) (xy 153.54625 48.952) (xy 153.705 48.79325) (xy 153.705 48.44925) (xy 168.22 48.44925)
-        (xy 168.22 48.881309) (xy 168.316673 49.114698) (xy 168.495301 49.293327) (xy 168.72869 49.39) (xy 169.77325 49.39)
-        (xy 169.932 49.23125) (xy 169.932 48.2905) (xy 170.428 48.2905) (xy 170.428 49.23125) (xy 170.58675 49.39)
-        (xy 171.63131 49.39) (xy 171.864699 49.293327) (xy 172.043327 49.114698) (xy 172.14 48.881309) (xy 172.14 48.44925)
-        (xy 175.84 48.44925) (xy 175.84 48.881309) (xy 175.936673 49.114698) (xy 176.115301 49.293327) (xy 176.34869 49.39)
-        (xy 177.39325 49.39) (xy 177.552 49.23125) (xy 177.552 48.2905) (xy 178.048 48.2905) (xy 178.048 49.23125)
-        (xy 178.20675 49.39) (xy 179.25131 49.39) (xy 179.484699 49.293327) (xy 179.663327 49.114698) (xy 179.754871 48.89369)
-        (xy 189.865 48.89369) (xy 189.865 49.82325) (xy 190.02375 49.982) (xy 192.792 49.982) (xy 192.792 48.54375)
-        (xy 192.63325 48.385) (xy 190.373691 48.385) (xy 190.140302 48.481673) (xy 189.961673 48.660301) (xy 189.865 48.89369)
-        (xy 179.754871 48.89369) (xy 179.76 48.881309) (xy 179.76 48.44925) (xy 179.60125 48.2905) (xy 178.048 48.2905)
+        (xy 176.71131 85.385) (xy 176.944699 85.288327) (xy 177.123327 85.109698) (xy 177.22 84.876309) (xy 177.22 84.497207)
+        (xy 181.843374 84.497207) (xy 181.891247 85.743469) (xy 182.276068 86.672508) (xy 182.683852 86.965423) (xy 184.649275 85)
+        (xy 185.350725 85) (xy 187.316148 86.965423) (xy 187.723932 86.672508) (xy 188.156626 85.502793) (xy 188.108753 84.256531)
+        (xy 187.723932 83.327492) (xy 187.316148 83.034577) (xy 185.350725 85) (xy 184.649275 85) (xy 182.683852 83.034577)
+        (xy 182.276068 83.327492) (xy 181.843374 84.497207) (xy 177.22 84.497207) (xy 177.22 84.44425) (xy 177.06125 84.2855)
+        (xy 175.508 84.2855) (xy 175.012 84.2855) (xy 173.45875 84.2855) (xy 173.3 84.44425) (xy 169.6 84.44425)
+        (xy 169.44125 84.2855) (xy 167.888 84.2855) (xy 167.392 84.2855) (xy 165.83875 84.2855) (xy 165.68 84.44425)
+        (xy 161.98 84.44425) (xy 161.82125 84.2855) (xy 160.268 84.2855) (xy 159.772 84.2855) (xy 158.21875 84.2855)
+        (xy 158.06 84.44425) (xy 149.855436 84.44425) (xy 149.925 84.276309) (xy 149.925 83.98175) (xy 149.76625 83.823)
+        (xy 148.838 83.823) (xy 148.342 83.823) (xy 147.41375 83.823) (xy 147.255 83.98175) (xy 139.765 83.98175)
+        (xy 139.60625 83.823) (xy 138.678 83.823) (xy 138.182 83.823) (xy 137.25375 83.823) (xy 137.095 83.98175)
+        (xy 133.994935 83.98175) (xy 133.723932 83.327492) (xy 133.316148 83.034577) (xy 131.350725 85) (xy 130.649275 85)
+        (xy 128.683852 83.034577) (xy 128.276068 83.327492) (xy 127.843374 84.497207) (xy 120.502 84.497207) (xy 120.502 83.695)
+        (xy 122.33325 83.695) (xy 122.492 83.53625) (xy 122.492 82.098) (xy 122.988 82.098) (xy 122.988 83.53625)
+        (xy 123.14675 83.695) (xy 125.406309 83.695) (xy 125.639698 83.598327) (xy 125.818327 83.419699) (xy 125.915 83.18631)
+        (xy 125.915 82.683852) (xy 129.034577 82.683852) (xy 131 84.649275) (xy 132.965423 82.683852) (xy 132.672508 82.276068)
+        (xy 131.502793 81.843374) (xy 130.256531 81.891247) (xy 129.327492 82.276068) (xy 129.034577 82.683852) (xy 125.915 82.683852)
+        (xy 125.915 82.25675) (xy 125.75625 82.098) (xy 122.988 82.098) (xy 122.492 82.098) (xy 122.472 82.098)
+        (xy 122.472 81.602) (xy 122.492 81.602) (xy 122.492 81.582) (xy 122.988 81.582) (xy 122.988 81.602)
+        (xy 125.75625 81.602) (xy 125.915 81.44325) (xy 125.915 80.51369) (xy 125.842045 80.337561) (xy 126.589803 79.589803)
+        (xy 126.617333 79.548601) (xy 126.627 79.5) (xy 126.627 78.647) (xy 128.15408 78.647) (xy 128.27 78.670058)
+        (xy 128.38592 78.647) (xy 130.734924 78.647) (xy 130.766805 78.807278) (xy 130.915374 79.029626) (xy 131.137722 79.178195)
+        (xy 131.4 79.230365) (xy 132.325 79.230365) (xy 132.587278 79.178195) (xy 132.809626 79.029626) (xy 132.958195 78.807278)
+        (xy 133.010365 78.545) (xy 133.010365 76.395) (xy 133.689635 76.395) (xy 133.689635 78.545) (xy 133.741805 78.807278)
+        (xy 133.890374 79.029626) (xy 134.112722 79.178195) (xy 134.375 79.230365) (xy 135.3 79.230365) (xy 135.562278 79.178195)
+        (xy 135.784626 79.029626) (xy 135.933195 78.807278) (xy 135.965076 78.647) (xy 137.253001 78.647) (xy 137.253 81.415919)
+        (xy 137.294635 81.625232) (xy 137.294635 81.850001) (xy 137.346805 82.112278) (xy 137.495373 82.334627) (xy 137.564885 82.381073)
+        (xy 137.370301 82.461673) (xy 137.191673 82.640302) (xy 137.095 82.873691) (xy 137.095 83.16825) (xy 137.25375 83.327)
+        (xy 138.182 83.327) (xy 138.182 83.307) (xy 138.678 83.307) (xy 138.678 83.327) (xy 139.60625 83.327)
+        (xy 139.765 83.16825) (xy 139.765 82.873691) (xy 139.668327 82.640302) (xy 139.489699 82.461673) (xy 139.295115 82.381073)
+        (xy 139.364627 82.334627) (xy 139.513195 82.112278) (xy 139.565365 81.850001) (xy 139.565365 81.625233) (xy 139.607 81.41592)
+        (xy 139.607 78.647) (xy 140.894924 78.647) (xy 140.926805 78.807278) (xy 141.075374 79.029626) (xy 141.297722 79.178195)
+        (xy 141.56 79.230365) (xy 142.485 79.230365) (xy 142.747278 79.178195) (xy 142.969626 79.029626) (xy 143.118195 78.807278)
+        (xy 143.170365 78.545) (xy 143.170365 76.395) (xy 143.849635 76.395) (xy 143.849635 78.545) (xy 143.901805 78.807278)
+        (xy 144.050374 79.029626) (xy 144.272722 79.178195) (xy 144.535 79.230365) (xy 145.46 79.230365) (xy 145.722278 79.178195)
+        (xy 145.944626 79.029626) (xy 146.093195 78.807278) (xy 146.125076 78.647) (xy 147.413001 78.647) (xy 147.413 81.415919)
+        (xy 147.454635 81.625232) (xy 147.454635 81.850001) (xy 147.506805 82.112278) (xy 147.655373 82.334627) (xy 147.724885 82.381073)
+        (xy 147.530301 82.461673) (xy 147.351673 82.640302) (xy 147.255 82.873691) (xy 147.255 83.16825) (xy 147.41375 83.327)
+        (xy 148.342 83.327) (xy 148.342 83.307) (xy 148.838 83.307) (xy 148.838 83.327) (xy 149.76625 83.327)
+        (xy 149.894559 83.198691) (xy 158.06 83.198691) (xy 158.06 83.63075) (xy 158.21875 83.7895) (xy 159.772 83.7895)
+        (xy 159.772 82.84875) (xy 160.268 82.84875) (xy 160.268 83.7895) (xy 161.82125 83.7895) (xy 161.98 83.63075)
+        (xy 161.98 83.198691) (xy 165.68 83.198691) (xy 165.68 83.63075) (xy 165.83875 83.7895) (xy 167.392 83.7895)
+        (xy 167.392 82.84875) (xy 167.888 82.84875) (xy 167.888 83.7895) (xy 169.44125 83.7895) (xy 169.6 83.63075)
+        (xy 169.6 83.198691) (xy 173.3 83.198691) (xy 173.3 83.63075) (xy 173.45875 83.7895) (xy 175.012 83.7895)
+        (xy 175.012 82.84875) (xy 175.508 82.84875) (xy 175.508 83.7895) (xy 177.06125 83.7895) (xy 177.22 83.63075)
+        (xy 177.22 83.198691) (xy 177.123327 82.965302) (xy 176.944699 82.786673) (xy 176.71131 82.69) (xy 175.66675 82.69)
+        (xy 175.508 82.84875) (xy 175.012 82.84875) (xy 174.85325 82.69) (xy 173.80869 82.69) (xy 173.575301 82.786673)
+        (xy 173.396673 82.965302) (xy 173.3 83.198691) (xy 169.6 83.198691) (xy 169.503327 82.965302) (xy 169.324699 82.786673)
+        (xy 169.09131 82.69) (xy 168.04675 82.69) (xy 167.888 82.84875) (xy 167.392 82.84875) (xy 167.23325 82.69)
+        (xy 166.18869 82.69) (xy 165.955301 82.786673) (xy 165.776673 82.965302) (xy 165.68 83.198691) (xy 161.98 83.198691)
+        (xy 161.883327 82.965302) (xy 161.704699 82.786673) (xy 161.47131 82.69) (xy 160.42675 82.69) (xy 160.268 82.84875)
+        (xy 159.772 82.84875) (xy 159.61325 82.69) (xy 158.56869 82.69) (xy 158.335301 82.786673) (xy 158.156673 82.965302)
+        (xy 158.06 83.198691) (xy 149.894559 83.198691) (xy 149.925 83.16825) (xy 149.925 82.873691) (xy 149.846367 82.683852)
+        (xy 183.034577 82.683852) (xy 185 84.649275) (xy 186.965423 82.683852) (xy 186.672508 82.276068) (xy 186.620286 82.25675)
+        (xy 189.865 82.25675) (xy 189.865 83.18631) (xy 189.961673 83.419699) (xy 190.140302 83.598327) (xy 190.373691 83.695)
+        (xy 192.63325 83.695) (xy 192.792 83.53625) (xy 192.792 82.098) (xy 190.02375 82.098) (xy 189.865 82.25675)
+        (xy 186.620286 82.25675) (xy 185.502793 81.843374) (xy 184.256531 81.891247) (xy 183.327492 82.276068) (xy 183.034577 82.683852)
+        (xy 149.846367 82.683852) (xy 149.828327 82.640302) (xy 149.649699 82.461673) (xy 149.455115 82.381073) (xy 149.524627 82.334627)
+        (xy 149.673195 82.112278) (xy 149.725365 81.850001) (xy 149.725365 81.625233) (xy 149.767 81.41592) (xy 149.767 78.647)
+        (xy 151.054924 78.647) (xy 151.086805 78.807278) (xy 151.235374 79.029626) (xy 151.457722 79.178195) (xy 151.72 79.230365)
+        (xy 152.645 79.230365) (xy 152.907278 79.178195) (xy 153.129626 79.029626) (xy 153.278195 78.807278) (xy 153.330365 78.545)
+        (xy 153.330365 76.395) (xy 154.009635 76.395) (xy 154.009635 78.545) (xy 154.061805 78.807278) (xy 154.210374 79.029626)
+        (xy 154.432722 79.178195) (xy 154.695 79.230365) (xy 155.62 79.230365) (xy 155.882278 79.178195) (xy 156.104626 79.029626)
+        (xy 156.253195 78.807278) (xy 156.285076 78.647) (xy 158.843001 78.647) (xy 158.843 79.934924) (xy 158.682722 79.966805)
+        (xy 158.460374 80.115374) (xy 158.311805 80.337722) (xy 158.259635 80.6) (xy 158.259635 81.525) (xy 158.311805 81.787278)
+        (xy 158.460374 82.009626) (xy 158.682722 82.158195) (xy 158.945 82.210365) (xy 161.095 82.210365) (xy 161.357278 82.158195)
+        (xy 161.579626 82.009626) (xy 161.728195 81.787278) (xy 161.780365 81.525) (xy 161.780365 80.6) (xy 161.728195 80.337722)
+        (xy 161.579626 80.115374) (xy 161.357278 79.966805) (xy 161.197 79.934924) (xy 161.197 78.647) (xy 162.69592 78.647)
+        (xy 162.905233 78.605365) (xy 163.130001 78.605365) (xy 163.392278 78.553195) (xy 163.614627 78.404627) (xy 163.763195 78.182278)
+        (xy 163.815365 77.920001) (xy 163.815365 77.019999) (xy 163.844635 77.019999) (xy 163.844635 77.920001) (xy 163.896805 78.182278)
+        (xy 164.045373 78.404627) (xy 164.267722 78.553195) (xy 164.529999 78.605365) (xy 164.754767 78.605365) (xy 164.96408 78.647)
+        (xy 166.463 78.647) (xy 166.463001 79.934924) (xy 166.302722 79.966805) (xy 166.080374 80.115374) (xy 165.931805 80.337722)
+        (xy 165.879635 80.6) (xy 165.879635 81.525) (xy 165.931805 81.787278) (xy 166.080374 82.009626) (xy 166.302722 82.158195)
+        (xy 166.565 82.210365) (xy 168.715 82.210365) (xy 168.977278 82.158195) (xy 169.199626 82.009626) (xy 169.348195 81.787278)
+        (xy 169.400365 81.525) (xy 169.400365 80.6) (xy 169.348195 80.337722) (xy 169.199626 80.115374) (xy 168.977278 79.966805)
+        (xy 168.817 79.934924) (xy 168.817 78.647) (xy 170.31592 78.647) (xy 170.525233 78.605365) (xy 170.750001 78.605365)
+        (xy 171.012278 78.553195) (xy 171.234627 78.404627) (xy 171.383195 78.182278) (xy 171.435365 77.920001) (xy 171.435365 77.019999)
+        (xy 171.464635 77.019999) (xy 171.464635 77.920001) (xy 171.516805 78.182278) (xy 171.665373 78.404627) (xy 171.887722 78.553195)
+        (xy 172.149999 78.605365) (xy 172.374767 78.605365) (xy 172.58408 78.647) (xy 174.083 78.647) (xy 174.083001 79.934924)
+        (xy 173.922722 79.966805) (xy 173.700374 80.115374) (xy 173.551805 80.337722) (xy 173.499635 80.6) (xy 173.499635 81.525)
+        (xy 173.551805 81.787278) (xy 173.700374 82.009626) (xy 173.922722 82.158195) (xy 174.185 82.210365) (xy 176.335 82.210365)
+        (xy 176.597278 82.158195) (xy 176.819626 82.009626) (xy 176.968195 81.787278) (xy 177.020365 81.525) (xy 177.020365 80.6)
+        (xy 176.968195 80.337722) (xy 176.819626 80.115374) (xy 176.597278 79.966805) (xy 176.437 79.934924) (xy 176.437 78.647)
+        (xy 180.47592 78.647) (xy 180.685233 78.605365) (xy 180.910001 78.605365) (xy 181.172278 78.553195) (xy 181.394627 78.404627)
+        (xy 181.543195 78.182278) (xy 181.595365 77.920001) (xy 181.595365 77.019999) (xy 181.543195 76.757722) (xy 181.394627 76.535373)
+        (xy 181.172278 76.386805) (xy 180.910001 76.334635) (xy 180.685233 76.334635) (xy 180.47592 76.293) (xy 175.37592 76.293)
+        (xy 175.26 76.269942) (xy 175.14408 76.293) (xy 172.58408 76.293) (xy 172.374767 76.334635) (xy 172.149999 76.334635)
+        (xy 171.887722 76.386805) (xy 171.665373 76.535373) (xy 171.516805 76.757722) (xy 171.464635 77.019999) (xy 171.435365 77.019999)
+        (xy 171.383195 76.757722) (xy 171.234627 76.535373) (xy 171.012278 76.386805) (xy 170.750001 76.334635) (xy 170.525233 76.334635)
+        (xy 170.31592 76.293) (xy 167.75592 76.293) (xy 167.64 76.269942) (xy 167.52408 76.293) (xy 164.96408 76.293)
+        (xy 164.754767 76.334635) (xy 164.529999 76.334635) (xy 164.267722 76.386805) (xy 164.045373 76.535373) (xy 163.896805 76.757722)
+        (xy 163.844635 77.019999) (xy 163.815365 77.019999) (xy 163.763195 76.757722) (xy 163.614627 76.535373) (xy 163.392278 76.386805)
+        (xy 163.130001 76.334635) (xy 162.905233 76.334635) (xy 162.69592 76.293) (xy 160.13592 76.293) (xy 160.02 76.269942)
+        (xy 159.90408 76.293) (xy 156.285076 76.293) (xy 156.253195 76.132722) (xy 156.104626 75.910374) (xy 155.882278 75.761805)
+        (xy 155.62 75.709635) (xy 154.695 75.709635) (xy 154.432722 75.761805) (xy 154.210374 75.910374) (xy 154.061805 76.132722)
+        (xy 154.009635 76.395) (xy 153.330365 76.395) (xy 153.278195 76.132722) (xy 153.129626 75.910374) (xy 152.907278 75.761805)
+        (xy 152.645 75.709635) (xy 151.72 75.709635) (xy 151.457722 75.761805) (xy 151.235374 75.910374) (xy 151.086805 76.132722)
+        (xy 151.054924 76.293) (xy 148.70592 76.293) (xy 148.59 76.269942) (xy 148.47408 76.293) (xy 146.125076 76.293)
+        (xy 146.093195 76.132722) (xy 145.944626 75.910374) (xy 145.722278 75.761805) (xy 145.46 75.709635) (xy 144.535 75.709635)
+        (xy 144.272722 75.761805) (xy 144.050374 75.910374) (xy 143.901805 76.132722) (xy 143.849635 76.395) (xy 143.170365 76.395)
+        (xy 143.118195 76.132722) (xy 142.969626 75.910374) (xy 142.747278 75.761805) (xy 142.485 75.709635) (xy 141.56 75.709635)
+        (xy 141.297722 75.761805) (xy 141.075374 75.910374) (xy 140.926805 76.132722) (xy 140.894924 76.293) (xy 138.54592 76.293)
+        (xy 138.43 76.269942) (xy 138.31408 76.293) (xy 135.965076 76.293) (xy 135.933195 76.132722) (xy 135.784626 75.910374)
+        (xy 135.562278 75.761805) (xy 135.3 75.709635) (xy 134.375 75.709635) (xy 134.112722 75.761805) (xy 133.890374 75.910374)
+        (xy 133.741805 76.132722) (xy 133.689635 76.395) (xy 133.010365 76.395) (xy 132.958195 76.132722) (xy 132.809626 75.910374)
+        (xy 132.587278 75.761805) (xy 132.325 75.709635) (xy 131.4 75.709635) (xy 131.137722 75.761805) (xy 130.915374 75.910374)
+        (xy 130.766805 76.132722) (xy 130.734924 76.293) (xy 129.447 76.293) (xy 129.447 75.417528) (xy 130.797778 74.06675)
+        (xy 176.835 74.06675) (xy 176.835 74.48631) (xy 176.931673 74.719699) (xy 177.110302 74.898327) (xy 177.343691 74.995)
+        (xy 177.63825 74.995) (xy 177.797 74.83625) (xy 177.797 73.908) (xy 176.99375 73.908) (xy 176.835 74.06675)
+        (xy 130.797778 74.06675) (xy 132.030838 72.83369) (xy 176.835 72.83369) (xy 176.835 73.25325) (xy 176.99375 73.412)
+        (xy 177.797 73.412) (xy 177.797 72.48375) (xy 177.63825 72.325) (xy 177.343691 72.325) (xy 177.110302 72.421673)
+        (xy 176.931673 72.600301) (xy 176.835 72.83369) (xy 132.030838 72.83369) (xy 135.864528 69) (xy 168.894635 69)
+        (xy 168.894635 70.7) (xy 168.927775 70.866607) (xy 169.02215 71.00785) (xy 169.163393 71.102225) (xy 169.33 71.135365)
+        (xy 171.03 71.135365) (xy 171.196607 71.102225) (xy 171.33785 71.00785) (xy 171.432225 70.866607) (xy 171.465365 70.7)
+        (xy 171.465365 70.088206) (xy 171.517093 70.34826) (xy 171.799335 70.770665) (xy 172.22174 71.052907) (xy 172.594231 71.127)
+        (xy 172.845769 71.127) (xy 173.21826 71.052907) (xy 173.257033 71.027) (xy 176.042471 71.027) (xy 176.155767 71.140296)
+        (xy 176.221431 71.238569) (xy 176.610758 71.498709) (xy 176.95408 71.567) (xy 176.954084 71.567) (xy 177.069999 71.590057)
+        (xy 177.185915 71.567) (xy 179.143001 71.567) (xy 179.143 72.584974) (xy 178.979698 72.421673) (xy 178.746309 72.325)
+        (xy 178.45175 72.325) (xy 178.293 72.48375) (xy 178.293 73.412) (xy 178.313 73.412) (xy 178.313 73.908)
+        (xy 178.293 73.908) (xy 178.293 74.83625) (xy 178.45175 74.995) (xy 178.746309 74.995) (xy 178.979698 74.898327)
+        (xy 179.158327 74.719699) (xy 179.238927 74.525115) (xy 179.285373 74.594627) (xy 179.507722 74.743195) (xy 179.769999 74.795365)
+        (xy 179.994767 74.795365) (xy 180.32 74.860058) (xy 180.779241 74.768709) (xy 181.168569 74.508569) (xy 181.428709 74.119242)
+        (xy 181.497 73.77592) (xy 181.497 71.567) (xy 183.699815 71.567) (xy 183.711805 71.627278) (xy 183.860374 71.849626)
+        (xy 184.082722 71.998195) (xy 184.345 72.050365) (xy 186.495 72.050365) (xy 186.757278 71.998195) (xy 186.979626 71.849626)
+        (xy 187.043728 71.75369) (xy 189.865 71.75369) (xy 189.865 72.68325) (xy 190.02375 72.842) (xy 192.792 72.842)
+        (xy 192.792 71.40375) (xy 192.63325 71.245) (xy 190.373691 71.245) (xy 190.140302 71.341673) (xy 189.961673 71.520301)
+        (xy 189.865 71.75369) (xy 187.043728 71.75369) (xy 187.128195 71.627278) (xy 187.180365 71.365) (xy 187.180365 70.44)
+        (xy 187.128195 70.177722) (xy 186.979626 69.955374) (xy 186.757278 69.806805) (xy 186.495 69.754635) (xy 186.411027 69.754635)
+        (xy 186.268569 69.541431) (xy 185.879242 69.281291) (xy 185.53592 69.213) (xy 180.455915 69.213) (xy 180.339999 69.189943)
+        (xy 180.224084 69.213) (xy 177.557528 69.213) (xy 177.444234 69.099706) (xy 177.378569 69.001431) (xy 176.989242 68.741291)
+        (xy 176.64592 68.673) (xy 176.645915 68.673) (xy 176.53 68.649943) (xy 176.414085 68.673) (xy 173.257033 68.673)
+        (xy 173.21826 68.647093) (xy 172.845769 68.573) (xy 172.594231 68.573) (xy 172.22174 68.647093) (xy 171.799335 68.929335)
+        (xy 171.517093 69.35174) (xy 171.465365 69.611794) (xy 171.465365 69) (xy 171.432225 68.833393) (xy 171.33785 68.69215)
+        (xy 171.196607 68.597775) (xy 171.03 68.564635) (xy 169.33 68.564635) (xy 169.163393 68.597775) (xy 169.02215 68.69215)
+        (xy 168.927775 68.833393) (xy 168.894635 69) (xy 135.864528 69) (xy 138.917529 65.947) (xy 153.554085 65.947)
+        (xy 153.67 65.970057) (xy 153.785915 65.947) (xy 153.78592 65.947) (xy 154.129242 65.878709) (xy 154.518569 65.618569)
+        (xy 154.584235 65.520293) (xy 158.724528 61.38) (xy 168.894635 61.38) (xy 168.894635 63.08) (xy 168.927775 63.246607)
+        (xy 169.02215 63.38785) (xy 169.163393 63.482225) (xy 169.33 63.515365) (xy 171.03 63.515365) (xy 171.196607 63.482225)
+        (xy 171.33785 63.38785) (xy 171.432225 63.246607) (xy 171.465365 63.08) (xy 171.465365 62.468206) (xy 171.517093 62.72826)
+        (xy 171.799335 63.150665) (xy 172.22174 63.432907) (xy 172.594231 63.507) (xy 172.845769 63.507) (xy 173.21826 63.432907)
+        (xy 173.257033 63.407) (xy 176.414085 63.407) (xy 176.53 63.430057) (xy 176.645915 63.407) (xy 176.64592 63.407)
+        (xy 176.989242 63.338709) (xy 177.378569 63.078569) (xy 177.444234 62.980294) (xy 177.557528 62.867) (xy 180.224084 62.867)
+        (xy 180.339999 62.890057) (xy 180.455915 62.867) (xy 185.53592 62.867) (xy 185.879242 62.798709) (xy 186.268569 62.538569)
+        (xy 186.411027 62.325365) (xy 186.495 62.325365) (xy 186.757278 62.273195) (xy 186.979626 62.124626) (xy 187.128195 61.902278)
+        (xy 187.180365 61.64) (xy 187.180365 60.715) (xy 187.128195 60.452722) (xy 186.979626 60.230374) (xy 186.757278 60.081805)
+        (xy 186.495 60.029635) (xy 184.345 60.029635) (xy 184.082722 60.081805) (xy 183.860374 60.230374) (xy 183.711805 60.452722)
+        (xy 183.699815 60.513) (xy 181.497 60.513) (xy 181.497 59.39675) (xy 189.865 59.39675) (xy 189.865 60.32631)
+        (xy 189.961673 60.559699) (xy 190.140302 60.738327) (xy 190.373691 60.835) (xy 192.63325 60.835) (xy 192.792 60.67625)
+        (xy 192.792 59.238) (xy 190.02375 59.238) (xy 189.865 59.39675) (xy 181.497 59.39675) (xy 181.497 58.30408)
+        (xy 181.428709 57.960758) (xy 181.168569 57.571431) (xy 180.779241 57.311291) (xy 180.32 57.219942) (xy 179.994767 57.284635)
+        (xy 179.769999 57.284635) (xy 179.507722 57.336805) (xy 179.285373 57.485373) (xy 179.238927 57.554885) (xy 179.158327 57.360301)
+        (xy 178.979698 57.181673) (xy 178.746309 57.085) (xy 178.45175 57.085) (xy 178.293 57.24375) (xy 178.293 58.172)
+        (xy 178.313 58.172) (xy 178.313 58.668) (xy 178.293 58.668) (xy 178.293 59.59625) (xy 178.45175 59.755)
+        (xy 178.746309 59.755) (xy 178.979698 59.658327) (xy 179.143 59.495026) (xy 179.143001 60.513) (xy 177.185915 60.513)
+        (xy 177.069999 60.489943) (xy 176.954084 60.513) (xy 176.95408 60.513) (xy 176.610758 60.581291) (xy 176.221431 60.841431)
+        (xy 176.155768 60.939703) (xy 176.042471 61.053) (xy 173.257033 61.053) (xy 173.21826 61.027093) (xy 172.845769 60.953)
+        (xy 172.594231 60.953) (xy 172.22174 61.027093) (xy 171.799335 61.309335) (xy 171.517093 61.73174) (xy 171.465365 61.991794)
+        (xy 171.465365 61.38) (xy 171.432225 61.213393) (xy 171.33785 61.07215) (xy 171.196607 60.977775) (xy 171.03 60.944635)
+        (xy 169.33 60.944635) (xy 169.163393 60.977775) (xy 169.02215 61.07215) (xy 168.927775 61.213393) (xy 168.894635 61.38)
+        (xy 158.724528 61.38) (xy 161.277778 58.82675) (xy 176.835 58.82675) (xy 176.835 59.24631) (xy 176.931673 59.479699)
+        (xy 177.110302 59.658327) (xy 177.343691 59.755) (xy 177.63825 59.755) (xy 177.797 59.59625) (xy 177.797 58.668)
+        (xy 176.99375 58.668) (xy 176.835 58.82675) (xy 161.277778 58.82675) (xy 162.510838 57.59369) (xy 176.835 57.59369)
+        (xy 176.835 58.01325) (xy 176.99375 58.172) (xy 177.797 58.172) (xy 177.797 57.24375) (xy 177.63825 57.085)
+        (xy 177.343691 57.085) (xy 177.110302 57.181673) (xy 176.931673 57.360301) (xy 176.835 57.59369) (xy 162.510838 57.59369)
+        (xy 164.317529 55.787) (xy 165.23592 55.787) (xy 165.445233 55.745365) (xy 165.670001 55.745365) (xy 165.932278 55.693195)
+        (xy 166.154627 55.544627) (xy 166.303195 55.322278) (xy 166.355365 55.060001) (xy 166.355365 54.159999) (xy 166.384635 54.159999)
+        (xy 166.384635 55.060001) (xy 166.436805 55.322278) (xy 166.585373 55.544627) (xy 166.807722 55.693195) (xy 167.069999 55.745365)
+        (xy 167.294767 55.745365) (xy 167.50408 55.787) (xy 170.06408 55.787) (xy 170.18 55.810058) (xy 170.29592 55.787)
+        (xy 172.85592 55.787) (xy 173.065233 55.745365) (xy 173.290001 55.745365) (xy 173.552278 55.693195) (xy 173.774627 55.544627)
+        (xy 173.923195 55.322278) (xy 173.975365 55.060001) (xy 173.975365 54.159999) (xy 174.004635 54.159999) (xy 174.004635 55.060001)
+        (xy 174.056805 55.322278) (xy 174.205373 55.544627) (xy 174.427722 55.693195) (xy 174.689999 55.745365) (xy 174.914767 55.745365)
+        (xy 175.12408 55.787) (xy 177.68408 55.787) (xy 177.8 55.810058) (xy 177.91592 55.787) (xy 180.47592 55.787)
+        (xy 180.685233 55.745365) (xy 180.910001 55.745365) (xy 181.172278 55.693195) (xy 181.394627 55.544627) (xy 181.543195 55.322278)
+        (xy 181.595365 55.060001) (xy 181.595365 54.159999) (xy 181.543195 53.897722) (xy 181.394627 53.675373) (xy 181.172278 53.526805)
+        (xy 180.910001 53.474635) (xy 180.685233 53.474635) (xy 180.47592 53.433) (xy 178.977 53.433) (xy 178.977 52.145076)
+        (xy 179.137278 52.113195) (xy 179.359626 51.964626) (xy 179.508195 51.742278) (xy 179.560365 51.48) (xy 179.560365 50.555)
+        (xy 179.512855 50.316148) (xy 183.034577 50.316148) (xy 183.327492 50.723932) (xy 184.497207 51.156626) (xy 185.743469 51.108753)
+        (xy 186.672508 50.723932) (xy 186.965423 50.316148) (xy 185 48.350725) (xy 183.034577 50.316148) (xy 179.512855 50.316148)
+        (xy 179.508195 50.292722) (xy 179.359626 50.070374) (xy 179.137278 49.921805) (xy 178.875 49.869635) (xy 176.725 49.869635)
+        (xy 176.462722 49.921805) (xy 176.240374 50.070374) (xy 176.091805 50.292722) (xy 176.039635 50.555) (xy 176.039635 51.48)
+        (xy 176.091805 51.742278) (xy 176.240374 51.964626) (xy 176.462722 52.113195) (xy 176.623 52.145076) (xy 176.623001 53.433)
+        (xy 175.12408 53.433) (xy 174.914767 53.474635) (xy 174.689999 53.474635) (xy 174.427722 53.526805) (xy 174.205373 53.675373)
+        (xy 174.056805 53.897722) (xy 174.004635 54.159999) (xy 173.975365 54.159999) (xy 173.923195 53.897722) (xy 173.774627 53.675373)
+        (xy 173.552278 53.526805) (xy 173.290001 53.474635) (xy 173.065233 53.474635) (xy 172.85592 53.433) (xy 171.357 53.433)
+        (xy 171.357 52.145076) (xy 171.517278 52.113195) (xy 171.739626 51.964626) (xy 171.888195 51.742278) (xy 171.940365 51.48)
+        (xy 171.940365 50.555) (xy 171.888195 50.292722) (xy 171.739626 50.070374) (xy 171.517278 49.921805) (xy 171.255 49.869635)
+        (xy 169.105 49.869635) (xy 168.842722 49.921805) (xy 168.620374 50.070374) (xy 168.471805 50.292722) (xy 168.419635 50.555)
+        (xy 168.419635 51.48) (xy 168.471805 51.742278) (xy 168.620374 51.964626) (xy 168.842722 52.113195) (xy 169.003 52.145076)
+        (xy 169.003001 53.433) (xy 167.50408 53.433) (xy 167.294767 53.474635) (xy 167.069999 53.474635) (xy 166.807722 53.526805)
+        (xy 166.585373 53.675373) (xy 166.436805 53.897722) (xy 166.384635 54.159999) (xy 166.355365 54.159999) (xy 166.303195 53.897722)
+        (xy 166.154627 53.675373) (xy 165.932278 53.526805) (xy 165.670001 53.474635) (xy 165.445233 53.474635) (xy 165.23592 53.433)
+        (xy 163.945915 53.433) (xy 163.83 53.409943) (xy 163.714084 53.433) (xy 163.71408 53.433) (xy 163.370758 53.501291)
+        (xy 162.981431 53.761431) (xy 162.915767 53.859704) (xy 153.182472 63.593) (xy 138.545915 63.593) (xy 138.43 63.569943)
+        (xy 138.314084 63.593) (xy 138.31408 63.593) (xy 137.970758 63.661291) (xy 137.581431 63.921431) (xy 137.515767 64.019704)
+        (xy 127.519705 74.015767) (xy 127.421432 74.081431) (xy 127.355768 74.179704) (xy 127.161292 74.470758) (xy 127.069943 74.93)
+        (xy 127.093001 75.04592) (xy 127.093 76.293) (xy 126.627 76.293) (xy 126.627 75.5) (xy 126.617333 75.451399)
+        (xy 126.589803 75.410197) (xy 125.824471 74.644865) (xy 125.915 74.42631) (xy 125.915 73.49675) (xy 125.75625 73.338)
+        (xy 122.988 73.338) (xy 122.988 73.358) (xy 122.492 73.358) (xy 122.492 73.338) (xy 122.472 73.338)
+        (xy 122.472 72.842) (xy 122.492 72.842) (xy 122.492 71.40375) (xy 122.988 71.40375) (xy 122.988 72.842)
+        (xy 125.75625 72.842) (xy 125.915 72.68325) (xy 125.915 71.75369) (xy 125.818327 71.520301) (xy 125.639698 71.341673)
+        (xy 125.406309 71.245) (xy 123.14675 71.245) (xy 122.988 71.40375) (xy 122.492 71.40375) (xy 122.33325 71.245)
+        (xy 120.502 71.245) (xy 120.502 48.25) (xy 122.084635 48.25) (xy 122.084635 51.75) (xy 122.117775 51.916607)
+        (xy 122.21215 52.05785) (xy 122.353393 52.152225) (xy 122.52 52.185365) (xy 123.093001 52.185365) (xy 123.093001 53.13408)
+        (xy 123.069943 53.25) (xy 123.101758 53.409943) (xy 123.161292 53.709242) (xy 123.183 53.74173) (xy 123.183 54.394085)
+        (xy 123.159943 54.51) (xy 123.183 54.625915) (xy 123.183 54.62592) (xy 123.251291 54.969242) (xy 123.511432 55.358569)
+        (xy 123.609705 55.424233) (xy 123.635765 55.450293) (xy 123.701431 55.548569) (xy 123.968472 55.727) (xy 124.090758 55.808709)
+        (xy 124.55 55.900058) (xy 124.66592 55.877) (xy 125.084635 55.877) (xy 125.084635 56.45) (xy 125.117775 56.616607)
+        (xy 125.21215 56.75785) (xy 125.353393 56.852225) (xy 125.52 56.885365) (xy 129.02 56.885365) (xy 129.186607 56.852225)
+        (xy 129.32785 56.75785) (xy 129.422225 56.616607) (xy 129.455365 56.45) (xy 129.455365 55.877) (xy 131.184085 55.877)
+        (xy 131.3 55.900057) (xy 131.415915 55.877) (xy 131.41592 55.877) (xy 131.759242 55.808709) (xy 131.881528 55.727)
+        (xy 135.857946 55.727) (xy 135.9 55.735365) (xy 136.562764 55.735365) (xy 136.75 55.772608) (xy 136.937236 55.735365)
+        (xy 137.9 55.735365) (xy 138.066607 55.702225) (xy 138.20785 55.60785) (xy 138.302225 55.466607) (xy 138.335365 55.3)
+        (xy 138.335365 53.8) (xy 144.204635 53.8) (xy 144.204635 55.3) (xy 144.237775 55.466607) (xy 144.33215 55.60785)
+        (xy 144.473393 55.702225) (xy 144.64 55.735365) (xy 146.64 55.735365) (xy 146.682054 55.727) (xy 151.034635 55.727)
+        (xy 151.034635 56.55) (xy 151.067775 56.716607) (xy 151.16215 56.85785) (xy 151.303393 56.952225) (xy 151.47 56.985365)
+        (xy 153.07 56.985365) (xy 153.236607 56.952225) (xy 153.37785 56.85785) (xy 153.472225 56.716607) (xy 153.505365 56.55)
+        (xy 153.505365 55.877) (xy 157.274085 55.877) (xy 157.39 55.900057) (xy 157.505915 55.877) (xy 157.50592 55.877)
+        (xy 157.849242 55.808709) (xy 158.238569 55.548569) (xy 158.304234 55.450294) (xy 159.500299 54.254231) (xy 159.598569 54.188569)
+        (xy 159.690652 54.050758) (xy 159.852551 53.808458) (xy 159.858709 53.799242) (xy 159.927 53.45592) (xy 159.927 53.455916)
+        (xy 159.950057 53.340001) (xy 159.927 53.224085) (xy 159.927 50.66408) (xy 159.885365 50.454767) (xy 159.885365 50.229999)
+        (xy 159.833195 49.967722) (xy 159.684627 49.745373) (xy 159.615115 49.698927) (xy 159.809699 49.618327) (xy 159.988327 49.439698)
+        (xy 160.085 49.206309) (xy 160.085 48.91175) (xy 159.92625 48.753) (xy 158.998 48.753) (xy 158.998 48.773)
+        (xy 158.502 48.773) (xy 158.502 48.753) (xy 157.57375 48.753) (xy 157.415 48.91175) (xy 157.415 49.206309)
+        (xy 157.511673 49.439698) (xy 157.690301 49.618327) (xy 157.884885 49.698927) (xy 157.815373 49.745373) (xy 157.666805 49.967722)
+        (xy 157.614635 50.229999) (xy 157.614635 50.454772) (xy 157.573001 50.66408) (xy 157.573 52.85247) (xy 156.902471 53.523)
+        (xy 153.505365 53.523) (xy 153.505365 53.05) (xy 153.472225 52.883393) (xy 153.37785 52.74215) (xy 153.236607 52.647775)
+        (xy 153.07 52.614635) (xy 151.47 52.614635) (xy 151.303393 52.647775) (xy 151.16215 52.74215) (xy 151.067775 52.883393)
+        (xy 151.034635 53.05) (xy 151.034635 53.373) (xy 146.682054 53.373) (xy 146.64 53.364635) (xy 144.64 53.364635)
+        (xy 144.473393 53.397775) (xy 144.33215 53.49215) (xy 144.237775 53.633393) (xy 144.204635 53.8) (xy 138.335365 53.8)
+        (xy 138.302225 53.633393) (xy 138.20785 53.49215) (xy 138.066607 53.397775) (xy 137.9 53.364635) (xy 135.9 53.364635)
+        (xy 135.857946 53.373) (xy 131.565915 53.373) (xy 131.449999 53.349943) (xy 131.334084 53.373) (xy 131.33408 53.373)
+        (xy 130.990758 53.441291) (xy 130.868472 53.523) (xy 129.455365 53.523) (xy 129.455365 52.95) (xy 129.422225 52.783393)
+        (xy 129.32785 52.64215) (xy 129.186607 52.547775) (xy 129.02 52.514635) (xy 125.52 52.514635) (xy 125.447 52.529156)
+        (xy 125.447 52.185365) (xy 126.02 52.185365) (xy 126.186607 52.152225) (xy 126.32785 52.05785) (xy 126.422225 51.916607)
+        (xy 126.455365 51.75) (xy 126.455365 48.25) (xy 128.084635 48.25) (xy 128.084635 51.75) (xy 128.117775 51.916607)
+        (xy 128.21215 52.05785) (xy 128.353393 52.152225) (xy 128.52 52.185365) (xy 132.02 52.185365) (xy 132.186607 52.152225)
+        (xy 132.32785 52.05785) (xy 132.422225 51.916607) (xy 132.455365 51.75) (xy 132.455365 51.177) (xy 133.154085 51.177)
+        (xy 133.27 51.200057) (xy 133.385915 51.177) (xy 133.38592 51.177) (xy 133.729242 51.108709) (xy 134.118569 50.848569)
+        (xy 134.184234 50.750294) (xy 134.307528 50.627) (xy 135.857946 50.627) (xy 135.9 50.635365) (xy 137.9 50.635365)
+        (xy 138.066607 50.602225) (xy 138.20785 50.50785) (xy 138.302225 50.366607) (xy 138.335365 50.2) (xy 138.335365 49.85675)
+        (xy 144.005 49.85675) (xy 144.005 50.32631) (xy 144.101673 50.559699) (xy 144.280302 50.738327) (xy 144.513691 50.835)
+        (xy 145.23325 50.835) (xy 145.392 50.67625) (xy 145.392 49.698) (xy 145.888 49.698) (xy 145.888 50.67625)
+        (xy 146.04675 50.835) (xy 146.766309 50.835) (xy 146.999698 50.738327) (xy 147.178327 50.559699) (xy 147.275 50.32631)
+        (xy 147.275 49.85675) (xy 147.11625 49.698) (xy 145.888 49.698) (xy 145.392 49.698) (xy 144.16375 49.698)
+        (xy 144.005 49.85675) (xy 138.335365 49.85675) (xy 138.335365 49.60675) (xy 150.835 49.60675) (xy 150.835 51.076309)
+        (xy 150.931673 51.309698) (xy 151.110301 51.488327) (xy 151.34369 51.585) (xy 151.86325 51.585) (xy 152.022 51.42625)
+        (xy 152.022 49.448) (xy 152.518 49.448) (xy 152.518 51.42625) (xy 152.67675 51.585) (xy 153.19631 51.585)
+        (xy 153.429699 51.488327) (xy 153.608327 51.309698) (xy 153.705 51.076309) (xy 153.705 49.60675) (xy 153.54625 49.448)
+        (xy 152.518 49.448) (xy 152.022 49.448) (xy 150.99375 49.448) (xy 150.835 49.60675) (xy 138.335365 49.60675)
+        (xy 138.335365 48.7) (xy 138.310241 48.57369) (xy 144.005 48.57369) (xy 144.005 49.04325) (xy 144.16375 49.202)
+        (xy 145.392 49.202) (xy 145.392 48.22375) (xy 145.888 48.22375) (xy 145.888 49.202) (xy 147.11625 49.202)
+        (xy 147.275 49.04325) (xy 147.275 48.57369) (xy 147.178327 48.340301) (xy 146.999698 48.161673) (xy 146.766309 48.065)
+        (xy 146.04675 48.065) (xy 145.888 48.22375) (xy 145.392 48.22375) (xy 145.23325 48.065) (xy 144.513691 48.065)
+        (xy 144.280302 48.161673) (xy 144.101673 48.340301) (xy 144.005 48.57369) (xy 138.310241 48.57369) (xy 138.302225 48.533393)
+        (xy 138.20785 48.39215) (xy 138.066607 48.297775) (xy 137.9 48.264635) (xy 135.9 48.264635) (xy 135.857946 48.273)
+        (xy 133.935915 48.273) (xy 133.819999 48.249943) (xy 133.704084 48.273) (xy 133.70408 48.273) (xy 133.360758 48.341291)
+        (xy 132.971431 48.601431) (xy 132.905767 48.699704) (xy 132.782471 48.823) (xy 132.455365 48.823) (xy 132.455365 48.25)
+        (xy 132.422225 48.083393) (xy 132.32785 47.94215) (xy 132.186607 47.847775) (xy 132.02 47.814635) (xy 128.52 47.814635)
+        (xy 128.353393 47.847775) (xy 128.21215 47.94215) (xy 128.117775 48.083393) (xy 128.084635 48.25) (xy 126.455365 48.25)
+        (xy 126.422225 48.083393) (xy 126.32785 47.94215) (xy 126.186607 47.847775) (xy 126.02 47.814635) (xy 122.52 47.814635)
+        (xy 122.353393 47.847775) (xy 122.21215 47.94215) (xy 122.117775 48.083393) (xy 122.084635 48.25) (xy 120.502 48.25)
+        (xy 120.502 47.323691) (xy 150.835 47.323691) (xy 150.835 48.79325) (xy 150.99375 48.952) (xy 152.022 48.952)
+        (xy 152.022 46.97375) (xy 152.518 46.97375) (xy 152.518 48.952) (xy 153.54625 48.952) (xy 153.705 48.79325)
+        (xy 153.705 48.44925) (xy 168.22 48.44925) (xy 168.22 48.881309) (xy 168.316673 49.114698) (xy 168.495301 49.293327)
+        (xy 168.72869 49.39) (xy 169.77325 49.39) (xy 169.932 49.23125) (xy 169.932 48.2905) (xy 170.428 48.2905)
+        (xy 170.428 49.23125) (xy 170.58675 49.39) (xy 171.63131 49.39) (xy 171.864699 49.293327) (xy 172.043327 49.114698)
+        (xy 172.14 48.881309) (xy 172.14 48.44925) (xy 175.84 48.44925) (xy 175.84 48.881309) (xy 175.936673 49.114698)
+        (xy 176.115301 49.293327) (xy 176.34869 49.39) (xy 177.39325 49.39) (xy 177.552 49.23125) (xy 177.552 48.2905)
+        (xy 178.048 48.2905) (xy 178.048 49.23125) (xy 178.20675 49.39) (xy 179.25131 49.39) (xy 179.484699 49.293327)
+        (xy 179.663327 49.114698) (xy 179.76 48.881309) (xy 179.76 48.44925) (xy 179.60125 48.2905) (xy 178.048 48.2905)
         (xy 177.552 48.2905) (xy 175.99875 48.2905) (xy 175.84 48.44925) (xy 172.14 48.44925) (xy 171.98125 48.2905)
         (xy 170.428 48.2905) (xy 169.932 48.2905) (xy 168.37875 48.2905) (xy 168.22 48.44925) (xy 153.705 48.44925)
         (xy 153.705 47.803691) (xy 157.415 47.803691) (xy 157.415 48.09825) (xy 157.57375 48.257) (xy 158.502 48.257)
@@ -3169,15 +3348,23 @@
         (xy 168.22 47.203691) (xy 168.22 47.63575) (xy 168.37875 47.7945) (xy 169.932 47.7945) (xy 169.932 46.85375)
         (xy 170.428 46.85375) (xy 170.428 47.7945) (xy 171.98125 47.7945) (xy 172.14 47.63575) (xy 172.14 47.203691)
         (xy 175.84 47.203691) (xy 175.84 47.63575) (xy 175.99875 47.7945) (xy 177.552 47.7945) (xy 177.552 46.85375)
-        (xy 178.048 46.85375) (xy 178.048 47.7945) (xy 179.60125 47.7945) (xy 179.76 47.63575) (xy 179.76 47.203691)
-        (xy 179.663327 46.970302) (xy 179.484699 46.791673) (xy 179.25131 46.695) (xy 178.20675 46.695) (xy 178.048 46.85375)
-        (xy 177.552 46.85375) (xy 177.39325 46.695) (xy 176.34869 46.695) (xy 176.115301 46.791673) (xy 175.936673 46.970302)
-        (xy 175.84 47.203691) (xy 172.14 47.203691) (xy 172.043327 46.970302) (xy 171.864699 46.791673) (xy 171.63131 46.695)
-        (xy 170.58675 46.695) (xy 170.428 46.85375) (xy 169.932 46.85375) (xy 169.77325 46.695) (xy 168.72869 46.695)
-        (xy 168.495301 46.791673) (xy 168.316673 46.970302) (xy 168.22 47.203691) (xy 153.655295 47.203691) (xy 153.608327 47.090302)
-        (xy 153.429699 46.911673) (xy 153.19631 46.815) (xy 152.67675 46.815) (xy 152.518 46.97375) (xy 152.022 46.97375)
-        (xy 151.86325 46.815) (xy 151.34369 46.815) (xy 151.110301 46.911673) (xy 150.931673 47.090302) (xy 150.835 47.323691)
-        (xy 120.502 47.323691) (xy 120.502 43.502) (xy 195.498 43.502)
+        (xy 178.048 46.85375) (xy 178.048 47.7945) (xy 179.60125 47.7945) (xy 179.76 47.63575) (xy 179.76 47.497207)
+        (xy 181.843374 47.497207) (xy 181.891247 48.743469) (xy 182.276068 49.672508) (xy 182.683852 49.965423) (xy 184.649275 48)
+        (xy 185.350725 48) (xy 187.316148 49.965423) (xy 187.723932 49.672508) (xy 188.012027 48.89369) (xy 189.865 48.89369)
+        (xy 189.865 49.82325) (xy 190.02375 49.982) (xy 192.792 49.982) (xy 192.792 48.54375) (xy 192.63325 48.385)
+        (xy 190.373691 48.385) (xy 190.140302 48.481673) (xy 189.961673 48.660301) (xy 189.865 48.89369) (xy 188.012027 48.89369)
+        (xy 188.156626 48.502793) (xy 188.108753 47.256531) (xy 187.723932 46.327492) (xy 187.316148 46.034577) (xy 185.350725 48)
+        (xy 184.649275 48) (xy 182.683852 46.034577) (xy 182.276068 46.327492) (xy 181.843374 47.497207) (xy 179.76 47.497207)
+        (xy 179.76 47.203691) (xy 179.663327 46.970302) (xy 179.484699 46.791673) (xy 179.25131 46.695) (xy 178.20675 46.695)
+        (xy 178.048 46.85375) (xy 177.552 46.85375) (xy 177.39325 46.695) (xy 176.34869 46.695) (xy 176.115301 46.791673)
+        (xy 175.936673 46.970302) (xy 175.84 47.203691) (xy 172.14 47.203691) (xy 172.043327 46.970302) (xy 171.864699 46.791673)
+        (xy 171.63131 46.695) (xy 170.58675 46.695) (xy 170.428 46.85375) (xy 169.932 46.85375) (xy 169.77325 46.695)
+        (xy 168.72869 46.695) (xy 168.495301 46.791673) (xy 168.316673 46.970302) (xy 168.22 47.203691) (xy 153.655295 47.203691)
+        (xy 153.608327 47.090302) (xy 153.429699 46.911673) (xy 153.19631 46.815) (xy 152.67675 46.815) (xy 152.518 46.97375)
+        (xy 152.022 46.97375) (xy 151.86325 46.815) (xy 151.34369 46.815) (xy 151.110301 46.911673) (xy 150.931673 47.090302)
+        (xy 150.835 47.323691) (xy 120.502 47.323691) (xy 120.502 45.683852) (xy 183.034577 45.683852) (xy 185 47.649275)
+        (xy 186.965423 45.683852) (xy 186.672508 45.276068) (xy 185.502793 44.843374) (xy 184.256531 44.891247) (xy 183.327492 45.276068)
+        (xy 183.034577 45.683852) (xy 120.502 45.683852) (xy 120.502 43.502) (xy 195.498 43.502)
       )
     )
   )
diff --git a/pcb/gerber/diplexer-B.Cu.gbl b/pcb/gerber/diplexer-B.Cu.gbl
index b5bf179..9cfc091 100644
--- a/pcb/gerber/diplexer-B.Cu.gbl
+++ b/pcb/gerber/diplexer-B.Cu.gbl
@@ -1,39 +1,51 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Copper,L2,Bot,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD10R,3.500000X3.500000*%
+%ADD10C,5.000000*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD11R,3.500000X3.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD11R,5.080000X2.420000*%
+%ADD12R,5.080000X2.420000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD12O,1.700000X1.700000*%
+%ADD13O,1.700000X1.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD13R,1.700000X1.700000*%
+%ADD14R,1.700000X1.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD14C,0.800000*%
+%ADD15C,0.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD15C,1.500000*%
+%ADD16C,1.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD16C,0.254000*%
+%ADD17C,0.254000*%
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.P,REF\002A\002A,1*
+G04 #@! TO.N,GND*
+X11000000Y-42000000D03*
+G04 #@! TD*
+G04 #@! TO.P,REF\002A\002A,1*
+G04 #@! TO.N,GND*
+X65000000Y-5000000D03*
+G04 #@! TD*
+D11*
 G04 #@! TO.P,J1,1*
 G04 #@! TO.N,Net-(D1-Pad3)*
 X10270000Y-7000000D03*
@@ -43,7 +55,7 @@ X4270000Y-7000000D03*
 G04 #@! TO.P,J1,3*
 X7270000Y-11700000D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.P,J2,2*
 G04 #@! TO.N,GND*
 X2740000Y-30090000D03*
@@ -59,11 +71,11 @@ G04 #@! TO.N,GND*
 X73040000Y-38850000D03*
 X73040000Y-30090000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.P,JP2,2*
 G04 #@! TO.N,Net-(C12-Pad1)*
 X52720000Y-26850000D03*
-D13*
+D14*
 G04 #@! TO.P,JP2,1*
 G04 #@! TO.N,VCC*
 X50180000Y-26850000D03*
@@ -71,12 +83,17 @@ G04 #@! TD*
 G04 #@! TO.P,JP1,1*
 G04 #@! TO.N,VCC*
 X50180000Y-19230000D03*
-D12*
+D13*
 G04 #@! TO.P,JP1,2*
 G04 #@! TO.N,Net-(C8-Pad1)*
 X52720000Y-19230000D03*
 G04 #@! TD*
-D14*
+D10*
+G04 #@! TO.P,REF\002A\002A,1*
+G04 #@! TO.N,GND*
+X65000000Y-42000000D03*
+G04 #@! TD*
+D15*
 G04 #@! TO.N,VCC*
 X38750000Y-10340000D03*
 G04 #@! TO.N,GND*
@@ -543,7 +560,7 @@ X25415000Y-9070000D03*
 X75000000Y-45000000D03*
 X1000000Y-45000000D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.N,VCC*
 X50180000Y-19230000D02*
 X50180000Y-26850000D01*
@@ -558,7 +575,7 @@ X50180000Y-19230000D01*
 X42560000Y-6530000D02*
 X48910000Y-6530000D01*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.N,GND*
 G36*
 X75498000Y-5385000D02*
@@ -603,6 +620,63 @@ X73446750Y-40695000D01*
 X75498001Y-40695000D01*
 X75498001Y-46498000D01*
 X502000Y-46498000D01*
+X502000Y-44316148D01*
+X9034577Y-44316148D01*
+X9327492Y-44723932D01*
+X10497207Y-45156626D01*
+X11743469Y-45108753D01*
+X12672508Y-44723932D01*
+X12965423Y-44316148D01*
+X63034577Y-44316148D01*
+X63327492Y-44723932D01*
+X64497207Y-45156626D01*
+X65743469Y-45108753D01*
+X66672508Y-44723932D01*
+X66965423Y-44316148D01*
+X65000000Y-42350725D01*
+X63034577Y-44316148D01*
+X12965423Y-44316148D01*
+X11000000Y-42350725D01*
+X9034577Y-44316148D01*
+X502000Y-44316148D01*
+X502000Y-41497207D01*
+X7843374Y-41497207D01*
+X7891247Y-42743469D01*
+X8276068Y-43672508D01*
+X8683852Y-43965423D01*
+X10649275Y-42000000D01*
+X11350725Y-42000000D01*
+X13316148Y-43965423D01*
+X13723932Y-43672508D01*
+X14156626Y-42502793D01*
+X14117999Y-41497207D01*
+X61843374Y-41497207D01*
+X61891247Y-42743469D01*
+X62276068Y-43672508D01*
+X62683852Y-43965423D01*
+X64649275Y-42000000D01*
+X65350725Y-42000000D01*
+X67316148Y-43965423D01*
+X67723932Y-43672508D01*
+X68156626Y-42502793D01*
+X68108753Y-41256531D01*
+X67723932Y-40327492D01*
+X67316148Y-40034577D01*
+X65350725Y-42000000D01*
+X64649275Y-42000000D01*
+X62683852Y-40034577D01*
+X62276068Y-40327492D01*
+X61843374Y-41497207D01*
+X14117999Y-41497207D01*
+X14108753Y-41256531D01*
+X13723932Y-40327492D01*
+X13316148Y-40034577D01*
+X11350725Y-42000000D01*
+X10649275Y-42000000D01*
+X8683852Y-40034577D01*
+X8276068Y-40327492D01*
+X7843374Y-41497207D01*
+X502000Y-41497207D01*
 X502000Y-40695000D01*
 X2333250Y-40695000D01*
 X2492000Y-40536250D01*
@@ -614,7 +688,15 @@ X5406309Y-40695000D01*
 X5639698Y-40598327D01*
 X5818327Y-40419699D01*
 X5915000Y-40186310D01*
-X5915000Y-39256750D01*
+X5915000Y-39683852D01*
+X9034577Y-39683852D01*
+X11000000Y-41649275D01*
+X12965423Y-39683852D01*
+X63034577Y-39683852D01*
+X65000000Y-41649275D01*
+X66965423Y-39683852D01*
+X66672508Y-39276068D01*
+X66620286Y-39256750D01*
 X69865000Y-39256750D01*
 X69865000Y-40186310D01*
 X69961673Y-40419699D01*
@@ -625,6 +707,18 @@ X72792000Y-40536250D01*
 X72792000Y-39098000D01*
 X70023750Y-39098000D01*
 X69865000Y-39256750D01*
+X66620286Y-39256750D01*
+X65502793Y-38843374D01*
+X64256531Y-38891247D01*
+X63327492Y-39276068D01*
+X63034577Y-39683852D01*
+X12965423Y-39683852D01*
+X12672508Y-39276068D01*
+X11502793Y-38843374D01*
+X10256531Y-38891247D01*
+X9327492Y-39276068D01*
+X9034577Y-39683852D01*
+X5915000Y-39683852D01*
 X5915000Y-39256750D01*
 X5756250Y-39098000D01*
 X2988000Y-39098000D01*
@@ -830,7 +924,14 @@ X51357000Y-7915915D01*
 X51380057Y-7799999D01*
 X51357000Y-7684084D01*
 X51357000Y-7684080D01*
-X51347586Y-7636750D01*
+X51288709Y-7340758D01*
+X51272266Y-7316148D01*
+X63034577Y-7316148D01*
+X63327492Y-7723932D01*
+X64497207Y-8156626D01*
+X65743469Y-8108753D01*
+X66672508Y-7723932D01*
+X66735131Y-7636750D01*
 X69865000Y-7636750D01*
 X69865000Y-8566310D01*
 X69961673Y-8799699D01*
@@ -841,22 +942,13 @@ X72792000Y-8916250D01*
 X72792000Y-7478000D01*
 X70023750Y-7478000D01*
 X69865000Y-7636750D01*
-X51347586Y-7636750D01*
-X51288709Y-7340758D01*
+X66735131Y-7636750D01*
+X66965423Y-7316148D01*
+X65000000Y-5350725D01*
+X63034577Y-7316148D01*
+X51272266Y-7316148D01*
 X51028569Y-6951431D01*
 X50930299Y-6885769D01*
-X49938219Y-5893690D01*
-X69865000Y-5893690D01*
-X69865000Y-6823250D01*
-X70023750Y-6982000D01*
-X72792000Y-6982000D01*
-X72792000Y-5543750D01*
-X72633250Y-5385000D01*
-X70373691Y-5385000D01*
-X70140302Y-5481673D01*
-X69961673Y-5660301D01*
-X69865000Y-5893690D01*
-X49938219Y-5893690D01*
 X49824234Y-5779706D01*
 X49758569Y-5681431D01*
 X49369242Y-5421291D01*
@@ -930,6 +1022,47 @@ X2212150Y-4942150D01*
 X2117775Y-5083393D01*
 X2084635Y-5250000D01*
 X502000Y-5250000D01*
+X502000Y-4497207D01*
+X61843374Y-4497207D01*
+X61891247Y-5743469D01*
+X62276068Y-6672508D01*
+X62683852Y-6965423D01*
+X64649275Y-5000000D01*
+X65350725Y-5000000D01*
+X67316148Y-6965423D01*
+X67723932Y-6672508D01*
+X68012027Y-5893690D01*
+X69865000Y-5893690D01*
+X69865000Y-6823250D01*
+X70023750Y-6982000D01*
+X72792000Y-6982000D01*
+X72792000Y-5543750D01*
+X72633250Y-5385000D01*
+X70373691Y-5385000D01*
+X70140302Y-5481673D01*
+X69961673Y-5660301D01*
+X69865000Y-5893690D01*
+X68012027Y-5893690D01*
+X68156626Y-5502793D01*
+X68108753Y-4256531D01*
+X67723932Y-3327492D01*
+X67316148Y-3034577D01*
+X65350725Y-5000000D01*
+X64649275Y-5000000D01*
+X62683852Y-3034577D01*
+X62276068Y-3327492D01*
+X61843374Y-4497207D01*
+X502000Y-4497207D01*
+X502000Y-2683852D01*
+X63034577Y-2683852D01*
+X65000000Y-4649275D01*
+X66965423Y-2683852D01*
+X66672508Y-2276068D01*
+X65502793Y-1843374D01*
+X64256531Y-1891247D01*
+X63327492Y-2276068D01*
+X63034577Y-2683852D01*
+X502000Y-2683852D01*
 X502000Y-502000D01*
 X75498000Y-502000D01*
 X75498000Y-5385000D01*
@@ -977,6 +1110,63 @@ X73446750Y-40695000D01*
 X75498001Y-40695000D01*
 X75498001Y-46498000D01*
 X502000Y-46498000D01*
+X502000Y-44316148D01*
+X9034577Y-44316148D01*
+X9327492Y-44723932D01*
+X10497207Y-45156626D01*
+X11743469Y-45108753D01*
+X12672508Y-44723932D01*
+X12965423Y-44316148D01*
+X63034577Y-44316148D01*
+X63327492Y-44723932D01*
+X64497207Y-45156626D01*
+X65743469Y-45108753D01*
+X66672508Y-44723932D01*
+X66965423Y-44316148D01*
+X65000000Y-42350725D01*
+X63034577Y-44316148D01*
+X12965423Y-44316148D01*
+X11000000Y-42350725D01*
+X9034577Y-44316148D01*
+X502000Y-44316148D01*
+X502000Y-41497207D01*
+X7843374Y-41497207D01*
+X7891247Y-42743469D01*
+X8276068Y-43672508D01*
+X8683852Y-43965423D01*
+X10649275Y-42000000D01*
+X11350725Y-42000000D01*
+X13316148Y-43965423D01*
+X13723932Y-43672508D01*
+X14156626Y-42502793D01*
+X14117999Y-41497207D01*
+X61843374Y-41497207D01*
+X61891247Y-42743469D01*
+X62276068Y-43672508D01*
+X62683852Y-43965423D01*
+X64649275Y-42000000D01*
+X65350725Y-42000000D01*
+X67316148Y-43965423D01*
+X67723932Y-43672508D01*
+X68156626Y-42502793D01*
+X68108753Y-41256531D01*
+X67723932Y-40327492D01*
+X67316148Y-40034577D01*
+X65350725Y-42000000D01*
+X64649275Y-42000000D01*
+X62683852Y-40034577D01*
+X62276068Y-40327492D01*
+X61843374Y-41497207D01*
+X14117999Y-41497207D01*
+X14108753Y-41256531D01*
+X13723932Y-40327492D01*
+X13316148Y-40034577D01*
+X11350725Y-42000000D01*
+X10649275Y-42000000D01*
+X8683852Y-40034577D01*
+X8276068Y-40327492D01*
+X7843374Y-41497207D01*
+X502000Y-41497207D01*
 X502000Y-40695000D01*
 X2333250Y-40695000D01*
 X2492000Y-40536250D01*
@@ -988,7 +1178,15 @@ X5406309Y-40695000D01*
 X5639698Y-40598327D01*
 X5818327Y-40419699D01*
 X5915000Y-40186310D01*
-X5915000Y-39256750D01*
+X5915000Y-39683852D01*
+X9034577Y-39683852D01*
+X11000000Y-41649275D01*
+X12965423Y-39683852D01*
+X63034577Y-39683852D01*
+X65000000Y-41649275D01*
+X66965423Y-39683852D01*
+X66672508Y-39276068D01*
+X66620286Y-39256750D01*
 X69865000Y-39256750D01*
 X69865000Y-40186310D01*
 X69961673Y-40419699D01*
@@ -999,6 +1197,18 @@ X72792000Y-40536250D01*
 X72792000Y-39098000D01*
 X70023750Y-39098000D01*
 X69865000Y-39256750D01*
+X66620286Y-39256750D01*
+X65502793Y-38843374D01*
+X64256531Y-38891247D01*
+X63327492Y-39276068D01*
+X63034577Y-39683852D01*
+X12965423Y-39683852D01*
+X12672508Y-39276068D01*
+X11502793Y-38843374D01*
+X10256531Y-38891247D01*
+X9327492Y-39276068D01*
+X9034577Y-39683852D01*
+X5915000Y-39683852D01*
 X5915000Y-39256750D01*
 X5756250Y-39098000D01*
 X2988000Y-39098000D01*
@@ -1204,7 +1414,14 @@ X51357000Y-7915915D01*
 X51380057Y-7799999D01*
 X51357000Y-7684084D01*
 X51357000Y-7684080D01*
-X51347586Y-7636750D01*
+X51288709Y-7340758D01*
+X51272266Y-7316148D01*
+X63034577Y-7316148D01*
+X63327492Y-7723932D01*
+X64497207Y-8156626D01*
+X65743469Y-8108753D01*
+X66672508Y-7723932D01*
+X66735131Y-7636750D01*
 X69865000Y-7636750D01*
 X69865000Y-8566310D01*
 X69961673Y-8799699D01*
@@ -1215,22 +1432,13 @@ X72792000Y-8916250D01*
 X72792000Y-7478000D01*
 X70023750Y-7478000D01*
 X69865000Y-7636750D01*
-X51347586Y-7636750D01*
-X51288709Y-7340758D01*
+X66735131Y-7636750D01*
+X66965423Y-7316148D01*
+X65000000Y-5350725D01*
+X63034577Y-7316148D01*
+X51272266Y-7316148D01*
 X51028569Y-6951431D01*
 X50930299Y-6885769D01*
-X49938219Y-5893690D01*
-X69865000Y-5893690D01*
-X69865000Y-6823250D01*
-X70023750Y-6982000D01*
-X72792000Y-6982000D01*
-X72792000Y-5543750D01*
-X72633250Y-5385000D01*
-X70373691Y-5385000D01*
-X70140302Y-5481673D01*
-X69961673Y-5660301D01*
-X69865000Y-5893690D01*
-X49938219Y-5893690D01*
 X49824234Y-5779706D01*
 X49758569Y-5681431D01*
 X49369242Y-5421291D01*
@@ -1304,6 +1512,47 @@ X2212150Y-4942150D01*
 X2117775Y-5083393D01*
 X2084635Y-5250000D01*
 X502000Y-5250000D01*
+X502000Y-4497207D01*
+X61843374Y-4497207D01*
+X61891247Y-5743469D01*
+X62276068Y-6672508D01*
+X62683852Y-6965423D01*
+X64649275Y-5000000D01*
+X65350725Y-5000000D01*
+X67316148Y-6965423D01*
+X67723932Y-6672508D01*
+X68012027Y-5893690D01*
+X69865000Y-5893690D01*
+X69865000Y-6823250D01*
+X70023750Y-6982000D01*
+X72792000Y-6982000D01*
+X72792000Y-5543750D01*
+X72633250Y-5385000D01*
+X70373691Y-5385000D01*
+X70140302Y-5481673D01*
+X69961673Y-5660301D01*
+X69865000Y-5893690D01*
+X68012027Y-5893690D01*
+X68156626Y-5502793D01*
+X68108753Y-4256531D01*
+X67723932Y-3327492D01*
+X67316148Y-3034577D01*
+X65350725Y-5000000D01*
+X64649275Y-5000000D01*
+X62683852Y-3034577D01*
+X62276068Y-3327492D01*
+X61843374Y-4497207D01*
+X502000Y-4497207D01*
+X502000Y-2683852D01*
+X63034577Y-2683852D01*
+X65000000Y-4649275D01*
+X66965423Y-2683852D01*
+X66672508Y-2276068D01*
+X65502793Y-1843374D01*
+X64256531Y-1891247D01*
+X63327492Y-2276068D01*
+X63034577Y-2683852D01*
+X502000Y-2683852D01*
 X502000Y-502000D01*
 X75498000Y-502000D01*
 X75498000Y-5385000D01*
diff --git a/pcb/gerber/diplexer-B.Mask.gbs b/pcb/gerber/diplexer-B.Mask.gbs
index 1c890dc..48cb8bd 100644
--- a/pcb/gerber/diplexer-B.Mask.gbs
+++ b/pcb/gerber/diplexer-B.Mask.gbs
@@ -1,21 +1,22 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Soldermask,Bot*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.150000*%
-%ADD11R,3.900000X3.900000*%
-%ADD12R,5.480000X2.820000*%
-%ADD13O,2.100000X2.100000*%
-%ADD14R,2.100000X2.100000*%
+%ADD11C,5.400000*%
+%ADD12R,3.900000X3.900000*%
+%ADD13R,5.480000X2.820000*%
+%ADD14O,2.100000X2.100000*%
+%ADD15R,2.100000X2.100000*%
 G04 APERTURE END LIST*
 D10*
 G36*
@@ -67,12 +68,19 @@ X76000000Y0D01*
 X0Y0D01*
 X0Y-2000000D01*
 D11*
+G04 #@! TO.C,REF\002A\002A*
+X11000000Y-42000000D03*
+G04 #@! TD*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-5000000D03*
+G04 #@! TD*
+D12*
 G04 #@! TO.C,J1*
 X10270000Y-7000000D03*
 X4270000Y-7000000D03*
 X7270000Y-11700000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,J2*
 X2740000Y-30090000D03*
 X2740000Y-38850000D03*
@@ -85,15 +93,19 @@ G04 #@! TO.C,J4*
 X73040000Y-38850000D03*
 X73040000Y-30090000D03*
 G04 #@! TD*
-D13*
+D14*
 G04 #@! TO.C,JP2*
 X52720000Y-26850000D03*
-D14*
+D15*
 X50180000Y-26850000D03*
 G04 #@! TD*
 G04 #@! TO.C,JP1*
 X50180000Y-19230000D03*
-D13*
+D14*
 X52720000Y-19230000D03*
 G04 #@! TD*
+D11*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-42000000D03*
+G04 #@! TD*
 M02*
diff --git a/pcb/gerber/diplexer-B.SilkS.gbo b/pcb/gerber/diplexer-B.SilkS.gbo
index 7aaa94d..a0013a0 100644
--- a/pcb/gerber/diplexer-B.SilkS.gbo
+++ b/pcb/gerber/diplexer-B.SilkS.gbo
@@ -1,12 +1,12 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Legend,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -15,351 +15,352 @@ G04 APERTURE LIST*
 %ADD11C,0.300000*%
 %ADD12C,0.010000*%
 %ADD13C,0.150000*%
-%ADD14R,3.900000X3.900000*%
-%ADD15R,5.480000X2.820000*%
-%ADD16O,2.100000X2.100000*%
-%ADD17R,2.100000X2.100000*%
+%ADD14C,5.400000*%
+%ADD15R,3.900000X3.900000*%
+%ADD16R,5.480000X2.820000*%
+%ADD17O,2.100000X2.100000*%
+%ADD18R,2.100000X2.100000*%
 G04 APERTURE END LIST*
 D10*
-X22524523Y-44318809D02*
-X22410238Y-44356904D01*
-X22219761Y-44356904D01*
-X22143571Y-44318809D01*
-X22105476Y-44280714D01*
-X22067380Y-44204523D01*
-X22067380Y-44128333D01*
-X22105476Y-44052142D01*
-X22143571Y-44014047D01*
-X22219761Y-43975952D01*
-X22372142Y-43937857D01*
-X22448333Y-43899761D01*
-X22486428Y-43861666D01*
-X22524523Y-43785476D01*
-X22524523Y-43709285D01*
-X22486428Y-43633095D01*
-X22448333Y-43595000D01*
-X22372142Y-43556904D01*
-X22181666Y-43556904D01*
-X22067380Y-43595000D01*
-X21419761Y-44318809D02*
-X21495952Y-44356904D01*
-X21648333Y-44356904D01*
-X21724523Y-44318809D01*
-X21762619Y-44242619D01*
-X21762619Y-43937857D01*
-X21724523Y-43861666D01*
-X21648333Y-43823571D01*
-X21495952Y-43823571D01*
-X21419761Y-43861666D01*
-X21381666Y-43937857D01*
-X21381666Y-44014047D01*
-X21762619Y-44090238D01*
-X21038809Y-44356904D02*
-X21038809Y-43556904D01*
-X21038809Y-43861666D02*
-X20962619Y-43823571D01*
-X20810238Y-43823571D01*
-X20734047Y-43861666D01*
-X20695952Y-43899761D01*
-X20657857Y-43975952D01*
-X20657857Y-44204523D01*
-X20695952Y-44280714D01*
-X20734047Y-44318809D01*
-X20810238Y-44356904D01*
-X20962619Y-44356904D01*
-X21038809Y-44318809D01*
-X19972142Y-44356904D02*
-X19972142Y-43937857D01*
-X20010238Y-43861666D01*
-X20086428Y-43823571D01*
-X20238809Y-43823571D01*
-X20315000Y-43861666D01*
-X19972142Y-44318809D02*
-X20048333Y-44356904D01*
-X20238809Y-44356904D01*
-X20315000Y-44318809D01*
-X20353095Y-44242619D01*
-X20353095Y-44166428D01*
-X20315000Y-44090238D01*
-X20238809Y-44052142D01*
-X20048333Y-44052142D01*
-X19972142Y-44014047D01*
-X19629285Y-44318809D02*
-X19553095Y-44356904D01*
-X19400714Y-44356904D01*
-X19324523Y-44318809D01*
-X19286428Y-44242619D01*
-X19286428Y-44204523D01*
-X19324523Y-44128333D01*
-X19400714Y-44090238D01*
-X19515000Y-44090238D01*
-X19591190Y-44052142D01*
-X19629285Y-43975952D01*
-X19629285Y-43937857D01*
-X19591190Y-43861666D01*
-X19515000Y-43823571D01*
-X19400714Y-43823571D01*
-X19324523Y-43861666D01*
-X19057857Y-43823571D02*
-X18753095Y-43823571D01*
-X18943571Y-43556904D02*
-X18943571Y-44242619D01*
-X18905476Y-44318809D01*
-X18829285Y-44356904D01*
-X18753095Y-44356904D01*
-X18486428Y-44356904D02*
-X18486428Y-43823571D01*
-X18486428Y-43556904D02*
-X18524523Y-43595000D01*
-X18486428Y-43633095D01*
-X18448333Y-43595000D01*
-X18486428Y-43556904D01*
-X18486428Y-43633095D01*
-X17762619Y-44356904D02*
-X17762619Y-43937857D01*
-X17800714Y-43861666D01*
-X17876904Y-43823571D01*
-X18029285Y-43823571D01*
-X18105476Y-43861666D01*
-X17762619Y-44318809D02*
-X17838809Y-44356904D01*
-X18029285Y-44356904D01*
-X18105476Y-44318809D01*
-X18143571Y-44242619D01*
-X18143571Y-44166428D01*
-X18105476Y-44090238D01*
-X18029285Y-44052142D01*
-X17838809Y-44052142D01*
-X17762619Y-44014047D01*
-X17381666Y-43823571D02*
-X17381666Y-44356904D01*
-X17381666Y-43899761D02*
-X17343571Y-43861666D01*
-X17267380Y-43823571D01*
-X17153095Y-43823571D01*
-X17076904Y-43861666D01*
-X17038809Y-43937857D01*
-X17038809Y-44356904D01*
-X16086428Y-44318809D02*
-X15972142Y-44356904D01*
-X15781666Y-44356904D01*
-X15705476Y-44318809D01*
-X15667380Y-44280714D01*
-X15629285Y-44204523D01*
-X15629285Y-44128333D01*
-X15667380Y-44052142D01*
-X15705476Y-44014047D01*
-X15781666Y-43975952D01*
-X15934047Y-43937857D01*
-X16010238Y-43899761D01*
-X16048333Y-43861666D01*
-X16086428Y-43785476D01*
-X16086428Y-43709285D01*
-X16048333Y-43633095D01*
-X16010238Y-43595000D01*
-X15934047Y-43556904D01*
-X15743571Y-43556904D01*
-X15629285Y-43595000D01*
-X14943571Y-44318809D02*
-X15019761Y-44356904D01*
-X15172142Y-44356904D01*
-X15248333Y-44318809D01*
-X15286428Y-44280714D01*
-X15324523Y-44204523D01*
-X15324523Y-43975952D01*
-X15286428Y-43899761D01*
-X15248333Y-43861666D01*
-X15172142Y-43823571D01*
-X15019761Y-43823571D01*
-X14943571Y-43861666D01*
-X14600714Y-44356904D02*
-X14600714Y-43556904D01*
-X14257857Y-44356904D02*
-X14257857Y-43937857D01*
-X14295952Y-43861666D01*
-X14372142Y-43823571D01*
-X14486428Y-43823571D01*
-X14562619Y-43861666D01*
-X14600714Y-43899761D01*
-X13534047Y-43823571D02*
-X13534047Y-44356904D01*
-X13876904Y-43823571D02*
-X13876904Y-44242619D01*
-X13838809Y-44318809D01*
-X13762619Y-44356904D01*
-X13648333Y-44356904D01*
-X13572142Y-44318809D01*
-X13534047Y-44280714D01*
-X13153095Y-44356904D02*
-X13153095Y-43823571D01*
-X13153095Y-43899761D02*
-X13115000Y-43861666D01*
-X13038809Y-43823571D01*
-X12924523Y-43823571D01*
-X12848333Y-43861666D01*
-X12810238Y-43937857D01*
-X12810238Y-44356904D01*
-X12810238Y-43937857D02*
-X12772142Y-43861666D01*
-X12695952Y-43823571D01*
-X12581666Y-43823571D01*
-X12505476Y-43861666D01*
-X12467380Y-43937857D01*
-X12467380Y-44356904D01*
-X12086428Y-44356904D02*
-X12086428Y-43556904D01*
-X12086428Y-43861666D02*
-X12010238Y-43823571D01*
-X11857857Y-43823571D01*
-X11781666Y-43861666D01*
-X11743571Y-43899761D01*
-X11705476Y-43975952D01*
-X11705476Y-44204523D01*
-X11743571Y-44280714D01*
-X11781666Y-44318809D01*
-X11857857Y-44356904D01*
-X12010238Y-44356904D01*
-X12086428Y-44318809D01*
-X10753095Y-44356904D02*
-X10753095Y-43556904D01*
-X10562619Y-43556904D01*
-X10448333Y-43595000D01*
-X10372142Y-43671190D01*
-X10334047Y-43747380D01*
-X10295952Y-43899761D01*
-X10295952Y-44014047D01*
-X10334047Y-44166428D01*
-X10372142Y-44242619D01*
-X10448333Y-44318809D01*
-X10562619Y-44356904D01*
-X10753095Y-44356904D01*
-X9572142Y-44356904D02*
-X9953095Y-44356904D01*
-X9953095Y-43556904D01*
-X8886428Y-44356904D02*
-X9343571Y-44356904D01*
-X9115000Y-44356904D02*
-X9115000Y-43556904D01*
-X9191190Y-43671190D01*
-X9267380Y-43747380D01*
-X9343571Y-43785476D01*
-X8581666Y-44318809D02*
-X8467380Y-44356904D01*
-X8276904Y-44356904D01*
-X8200714Y-44318809D01*
-X8162619Y-44280714D01*
-X8124523Y-44204523D01*
-X8124523Y-44128333D01*
-X8162619Y-44052142D01*
-X8200714Y-44014047D01*
-X8276904Y-43975952D01*
-X8429285Y-43937857D01*
-X8505476Y-43899761D01*
-X8543571Y-43861666D01*
-X8581666Y-43785476D01*
-X8581666Y-43709285D01*
-X8543571Y-43633095D01*
-X8505476Y-43595000D01*
-X8429285Y-43556904D01*
-X8238809Y-43556904D01*
-X8124523Y-43595000D01*
-X7819761Y-44318809D02*
-X7705476Y-44356904D01*
-X7515000Y-44356904D01*
-X7438809Y-44318809D01*
-X7400714Y-44280714D01*
-X7362619Y-44204523D01*
-X7362619Y-44128333D01*
-X7400714Y-44052142D01*
-X7438809Y-44014047D01*
-X7515000Y-43975952D01*
-X7667380Y-43937857D01*
-X7743571Y-43899761D01*
-X7781666Y-43861666D01*
-X7819761Y-43785476D01*
-X7819761Y-43709285D01*
-X7781666Y-43633095D01*
-X7743571Y-43595000D01*
-X7667380Y-43556904D01*
-X7476904Y-43556904D01*
-X7362619Y-43595000D01*
-X7019761Y-44356904D02*
-X7019761Y-43556904D01*
-X6562619Y-44356904D02*
-X6905476Y-43899761D01*
-X6562619Y-43556904D02*
-X7019761Y-44014047D01*
-X5648333Y-43633095D02*
-X5610238Y-43595000D01*
-X5534047Y-43556904D01*
-X5343571Y-43556904D01*
-X5267380Y-43595000D01*
-X5229285Y-43633095D01*
-X5191190Y-43709285D01*
-X5191190Y-43785476D01*
-X5229285Y-43899761D01*
-X5686428Y-44356904D01*
-X5191190Y-44356904D01*
-X4695952Y-43556904D02*
-X4619761Y-43556904D01*
-X4543571Y-43595000D01*
-X4505476Y-43633095D01*
-X4467380Y-43709285D01*
-X4429285Y-43861666D01*
-X4429285Y-44052142D01*
-X4467380Y-44204523D01*
-X4505476Y-44280714D01*
-X4543571Y-44318809D01*
-X4619761Y-44356904D01*
-X4695952Y-44356904D01*
-X4772142Y-44318809D01*
-X4810238Y-44280714D01*
-X4848333Y-44204523D01*
-X4886428Y-44052142D01*
-X4886428Y-43861666D01*
-X4848333Y-43709285D01*
-X4810238Y-43633095D01*
-X4772142Y-43595000D01*
-X4695952Y-43556904D01*
-X3667380Y-44356904D02*
-X4124523Y-44356904D01*
-X3895952Y-44356904D02*
-X3895952Y-43556904D01*
-X3972142Y-43671190D01*
-X4048333Y-43747380D01*
-X4124523Y-43785476D01*
-X3210238Y-43899761D02*
-X3286428Y-43861666D01*
-X3324523Y-43823571D01*
-X3362619Y-43747380D01*
-X3362619Y-43709285D01*
-X3324523Y-43633095D01*
-X3286428Y-43595000D01*
-X3210238Y-43556904D01*
-X3057857Y-43556904D01*
-X2981666Y-43595000D01*
-X2943571Y-43633095D01*
-X2905476Y-43709285D01*
-X2905476Y-43747380D01*
-X2943571Y-43823571D01*
-X2981666Y-43861666D01*
-X3057857Y-43899761D01*
-X3210238Y-43899761D01*
-X3286428Y-43937857D01*
-X3324523Y-43975952D01*
-X3362619Y-44052142D01*
-X3362619Y-44204523D01*
-X3324523Y-44280714D01*
-X3286428Y-44318809D01*
-X3210238Y-44356904D01*
-X3057857Y-44356904D01*
-X2981666Y-44318809D01*
-X2943571Y-44280714D01*
-X2905476Y-44204523D01*
-X2905476Y-44052142D01*
-X2943571Y-43975952D01*
-X2981666Y-43937857D01*
-X3057857Y-43899761D01*
+X34809523Y-44323809D02*
+X34695238Y-44361904D01*
+X34504761Y-44361904D01*
+X34428571Y-44323809D01*
+X34390476Y-44285714D01*
+X34352380Y-44209523D01*
+X34352380Y-44133333D01*
+X34390476Y-44057142D01*
+X34428571Y-44019047D01*
+X34504761Y-43980952D01*
+X34657142Y-43942857D01*
+X34733333Y-43904761D01*
+X34771428Y-43866666D01*
+X34809523Y-43790476D01*
+X34809523Y-43714285D01*
+X34771428Y-43638095D01*
+X34733333Y-43600000D01*
+X34657142Y-43561904D01*
+X34466666Y-43561904D01*
+X34352380Y-43600000D01*
+X33704761Y-44323809D02*
+X33780952Y-44361904D01*
+X33933333Y-44361904D01*
+X34009523Y-44323809D01*
+X34047619Y-44247619D01*
+X34047619Y-43942857D01*
+X34009523Y-43866666D01*
+X33933333Y-43828571D01*
+X33780952Y-43828571D01*
+X33704761Y-43866666D01*
+X33666666Y-43942857D01*
+X33666666Y-44019047D01*
+X34047619Y-44095238D01*
+X33323809Y-44361904D02*
+X33323809Y-43561904D01*
+X33323809Y-43866666D02*
+X33247619Y-43828571D01*
+X33095238Y-43828571D01*
+X33019047Y-43866666D01*
+X32980952Y-43904761D01*
+X32942857Y-43980952D01*
+X32942857Y-44209523D01*
+X32980952Y-44285714D01*
+X33019047Y-44323809D01*
+X33095238Y-44361904D01*
+X33247619Y-44361904D01*
+X33323809Y-44323809D01*
+X32257142Y-44361904D02*
+X32257142Y-43942857D01*
+X32295238Y-43866666D01*
+X32371428Y-43828571D01*
+X32523809Y-43828571D01*
+X32600000Y-43866666D01*
+X32257142Y-44323809D02*
+X32333333Y-44361904D01*
+X32523809Y-44361904D01*
+X32600000Y-44323809D01*
+X32638095Y-44247619D01*
+X32638095Y-44171428D01*
+X32600000Y-44095238D01*
+X32523809Y-44057142D01*
+X32333333Y-44057142D01*
+X32257142Y-44019047D01*
+X31914285Y-44323809D02*
+X31838095Y-44361904D01*
+X31685714Y-44361904D01*
+X31609523Y-44323809D01*
+X31571428Y-44247619D01*
+X31571428Y-44209523D01*
+X31609523Y-44133333D01*
+X31685714Y-44095238D01*
+X31800000Y-44095238D01*
+X31876190Y-44057142D01*
+X31914285Y-43980952D01*
+X31914285Y-43942857D01*
+X31876190Y-43866666D01*
+X31800000Y-43828571D01*
+X31685714Y-43828571D01*
+X31609523Y-43866666D01*
+X31342857Y-43828571D02*
+X31038095Y-43828571D01*
+X31228571Y-43561904D02*
+X31228571Y-44247619D01*
+X31190476Y-44323809D01*
+X31114285Y-44361904D01*
+X31038095Y-44361904D01*
+X30771428Y-44361904D02*
+X30771428Y-43828571D01*
+X30771428Y-43561904D02*
+X30809523Y-43600000D01*
+X30771428Y-43638095D01*
+X30733333Y-43600000D01*
+X30771428Y-43561904D01*
+X30771428Y-43638095D01*
+X30047619Y-44361904D02*
+X30047619Y-43942857D01*
+X30085714Y-43866666D01*
+X30161904Y-43828571D01*
+X30314285Y-43828571D01*
+X30390476Y-43866666D01*
+X30047619Y-44323809D02*
+X30123809Y-44361904D01*
+X30314285Y-44361904D01*
+X30390476Y-44323809D01*
+X30428571Y-44247619D01*
+X30428571Y-44171428D01*
+X30390476Y-44095238D01*
+X30314285Y-44057142D01*
+X30123809Y-44057142D01*
+X30047619Y-44019047D01*
+X29666666Y-43828571D02*
+X29666666Y-44361904D01*
+X29666666Y-43904761D02*
+X29628571Y-43866666D01*
+X29552380Y-43828571D01*
+X29438095Y-43828571D01*
+X29361904Y-43866666D01*
+X29323809Y-43942857D01*
+X29323809Y-44361904D01*
+X28371428Y-44323809D02*
+X28257142Y-44361904D01*
+X28066666Y-44361904D01*
+X27990476Y-44323809D01*
+X27952380Y-44285714D01*
+X27914285Y-44209523D01*
+X27914285Y-44133333D01*
+X27952380Y-44057142D01*
+X27990476Y-44019047D01*
+X28066666Y-43980952D01*
+X28219047Y-43942857D01*
+X28295238Y-43904761D01*
+X28333333Y-43866666D01*
+X28371428Y-43790476D01*
+X28371428Y-43714285D01*
+X28333333Y-43638095D01*
+X28295238Y-43600000D01*
+X28219047Y-43561904D01*
+X28028571Y-43561904D01*
+X27914285Y-43600000D01*
+X27228571Y-44323809D02*
+X27304761Y-44361904D01*
+X27457142Y-44361904D01*
+X27533333Y-44323809D01*
+X27571428Y-44285714D01*
+X27609523Y-44209523D01*
+X27609523Y-43980952D01*
+X27571428Y-43904761D01*
+X27533333Y-43866666D01*
+X27457142Y-43828571D01*
+X27304761Y-43828571D01*
+X27228571Y-43866666D01*
+X26885714Y-44361904D02*
+X26885714Y-43561904D01*
+X26542857Y-44361904D02*
+X26542857Y-43942857D01*
+X26580952Y-43866666D01*
+X26657142Y-43828571D01*
+X26771428Y-43828571D01*
+X26847619Y-43866666D01*
+X26885714Y-43904761D01*
+X25819047Y-43828571D02*
+X25819047Y-44361904D01*
+X26161904Y-43828571D02*
+X26161904Y-44247619D01*
+X26123809Y-44323809D01*
+X26047619Y-44361904D01*
+X25933333Y-44361904D01*
+X25857142Y-44323809D01*
+X25819047Y-44285714D01*
+X25438095Y-44361904D02*
+X25438095Y-43828571D01*
+X25438095Y-43904761D02*
+X25400000Y-43866666D01*
+X25323809Y-43828571D01*
+X25209523Y-43828571D01*
+X25133333Y-43866666D01*
+X25095238Y-43942857D01*
+X25095238Y-44361904D01*
+X25095238Y-43942857D02*
+X25057142Y-43866666D01*
+X24980952Y-43828571D01*
+X24866666Y-43828571D01*
+X24790476Y-43866666D01*
+X24752380Y-43942857D01*
+X24752380Y-44361904D01*
+X24371428Y-44361904D02*
+X24371428Y-43561904D01*
+X24371428Y-43866666D02*
+X24295238Y-43828571D01*
+X24142857Y-43828571D01*
+X24066666Y-43866666D01*
+X24028571Y-43904761D01*
+X23990476Y-43980952D01*
+X23990476Y-44209523D01*
+X24028571Y-44285714D01*
+X24066666Y-44323809D01*
+X24142857Y-44361904D01*
+X24295238Y-44361904D01*
+X24371428Y-44323809D01*
+X23038095Y-44361904D02*
+X23038095Y-43561904D01*
+X22847619Y-43561904D01*
+X22733333Y-43600000D01*
+X22657142Y-43676190D01*
+X22619047Y-43752380D01*
+X22580952Y-43904761D01*
+X22580952Y-44019047D01*
+X22619047Y-44171428D01*
+X22657142Y-44247619D01*
+X22733333Y-44323809D01*
+X22847619Y-44361904D01*
+X23038095Y-44361904D01*
+X21857142Y-44361904D02*
+X22238095Y-44361904D01*
+X22238095Y-43561904D01*
+X21171428Y-44361904D02*
+X21628571Y-44361904D01*
+X21400000Y-44361904D02*
+X21400000Y-43561904D01*
+X21476190Y-43676190D01*
+X21552380Y-43752380D01*
+X21628571Y-43790476D01*
+X20866666Y-44323809D02*
+X20752380Y-44361904D01*
+X20561904Y-44361904D01*
+X20485714Y-44323809D01*
+X20447619Y-44285714D01*
+X20409523Y-44209523D01*
+X20409523Y-44133333D01*
+X20447619Y-44057142D01*
+X20485714Y-44019047D01*
+X20561904Y-43980952D01*
+X20714285Y-43942857D01*
+X20790476Y-43904761D01*
+X20828571Y-43866666D01*
+X20866666Y-43790476D01*
+X20866666Y-43714285D01*
+X20828571Y-43638095D01*
+X20790476Y-43600000D01*
+X20714285Y-43561904D01*
+X20523809Y-43561904D01*
+X20409523Y-43600000D01*
+X20104761Y-44323809D02*
+X19990476Y-44361904D01*
+X19800000Y-44361904D01*
+X19723809Y-44323809D01*
+X19685714Y-44285714D01*
+X19647619Y-44209523D01*
+X19647619Y-44133333D01*
+X19685714Y-44057142D01*
+X19723809Y-44019047D01*
+X19800000Y-43980952D01*
+X19952380Y-43942857D01*
+X20028571Y-43904761D01*
+X20066666Y-43866666D01*
+X20104761Y-43790476D01*
+X20104761Y-43714285D01*
+X20066666Y-43638095D01*
+X20028571Y-43600000D01*
+X19952380Y-43561904D01*
+X19761904Y-43561904D01*
+X19647619Y-43600000D01*
+X19304761Y-44361904D02*
+X19304761Y-43561904D01*
+X18847619Y-44361904D02*
+X19190476Y-43904761D01*
+X18847619Y-43561904D02*
+X19304761Y-44019047D01*
+X17933333Y-43638095D02*
+X17895238Y-43600000D01*
+X17819047Y-43561904D01*
+X17628571Y-43561904D01*
+X17552380Y-43600000D01*
+X17514285Y-43638095D01*
+X17476190Y-43714285D01*
+X17476190Y-43790476D01*
+X17514285Y-43904761D01*
+X17971428Y-44361904D01*
+X17476190Y-44361904D01*
+X16980952Y-43561904D02*
+X16904761Y-43561904D01*
+X16828571Y-43600000D01*
+X16790476Y-43638095D01*
+X16752380Y-43714285D01*
+X16714285Y-43866666D01*
+X16714285Y-44057142D01*
+X16752380Y-44209523D01*
+X16790476Y-44285714D01*
+X16828571Y-44323809D01*
+X16904761Y-44361904D01*
+X16980952Y-44361904D01*
+X17057142Y-44323809D01*
+X17095238Y-44285714D01*
+X17133333Y-44209523D01*
+X17171428Y-44057142D01*
+X17171428Y-43866666D01*
+X17133333Y-43714285D01*
+X17095238Y-43638095D01*
+X17057142Y-43600000D01*
+X16980952Y-43561904D01*
+X15952380Y-44361904D02*
+X16409523Y-44361904D01*
+X16180952Y-44361904D02*
+X16180952Y-43561904D01*
+X16257142Y-43676190D01*
+X16333333Y-43752380D01*
+X16409523Y-43790476D01*
+X15495238Y-43904761D02*
+X15571428Y-43866666D01*
+X15609523Y-43828571D01*
+X15647619Y-43752380D01*
+X15647619Y-43714285D01*
+X15609523Y-43638095D01*
+X15571428Y-43600000D01*
+X15495238Y-43561904D01*
+X15342857Y-43561904D01*
+X15266666Y-43600000D01*
+X15228571Y-43638095D01*
+X15190476Y-43714285D01*
+X15190476Y-43752380D01*
+X15228571Y-43828571D01*
+X15266666Y-43866666D01*
+X15342857Y-43904761D01*
+X15495238Y-43904761D01*
+X15571428Y-43942857D01*
+X15609523Y-43980952D01*
+X15647619Y-44057142D01*
+X15647619Y-44209523D01*
+X15609523Y-44285714D01*
+X15571428Y-44323809D01*
+X15495238Y-44361904D01*
+X15342857Y-44361904D01*
+X15266666Y-44323809D01*
+X15228571Y-44285714D01*
+X15190476Y-44209523D01*
+X15190476Y-44057142D01*
+X15228571Y-43980952D01*
+X15266666Y-43942857D01*
+X15342857Y-43904761D01*
 D11*
 X10405000Y-33648571D02*
 X10119285Y-33648571D01*
@@ -4974,12 +4975,19 @@ X76000000Y0D01*
 X0Y0D01*
 X0Y-2000000D01*
 D14*
+G04 #@! TO.C,REF\002A\002A*
+X11000000Y-42000000D03*
+G04 #@! TD*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-5000000D03*
+G04 #@! TD*
+D15*
 G04 #@! TO.C,J1*
 X10270000Y-7000000D03*
 X4270000Y-7000000D03*
 X7270000Y-11700000D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.C,J2*
 X2740000Y-30090000D03*
 X2740000Y-38850000D03*
@@ -4992,15 +5000,19 @@ G04 #@! TO.C,J4*
 X73040000Y-38850000D03*
 X73040000Y-30090000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,JP2*
 X52720000Y-26850000D03*
-D17*
+D18*
 X50180000Y-26850000D03*
 G04 #@! TD*
 G04 #@! TO.C,JP1*
 X50180000Y-19230000D03*
-D16*
+D17*
 X52720000Y-19230000D03*
 G04 #@! TD*
+D14*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-42000000D03*
+G04 #@! TD*
 M02*
diff --git a/pcb/gerber/diplexer-Edge.Cuts.gm1 b/pcb/gerber/diplexer-Edge.Cuts.gm1
index 185127a..545476d 100644
--- a/pcb/gerber/diplexer-Edge.Cuts.gm1
+++ b/pcb/gerber/diplexer-Edge.Cuts.gm1
@@ -1,11 +1,11 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/pcb/gerber/diplexer-F.Cu.gtl b/pcb/gerber/diplexer-F.Cu.gtl
index 1f9eb65..974a1d9 100644
--- a/pcb/gerber/diplexer-F.Cu.gtl
+++ b/pcb/gerber/diplexer-F.Cu.gtl
@@ -1,60 +1,72 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Copper,L1,Top,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD10C,5.000000*%
+G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD10R,1.600000X3.500000*%
+%ADD11R,1.600000X3.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD11C,0.100000*%
+%ADD12C,0.100000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD12C,1.150000*%
+%ADD13C,1.150000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD13C,1.425000*%
+%ADD14C,1.425000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD14R,3.500000X3.500000*%
+%ADD15R,3.500000X3.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD15R,5.080000X2.290000*%
+%ADD16R,5.080000X2.290000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD16R,5.080000X2.420000*%
+%ADD17R,5.080000X2.420000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD17O,1.700000X1.700000*%
+%ADD18O,1.700000X1.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD18R,1.700000X1.700000*%
+%ADD19R,1.700000X1.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD19R,2.000000X1.500000*%
+%ADD20R,2.000000X1.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD20C,0.800000*%
+%ADD21C,0.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD21C,1.250000*%
+%ADD22C,1.250000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD22C,1.500000*%
+%ADD23C,1.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD23C,0.254000*%
+%ADD24C,0.254000*%
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.P,REF\002A\002A,1*
+G04 #@! TO.N,GND*
+X11000000Y-42000000D03*
+G04 #@! TD*
+G04 #@! TO.P,REF\002A\002A,1*
+G04 #@! TO.N,GND*
+X65000000Y-5000000D03*
+G04 #@! TD*
+D11*
 G04 #@! TO.P,C1,1*
 G04 #@! TO.N,VCC*
 X32270000Y-11800000D03*
@@ -62,7 +74,7 @@ G04 #@! TO.P,C1,2*
 G04 #@! TO.N,GND*
 X32270000Y-6200000D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.N,Net-(C2-Pad1)*
 G04 #@! TO.C,C2*
 G36*
@@ -137,12 +149,12 @@ X47720001Y-10910000D01*
 X47744505Y-10911204D01*
 X47744505Y-10911204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C2,1*
 G04 #@! TO.N,Net-(C2-Pad1)*
 X47395000Y-11610000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C2-Pad2)*
 G04 #@! TO.C,C2*
 G36*
@@ -217,12 +229,12 @@ X45670001Y-10910000D01*
 X45694505Y-10911204D01*
 X45694505Y-10911204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C2,2*
 G04 #@! TO.N,Net-(C2-Pad2)*
 X45345000Y-11610000D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,C3*
 G36*
@@ -297,12 +309,12 @@ X39200001Y-4930000D01*
 X39224505Y-4931204D01*
 X39224505Y-4931204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C3,2*
 G04 #@! TO.N,GND*
 X38750000Y-5505000D03*
-D11*
+D12*
 G04 #@! TO.N,VCC*
 G04 #@! TO.C,C3*
 G36*
@@ -377,12 +389,12 @@ X39200001Y-6980000D01*
 X39224505Y-6981204D01*
 X39224505Y-6981204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C3,1*
 G04 #@! TO.N,VCC*
 X38750000Y-7555000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C4-Pad1)*
 G04 #@! TO.C,C4*
 G36*
@@ -457,12 +469,12 @@ X18880001Y-37950000D01*
 X18904505Y-37951204D01*
 X18904505Y-37951204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C4,1*
 G04 #@! TO.N,Net-(C4-Pad1)*
 X18430000Y-38525000D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,C4*
 G36*
@@ -537,12 +549,12 @@ X18880001Y-40000000D01*
 X18904505Y-40001204D01*
 X18904505Y-40001204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C4,2*
 G04 #@! TO.N,GND*
 X18430000Y-40575000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C2-Pad1)*
 G04 #@! TO.C,C5*
 G36*
@@ -617,12 +629,12 @@ X53290001Y-10910000D01*
 X53314505Y-10911204D01*
 X53314505Y-10911204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C5,2*
 G04 #@! TO.N,Net-(C2-Pad1)*
 X52965000Y-11610000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C5-Pad1)*
 G04 #@! TO.C,C5*
 G36*
@@ -697,12 +709,12 @@ X55340001Y-10910000D01*
 X55364505Y-10911204D01*
 X55364505Y-10911204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C5,1*
 G04 #@! TO.N,Net-(C5-Pad1)*
 X55015000Y-11610000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C6-Pad1)*
 G04 #@! TO.C,C6*
 G36*
@@ -777,12 +789,12 @@ X62960001Y-10910000D01*
 X62984505Y-10911204D01*
 X62984505Y-10911204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C6,1*
 G04 #@! TO.N,Net-(C6-Pad1)*
 X62635000Y-11610000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C5-Pad1)*
 G04 #@! TO.C,C6*
 G36*
@@ -857,12 +869,12 @@ X60910001Y-10910000D01*
 X60934505Y-10911204D01*
 X60934505Y-10911204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C6,2*
 G04 #@! TO.N,Net-(C5-Pad1)*
 X60585000Y-11610000D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,C7*
 G36*
@@ -937,12 +949,12 @@ X29040001Y-40000000D01*
 X29064505Y-40001204D01*
 X29064505Y-40001204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C7,2*
 G04 #@! TO.N,GND*
 X28590000Y-40575000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C7-Pad1)*
 G04 #@! TO.C,C7*
 G36*
@@ -1017,12 +1029,12 @@ X29040001Y-37950000D01*
 X29064505Y-37951204D01*
 X29064505Y-37951204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C7,1*
 G04 #@! TO.N,Net-(C7-Pad1)*
 X28590000Y-38525000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C8-Pad1)*
 G04 #@! TO.C,C8*
 G36*
@@ -1097,12 +1109,12 @@ X60420001Y-14720000D01*
 X60444505Y-14721204D01*
 X60444505Y-14721204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C8,1*
 G04 #@! TO.N,Net-(C8-Pad1)*
 X60095000Y-15420000D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,C8*
 G36*
@@ -1177,12 +1189,12 @@ X58370001Y-14720000D01*
 X58394505Y-14721204D01*
 X58394505Y-14721204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C8,2*
 G04 #@! TO.N,GND*
 X58045000Y-15420000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C9-Pad2)*
 G04 #@! TO.C,C9*
 G36*
@@ -1257,12 +1269,12 @@ X43130001Y-33770000D01*
 X43154505Y-33771204D01*
 X43154505Y-33771204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C9,2*
 G04 #@! TO.N,Net-(C9-Pad2)*
 X42805000Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C10-Pad2)*
 G04 #@! TO.C,C9*
 G36*
@@ -1337,12 +1349,12 @@ X45180001Y-33770000D01*
 X45204505Y-33771204D01*
 X45204505Y-33771204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C9,1*
 G04 #@! TO.N,Net-(C10-Pad2)*
 X44855000Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C10-Pad1)*
 G04 #@! TO.C,C10*
 G36*
@@ -1417,12 +1429,12 @@ X52800001Y-33770000D01*
 X52824505Y-33771204D01*
 X52824505Y-33771204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C10,1*
 G04 #@! TO.N,Net-(C10-Pad1)*
 X52475000Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C10-Pad2)*
 G04 #@! TO.C,C10*
 G36*
@@ -1497,12 +1509,12 @@ X50750001Y-33770000D01*
 X50774505Y-33771204D01*
 X50774505Y-33771204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C10,2*
 G04 #@! TO.N,Net-(C10-Pad2)*
 X50425000Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C10-Pad1)*
 G04 #@! TO.C,C11*
 G36*
@@ -1577,12 +1589,12 @@ X60910001Y-33770000D01*
 X60934505Y-33771204D01*
 X60934505Y-33771204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C11,2*
 G04 #@! TO.N,Net-(C10-Pad1)*
 X60585000Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C11-Pad1)*
 G04 #@! TO.C,C11*
 G36*
@@ -1657,12 +1669,12 @@ X62960001Y-33770000D01*
 X62984505Y-33771204D01*
 X62984505Y-33771204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C11,1*
 G04 #@! TO.N,Net-(C11-Pad1)*
 X62635000Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C12-Pad1)*
 G04 #@! TO.C,C12*
 G36*
@@ -1737,12 +1749,12 @@ X60420001Y-29960000D01*
 X60444505Y-29961204D01*
 X60444505Y-29961204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C12,1*
 G04 #@! TO.N,Net-(C12-Pad1)*
 X60095000Y-30660000D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,C12*
 G36*
@@ -1817,12 +1829,12 @@ X58370001Y-29960000D01*
 X58394505Y-29961204D01*
 X58394505Y-29961204D01*
 G37*
-D12*
+D13*
 G04 #@! TD*
 G04 #@! TO.P,C12,2*
 G04 #@! TO.N,GND*
 X58045000Y-30660000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C4-Pad1)*
 G04 #@! TO.C,L1*
 G36*
@@ -1897,12 +1909,12 @@ X15300000Y-33145000D01*
 X15324504Y-33146204D01*
 X15324504Y-33146204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L1,2*
 G04 #@! TO.N,Net-(C4-Pad1)*
 X14837500Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C2-Pad2)*
 G04 #@! TO.C,L1*
 G36*
@@ -1977,12 +1989,12 @@ X12325000Y-33145000D01*
 X12349504Y-33146204D01*
 X12349504Y-33146204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L1,1*
 G04 #@! TO.N,Net-(C2-Pad2)*
 X11862500Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C2-Pad1)*
 G04 #@! TO.C,L2*
 G36*
@@ -2057,12 +2069,12 @@ X51255000Y-7305000D01*
 X51279504Y-7306204D01*
 X51279504Y-7306204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L2,1*
 G04 #@! TO.N,Net-(C2-Pad1)*
 X50180000Y-8017500D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,L2*
 G36*
@@ -2137,12 +2149,12 @@ X51255000Y-4330000D01*
 X51279504Y-4331204D01*
 X51279504Y-4331204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L2,2*
 G04 #@! TO.N,GND*
 X50180000Y-5042500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C7-Pad1)*
 G04 #@! TO.C,L3*
 G36*
@@ -2217,12 +2229,12 @@ X25460000Y-33145000D01*
 X25484504Y-33146204D01*
 X25484504Y-33146204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L3,2*
 G04 #@! TO.N,Net-(C7-Pad1)*
 X24997500Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C4-Pad1)*
 G04 #@! TO.C,L3*
 G36*
@@ -2297,12 +2309,12 @@ X22485000Y-33145000D01*
 X22509504Y-33146204D01*
 X22509504Y-33146204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L3,1*
 G04 #@! TO.N,Net-(C4-Pad1)*
 X22022500Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C5-Pad1)*
 G04 #@! TO.C,L4*
 G36*
@@ -2377,12 +2389,12 @@ X58875000Y-7305000D01*
 X58899504Y-7306204D01*
 X58899504Y-7306204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L4,1*
 G04 #@! TO.N,Net-(C5-Pad1)*
 X57800000Y-8017500D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,L4*
 G36*
@@ -2457,12 +2469,12 @@ X58875000Y-4330000D01*
 X58899504Y-4331204D01*
 X58899504Y-4331204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L4,2*
 G04 #@! TO.N,GND*
 X57800000Y-5042500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C9-Pad2)*
 G04 #@! TO.C,L5*
 G36*
@@ -2537,12 +2549,12 @@ X35620000Y-33145000D01*
 X35644504Y-33146204D01*
 X35644504Y-33146204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L5,2*
 G04 #@! TO.N,Net-(C9-Pad2)*
 X35157500Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C7-Pad1)*
 G04 #@! TO.C,L5*
 G36*
@@ -2617,12 +2629,12 @@ X32645000Y-33145000D01*
 X32669504Y-33146204D01*
 X32669504Y-33146204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L5,1*
 G04 #@! TO.N,Net-(C7-Pad1)*
 X32182500Y-34470000D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C9-Pad2)*
 G04 #@! TO.C,L6*
 G36*
@@ -2697,12 +2709,12 @@ X41095000Y-37350000D01*
 X41119504Y-37351204D01*
 X41119504Y-37351204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L6,1*
 G04 #@! TO.N,Net-(C9-Pad2)*
 X40020000Y-38062500D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,L6*
 G36*
@@ -2777,12 +2789,12 @@ X41095000Y-40325000D01*
 X41119504Y-40326204D01*
 X41119504Y-40326204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L6,2*
 G04 #@! TO.N,GND*
 X40020000Y-41037500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C6-Pad1)*
 G04 #@! TO.C,L7*
 G36*
@@ -2857,12 +2869,12 @@ X66495000Y-14490000D01*
 X66519504Y-14491204D01*
 X66519504Y-14491204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L7,2*
 G04 #@! TO.N,Net-(C6-Pad1)*
 X65420000Y-15202500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C8-Pad1)*
 G04 #@! TO.C,L7*
 G36*
@@ -2937,12 +2949,12 @@ X66495000Y-17465000D01*
 X66519504Y-17466204D01*
 X66519504Y-17466204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L7,1*
 G04 #@! TO.N,Net-(C8-Pad1)*
 X65420000Y-18177500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C10-Pad2)*
 G04 #@! TO.C,L8*
 G36*
@@ -3017,12 +3029,12 @@ X48715000Y-37350000D01*
 X48739504Y-37351204D01*
 X48739504Y-37351204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L8,1*
 G04 #@! TO.N,Net-(C10-Pad2)*
 X47640000Y-38062500D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,L8*
 G36*
@@ -3097,12 +3109,12 @@ X48715000Y-40325000D01*
 X48739504Y-40326204D01*
 X48739504Y-40326204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L8,2*
 G04 #@! TO.N,GND*
 X47640000Y-41037500D03*
-D11*
+D12*
 G04 #@! TO.N,GND*
 G04 #@! TO.C,L9*
 G36*
@@ -3177,12 +3189,12 @@ X56335000Y-40325000D01*
 X56359504Y-40326204D01*
 X56359504Y-40326204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L9,2*
 G04 #@! TO.N,GND*
 X55260000Y-41037500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C10-Pad1)*
 G04 #@! TO.C,L9*
 G36*
@@ -3257,12 +3269,12 @@ X56335000Y-37350000D01*
 X56359504Y-37351204D01*
 X56359504Y-37351204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L9,1*
 G04 #@! TO.N,Net-(C10-Pad1)*
 X55260000Y-38062500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C12-Pad1)*
 G04 #@! TO.C,L10*
 G36*
@@ -3337,12 +3349,12 @@ X66495000Y-27190000D01*
 X66519504Y-27191204D01*
 X66519504Y-27191204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L10,1*
 G04 #@! TO.N,Net-(C12-Pad1)*
 X65420000Y-27902500D03*
-D11*
+D12*
 G04 #@! TO.N,Net-(C11-Pad1)*
 G04 #@! TO.C,L10*
 G36*
@@ -3417,12 +3429,12 @@ X66495000Y-30165000D01*
 X66519504Y-30166204D01*
 X66519504Y-30166204D01*
 G37*
-D13*
+D14*
 G04 #@! TD*
 G04 #@! TO.P,L10,2*
 G04 #@! TO.N,Net-(C11-Pad1)*
 X65420000Y-30877500D03*
-D14*
+D15*
 G04 #@! TO.P,J1,1*
 G04 #@! TO.N,Net-(D1-Pad3)*
 X10270000Y-7000000D03*
@@ -3432,11 +3444,11 @@ X4270000Y-7000000D03*
 G04 #@! TO.P,J1,3*
 X7270000Y-11700000D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.P,J2,1*
 G04 #@! TO.N,Net-(C2-Pad2)*
 X2740000Y-34470000D03*
-D16*
+D17*
 G04 #@! TO.P,J2,2*
 G04 #@! TO.N,GND*
 X2740000Y-30090000D03*
@@ -3446,7 +3458,7 @@ G04 #@! TO.P,J3,2*
 G04 #@! TO.N,GND*
 X73040000Y-7230000D03*
 X73040000Y-15990000D03*
-D15*
+D16*
 G04 #@! TO.P,J3,1*
 G04 #@! TO.N,Net-(C6-Pad1)*
 X73040000Y-11610000D03*
@@ -3454,17 +3466,17 @@ G04 #@! TD*
 G04 #@! TO.P,J4,1*
 G04 #@! TO.N,Net-(C11-Pad1)*
 X73040000Y-34470000D03*
-D16*
+D17*
 G04 #@! TO.P,J4,2*
 G04 #@! TO.N,GND*
 X73040000Y-38850000D03*
 X73040000Y-30090000D03*
 G04 #@! TD*
-D17*
+D18*
 G04 #@! TO.P,JP2,2*
 G04 #@! TO.N,Net-(C12-Pad1)*
 X52720000Y-26850000D03*
-D18*
+D19*
 G04 #@! TO.P,JP2,1*
 G04 #@! TO.N,VCC*
 X50180000Y-26850000D03*
@@ -3472,12 +3484,12 @@ G04 #@! TD*
 G04 #@! TO.P,JP1,1*
 G04 #@! TO.N,VCC*
 X50180000Y-19230000D03*
-D17*
+D18*
 G04 #@! TO.P,JP1,2*
 G04 #@! TO.N,Net-(C8-Pad1)*
 X52720000Y-19230000D03*
 G04 #@! TD*
-D19*
+D20*
 G04 #@! TO.P,D1,1*
 G04 #@! TO.N,VCC*
 X25640000Y-11550000D03*
@@ -3491,7 +3503,12 @@ G04 #@! TO.P,D1,4*
 G04 #@! TO.N,Net-(D1-Pad4)*
 X16900000Y-11550000D03*
 G04 #@! TD*
-D20*
+D10*
+G04 #@! TO.P,REF\002A\002A,1*
+G04 #@! TO.N,GND*
+X65000000Y-42000000D03*
+G04 #@! TD*
+D21*
 G04 #@! TO.N,VCC*
 X38750000Y-10340000D03*
 G04 #@! TO.N,GND*
@@ -3958,11 +3975,11 @@ X25415000Y-9070000D03*
 X75000000Y-45000000D03*
 X1000000Y-45000000D03*
 G04 #@! TD*
-D21*
+D22*
 G04 #@! TO.N,VCC*
 X32120000Y-11550000D02*
 X32270000Y-11700000D01*
-D22*
+D23*
 X25640000Y-11550000D02*
 X32120000Y-11550000D01*
 X32270000Y-11700000D02*
@@ -4056,11 +4073,11 @@ X10270000Y-7000000D02*
 X13270000Y-7000000D01*
 X13270000Y-7000000D02*
 X13820000Y-6450000D01*
-D21*
+D22*
 G04 #@! TO.N,Net-(D1-Pad4)*
 X16750000Y-11700000D02*
 X16900000Y-11550000D01*
-D22*
+D23*
 X16900000Y-11550000D02*
 X11450000Y-11550000D01*
 X11300000Y-11700000D02*
@@ -4104,7 +4121,7 @@ X60340000Y-27390000D01*
 X60340000Y-27390000D02*
 X57070000Y-27390000D01*
 G04 #@! TD*
-D23*
+D24*
 G04 #@! TO.N,GND*
 G36*
 X75498000Y-5385000D02*
@@ -4257,7 +4274,37 @@ X73446750Y-40695000D01*
 X75498001Y-40695000D01*
 X75498001Y-46498000D01*
 X502000Y-46498000D01*
-X502000Y-40981750D01*
+X502000Y-44316148D01*
+X9034577Y-44316148D01*
+X9327492Y-44723932D01*
+X10497207Y-45156626D01*
+X11743469Y-45108753D01*
+X12672508Y-44723932D01*
+X12965423Y-44316148D01*
+X63034577Y-44316148D01*
+X63327492Y-44723932D01*
+X64497207Y-45156626D01*
+X65743469Y-45108753D01*
+X66672508Y-44723932D01*
+X66965423Y-44316148D01*
+X65000000Y-42350725D01*
+X63034577Y-44316148D01*
+X12965423Y-44316148D01*
+X11000000Y-42350725D01*
+X9034577Y-44316148D01*
+X502000Y-44316148D01*
+X502000Y-41497207D01*
+X7843374Y-41497207D01*
+X7891247Y-42743469D01*
+X8276068Y-43672508D01*
+X8683852Y-43965423D01*
+X10649275Y-42000000D01*
+X11350725Y-42000000D01*
+X13316148Y-43965423D01*
+X13723932Y-43672508D01*
+X14156626Y-42502793D01*
+X14108753Y-41256531D01*
+X13994935Y-40981750D01*
 X17095000Y-40981750D01*
 X17095000Y-41276309D01*
 X17191673Y-41509698D01*
@@ -4336,6 +4383,25 @@ X56711310Y-42385000D01*
 X56944699Y-42288327D01*
 X57123327Y-42109698D01*
 X57220000Y-41876309D01*
+X57220000Y-41497207D01*
+X61843374Y-41497207D01*
+X61891247Y-42743469D01*
+X62276068Y-43672508D01*
+X62683852Y-43965423D01*
+X64649275Y-42000000D01*
+X65350725Y-42000000D01*
+X67316148Y-43965423D01*
+X67723932Y-43672508D01*
+X68156626Y-42502793D01*
+X68108753Y-41256531D01*
+X67723932Y-40327492D01*
+X67316148Y-40034577D01*
+X65350725Y-42000000D01*
+X64649275Y-42000000D01*
+X62683852Y-40034577D01*
+X62276068Y-40327492D01*
+X61843374Y-41497207D01*
+X57220000Y-41497207D01*
 X57220000Y-41444250D01*
 X57061250Y-41285500D01*
 X55508000Y-41285500D01*
@@ -4368,7 +4434,15 @@ X18678000Y-40823000D01*
 X18182000Y-40823000D01*
 X17253750Y-40823000D01*
 X17095000Y-40981750D01*
-X502000Y-40981750D01*
+X13994935Y-40981750D01*
+X13723932Y-40327492D01*
+X13316148Y-40034577D01*
+X11350725Y-42000000D01*
+X10649275Y-42000000D01*
+X8683852Y-40034577D01*
+X8276068Y-40327492D01*
+X7843374Y-41497207D01*
+X502000Y-41497207D01*
 X502000Y-40695000D01*
 X2333250Y-40695000D01*
 X2492000Y-40536250D01*
@@ -4380,6 +4454,16 @@ X5406309Y-40695000D01*
 X5639698Y-40598327D01*
 X5818327Y-40419699D01*
 X5915000Y-40186310D01*
+X5915000Y-39683852D01*
+X9034577Y-39683852D01*
+X11000000Y-41649275D01*
+X12965423Y-39683852D01*
+X12672508Y-39276068D01*
+X11502793Y-38843374D01*
+X10256531Y-38891247D01*
+X9327492Y-39276068D01*
+X9034577Y-39683852D01*
+X5915000Y-39683852D01*
 X5915000Y-39256750D01*
 X5756250Y-39098000D01*
 X2988000Y-39098000D01*
@@ -4559,11 +4643,12 @@ X38060000Y-40198691D01*
 X29894559Y-40198691D01*
 X29925000Y-40168250D01*
 X29925000Y-39873691D01*
-X29828327Y-39640302D01*
-X29649699Y-39461673D01*
-X29455115Y-39381073D01*
-X29524627Y-39334627D01*
-X29576662Y-39256750D01*
+X29846367Y-39683852D01*
+X63034577Y-39683852D01*
+X65000000Y-41649275D01*
+X66965423Y-39683852D01*
+X66672508Y-39276068D01*
+X66620286Y-39256750D01*
 X69865000Y-39256750D01*
 X69865000Y-40186310D01*
 X69961673Y-40419699D01*
@@ -4574,7 +4659,16 @@ X72792000Y-40536250D01*
 X72792000Y-39098000D01*
 X70023750Y-39098000D01*
 X69865000Y-39256750D01*
-X29576662Y-39256750D01*
+X66620286Y-39256750D01*
+X65502793Y-38843374D01*
+X64256531Y-38891247D01*
+X63327492Y-39276068D01*
+X63034577Y-39683852D01*
+X29846367Y-39683852D01*
+X29828327Y-39640302D01*
+X29649699Y-39461673D01*
+X29455115Y-39381073D01*
+X29524627Y-39334627D01*
 X29673195Y-39112278D01*
 X29725365Y-38850001D01*
 X29725365Y-38625233D01*
@@ -5165,6 +5259,16 @@ X59359626Y-8964626D01*
 X59508195Y-8742278D01*
 X59560365Y-8480000D01*
 X59560365Y-7555000D01*
+X59512855Y-7316148D01*
+X63034577Y-7316148D01*
+X63327492Y-7723932D01*
+X64497207Y-8156626D01*
+X65743469Y-8108753D01*
+X66672508Y-7723932D01*
+X66965423Y-7316148D01*
+X65000000Y-5350725D01*
+X63034577Y-7316148D01*
+X59512855Y-7316148D01*
 X59508195Y-7292722D01*
 X59359626Y-7070374D01*
 X59137278Y-6921805D01*
@@ -5621,18 +5725,6 @@ X58206750Y-6390000D01*
 X59251310Y-6390000D01*
 X59484699Y-6293327D01*
 X59663327Y-6114698D01*
-X59754871Y-5893690D01*
-X69865000Y-5893690D01*
-X69865000Y-6823250D01*
-X70023750Y-6982000D01*
-X72792000Y-6982000D01*
-X72792000Y-5543750D01*
-X72633250Y-5385000D01*
-X70373691Y-5385000D01*
-X70140302Y-5481673D01*
-X69961673Y-5660301D01*
-X69865000Y-5893690D01*
-X59754871Y-5893690D01*
 X59760000Y-5881309D01*
 X59760000Y-5449250D01*
 X59601250Y-5290500D01*
@@ -5691,6 +5783,37 @@ X58048000Y-3853750D01*
 X58048000Y-4794500D01*
 X59601250Y-4794500D01*
 X59760000Y-4635750D01*
+X59760000Y-4497207D01*
+X61843374Y-4497207D01*
+X61891247Y-5743469D01*
+X62276068Y-6672508D01*
+X62683852Y-6965423D01*
+X64649275Y-5000000D01*
+X65350725Y-5000000D01*
+X67316148Y-6965423D01*
+X67723932Y-6672508D01*
+X68012027Y-5893690D01*
+X69865000Y-5893690D01*
+X69865000Y-6823250D01*
+X70023750Y-6982000D01*
+X72792000Y-6982000D01*
+X72792000Y-5543750D01*
+X72633250Y-5385000D01*
+X70373691Y-5385000D01*
+X70140302Y-5481673D01*
+X69961673Y-5660301D01*
+X69865000Y-5893690D01*
+X68012027Y-5893690D01*
+X68156626Y-5502793D01*
+X68108753Y-4256531D01*
+X67723932Y-3327492D01*
+X67316148Y-3034577D01*
+X65350725Y-5000000D01*
+X64649275Y-5000000D01*
+X62683852Y-3034577D01*
+X62276068Y-3327492D01*
+X61843374Y-4497207D01*
+X59760000Y-4497207D01*
 X59760000Y-4203691D01*
 X59663327Y-3970302D01*
 X59484699Y-3791673D01*
@@ -5728,6 +5851,16 @@ X31110301Y-3911673D01*
 X30931673Y-4090302D01*
 X30835000Y-4323691D01*
 X502000Y-4323691D01*
+X502000Y-2683852D01*
+X63034577Y-2683852D01*
+X65000000Y-4649275D01*
+X66965423Y-2683852D01*
+X66672508Y-2276068D01*
+X65502793Y-1843374D01*
+X64256531Y-1891247D01*
+X63327492Y-2276068D01*
+X63034577Y-2683852D01*
+X502000Y-2683852D01*
 X502000Y-502000D01*
 X75498000Y-502000D01*
 X75498000Y-5385000D01*
@@ -5883,7 +6016,37 @@ X73446750Y-40695000D01*
 X75498001Y-40695000D01*
 X75498001Y-46498000D01*
 X502000Y-46498000D01*
-X502000Y-40981750D01*
+X502000Y-44316148D01*
+X9034577Y-44316148D01*
+X9327492Y-44723932D01*
+X10497207Y-45156626D01*
+X11743469Y-45108753D01*
+X12672508Y-44723932D01*
+X12965423Y-44316148D01*
+X63034577Y-44316148D01*
+X63327492Y-44723932D01*
+X64497207Y-45156626D01*
+X65743469Y-45108753D01*
+X66672508Y-44723932D01*
+X66965423Y-44316148D01*
+X65000000Y-42350725D01*
+X63034577Y-44316148D01*
+X12965423Y-44316148D01*
+X11000000Y-42350725D01*
+X9034577Y-44316148D01*
+X502000Y-44316148D01*
+X502000Y-41497207D01*
+X7843374Y-41497207D01*
+X7891247Y-42743469D01*
+X8276068Y-43672508D01*
+X8683852Y-43965423D01*
+X10649275Y-42000000D01*
+X11350725Y-42000000D01*
+X13316148Y-43965423D01*
+X13723932Y-43672508D01*
+X14156626Y-42502793D01*
+X14108753Y-41256531D01*
+X13994935Y-40981750D01*
 X17095000Y-40981750D01*
 X17095000Y-41276309D01*
 X17191673Y-41509698D01*
@@ -5962,6 +6125,25 @@ X56711310Y-42385000D01*
 X56944699Y-42288327D01*
 X57123327Y-42109698D01*
 X57220000Y-41876309D01*
+X57220000Y-41497207D01*
+X61843374Y-41497207D01*
+X61891247Y-42743469D01*
+X62276068Y-43672508D01*
+X62683852Y-43965423D01*
+X64649275Y-42000000D01*
+X65350725Y-42000000D01*
+X67316148Y-43965423D01*
+X67723932Y-43672508D01*
+X68156626Y-42502793D01*
+X68108753Y-41256531D01*
+X67723932Y-40327492D01*
+X67316148Y-40034577D01*
+X65350725Y-42000000D01*
+X64649275Y-42000000D01*
+X62683852Y-40034577D01*
+X62276068Y-40327492D01*
+X61843374Y-41497207D01*
+X57220000Y-41497207D01*
 X57220000Y-41444250D01*
 X57061250Y-41285500D01*
 X55508000Y-41285500D01*
@@ -5994,7 +6176,15 @@ X18678000Y-40823000D01*
 X18182000Y-40823000D01*
 X17253750Y-40823000D01*
 X17095000Y-40981750D01*
-X502000Y-40981750D01*
+X13994935Y-40981750D01*
+X13723932Y-40327492D01*
+X13316148Y-40034577D01*
+X11350725Y-42000000D01*
+X10649275Y-42000000D01*
+X8683852Y-40034577D01*
+X8276068Y-40327492D01*
+X7843374Y-41497207D01*
+X502000Y-41497207D01*
 X502000Y-40695000D01*
 X2333250Y-40695000D01*
 X2492000Y-40536250D01*
@@ -6006,6 +6196,16 @@ X5406309Y-40695000D01*
 X5639698Y-40598327D01*
 X5818327Y-40419699D01*
 X5915000Y-40186310D01*
+X5915000Y-39683852D01*
+X9034577Y-39683852D01*
+X11000000Y-41649275D01*
+X12965423Y-39683852D01*
+X12672508Y-39276068D01*
+X11502793Y-38843374D01*
+X10256531Y-38891247D01*
+X9327492Y-39276068D01*
+X9034577Y-39683852D01*
+X5915000Y-39683852D01*
 X5915000Y-39256750D01*
 X5756250Y-39098000D01*
 X2988000Y-39098000D01*
@@ -6185,11 +6385,12 @@ X38060000Y-40198691D01*
 X29894559Y-40198691D01*
 X29925000Y-40168250D01*
 X29925000Y-39873691D01*
-X29828327Y-39640302D01*
-X29649699Y-39461673D01*
-X29455115Y-39381073D01*
-X29524627Y-39334627D01*
-X29576662Y-39256750D01*
+X29846367Y-39683852D01*
+X63034577Y-39683852D01*
+X65000000Y-41649275D01*
+X66965423Y-39683852D01*
+X66672508Y-39276068D01*
+X66620286Y-39256750D01*
 X69865000Y-39256750D01*
 X69865000Y-40186310D01*
 X69961673Y-40419699D01*
@@ -6200,7 +6401,16 @@ X72792000Y-40536250D01*
 X72792000Y-39098000D01*
 X70023750Y-39098000D01*
 X69865000Y-39256750D01*
-X29576662Y-39256750D01*
+X66620286Y-39256750D01*
+X65502793Y-38843374D01*
+X64256531Y-38891247D01*
+X63327492Y-39276068D01*
+X63034577Y-39683852D01*
+X29846367Y-39683852D01*
+X29828327Y-39640302D01*
+X29649699Y-39461673D01*
+X29455115Y-39381073D01*
+X29524627Y-39334627D01*
 X29673195Y-39112278D01*
 X29725365Y-38850001D01*
 X29725365Y-38625233D01*
@@ -6791,6 +7001,16 @@ X59359626Y-8964626D01*
 X59508195Y-8742278D01*
 X59560365Y-8480000D01*
 X59560365Y-7555000D01*
+X59512855Y-7316148D01*
+X63034577Y-7316148D01*
+X63327492Y-7723932D01*
+X64497207Y-8156626D01*
+X65743469Y-8108753D01*
+X66672508Y-7723932D01*
+X66965423Y-7316148D01*
+X65000000Y-5350725D01*
+X63034577Y-7316148D01*
+X59512855Y-7316148D01*
 X59508195Y-7292722D01*
 X59359626Y-7070374D01*
 X59137278Y-6921805D01*
@@ -7247,18 +7467,6 @@ X58206750Y-6390000D01*
 X59251310Y-6390000D01*
 X59484699Y-6293327D01*
 X59663327Y-6114698D01*
-X59754871Y-5893690D01*
-X69865000Y-5893690D01*
-X69865000Y-6823250D01*
-X70023750Y-6982000D01*
-X72792000Y-6982000D01*
-X72792000Y-5543750D01*
-X72633250Y-5385000D01*
-X70373691Y-5385000D01*
-X70140302Y-5481673D01*
-X69961673Y-5660301D01*
-X69865000Y-5893690D01*
-X59754871Y-5893690D01*
 X59760000Y-5881309D01*
 X59760000Y-5449250D01*
 X59601250Y-5290500D01*
@@ -7317,6 +7525,37 @@ X58048000Y-3853750D01*
 X58048000Y-4794500D01*
 X59601250Y-4794500D01*
 X59760000Y-4635750D01*
+X59760000Y-4497207D01*
+X61843374Y-4497207D01*
+X61891247Y-5743469D01*
+X62276068Y-6672508D01*
+X62683852Y-6965423D01*
+X64649275Y-5000000D01*
+X65350725Y-5000000D01*
+X67316148Y-6965423D01*
+X67723932Y-6672508D01*
+X68012027Y-5893690D01*
+X69865000Y-5893690D01*
+X69865000Y-6823250D01*
+X70023750Y-6982000D01*
+X72792000Y-6982000D01*
+X72792000Y-5543750D01*
+X72633250Y-5385000D01*
+X70373691Y-5385000D01*
+X70140302Y-5481673D01*
+X69961673Y-5660301D01*
+X69865000Y-5893690D01*
+X68012027Y-5893690D01*
+X68156626Y-5502793D01*
+X68108753Y-4256531D01*
+X67723932Y-3327492D01*
+X67316148Y-3034577D01*
+X65350725Y-5000000D01*
+X64649275Y-5000000D01*
+X62683852Y-3034577D01*
+X62276068Y-3327492D01*
+X61843374Y-4497207D01*
+X59760000Y-4497207D01*
 X59760000Y-4203691D01*
 X59663327Y-3970302D01*
 X59484699Y-3791673D01*
@@ -7354,6 +7593,16 @@ X31110301Y-3911673D01*
 X30931673Y-4090302D01*
 X30835000Y-4323691D01*
 X502000Y-4323691D01*
+X502000Y-2683852D01*
+X63034577Y-2683852D01*
+X65000000Y-4649275D01*
+X66965423Y-2683852D01*
+X66672508Y-2276068D01*
+X65502793Y-1843374D01*
+X64256531Y-1891247D01*
+X63327492Y-2276068D01*
+X63034577Y-2683852D01*
+X502000Y-2683852D01*
 X502000Y-502000D01*
 X75498000Y-502000D01*
 X75498000Y-5385000D01*
diff --git a/pcb/gerber/diplexer-F.Mask.gts b/pcb/gerber/diplexer-F.Mask.gts
index 062e72e..c5b125d 100644
--- a/pcb/gerber/diplexer-F.Mask.gts
+++ b/pcb/gerber/diplexer-F.Mask.gts
@@ -1,27 +1,28 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Soldermask,Top*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.150000*%
-%ADD11R,2.000000X3.900000*%
-%ADD12C,0.100000*%
-%ADD13C,1.550000*%
-%ADD14C,1.825000*%
-%ADD15R,3.900000X3.900000*%
-%ADD16R,5.480000X2.690000*%
-%ADD17R,5.480000X2.820000*%
-%ADD18O,2.100000X2.100000*%
-%ADD19R,2.100000X2.100000*%
-%ADD20R,2.400000X1.900000*%
+%ADD11C,5.400000*%
+%ADD12R,2.000000X3.900000*%
+%ADD13C,0.100000*%
+%ADD14C,1.550000*%
+%ADD15C,1.825000*%
+%ADD16R,3.900000X3.900000*%
+%ADD17R,5.480000X2.690000*%
+%ADD18R,5.480000X2.820000*%
+%ADD19O,2.100000X2.100000*%
+%ADD20R,2.100000X2.100000*%
+%ADD21R,2.400000X1.900000*%
 G04 APERTURE END LIST*
 D10*
 G36*
@@ -73,11 +74,18 @@ X76000000Y0D01*
 X0Y0D01*
 X0Y-2000000D01*
 D11*
+G04 #@! TO.C,REF\002A\002A*
+X11000000Y-42000000D03*
+G04 #@! TD*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-5000000D03*
+G04 #@! TD*
+D12*
 G04 #@! TO.C,C1*
 X32270000Y-11800000D03*
 X32270000Y-6200000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C2*
 G36*
 X47866071Y-10711623D02*
@@ -151,9 +159,9 @@ X47833044Y-10710000D01*
 X47866071Y-10711623D01*
 X47866071Y-10711623D01*
 G37*
-D13*
+D14*
 X47395000Y-11610000D03*
-D12*
+D13*
 G36*
 X45816071Y-10711623D02*
 X45848781Y-10716475D01*
@@ -226,10 +234,10 @@ X45783044Y-10710000D01*
 X45816071Y-10711623D01*
 X45816071Y-10711623D01*
 G37*
-D13*
+D14*
 X45345000Y-11610000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C3*
 G36*
 X39346071Y-4731623D02*
@@ -303,9 +311,9 @@ X39313044Y-4730000D01*
 X39346071Y-4731623D01*
 X39346071Y-4731623D01*
 G37*
-D13*
+D14*
 X38750000Y-5505000D03*
-D12*
+D13*
 G36*
 X39346071Y-6781623D02*
 X39378781Y-6786475D01*
@@ -378,10 +386,10 @@ X39313044Y-6780000D01*
 X39346071Y-6781623D01*
 X39346071Y-6781623D01*
 G37*
-D13*
+D14*
 X38750000Y-7555000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C4*
 G36*
 X19026071Y-37751623D02*
@@ -455,9 +463,9 @@ X18993044Y-37750000D01*
 X19026071Y-37751623D01*
 X19026071Y-37751623D01*
 G37*
-D13*
+D14*
 X18430000Y-38525000D03*
-D12*
+D13*
 G36*
 X19026071Y-39801623D02*
 X19058781Y-39806475D01*
@@ -530,10 +538,10 @@ X18993044Y-39800000D01*
 X19026071Y-39801623D01*
 X19026071Y-39801623D01*
 G37*
-D13*
+D14*
 X18430000Y-40575000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C5*
 G36*
 X53436071Y-10711623D02*
@@ -607,9 +615,9 @@ X53403044Y-10710000D01*
 X53436071Y-10711623D01*
 X53436071Y-10711623D01*
 G37*
-D13*
+D14*
 X52965000Y-11610000D03*
-D12*
+D13*
 G36*
 X55486071Y-10711623D02*
 X55518781Y-10716475D01*
@@ -682,10 +690,10 @@ X55453044Y-10710000D01*
 X55486071Y-10711623D01*
 X55486071Y-10711623D01*
 G37*
-D13*
+D14*
 X55015000Y-11610000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C6*
 G36*
 X63106071Y-10711623D02*
@@ -759,9 +767,9 @@ X63073044Y-10710000D01*
 X63106071Y-10711623D01*
 X63106071Y-10711623D01*
 G37*
-D13*
+D14*
 X62635000Y-11610000D03*
-D12*
+D13*
 G36*
 X61056071Y-10711623D02*
 X61088781Y-10716475D01*
@@ -834,10 +842,10 @@ X61023044Y-10710000D01*
 X61056071Y-10711623D01*
 X61056071Y-10711623D01*
 G37*
-D13*
+D14*
 X60585000Y-11610000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C7*
 G36*
 X29186071Y-39801623D02*
@@ -911,9 +919,9 @@ X29153044Y-39800000D01*
 X29186071Y-39801623D01*
 X29186071Y-39801623D01*
 G37*
-D13*
+D14*
 X28590000Y-40575000D03*
-D12*
+D13*
 G36*
 X29186071Y-37751623D02*
 X29218781Y-37756475D01*
@@ -986,10 +994,10 @@ X29153044Y-37750000D01*
 X29186071Y-37751623D01*
 X29186071Y-37751623D01*
 G37*
-D13*
+D14*
 X28590000Y-38525000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C8*
 G36*
 X60566071Y-14521623D02*
@@ -1063,9 +1071,9 @@ X60533044Y-14520000D01*
 X60566071Y-14521623D01*
 X60566071Y-14521623D01*
 G37*
-D13*
+D14*
 X60095000Y-15420000D03*
-D12*
+D13*
 G36*
 X58516071Y-14521623D02*
 X58548781Y-14526475D01*
@@ -1138,10 +1146,10 @@ X58483044Y-14520000D01*
 X58516071Y-14521623D01*
 X58516071Y-14521623D01*
 G37*
-D13*
+D14*
 X58045000Y-15420000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C9*
 G36*
 X43276071Y-33571623D02*
@@ -1215,9 +1223,9 @@ X43243044Y-33570000D01*
 X43276071Y-33571623D01*
 X43276071Y-33571623D01*
 G37*
-D13*
+D14*
 X42805000Y-34470000D03*
-D12*
+D13*
 G36*
 X45326071Y-33571623D02*
 X45358781Y-33576475D01*
@@ -1290,10 +1298,10 @@ X45293044Y-33570000D01*
 X45326071Y-33571623D01*
 X45326071Y-33571623D01*
 G37*
-D13*
+D14*
 X44855000Y-34470000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C10*
 G36*
 X52946071Y-33571623D02*
@@ -1367,9 +1375,9 @@ X52913044Y-33570000D01*
 X52946071Y-33571623D01*
 X52946071Y-33571623D01*
 G37*
-D13*
+D14*
 X52475000Y-34470000D03*
-D12*
+D13*
 G36*
 X50896071Y-33571623D02*
 X50928781Y-33576475D01*
@@ -1442,10 +1450,10 @@ X50863044Y-33570000D01*
 X50896071Y-33571623D01*
 X50896071Y-33571623D01*
 G37*
-D13*
+D14*
 X50425000Y-34470000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C11*
 G36*
 X61056071Y-33571623D02*
@@ -1519,9 +1527,9 @@ X61023044Y-33570000D01*
 X61056071Y-33571623D01*
 X61056071Y-33571623D01*
 G37*
-D13*
+D14*
 X60585000Y-34470000D03*
-D12*
+D13*
 G36*
 X63106071Y-33571623D02*
 X63138781Y-33576475D01*
@@ -1594,10 +1602,10 @@ X63073044Y-33570000D01*
 X63106071Y-33571623D01*
 X63106071Y-33571623D01*
 G37*
-D13*
+D14*
 X62635000Y-34470000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,C12*
 G36*
 X60566071Y-29761623D02*
@@ -1671,9 +1679,9 @@ X60533044Y-29760000D01*
 X60566071Y-29761623D01*
 X60566071Y-29761623D01*
 G37*
-D13*
+D14*
 X60095000Y-30660000D03*
-D12*
+D13*
 G36*
 X58516071Y-29761623D02*
 X58548781Y-29766475D01*
@@ -1746,10 +1754,10 @@ X58483044Y-29760000D01*
 X58516071Y-29761623D01*
 X58516071Y-29761623D01*
 G37*
-D13*
+D14*
 X58045000Y-30660000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L1*
 G36*
 X15461207Y-32946542D02*
@@ -1823,9 +1831,9 @@ X15429824Y-32945000D01*
 X15461207Y-32946542D01*
 X15461207Y-32946542D01*
 G37*
-D14*
+D15*
 X14837500Y-34470000D03*
-D12*
+D13*
 G36*
 X12486207Y-32946542D02*
 X12517287Y-32951152D01*
@@ -1898,10 +1906,10 @@ X12454824Y-32945000D01*
 X12486207Y-32946542D01*
 X12486207Y-32946542D01*
 G37*
-D14*
+D15*
 X11862500Y-34470000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L2*
 G36*
 X51416207Y-7106542D02*
@@ -1975,9 +1983,9 @@ X51384824Y-7105000D01*
 X51416207Y-7106542D01*
 X51416207Y-7106542D01*
 G37*
-D14*
+D15*
 X50180000Y-8017500D03*
-D12*
+D13*
 G36*
 X51416207Y-4131542D02*
 X51447287Y-4136152D01*
@@ -2050,10 +2058,10 @@ X51384824Y-4130000D01*
 X51416207Y-4131542D01*
 X51416207Y-4131542D01*
 G37*
-D14*
+D15*
 X50180000Y-5042500D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L3*
 G36*
 X25621207Y-32946542D02*
@@ -2127,9 +2135,9 @@ X25589824Y-32945000D01*
 X25621207Y-32946542D01*
 X25621207Y-32946542D01*
 G37*
-D14*
+D15*
 X24997500Y-34470000D03*
-D12*
+D13*
 G36*
 X22646207Y-32946542D02*
 X22677287Y-32951152D01*
@@ -2202,10 +2210,10 @@ X22614824Y-32945000D01*
 X22646207Y-32946542D01*
 X22646207Y-32946542D01*
 G37*
-D14*
+D15*
 X22022500Y-34470000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L4*
 G36*
 X59036207Y-7106542D02*
@@ -2279,9 +2287,9 @@ X59004824Y-7105000D01*
 X59036207Y-7106542D01*
 X59036207Y-7106542D01*
 G37*
-D14*
+D15*
 X57800000Y-8017500D03*
-D12*
+D13*
 G36*
 X59036207Y-4131542D02*
 X59067287Y-4136152D01*
@@ -2354,10 +2362,10 @@ X59004824Y-4130000D01*
 X59036207Y-4131542D01*
 X59036207Y-4131542D01*
 G37*
-D14*
+D15*
 X57800000Y-5042500D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L5*
 G36*
 X35781207Y-32946542D02*
@@ -2431,9 +2439,9 @@ X35749824Y-32945000D01*
 X35781207Y-32946542D01*
 X35781207Y-32946542D01*
 G37*
-D14*
+D15*
 X35157500Y-34470000D03*
-D12*
+D13*
 G36*
 X32806207Y-32946542D02*
 X32837287Y-32951152D01*
@@ -2506,10 +2514,10 @@ X32774824Y-32945000D01*
 X32806207Y-32946542D01*
 X32806207Y-32946542D01*
 G37*
-D14*
+D15*
 X32182500Y-34470000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L6*
 G36*
 X41256207Y-37151542D02*
@@ -2583,9 +2591,9 @@ X41224824Y-37150000D01*
 X41256207Y-37151542D01*
 X41256207Y-37151542D01*
 G37*
-D14*
+D15*
 X40020000Y-38062500D03*
-D12*
+D13*
 G36*
 X41256207Y-40126542D02*
 X41287287Y-40131152D01*
@@ -2658,10 +2666,10 @@ X41224824Y-40125000D01*
 X41256207Y-40126542D01*
 X41256207Y-40126542D01*
 G37*
-D14*
+D15*
 X40020000Y-41037500D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L7*
 G36*
 X66656207Y-14291542D02*
@@ -2735,9 +2743,9 @@ X66624824Y-14290000D01*
 X66656207Y-14291542D01*
 X66656207Y-14291542D01*
 G37*
-D14*
+D15*
 X65420000Y-15202500D03*
-D12*
+D13*
 G36*
 X66656207Y-17266542D02*
 X66687287Y-17271152D01*
@@ -2810,10 +2818,10 @@ X66624824Y-17265000D01*
 X66656207Y-17266542D01*
 X66656207Y-17266542D01*
 G37*
-D14*
+D15*
 X65420000Y-18177500D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L8*
 G36*
 X48876207Y-37151542D02*
@@ -2887,9 +2895,9 @@ X48844824Y-37150000D01*
 X48876207Y-37151542D01*
 X48876207Y-37151542D01*
 G37*
-D14*
+D15*
 X47640000Y-38062500D03*
-D12*
+D13*
 G36*
 X48876207Y-40126542D02*
 X48907287Y-40131152D01*
@@ -2962,10 +2970,10 @@ X48844824Y-40125000D01*
 X48876207Y-40126542D01*
 X48876207Y-40126542D01*
 G37*
-D14*
+D15*
 X47640000Y-41037500D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L9*
 G36*
 X56496207Y-40126542D02*
@@ -3039,9 +3047,9 @@ X56464824Y-40125000D01*
 X56496207Y-40126542D01*
 X56496207Y-40126542D01*
 G37*
-D14*
+D15*
 X55260000Y-41037500D03*
-D12*
+D13*
 G36*
 X56496207Y-37151542D02*
 X56527287Y-37156152D01*
@@ -3114,10 +3122,10 @@ X56464824Y-37150000D01*
 X56496207Y-37151542D01*
 X56496207Y-37151542D01*
 G37*
-D14*
+D15*
 X55260000Y-38062500D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,L10*
 G36*
 X66656207Y-26991542D02*
@@ -3191,9 +3199,9 @@ X66624824Y-26990000D01*
 X66656207Y-26991542D01*
 X66656207Y-26991542D01*
 G37*
-D14*
+D15*
 X65420000Y-27902500D03*
-D12*
+D13*
 G36*
 X66656207Y-29966542D02*
 X66687287Y-29971152D01*
@@ -3266,50 +3274,54 @@ X66624824Y-29965000D01*
 X66656207Y-29966542D01*
 X66656207Y-29966542D01*
 G37*
-D14*
+D15*
 X65420000Y-30877500D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.C,J1*
 X10270000Y-7000000D03*
 X4270000Y-7000000D03*
 X7270000Y-11700000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,J2*
 X2740000Y-34470000D03*
-D17*
+D18*
 X2740000Y-30090000D03*
 X2740000Y-38850000D03*
 G04 #@! TD*
 G04 #@! TO.C,J3*
 X73040000Y-7230000D03*
 X73040000Y-15990000D03*
-D16*
+D17*
 X73040000Y-11610000D03*
 G04 #@! TD*
 G04 #@! TO.C,J4*
 X73040000Y-34470000D03*
-D17*
+D18*
 X73040000Y-38850000D03*
 X73040000Y-30090000D03*
 G04 #@! TD*
-D18*
+D19*
 G04 #@! TO.C,JP2*
 X52720000Y-26850000D03*
-D19*
+D20*
 X50180000Y-26850000D03*
 G04 #@! TD*
 G04 #@! TO.C,JP1*
 X50180000Y-19230000D03*
-D18*
+D19*
 X52720000Y-19230000D03*
 G04 #@! TD*
-D20*
+D21*
 G04 #@! TO.C,D1*
 X25640000Y-11550000D03*
 X25640000Y-6450000D03*
 X16900000Y-6450000D03*
 X16900000Y-11550000D03*
 G04 #@! TD*
+D11*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-42000000D03*
+G04 #@! TD*
 M02*
diff --git a/pcb/gerber/diplexer-F.Paste.gtp b/pcb/gerber/diplexer-F.Paste.gtp
index 8d21fff..ea4e760 100644
--- a/pcb/gerber/diplexer-F.Paste.gtp
+++ b/pcb/gerber/diplexer-F.Paste.gtp
@@ -1,12 +1,12 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Paste,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/pcb/gerber/diplexer-F.SilkS.gto b/pcb/gerber/diplexer-F.SilkS.gto
index 5f19022..8317ca9 100644
--- a/pcb/gerber/diplexer-F.SilkS.gto
+++ b/pcb/gerber/diplexer-F.SilkS.gto
@@ -1,12 +1,12 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev-163-g630631b41)*
-G04 #@! TF.CreationDate,2018-08-07T22:42:02+02:00*
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.0-rc1-dev)*
+G04 #@! TF.CreationDate,2018-08-10T22:57:37+02:00*
 G04 #@! TF.ProjectId,diplexer,6469706C657865722E6B696361645F70,rev?*
 G04 #@! TF.SameCoordinates,PX7270e00PY29020c0*
 G04 #@! TF.FileFunction,Legend,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev-163-g630631b41)) date Tue Aug  7 22:42:02 2018*
+G04 Created by KiCad (PCBNEW (6.0.0-rc1-dev)) date Fri Aug 10 22:57:37 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -16,16 +16,17 @@ G04 APERTURE LIST*
 %ADD12C,0.120000*%
 %ADD13C,0.150000*%
 %ADD14C,0.010000*%
-%ADD15R,2.000000X3.900000*%
-%ADD16C,0.100000*%
-%ADD17C,1.550000*%
-%ADD18C,1.825000*%
-%ADD19R,3.900000X3.900000*%
-%ADD20R,5.480000X2.690000*%
-%ADD21R,5.480000X2.820000*%
-%ADD22O,2.100000X2.100000*%
-%ADD23R,2.100000X2.100000*%
-%ADD24R,2.400000X1.900000*%
+%ADD15C,5.400000*%
+%ADD16R,2.000000X3.900000*%
+%ADD17C,0.100000*%
+%ADD18C,1.550000*%
+%ADD19C,1.825000*%
+%ADD20R,3.900000X3.900000*%
+%ADD21R,5.480000X2.690000*%
+%ADD22R,5.480000X2.820000*%
+%ADD23O,2.100000X2.100000*%
+%ADD24R,2.100000X2.100000*%
+%ADD25R,2.400000X1.900000*%
 G04 APERTURE END LIST*
 D10*
 X6770000Y-33648571D02*
@@ -364,6 +365,15 @@ X42685476Y-27151666D01*
 X42875952Y-27056428D01*
 X43066428Y-27056428D01*
 D12*
+G04 #@! TO.C,REF\002A\002A*
+X13700000Y-42000000D02*
+G75*
+G03X13700000Y-42000000I-2700000J0D01*
+G01*
+X67700000Y-5000000D02*
+G75*
+G03X67700000Y-5000000I-2700000J0D01*
+G01*
 G04 #@! TO.C,C1*
 X35680000Y-5590000D02*
 X33330000Y-5590000D01*
@@ -2803,6 +2813,11 @@ X5651405Y-22451185D01*
 X5720336Y-22419890D01*
 X5800072Y-22411165D01*
 X5869744Y-22419918D01*
+D12*
+X67700000Y-42000000D02*
+G75*
+G03X67700000Y-42000000I-2700000J0D01*
+G01*
 G04 #@! TO.C,C1*
 D11*
 X32200000Y-15848571D02*
@@ -3592,11 +3607,18 @@ X76000000Y0D01*
 X0Y0D01*
 X0Y-2000000D01*
 D15*
+G04 #@! TO.C,REF\002A\002A*
+X11000000Y-42000000D03*
+G04 #@! TD*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-5000000D03*
+G04 #@! TD*
+D16*
 G04 #@! TO.C,C1*
 X32270000Y-11800000D03*
 X32270000Y-6200000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C2*
 G36*
 X47866071Y-10711623D02*
@@ -3670,9 +3692,9 @@ X47833044Y-10710000D01*
 X47866071Y-10711623D01*
 X47866071Y-10711623D01*
 G37*
-D17*
+D18*
 X47395000Y-11610000D03*
-D16*
+D17*
 G36*
 X45816071Y-10711623D02*
 X45848781Y-10716475D01*
@@ -3745,10 +3767,10 @@ X45783044Y-10710000D01*
 X45816071Y-10711623D01*
 X45816071Y-10711623D01*
 G37*
-D17*
+D18*
 X45345000Y-11610000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C3*
 G36*
 X39346071Y-4731623D02*
@@ -3822,9 +3844,9 @@ X39313044Y-4730000D01*
 X39346071Y-4731623D01*
 X39346071Y-4731623D01*
 G37*
-D17*
+D18*
 X38750000Y-5505000D03*
-D16*
+D17*
 G36*
 X39346071Y-6781623D02*
 X39378781Y-6786475D01*
@@ -3897,10 +3919,10 @@ X39313044Y-6780000D01*
 X39346071Y-6781623D01*
 X39346071Y-6781623D01*
 G37*
-D17*
+D18*
 X38750000Y-7555000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C4*
 G36*
 X19026071Y-37751623D02*
@@ -3974,9 +3996,9 @@ X18993044Y-37750000D01*
 X19026071Y-37751623D01*
 X19026071Y-37751623D01*
 G37*
-D17*
+D18*
 X18430000Y-38525000D03*
-D16*
+D17*
 G36*
 X19026071Y-39801623D02*
 X19058781Y-39806475D01*
@@ -4049,10 +4071,10 @@ X18993044Y-39800000D01*
 X19026071Y-39801623D01*
 X19026071Y-39801623D01*
 G37*
-D17*
+D18*
 X18430000Y-40575000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C5*
 G36*
 X53436071Y-10711623D02*
@@ -4126,9 +4148,9 @@ X53403044Y-10710000D01*
 X53436071Y-10711623D01*
 X53436071Y-10711623D01*
 G37*
-D17*
+D18*
 X52965000Y-11610000D03*
-D16*
+D17*
 G36*
 X55486071Y-10711623D02*
 X55518781Y-10716475D01*
@@ -4201,10 +4223,10 @@ X55453044Y-10710000D01*
 X55486071Y-10711623D01*
 X55486071Y-10711623D01*
 G37*
-D17*
+D18*
 X55015000Y-11610000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C6*
 G36*
 X63106071Y-10711623D02*
@@ -4278,9 +4300,9 @@ X63073044Y-10710000D01*
 X63106071Y-10711623D01*
 X63106071Y-10711623D01*
 G37*
-D17*
+D18*
 X62635000Y-11610000D03*
-D16*
+D17*
 G36*
 X61056071Y-10711623D02*
 X61088781Y-10716475D01*
@@ -4353,10 +4375,10 @@ X61023044Y-10710000D01*
 X61056071Y-10711623D01*
 X61056071Y-10711623D01*
 G37*
-D17*
+D18*
 X60585000Y-11610000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C7*
 G36*
 X29186071Y-39801623D02*
@@ -4430,9 +4452,9 @@ X29153044Y-39800000D01*
 X29186071Y-39801623D01*
 X29186071Y-39801623D01*
 G37*
-D17*
+D18*
 X28590000Y-40575000D03*
-D16*
+D17*
 G36*
 X29186071Y-37751623D02*
 X29218781Y-37756475D01*
@@ -4505,10 +4527,10 @@ X29153044Y-37750000D01*
 X29186071Y-37751623D01*
 X29186071Y-37751623D01*
 G37*
-D17*
+D18*
 X28590000Y-38525000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C8*
 G36*
 X60566071Y-14521623D02*
@@ -4582,9 +4604,9 @@ X60533044Y-14520000D01*
 X60566071Y-14521623D01*
 X60566071Y-14521623D01*
 G37*
-D17*
+D18*
 X60095000Y-15420000D03*
-D16*
+D17*
 G36*
 X58516071Y-14521623D02*
 X58548781Y-14526475D01*
@@ -4657,10 +4679,10 @@ X58483044Y-14520000D01*
 X58516071Y-14521623D01*
 X58516071Y-14521623D01*
 G37*
-D17*
+D18*
 X58045000Y-15420000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C9*
 G36*
 X43276071Y-33571623D02*
@@ -4734,9 +4756,9 @@ X43243044Y-33570000D01*
 X43276071Y-33571623D01*
 X43276071Y-33571623D01*
 G37*
-D17*
+D18*
 X42805000Y-34470000D03*
-D16*
+D17*
 G36*
 X45326071Y-33571623D02*
 X45358781Y-33576475D01*
@@ -4809,10 +4831,10 @@ X45293044Y-33570000D01*
 X45326071Y-33571623D01*
 X45326071Y-33571623D01*
 G37*
-D17*
+D18*
 X44855000Y-34470000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C10*
 G36*
 X52946071Y-33571623D02*
@@ -4886,9 +4908,9 @@ X52913044Y-33570000D01*
 X52946071Y-33571623D01*
 X52946071Y-33571623D01*
 G37*
-D17*
+D18*
 X52475000Y-34470000D03*
-D16*
+D17*
 G36*
 X50896071Y-33571623D02*
 X50928781Y-33576475D01*
@@ -4961,10 +4983,10 @@ X50863044Y-33570000D01*
 X50896071Y-33571623D01*
 X50896071Y-33571623D01*
 G37*
-D17*
+D18*
 X50425000Y-34470000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C11*
 G36*
 X61056071Y-33571623D02*
@@ -5038,9 +5060,9 @@ X61023044Y-33570000D01*
 X61056071Y-33571623D01*
 X61056071Y-33571623D01*
 G37*
-D17*
+D18*
 X60585000Y-34470000D03*
-D16*
+D17*
 G36*
 X63106071Y-33571623D02*
 X63138781Y-33576475D01*
@@ -5113,10 +5135,10 @@ X63073044Y-33570000D01*
 X63106071Y-33571623D01*
 X63106071Y-33571623D01*
 G37*
-D17*
+D18*
 X62635000Y-34470000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C12*
 G36*
 X60566071Y-29761623D02*
@@ -5190,9 +5212,9 @@ X60533044Y-29760000D01*
 X60566071Y-29761623D01*
 X60566071Y-29761623D01*
 G37*
-D17*
+D18*
 X60095000Y-30660000D03*
-D16*
+D17*
 G36*
 X58516071Y-29761623D02*
 X58548781Y-29766475D01*
@@ -5265,10 +5287,10 @@ X58483044Y-29760000D01*
 X58516071Y-29761623D01*
 X58516071Y-29761623D01*
 G37*
-D17*
+D18*
 X58045000Y-30660000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L1*
 G36*
 X15461207Y-32946542D02*
@@ -5342,9 +5364,9 @@ X15429824Y-32945000D01*
 X15461207Y-32946542D01*
 X15461207Y-32946542D01*
 G37*
-D18*
+D19*
 X14837500Y-34470000D03*
-D16*
+D17*
 G36*
 X12486207Y-32946542D02*
 X12517287Y-32951152D01*
@@ -5417,10 +5439,10 @@ X12454824Y-32945000D01*
 X12486207Y-32946542D01*
 X12486207Y-32946542D01*
 G37*
-D18*
+D19*
 X11862500Y-34470000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L2*
 G36*
 X51416207Y-7106542D02*
@@ -5494,9 +5516,9 @@ X51384824Y-7105000D01*
 X51416207Y-7106542D01*
 X51416207Y-7106542D01*
 G37*
-D18*
+D19*
 X50180000Y-8017500D03*
-D16*
+D17*
 G36*
 X51416207Y-4131542D02*
 X51447287Y-4136152D01*
@@ -5569,10 +5591,10 @@ X51384824Y-4130000D01*
 X51416207Y-4131542D01*
 X51416207Y-4131542D01*
 G37*
-D18*
+D19*
 X50180000Y-5042500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L3*
 G36*
 X25621207Y-32946542D02*
@@ -5646,9 +5668,9 @@ X25589824Y-32945000D01*
 X25621207Y-32946542D01*
 X25621207Y-32946542D01*
 G37*
-D18*
+D19*
 X24997500Y-34470000D03*
-D16*
+D17*
 G36*
 X22646207Y-32946542D02*
 X22677287Y-32951152D01*
@@ -5721,10 +5743,10 @@ X22614824Y-32945000D01*
 X22646207Y-32946542D01*
 X22646207Y-32946542D01*
 G37*
-D18*
+D19*
 X22022500Y-34470000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L4*
 G36*
 X59036207Y-7106542D02*
@@ -5798,9 +5820,9 @@ X59004824Y-7105000D01*
 X59036207Y-7106542D01*
 X59036207Y-7106542D01*
 G37*
-D18*
+D19*
 X57800000Y-8017500D03*
-D16*
+D17*
 G36*
 X59036207Y-4131542D02*
 X59067287Y-4136152D01*
@@ -5873,10 +5895,10 @@ X59004824Y-4130000D01*
 X59036207Y-4131542D01*
 X59036207Y-4131542D01*
 G37*
-D18*
+D19*
 X57800000Y-5042500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L5*
 G36*
 X35781207Y-32946542D02*
@@ -5950,9 +5972,9 @@ X35749824Y-32945000D01*
 X35781207Y-32946542D01*
 X35781207Y-32946542D01*
 G37*
-D18*
+D19*
 X35157500Y-34470000D03*
-D16*
+D17*
 G36*
 X32806207Y-32946542D02*
 X32837287Y-32951152D01*
@@ -6025,10 +6047,10 @@ X32774824Y-32945000D01*
 X32806207Y-32946542D01*
 X32806207Y-32946542D01*
 G37*
-D18*
+D19*
 X32182500Y-34470000D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L6*
 G36*
 X41256207Y-37151542D02*
@@ -6102,9 +6124,9 @@ X41224824Y-37150000D01*
 X41256207Y-37151542D01*
 X41256207Y-37151542D01*
 G37*
-D18*
+D19*
 X40020000Y-38062500D03*
-D16*
+D17*
 G36*
 X41256207Y-40126542D02*
 X41287287Y-40131152D01*
@@ -6177,10 +6199,10 @@ X41224824Y-40125000D01*
 X41256207Y-40126542D01*
 X41256207Y-40126542D01*
 G37*
-D18*
+D19*
 X40020000Y-41037500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L7*
 G36*
 X66656207Y-14291542D02*
@@ -6254,9 +6276,9 @@ X66624824Y-14290000D01*
 X66656207Y-14291542D01*
 X66656207Y-14291542D01*
 G37*
-D18*
+D19*
 X65420000Y-15202500D03*
-D16*
+D17*
 G36*
 X66656207Y-17266542D02*
 X66687287Y-17271152D01*
@@ -6329,10 +6351,10 @@ X66624824Y-17265000D01*
 X66656207Y-17266542D01*
 X66656207Y-17266542D01*
 G37*
-D18*
+D19*
 X65420000Y-18177500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L8*
 G36*
 X48876207Y-37151542D02*
@@ -6406,9 +6428,9 @@ X48844824Y-37150000D01*
 X48876207Y-37151542D01*
 X48876207Y-37151542D01*
 G37*
-D18*
+D19*
 X47640000Y-38062500D03*
-D16*
+D17*
 G36*
 X48876207Y-40126542D02*
 X48907287Y-40131152D01*
@@ -6481,10 +6503,10 @@ X48844824Y-40125000D01*
 X48876207Y-40126542D01*
 X48876207Y-40126542D01*
 G37*
-D18*
+D19*
 X47640000Y-41037500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L9*
 G36*
 X56496207Y-40126542D02*
@@ -6558,9 +6580,9 @@ X56464824Y-40125000D01*
 X56496207Y-40126542D01*
 X56496207Y-40126542D01*
 G37*
-D18*
+D19*
 X55260000Y-41037500D03*
-D16*
+D17*
 G36*
 X56496207Y-37151542D02*
 X56527287Y-37156152D01*
@@ -6633,10 +6655,10 @@ X56464824Y-37150000D01*
 X56496207Y-37151542D01*
 X56496207Y-37151542D01*
 G37*
-D18*
+D19*
 X55260000Y-38062500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,L10*
 G36*
 X66656207Y-26991542D02*
@@ -6710,9 +6732,9 @@ X66624824Y-26990000D01*
 X66656207Y-26991542D01*
 X66656207Y-26991542D01*
 G37*
-D18*
+D19*
 X65420000Y-27902500D03*
-D16*
+D17*
 G36*
 X66656207Y-29966542D02*
 X66687287Y-29971152D01*
@@ -6785,50 +6807,54 @@ X66624824Y-29965000D01*
 X66656207Y-29966542D01*
 X66656207Y-29966542D01*
 G37*
-D18*
+D19*
 X65420000Y-30877500D03*
 G04 #@! TD*
-D19*
+D20*
 G04 #@! TO.C,J1*
 X10270000Y-7000000D03*
 X4270000Y-7000000D03*
 X7270000Y-11700000D03*
 G04 #@! TD*
-D20*
+D21*
 G04 #@! TO.C,J2*
 X2740000Y-34470000D03*
-D21*
+D22*
 X2740000Y-30090000D03*
 X2740000Y-38850000D03*
 G04 #@! TD*
 G04 #@! TO.C,J3*
 X73040000Y-7230000D03*
 X73040000Y-15990000D03*
-D20*
+D21*
 X73040000Y-11610000D03*
 G04 #@! TD*
 G04 #@! TO.C,J4*
 X73040000Y-34470000D03*
-D21*
+D22*
 X73040000Y-38850000D03*
 X73040000Y-30090000D03*
 G04 #@! TD*
-D22*
+D23*
 G04 #@! TO.C,JP2*
 X52720000Y-26850000D03*
-D23*
+D24*
 X50180000Y-26850000D03*
 G04 #@! TD*
 G04 #@! TO.C,JP1*
 X50180000Y-19230000D03*
-D22*
+D23*
 X52720000Y-19230000D03*
 G04 #@! TD*
-D24*
+D25*
 G04 #@! TO.C,D1*
 X25640000Y-11550000D03*
 X25640000Y-6450000D03*
 X16900000Y-6450000D03*
 X16900000Y-11550000D03*
 G04 #@! TD*
+D15*
+G04 #@! TO.C,REF\002A\002A*
+X65000000Y-42000000D03*
+G04 #@! TD*
 M02*
diff --git a/pcb/gerber/diplexer.drl b/pcb/gerber/diplexer.drl
index bcfff7c..882f1e8 100644
--- a/pcb/gerber/diplexer.drl
+++ b/pcb/gerber/diplexer.drl
@@ -1,489 +1,494 @@
 M48
-;DRILL file {KiCad (6.0.0-rc1-dev-163-g630631b41)} date Tue Aug  7 22:41:49 2018
-;FORMAT={3:3/ absolute / metric / keep zeros}
+;DRILL file {KiCad (6.0.0-rc1-dev)} date Fri Aug 10 22:57:01 2018
+;FORMAT={-:-/ absolute / metric / decimal}
 FMAT,2
 METRIC,TZ
 T1C0.400
 T2C1.000
+T3C3.200
 %
 G90
 G05
 M71
 T1
-X001000Y-001000
-X001000Y-002000
-X001000Y-003000
-X001000Y-004000
-X001000Y-005000
-X001000Y-006000
-X001000Y-007000
-X001000Y-008000
-X001000Y-009000
-X001000Y-010000
-X001000Y-011000
-X001000Y-012000
-X001000Y-013000
-X001000Y-014000
-X001000Y-015000
-X001000Y-016000
-X001000Y-017000
-X001000Y-018000
-X001000Y-019000
-X001000Y-020000
-X001000Y-021000
-X001000Y-022000
-X001000Y-023000
-X001000Y-024000
-X001000Y-025000
-X001000Y-026000
-X001000Y-027000
-X001000Y-042000
-X001000Y-043000
-X001000Y-044000
-X001000Y-045000
-X001000Y-046000
-X001920Y-027485
-X001920Y-041455
-X002000Y-001000
-X002000Y-046000
-X003000Y-001000
-X003000Y-046000
-X003190Y-027485
-X003190Y-041455
-X004000Y-001000
-X004000Y-046000
-X004460Y-027485
-X004460Y-041455
-X005000Y-001000
-X005000Y-046000
-X005730Y-027485
-X005730Y-041455
-X006000Y-001000
-X006000Y-046000
-X006365Y-028755
-X006365Y-030025
-X006365Y-031295
-X006365Y-037645
-X006365Y-038915
-X006365Y-040185
-X007000Y-001000
-X007000Y-036375
-X007000Y-046000
-X007635Y-030025
-X008000Y-001000
-X008000Y-046000
-X008270Y-036375
-X008905Y-028755
-X009000Y-001000
-X009000Y-046000
-X009540Y-036375
-X010000Y-001000
-X010000Y-046000
-X010175Y-027485
-X010810Y-031930
-X011000Y-001000
-X011000Y-046000
-X011445Y-026215
-X011445Y-037010
-X012000Y-001000
-X012000Y-046000
-X012080Y-030660
-X012080Y-031930
-X012715Y-024945
-X012715Y-037010
-X013000Y-001000
-X013000Y-046000
-X013350Y-029390
-X013350Y-031930
-X013985Y-023675
-X013985Y-037010
-X014000Y-001000
-X014000Y-046000
-X014620Y-028120
-X014620Y-031930
-X015000Y-001000
-X015000Y-046000
-X015255Y-022405
-X015255Y-037010
-X015890Y-026850
-X015890Y-031930
-X016000Y-001000
-X016000Y-046000
-X016525Y-021135
-X016525Y-037010
-X016525Y-038280
-X016525Y-039550
-X016525Y-040820
-X017000Y-001000
-X017000Y-046000
-X017160Y-025580
-X017160Y-032565
-X017795Y-019865
-X018000Y-001000
-X018000Y-046000
-X018430Y-024310
-X018430Y-032565
-X018430Y-042090
-X019000Y-001000
-X019000Y-046000
-X019065Y-019865
-X019700Y-023675
-X019700Y-032565
-X020000Y-001000
-X020000Y-046000
-X020335Y-019865
-X020335Y-037010
-X020335Y-038280
-X020335Y-039550
-X020335Y-040820
-X020970Y-023675
-X020970Y-031930
-X021000Y-001000
-X021000Y-046000
-X021605Y-019865
-X021605Y-037010
-X022000Y-001000
-X022000Y-046000
-X022240Y-023675
-X022240Y-031930
-X022875Y-019865
-X022875Y-037010
-X023000Y-001000
-X023000Y-046000
-X023510Y-023675
-X023510Y-031930
-X024000Y-001000
-X024000Y-046000
-X024145Y-019865
-X024145Y-037010
-X024780Y-023675
-X024780Y-031930
-X025000Y-001000
-X025000Y-046000
-X025415Y-003990
-X025415Y-009070
-X025415Y-019865
-X025415Y-037010
-X026000Y-001000
-X026000Y-046000
-X026050Y-023675
-X026050Y-031930
-X026685Y-019865
-X026685Y-037010
-X026685Y-038280
-X026685Y-039550
-X026685Y-040820
-X027000Y-001000
-X027000Y-046000
-X027320Y-023675
-X027320Y-032565
-X027955Y-003990
-X027955Y-006530
-X027955Y-009070
-X027955Y-019865
-X028000Y-001000
-X028000Y-046000
-X028590Y-023675
-X028590Y-032565
-X028590Y-042090
-X029000Y-001000
-X029000Y-046000
-X029225Y-019865
-X029860Y-023675
-X029860Y-032565
-X030000Y-001000
-X030000Y-046000
-X030495Y-019865
-X030495Y-037010
-X030495Y-038280
-X030495Y-039550
-X030495Y-040820
-X031000Y-001000
-X031000Y-046000
-X031130Y-023675
-X031130Y-031930
-X031765Y-019865
-X031765Y-037010
-X032000Y-001000
-X032000Y-046000
-X032400Y-003355
-X032400Y-023675
-X032400Y-031930
-X033000Y-001000
-X033000Y-046000
-X033035Y-019865
-X033035Y-037010
-X033670Y-023675
-X033670Y-031930
-X034000Y-001000
-X034000Y-046000
-X034305Y-018595
-X034305Y-037010
-X034940Y-023040
-X034940Y-031930
-X035000Y-001000
-X035000Y-046000
-X035575Y-017325
-X035575Y-037010
-X036000Y-001000
-X036000Y-046000
-X036210Y-021770
-X036210Y-031930
-X036845Y-016055
-X036845Y-037010
-X036845Y-038280
-X036845Y-039550
-X036845Y-040820
-X037000Y-001000
-X037000Y-046000
-X037480Y-020500
-X037480Y-032565
-X038000Y-001000
-X038000Y-046000
-X038115Y-014785
-X038750Y-003990
-X038750Y-010340
-X038750Y-019230
-X038750Y-032565
-X039000Y-001000
-X039000Y-046000
-X039385Y-013515
-X040000Y-001000
-X040000Y-046000
-X040020Y-017960
-X040020Y-032565
-X040020Y-042725
-X040655Y-012245
-X041000Y-001000
-X041000Y-046000
-X041290Y-016690
-X041290Y-032565
-X041925Y-010975
-X042000Y-001000
-X042000Y-046000
-X042560Y-015420
-X042560Y-032565
-X042560Y-037010
-X042560Y-038280
-X042560Y-039550
-X042560Y-040820
-X043000Y-001000
-X043000Y-046000
-X043830Y-009705
-X043830Y-014150
-X043830Y-032565
-X043830Y-037010
-X044000Y-001000
-X044000Y-046000
-X045000Y-001000
-X045000Y-046000
-X045100Y-009705
-X045100Y-013515
-X045100Y-032565
-X045100Y-037010
-X045100Y-038280
-X045100Y-039550
-X045100Y-040820
-X046000Y-001000
-X046000Y-046000
-X046370Y-009705
-X046370Y-013515
-X046370Y-032565
-X047000Y-001000
-X047000Y-046000
-X047640Y-008435
-X047640Y-009705
-X047640Y-013515
-X047640Y-032565
-X047640Y-042725
-X048000Y-001000
-X048000Y-046000
-X048910Y-032565
-X049000Y-001000
-X049000Y-046000
-X050000Y-001000
-X050000Y-046000
-X050180Y-003355
-X050180Y-032565
-X050180Y-037010
-X050180Y-038280
-X050180Y-039550
-X050180Y-039550
-X050180Y-039550
-X050180Y-040820
-X051000Y-001000
-X051000Y-046000
-X051450Y-032565
-X051450Y-037010
-X052000Y-001000
-X052000Y-046000
-X052720Y-007165
-X052720Y-008435
-X052720Y-009705
-X052720Y-013515
-X052720Y-032565
-X052720Y-037010
-X052720Y-038280
-X052720Y-039550
-X052720Y-040820
-X053000Y-001000
-X053000Y-046000
-X053990Y-009705
-X053990Y-013515
-X053990Y-013515
-X053990Y-013515
-X053990Y-032565
-X054000Y-001000
-X054000Y-046000
-X055000Y-001000
-X055000Y-046000
-X055260Y-007165
-X055260Y-008435
-X055260Y-009705
-X055260Y-013515
-X055260Y-032565
-X055260Y-042725
-X055895Y-015420
-X055895Y-030660
-X056000Y-001000
-X056000Y-046000
-X056530Y-013515
-X056530Y-032565
-X057000Y-001000
-X057000Y-046000
-X057800Y-003355
-X057800Y-013515
-X057800Y-032565
-X057800Y-037010
-X057800Y-038280
-X057800Y-039550
-X057800Y-040820
-X058000Y-001000
-X058000Y-046000
-X059000Y-001000
-X059000Y-046000
-X059070Y-013515
-X059070Y-032565
-X059070Y-037010
-X060000Y-001000
-X060000Y-046000
-X060340Y-007165
-X060340Y-008435
-X060340Y-009705
-X060340Y-013515
-X060340Y-032565
-X060340Y-037010
-X060340Y-037010
-X060340Y-037010
-X061000Y-001000
-X061000Y-046000
-X061610Y-009705
-X061610Y-013515
-X061610Y-032565
-X061610Y-037010
-X062000Y-001000
-X062000Y-046000
-X062880Y-009705
-X062880Y-013515
-X062880Y-014785
-X062880Y-016055
-X062880Y-030025
-X062880Y-031295
-X062880Y-032565
-X062880Y-037010
-X063000Y-001000
-X063000Y-046000
-X064000Y-001000
-X064000Y-046000
-X064150Y-009705
-X064150Y-009705
-X064150Y-009705
-X064150Y-037010
-X065000Y-001000
-X065000Y-046000
-X065420Y-009705
-X065420Y-037010
-X066000Y-001000
-X066000Y-046000
-X066690Y-009705
-X066690Y-037010
-X067000Y-001000
-X067000Y-046000
-X067960Y-009705
-X067960Y-014785
-X067960Y-031295
-X067960Y-037010
-X068000Y-001000
-X068000Y-046000
-X069000Y-001000
-X069000Y-046000
-X069230Y-005895
-X069230Y-007165
-X069230Y-008435
-X069230Y-014785
-X069230Y-016055
-X069230Y-017325
-X069230Y-028755
-X069230Y-030025
-X069230Y-031295
-X069230Y-037645
-X069230Y-038915
-X069230Y-040185
-X069865Y-004625
-X069865Y-018595
-X069865Y-027485
-X069865Y-041455
-X070000Y-001000
-X070000Y-046000
-X071000Y-001000
-X071000Y-046000
-X071135Y-004625
-X071135Y-018595
-X071135Y-027485
-X071135Y-041455
-X072000Y-001000
-X072000Y-046000
-X072405Y-004625
-X072405Y-018595
-X072405Y-027485
-X072405Y-041455
-X073000Y-001000
-X073000Y-046000
-X073675Y-004625
-X073675Y-018595
-X073675Y-027485
-X073675Y-041455
-X074000Y-001000
-X074000Y-046000
-X075000Y-001000
-X075000Y-002000
-X075000Y-003000
-X075000Y-004000
-X075000Y-019000
-X075000Y-020000
-X075000Y-021000
-X075000Y-022000
-X075000Y-023000
-X075000Y-024000
-X075000Y-025000
-X075000Y-026000
-X075000Y-027000
-X075000Y-042000
-X075000Y-043000
-X075000Y-044000
-X075000Y-045000
-X075000Y-046000
+X1.Y-1.
+X1.Y-2.
+X1.Y-3.
+X1.Y-4.
+X1.Y-5.
+X1.Y-6.
+X1.Y-7.
+X1.Y-8.
+X1.Y-9.
+X1.Y-10.
+X1.Y-11.
+X1.Y-12.
+X1.Y-13.
+X1.Y-14.
+X1.Y-15.
+X1.Y-16.
+X1.Y-17.
+X1.Y-18.
+X1.Y-19.
+X1.Y-20.
+X1.Y-21.
+X1.Y-22.
+X1.Y-23.
+X1.Y-24.
+X1.Y-25.
+X1.Y-26.
+X1.Y-27.
+X1.Y-42.
+X1.Y-43.
+X1.Y-44.
+X1.Y-45.
+X1.Y-46.
+X1.92Y-27.485
+X1.92Y-41.455
+X2.Y-1.
+X2.Y-46.
+X3.Y-1.
+X3.Y-46.
+X3.19Y-27.485
+X3.19Y-41.455
+X4.Y-1.
+X4.Y-46.
+X4.46Y-27.485
+X4.46Y-41.455
+X5.Y-1.
+X5.Y-46.
+X5.73Y-27.485
+X5.73Y-41.455
+X6.Y-1.
+X6.Y-46.
+X6.365Y-28.755
+X6.365Y-30.025
+X6.365Y-31.295
+X6.365Y-37.645
+X6.365Y-38.915
+X6.365Y-40.185
+X7.Y-1.
+X7.Y-36.375
+X7.Y-46.
+X7.635Y-30.025
+X8.Y-1.
+X8.Y-46.
+X8.27Y-36.375
+X8.905Y-28.755
+X9.Y-1.
+X9.Y-46.
+X9.54Y-36.375
+X10.Y-1.
+X10.Y-46.
+X10.175Y-27.485
+X10.81Y-31.93
+X11.Y-1.
+X11.Y-46.
+X11.445Y-26.215
+X11.445Y-37.01
+X12.Y-1.
+X12.Y-46.
+X12.08Y-30.66
+X12.08Y-31.93
+X12.715Y-24.945
+X12.715Y-37.01
+X13.Y-1.
+X13.Y-46.
+X13.35Y-29.39
+X13.35Y-31.93
+X13.985Y-23.675
+X13.985Y-37.01
+X14.Y-1.
+X14.Y-46.
+X14.62Y-28.12
+X14.62Y-31.93
+X15.Y-1.
+X15.Y-46.
+X15.255Y-22.405
+X15.255Y-37.01
+X15.89Y-26.85
+X15.89Y-31.93
+X16.Y-1.
+X16.Y-46.
+X16.525Y-21.135
+X16.525Y-37.01
+X16.525Y-38.28
+X16.525Y-39.55
+X16.525Y-40.82
+X17.Y-1.
+X17.Y-46.
+X17.16Y-25.58
+X17.16Y-32.565
+X17.795Y-19.865
+X18.Y-1.
+X18.Y-46.
+X18.43Y-24.31
+X18.43Y-32.565
+X18.43Y-42.09
+X19.Y-1.
+X19.Y-46.
+X19.065Y-19.865
+X19.7Y-23.675
+X19.7Y-32.565
+X20.Y-1.
+X20.Y-46.
+X20.335Y-19.865
+X20.335Y-37.01
+X20.335Y-38.28
+X20.335Y-39.55
+X20.335Y-40.82
+X20.97Y-23.675
+X20.97Y-31.93
+X21.Y-1.
+X21.Y-46.
+X21.605Y-19.865
+X21.605Y-37.01
+X22.Y-1.
+X22.Y-46.
+X22.24Y-23.675
+X22.24Y-31.93
+X22.875Y-19.865
+X22.875Y-37.01
+X23.Y-1.
+X23.Y-46.
+X23.51Y-23.675
+X23.51Y-31.93
+X24.Y-1.
+X24.Y-46.
+X24.145Y-19.865
+X24.145Y-37.01
+X24.78Y-23.675
+X24.78Y-31.93
+X25.Y-1.
+X25.Y-46.
+X25.415Y-3.99
+X25.415Y-9.07
+X25.415Y-19.865
+X25.415Y-37.01
+X26.Y-1.
+X26.Y-46.
+X26.05Y-23.675
+X26.05Y-31.93
+X26.685Y-19.865
+X26.685Y-37.01
+X26.685Y-38.28
+X26.685Y-39.55
+X26.685Y-40.82
+X27.Y-1.
+X27.Y-46.
+X27.32Y-23.675
+X27.32Y-32.565
+X27.955Y-3.99
+X27.955Y-6.53
+X27.955Y-9.07
+X27.955Y-19.865
+X28.Y-1.
+X28.Y-46.
+X28.59Y-23.675
+X28.59Y-32.565
+X28.59Y-42.09
+X29.Y-1.
+X29.Y-46.
+X29.225Y-19.865
+X29.86Y-23.675
+X29.86Y-32.565
+X30.Y-1.
+X30.Y-46.
+X30.495Y-19.865
+X30.495Y-37.01
+X30.495Y-38.28
+X30.495Y-39.55
+X30.495Y-40.82
+X31.Y-1.
+X31.Y-46.
+X31.13Y-23.675
+X31.13Y-31.93
+X31.765Y-19.865
+X31.765Y-37.01
+X32.Y-1.
+X32.Y-46.
+X32.4Y-3.355
+X32.4Y-23.675
+X32.4Y-31.93
+X33.Y-1.
+X33.Y-46.
+X33.035Y-19.865
+X33.035Y-37.01
+X33.67Y-23.675
+X33.67Y-31.93
+X34.Y-1.
+X34.Y-46.
+X34.305Y-18.595
+X34.305Y-37.01
+X34.94Y-23.04
+X34.94Y-31.93
+X35.Y-1.
+X35.Y-46.
+X35.575Y-17.325
+X35.575Y-37.01
+X36.Y-1.
+X36.Y-46.
+X36.21Y-21.77
+X36.21Y-31.93
+X36.845Y-16.055
+X36.845Y-37.01
+X36.845Y-38.28
+X36.845Y-39.55
+X36.845Y-40.82
+X37.Y-1.
+X37.Y-46.
+X37.48Y-20.5
+X37.48Y-32.565
+X38.Y-1.
+X38.Y-46.
+X38.115Y-14.785
+X38.75Y-3.99
+X38.75Y-10.34
+X38.75Y-19.23
+X38.75Y-32.565
+X39.Y-1.
+X39.Y-46.
+X39.385Y-13.515
+X40.Y-1.
+X40.Y-46.
+X40.02Y-17.96
+X40.02Y-32.565
+X40.02Y-42.725
+X40.655Y-12.245
+X41.Y-1.
+X41.Y-46.
+X41.29Y-16.69
+X41.29Y-32.565
+X41.925Y-10.975
+X42.Y-1.
+X42.Y-46.
+X42.56Y-15.42
+X42.56Y-32.565
+X42.56Y-37.01
+X42.56Y-38.28
+X42.56Y-39.55
+X42.56Y-40.82
+X43.Y-1.
+X43.Y-46.
+X43.83Y-9.705
+X43.83Y-14.15
+X43.83Y-32.565
+X43.83Y-37.01
+X44.Y-1.
+X44.Y-46.
+X45.Y-1.
+X45.Y-46.
+X45.1Y-9.705
+X45.1Y-13.515
+X45.1Y-32.565
+X45.1Y-37.01
+X45.1Y-38.28
+X45.1Y-39.55
+X45.1Y-40.82
+X46.Y-1.
+X46.Y-46.
+X46.37Y-9.705
+X46.37Y-13.515
+X46.37Y-32.565
+X47.Y-1.
+X47.Y-46.
+X47.64Y-8.435
+X47.64Y-9.705
+X47.64Y-13.515
+X47.64Y-32.565
+X47.64Y-42.725
+X48.Y-1.
+X48.Y-46.
+X48.91Y-32.565
+X49.Y-1.
+X49.Y-46.
+X50.Y-1.
+X50.Y-46.
+X50.18Y-3.355
+X50.18Y-32.565
+X50.18Y-37.01
+X50.18Y-38.28
+X50.18Y-39.55
+X50.18Y-39.55
+X50.18Y-39.55
+X50.18Y-40.82
+X51.Y-1.
+X51.Y-46.
+X51.45Y-32.565
+X51.45Y-37.01
+X52.Y-1.
+X52.Y-46.
+X52.72Y-7.165
+X52.72Y-8.435
+X52.72Y-9.705
+X52.72Y-13.515
+X52.72Y-32.565
+X52.72Y-37.01
+X52.72Y-38.28
+X52.72Y-39.55
+X52.72Y-40.82
+X53.Y-1.
+X53.Y-46.
+X53.99Y-9.705
+X53.99Y-13.515
+X53.99Y-13.515
+X53.99Y-13.515
+X53.99Y-32.565
+X54.Y-1.
+X54.Y-46.
+X55.Y-1.
+X55.Y-46.
+X55.26Y-7.165
+X55.26Y-8.435
+X55.26Y-9.705
+X55.26Y-13.515
+X55.26Y-32.565
+X55.26Y-42.725
+X55.895Y-15.42
+X55.895Y-30.66
+X56.Y-1.
+X56.Y-46.
+X56.53Y-13.515
+X56.53Y-32.565
+X57.Y-1.
+X57.Y-46.
+X57.8Y-3.355
+X57.8Y-13.515
+X57.8Y-32.565
+X57.8Y-37.01
+X57.8Y-38.28
+X57.8Y-39.55
+X57.8Y-40.82
+X58.Y-1.
+X58.Y-46.
+X59.Y-1.
+X59.Y-46.
+X59.07Y-13.515
+X59.07Y-32.565
+X59.07Y-37.01
+X60.Y-1.
+X60.Y-46.
+X60.34Y-7.165
+X60.34Y-8.435
+X60.34Y-9.705
+X60.34Y-13.515
+X60.34Y-32.565
+X60.34Y-37.01
+X60.34Y-37.01
+X60.34Y-37.01
+X61.Y-1.
+X61.Y-46.
+X61.61Y-9.705
+X61.61Y-13.515
+X61.61Y-32.565
+X61.61Y-37.01
+X62.Y-1.
+X62.Y-46.
+X62.88Y-9.705
+X62.88Y-13.515
+X62.88Y-14.785
+X62.88Y-16.055
+X62.88Y-30.025
+X62.88Y-31.295
+X62.88Y-32.565
+X62.88Y-37.01
+X63.Y-1.
+X63.Y-46.
+X64.Y-1.
+X64.Y-46.
+X64.15Y-9.705
+X64.15Y-9.705
+X64.15Y-9.705
+X64.15Y-37.01
+X65.Y-1.
+X65.Y-46.
+X65.42Y-9.705
+X65.42Y-37.01
+X66.Y-1.
+X66.Y-46.
+X66.69Y-9.705
+X66.69Y-37.01
+X67.Y-1.
+X67.Y-46.
+X67.96Y-9.705
+X67.96Y-14.785
+X67.96Y-31.295
+X67.96Y-37.01
+X68.Y-1.
+X68.Y-46.
+X69.Y-1.
+X69.Y-46.
+X69.23Y-5.895
+X69.23Y-7.165
+X69.23Y-8.435
+X69.23Y-14.785
+X69.23Y-16.055
+X69.23Y-17.325
+X69.23Y-28.755
+X69.23Y-30.025
+X69.23Y-31.295
+X69.23Y-37.645
+X69.23Y-38.915
+X69.23Y-40.185
+X69.865Y-4.625
+X69.865Y-18.595
+X69.865Y-27.485
+X69.865Y-41.455
+X70.Y-1.
+X70.Y-46.
+X71.Y-1.
+X71.Y-46.
+X71.135Y-4.625
+X71.135Y-18.595
+X71.135Y-27.485
+X71.135Y-41.455
+X72.Y-1.
+X72.Y-46.
+X72.405Y-4.625
+X72.405Y-18.595
+X72.405Y-27.485
+X72.405Y-41.455
+X73.Y-1.
+X73.Y-46.
+X73.675Y-4.625
+X73.675Y-18.595
+X73.675Y-27.485
+X73.675Y-41.455
+X74.Y-1.
+X74.Y-46.
+X75.Y-1.
+X75.Y-2.
+X75.Y-3.
+X75.Y-4.
+X75.Y-19.
+X75.Y-20.
+X75.Y-21.
+X75.Y-22.
+X75.Y-23.
+X75.Y-24.
+X75.Y-25.
+X75.Y-26.
+X75.Y-27.
+X75.Y-42.
+X75.Y-43.
+X75.Y-44.
+X75.Y-45.
+X75.Y-46.
 T2
-X050180Y-026850
-X052720Y-026850
-X050180Y-019230
-X052720Y-019230
+X50.18Y-19.23
+X52.72Y-19.23
+X50.18Y-26.85
+X52.72Y-26.85
+T3
+X11.Y-42.
+X65.Y-42.
+X65.Y-5.
 T2
-X004270Y-006000G85X004270Y-008000
+X4.27Y-6.G85X4.27Y-8.
 G05
-X006270Y-011700G85X008270Y-011700
+X6.27Y-11.7G85X8.27Y-11.7
 G05
-X010270Y-006000G85X010270Y-008000
+X10.27Y-6.G85X10.27Y-8.
 G05
 T0
 M30
diff --git a/pcb/plot/bottom.png b/pcb/plot/bottom.png
index e6a3ae4..7283866 100644
Binary files a/pcb/plot/bottom.png and b/pcb/plot/bottom.png differ
diff --git a/pcb/plot/top.png b/pcb/plot/top.png
index 9639e56..f4d4d32 100644
Binary files a/pcb/plot/top.png and b/pcb/plot/top.png differ