Changed USB-C footprints to CircularHoles variant

Since I plan on getting these made at OSH Park, I shouldn't use
footprints with plated slots.  Now I'm using the CircularHoles
variant of the USB Type-C connector footprint, which is more
OSH-Park-friendly.

This may mean that I need to make a minor board revision after the
footprints are merged.  Not that I mind terribly.

pd-buddy-wye.kicad_pcb

@@ -3,10 +3,10 @@
   (general
     (links 40)
     (no_connects 0)
-    (area 98.094999 99.015 121.635001 126.225)
+    (area 99.924999 99.924999 121.035001 125.075001)
     (thickness 0.8)
     (drawings 19)
-    (tracks 139)
+    (tracks 142)
     (zones 0)
     (modules 7)
     (nets 47)
@@ -304,190 +304,6 @@
     )
   )
 
-  (module Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A (layer F.Cu) (tedit 59861103) (tstamp 59861124)
-    (at 104 105.5 270)
-    (descr "USB TYPE C, RA RCPT PCB, Hybrid, https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401548E4%7e2A")
-    (tags "USB C Type-C Receptacle Hybrid")
-    (path /59860B95)
-    (attr smd)
-    (fp_text reference J1 (at 0 -6.25 270) (layer F.SilkS)
-      (effects (font (size 0.8 0.8) (thickness 0.15)))
-    )
-    (fp_text value Power (at 0 -7.75 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.1)))
-    )
-    (fp_line (start -5.39 5.73) (end -5.39 -5.87) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.39 5.73) (end -5.39 5.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.39 -5.87) (end 5.39 5.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.39 -5.87) (end 5.39 -5.87) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.6 5.23) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
-    (fp_line (start -4.6 5.23) (end 4.6 5.23) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.25 -5.37) (end 4.75 -5.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.75 -5.37) (end 4.75 1.89) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.75 -5.37) (end -4.75 1.89) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.75 -5.37) (end -3.25 -5.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.6 -5.22) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
-    (fp_line (start -4.6 5.23) (end -4.6 -5.22) (layer F.Fab) (width 0.1))
-    (pad S1 thru_hole oval (at -4.13 -3.11 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad A1 smd rect (at -2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad A2 smd rect (at -2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 2 "Net-(J1-PadA2)"))
-    (pad A3 smd rect (at -1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 3 "Net-(J1-PadA3)"))
-    (pad A4 smd rect (at -1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 4 VBUS))
-    (pad A5 smd rect (at -0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 43 /CC1P))
-    (pad A6 smd rect (at -0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 5 "Net-(J1-PadA6)"))
-    (pad A7 smd rect (at 0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 6 "Net-(J1-PadA7)"))
-    (pad A12 smd rect (at 2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad A10 smd rect (at 1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 7 "Net-(J1-PadA10)"))
-    (pad A9 smd rect (at 1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 4 VBUS))
-    (pad A8 smd rect (at 0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 8 "Net-(J1-PadA8)"))
-    (pad A11 smd rect (at 2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 9 "Net-(J1-PadA11)"))
-    (pad S1 thru_hole oval (at 4.13 -3.11 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad S1 thru_hole oval (at 4.49 2.84 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad S1 thru_hole oval (at -4.49 2.84 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad "" np_thru_hole oval (at 3.6 -4.36 270) (size 0.95 0.65) (drill oval 0.95 0.65) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -3.6 -4.36 270) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
-    (pad B1 thru_hole circle (at 2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad B4 thru_hole circle (at 1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 4 VBUS))
-    (pad B6 thru_hole circle (at 0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 10 "Net-(J1-PadB6)"))
-    (pad B7 thru_hole circle (at -0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 11 "Net-(J1-PadB7)"))
-    (pad B9 thru_hole circle (at -1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 4 VBUS))
-    (pad B12 thru_hole circle (at -2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad B2 thru_hole circle (at 2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 12 "Net-(J1-PadB2)"))
-    (pad B3 thru_hole circle (at 1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 13 "Net-(J1-PadB3)"))
-    (pad B5 thru_hole circle (at 0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 44 /CC2P))
-    (pad B8 thru_hole circle (at -0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 14 "Net-(J1-PadB8)"))
-    (pad B10 thru_hole circle (at -1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 15 "Net-(J1-PadB10)"))
-    (pad B11 thru_hole circle (at -2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 16 "Net-(J1-PadB11)"))
-    (model ${KISYS3DMOD}/Connectors_USB.3dshapes/USB_C_Receptacle_Amphenol_12401548E4-2A.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A (layer F.Cu) (tedit 59861107) (tstamp 59861153)
-    (at 104 119.5 270)
-    (descr "USB TYPE C, RA RCPT PCB, Hybrid, https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401548E4%7e2A")
-    (tags "USB C Type-C Receptacle Hybrid")
-    (path /59860C73)
-    (attr smd)
-    (fp_text reference J2 (at 0 -6.25 270) (layer F.SilkS)
-      (effects (font (size 0.8 0.8) (thickness 0.15)))
-    )
-    (fp_text value UFP (at 0 -7.75 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.1)))
-    )
-    (fp_line (start -5.39 5.73) (end -5.39 -5.87) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.39 5.73) (end -5.39 5.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.39 -5.87) (end 5.39 5.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.39 -5.87) (end 5.39 -5.87) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.6 5.23) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
-    (fp_line (start -4.6 5.23) (end 4.6 5.23) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.25 -5.37) (end 4.75 -5.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.75 -5.37) (end 4.75 1.89) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.75 -5.37) (end -4.75 1.89) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.75 -5.37) (end -3.25 -5.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.6 -5.22) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
-    (fp_line (start -4.6 5.23) (end -4.6 -5.22) (layer F.Fab) (width 0.1))
-    (pad S1 thru_hole oval (at -4.13 -3.11 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad A1 smd rect (at -2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad A2 smd rect (at -2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 17 "Net-(J2-PadA2)"))
-    (pad A3 smd rect (at -1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 18 "Net-(J2-PadA3)"))
-    (pad A4 smd rect (at -1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 19 "Net-(J2-PadA4)"))
-    (pad A5 smd rect (at -0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 45 /CC1D))
-    (pad A6 smd rect (at -0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 41 /D+))
-    (pad A7 smd rect (at 0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 42 /D-))
-    (pad A12 smd rect (at 2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad A10 smd rect (at 1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 20 "Net-(J2-PadA10)"))
-    (pad A9 smd rect (at 1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 21 "Net-(J2-PadA9)"))
-    (pad A8 smd rect (at 0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 22 "Net-(J2-PadA8)"))
-    (pad A11 smd rect (at 2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 23 "Net-(J2-PadA11)"))
-    (pad S1 thru_hole oval (at 4.13 -3.11 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad S1 thru_hole oval (at 4.49 2.84 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad S1 thru_hole oval (at -4.49 2.84 270) (size 0.8 1.4) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad "" np_thru_hole oval (at 3.6 -4.36 270) (size 0.95 0.65) (drill oval 0.95 0.65) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -3.6 -4.36 270) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
-    (pad B1 thru_hole circle (at 2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad B4 thru_hole circle (at 1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 24 "Net-(J2-PadB4)"))
-    (pad B6 thru_hole circle (at 0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 41 /D+))
-    (pad B7 thru_hole circle (at -0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 42 /D-))
-    (pad B9 thru_hole circle (at -1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 25 "Net-(J2-PadB9)"))
-    (pad B12 thru_hole circle (at -2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad B2 thru_hole circle (at 2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 26 "Net-(J2-PadB2)"))
-    (pad B3 thru_hole circle (at 1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 27 "Net-(J2-PadB3)"))
-    (pad B5 thru_hole circle (at 0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 46 /CC2D))
-    (pad B8 thru_hole circle (at -0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 28 "Net-(J2-PadB8)"))
-    (pad B10 thru_hole circle (at -1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 29 "Net-(J2-PadB10)"))
-    (pad B11 thru_hole circle (at -2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 30 "Net-(J2-PadB11)"))
-    (model ${KISYS3DMOD}/Connectors_USB.3dshapes/USB_C_Receptacle_Amphenol_12401548E4-2A.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Mounting_Holes:MountingHole_3.2mm_M3_Pad_Via (layer F.Cu) (tedit 59861099) (tstamp 59861484)
     (at 116 104)
     (descr "Mounting Hole 3.2mm, M3")
@@ -628,6 +444,194 @@
     )
   )
 
+  (module Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A_CircularHoles (layer F.Cu) (tedit 59877D92) (tstamp 59877A9E)
+    (at 104 119.5 270)
+    (descr "USB TYPE C, RA RCPT PCB, Hybrid, https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401548E4%7e2A")
+    (tags "USB C Type-C Receptacle Hybrid")
+    (path /59860C73)
+    (attr smd)
+    (fp_text reference J2 (at 0 -6.36 270) (layer F.SilkS)
+      (effects (font (size 0.8 0.8) (thickness 0.15)))
+    )
+    (fp_text value UFP (at 0 -7.75 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.1)))
+    )
+    (fp_line (start -5.69 5.73) (end -5.69 -5.87) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.69 5.73) (end -5.69 5.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.69 -5.87) (end 5.69 5.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.69 -5.87) (end 5.69 -5.87) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.6 5.23) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.6 5.23) (end 4.6 5.23) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.25 -5.37) (end 4.75 -5.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.75 -5.37) (end 4.75 -3.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.75 -2.35) (end -4.75 1.89) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.75 -5.37) (end -3.25 -5.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.6 -5.22) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.6 5.23) (end -4.6 -5.22) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.75 -2.35) (end 4.75 1.89) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.75 -5.37) (end -4.75 -3.85) (layer F.SilkS) (width 0.12))
+    (pad S1 thru_hole circle (at -4.13 -3.11 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad A1 smd rect (at -2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad A2 smd rect (at -2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 17 "Net-(J2-PadA2)"))
+    (pad A3 smd rect (at -1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 18 "Net-(J2-PadA3)"))
+    (pad A4 smd rect (at -1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 19 "Net-(J2-PadA4)"))
+    (pad A5 smd rect (at -0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 45 /CC1D))
+    (pad A6 smd rect (at -0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 41 /D+))
+    (pad A7 smd rect (at 0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 42 /D-))
+    (pad A12 smd rect (at 2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad A10 smd rect (at 1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 20 "Net-(J2-PadA10)"))
+    (pad A9 smd rect (at 1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 21 "Net-(J2-PadA9)"))
+    (pad A8 smd rect (at 0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 22 "Net-(J2-PadA8)"))
+    (pad A11 smd rect (at 2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 23 "Net-(J2-PadA11)"))
+    (pad S1 thru_hole circle (at 4.13 -3.11 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad S1 thru_hole circle (at 4.49 2.84 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad S1 thru_hole circle (at -4.49 2.84 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad "" np_thru_hole circle (at 3.6 -4.36 270) (size 0.95 0.95) (drill 0.95) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -3.6 -4.36 270) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
+    (pad B1 thru_hole circle (at 2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad B4 thru_hole circle (at 1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 24 "Net-(J2-PadB4)"))
+    (pad B6 thru_hole circle (at 0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 41 /D+))
+    (pad B7 thru_hole circle (at -0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 42 /D-))
+    (pad B9 thru_hole circle (at -1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 25 "Net-(J2-PadB9)"))
+    (pad B12 thru_hole circle (at -2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad B2 thru_hole circle (at 2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 26 "Net-(J2-PadB2)"))
+    (pad B3 thru_hole circle (at 1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 27 "Net-(J2-PadB3)"))
+    (pad B5 thru_hole circle (at 0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 46 /CC2D))
+    (pad B8 thru_hole circle (at -0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 28 "Net-(J2-PadB8)"))
+    (pad B10 thru_hole circle (at -1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 29 "Net-(J2-PadB10)"))
+    (pad B11 thru_hole circle (at -2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 30 "Net-(J2-PadB11)"))
+    (model ${KISYS3DMOD}/Connectors_USB.3dshapes/USB_C_Receptacle_Amphenol_12401548E4-2A.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A_CircularHoles (layer F.Cu) (tedit 59877D8F) (tstamp 59877A6E)
+    (at 104 105.5 270)
+    (descr "USB TYPE C, RA RCPT PCB, Hybrid, https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401548E4%7e2A")
+    (tags "USB C Type-C Receptacle Hybrid")
+    (path /59860B95)
+    (attr smd)
+    (fp_text reference J1 (at 0 -6.36 270) (layer F.SilkS)
+      (effects (font (size 0.8 0.8) (thickness 0.15)))
+    )
+    (fp_text value Power (at 0 -7.75 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.1)))
+    )
+    (fp_line (start -5.69 5.73) (end -5.69 -5.87) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.69 5.73) (end -5.69 5.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.69 -5.87) (end 5.69 5.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.69 -5.87) (end 5.69 -5.87) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.6 5.23) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.6 5.23) (end 4.6 5.23) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.25 -5.37) (end 4.75 -5.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.75 -5.37) (end 4.75 -3.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.75 -2.35) (end -4.75 1.89) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.75 -5.37) (end -3.25 -5.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.6 -5.22) (end 4.6 -5.22) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.6 5.23) (end -4.6 -5.22) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.75 -2.35) (end 4.75 1.89) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.75 -5.37) (end -4.75 -3.85) (layer F.SilkS) (width 0.12))
+    (pad S1 thru_hole circle (at -4.13 -3.11 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad A1 smd rect (at -2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad A2 smd rect (at -2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 2 "Net-(J1-PadA2)"))
+    (pad A3 smd rect (at -1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 3 "Net-(J1-PadA3)"))
+    (pad A4 smd rect (at -1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 4 VBUS))
+    (pad A5 smd rect (at -0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 43 /CC1P))
+    (pad A6 smd rect (at -0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 5 "Net-(J1-PadA6)"))
+    (pad A7 smd rect (at 0.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 6 "Net-(J1-PadA7)"))
+    (pad A12 smd rect (at 2.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad A10 smd rect (at 1.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 7 "Net-(J1-PadA10)"))
+    (pad A9 smd rect (at 1.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 4 VBUS))
+    (pad A8 smd rect (at 0.75 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 8 "Net-(J1-PadA8)"))
+    (pad A11 smd rect (at 2.25 -5.02 270) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask)
+      (net 9 "Net-(J1-PadA11)"))
+    (pad S1 thru_hole circle (at 4.13 -3.11 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad S1 thru_hole circle (at 4.49 2.84 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad S1 thru_hole circle (at -4.49 2.84 270) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad "" np_thru_hole circle (at 3.6 -4.36 270) (size 0.95 0.95) (drill 0.95) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -3.6 -4.36 270) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
+    (pad B1 thru_hole circle (at 2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad B4 thru_hole circle (at 1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 4 VBUS))
+    (pad B6 thru_hole circle (at 0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 10 "Net-(J1-PadB6)"))
+    (pad B7 thru_hole circle (at -0.4 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 11 "Net-(J1-PadB7)"))
+    (pad B9 thru_hole circle (at -1.2 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 4 VBUS))
+    (pad B12 thru_hole circle (at -2.8 -3.71 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad B2 thru_hole circle (at 2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 12 "Net-(J1-PadB2)"))
+    (pad B3 thru_hole circle (at 1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 13 "Net-(J1-PadB3)"))
+    (pad B5 thru_hole circle (at 0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 44 /CC2P))
+    (pad B8 thru_hole circle (at -0.8 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 14 "Net-(J1-PadB8)"))
+    (pad B10 thru_hole circle (at -1.6 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 15 "Net-(J1-PadB10)"))
+    (pad B11 thru_hole circle (at -2.4 -3.01 270) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
+      (net 16 "Net-(J1-PadB11)"))
+    (model ${KISYS3DMOD}/Connectors_USB.3dshapes/USB_C_Receptacle_Amphenol_12401548E4-2A.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (gr_text "PD Buddy Wye v1.0" (at 104 112.5 90) (layer B.Mask)
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror))
   )
@@ -650,6 +654,9 @@
   (gr_line (start 119 100) (end 101 100) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 120 109.15) (end 120 101) (layer Edge.Cuts) (width 0.15))
 
+  (segment (start 109.55 116.7) (end 110.25 116) (width 0.25) (layer B.Cu) (net 1))
+  (segment (start 110.25 116) (end 110.25 111.5) (width 0.25) (layer B.Cu) (net 1))
+  (segment (start 107.71 116.7) (end 109.55 116.7) (width 0.25) (layer B.Cu) (net 1))
   (segment (start 109 111.55) (end 110.2 111.55) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 110.2 111.55) (end 110.25 111.5) (width 0.25) (layer F.Cu) (net 1))
   (via (at 110.25 111.5) (size 0.7) (drill 0.38) (layers F.Cu B.Cu) (net 1))
@@ -769,15 +776,15 @@
   (segment (start 111 105.75) (end 110.447998 105.75) (width 0.16) (layer F.Cu) (net 43))
   (segment (start 109.5 104.802002) (end 109.072002 104.802002) (width 0.16) (layer F.Cu) (net 43))
   (segment (start 109.072002 104.802002) (end 109.02 104.75) (width 0.16) (layer F.Cu) (net 43))
+  (segment (start 107.01 106.3) (end 106 107.31) (width 0.16) (layer F.Cu) (net 44))
+  (segment (start 106.75 110.75) (end 113.75 110.75) (width 0.16) (layer F.Cu) (net 44))
+  (segment (start 106 107.31) (end 106 110) (width 0.16) (layer F.Cu) (net 44))
+  (segment (start 106 110) (end 106.75 110.75) (width 0.16) (layer F.Cu) (net 44))
+  (segment (start 113.75 110.75) (end 115.187501 112.187501) (width 0.16) (layer F.Cu) (net 44))
+  (segment (start 115.187501 112.187501) (end 115.5 112.5) (width 0.16) (layer F.Cu) (net 44))
   (segment (start 115.5 112.5) (end 119.53 112.5) (width 0.16) (layer B.Cu) (net 44))
   (segment (start 119.53 112.5) (end 119.96 112.93) (width 0.16) (layer B.Cu) (net 44))
   (segment (start 119.96 112.93) (end 119.96 113.25) (width 0.16) (layer B.Cu) (net 44))
-  (segment (start 115.187501 112.187501) (end 115.5 112.5) (width 0.16) (layer F.Cu) (net 44))
-  (segment (start 106 110) (end 106.5 110.5) (width 0.16) (layer F.Cu) (net 44))
-  (segment (start 107.01 106.3) (end 106 107.31) (width 0.16) (layer F.Cu) (net 44))
-  (segment (start 113.5 110.5) (end 115.187501 112.187501) (width 0.16) (layer F.Cu) (net 44))
-  (segment (start 106.5 110.5) (end 113.5 110.5) (width 0.16) (layer F.Cu) (net 44))
-  (segment (start 106 107.31) (end 106 110) (width 0.16) (layer F.Cu) (net 44))
   (via (at 115.5 112.5) (size 0.625) (drill 0.305) (layers F.Cu B.Cu) (net 44))
   (segment (start 110 118.5) (end 110 114.95) (width 0.16) (layer F.Cu) (net 45))
   (segment (start 110 114.95) (end 109 113.95) (width 0.16) (layer F.Cu) (net 45))
@@ -801,6 +808,7 @@
     )
     (filled_polygon
       (pts
+        (xy 106.493483 100.573878) (xy 107.11 101.190395) (xy 107.726517 100.573878) (xy 107.672172 100.456) (xy 118.955089 100.456)
         (xy 119.204761 100.505663) (xy 119.378349 100.621651) (xy 119.494337 100.795239) (xy 119.544 101.044911) (xy 119.544 109.15)
         (xy 119.552762 109.19405) (xy 119.552762 109.238961) (xy 119.575598 109.353766) (xy 119.643686 109.518146) (xy 119.708716 109.61547)
         (xy 119.712246 109.619) (xy 117.407816 109.619) (xy 114.323681 106.534865) (xy 115.318882 106.534865) (xy 115.422339 106.785252)
@@ -823,142 +831,138 @@
         (xy 114.177661 103.614748) (xy 113.986259 103.423013) (xy 113.736054 103.319118) (xy 113.465135 103.318882) (xy 113.214748 103.422339)
         (xy 113.023013 103.613741) (xy 112.919118 103.863946) (xy 112.918882 104.134865) (xy 111.923681 104.134865) (xy 111.269408 103.480592)
         (xy 111.14823 103.399017) (xy 111 103.369) (xy 107.972709 103.369) (xy 108.023724 103.347869) (xy 108.052617 103.222222)
-        (xy 107.71 102.879605) (xy 107.695858 102.893748) (xy 107.68361 102.8815) (xy 107.608866 102.700606) (xy 107.410439 102.501832)
-        (xy 107.276689 102.446294) (xy 107.187778 102.357383) (xy 107.062131 102.386276) (xy 107.060109 102.394044) (xy 106.870184 102.393878)
-        (xy 106.610606 102.501134) (xy 106.411832 102.699561) (xy 106.304123 102.958952) (xy 106.303878 103.239816) (xy 106.411134 103.499394)
-        (xy 106.411676 103.499937) (xy 106.304123 103.758952) (xy 106.303878 104.039816) (xy 106.411134 104.299394) (xy 106.411676 104.299937)
-        (xy 106.304123 104.558952) (xy 106.303878 104.839816) (xy 106.411134 105.099394) (xy 106.609561 105.298168) (xy 106.868952 105.405877)
-        (xy 107.072567 105.406055) (xy 107.111134 105.499394) (xy 107.111676 105.499937) (xy 107.072595 105.594055) (xy 106.870184 105.593878)
-        (xy 106.610606 105.701134) (xy 106.411832 105.899561) (xy 106.304123 106.158952) (xy 106.303878 106.439816) (xy 106.411134 106.699394)
-        (xy 106.411676 106.699937) (xy 106.304123 106.958952) (xy 106.303878 107.239816) (xy 106.411134 107.499394) (xy 106.411676 107.499937)
-        (xy 106.304123 107.758952) (xy 106.303878 108.039816) (xy 106.411134 108.299394) (xy 106.609561 108.498168) (xy 106.868952 108.605877)
-        (xy 107.058949 108.606043) (xy 107.062131 108.613724) (xy 107.187778 108.642617) (xy 107.276701 108.553694) (xy 107.409394 108.498866)
-        (xy 107.608168 108.300439) (xy 107.683792 108.118318) (xy 107.695858 108.106253) (xy 107.71 108.120395) (xy 108.052617 107.777778)
-        (xy 108.023724 107.652131) (xy 107.942532 107.631) (xy 109.842184 107.631) (xy 112.369 110.157816) (xy 112.369 115)
-        (xy 112.395056 115.138477) (xy 112.476896 115.26566) (xy 112.60177 115.350983) (xy 112.75 115.381) (xy 119.712246 115.381)
-        (xy 119.708718 115.384528) (xy 119.643686 115.481854) (xy 119.588069 115.616126) (xy 119.575598 115.646234) (xy 119.552762 115.761039)
-        (xy 119.552762 115.80595) (xy 119.544 115.85) (xy 119.544 123.955089) (xy 119.494337 124.204761) (xy 119.378349 124.378349)
-        (xy 119.204761 124.494337) (xy 118.955089 124.544) (xy 102.003827 124.544) (xy 102.102052 124.452448) (xy 102.20125 124.235986)
-        (xy 102.133887 124.117) (xy 101.287 124.117) (xy 101.287 124.137) (xy 101.033 124.137) (xy 101.033 124.117)
-        (xy 101.013 124.117) (xy 101.013 123.875986) (xy 106.06875 123.875986) (xy 106.167948 124.092448) (xy 106.393792 124.302949)
-        (xy 106.683 124.411) (xy 106.983 124.411) (xy 106.983 123.757) (xy 106.136113 123.757) (xy 106.06875 123.875986)
-        (xy 101.013 123.875986) (xy 101.013 123.863) (xy 101.033 123.863) (xy 101.033 123.209) (xy 101.287 123.209)
-        (xy 101.287 123.863) (xy 102.133887 123.863) (xy 102.20125 123.744014) (xy 102.102052 123.527552) (xy 101.948052 123.384014)
-        (xy 106.06875 123.384014) (xy 106.136113 123.503) (xy 106.983 123.503) (xy 106.983 122.849) (xy 107.237 122.849)
-        (xy 107.237 123.503) (xy 107.257 123.503) (xy 107.257 123.757) (xy 107.237 123.757) (xy 107.237 124.411)
-        (xy 107.537 124.411) (xy 107.826208 124.302949) (xy 108.052052 124.092448) (xy 108.128041 123.926631) (xy 108.36 123.97277)
-        (xy 108.630175 123.919029) (xy 108.859217 123.765987) (xy 109.012259 123.536945) (xy 109.012672 123.534865) (xy 115.318882 123.534865)
-        (xy 115.422339 123.785252) (xy 115.613741 123.976987) (xy 115.863946 124.080882) (xy 116.134865 124.081118) (xy 116.385252 123.977661)
-        (xy 116.576987 123.786259) (xy 116.680882 123.536054) (xy 116.681118 123.265135) (xy 116.577661 123.014748) (xy 116.395152 122.831921)
-        (xy 117.015938 122.831921) (xy 117.119395 123.082308) (xy 117.310797 123.274043) (xy 117.561002 123.377938) (xy 117.831921 123.378174)
-        (xy 118.082308 123.274717) (xy 118.274043 123.083315) (xy 118.377938 122.83311) (xy 118.378174 122.562191) (xy 118.274717 122.311804)
-        (xy 118.083315 122.120069) (xy 117.83311 122.016174) (xy 117.562191 122.015938) (xy 117.311804 122.119395) (xy 117.120069 122.310797)
-        (xy 117.016174 122.561002) (xy 117.015938 122.831921) (xy 116.395152 122.831921) (xy 116.386259 122.823013) (xy 116.136054 122.719118)
-        (xy 115.865135 122.718882) (xy 115.614748 122.822339) (xy 115.423013 123.013741) (xy 115.319118 123.263946) (xy 115.318882 123.534865)
-        (xy 109.012672 123.534865) (xy 109.066 123.26677) (xy 109.066 122.93323) (xy 109.045849 122.831921) (xy 113.621826 122.831921)
-        (xy 113.725283 123.082308) (xy 113.916685 123.274043) (xy 114.16689 123.377938) (xy 114.437809 123.378174) (xy 114.688196 123.274717)
-        (xy 114.879931 123.083315) (xy 114.983826 122.83311) (xy 114.984062 122.562191) (xy 114.880605 122.311804) (xy 114.689203 122.120069)
-        (xy 114.438998 122.016174) (xy 114.168079 122.015938) (xy 113.917692 122.119395) (xy 113.725957 122.310797) (xy 113.622062 122.561002)
-        (xy 113.621826 122.831921) (xy 109.045849 122.831921) (xy 109.012259 122.663055) (xy 108.859217 122.434013) (xy 108.630175 122.280971)
-        (xy 108.414169 122.238005) (xy 108.389949 122.063724) (xy 108.357869 121.986276) (xy 108.232222 121.957383) (xy 107.889605 122.3)
-        (xy 107.903748 122.314143) (xy 107.724143 122.493748) (xy 107.71 122.479605) (xy 107.367383 122.822222) (xy 107.373541 122.849)
-        (xy 107.237 122.849) (xy 106.983 122.849) (xy 106.683 122.849) (xy 106.393792 122.957051) (xy 106.167948 123.167552)
-        (xy 106.06875 123.384014) (xy 101.948052 123.384014) (xy 101.876208 123.317051) (xy 101.587 123.209) (xy 101.287 123.209)
-        (xy 101.033 123.209) (xy 100.733 123.209) (xy 100.456 123.31249) (xy 100.456 117.239816) (xy 106.303878 117.239816)
-        (xy 106.411134 117.499394) (xy 106.411676 117.499937) (xy 106.304123 117.758952) (xy 106.303878 118.039816) (xy 106.411134 118.299394)
-        (xy 106.411676 118.299937) (xy 106.304123 118.558952) (xy 106.303878 118.839816) (xy 106.411134 119.099394) (xy 106.609561 119.298168)
-        (xy 106.868952 119.405877) (xy 107.072567 119.406055) (xy 107.111134 119.499394) (xy 107.111676 119.499937) (xy 107.072595 119.594055)
-        (xy 106.870184 119.593878) (xy 106.610606 119.701134) (xy 106.411832 119.899561) (xy 106.304123 120.158952) (xy 106.303878 120.439816)
-        (xy 106.411134 120.699394) (xy 106.411676 120.699937) (xy 106.304123 120.958952) (xy 106.303878 121.239816) (xy 106.411134 121.499394)
-        (xy 106.411676 121.499937) (xy 106.304123 121.758952) (xy 106.303878 122.039816) (xy 106.411134 122.299394) (xy 106.609561 122.498168)
-        (xy 106.868952 122.605877) (xy 107.058949 122.606043) (xy 107.062131 122.613724) (xy 107.187778 122.642617) (xy 107.276701 122.553694)
-        (xy 107.409394 122.498866) (xy 107.608168 122.300439) (xy 107.683792 122.118318) (xy 107.695858 122.106253) (xy 107.71 122.120395)
-        (xy 108.052617 121.777778) (xy 108.023724 121.652131) (xy 107.751914 121.58139) (xy 107.648201 121.595803) (xy 107.608866 121.500606)
-        (xy 107.608324 121.500063) (xy 107.647405 121.405945) (xy 107.849816 121.406122) (xy 108.109394 121.298866) (xy 108.273681 121.134865)
-        (xy 112.918882 121.134865) (xy 113.022339 121.385252) (xy 113.213741 121.576987) (xy 113.463946 121.680882) (xy 113.734865 121.681118)
-        (xy 113.985252 121.577661) (xy 114.176987 121.386259) (xy 114.280882 121.136054) (xy 114.280883 121.134865) (xy 117.718882 121.134865)
-        (xy 117.822339 121.385252) (xy 118.013741 121.576987) (xy 118.263946 121.680882) (xy 118.534865 121.681118) (xy 118.785252 121.577661)
-        (xy 118.976987 121.386259) (xy 119.080882 121.136054) (xy 119.081118 120.865135) (xy 118.977661 120.614748) (xy 118.786259 120.423013)
-        (xy 118.536054 120.319118) (xy 118.265135 120.318882) (xy 118.014748 120.422339) (xy 117.823013 120.613741) (xy 117.719118 120.863946)
-        (xy 117.718882 121.134865) (xy 114.280883 121.134865) (xy 114.281118 120.865135) (xy 114.177661 120.614748) (xy 113.986259 120.423013)
-        (xy 113.736054 120.319118) (xy 113.465135 120.318882) (xy 113.214748 120.422339) (xy 113.023013 120.613741) (xy 112.919118 120.863946)
-        (xy 112.918882 121.134865) (xy 108.273681 121.134865) (xy 108.308168 121.100439) (xy 108.415877 120.841048) (xy 108.416122 120.560184)
-        (xy 108.308866 120.300606) (xy 108.308324 120.300063) (xy 108.415877 120.041048) (xy 108.416047 119.845905) (xy 108.625976 119.635976)
-        (xy 108.725908 119.486417) (xy 108.735576 119.437809) (xy 113.621826 119.437809) (xy 113.725283 119.688196) (xy 113.916685 119.879931)
-        (xy 114.16689 119.983826) (xy 114.437809 119.984062) (xy 114.688196 119.880605) (xy 114.879931 119.689203) (xy 114.983826 119.438998)
-        (xy 114.983827 119.437809) (xy 117.015938 119.437809) (xy 117.119395 119.688196) (xy 117.310797 119.879931) (xy 117.561002 119.983826)
-        (xy 117.831921 119.984062) (xy 118.082308 119.880605) (xy 118.274043 119.689203) (xy 118.377938 119.438998) (xy 118.378174 119.168079)
-        (xy 118.274717 118.917692) (xy 118.083315 118.725957) (xy 117.83311 118.622062) (xy 117.562191 118.621826) (xy 117.311804 118.725283)
-        (xy 117.120069 118.916685) (xy 117.016174 119.16689) (xy 117.015938 119.437809) (xy 114.983827 119.437809) (xy 114.984062 119.168079)
-        (xy 114.880605 118.917692) (xy 114.698096 118.734865) (xy 115.318882 118.734865) (xy 115.422339 118.985252) (xy 115.613741 119.176987)
-        (xy 115.863946 119.280882) (xy 116.134865 119.281118) (xy 116.385252 119.177661) (xy 116.576987 118.986259) (xy 116.680882 118.736054)
-        (xy 116.681118 118.465135) (xy 116.577661 118.214748) (xy 116.386259 118.023013) (xy 116.136054 117.919118) (xy 115.865135 117.918882)
-        (xy 115.614748 118.022339) (xy 115.423013 118.213741) (xy 115.319118 118.463946) (xy 115.318882 118.734865) (xy 114.698096 118.734865)
-        (xy 114.689203 118.725957) (xy 114.438998 118.622062) (xy 114.168079 118.621826) (xy 113.917692 118.725283) (xy 113.725957 118.916685)
-        (xy 113.622062 119.16689) (xy 113.621826 119.437809) (xy 108.735576 119.437809) (xy 108.761 119.31) (xy 108.761 117.8)
-        (xy 108.725908 117.623583) (xy 108.693435 117.574983) (xy 108.69362 117.36266) (xy 108.588263 117.107677) (xy 108.393349 116.912423)
-        (xy 108.385123 116.909007) (xy 108.42861 116.741914) (xy 108.409728 116.606043) (xy 108.499816 116.606122) (xy 108.759394 116.498866)
-        (xy 108.958168 116.300439) (xy 109.065877 116.041048) (xy 109.066122 115.760184) (xy 108.958866 115.500606) (xy 108.760439 115.301832)
-        (xy 108.501048 115.194123) (xy 108.220184 115.193878) (xy 108.101305 115.242998) (xy 108.083888 115.242998) (xy 108.15125 115.124014)
-        (xy 108.052052 114.907552) (xy 107.826208 114.697051) (xy 107.537 114.589) (xy 107.237 114.589) (xy 107.237 115.243)
-        (xy 107.257 115.243) (xy 107.257 115.497) (xy 107.237 115.497) (xy 107.237 116.151) (xy 107.373541 116.151)
-        (xy 107.367383 116.177778) (xy 107.71 116.520395) (xy 107.724143 116.506253) (xy 107.903748 116.685858) (xy 107.889605 116.7)
-        (xy 107.903748 116.714143) (xy 107.775493 116.842397) (xy 107.683209 116.880528) (xy 107.608866 116.700606) (xy 107.410439 116.501832)
-        (xy 107.276689 116.446294) (xy 107.187778 116.357383) (xy 107.062131 116.386276) (xy 107.060109 116.394044) (xy 106.870184 116.393878)
-        (xy 106.610606 116.501134) (xy 106.411832 116.699561) (xy 106.304123 116.958952) (xy 106.303878 117.239816) (xy 100.456 117.239816)
-        (xy 100.456 115.68751) (xy 100.733 115.791) (xy 101.033 115.791) (xy 101.033 115.137) (xy 101.287 115.137)
-        (xy 101.287 115.791) (xy 101.587 115.791) (xy 101.876208 115.682949) (xy 101.948051 115.615986) (xy 106.06875 115.615986)
-        (xy 106.167948 115.832448) (xy 106.393792 116.042949) (xy 106.683 116.151) (xy 106.983 116.151) (xy 106.983 115.497)
-        (xy 106.136113 115.497) (xy 106.06875 115.615986) (xy 101.948051 115.615986) (xy 102.102052 115.472448) (xy 102.20125 115.255986)
-        (xy 102.133887 115.137) (xy 101.287 115.137) (xy 101.033 115.137) (xy 101.013 115.137) (xy 101.013 115.124014)
-        (xy 106.06875 115.124014) (xy 106.136113 115.243) (xy 106.983 115.243) (xy 106.983 114.589) (xy 106.683 114.589)
-        (xy 106.393792 114.697051) (xy 106.167948 114.907552) (xy 106.06875 115.124014) (xy 101.013 115.124014) (xy 101.013 114.883)
-        (xy 101.033 114.883) (xy 101.033 114.229) (xy 101.287 114.229) (xy 101.287 114.883) (xy 102.133887 114.883)
-        (xy 102.20125 114.764014) (xy 102.102052 114.547552) (xy 101.876208 114.337051) (xy 101.587 114.229) (xy 101.287 114.229)
-        (xy 101.033 114.229) (xy 100.733 114.229) (xy 100.456 114.33249) (xy 100.456 110.66751) (xy 100.733 110.771)
-        (xy 101.033 110.771) (xy 101.033 110.117) (xy 101.287 110.117) (xy 101.287 110.771) (xy 101.587 110.771)
-        (xy 101.876208 110.662949) (xy 102.102052 110.452448) (xy 102.20125 110.235986) (xy 102.133887 110.117) (xy 101.287 110.117)
-        (xy 101.033 110.117) (xy 101.013 110.117) (xy 101.013 109.875986) (xy 106.06875 109.875986) (xy 106.167948 110.092448)
-        (xy 106.393792 110.302949) (xy 106.683 110.411) (xy 106.983 110.411) (xy 106.983 109.757) (xy 106.136113 109.757)
-        (xy 106.06875 109.875986) (xy 101.013 109.875986) (xy 101.013 109.863) (xy 101.033 109.863) (xy 101.033 109.209)
-        (xy 101.287 109.209) (xy 101.287 109.863) (xy 102.133887 109.863) (xy 102.20125 109.744014) (xy 102.102052 109.527552)
-        (xy 101.948052 109.384014) (xy 106.06875 109.384014) (xy 106.136113 109.503) (xy 106.983 109.503) (xy 106.983 108.849)
-        (xy 107.237 108.849) (xy 107.237 109.503) (xy 107.257 109.503) (xy 107.257 109.757) (xy 107.237 109.757)
-        (xy 107.237 110.411) (xy 107.537 110.411) (xy 107.826208 110.302949) (xy 108.052052 110.092448) (xy 108.128041 109.926631)
-        (xy 108.36 109.97277) (xy 108.630175 109.919029) (xy 108.859217 109.765987) (xy 109.012259 109.536945) (xy 109.066 109.26677)
-        (xy 109.066 108.93323) (xy 109.012259 108.663055) (xy 108.859217 108.434013) (xy 108.630175 108.280971) (xy 108.414169 108.238005)
+        (xy 107.71 102.879605) (xy 107.695858 102.893748) (xy 107.68361 102.8815) (xy 107.608866 102.700606) (xy 107.555232 102.646878)
+        (xy 107.695858 102.506253) (xy 107.71 102.520395) (xy 107.724143 102.506253) (xy 107.903748 102.685858) (xy 107.889605 102.7)
+        (xy 108.232222 103.042617) (xy 108.357869 103.013724) (xy 108.42861 102.741914) (xy 108.409728 102.606043) (xy 108.499816 102.606122)
+        (xy 108.759394 102.498866) (xy 108.820557 102.437809) (xy 113.621826 102.437809) (xy 113.725283 102.688196) (xy 113.916685 102.879931)
+        (xy 114.16689 102.983826) (xy 114.437809 102.984062) (xy 114.688196 102.880605) (xy 114.879931 102.689203) (xy 114.983826 102.438998)
+        (xy 114.983827 102.437809) (xy 117.015938 102.437809) (xy 117.119395 102.688196) (xy 117.310797 102.879931) (xy 117.561002 102.983826)
+        (xy 117.831921 102.984062) (xy 118.082308 102.880605) (xy 118.274043 102.689203) (xy 118.377938 102.438998) (xy 118.378174 102.168079)
+        (xy 118.274717 101.917692) (xy 118.083315 101.725957) (xy 117.83311 101.622062) (xy 117.562191 101.621826) (xy 117.311804 101.725283)
+        (xy 117.120069 101.916685) (xy 117.016174 102.16689) (xy 117.015938 102.437809) (xy 114.983827 102.437809) (xy 114.984062 102.168079)
+        (xy 114.880605 101.917692) (xy 114.698096 101.734865) (xy 115.318882 101.734865) (xy 115.422339 101.985252) (xy 115.613741 102.176987)
+        (xy 115.863946 102.280882) (xy 116.134865 102.281118) (xy 116.385252 102.177661) (xy 116.576987 101.986259) (xy 116.680882 101.736054)
+        (xy 116.681118 101.465135) (xy 116.577661 101.214748) (xy 116.386259 101.023013) (xy 116.136054 100.919118) (xy 115.865135 100.918882)
+        (xy 115.614748 101.022339) (xy 115.423013 101.213741) (xy 115.319118 101.463946) (xy 115.318882 101.734865) (xy 114.698096 101.734865)
+        (xy 114.689203 101.725957) (xy 114.438998 101.622062) (xy 114.168079 101.621826) (xy 113.917692 101.725283) (xy 113.725957 101.916685)
+        (xy 113.622062 102.16689) (xy 113.621826 102.437809) (xy 108.820557 102.437809) (xy 108.958168 102.300439) (xy 109.065877 102.041048)
+        (xy 109.066122 101.760184) (xy 108.958866 101.500606) (xy 108.760439 101.301832) (xy 108.501048 101.194123) (xy 108.220184 101.193878)
+        (xy 108.181907 101.209694) (xy 108.171491 101.073293) (xy 108.070391 100.829216) (xy 107.906122 100.753483) (xy 107.289605 101.37)
+        (xy 107.303748 101.384143) (xy 107.124143 101.563748) (xy 107.11 101.549605) (xy 106.493483 102.166122) (xy 106.569216 102.330391)
+        (xy 106.822825 102.413446) (xy 106.610606 102.501134) (xy 106.411832 102.699561) (xy 106.304123 102.958952) (xy 106.303878 103.239816)
+        (xy 106.411134 103.499394) (xy 106.411676 103.499937) (xy 106.304123 103.758952) (xy 106.303878 104.039816) (xy 106.411134 104.299394)
+        (xy 106.411676 104.299937) (xy 106.304123 104.558952) (xy 106.303878 104.839816) (xy 106.411134 105.099394) (xy 106.609561 105.298168)
+        (xy 106.868952 105.405877) (xy 107.072567 105.406055) (xy 107.111134 105.499394) (xy 107.111676 105.499937) (xy 107.072595 105.594055)
+        (xy 106.870184 105.593878) (xy 106.610606 105.701134) (xy 106.411832 105.899561) (xy 106.304123 106.158952) (xy 106.303878 106.439816)
+        (xy 106.411134 106.699394) (xy 106.411676 106.699937) (xy 106.304123 106.958952) (xy 106.303878 107.239816) (xy 106.411134 107.499394)
+        (xy 106.411676 107.499937) (xy 106.304123 107.758952) (xy 106.303878 108.039816) (xy 106.411134 108.299394) (xy 106.609561 108.498168)
+        (xy 106.796105 108.575628) (xy 106.569216 108.669609) (xy 106.493483 108.833878) (xy 107.11 109.450395) (xy 107.124143 109.436253)
+        (xy 107.303748 109.615858) (xy 107.289605 109.63) (xy 107.906122 110.246517) (xy 108.070391 110.170784) (xy 108.146551 109.938231)
+        (xy 108.188984 109.955851) (xy 108.529522 109.956148) (xy 108.844252 109.826105) (xy 109.085258 109.585518) (xy 109.215851 109.271016)
+        (xy 109.216148 108.930478) (xy 109.086105 108.615748) (xy 108.845518 108.374742) (xy 108.531016 108.244149) (xy 108.415009 108.244048)
         (xy 108.389949 108.063724) (xy 108.357869 107.986276) (xy 108.232222 107.957383) (xy 107.889605 108.3) (xy 107.903748 108.314143)
-        (xy 107.724143 108.493748) (xy 107.71 108.479605) (xy 107.367383 108.822222) (xy 107.373541 108.849) (xy 107.237 108.849)
-        (xy 106.983 108.849) (xy 106.683 108.849) (xy 106.393792 108.957051) (xy 106.167948 109.167552) (xy 106.06875 109.384014)
-        (xy 101.948052 109.384014) (xy 101.876208 109.317051) (xy 101.587 109.209) (xy 101.287 109.209) (xy 101.033 109.209)
-        (xy 100.733 109.209) (xy 100.456 109.31249) (xy 100.456 101.68751) (xy 100.733 101.791) (xy 101.033 101.791)
-        (xy 101.033 101.137) (xy 101.287 101.137) (xy 101.287 101.791) (xy 101.587 101.791) (xy 101.876208 101.682949)
-        (xy 101.948051 101.615986) (xy 106.06875 101.615986) (xy 106.167948 101.832448) (xy 106.393792 102.042949) (xy 106.683 102.151)
-        (xy 106.983 102.151) (xy 106.983 101.497) (xy 106.136113 101.497) (xy 106.06875 101.615986) (xy 101.948051 101.615986)
-        (xy 102.102052 101.472448) (xy 102.20125 101.255986) (xy 102.133887 101.137) (xy 101.287 101.137) (xy 101.033 101.137)
-        (xy 101.013 101.137) (xy 101.013 101.124014) (xy 106.06875 101.124014) (xy 106.136113 101.243) (xy 106.983 101.243)
-        (xy 106.983 100.589) (xy 107.237 100.589) (xy 107.237 101.243) (xy 107.257 101.243) (xy 107.257 101.497)
-        (xy 107.237 101.497) (xy 107.237 102.151) (xy 107.373541 102.151) (xy 107.367383 102.177778) (xy 107.71 102.520395)
-        (xy 107.724143 102.506253) (xy 107.903748 102.685858) (xy 107.889605 102.7) (xy 108.232222 103.042617) (xy 108.357869 103.013724)
-        (xy 108.42861 102.741914) (xy 108.409728 102.606043) (xy 108.499816 102.606122) (xy 108.759394 102.498866) (xy 108.820557 102.437809)
-        (xy 113.621826 102.437809) (xy 113.725283 102.688196) (xy 113.916685 102.879931) (xy 114.16689 102.983826) (xy 114.437809 102.984062)
-        (xy 114.688196 102.880605) (xy 114.879931 102.689203) (xy 114.983826 102.438998) (xy 114.983827 102.437809) (xy 117.015938 102.437809)
-        (xy 117.119395 102.688196) (xy 117.310797 102.879931) (xy 117.561002 102.983826) (xy 117.831921 102.984062) (xy 118.082308 102.880605)
-        (xy 118.274043 102.689203) (xy 118.377938 102.438998) (xy 118.378174 102.168079) (xy 118.274717 101.917692) (xy 118.083315 101.725957)
-        (xy 117.83311 101.622062) (xy 117.562191 101.621826) (xy 117.311804 101.725283) (xy 117.120069 101.916685) (xy 117.016174 102.16689)
-        (xy 117.015938 102.437809) (xy 114.983827 102.437809) (xy 114.984062 102.168079) (xy 114.880605 101.917692) (xy 114.698096 101.734865)
-        (xy 115.318882 101.734865) (xy 115.422339 101.985252) (xy 115.613741 102.176987) (xy 115.863946 102.280882) (xy 116.134865 102.281118)
-        (xy 116.385252 102.177661) (xy 116.576987 101.986259) (xy 116.680882 101.736054) (xy 116.681118 101.465135) (xy 116.577661 101.214748)
-        (xy 116.386259 101.023013) (xy 116.136054 100.919118) (xy 115.865135 100.918882) (xy 115.614748 101.022339) (xy 115.423013 101.213741)
-        (xy 115.319118 101.463946) (xy 115.318882 101.734865) (xy 114.698096 101.734865) (xy 114.689203 101.725957) (xy 114.438998 101.622062)
-        (xy 114.168079 101.621826) (xy 113.917692 101.725283) (xy 113.725957 101.916685) (xy 113.622062 102.16689) (xy 113.621826 102.437809)
-        (xy 108.820557 102.437809) (xy 108.958168 102.300439) (xy 109.065877 102.041048) (xy 109.066122 101.760184) (xy 108.958866 101.500606)
-        (xy 108.760439 101.301832) (xy 108.501048 101.194123) (xy 108.220184 101.193878) (xy 108.101305 101.242998) (xy 108.083888 101.242998)
-        (xy 108.15125 101.124014) (xy 108.052052 100.907552) (xy 107.826208 100.697051) (xy 107.537 100.589) (xy 107.237 100.589)
-        (xy 106.983 100.589) (xy 106.683 100.589) (xy 106.393792 100.697051) (xy 106.167948 100.907552) (xy 106.06875 101.124014)
-        (xy 101.013 101.124014) (xy 101.013 100.883) (xy 101.033 100.883) (xy 101.033 100.863) (xy 101.287 100.863)
-        (xy 101.287 100.883) (xy 102.133887 100.883) (xy 102.20125 100.764014) (xy 102.102052 100.547552) (xy 102.003827 100.456)
-        (xy 118.955089 100.456)
+        (xy 107.724143 108.493748) (xy 107.71 108.479605) (xy 107.695858 108.493748) (xy 107.555312 108.353202) (xy 107.608168 108.300439)
+        (xy 107.683792 108.118318) (xy 107.695858 108.106253) (xy 107.71 108.120395) (xy 108.052617 107.777778) (xy 108.023724 107.652131)
+        (xy 107.942532 107.631) (xy 109.842184 107.631) (xy 112.369 110.157816) (xy 112.369 115) (xy 112.395056 115.138477)
+        (xy 112.476896 115.26566) (xy 112.60177 115.350983) (xy 112.75 115.381) (xy 119.712246 115.381) (xy 119.708718 115.384528)
+        (xy 119.643686 115.481854) (xy 119.588069 115.616126) (xy 119.575598 115.646234) (xy 119.552762 115.761039) (xy 119.552762 115.80595)
+        (xy 119.544 115.85) (xy 119.544 123.955089) (xy 119.494337 124.204761) (xy 119.378349 124.378349) (xy 119.204761 124.494337)
+        (xy 118.955089 124.544) (xy 107.672172 124.544) (xy 107.726517 124.426122) (xy 107.11 123.809605) (xy 106.493483 124.426122)
+        (xy 106.547828 124.544) (xy 102.091725 124.544) (xy 102.120391 124.530784) (xy 102.254235 124.122093) (xy 102.221491 123.693293)
+        (xy 102.14056 123.497907) (xy 106.015765 123.497907) (xy 106.048509 123.926707) (xy 106.149609 124.170784) (xy 106.313878 124.246517)
+        (xy 106.930395 123.63) (xy 106.313878 123.013483) (xy 106.149609 123.089216) (xy 106.015765 123.497907) (xy 102.14056 123.497907)
+        (xy 102.120391 123.449216) (xy 101.956122 123.373483) (xy 101.339605 123.99) (xy 101.353748 124.004143) (xy 101.174143 124.183748)
+        (xy 101.16 124.169605) (xy 101.145858 124.183748) (xy 100.966253 124.004143) (xy 100.980395 123.99) (xy 100.966253 123.975858)
+        (xy 101.145858 123.796253) (xy 101.16 123.810395) (xy 101.776517 123.193878) (xy 101.700784 123.029609) (xy 101.292093 122.895765)
+        (xy 100.863293 122.928509) (xy 100.619216 123.029609) (xy 100.543484 123.193876) (xy 100.472206 123.122598) (xy 100.456 123.138804)
+        (xy 100.456 117.239816) (xy 106.303878 117.239816) (xy 106.411134 117.499394) (xy 106.411676 117.499937) (xy 106.304123 117.758952)
+        (xy 106.303878 118.039816) (xy 106.411134 118.299394) (xy 106.411676 118.299937) (xy 106.304123 118.558952) (xy 106.303878 118.839816)
+        (xy 106.411134 119.099394) (xy 106.609561 119.298168) (xy 106.868952 119.405877) (xy 107.072567 119.406055) (xy 107.111134 119.499394)
+        (xy 107.111676 119.499937) (xy 107.072595 119.594055) (xy 106.870184 119.593878) (xy 106.610606 119.701134) (xy 106.411832 119.899561)
+        (xy 106.304123 120.158952) (xy 106.303878 120.439816) (xy 106.411134 120.699394) (xy 106.411676 120.699937) (xy 106.304123 120.958952)
+        (xy 106.303878 121.239816) (xy 106.411134 121.499394) (xy 106.411676 121.499937) (xy 106.304123 121.758952) (xy 106.303878 122.039816)
+        (xy 106.411134 122.299394) (xy 106.609561 122.498168) (xy 106.796105 122.575628) (xy 106.569216 122.669609) (xy 106.493483 122.833878)
+        (xy 107.11 123.450395) (xy 107.124143 123.436253) (xy 107.303748 123.615858) (xy 107.289605 123.63) (xy 107.906122 124.246517)
+        (xy 108.070391 124.170784) (xy 108.146551 123.938231) (xy 108.188984 123.955851) (xy 108.529522 123.956148) (xy 108.844252 123.826105)
+        (xy 109.085258 123.585518) (xy 109.106291 123.534865) (xy 115.318882 123.534865) (xy 115.422339 123.785252) (xy 115.613741 123.976987)
+        (xy 115.863946 124.080882) (xy 116.134865 124.081118) (xy 116.385252 123.977661) (xy 116.576987 123.786259) (xy 116.680882 123.536054)
+        (xy 116.681118 123.265135) (xy 116.577661 123.014748) (xy 116.395152 122.831921) (xy 117.015938 122.831921) (xy 117.119395 123.082308)
+        (xy 117.310797 123.274043) (xy 117.561002 123.377938) (xy 117.831921 123.378174) (xy 118.082308 123.274717) (xy 118.274043 123.083315)
+        (xy 118.377938 122.83311) (xy 118.378174 122.562191) (xy 118.274717 122.311804) (xy 118.083315 122.120069) (xy 117.83311 122.016174)
+        (xy 117.562191 122.015938) (xy 117.311804 122.119395) (xy 117.120069 122.310797) (xy 117.016174 122.561002) (xy 117.015938 122.831921)
+        (xy 116.395152 122.831921) (xy 116.386259 122.823013) (xy 116.136054 122.719118) (xy 115.865135 122.718882) (xy 115.614748 122.822339)
+        (xy 115.423013 123.013741) (xy 115.319118 123.263946) (xy 115.318882 123.534865) (xy 109.106291 123.534865) (xy 109.215851 123.271016)
+        (xy 109.216148 122.930478) (xy 109.175426 122.831921) (xy 113.621826 122.831921) (xy 113.725283 123.082308) (xy 113.916685 123.274043)
+        (xy 114.16689 123.377938) (xy 114.437809 123.378174) (xy 114.688196 123.274717) (xy 114.879931 123.083315) (xy 114.983826 122.83311)
+        (xy 114.984062 122.562191) (xy 114.880605 122.311804) (xy 114.689203 122.120069) (xy 114.438998 122.016174) (xy 114.168079 122.015938)
+        (xy 113.917692 122.119395) (xy 113.725957 122.310797) (xy 113.622062 122.561002) (xy 113.621826 122.831921) (xy 109.175426 122.831921)
+        (xy 109.086105 122.615748) (xy 108.845518 122.374742) (xy 108.531016 122.244149) (xy 108.415009 122.244048) (xy 108.389949 122.063724)
+        (xy 108.357869 121.986276) (xy 108.232222 121.957383) (xy 107.889605 122.3) (xy 107.903748 122.314143) (xy 107.724143 122.493748)
+        (xy 107.71 122.479605) (xy 107.695858 122.493748) (xy 107.555312 122.353202) (xy 107.608168 122.300439) (xy 107.683792 122.118318)
+        (xy 107.695858 122.106253) (xy 107.71 122.120395) (xy 108.052617 121.777778) (xy 108.023724 121.652131) (xy 107.751914 121.58139)
+        (xy 107.648201 121.595803) (xy 107.608866 121.500606) (xy 107.608324 121.500063) (xy 107.647405 121.405945) (xy 107.849816 121.406122)
+        (xy 108.109394 121.298866) (xy 108.273681 121.134865) (xy 112.918882 121.134865) (xy 113.022339 121.385252) (xy 113.213741 121.576987)
+        (xy 113.463946 121.680882) (xy 113.734865 121.681118) (xy 113.985252 121.577661) (xy 114.176987 121.386259) (xy 114.280882 121.136054)
+        (xy 114.280883 121.134865) (xy 117.718882 121.134865) (xy 117.822339 121.385252) (xy 118.013741 121.576987) (xy 118.263946 121.680882)
+        (xy 118.534865 121.681118) (xy 118.785252 121.577661) (xy 118.976987 121.386259) (xy 119.080882 121.136054) (xy 119.081118 120.865135)
+        (xy 118.977661 120.614748) (xy 118.786259 120.423013) (xy 118.536054 120.319118) (xy 118.265135 120.318882) (xy 118.014748 120.422339)
+        (xy 117.823013 120.613741) (xy 117.719118 120.863946) (xy 117.718882 121.134865) (xy 114.280883 121.134865) (xy 114.281118 120.865135)
+        (xy 114.177661 120.614748) (xy 113.986259 120.423013) (xy 113.736054 120.319118) (xy 113.465135 120.318882) (xy 113.214748 120.422339)
+        (xy 113.023013 120.613741) (xy 112.919118 120.863946) (xy 112.918882 121.134865) (xy 108.273681 121.134865) (xy 108.308168 121.100439)
+        (xy 108.415877 120.841048) (xy 108.416122 120.560184) (xy 108.308866 120.300606) (xy 108.308324 120.300063) (xy 108.415877 120.041048)
+        (xy 108.416047 119.845905) (xy 108.625976 119.635976) (xy 108.725908 119.486417) (xy 108.735576 119.437809) (xy 113.621826 119.437809)
+        (xy 113.725283 119.688196) (xy 113.916685 119.879931) (xy 114.16689 119.983826) (xy 114.437809 119.984062) (xy 114.688196 119.880605)
+        (xy 114.879931 119.689203) (xy 114.983826 119.438998) (xy 114.983827 119.437809) (xy 117.015938 119.437809) (xy 117.119395 119.688196)
+        (xy 117.310797 119.879931) (xy 117.561002 119.983826) (xy 117.831921 119.984062) (xy 118.082308 119.880605) (xy 118.274043 119.689203)
+        (xy 118.377938 119.438998) (xy 118.378174 119.168079) (xy 118.274717 118.917692) (xy 118.083315 118.725957) (xy 117.83311 118.622062)
+        (xy 117.562191 118.621826) (xy 117.311804 118.725283) (xy 117.120069 118.916685) (xy 117.016174 119.16689) (xy 117.015938 119.437809)
+        (xy 114.983827 119.437809) (xy 114.984062 119.168079) (xy 114.880605 118.917692) (xy 114.698096 118.734865) (xy 115.318882 118.734865)
+        (xy 115.422339 118.985252) (xy 115.613741 119.176987) (xy 115.863946 119.280882) (xy 116.134865 119.281118) (xy 116.385252 119.177661)
+        (xy 116.576987 118.986259) (xy 116.680882 118.736054) (xy 116.681118 118.465135) (xy 116.577661 118.214748) (xy 116.386259 118.023013)
+        (xy 116.136054 117.919118) (xy 115.865135 117.918882) (xy 115.614748 118.022339) (xy 115.423013 118.213741) (xy 115.319118 118.463946)
+        (xy 115.318882 118.734865) (xy 114.698096 118.734865) (xy 114.689203 118.725957) (xy 114.438998 118.622062) (xy 114.168079 118.621826)
+        (xy 113.917692 118.725283) (xy 113.725957 118.916685) (xy 113.622062 119.16689) (xy 113.621826 119.437809) (xy 108.735576 119.437809)
+        (xy 108.761 119.31) (xy 108.761 117.8) (xy 108.725908 117.623583) (xy 108.693435 117.574983) (xy 108.69362 117.36266)
+        (xy 108.588263 117.107677) (xy 108.393349 116.912423) (xy 108.385123 116.909007) (xy 108.42861 116.741914) (xy 108.409728 116.606043)
+        (xy 108.499816 116.606122) (xy 108.759394 116.498866) (xy 108.958168 116.300439) (xy 109.065877 116.041048) (xy 109.066122 115.760184)
+        (xy 108.958866 115.500606) (xy 108.760439 115.301832) (xy 108.501048 115.194123) (xy 108.220184 115.193878) (xy 108.181907 115.209694)
+        (xy 108.171491 115.073293) (xy 108.070391 114.829216) (xy 107.906122 114.753483) (xy 107.289605 115.37) (xy 107.303748 115.384143)
+        (xy 107.124143 115.563748) (xy 107.11 115.549605) (xy 106.493483 116.166122) (xy 106.569216 116.330391) (xy 106.822825 116.413446)
+        (xy 106.610606 116.501134) (xy 106.411832 116.699561) (xy 106.304123 116.958952) (xy 106.303878 117.239816) (xy 100.456 117.239816)
+        (xy 100.456 115.861196) (xy 100.472206 115.877402) (xy 100.543484 115.806124) (xy 100.619216 115.970391) (xy 101.027907 116.104235)
+        (xy 101.456707 116.071491) (xy 101.700784 115.970391) (xy 101.776517 115.806122) (xy 101.16 115.189605) (xy 101.145858 115.203748)
+        (xy 100.966253 115.024143) (xy 100.980395 115.01) (xy 101.339605 115.01) (xy 101.956122 115.626517) (xy 102.120391 115.550784)
+        (xy 102.222856 115.237907) (xy 106.015765 115.237907) (xy 106.048509 115.666707) (xy 106.149609 115.910784) (xy 106.313878 115.986517)
+        (xy 106.930395 115.37) (xy 106.313878 114.753483) (xy 106.149609 114.829216) (xy 106.015765 115.237907) (xy 102.222856 115.237907)
+        (xy 102.254235 115.142093) (xy 102.221491 114.713293) (xy 102.163744 114.573878) (xy 106.493483 114.573878) (xy 107.11 115.190395)
+        (xy 107.726517 114.573878) (xy 107.650784 114.409609) (xy 107.242093 114.275765) (xy 106.813293 114.308509) (xy 106.569216 114.409609)
+        (xy 106.493483 114.573878) (xy 102.163744 114.573878) (xy 102.120391 114.469216) (xy 101.956122 114.393483) (xy 101.339605 115.01)
+        (xy 100.980395 115.01) (xy 100.966253 114.995858) (xy 101.145858 114.816253) (xy 101.16 114.830395) (xy 101.776517 114.213878)
+        (xy 101.700784 114.049609) (xy 101.292093 113.915765) (xy 100.863293 113.948509) (xy 100.619216 114.049609) (xy 100.543484 114.213876)
+        (xy 100.472206 114.142598) (xy 100.456 114.158804) (xy 100.456 110.841196) (xy 100.472206 110.857402) (xy 100.543484 110.786124)
+        (xy 100.619216 110.950391) (xy 101.027907 111.084235) (xy 101.456707 111.051491) (xy 101.700784 110.950391) (xy 101.776517 110.786122)
+        (xy 101.16 110.169605) (xy 101.145858 110.183748) (xy 100.966253 110.004143) (xy 100.980395 109.99) (xy 101.339605 109.99)
+        (xy 101.956122 110.606517) (xy 102.120391 110.530784) (xy 102.154667 110.426122) (xy 106.493483 110.426122) (xy 106.569216 110.590391)
+        (xy 106.977907 110.724235) (xy 107.406707 110.691491) (xy 107.650784 110.590391) (xy 107.726517 110.426122) (xy 107.11 109.809605)
+        (xy 106.493483 110.426122) (xy 102.154667 110.426122) (xy 102.254235 110.122093) (xy 102.221491 109.693293) (xy 102.14056 109.497907)
+        (xy 106.015765 109.497907) (xy 106.048509 109.926707) (xy 106.149609 110.170784) (xy 106.313878 110.246517) (xy 106.930395 109.63)
+        (xy 106.313878 109.013483) (xy 106.149609 109.089216) (xy 106.015765 109.497907) (xy 102.14056 109.497907) (xy 102.120391 109.449216)
+        (xy 101.956122 109.373483) (xy 101.339605 109.99) (xy 100.980395 109.99) (xy 100.966253 109.975858) (xy 101.145858 109.796253)
+        (xy 101.16 109.810395) (xy 101.776517 109.193878) (xy 101.700784 109.029609) (xy 101.292093 108.895765) (xy 100.863293 108.928509)
+        (xy 100.619216 109.029609) (xy 100.543484 109.193876) (xy 100.472206 109.122598) (xy 100.456 109.138804) (xy 100.456 101.861196)
+        (xy 100.472206 101.877402) (xy 100.543484 101.806124) (xy 100.619216 101.970391) (xy 101.027907 102.104235) (xy 101.456707 102.071491)
+        (xy 101.700784 101.970391) (xy 101.776517 101.806122) (xy 101.16 101.189605) (xy 101.145858 101.203748) (xy 100.966253 101.024143)
+        (xy 100.980395 101.01) (xy 100.966253 100.995858) (xy 101.145858 100.816253) (xy 101.16 100.830395) (xy 101.174143 100.816253)
+        (xy 101.353748 100.995858) (xy 101.339605 101.01) (xy 101.956122 101.626517) (xy 102.120391 101.550784) (xy 102.222856 101.237907)
+        (xy 106.015765 101.237907) (xy 106.048509 101.666707) (xy 106.149609 101.910784) (xy 106.313878 101.986517) (xy 106.930395 101.37)
+        (xy 106.313878 100.753483) (xy 106.149609 100.829216) (xy 106.015765 101.237907) (xy 102.222856 101.237907) (xy 102.254235 101.142093)
+        (xy 102.221491 100.713293) (xy 102.120391 100.469216) (xy 102.091725 100.456) (xy 106.547828 100.456)
+      )
+    )
+    (filled_polygon
+      (pts
+        (xy 107.903748 116.685858) (xy 107.889605 116.7) (xy 107.903748 116.714143) (xy 107.775493 116.842397) (xy 107.683209 116.880528)
+        (xy 107.608866 116.700606) (xy 107.555232 116.646878) (xy 107.695858 116.506253) (xy 107.71 116.520395) (xy 107.724143 116.506253)
       )
     )
   )
@@ -1085,14 +1089,18 @@
     )
     (filled_polygon
       (pts
-        (xy 108.281536 107.9) (xy 108.308103 108.04119) (xy 108.391546 108.170865) (xy 108.518866 108.257859) (xy 108.67 108.288464)
-        (xy 109.37 108.288464) (xy 109.51119 108.261897) (xy 109.640865 108.178454) (xy 109.727859 108.051134) (xy 109.758464 107.9)
-        (xy 109.758464 107.631) (xy 110.123 107.631) (xy 110.123 109.623) (xy 108.954759 109.623) (xy 109.012259 109.536945)
-        (xy 109.066 109.26677) (xy 109.066 108.93323) (xy 109.012259 108.663055) (xy 108.859217 108.434013) (xy 108.630175 108.280971)
-        (xy 108.36 108.22723) (xy 108.089825 108.280971) (xy 107.860783 108.434013) (xy 107.707741 108.663055) (xy 107.654 108.93323)
-        (xy 107.654 109.26677) (xy 107.707741 109.536945) (xy 107.765241 109.623) (xy 107.377 109.623) (xy 107.377 108.512251)
-        (xy 107.409394 108.498866) (xy 107.608168 108.300439) (xy 107.715877 108.041048) (xy 107.716122 107.760184) (xy 107.662744 107.631)
-        (xy 108.281536 107.631)
+        (xy 108.281536 107.9) (xy 108.308103 108.04119) (xy 108.391546 108.170865) (xy 108.49876 108.244121) (xy 108.190478 108.243852)
+        (xy 107.875748 108.373895) (xy 107.634742 108.614482) (xy 107.504149 108.928984) (xy 107.503852 109.269522) (xy 107.633895 109.584252)
+        (xy 107.672576 109.623) (xy 107.377 109.623) (xy 107.377 108.512251) (xy 107.409394 108.498866) (xy 107.608168 108.300439)
+        (xy 107.715877 108.041048) (xy 107.716122 107.760184) (xy 107.662744 107.631) (xy 108.281536 107.631)
+      )
+    )
+    (filled_polygon
+      (pts
+        (xy 110.123 109.623) (xy 109.047711 109.623) (xy 109.085258 109.585518) (xy 109.215851 109.271016) (xy 109.216148 108.930478)
+        (xy 109.086105 108.615748) (xy 108.845518 108.374742) (xy 108.607028 108.275712) (xy 108.67 108.288464) (xy 109.37 108.288464)
+        (xy 109.51119 108.261897) (xy 109.640865 108.178454) (xy 109.727859 108.051134) (xy 109.758464 107.9) (xy 109.758464 107.631)
+        (xy 110.123 107.631)
       )
     )
   )

pd-buddy-wye.sch

@@ -50,7 +50,7 @@ U 1 1 59860B95
 P 1500 2200
 F 0 "J1" H 1100 3650 50  0000 L CNN
 F 1 "Power" H 1900 3650 50  0000 R CNN
-F 2 "Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A" H 1650 2200 50  0001 C CNN
+F 2 "Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A_CircularHoles" H 1650 2200 50  0001 C CNN
 F 3 "" H 1650 2200 50  0001 C CNN
 	1    1500 2200
 	1    0    0    -1  
@@ -325,7 +325,7 @@ U 1 1 59860C73
 P 1500 5700
 F 0 "J2" H 1100 7150 50  0000 L CNN
 F 1 "UFP" H 1900 7150 50  0000 R CNN
-F 2 "Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A" H 1650 5700 50  0001 C CNN
+F 2 "Ratfink_Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A_CircularHoles" H 1650 5700 50  0001 C CNN
 F 3 "" H 1650 5700 50  0001 C CNN
 	1    1500 5700
 	1    0    0    -1