diff --git a/.gitmodules b/.gitmodules
index 30e3add..77c4a90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "random-keyboard-parts.pretty"]
 	path = random-keyboard-parts.pretty
 	url = https://github.com/ai03-2725/random-keyboard-parts.pretty
+[submodule "Type-C.pretty"]
+	path = Type-C.pretty
+	url = https://github.com/ai03-2725/Type-C.pretty
diff --git a/Type-C.pretty b/Type-C.pretty
new file mode 160000
index 0000000..fecd1a9
--- /dev/null
+++ b/Type-C.pretty
@@ -0,0 +1 @@
+Subproject commit fecd1a97dee885e7daf32da80dfa47e726d59529
diff --git a/fp-lib-table b/fp-lib-table
index cf4e475..1ec0d63 100644
--- a/fp-lib-table
+++ b/fp-lib-table
@@ -7,4 +7,5 @@
   (lib (name "Random Keyboard Parts")(type "KiCad")(uri "${KIPRJMOD}/random-keyboard-parts.pretty")(options "")(descr ""))
   (lib (name "cftkb")(type "KiCad")(uri "${KIPRJMOD}/MX_Alps_Hybrid.pretty/cftkb.pretty")(options "")(descr ""))
   (lib (name "SnapEDA")(type "KiCad")(uri "/Users/mbagnara/Documents/my-keyboard/10137061-00021LF")(options "")(descr ""))
+  (lib (name "Type-C")(type "KiCad")(uri "${KIPRJMOD}/Type-C.pretty")(options "")(descr ""))
 )
diff --git a/gerbers.zip b/gerbers.zip
new file mode 100644
index 0000000..a731d52
Binary files /dev/null and b/gerbers.zip differ
diff --git a/my-keyboard b/my-keyboard
deleted file mode 100644
index 8851c99..0000000
--- a/my-keyboard
+++ /dev/null
@@ -1,157 +0,0 @@
-Reference, Value, Footprint, Datasheet
-"C1","0.1uF","Capacitor_SMD:C_0805_2012Metric","~"
-"C2","0.1uF","Capacitor_SMD:C_0805_2012Metric","~"
-"C3","0.1uF","Capacitor_SMD:C_0805_2012Metric","~"
-"C4","10uF","Capacitor_SMD:C_0805_2012Metric","~"
-"C5","22pF","Capacitor_SMD:C_0805_2012Metric","~"
-"C6","22pF","Capacitor_SMD:C_0805_2012Metric","~"
-"C7","1uF","Capacitor_SMD:C_0805_2012Metric","~"
-"D1","D_Small","Diode_SMD:D_SOD-123","~"
-"D2","D_Small","Diode_SMD:D_SOD-123","~"
-"D4","D_Small","Diode_SMD:D_SOD-123","~"
-"D5","D_Small","Diode_SMD:D_SOD-123","~"
-"D6","D_Small","Diode_SMD:D_SOD-123","~"
-"D7","D_Small","Diode_SMD:D_SOD-123","~"
-"D8","D_Small","Diode_SMD:D_SOD-123","~"
-"D9","D_Small","Diode_SMD:D_SOD-123","~"
-"D10","D_Small","Diode_SMD:D_SOD-123","~"
-"D11","D_Small","Diode_SMD:D_SOD-123","~"
-"D13","D_Small","Diode_SMD:D_SOD-123","~"
-"D14","D_Small","Diode_SMD:D_SOD-123","~"
-"D15","D_Small","Diode_SMD:D_SOD-123","~"
-"D16","D_Small","Diode_SMD:D_SOD-123","~"
-"D17","D_Small","Diode_SMD:D_SOD-123","~"
-"D19","D_Small","Diode_SMD:D_SOD-123","~"
-"D20","D_Small","Diode_SMD:D_SOD-123","~"
-"D21","D_Small","Diode_SMD:D_SOD-123","~"
-"D22","D_Small","Diode_SMD:D_SOD-123","~"
-"D24","D_Small","Diode_SMD:D_SOD-123","~"
-"D25","D_Small","Diode_SMD:D_SOD-123","~"
-"D26","D_Small","Diode_SMD:D_SOD-123","~"
-"D27","D_Small","Diode_SMD:D_SOD-123","~"
-"D29","D_Small","Diode_SMD:D_SOD-123","~"
-"D30","D_Small","Diode_SMD:D_SOD-123","~"
-"D31","D_Small","Diode_SMD:D_SOD-123","~"
-"D32","D_Small","Diode_SMD:D_SOD-123","~"
-"D34","D_Small","Diode_SMD:D_SOD-123","~"
-"D35","D_Small","Diode_SMD:D_SOD-123","~"
-"D36","D_Small","Diode_SMD:D_SOD-123","~"
-"D37","D_Small","Diode_SMD:D_SOD-123","~"
-"D38","D_Small","Diode_SMD:D_SOD-123","~"
-"D40","D_Small","Diode_SMD:D_SOD-123","~"
-"D41","D_Small","Diode_SMD:D_SOD-123","~"
-"D42","D_Small","Diode_SMD:D_SOD-123","~"
-"D43","D_Small","Diode_SMD:D_SOD-123","~"
-"D45","D_Small","Diode_SMD:D_SOD-123","~"
-"D46","D_Small","Diode_SMD:D_SOD-123","~"
-"D47","D_Small","Diode_SMD:D_SOD-123","~"
-"D48","D_Small","Diode_SMD:D_SOD-123","~"
-"D50","D_Small","Diode_SMD:D_SOD-123","~"
-"D51","D_Small","Diode_SMD:D_SOD-123","~"
-"D52","D_Small","Diode_SMD:D_SOD-123","~"
-"D53","D_Small","Diode_SMD:D_SOD-123","~"
-"D55","D_Small","Diode_SMD:D_SOD-123","~"
-"D56","D_Small","Diode_SMD:D_SOD-123","~"
-"D57","D_Small","Diode_SMD:D_SOD-123","~"
-"D58","D_Small","Diode_SMD:D_SOD-123","~"
-"D59","D_Small","Diode_SMD:D_SOD-123","~"
-"D61","D_Small","Diode_SMD:D_SOD-123","~"
-"D62","D_Small","Diode_SMD:D_SOD-123","~"
-"D63","D_Small","Diode_SMD:D_SOD-123","~"
-"D64","D_Small","Diode_SMD:D_SOD-123","~"
-"D65","D_Small","Diode_SMD:D_SOD-123","~"
-"D67","D_Small","Diode_SMD:D_SOD-123","~"
-"D68","D_Small","Diode_SMD:D_SOD-123","~"
-"D69","D_Small","Diode_SMD:D_SOD-123","~"
-"D70","D_Small","Diode_SMD:D_SOD-123","~"
-"D73","D_Small","Diode_SMD:D_SOD-123","~"
-"D74","D_Small","Diode_SMD:D_SOD-123","~"
-"D76","D_Small","Diode_SMD:D_SOD-123","~"
-"D78","D_Small","Diode_SMD:D_SOD-123","~"
-"D79","D_Small","Diode_SMD:D_SOD-123","~"
-"D80","D_Small","Diode_SMD:D_SOD-123","~"
-"D81","D_Small","Diode_SMD:D_SOD-123","~"
-"D82","D_Small","Diode_SMD:D_SOD-123","~"
-"D85","D_Small","Diode_SMD:D_SOD-123","~"
-"D86","3.6V","Diode_SMD:D_SOD-123","~"
-"D87","3.6V","Diode_SMD:D_SOD-123","~"
-"F1","500mA","cftkb:polyfuse_5.1mm","~"
-"J1","AVR-ISP-6","cftkb:AVR_ICSP_3x2"," ~"
-"MX0-0","Esc","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX0-1","Tab","MX_Alps_Hybrid:MX-1.5U-NoLED",""
-"MX0-2","Caps Lock","MX_Alps_Hybrid:MX-1.75U",""
-"MX0-3","Shift","MX_Alps_Hybrid:MX-2.25U-NoLED",""
-"MX0-4","LCtrl","MX_Alps_Hybrid:MX-1.25U-NoLED",""
-"MX1-0","1","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX1-1","Q","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX1-2","A","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX1-4","LMeta","MX_Alps_Hybrid:MX-1.25U-NoLED",""
-"MX10-0","0","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX10-1","P","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX10-2",";","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX10-3",".","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX10-4","Fn","MX_Alps_Hybrid:MX-1.25U-NoLED",""
-"MX11-0","-","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX11-1","[","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX11-2","'","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX11-3","/","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX11-4","Alt","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX12-0","=","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX12-1","]","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX12-2","return","MX_Alps_Hybrid:MX-2.25U-NoLED",""
-"MX12-3","Shift","MX_Alps_Hybrid:MX-1.75U-NoLED",""
-"MX13-0","Backspace","MX_Alps_Hybrid:MX-2U-NoLED",""
-"MX13-1","\","MX_Alps_Hybrid:MX-1.5U-NoLED",""
-"MX13-4","Left","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX14-3","Up","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX14-4","Down","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX15-0","Tilde","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX15-1","Del","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX15-2","PgUp","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX15-3","PgDn","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX15-4","Right","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX2-0","2","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX2-1","W","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX2-2","S","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX2-3","Z","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX2-4","Alt","MX_Alps_Hybrid:MX-1.25U-NoLED",""
-"MX3-0","3","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX3-1","E","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX3-2","D","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX3-3","X","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX4-0","4","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX4-1","R","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX4-2","F","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX4-3","C","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX5-0","5","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX5-1","T","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX5-2","G","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX5-3","V","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX6-0","6","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX6-1","Y","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX6-2","H","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX6-3","B","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX6-4","Space","MX_Alps_Hybrid:MX-6U-ReversedStabilizers-NoLED",""
-"MX7-0","7","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX7-1","U","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX7-2","J","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX7-3","N","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX8-0","8","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX8-1","I","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX8-2","K","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX8-3","M","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX9-0","9","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX9-1","O","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX9-2","L","MX_Alps_Hybrid:MX-1U-NoLED",""
-"MX9-3",",","MX_Alps_Hybrid:MX-1U-NoLED",""
-"R1","75","Resistor_SMD:R_0805_2012Metric","~"
-"R2","75","Resistor_SMD:R_0805_2012Metric","~"
-"R3","10k","Resistor_SMD:R_0805_2012Metric","~"
-"R4","10k","Resistor_SMD:R_0805_2012Metric","~"
-"R5","5.1k","Resistor_SMD:R_0805_2012Metric","~"
-"R6","5.1k","Resistor_SMD:R_0805_2012Metric","~"
-"R7","1.5k","Resistor_SMD:R_0805_2012Metric","~"
-"SW1","SW_Push","Random Keyboard Parts:SKQG-1155865","~"
-"U1","ATmega32U4-AU","Package_QFP:TQFP-44_10x10mm_P0.8mm","http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf"
-"USB2","USB_C_GCT_USB4085-Type-C","cftkb:USB_C_GCT_USB4085",""
-"Y1","16MHz","Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm","~"
diff --git a/my-keyboard-NPTH.drl b/my-keyboard-NPTH.drl
index 345ff8c..ed6665c 100644
--- a/my-keyboard-NPTH.drl
+++ b/my-keyboard-NPTH.drl
@@ -1,8 +1,8 @@
 M48
-; DRILL file {KiCad (5.99.0-1615-g0042cd509)} date Sunday, May 31, 2020 at 09:12:51 PM
+; DRILL file {KiCad (5.99.0-2887-gdf45a6699)} date Thursday, October 29, 2020 at 03:17:49 PM
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2020-05-31T21:12:51-05:00
-; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.99.0-1615-g0042cd509)
+; #@! TF.CreationDate,2020-10-29T15:17:49-05:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.99.0-2887-gdf45a6699)
 ; #@! TF.FileFunction,NonPlated,1,2,NPTH
 FMAT,2
 INCH
@@ -13,275 +13,224 @@ T3C0.1570
 G90
 G05
 T1
-X3.5812Y-6.6875
-X3.9812Y-6.6875
-X13.6125Y-5.9375
-X14.0125Y-5.9375
-X3.4875Y-5.9375
-X3.8875Y-5.9375
-X13.425Y-5.1875
-X13.825Y-5.1875
-X14.55Y-8.1875
-X14.95Y-8.1875
-X10.7062Y-8.1875
-X11.1062Y-8.1875
-X5.2687Y-8.1875
-X5.6688Y-8.1875
-X4.3312Y-8.1875
-X4.7313Y-8.1875
-X3.3937Y-8.1875
-X3.7937Y-8.1875
-X8.3625Y-8.1875
-X8.7625Y-8.1875
-X12.1125Y-6.6875
-X12.5125Y-6.6875
+X12.675Y-5.9375
+X13.075Y-5.9375
 X11.3625Y-6.6875
 X11.7625Y-6.6875
-X10.05Y-4.4375
-X10.45Y-4.4375
-X9.3Y-4.4375
-X9.7Y-4.4375
-X8.55Y-4.4375
-X8.95Y-4.4375
-X7.8Y-4.4375
-X8.2Y-4.4375
-X13.8Y-8.1875
-X14.2Y-8.1875
-X13.05Y-8.1875
-X13.45Y-8.1875
-X12.7687Y-7.4375
-X13.1687Y-7.4375
-X3.7687Y-7.4375
-X4.1688Y-7.4375
-X13.3312Y-6.6875
-X13.7312Y-6.6875
-X12.3Y-8.1875
-X12.7Y-8.1875
-X11.55Y-8.1875
-X11.95Y-8.1875
-X14.55Y-7.4375
-X14.95Y-7.4375
-X13.8Y-7.4375
-X14.2Y-7.4375
+X9.1125Y-6.6875
+X9.5125Y-6.6875
 X11.7375Y-7.4375
 X12.1375Y-7.4375
-X10.9875Y-7.4375
-X11.3875Y-7.4375
-X10.2375Y-7.4375
-X10.6375Y-7.4375
-X9.4875Y-7.4375
-X9.8875Y-7.4375
-X8.7375Y-7.4375
-X9.1375Y-7.4375
-X7.9875Y-7.4375
-X8.3875Y-7.4375
-X7.2375Y-7.4375
-X7.6375Y-7.4375
-X6.4875Y-7.4375
-X6.8875Y-7.4375
+X14.55Y-5.1875
+X14.95Y-5.1875
+X3.7687Y-7.4375
+X4.1688Y-7.4375
 X5.7375Y-7.4375
 X6.1375Y-7.4375
-X4.9875Y-7.4375
-X5.3875Y-7.4375
-X14.55Y-6.6875
-X14.95Y-6.6875
-X10.6125Y-6.6875
-X11.0125Y-6.6875
-X9.8625Y-6.6875
-X10.2625Y-6.6875
-X9.1125Y-6.6875
-X9.5125Y-6.6875
+X10.05Y-5.1875
+X10.45Y-5.1875
+X13.6125Y-5.9375
+X14.0125Y-5.9375
+X4.8Y-5.1875
+X5.2Y-5.1875
 X8.3625Y-6.6875
 X8.7625Y-6.6875
+X10.2375Y-7.4375
+X10.6375Y-7.4375
+X5.55Y-5.1875
+X5.95Y-5.1875
+X5.175Y-5.9375
+X5.575Y-5.9375
+X7.8Y-5.1875
+X8.2Y-5.1875
+X7.2375Y-7.4375
+X7.6375Y-7.4375
+X11.925Y-5.9375
+X12.325Y-5.9375
+X13.05Y-8.1875
+X13.45Y-8.1875
+X9.675Y-5.9375
+X10.075Y-5.9375
+X5.3625Y-6.6875
+X5.7625Y-6.6875
+X7.425Y-5.9375
+X7.825Y-5.9375
 X6.8625Y-6.6875
 X7.2625Y-6.6875
-X7.6125Y-6.6875
-X8.0125Y-6.6875
+X6.3Y-5.1875
+X6.7Y-5.1875
+X14.55Y-5.9375
+X14.95Y-5.9375
+X7.05Y-5.1875
+X7.45Y-5.1875
+X13.8Y-7.4375
+X14.2Y-7.4375
+X3.5812Y-6.6875
+X3.9812Y-6.6875
+X14.55Y-8.1875
+X14.95Y-8.1875
+X12.1125Y-6.6875
+X12.5125Y-6.6875
+X3.3Y-5.1875
+X3.7Y-5.1875
+X9.3Y-5.1875
+X9.7Y-5.1875
+X8.55Y-5.1875
+X8.95Y-5.1875
+X12.3Y-5.1875
+X12.7Y-5.1875
+X9.8625Y-6.6875
+X10.2625Y-6.6875
+X8.7375Y-7.4375
+X9.1375Y-7.4375
+X12.7687Y-7.4375
+X13.1687Y-7.4375
+X4.05Y-5.1875
+X4.45Y-5.1875
+X3.4875Y-5.9375
+X3.8875Y-5.9375
+X11.8312Y-8.1875
+X12.2312Y-8.1875
+X8.0812Y-8.1875
+X8.4812Y-8.1875
 X6.1125Y-6.6875
 X6.5125Y-6.6875
-X4.6125Y-6.6875
-X5.0125Y-6.6875
-X5.3625Y-6.6875
-X5.7625Y-6.6875
-X14.55Y-5.9387
-X14.95Y-5.9387
-X12.675Y-5.9375
-X13.075Y-5.9375
-X11.925Y-5.9375
-X12.325Y-5.9375
+X7.9875Y-7.4375
+X8.3875Y-7.4375
+X5.925Y-5.9375
+X6.325Y-5.9375
+X8.175Y-5.9375
+X8.575Y-5.9375
 X11.175Y-5.9375
 X11.575Y-5.9375
+X7.6125Y-6.6875
+X8.0125Y-6.6875
+X14.55Y-6.6875
+X14.95Y-6.6875
+X4.9875Y-7.4375
+X5.3875Y-7.4375
 X10.425Y-5.9375
 X10.825Y-5.9375
-X9.675Y-5.9375
-X10.075Y-5.9375
+X9.4875Y-7.4375
+X9.8875Y-7.4375
+X10.8937Y-8.1875
+X11.2937Y-8.1875
+X4.3312Y-8.1875
+X4.7313Y-8.1875
 X8.925Y-5.9375
 X9.325Y-5.9375
-X8.175Y-5.9375
-X8.575Y-5.9375
-X7.425Y-5.9375
-X7.825Y-5.9375
-X6.675Y-5.9375
-X7.075Y-5.9375
-X5.925Y-5.9375
-X6.325Y-5.9375
-X5.175Y-5.9375
-X5.575Y-5.9375
-X4.425Y-5.9375
-X4.825Y-5.9375
-X14.55Y-4.4375
-X14.95Y-4.4375
-X13.8Y-4.4375
-X14.2Y-4.4375
-X13.05Y-4.4375
-X13.45Y-4.4375
-X12.3Y-4.4375
-X12.7Y-4.4375
-X11.55Y-4.4375
-X11.95Y-4.4375
-X10.8Y-4.4375
-X11.2Y-4.4375
-X14.55Y-5.1875
-X14.95Y-5.1875
-X12.3Y-5.1875
-X12.7Y-5.1875
+X13.425Y-5.1875
+X13.825Y-5.1875
+X10.9875Y-7.4375
+X11.3875Y-7.4375
 X11.55Y-5.1875
 X11.95Y-5.1875
+X10.6125Y-6.6875
+X11.0125Y-6.6875
 X10.8Y-5.1875
 X11.2Y-5.1875
-X10.05Y-5.1875
-X10.45Y-5.1875
-X9.3Y-5.1875
-X9.7Y-5.1875
-X8.55Y-5.1875
-X8.95Y-5.1875
-X7.8Y-5.1875
-X8.2Y-5.1875
-X7.05Y-5.1875
-X7.45Y-5.1875
-X6.3Y-5.1875
-X6.7Y-5.1875
-X5.55Y-5.1875
-X5.95Y-5.1875
-X4.8Y-5.1875
-X5.2Y-5.1875
-X7.05Y-4.4375
-X7.45Y-4.4375
-X6.3Y-4.4375
-X6.7Y-4.4375
-X5.55Y-4.4375
-X5.95Y-4.4375
-X4.8Y-4.4375
-X5.2Y-4.4375
-X4.05Y-5.1875
-X4.45Y-5.1875
-X4.05Y-4.4375
-X4.45Y-4.4375
-X3.3Y-5.1875
-X3.7Y-5.1875
-X3.3Y-4.4375
-X3.7Y-4.4375
+X14.55Y-7.4375
+X14.95Y-7.4375
+X6.4875Y-7.4375
+X6.8875Y-7.4375
+X13.3312Y-6.6875
+X13.7312Y-6.6875
+X5.2687Y-8.1875
+X5.6688Y-8.1875
+X13.8Y-8.1875
+X14.2Y-8.1875
+X4.6125Y-6.6875
+X5.0125Y-6.6875
+X6.675Y-5.9375
+X7.075Y-5.9375
+X3.3937Y-8.1875
+X3.7937Y-8.1875
+X4.425Y-5.9375
+X4.825Y-5.9375
 T2
+X6.3127Y-8.4625
+X10.2498Y-8.4625
 X13.155Y-4.9125
 X14.095Y-4.9125
-X6.3125Y-7.9125
-X10.0625Y-7.9125
-X3.4987Y-7.1625
-X4.4387Y-7.1625
 X13.0612Y-6.4125
 X14.0012Y-6.4125
+X3.4987Y-7.1625
+X4.4387Y-7.1625
 T3
-X3.7812Y-6.6875
-X13.8125Y-5.9375
-X3.6875Y-5.9375
-X13.155Y-5.5125
-X13.625Y-5.1875
-X14.095Y-5.5125
-X14.75Y-8.1875
-X10.9062Y-8.1875
-X5.4688Y-8.1875
-X4.5312Y-8.1875
-X3.5938Y-8.1875
-X6.3125Y-8.5125
-X8.5625Y-8.1875
-X10.0625Y-8.5125
-X12.3125Y-6.6875
-X11.5625Y-6.6875
-X10.25Y-4.4375
-X9.5Y-4.4375
-X8.75Y-4.4375
-X8.0Y-4.4375
-X14.0Y-8.1875
-X13.25Y-8.1875
-X12.9688Y-7.4375
+X9.3125Y-6.6875
+X11.9375Y-7.4375
+X14.75Y-5.1875
 X3.4987Y-7.7625
 X3.9688Y-7.4375
 X4.4387Y-7.7625
-X13.0612Y-7.0125
-X13.5312Y-6.6875
-X14.0012Y-7.0125
-X12.5Y-8.1875
-X11.75Y-8.1875
-X14.75Y-7.4375
-X14.0Y-7.4375
-X11.9375Y-7.4375
-X11.1875Y-7.4375
-X10.4375Y-7.4375
-X9.6875Y-7.4375
-X8.9375Y-7.4375
-X8.1875Y-7.4375
-X7.4375Y-7.4375
-X6.6875Y-7.4375
 X5.9375Y-7.4375
-X5.1875Y-7.4375
-X14.75Y-6.6875
-X10.8125Y-6.6875
-X10.0625Y-6.6875
-X9.3125Y-6.6875
+X10.25Y-5.1875
+X13.8125Y-5.9375
+X5.0Y-5.1875
 X8.5625Y-6.6875
+X10.4375Y-7.4375
+X5.75Y-5.1875
+X5.375Y-5.9375
+X8.0Y-5.1875
+X7.4375Y-7.4375
+X12.125Y-5.9375
+X13.25Y-8.1875
+X9.875Y-5.9375
+X5.5625Y-6.6875
+X7.625Y-5.9375
 X7.0625Y-6.6875
-X7.8125Y-6.6875
+X6.5Y-5.1875
+X14.75Y-5.9375
+X7.25Y-5.1875
+X14.0Y-7.4375
+X3.7812Y-6.6875
+X14.75Y-8.1875
+X12.3125Y-6.6875
+X3.5Y-5.1875
+X9.5Y-5.1875
+X8.75Y-5.1875
+X12.5Y-5.1875
+X10.0625Y-6.6875
+X8.9375Y-7.4375
+X12.9688Y-7.4375
+X4.25Y-5.1875
+X3.6875Y-5.9375
+X12.0312Y-8.1875
+X6.3127Y-7.8625
+X8.2812Y-8.1875
+X10.2498Y-7.8625
 X6.3125Y-6.6875
-X4.8125Y-6.6875
-X5.5625Y-6.6875
-X14.75Y-5.9387
-X12.875Y-5.9375
-X12.125Y-5.9375
+X8.1875Y-7.4375
+X6.125Y-5.9375
+X8.375Y-5.9375
 X11.375Y-5.9375
+X7.8125Y-6.6875
+X14.75Y-6.6875
+X5.1875Y-7.4375
 X10.625Y-5.9375
-X9.875Y-5.9375
+X9.6875Y-7.4375
+X11.0938Y-8.1875
+X4.5312Y-8.1875
 X9.125Y-5.9375
-X8.375Y-5.9375
-X7.625Y-5.9375
-X6.875Y-5.9375
-X6.125Y-5.9375
-X5.375Y-5.9375
-X4.625Y-5.9375
-X14.75Y-4.4375
-X14.0Y-4.4375
-X13.25Y-4.4375
-X12.5Y-4.4375
-X11.75Y-4.4375
-X11.0Y-4.4375
-X14.75Y-5.1875
-X12.5Y-5.1875
+X13.155Y-5.5125
+X13.625Y-5.1875
+X14.095Y-5.5125
+X11.1875Y-7.4375
 X11.75Y-5.1875
+X10.8125Y-6.6875
 X11.0Y-5.1875
-X10.25Y-5.1875
-X9.5Y-5.1875
-X8.75Y-5.1875
-X8.0Y-5.1875
-X7.25Y-5.1875
-X6.5Y-5.1875
-X5.75Y-5.1875
-X5.0Y-5.1875
-X7.25Y-4.4375
-X6.5Y-4.4375
-X5.75Y-4.4375
-X5.0Y-4.4375
-X4.25Y-5.1875
-X4.25Y-4.4375
-X3.5Y-5.1875
-X3.5Y-4.4375
+X14.75Y-7.4375
+X6.6875Y-7.4375
+X13.0612Y-7.0125
+X13.5312Y-6.6875
+X14.0012Y-7.0125
+X5.4688Y-8.1875
+X14.0Y-8.1875
+X4.8125Y-6.6875
+X6.875Y-5.9375
+X3.5938Y-8.1875
+X4.625Y-5.9375
+X12.875Y-5.9375
+X11.5625Y-6.6875
 T0
 M30
diff --git a/my-keyboard-PTH.drl b/my-keyboard-PTH.drl
index 30fe6db..962d0dc 100644
--- a/my-keyboard-PTH.drl
+++ b/my-keyboard-PTH.drl
@@ -1,443 +1,798 @@
 M48
-; DRILL file {KiCad (5.99.0-1615-g0042cd509)} date Sunday, May 31, 2020 at 09:12:51 PM
+; DRILL file {KiCad (5.99.0-2887-gdf45a6699)} date Thursday, October 29, 2020 at 03:17:49 PM
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2020-05-31T21:12:51-05:00
-; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.99.0-1615-g0042cd509)
+; #@! TF.CreationDate,2020-10-29T15:17:49-05:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.99.0-2887-gdf45a6699)
 ; #@! TF.FileFunction,Plated,1,2,PTH
 FMAT,2
 INCH
 T1C0.0157
-T2C0.0197
+T2C0.0236
 T3C0.0276
-T4C0.0409
-T5C0.0579
+T4C0.0400
+T5C0.0409
+T6C0.0583
+T7C0.0866
 %
 G90
 G05
 T1
-X2.06Y-4.68
-X2.14Y-4.54
-X2.15Y-5.25
-X2.179Y-5.1861
-X2.21Y-5.1536
-X2.25Y-5.12
-X2.3Y-4.64
-X2.33Y-4.68
-X2.36Y-4.54
-X2.39Y-4.925
-X2.42Y-4.24
-X2.4302Y-4.9252
-X2.4679Y-4.9129
-X2.5Y-6.06
-X2.5Y-6.105
-X2.5Y-6.15
-X2.5003Y-4.9352
-X2.515Y-5.36
-X2.5644Y-4.87
-X2.59Y-4.55
-X2.62Y-5.32
-X2.655Y-4.78
-X2.685Y-5.085
-X2.7305Y-4.8895
-X2.7336Y-4.37
-X2.79Y-5.42
-X2.795Y-4.64
-X2.8197Y-5.3397
-X2.84Y-4.82
-X2.84Y-5.18
-X2.875Y-4.945
-X2.99Y-7.5
-X2.99Y-7.55
-X3.17Y-5.375
-X3.17Y-5.42
-X3.385Y-5.345
-X3.445Y-4.77
-X3.485Y-5.375
-X3.485Y-5.42
-X3.575Y-7.055
-X3.58Y-5.375
-X3.58Y-5.42
-X3.605Y-4.77
-X3.61Y-6.255
-X3.66Y-5.345
-X3.715Y-5.42
-X3.75Y-5.375
-X3.76Y-7.62
-X3.765Y-6.255
-X3.79Y-5.345
-X5.465Y-7.62
-X6.4714Y-6.0614
-X7.195Y-6.105
-X7.91Y-6.15
-X8.6Y-5.42
-X9.35Y-5.345
-X14.29Y-5.375
-T2
-X2.875Y-4.2419
-X2.875Y-4.2812
-X2.9144Y-4.2419
-X2.9144Y-4.2812
-X2.9537Y-4.2419
-X2.9537Y-4.2812
+X10.85Y-4.45
+X10.9Y-4.45
+X10.96Y-4.41
+X11.09Y-4.52
+X11.22Y-4.29
+X11.375Y-4.285
+X11.52Y-4.52
+X13.22Y-4.34
+X13.23Y-4.21
+X13.34Y-4.04
+X13.47Y-4.27
+X13.4978Y-4.2986
+X13.5262Y-4.3272
+X13.5561Y-4.3559
+X13.5832Y-4.3845
+X13.6Y-4.16
+X13.6117Y-4.4131
+X13.6402Y-4.4417
+X13.67Y-4.4704
+X13.7Y-4.5
+X13.73Y-4.53
+X14.0186Y-4.1426
+X14.07Y-4.18
+X14.15Y-4.7
+X14.27Y-4.1195
+X14.28Y-5.29
+X14.29Y-4.7
+X14.31Y-4.15
+X14.31Y-6.04
+X14.34Y-6.79
+X14.37Y-7.54
+X14.3769Y-4.667
+X14.38Y-4.53
+X14.39Y-4.21
+X14.4Y-8.29
+X14.41Y-4.5
+X14.45Y-4.09
+X14.49Y-4.46
+X14.52Y-4.43
+X14.55Y-4.4
+X14.58Y-4.37
+X14.5938Y-4.0625
+X14.61Y-4.34
+X14.64Y-4.31
+X14.6603Y-4.2057
+X14.67Y-4.28
+X14.78Y-4.2175
+X14.7812Y-4.53
+X14.81Y-4.7
+X10.7648Y-4.3048
+X10.7805Y-4.2773
+X10.7963Y-4.3048
+X10.812Y-4.2773
+X10.8278Y-4.3048
+X10.8435Y-4.2773
+X10.8593Y-4.3048
+X10.8907Y-4.3048
+X10.9065Y-4.2769
+X10.9222Y-4.3048
+X10.938Y-4.2773
+X10.9537Y-4.3048
+X10.9695Y-4.2773
+X10.9852Y-4.3048
+T3
+X11.2292Y-4.49
+X11.43Y-4.49
 T4
+X12.4Y-4.2
+X12.4Y-4.3
+X12.5Y-4.2
+X12.5Y-4.3
+X12.6Y-4.2
+X12.6Y-4.3
+T5
 X3.7312Y-6.8875
 X3.8312Y-6.8875
-T5
-X3.6313Y-6.5875
-X3.6828Y-6.53
-X3.8797Y-6.5103
-X3.8813Y-6.4875
-X13.6625Y-5.8375
-X13.7141Y-5.78
-X13.9109Y-5.7603
-X13.9125Y-5.7375
-X3.5375Y-5.8375
-X3.5891Y-5.78
-X3.7859Y-5.7603
-X3.7875Y-5.7375
-X13.475Y-5.0875
-X13.5266Y-5.03
-X13.7234Y-5.0103
-X13.725Y-4.9875
-X14.6Y-8.0875
-X14.6516Y-8.03
-X14.8484Y-8.0103
-X14.85Y-7.9875
-X10.7562Y-8.0875
-X10.8078Y-8.03
-X11.0047Y-8.0103
-X11.0062Y-7.9875
-X5.3187Y-8.0875
-X5.3703Y-8.03
-X5.5672Y-8.0103
-X5.5687Y-7.9875
-X4.3812Y-8.0875
-X4.4328Y-8.03
-X4.6297Y-8.0103
-X4.6312Y-7.9875
-X3.4438Y-8.0875
-X3.4953Y-8.03
-X3.6922Y-8.0103
-X3.6938Y-7.9875
-X8.4125Y-8.0875
-X8.4641Y-8.03
-X8.6609Y-8.0103
-X8.6625Y-7.9875
-X12.1625Y-6.5875
-X12.2141Y-6.53
-X12.4109Y-6.5103
-X12.4125Y-6.4875
-X11.4125Y-6.5875
-X11.4641Y-6.53
-X11.6609Y-6.5103
-X11.6625Y-6.4875
-X10.1Y-4.3375
-X10.1516Y-4.28
-X10.3484Y-4.2603
-X10.35Y-4.2375
-X9.35Y-4.3375
-X9.4016Y-4.28
-X9.5984Y-4.2603
-X9.6Y-4.2375
-X8.6Y-4.3375
-X8.6516Y-4.28
-X8.8484Y-4.2603
-X8.85Y-4.2375
-X7.85Y-4.3375
-X7.9016Y-4.28
-X8.0984Y-4.2603
-X8.1Y-4.2375
-X13.85Y-8.0875
-X13.9016Y-8.03
-X14.0984Y-8.0103
-X14.1Y-7.9875
-X13.1Y-8.0875
-X13.1516Y-8.03
-X13.3484Y-8.0103
-X13.35Y-7.9875
-X12.8187Y-7.3375
-X12.8703Y-7.28
-X13.0672Y-7.2603
-X13.0687Y-7.2375
-X3.8188Y-7.3375
-X3.8703Y-7.28
-X4.0672Y-7.2603
-X4.0687Y-7.2375
-X13.3812Y-6.5875
-X13.4328Y-6.53
-X13.6297Y-6.5103
-X13.6312Y-6.4875
-X12.35Y-8.0875
-X12.4016Y-8.03
-X12.5984Y-8.0103
-X12.6Y-7.9875
-X11.6Y-8.0875
-X11.6516Y-8.03
-X11.8484Y-8.0103
-X11.85Y-7.9875
-X14.6Y-7.3375
-X14.6516Y-7.28
-X14.8484Y-7.2603
-X14.85Y-7.2375
-X13.85Y-7.3375
-X13.9016Y-7.28
-X14.0984Y-7.2603
-X14.1Y-7.2375
-X11.7875Y-7.3375
-X11.8391Y-7.28
-X12.0359Y-7.2603
-X12.0375Y-7.2375
-X11.0375Y-7.3375
-X11.0891Y-7.28
-X11.2859Y-7.2603
-X11.2875Y-7.2375
-X10.2875Y-7.3375
-X10.3391Y-7.28
-X10.5359Y-7.2603
-X10.5375Y-7.2375
-X9.5375Y-7.3375
-X9.5891Y-7.28
-X9.7859Y-7.2603
-X9.7875Y-7.2375
-X8.7875Y-7.3375
-X8.8391Y-7.28
-X9.0359Y-7.2603
-X9.0375Y-7.2375
-X8.0375Y-7.3375
-X8.0891Y-7.28
-X8.2859Y-7.2603
-X8.2875Y-7.2375
-X7.2875Y-7.3375
-X7.3391Y-7.28
-X7.5359Y-7.2603
-X7.5375Y-7.2375
-X6.5375Y-7.3375
-X6.5891Y-7.28
-X6.7859Y-7.2603
-X6.7875Y-7.2375
-X5.7875Y-7.3375
-X5.8391Y-7.28
-X6.0359Y-7.2603
-X6.0375Y-7.2375
-X5.0375Y-7.3375
-X5.0891Y-7.28
-X5.2859Y-7.2603
-X5.2875Y-7.2375
-X14.6Y-6.5875
-X14.6516Y-6.53
-X14.8484Y-6.5103
-X14.85Y-6.4875
-X10.6625Y-6.5875
-X10.7141Y-6.53
-X10.9109Y-6.5103
-X10.9125Y-6.4875
-X9.9125Y-6.5875
-X9.9641Y-6.53
-X10.1609Y-6.5103
-X10.1625Y-6.4875
-X9.1625Y-6.5875
-X9.2141Y-6.53
-X9.4109Y-6.5103
-X9.4125Y-6.4875
-X8.4125Y-6.5875
-X8.4641Y-6.53
-X8.6609Y-6.5103
-X8.6625Y-6.4875
-X6.9125Y-6.5875
-X6.9641Y-6.53
-X7.1609Y-6.5103
-X7.1625Y-6.4875
-X7.6625Y-6.5875
-X7.7141Y-6.53
-X7.9109Y-6.5103
-X7.9125Y-6.4875
-X6.1625Y-6.5875
-X6.2141Y-6.53
-X6.4109Y-6.5103
-X6.4125Y-6.4875
-X4.6625Y-6.5875
-X4.7141Y-6.53
-X4.9109Y-6.5103
-X4.9125Y-6.4875
-X5.4125Y-6.5875
-X5.4641Y-6.53
-X5.6609Y-6.5103
-X5.6625Y-6.4875
-X14.6Y-5.8387
-X14.6516Y-5.7812
-X14.8484Y-5.7616
-X14.85Y-5.7387
-X12.725Y-5.8375
-X12.7766Y-5.78
-X12.9734Y-5.7603
-X12.975Y-5.7375
-X11.975Y-5.8375
-X12.0266Y-5.78
-X12.2234Y-5.7603
-X12.225Y-5.7375
-X11.225Y-5.8375
-X11.2766Y-5.78
-X11.4734Y-5.7603
-X11.475Y-5.7375
-X10.475Y-5.8375
-X10.5266Y-5.78
-X10.7234Y-5.7603
-X10.725Y-5.7375
-X9.725Y-5.8375
-X9.7766Y-5.78
-X9.9734Y-5.7603
-X9.975Y-5.7375
-X8.975Y-5.8375
-X9.0266Y-5.78
-X9.2234Y-5.7603
-X9.225Y-5.7375
-X8.225Y-5.8375
-X8.2766Y-5.78
-X8.4734Y-5.7603
-X8.475Y-5.7375
-X7.475Y-5.8375
-X7.5266Y-5.78
-X7.7234Y-5.7603
-X7.725Y-5.7375
-X6.725Y-5.8375
-X6.7766Y-5.78
-X6.9734Y-5.7603
-X6.975Y-5.7375
-X5.975Y-5.8375
-X6.0266Y-5.78
-X6.2234Y-5.7603
-X6.225Y-5.7375
-X5.225Y-5.8375
-X5.2766Y-5.78
-X5.4734Y-5.7603
-X5.475Y-5.7375
-X4.475Y-5.8375
-X4.5266Y-5.78
-X4.7234Y-5.7603
-X4.725Y-5.7375
-X14.6Y-4.3375
-X14.6516Y-4.28
-X14.8484Y-4.2603
-X14.85Y-4.2375
-X13.85Y-4.3375
-X13.9016Y-4.28
-X14.0984Y-4.2603
-X14.1Y-4.2375
-X13.1Y-4.3375
-X13.1516Y-4.28
-X13.3484Y-4.2603
-X13.35Y-4.2375
-X12.35Y-4.3375
-X12.4016Y-4.28
-X12.5984Y-4.2603
-X12.6Y-4.2375
-X11.6Y-4.3375
-X11.6516Y-4.28
-X11.8484Y-4.2603
-X11.85Y-4.2375
-X10.85Y-4.3375
-X10.9016Y-4.28
-X11.0984Y-4.2603
-X11.1Y-4.2375
-X14.6Y-5.0875
-X14.6516Y-5.03
-X14.8484Y-5.0103
-X14.85Y-4.9875
-X12.35Y-5.0875
-X12.4016Y-5.03
-X12.5984Y-5.0103
-X12.6Y-4.9875
-X11.6Y-5.0875
-X11.6516Y-5.03
-X11.8484Y-5.0103
-X11.85Y-4.9875
-X10.85Y-5.0875
-X10.9016Y-5.03
-X11.0984Y-5.0103
-X11.1Y-4.9875
-X10.1Y-5.0875
-X10.1516Y-5.03
-X10.3484Y-5.0103
-X10.35Y-4.9875
-X9.35Y-5.0875
-X9.4016Y-5.03
-X9.5984Y-5.0103
-X9.6Y-4.9875
-X8.6Y-5.0875
-X8.6516Y-5.03
-X8.8484Y-5.0103
-X8.85Y-4.9875
-X7.85Y-5.0875
-X7.9016Y-5.03
-X8.0984Y-5.0103
-X8.1Y-4.9875
-X7.1Y-5.0875
-X7.1516Y-5.03
-X7.3484Y-5.0103
-X7.35Y-4.9875
-X6.35Y-5.0875
-X6.4016Y-5.03
-X6.5984Y-5.0103
-X6.6Y-4.9875
-X5.6Y-5.0875
-X5.6516Y-5.03
-X5.8484Y-5.0103
-X5.85Y-4.9875
-X4.85Y-5.0875
-X4.9016Y-5.03
-X5.0984Y-5.0103
-X5.1Y-4.9875
-X7.1Y-4.3375
-X7.1516Y-4.28
-X7.3484Y-4.2603
-X7.35Y-4.2375
-X6.35Y-4.3375
-X6.4016Y-4.28
-X6.5984Y-4.2603
-X6.6Y-4.2375
-X5.6Y-4.3375
-X5.6516Y-4.28
-X5.8484Y-4.2603
-X5.85Y-4.2375
-X4.85Y-4.3375
-X4.9016Y-4.28
-X5.0984Y-4.2603
-X5.1Y-4.2375
-X4.1Y-5.0875
-X4.1516Y-5.03
-X4.3484Y-5.0103
-X4.35Y-4.9875
-X4.1Y-4.3375
-X4.1516Y-4.28
-X4.3484Y-4.2603
-X4.35Y-4.2375
-X3.35Y-5.0875
-X3.4016Y-5.03
-X3.5984Y-5.0103
-X3.6Y-4.9875
-X3.35Y-4.3375
-X3.4016Y-4.28
-X3.5984Y-4.2603
-X3.6Y-4.2375
-T3
-G00X2.0575Y-4.1639
+T7
+X14.9688Y-4.6562
+X9.125Y-4.6562
+X9.125Y-4.1562
+X14.9688Y-4.1562
+X13.5Y-7.7812
+X9.0938Y-8.0312
+X3.2812Y-4.6562
+X4.9375Y-7.875
+X3.2812Y-4.1562
+T2
+G00X10.7069Y-4.0851
+M15
+G01X10.7069Y-4.0615
+M16
+G05
+G00X10.7069Y-4.2714
+M15
+G01X10.7069Y-4.2477
+M16
+G05
+G00X11.0431Y-4.0851
+M15
+G01X11.0431Y-4.0615
+M16
+G05
+G00X11.0431Y-4.2714
+M15
+G01X11.0431Y-4.2477
+M16
+G05
+T6
+G00X5.9749Y-5.8369
+M15
+G01X6.0263Y-5.7798
+M16
+G05
+G00X6.2234Y-5.7601
+M15
+G01X6.225Y-5.7377
+M16
+G05
+G00X8.2249Y-5.8369
+M15
+G01X8.2763Y-5.7798
+M16
+G05
+G00X8.4734Y-5.7601
+M15
+G01X8.475Y-5.7377
+M16
+G05
+G00X11.2249Y-5.8369
+M15
+G01X11.2763Y-5.7798
+M16
+G05
+G00X11.4734Y-5.7601
+M15
+G01X11.475Y-5.7377
+M16
+G05
+G00X7.6624Y-6.5869
+M15
+G01X7.7138Y-6.5298
+M16
+G05
+G00X7.9109Y-6.5101
+M15
+G01X7.9125Y-6.4877
+M16
+G05
+G00X14.5999Y-6.5869
+M15
+G01X14.6513Y-6.5298
+M16
+G05
+G00X14.8484Y-6.5101
+M15
+G01X14.85Y-6.4877
+M16
+G05
+G00X5.0374Y-7.3369
+M15
+G01X5.0888Y-7.2798
+M16
+G05
+G00X5.2859Y-7.2601
+M15
+G01X5.2875Y-7.2377
+M16
+G05
+G00X10.4749Y-5.8369
+M15
+G01X10.5263Y-5.7798
+M16
+G05
+G00X10.7234Y-5.7601
+M15
+G01X10.725Y-5.7377
+M16
+G05
+G00X9.5374Y-7.3369
+M15
+G01X9.5888Y-7.2798
+M16
+G05
+G00X9.7859Y-7.2601
+M15
+G01X9.7875Y-7.2377
+M16
+G05
+G00X10.9437Y-8.0869
+M15
+G01X10.995Y-8.0298
+M16
+G05
+G00X11.1922Y-8.0101
+M15
+G01X11.1937Y-7.9877
+M16
+G05
+G00X4.3812Y-8.0869
+M15
+G01X4.4325Y-8.0298
+M16
+G05
+G00X4.6297Y-8.0101
+M15
+G01X4.6312Y-7.9877
+M16
+G05
+G00X8.9749Y-5.8369
+M15
+G01X9.0263Y-5.7798
+M16
+G05
+G00X9.2234Y-5.7601
+M15
+G01X9.225Y-5.7377
+M16
+G05
+G00X13.4749Y-5.0869
+M15
+G01X13.5263Y-5.0298
+M16
+G05
+G00X13.7234Y-5.0101
+M15
+G01X13.725Y-4.9877
+M16
+G05
+G00X11.0374Y-7.3369
+M15
+G01X11.0888Y-7.2798
+M16
+G05
+G00X11.2859Y-7.2601
+M15
+G01X11.2875Y-7.2377
+M16
+G05
+G00X11.5999Y-5.0869
+M15
+G01X11.6513Y-5.0298
+M16
+G05
+G00X11.8484Y-5.0101
+M15
+G01X11.85Y-4.9877
+M16
+G05
+G00X10.6624Y-6.5869
+M15
+G01X10.7138Y-6.5298
+M16
+G05
+G00X10.9109Y-6.5101
+M15
+G01X10.9125Y-6.4877
+M16
+G05
+G00X10.8499Y-5.0869
+M15
+G01X10.9013Y-5.0298
+M16
+G05
+G00X11.0984Y-5.0101
+M15
+G01X11.1Y-4.9877
+M16
+G05
+G00X14.5999Y-7.3369
+M15
+G01X14.6513Y-7.2798
+M16
+G05
+G00X14.8484Y-7.2601
+M15
+G01X14.85Y-7.2377
+M16
+G05
+G00X6.5374Y-7.3369
+M15
+G01X6.5888Y-7.2798
+M16
+G05
+G00X6.7859Y-7.2601
+M15
+G01X6.7875Y-7.2377
+M16
+G05
+G00X13.3812Y-6.5869
+M15
+G01X13.4325Y-6.5298
+M16
+G05
+G00X13.6297Y-6.5101
+M15
+G01X13.6312Y-6.4877
+M16
+G05
+G00X5.3187Y-8.0869
+M15
+G01X5.37Y-8.0298
+M16
+G05
+G00X5.5672Y-8.0101
+M15
+G01X5.5687Y-7.9877
+M16
+G05
+G00X13.8499Y-8.0869
+M15
+G01X13.9013Y-8.0298
+M16
+G05
+G00X14.0984Y-8.0101
+M15
+G01X14.1Y-7.9877
+M16
+G05
+G00X4.6624Y-6.5869
+M15
+G01X4.7138Y-6.5298
+M16
+G05
+G00X4.9109Y-6.5101
+M15
+G01X4.9125Y-6.4877
+M16
+G05
+G00X6.7249Y-5.8369
+M15
+G01X6.7763Y-5.7798
+M16
+G05
+G00X6.9734Y-5.7601
+M15
+G01X6.975Y-5.7377
+M16
+G05
+G00X3.4437Y-8.0869
+M15
+G01X3.495Y-8.0298
+M16
+G05
+G00X3.6922Y-8.0101
+M15
+G01X3.6937Y-7.9877
+M16
+G05
+G00X4.4749Y-5.8369
+M15
+G01X4.5263Y-5.7798
+M16
+G05
+G00X4.7234Y-5.7601
+M15
+G01X4.725Y-5.7377
+M16
+G05
+G00X12.7249Y-5.8369
+M15
+G01X12.7763Y-5.7798
+M16
+G05
+G00X12.9734Y-5.7601
+M15
+G01X12.975Y-5.7377
+M16
+G05
+G00X11.4124Y-6.5869
+M15
+G01X11.4638Y-6.5298
+M16
+G05
+G00X11.6609Y-6.5101
+M15
+G01X11.6625Y-6.4877
+M16
+G05
+G00X9.1624Y-6.5869
+M15
+G01X9.2138Y-6.5298
+M16
+G05
+G00X9.4109Y-6.5101
+M15
+G01X9.4125Y-6.4877
+M16
+G05
+G00X11.7874Y-7.3369
+M15
+G01X11.8388Y-7.2798
+M16
+G05
+G00X12.0359Y-7.2601
+M15
+G01X12.0375Y-7.2377
+M16
+G05
+G00X14.5999Y-5.0869
+M15
+G01X14.6513Y-5.0298
+M16
+G05
+G00X14.8484Y-5.0101
+M15
+G01X14.85Y-4.9877
+M16
+G05
+G00X3.8187Y-7.3369
+M15
+G01X3.87Y-7.2798
+M16
+G05
+G00X4.0672Y-7.2601
+M15
+G01X4.0687Y-7.2377
+M16
+G05
+G00X5.7874Y-7.3369
+M15
+G01X5.8388Y-7.2798
+M16
+G05
+G00X6.0359Y-7.2601
+M15
+G01X6.0375Y-7.2377
+M16
+G05
+G00X10.0999Y-5.0869
+M15
+G01X10.1513Y-5.0298
+M16
+G05
+G00X10.3484Y-5.0101
+M15
+G01X10.35Y-4.9877
+M16
+G05
+G00X13.6624Y-5.8369
+M15
+G01X13.7138Y-5.7798
+M16
+G05
+G00X13.9109Y-5.7601
+M15
+G01X13.9125Y-5.7377
+M16
+G05
+G00X4.8499Y-5.0869
+M15
+G01X4.9013Y-5.0298
+M16
+G05
+G00X5.0984Y-5.0101
+M15
+G01X5.1Y-4.9877
+M16
+G05
+G00X8.4124Y-6.5869
+M15
+G01X8.4638Y-6.5298
+M16
+G05
+G00X8.6609Y-6.5101
+M15
+G01X8.6625Y-6.4877
+M16
+G05
+G00X10.2874Y-7.3369
+M15
+G01X10.3388Y-7.2798
+M16
+G05
+G00X10.5359Y-7.2601
+M15
+G01X10.5375Y-7.2377
+M16
+G05
+G00X5.5999Y-5.0869
+M15
+G01X5.6513Y-5.0298
+M16
+G05
+G00X5.8484Y-5.0101
+M15
+G01X5.85Y-4.9877
+M16
+G05
+G00X5.2249Y-5.8369
+M15
+G01X5.2763Y-5.7798
+M16
+G05
+G00X5.4734Y-5.7601
+M15
+G01X5.475Y-5.7377
+M16
+G05
+G00X7.8499Y-5.0869
+M15
+G01X7.9013Y-5.0298
+M16
+G05
+G00X8.0984Y-5.0101
+M15
+G01X8.1Y-4.9877
+M16
+G05
+G00X7.2874Y-7.3369
+M15
+G01X7.3388Y-7.2798
+M16
+G05
+G00X7.5359Y-7.2601
+M15
+G01X7.5375Y-7.2377
+M16
+G05
+G00X11.9749Y-5.8369
+M15
+G01X12.0263Y-5.7798
+M16
+G05
+G00X12.2234Y-5.7601
+M15
+G01X12.225Y-5.7377
+M16
+G05
+G00X13.0999Y-8.0869
+M15
+G01X13.1513Y-8.0298
+M16
+G05
+G00X13.3484Y-8.0101
+M15
+G01X13.35Y-7.9877
+M16
+G05
+G00X9.7249Y-5.8369
+M15
+G01X9.7763Y-5.7798
+M16
+G05
+G00X9.9734Y-5.7601
+M15
+G01X9.975Y-5.7377
+M16
+G05
+G00X5.4124Y-6.5869
+M15
+G01X5.4638Y-6.5298
+M16
+G05
+G00X5.6609Y-6.5101
+M15
+G01X5.6625Y-6.4877
+M16
+G05
+G00X7.4749Y-5.8369
+M15
+G01X7.5263Y-5.7798
+M16
+G05
+G00X7.7234Y-5.7601
+M15
+G01X7.725Y-5.7377
+M16
+G05
+G00X6.9124Y-6.5869
+M15
+G01X6.9638Y-6.5298
+M16
+G05
+G00X7.1609Y-6.5101
+M15
+G01X7.1625Y-6.4877
+M16
+G05
+G00X6.3499Y-5.0869
+M15
+G01X6.4013Y-5.0298
+M16
+G05
+G00X6.5984Y-5.0101
+M15
+G01X6.6Y-4.9877
+M16
+G05
+G00X14.5999Y-5.8369
+M15
+G01X14.6513Y-5.7798
+M16
+G05
+G00X14.8484Y-5.7601
+M15
+G01X14.85Y-5.7377
+M16
+G05
+G00X7.0999Y-5.0869
+M15
+G01X7.1513Y-5.0298
+M16
+G05
+G00X7.3484Y-5.0101
+M15
+G01X7.35Y-4.9877
+M16
+G05
+G00X13.8499Y-7.3369
+M15
+G01X13.9013Y-7.2798
+M16
+G05
+G00X14.0984Y-7.2601
+M15
+G01X14.1Y-7.2377
+M16
+G05
+G00X3.6312Y-6.5869
+M15
+G01X3.6825Y-6.5298
+M16
+G05
+G00X3.8797Y-6.5101
+M15
+G01X3.8812Y-6.4877
+M16
+G05
+G00X14.5999Y-8.0869
+M15
+G01X14.6513Y-8.0298
+M16
+G05
+G00X14.8484Y-8.0101
+M15
+G01X14.85Y-7.9877
+M16
+G05
+G00X12.1624Y-6.5869
+M15
+G01X12.2138Y-6.5298
+M16
+G05
+G00X12.4109Y-6.5101
+M15
+G01X12.4125Y-6.4877
+M16
+G05
+G00X3.3499Y-5.0869
+M15
+G01X3.4013Y-5.0298
+M16
+G05
+G00X3.5984Y-5.0101
+M15
+G01X3.6Y-4.9877
+M16
+G05
+G00X9.3499Y-5.0869
+M15
+G01X9.4013Y-5.0298
+M16
+G05
+G00X9.5984Y-5.0101
+M15
+G01X9.6Y-4.9877
+M16
+G05
+G00X8.5999Y-5.0869
+M15
+G01X8.6513Y-5.0298
+M16
+G05
+G00X8.8484Y-5.0101
+M15
+G01X8.85Y-4.9877
+M16
+G05
+G00X12.3499Y-5.0869
+M15
+G01X12.4013Y-5.0298
+M16
+G05
+G00X12.5984Y-5.0101
+M15
+G01X12.6Y-4.9877
+M16
+G05
+G00X9.9124Y-6.5869
+M15
+G01X9.9638Y-6.5298
+M16
+G05
+G00X10.1609Y-6.5101
+M15
+G01X10.1625Y-6.4877
+M16
+G05
+G00X8.7874Y-7.3369
+M15
+G01X8.8388Y-7.2798
+M16
+G05
+G00X9.0359Y-7.2601
+M15
+G01X9.0375Y-7.2377
+M16
+G05
+G00X12.8187Y-7.3369
+M15
+G01X12.87Y-7.2798
+M16
+G05
+G00X13.0672Y-7.2601
+M15
+G01X13.0687Y-7.2377
+M16
+G05
+G00X4.0999Y-5.0869
+M15
+G01X4.1513Y-5.0298
+M16
+G05
+G00X4.3484Y-5.0101
+M15
+G01X4.35Y-4.9877
+M16
+G05
+G00X3.5374Y-5.8369
+M15
+G01X3.5888Y-5.7798
+M16
+G05
+G00X3.7859Y-5.7601
+M15
+G01X3.7875Y-5.7377
+M16
+G05
+G00X11.8812Y-8.0869
+M15
+G01X11.9325Y-8.0298
+M16
+G05
+G00X12.1297Y-8.0101
+M15
+G01X12.1312Y-7.9877
+M16
+G05
+G00X8.1312Y-8.0869
+M15
+G01X8.1825Y-8.0298
+M16
+G05
+G00X8.3797Y-8.0101
+M15
+G01X8.3812Y-7.9877
+M16
+G05
+G00X6.1624Y-6.5869
 M15
-G01X2.0575Y-4.2111
+G01X6.2138Y-6.5298
 M16
 G05
-G00X2.0575Y-4.341
+G00X6.4109Y-6.5101
 M15
-G01X2.0575Y-4.3883
+G01X6.4125Y-6.4877
 M16
 G05
-G00X2.345Y-4.1639
+G00X8.0374Y-7.3369
 M15
-G01X2.345Y-4.2111
+G01X8.0888Y-7.2798
 M16
 G05
-G00X2.345Y-4.341
+G00X8.2859Y-7.2601
 M15
-G01X2.345Y-4.3883
+G01X8.2875Y-7.2377
 M16
 G05
 T0
diff --git a/my-keyboard.kicad_pcb b/my-keyboard.kicad_pcb
index d11c639..acfa5ce 100644
--- a/my-keyboard.kicad_pcb
+++ b/my-keyboard.kicad_pcb
@@ -182,16 +182,16 @@
   (net 104 "Net-(U1-Pad29)")
   (net 105 "Net-(R5-Pad1)")
   (net 106 "VCC")
-  (net 107 "Net-(USB1-PadA8)")
-  (net 108 "Net-(USB1-PadB8)")
-  (net 109 "Net-(USB1-PadA2)")
-  (net 110 "Net-(USB1-PadA3)")
-  (net 111 "Net-(USB1-PadA10)")
-  (net 112 "Net-(USB1-PadA11)")
-  (net 113 "Net-(USB1-PadB2)")
-  (net 114 "Net-(USB1-PadB3)")
-  (net 115 "Net-(USB1-PadB10)")
-  (net 116 "Net-(USB1-PadB11)")
+  (net 107 "Net-(USB1-Pad23)")
+  (net 108 "Net-(USB1-Pad22)")
+  (net 109 "Net-(USB1-Pad20)")
+  (net 110 "Net-(USB1-Pad15)")
+  (net 111 "Net-(USB1-Pad14)")
+  (net 112 "Net-(USB1-Pad11)")
+  (net 113 "Net-(USB1-Pad10)")
+  (net 114 "Net-(USB1-Pad8)")
+  (net 115 "Net-(USB1-Pad3)")
+  (net 116 "Net-(USB1-Pad2)")
   (net 117 "Net-(R6-Pad2)")
 
   (module "MX_Alps_Hybrid:MX-1U-NoLED" (layer "F.Cu") (tedit 5EC557DE) (tstamp 00000000-0000-0000-0000-00005e82c359)
@@ -3106,7 +3106,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 51a70295-c00e-4627-8ce2-6c0d38d32ee0)
     )
-    (fp_text value "75" (at 0 -1.651) (layer "F.Fab")
+    (fp_text value "22" (at 0 -1.651) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ba124f25-f549-4c43-8cbf-84b97df00316)
     )
@@ -3403,7 +3403,7 @@
     )
   )
 
-  (module "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm" (layer "F.Cu") (tedit 5A0FD1B2) (tstamp 00000000-0000-0000-0000-00005eadf9db)
+  (module "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm" (layer "F.Cu") (tedit 5F7F5953) (tstamp 00000000-0000-0000-0000-00005eadf9db)
     (at 351.493 107.784)
     (descr "SMD Crystal SERIES SMD3225/4 http://www.txccrystal.com/images/pdf/7m-accuracy.pdf, 3.2x2.5mm^2 package")
     (tags "SMD SMT crystal")
@@ -3438,7 +3438,7 @@
     (pad "1" smd rect (at -1.1 0.85) (size 1.4 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 3 "Net-(C5-Pad2)") (pinfunction "1") (tstamp e495cbb7-d141-4a1d-a83c-c7c919b44770))
     (pad "2" smd rect (at 1.1 0.85) (size 1.4 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1 "GND") (pinfunction "2") (tstamp 5bc3a6bc-97c4-4a09-a203-2b12da9f6c82))
+      (net 1 "GND") (pinfunction "2") (zone_connect 0) (tstamp 5bc3a6bc-97c4-4a09-a203-2b12da9f6c82))
     (pad "3" smd rect (at 1.1 -0.85) (size 1.4 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 4 "Net-(C6-Pad2)") (pinfunction "3") (tstamp f99c00b6-40f1-4694-a99d-0f6c45520823))
     (pad "4" smd rect (at -1.1 -0.85) (size 1.4 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -3463,7 +3463,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 4e74ddc4-7a9c-4ae8-ac52-80730f21e07b)
     )
-    (fp_text value "1uF" (at 0 1.65) (layer "F.Fab")
+    (fp_text value "1u" (at 0 1.65) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp b984c71f-3a14-494a-887b-c6e432e07e32)
     )
@@ -3505,7 +3505,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 26d49b52-9a9a-4e67-94f2-1c79cf3e840d)
     )
-    (fp_text value "22pF" (at 0 1.65 90) (layer "F.Fab")
+    (fp_text value "22p" (at 0 1.65 90) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 2329fa44-5a5c-4c17-8c02-e03254485125)
     )
@@ -3535,7 +3535,7 @@
   )
 
   (module "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005eadfaa1)
-    (at 377.96875 114.3)
+    (at 372.618 103.378)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
     (property "SKU" "CGA4J1X7S1E106K125AC")
@@ -3543,11 +3543,11 @@
     (property "Sheet name" "")
     (path "/00000000-0000-0000-0000-00005e81ff90")
     (attr smd)
-    (fp_text reference "C4" (at 0 -1.65) (layer "F.SilkS")
+    (fp_text reference "C4" (at 2.794 -0.508) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 6bdbb39c-3526-4815-b876-a710268a2f4b)
     )
-    (fp_text value "10uF" (at 0 1.65) (layer "F.Fab")
+    (fp_text value "10u" (at 0 1.65) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 45949feb-2274-4c4f-9a41-b3c0f3cc93ed)
     )
@@ -3566,9 +3566,9 @@
     (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp 6c3285ad-6051-412c-b3d3-e96557199caa))
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp d4b71761-72ec-4679-b526-35763c2fbd8d))
     (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 2 "+5V") (tstamp 049fca66-17ea-4c4f-93a0-ebf932deadc5))
+      (net 2 "+5V") (tstamp f4e7774e-3e2e-4cdb-b6bf-c3bc4d6ec3ee))
     (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1 "GND") (tstamp 380d8b7b-9f1a-4c29-b8ae-1b8444593e7c))
+      (net 1 "GND") (tstamp af184ab3-9958-4551-bc47-7bce6a5d6c83))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3576,7 +3576,7 @@
     )
   )
 
-  (module "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005eadfad1)
+  (module "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tedit 5F7F59DB) (tstamp 00000000-0000-0000-0000-00005eadfad1)
     (at 359.4585 108.712 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
@@ -3589,7 +3589,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 04291a4a-3445-400a-b2b0-f0db1de222b4)
     )
-    (fp_text value "0.1uF" (at 0 1.65) (layer "F.Fab")
+    (fp_text value "0.1u" (at 0 1.65) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cc455d43-8ffb-4b53-b141-3776d7f33069)
     )
@@ -3610,7 +3610,7 @@
     (pad "1" smd roundrect (at -0.9375 0 180) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "+5V") (tstamp b17a9f25-a80c-4f75-a679-2357867f2b94))
     (pad "2" smd roundrect (at 0.9375 0 180) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1 "GND") (tstamp 7cf4c6d6-2fa4-4dd4-bbb5-7dcbb131cf94))
+      (net 1 "GND") (zone_connect 0) (tstamp 7cf4c6d6-2fa4-4dd4-bbb5-7dcbb131cf94))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3619,7 +3619,7 @@
   )
 
   (module "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005eadfb01)
-    (at 372.4425 103.378)
+    (at 377.952 114.3)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
     (property "SKU" "CC0805JPX7R8BB104")
@@ -3627,11 +3627,11 @@
     (property "Sheet name" "")
     (path "/00000000-0000-0000-0000-00005e81f270")
     (attr smd)
-    (fp_text reference "C2" (at 2.7155 0) (layer "F.SilkS")
+    (fp_text reference "C2" (at 0 -1.524) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 5d4d7e78-679a-4353-b146-7b76168b2923)
     )
-    (fp_text value "0.1uF" (at 0 1.65) (layer "F.Fab")
+    (fp_text value "0.1u" (at 0 1.65) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 91465a00-1f52-4ffa-9cf2-65d6f76dcf07)
     )
@@ -3650,9 +3650,9 @@
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp f6b57e60-900a-487f-aa3d-cdf74aa26bda))
     (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp f8deec64-cd59-425d-855d-d7de04494ac6))
     (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 2 "+5V") (tstamp 0ba214e3-ed54-41a8-9839-75a6c9871b96))
+      (net 2 "+5V") (tstamp 40b27308-d3ca-4bce-ad06-6e1ddbc81052))
     (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1 "GND") (tstamp d915c8ca-4ca9-4867-9ba7-b0952a4813d2))
+      (net 1 "GND") (tstamp add72de0-866c-4693-ad44-549f5d609350))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3715,11 +3715,11 @@
     (property "Sheet name" "")
     (path "/00000000-0000-0000-0000-00005e81f80b")
     (attr smd)
-    (fp_text reference "C3" (at 0 -1.65 90) (layer "F.SilkS")
+    (fp_text reference "C3" (at -2.7155 0.508 90) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ca93b2a6-5ce6-4274-95d6-b3ef9c47e4fa)
     )
-    (fp_text value "0.1uF" (at 0 1.65 90) (layer "F.Fab")
+    (fp_text value "0.1u" (at 0 1.65 90) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 96901ebf-95bc-4017-8288-a12785d911bc)
     )
@@ -3761,7 +3761,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 51435a32-b181-4e08-a62c-9914daf09455)
     )
-    (fp_text value "75" (at 0 1.65) (layer "F.Fab")
+    (fp_text value "22" (at 0 1.65) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 6cb7b879-1465-4364-847a-9794dfcb1060)
     )
@@ -3803,7 +3803,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp dc84bc50-5c31-4301-a81a-ee5c68d9a55e)
     )
-    (fp_text value "22pF" (at 0 1.65 90) (layer "F.Fab")
+    (fp_text value "22p" (at 0 1.65 90) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp e8970438-3fdf-4acb-bd91-e8843379e561)
     )
@@ -4973,112 +4973,6 @@
       (xy 1.065943 3.92192)) (layer "F.SilkS") (width 0.01) (tstamp e2851eb9-a4df-4d0f-af5a-e8551f295143))
   )
 
-  (module "SnapEDA:AMPHENOL_10137061-00021LF" (layer "F.Cu") (tedit 5F7A700E) (tstamp 1d0e5abf-081d-4f84-bb7d-3ed84da07afd)
-    (at 280.19375 109.5375 180)
-    (property "SKU" "10137061-00021LF")
-    (property "Sheet file" "/Users/mbagnara/Documents/my-keyboard/my-keyboard.kicad_sch")
-    (property "Sheet name" "")
-    (path "/7a64ceac-9ab1-4bf6-9a33-ec9c357daa77")
-    (clearance 0.1)
-    (fp_text reference "USB1" (at 3.33375 6.6675) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 417c548d-a72f-4905-9b39-e3e124371faa)
-    )
-    (fp_text value "USB_C_GCT_USB4085-Type-C" (at 0 0.85) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp b267bbb7-1761-438f-8d50-d2b1b62d0f67)
-    )
-    (fp_line (start -1.225 -1.65) (end 8.425 -1.65) (layer "F.SilkS") (width 0.127) (tstamp 0df2e78d-e62d-4c0e-9056-9203ab546efc))
-    (fp_line (start 8.425 -1.65) (end 8.425 0.37) (layer "F.SilkS") (width 0.127) (tstamp 397dc02a-6d6a-4606-8868-c34035da0f15))
-    (fp_line (start -1.225 0.37) (end -1.225 -1.65) (layer "F.SilkS") (width 0.127) (tstamp 4dcf7f07-948b-4538-aca8-cd199a8049b5))
-    (fp_line (start 8.425 8.55) (end -1.225 8.55) (layer "F.SilkS") (width 0.127) (tstamp 4f93dc1e-c0ac-40a5-a559-dc4b8474f0e2))
-    (fp_line (start 8.425 2.13) (end 8.425 4.66) (layer "F.SilkS") (width 0.127) (tstamp 5b06c7b1-d1f2-4459-9f4c-3342d66e587b))
-    (fp_line (start 8.425 6.8) (end 8.425 8.55) (layer "F.SilkS") (width 0.127) (tstamp d2a171cf-e7f5-4280-bad6-3ede4172af18))
-    (fp_line (start -1.225 8.55) (end -1.225 6.8) (layer "F.SilkS") (width 0.127) (tstamp dc8774a7-444f-4232-892a-1a8291e2c9dd))
-    (fp_line (start -1.225 4.66) (end -1.225 2.13) (layer "F.SilkS") (width 0.127) (tstamp f5e10df2-855c-41ba-a9d8-3bd25203c41d))
-    (fp_circle (center 0.8 -2.3) (end 0.9 -2.3) (layer "F.SilkS") (width 0.2) (tstamp 50d85636-8b5e-4931-bcfe-c0f3b735b773))
-    (fp_line (start 7.35 0.325) (end 7.05 0.325) (layer "Edge.Cuts") (width 0.0001) (tstamp adcfa622-15fb-4bfd-878c-16af819f8a2d))
-    (fp_line (start 7.35 -0.325) (end 7.05 -0.325) (layer "Edge.Cuts") (width 0.0001) (tstamp cf27e337-d56a-4ad3-a0b5-4187f249d0b3))
-    (fp_arc (start 7.35 0) (end 7.35 0.325) (angle -180) (layer "Edge.Cuts") (width 0.0001) (tstamp afd30a16-5dfc-4aaf-a645-2cf9b03ba196))
-    (fp_arc (start 7.05 0) (end 7.05 -0.325) (angle -180) (layer "Edge.Cuts") (width 0.0001) (tstamp c8279797-aca8-45b8-bf0a-bd0f1e581d86))
-    (fp_line (start -1.565 8.8) (end -1.565 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 071eba51-a011-4a88-9cae-aef1bff523b7))
-    (fp_line (start -1.565 -1.9) (end 8.77 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 873d8b90-9fa1-4c3e-9fa3-b58832f40836))
-    (fp_line (start 8.77 -1.9) (end 8.77 8.8) (layer "F.CrtYd") (width 0.05) (tstamp d9d98fd0-8256-408e-946e-e8426d02a985))
-    (fp_line (start 8.77 8.8) (end -1.565 8.8) (layer "F.CrtYd") (width 0.05) (tstamp f6a3a7fd-448a-43da-bc7b-8a86b2fb3386))
-    (fp_line (start 8.425 -1.65) (end 8.425 8.55) (layer "F.Fab") (width 0.127) (tstamp 4748b242-9569-42ed-8b6a-2c3e32f9e3a4))
-    (fp_line (start -1.225 8.55) (end -1.225 -1.65) (layer "F.Fab") (width 0.127) (tstamp 6ca2ec7f-02fe-47d9-aebd-df6a8cab63d1))
-    (fp_line (start -1.225 -1.65) (end 8.425 -1.65) (layer "F.Fab") (width 0.127) (tstamp 770affea-d359-4b1e-af33-e9eb87fe9d91))
-    (fp_line (start 8.425 8.55) (end -1.225 8.55) (layer "F.Fab") (width 0.127) (tstamp 8f5c5bae-1bb3-44a3-893d-27a1d3142ece))
-    (fp_circle (center 0.8 -2.3) (end 0.9 -2.3) (layer "F.Fab") (width 0.2) (tstamp 31fbe52f-abcc-4fae-a012-4c5d91a5c7ba))
-    (pad "A1" smd rect (at 0.85 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1 "GND") (pinfunction "GND_A1") (tstamp 38dc9279-2f7b-42af-97b8-9c3a882d2612))
-    (pad "A2" smd rect (at 1.35 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 109 "Net-(USB1-PadA2)") (pinfunction "SSTXP1") (tstamp 8cd2b297-717c-476b-8333-fba3d3b6775f))
-    (pad "A3" smd rect (at 1.85 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 110 "Net-(USB1-PadA3)") (pinfunction "SSTXN1") (clearance 0.1) (tstamp a690aaff-2589-4c38-bca7-a4ac7f2fb5b6))
-    (pad "A4" smd rect (at 2.35 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 106 "VCC") (pinfunction "VBUS_A4") (clearance 0.1) (tstamp fd074509-d22b-434d-b08b-b276e0fe576f))
-    (pad "A5" smd rect (at 2.85 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 117 "Net-(R6-Pad2)") (pinfunction "CC1") (clearance 0.1) (tstamp c8a7486f-d0c9-4b0b-bc81-a47bcb617dff))
-    (pad "A6" smd rect (at 3.35 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 103 "/D+") (pinfunction "DP1") (clearance 0.1) (tstamp 67931466-b1c5-4557-b3ec-92a2e9217eb6))
-    (pad "A7" smd rect (at 3.85 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 102 "/D-") (pinfunction "DN1") (clearance 0.1) (tstamp de18ec57-7293-4742-9873-974b361b749d))
-    (pad "A8" smd rect (at 4.35 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 107 "Net-(USB1-PadA8)") (pinfunction "SBU1") (tstamp 215e9008-a0e0-4b75-89ae-e440ea55c889))
-    (pad "A9" smd rect (at 4.85 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 106 "VCC") (pinfunction "VBUS_A9") (clearance 0.1) (tstamp 7a97036b-1055-4d88-8b16-72f3e0c6949c))
-    (pad "A10" smd rect (at 5.35 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 111 "Net-(USB1-PadA10)") (pinfunction "SSRXN2") (clearance 0.1) (tstamp d71b07c8-2145-4d89-bb40-ce89beecfa13))
-    (pad "A11" smd rect (at 5.85 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 112 "Net-(USB1-PadA11)") (pinfunction "SSRXP2") (clearance 0.1) (tstamp eabf2473-0957-4202-bd66-08db8f17f7ce))
-    (pad "A12" smd rect (at 6.35 -0.56 180) (size 0.3 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1 "GND") (pinfunction "GND_A12") (tstamp a40c7ace-0e3b-400d-84b7-8cd5f0c4ab36))
-    (pad "B1" thru_hole circle (at 6.4 0.65 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 "GND") (pinfunction "GND_B1") (tstamp 4b817a5b-80b4-4b68-8a0b-f1b91f988d37))
-    (pad "B2" thru_hole circle (at 6 1.35 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 113 "Net-(USB1-PadB2)") (pinfunction "SSTXP2") (tstamp 9402bff8-c13f-4067-baf2-0afafc76edcc))
-    (pad "B3" thru_hole circle (at 5.2 1.35 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 114 "Net-(USB1-PadB3)") (pinfunction "SSTXN2") (tstamp 882f1bcd-32d5-40cd-84e1-c4523dab80f3))
-    (pad "B4" thru_hole circle (at 4.8 0.65 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask) (remove_unused_layers) (keep_end_layers)
-      (net 106 "VCC") (pinfunction "VBUS_B4") (tstamp bb423c45-9a97-4023-b6c0-0306c493f07d))
-    (pad "B5" thru_hole circle (at 4.4 1.35 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 105 "Net-(R5-Pad1)") (pinfunction "CC2") (tstamp f7113f2d-35b6-41ba-b7d4-62eaa9fc1219))
-    (pad "B6" thru_hole circle (at 4 0.65 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 103 "/D+") (pinfunction "DP2") (tstamp b4ea8be8-7291-4269-8e27-ad2263fd551d))
-    (pad "B7" thru_hole circle (at 3.2 0.65 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask) (remove_unused_layers) (keep_end_layers)
-      (net 102 "/D-") (pinfunction "DN2") (tstamp 58926085-fb85-4337-bfb6-50d8d403b30b))
-    (pad "B8" thru_hole circle (at 2.8 1.35 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask) (remove_unused_layers) (keep_end_layers)
-      (net 108 "Net-(USB1-PadB8)") (pinfunction "SBU2") (tstamp f1d9c142-7f31-4a64-80c1-2bf1cbcca178))
-    (pad "B9" thru_hole circle (at 2.4 0.65 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 106 "VCC") (pinfunction "VBUS_B9") (tstamp c8567155-0906-4f8a-b1da-96dae6154d22))
-    (pad "B10" thru_hole circle (at 2 1.35 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 115 "Net-(USB1-PadB10)") (pinfunction "SSRXN1") (tstamp edc9a837-d8d4-4234-9a64-c286962640cf))
-    (pad "B11" thru_hole circle (at 1.2 1.35 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 116 "Net-(USB1-PadB11)") (pinfunction "SSRXP1") (tstamp 0ddf839a-7063-480a-8c97-6ba2d1b19c24))
-    (pad "B12" thru_hole circle (at 0.8 0.65 180) (size 0.6 0.6) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 "GND") (pinfunction "GND_B12") (tstamp 72a5ec95-590c-4bff-b466-1852d7aad783))
-    (pad "None" np_thru_hole circle (at 0 0 180) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask) (tstamp 7a3e3511-81f5-4dcf-b790-735ecfe335be))
-    (pad "S1" thru_hole oval (at -0.53 1.25 180) (size 0.85 1.7) (drill oval 0.5 1.1) (layers *.Cu *.Mask) (remove_unused_layers) (keep_end_layers)
-      (net 1 "GND") (pinfunction "SHIELD") (tstamp 3591ccd7-a430-4909-8e41-b0845a8fa700))
-    (pad "S2" thru_hole oval (at 7.73 1.25 180) (size 0.85 1.7) (drill oval 0.5 1.1) (layers *.Cu *.Mask) (remove_unused_layers) (keep_end_layers)
-      (net 1 "GND") (pinfunction "SHIELD") (tstamp 7a85ef4f-3fd6-4ada-842b-d92fd0142548))
-    (pad "S3" thru_hole oval (at -0.89 5.73 180) (size 0.85 1.7) (drill oval 0.5 1.1) (layers *.Cu *.Mask)
-      (net 1 "GND") (pinfunction "SHIELD") (tstamp 344d24a5-49e6-474d-ac69-9891f4d08e01))
-    (pad "S4" thru_hole oval (at 8.09 5.73 180) (size 0.85 1.7) (drill oval 0.5 1.1) (layers *.Cu *.Mask) (remove_unused_layers) (keep_end_layers)
-      (net 1 "GND") (pinfunction "SHIELD") (tstamp f9823513-c5d9-45d7-9d2d-eb7151489043))
-    (model "C:/Users/bryan/Downloads/kicad projects/github repositories/Type-C.pretty/gct-usb4085.step"
-      (offset (xyz 0 -2 -0.2))
-      (scale (xyz 1 1 1))
-      (rotate (xyz -90 0 0))
-    )
-    (model "C:/Users/bryan/OneDrive/kicad projects/libraries/Type-C.pretty/USB_C_GCT_USB4085.step"
-      (offset (xyz 0 -2 -0.2))
-      (scale (xyz 1 1 1))
-      (rotate (xyz -90 0 0))
-    )
-  )
-
   (module "cftkb:MountingHole_2.2mm_M2_Pad" (layer "F.Cu") (tedit 5CFB748D) (tstamp 1f0c88a8-caf9-4ffa-915d-f765ce1d5c6e)
     (at 83.34375 118.26875)
     (descr "Mounting Hole 2.2mm, M2")
@@ -7348,7 +7242,7 @@
   )
 
   (module "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp c4e06b30-a3b2-4495-925d-a6a6f51af8c9)
-    (at 272.288 113.792)
+    (at 282.194 106.172 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "resistor")
     (property "SKU" "CR0805-FX-5101ELF ")
@@ -7356,15 +7250,15 @@
     (property "Sheet name" "")
     (path "/bfb0acdd-c511-4ef5-ae30-49ca9f392e5a")
     (attr smd)
-    (fp_text reference "R6" (at -0.0785 1.778) (layer "F.SilkS")
+    (fp_text reference "R6" (at -0.0785 1.778 90) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 680ffecc-9277-4e8a-a17e-d98858ca5d2c)
     )
-    (fp_text value "5.1k" (at -3.3805 0.254) (layer "F.Fab")
+    (fp_text value "5.1k" (at -3.3805 0.254 90) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 1a3af741-d1fc-4d67-b348-663f699023c5)
     )
-    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+    (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
       (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp e87453d3-f05b-4671-97a1-6b463554e6b4)
     )
@@ -7378,10 +7272,10 @@
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 904685d6-30ae-4807-b614-4af3e0fd91ed))
     (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp a25e598f-4a40-469e-b747-970fbf09dba0))
     (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp e1f6ab2a-bb56-4aef-a2e2-c8891b74fb4a))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1 "GND") (tstamp 9ff2c224-d70d-4405-8f66-5ebb47909b87))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 117 "Net-(R6-Pad2)") (tstamp e3e873e9-57d6-4629-9ac1-5d271c31710e))
+    (pad "1" smd roundrect (at -0.9375 0 270) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 1 "GND") (tstamp c0a6e5e1-efcf-4eab-9670-543e785ba4c9))
+    (pad "2" smd roundrect (at 0.9375 0 270) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 117 "Net-(R6-Pad2)") (tstamp 32961818-99e2-4237-bbca-cd5e9a34a7c2))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7498,6 +7392,91 @@
     )
   )
 
+  (module "Type-C:Wurth-632723300011" (layer "F.Cu") (tedit 5C42C6B8) (tstamp e205da28-b2a2-48b0-a08a-db01b6ff3022)
+    (at 276.225 100.0125 180)
+    (property "SKU" "632723300011")
+    (property "Sheet file" "/Users/mbagnara/Documents/my-keyboard/my-keyboard.kicad_sch")
+    (property "Sheet name" "")
+    (path "/665e9f3a-e0a2-466a-bd9f-8b3e350b60e6")
+    (attr smd)
+    (fp_text reference "USB1" (at 0.127 -4.3815) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d737e53f-0783-4984-823c-bb59a2725c6b)
+    )
+    (fp_text value "Wurth-632723300011" (at 0 1.9) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 405f9863-f37a-4bab-9bf6-f7b215a7fc3d)
+    )
+    (fp_line (start -4.37 0.95) (end -4.37 -10.38) (layer "Dwgs.User") (width 0.15) (tstamp 02be6331-d2a9-4c2f-96bb-86c97b0a5428))
+    (fp_line (start -4.37 0.95) (end 4.37 0.95) (layer "Dwgs.User") (width 0.15) (tstamp 933533ac-e219-4ee3-86dc-6937b10ef973))
+    (fp_line (start 4.37 0.95) (end 4.37 -10.38) (layer "Dwgs.User") (width 0.15) (tstamp cd41f085-a728-485d-b4f5-d4a45bc5dd3c))
+    (fp_line (start -4.37 -10.38) (end 4.37 -10.38) (layer "Dwgs.User") (width 0.15) (tstamp de39e796-f27d-4eb0-b6f4-87f3935a993f))
+    (pad "1" smd rect (at -2.75 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 1 "GND") (pinfunction "GND") (tstamp 623762b9-eedc-4795-8215-a32f170c2d8f))
+    (pad "2" smd rect (at -2.25 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 116 "Net-(USB1-Pad2)") (pinfunction "SSTXXp1") (tstamp 7a59a572-b60d-4234-9c01-b289875daedd))
+    (pad "3" smd rect (at -1.75 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 115 "Net-(USB1-Pad3)") (pinfunction "SSTXn1") (tstamp 68272335-6ed1-4f19-a417-e2e5e71d02d3))
+    (pad "4" smd rect (at -1.25 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 106 "VCC") (pinfunction "VBUS") (tstamp cc297288-97bd-45f2-99e6-0b02736291d7))
+    (pad "5" smd rect (at -0.75 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 117 "Net-(R6-Pad2)") (pinfunction "CC1") (tstamp 30050bc2-a029-4408-9381-1d7488d7f184))
+    (pad "6" smd rect (at -0.25 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 103 "/D+") (pinfunction "Dp1") (tstamp 85a337e1-1841-4d72-8203-2e2aa11da999))
+    (pad "7" smd rect (at 0.25 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 102 "/D-") (pinfunction "Dn1") (tstamp f88393ee-065d-470a-bce7-4eb35474b80a))
+    (pad "8" smd rect (at 0.75 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 114 "Net-(USB1-Pad8)") (pinfunction "SBU1") (tstamp b6d7db18-892a-41f7-87f4-1b6b0cca12cf))
+    (pad "9" smd rect (at 1.25 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 106 "VCC") (pinfunction "VBUS") (tstamp 3327398c-5285-40f0-a4d7-277a61352e90))
+    (pad "10" smd rect (at 1.75 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 113 "Net-(USB1-Pad10)") (pinfunction "SSRXn2") (tstamp b0750553-5a5e-4594-bea2-9603453cafe8))
+    (pad "11" smd rect (at 2.25 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 112 "Net-(USB1-Pad11)") (pinfunction "SSRXp2") (tstamp 04a569bc-eb33-4636-b9e9-4fc94135dfe9))
+    (pad "12" smd rect (at 2.75 -10.58 180) (size 0.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 1 "GND") (pinfunction "GND") (tstamp b2bbaa0d-744d-4cce-86c8-87f45c79acc2))
+    (pad "13" thru_hole circle (at 2.8 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "GND") (tstamp 3e1b3af8-6e5b-42ce-ab4a-4b016535197d))
+    (pad "14" thru_hole circle (at 2.4 -8.63 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 111 "Net-(USB1-Pad14)") (pinfunction "SSTXp2") (tstamp 8b0b0094-b8af-4246-8878-f0207cc2c543))
+    (pad "15" thru_hole circle (at 1.6 -8.63 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 110 "Net-(USB1-Pad15)") (pinfunction "SSTXn2") (tstamp 310b852e-acb5-4139-a2ca-02c889ec2863))
+    (pad "16" thru_hole circle (at 1.2 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 106 "VCC") (pinfunction "VBUS") (tstamp 83978175-1908-4cce-9cfb-23e645767a70))
+    (pad "17" thru_hole circle (at 0.8 -8.63 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 105 "Net-(R5-Pad1)") (pinfunction "CC2") (tstamp 2f5790ce-2195-453e-97f5-9e750f596aaf))
+    (pad "18" thru_hole circle (at 0.4 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 103 "/D+") (pinfunction "Dp2") (tstamp 6920d5c9-2865-48eb-a66e-5b0588ec7ff0))
+    (pad "19" thru_hole circle (at -0.4 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 102 "/D-") (pinfunction "Dn2") (tstamp 6b0a2fa6-7db0-4a78-afb6-28fba1accbc8))
+    (pad "20" thru_hole circle (at -0.8 -8.62 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 109 "Net-(USB1-Pad20)") (pinfunction "SBU2") (tstamp 65c36643-6996-484d-ad3f-6683dd97f77f))
+    (pad "21" thru_hole circle (at -1.2 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 106 "VCC") (pinfunction "VBUS") (tstamp a1c55ff8-08bc-46e6-af53-d9efdc233124))
+    (pad "22" thru_hole circle (at -1.6 -8.63 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 108 "Net-(USB1-Pad22)") (pinfunction "SSRXn1") (tstamp e7f7319d-3091-42e8-b35e-6b62d41cd573))
+    (pad "23" thru_hole circle (at -2.4 -8.63 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 107 "Net-(USB1-Pad23)") (pinfunction "SSRXp1") (tstamp 3812bd47-afc8-4713-a65b-7e10bfdea5c7))
+    (pad "24" thru_hole circle (at -2.8 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "GND") (tstamp a13b9dfb-bf4b-4699-a9f4-b8115f8afc7e))
+    (pad "25" thru_hole circle (at 2 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "Center_Plate_Pin") (tstamp 2ff0fba0-9372-4564-b0f9-4bb645f5aa2f))
+    (pad "25" thru_hole circle (at -2 -9.33 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "Center_Plate_Pin") (tstamp a34161eb-762d-4600-86be-8b29366c41b5))
+    (pad "26" thru_hole oval (at -4.27 -3.45 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "Connector_Legs") (tstamp 465bbbd2-6c93-409e-b5ab-53420d540652))
+    (pad "26" thru_hole oval (at -4.27 -8.18 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "Connector_Legs") (tstamp d1f20910-e3d1-4217-849b-3bab46962ced))
+    (pad "26" thru_hole oval (at 4.27 -8.18 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "Connector_Legs") (tstamp d5e8dd71-565d-4e66-9b46-1a8ed849a4c3))
+    (pad "26" thru_hole oval (at 4.27 -3.45 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu "B.Mask") (remove_unused_layers) (keep_end_layers)
+      (net 1 "GND") (pinfunction "Connector_Legs") (tstamp ddf0bb65-6d96-48d9-b3d8-f9a8131a5a0b))
+    (pad "27" smd rect (at 0 -6 180) (size 0.2 1) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 1 "GND") (pinfunction "Under-Barrel_Pads") (tstamp 28fe4ab2-0bb1-48fe-9134-3d09255b7ccc))
+    (pad "27" smd rect (at 0 -2.9 180) (size 0.2 1) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 1 "GND") (pinfunction "Under-Barrel_Pads") (tstamp 4ced0c7d-81f7-444c-9e23-f281365325fb))
+  )
+
   (module "cftkb:MountingHole_2.2mm_M2_Pad" (layer "F.Cu") (tedit 5CFB748D) (tstamp e489311d-06ea-474d-b15e-e50c3c9c2a04)
     (at 125.4125 200.025)
     (descr "Mounting Hole 2.2mm, M2")
@@ -9865,9 +9844,9 @@
     (fp_line (start 0.25 0.4) (end 0.25 -0.4) (layer "B.Fab") (width 0.1) (tstamp c387971b-86b9-4a4a-a1e0-d4361072f7b5))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9) (layer "B.Fab") (width 0.1) (tstamp d93869ae-9615-4a10-82c1-49dc44fb495c))
     (pad "1" smd rect (at -1.65 0 90) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 7 "/ROW0") (pinfunction "K") (tstamp cec1d093-dd53-430d-9fe6-56b12bd2ddc6))
+      (net 7 "/ROW0") (pinfunction "K") (tstamp 6c347258-fca2-4d95-94e8-13bc60c14fa6))
     (pad "2" smd rect (at 1.65 0 90) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 64 "Net-(D55-Pad2)") (pinfunction "A") (tstamp 5f782288-35d3-43ec-bb84-f2f1b4c9e6ea))
+      (net 64 "Net-(D55-Pad2)") (pinfunction "A") (tstamp 60777e16-fd38-445e-b97a-1c0b1a0f96a1))
     (model "${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10995,11 +10974,11 @@
   (gr_text "by bagnaram" (at 208.026 110.236) (layer "F.SilkS") (tstamp 6acf7a18-4c23-4ce4-a2be-a06e7bd33ba3)
     (effects (font (size 1.5 1.5) (thickness 0.3)))
   )
-  (gr_text "Splendens" (at 207.772 105.664) (layer "F.SilkS") (tstamp a2971b8c-24fb-4ac4-9d64-53dff3ed42d8)
+  (gr_text "Ocotillo" (at 207.772 105.664) (layer "F.SilkS") (tstamp a2971b8c-24fb-4ac4-9d64-53dff3ed42d8)
     (effects (font (size 3 3) (thickness 0.3)))
   )
-  (dimension 115.8875 (width 0.4) (layer "F.Cu") (tstamp 05fe0bbd-6a70-4a1b-b2d8-47bd6037e603)
-    (gr_text "4.5625 in" (at 60 159.54375 270) (layer "F.Cu") (tstamp 05fe0bbd-6a70-4a1b-b2d8-47bd6037e603)
+  (dimension 115.8875 (width 0.4) (layer "Cmts.User") (tstamp 05fe0bbd-6a70-4a1b-b2d8-47bd6037e603)
+    (gr_text "4.5625 in" (at 60 159.54375 270) (layer "Cmts.User") (tstamp 05fe0bbd-6a70-4a1b-b2d8-47bd6037e603)
       (effects (font (size 3 3) (thickness 0.6)))
     )
     (feature1 (pts (xy 79.375 217.4875) (xy 62.913579 217.4875)))
@@ -11010,8 +10989,8 @@
     (arrow2a (pts (xy 63.5 101.6) (xy 62.913579 102.726504)))
     (arrow2b (pts (xy 63.5 101.6) (xy 64.086421 102.726504)))
   )
-  (dimension 12.7 (width 0.2) (layer "F.Cu") (tstamp 0d18284f-f441-4d06-afed-72e17f47b334)
-    (gr_text "0.5000 in" (at 71.81875 111.91875 270) (layer "F.Cu") (tstamp 0d18284f-f441-4d06-afed-72e17f47b334)
+  (dimension 12.7 (width 0.2) (layer "Cmts.User") (tstamp 0d18284f-f441-4d06-afed-72e17f47b334)
+    (gr_text "0.5000 in" (at 71.81875 111.91875 270) (layer "Cmts.User") (tstamp 0d18284f-f441-4d06-afed-72e17f47b334)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (feature1 (pts (xy 83.34375 118.26875) (xy 73.232329 118.26875)))
@@ -11022,8 +11001,8 @@
     (arrow2a (pts (xy 73.81875 105.56875) (xy 73.232329 106.695254)))
     (arrow2b (pts (xy 73.81875 105.56875) (xy 74.405171 106.695254)))
   )
-  (dimension 95.25 (width 0.2) (layer "F.Cu") (tstamp 6e93367f-d8e8-47eb-88e7-886d11969609)
-    (gr_text "3.7500 in" (at 71.818751 169.8625 270) (layer "F.Cu") (tstamp 6e93367f-d8e8-47eb-88e7-886d11969609)
+  (dimension 95.25 (width 0.2) (layer "Cmts.User") (tstamp 6e93367f-d8e8-47eb-88e7-886d11969609)
+    (gr_text "3.7500 in" (at 71.818751 169.8625 270) (layer "Cmts.User") (tstamp 6e93367f-d8e8-47eb-88e7-886d11969609)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (feature1 (pts (xy 79.375 217.4875) (xy 73.23233 217.4875)))
@@ -11034,8 +11013,8 @@
     (arrow2a (pts (xy 73.818751 122.2375) (xy 73.23233 123.364004)))
     (arrow2b (pts (xy 73.818751 122.2375) (xy 74.405172 123.364004)))
   )
-  (dimension 296.8625 (width 0.2) (layer "F.Cu") (tstamp 9b2c937a-a675-4b15-8149-84e37dc9b908)
-    (gr_text "11.6875 in" (at 231.775 94.8375) (layer "F.Cu") (tstamp 9b2c937a-a675-4b15-8149-84e37dc9b908)
+  (dimension 296.8625 (width 0.2) (layer "Cmts.User") (tstamp 9b2c937a-a675-4b15-8149-84e37dc9b908)
+    (gr_text "11.6875 in" (at 231.775 94.8375) (layer "Cmts.User") (tstamp 9b2c937a-a675-4b15-8149-84e37dc9b908)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (feature1 (pts (xy 380.20625 105.56875) (xy 380.20625 96.251079)))
@@ -11046,8 +11025,8 @@
     (arrow2a (pts (xy 83.34375 96.8375) (xy 84.470254 97.423921)))
     (arrow2b (pts (xy 83.34375 96.8375) (xy 84.470254 96.251079)))
   )
-  (dimension 304.8 (width 0.4) (layer "F.Cu") (tstamp 9ea5fb46-e30a-4d97-ac3f-ea9718d526c9)
-    (gr_text "12.0000 in" (at 231.775 85.3125) (layer "F.Cu") (tstamp 9ea5fb46-e30a-4d97-ac3f-ea9718d526c9)
+  (dimension 304.8 (width 0.4) (layer "Cmts.User") (tstamp 9ea5fb46-e30a-4d97-ac3f-ea9718d526c9)
+    (gr_text "12.0000 in" (at 231.775 85.3125) (layer "Cmts.User") (tstamp 9ea5fb46-e30a-4d97-ac3f-ea9718d526c9)
       (effects (font (size 3 3) (thickness 0.6)))
     )
     (feature1 (pts (xy 384.175 101.6) (xy 384.175 86.726079)))
@@ -11061,37 +11040,31 @@
 
   (segment (start 359.61649 109.80749) (end 358.521 108.712) (width 0.381) (layer "F.Cu") (net 1) (tstamp 019fe2c1-127c-4c1d-9cde-86dbab4e8236))
   (segment (start 350.393 106.934) (end 348.353 106.934) (width 0.381) (layer "F.Cu") (net 1) (tstamp 04c510e7-f374-4c4a-b316-69a1ef9e12b3))
-  (segment (start 351.568039 105.758961) (end 353.473039 105.758961) (width 0.381) (layer "F.Cu") (net 1) (tstamp 068d1bb0-4b52-4695-8b85-4397c09c7072))
-  (segment (start 273.79375 108.8875) (end 273.19375 108.2875) (width 0.381) (layer "F.Cu") (net 1) (tstamp 08e1bc2a-8a70-4783-8dda-43e64da215c8))
   (segment (start 363.731 109.525) (end 363.740501 109.534501) (width 0.381) (layer "F.Cu") (net 1) (tstamp 14c3d23c-ed69-4246-9947-817ef5374a57))
   (segment (start 375.140501 107.934501) (end 375.140501 114.112401) (width 0.381) (layer "F.Cu") (net 1) (tstamp 202ba466-70ff-4d95-8c25-96b1452f4ab0))
-  (segment (start 353.473039 105.758961) (end 355.380999 105.758961) (width 0.381) (layer "F.Cu") (net 1) (tstamp 280b7569-29cd-4094-a6f1-845fbabea575))
+  (segment (start 273.425 109.3425) (end 274.225 109.3425) (width 0.254) (layer "F.Cu") (net 1) (tstamp 21739737-154d-4599-a0d5-588d40b53140))
+  (segment (start 278.225 109.3425) (end 279.025 109.3425) (width 0.254) (layer "F.Cu") (net 1) (tstamp 27d39262-713d-45b0-9b8f-53a48052431e))
   (segment (start 369.1 105.425) (end 369.1 106.202266) (width 0.381) (layer "F.Cu") (net 1) (tstamp 2c8f54b5-926d-4a74-9cf8-b21075d523ef))
-  (segment (start 354.076 104.394) (end 353.473039 104.996961) (width 0.381) (layer "F.Cu") (net 1) (tstamp 2d4fc58d-4f64-4447-bc41-107887e63efe))
-  (segment (start 279.39375 108.8875) (end 279.99375 108.2875) (width 0.381) (layer "F.Cu") (net 1) (tstamp 2d68cb93-ad52-4557-b571-b0d01e2f8ea3))
-  (segment (start 279.34375 110.0975) (end 279.34375 108.9375) (width 0.3) (layer "F.Cu") (net 1) (tstamp 32922cc2-e5ca-461b-a601-66cc4aba005a))
   (segment (start 369.1 106.202266) (end 370.819233 107.921499) (width 0.381) (layer "F.Cu") (net 1) (tstamp 357587ee-ceb4-4dfa-9825-d064028598a8))
-  (segment (start 353.473039 104.996961) (end 353.473039 105.758961) (width 0.381) (layer "F.Cu") (net 1) (tstamp 4b5f16ae-ef76-4565-8cb9-4533f63d025e))
   (segment (start 362.6 109.525) (end 361.184068 109.525) (width 0.381) (layer "F.Cu") (net 1) (tstamp 4cacd0c0-d2f2-40d8-9868-15d6e8003271))
   (segment (start 363.740501 115.847967) (end 364.3 116.407466) (width 0.381) (layer "F.Cu") (net 1) (tstamp 4ec9a041-5861-467b-9164-523753242159))
   (segment (start 372.593 114.325) (end 372.364 114.554) (width 0.381) (layer "F.Cu") (net 1) (tstamp 51b97283-38bb-4ac1-95a8-94f71c09763c))
   (segment (start 362.6 109.525) (end 363.731 109.525) (width 0.381) (layer "F.Cu") (net 1) (tstamp 6ce3c667-f0ae-4b7a-b0bf-84494e3790a9))
+  (segment (start 355.092 105.41) (end 354.838 105.41) (width 0.381) (layer "F.Cu") (net 1) (tstamp 7a4db55f-afa2-446f-ba0a-e5155b980291))
+  (segment (start 358.394 108.712) (end 355.092 105.41) (width 0.381) (layer "F.Cu") (net 1) (tstamp 81f178c2-7789-4e90-831c-63bbefcf7399))
+  (segment (start 273.475 110.5925) (end 273.475 112.859) (width 0.3) (layer "F.Cu") (net 1) (tstamp 8465fe6a-db31-47c0-91e0-e3fa61e946e3))
   (segment (start 352.290098 108.634) (end 350.590098 106.934) (width 0.381) (layer "F.Cu") (net 1) (tstamp 8f427b79-f56f-479c-83e3-bf3095901836))
   (segment (start 361.184068 109.525) (end 360.901578 109.80749) (width 0.381) (layer "F.Cu") (net 1) (tstamp 9f465317-cd60-4472-9bb3-d14ac51a136f))
-  (segment (start 358.4725 104.394) (end 354.076 104.394) (width 0.381) (layer "F.Cu") (net 1) (tstamp a2a0f2d7-4604-4d96-824d-c2e70b737e1c))
   (segment (start 370.819233 107.921499) (end 373.996499 107.921499) (width 0.381) (layer "F.Cu") (net 1) (tstamp a681e85b-aca1-4d2e-8652-8982b4855637))
   (segment (start 363.740501 109.534501) (end 363.740501 115.847967) (width 0.381) (layer "F.Cu") (net 1) (tstamp adb9b353-2296-4350-9db7-79731932e502))
-  (segment (start 350.393 106.934) (end 351.568039 105.758961) (width 0.381) (layer "F.Cu") (net 1) (tstamp addaf00d-1270-4dc0-9699-4ff67d522979))
   (segment (start 375.131 107.925) (end 375.140501 107.934501) (width 0.381) (layer "F.Cu") (net 1) (tstamp b04885e9-1753-4c55-b898-71b7f99bba51))
-  (segment (start 273.84375 110.0975) (end 273.84375 108.9375) (width 0.3) (layer "F.Cu") (net 1) (tstamp b298f3e8-37fe-45dc-9917-5cc380046971))
   (segment (start 374 114.325) (end 372.593 114.325) (width 0.381) (layer "F.Cu") (net 1) (tstamp b67906bc-3b3c-4e02-884e-7d62d21771ba))
+  (segment (start 273.475 110.5925) (end 272.1365 110.5925) (width 0.3) (layer "F.Cu") (net 1) (tstamp c096238b-dfec-44b1-a91c-adb31e2860aa))
+  (segment (start 278.975 110.5925) (end 279.8055 110.5925) (width 0.3) (layer "F.Cu") (net 1) (tstamp d2d4dfb2-06cd-4fca-9fe6-f46aae06e933))
   (segment (start 360.901578 109.80749) (end 359.61649 109.80749) (width 0.381) (layer "F.Cu") (net 1) (tstamp d9369aa7-1419-415a-8e9e-90329a2e5c52))
   (segment (start 374 107.925) (end 375.131 107.925) (width 0.381) (layer "F.Cu") (net 1) (tstamp dd9b1a64-fe5f-4eea-8850-eb73a0096158))
   (segment (start 375.140501 114.112401) (end 374.927902 114.325) (width 0.381) (layer "F.Cu") (net 1) (tstamp e523852a-b55c-41e5-90fd-93558b4c03d7))
   (segment (start 354.813602 108.7605) (end 352.7195 108.7605) (width 0.381) (layer "F.Cu") (net 1) (tstamp ea5cd31b-ed9b-4bdd-8198-ad213930efa1))
-  (segment (start 355.380999 105.758961) (end 358.334038 108.712) (width 0.381) (layer "F.Cu") (net 1) (tstamp ec44eb26-1503-4313-b990-4a68b25a92f4))
-  (segment (start 279.99375 108.2875) (end 280.72375 108.2875) (width 0.381) (layer "F.Cu") (net 1) (tstamp f7d33dd1-b45d-482a-bf7e-c4c3035c5553))
-  (segment (start 273.19375 108.2875) (end 272.46375 108.2875) (width 0.381) (layer "F.Cu") (net 1) (tstamp fce7b14a-1e51-462f-a967-721863fad0d6))
   (via (at 362.966 119.38) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 1) (tstamp 74bb2834-b63b-476b-b181-6e3d94fcbaef))
   (via (at 376.174 119.38) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 1) (tstamp 86994fe5-6b3a-4605-88c3-0179a433ea72))
   (via (at 281.686 114.808) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 1) (tstamp ae956b3b-51cb-49f4-ba5f-40edc6eb3cac))
@@ -11115,16 +11088,17 @@
   (segment (start 289.7355 114.046) (end 290.322 114.046) (width 0.381) (layer "F.Cu") (net 2) (tstamp 4e008826-45c9-4d16-9451-17abf3d78d31))
   (segment (start 364.321511 115.269245) (end 364.32151 109.293838) (width 0.381) (layer "F.Cu") (net 2) (tstamp 5fac70de-faf4-4372-bead-bd64ed183e76))
   (segment (start 374 107.125) (end 375.4125 107.125) (width 0.381) (layer "F.Cu") (net 2) (tstamp 6ff4d785-1132-4f35-8907-a964db2a0682))
+  (segment (start 359.9665 108.2525) (end 360.299 108.2525) (width 0.381) (layer "F.Cu") (net 2) (tstamp 711bbbed-66de-45c0-99bc-8305c16218b3))
   (segment (start 363.752672 108.725) (end 362.6 108.725) (width 0.381) (layer "F.Cu") (net 2) (tstamp 88b9b5f2-c910-4184-a0c3-aca40cdbc60e))
   (segment (start 286.9415 111.252) (end 289.7355 114.046) (width 0.381) (layer "F.Cu") (net 2) (tstamp 8a038813-33d0-4f62-9eba-2be1b53285a4))
   (segment (start 376.174 106.3635) (end 375.4125 107.125) (width 0.381) (layer "F.Cu") (net 2) (tstamp 91afd707-b682-47a7-b82e-cd55e555a2e2))
   (segment (start 365.1 116.825) (end 365.1 118.469515) (width 0.381) (layer "F.Cu") (net 2) (tstamp a3ed5c7e-7825-453f-932d-b483c7efd62c))
   (segment (start 367.5 105.425) (end 367.5 104.356) (width 0.381) (layer "F.Cu") (net 2) (tstamp a4f3858c-6b39-4253-9d86-55b82ab4978c))
   (segment (start 376.174 105.918) (end 376.174 106.3635) (width 0.381) (layer "F.Cu") (net 2) (tstamp a65f7102-9f91-4fc2-a25d-1ec2e4becae4))
-  (segment (start 358.4725 106.426) (end 360.299 108.2525) (width 0.381) (layer "F.Cu") (net 2) (tstamp b86fed2b-4b2e-4f31-b461-13c756e33038))
   (segment (start 371.5 105.425) (end 371.5 106.175) (width 0.254) (layer "F.Cu") (net 2) (tstamp bc87f316-4f08-4671-89e2-f3bfdc504a38))
   (segment (start 365.1 116.825) (end 365.1 116.047734) (width 0.381) (layer "F.Cu") (net 2) (tstamp d025a6d7-486b-4e90-a42e-0400c4054574))
   (segment (start 365.1 116.047734) (end 364.321511 115.269245) (width 0.381) (layer "F.Cu") (net 2) (tstamp da5451b6-0310-4825-aa67-83ef750aa34f))
+  (segment (start 358.4725 106.7585) (end 359.9665 108.2525) (width 0.381) (layer "F.Cu") (net 2) (tstamp da906cc4-51a6-4899-8fa6-d9112365ad23))
   (segment (start 358.4725 106.68) (end 357.886 106.68) (width 0.381) (layer "F.Cu") (net 2) (tstamp dfc85d1d-47fa-4833-9a75-320404b3be0b))
   (segment (start 371.505 103.378) (end 371.505 105.42) (width 0.381) (layer "F.Cu") (net 2) (tstamp e1c7d727-3a48-457c-a9ac-8a33b8b9b12d))
   (segment (start 367.5 106.175) (end 367.5 105.425) (width 0.254) (layer "F.Cu") (net 2) (tstamp ecb258fa-cd4a-462e-930c-ed272cf0a3c8))
@@ -11153,11 +11127,9 @@
   (segment (start 350.393 108.634) (end 352.884 111.125) (width 0.254) (layer "F.Cu") (net 3) (tstamp 40b40721-5ea4-4ebb-bdab-873f76adb391))
   (segment (start 350.393 108.634) (end 348.372 108.634) (width 0.254) (layer "F.Cu") (net 3) (tstamp 86493ef6-46c8-4a59-a25b-d60678c1da42))
   (segment (start 352.884 111.125) (end 361.940602 111.125) (width 0.254) (layer "F.Cu") (net 3) (tstamp b123999f-d1b8-4655-8638-df9b187bdea5))
-  (segment (start 355.840612 108.299276) (end 357.866336 110.325) (width 0.254) (layer "F.Cu") (net 4) (tstamp 9251b187-4540-4291-a434-7c0a201a15f0))
-  (segment (start 355.840612 107.91251) (end 355.840612 108.299276) (width 0.254) (layer "F.Cu") (net 4) (tstamp c7a34aa8-b1d7-4b04-aa11-684a7207d0bf))
+  (segment (start 355.0435 106.8855) (end 358.483 110.325) (width 0.254) (layer "F.Cu") (net 4) (tstamp 6d83c56b-9d90-4d69-b343-c24d9e17d661))
+  (segment (start 358.483 110.325) (end 362.6 110.325) (width 0.254) (layer "F.Cu") (net 4) (tstamp a15b87d5-1c9b-4be1-ace1-124665d10050))
   (segment (start 354.813602 106.8855) (end 352.6415 106.8855) (width 0.254) (layer "F.Cu") (net 4) (tstamp ca00f167-a762-4c18-ab52-443669cdf956))
-  (segment (start 357.866336 110.325) (end 362.6 110.325) (width 0.254) (layer "F.Cu") (net 4) (tstamp d1b049b6-020d-43e7-a66f-b624cece897b))
-  (segment (start 354.813602 106.8855) (end 355.840612 107.91251) (width 0.254) (layer "F.Cu") (net 4) (tstamp f4d66d56-a418-4cb3-aaa1-b30f65b13c3c))
   (segment (start 368.3 103.632) (end 367.826999 103.158999) (width 0.254) (layer "F.Cu") (net 5) (tstamp 1787740e-65c2-4ec5-970e-6bfcc24fc708))
   (segment (start 367.826999 103.158999) (end 366.487001 103.158999) (width 0.254) (layer "F.Cu") (net 5) (tstamp 3cc72eb8-44a8-4406-8d7c-e8bd23440416))
   (segment (start 365.825 103.821) (end 360.9205 103.821) (width 0.254) (layer "F.Cu") (net 5) (tstamp 83d3dbc9-d2f2-4b65-abff-0c7a0f970f36))
@@ -11606,16 +11578,16 @@
   (segment (start 365.1 104.647503) (end 364.727507 104.27501) (width 0.254) (layer "F.Cu") (net 89) (tstamp ba638ead-bb8d-4b14-813b-0a460be8b5ca))
   (segment (start 362.818407 104.27501) (end 362.458 104.635417) (width 0.254) (layer "F.Cu") (net 89) (tstamp fa78ee93-6b9a-4cf0-b945-5dec1d048930))
   (via (at 362.458 104.635417) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 89) (tstamp 73826a05-b100-4170-8abf-a5a744f1cb11))
-  (segment (start 363.195037 106.206999) (end 362.458 105.469962) (width 0.254) (layer "B.Cu") (net 89) (tstamp 05fb7fb9-432d-48f7-98fd-987c41b8321b))
-  (segment (start 365.854961 106.206999) (end 363.195037 106.206999) (width 0.254) (layer "B.Cu") (net 89) (tstamp 2757e349-83f3-460f-9e74-725bc80c86a5))
-  (segment (start 317.5 109.22) (end 318.95099 110.67099) (width 0.254) (layer "B.Cu") (net 89) (tstamp 3844ad02-71d6-4d47-9f8a-3d1cc39771ce))
-  (segment (start 362.458 105.469962) (end 362.458 104.635417) (width 0.254) (layer "B.Cu") (net 89) (tstamp 57e6d2aa-a203-4704-9cf9-e6954bae0a4a))
-  (segment (start 365.819962 107.696) (end 366.233001 107.282961) (width 0.254) (layer "B.Cu") (net 89) (tstamp 649bc9d4-e64b-42af-9fce-cd717b8b9d5a))
-  (segment (start 332.05101 110.67099) (end 335.026 107.696) (width 0.254) (layer "B.Cu") (net 89) (tstamp 6ab2c4c3-12f2-478a-b07b-763c59694866))
-  (segment (start 318.95099 110.67099) (end 332.05101 110.67099) (width 0.254) (layer "B.Cu") (net 89) (tstamp 87b4b7f1-d499-4a7e-a9bb-8f9046564085))
-  (segment (start 366.233001 107.282961) (end 366.233001 106.585039) (width 0.254) (layer "B.Cu") (net 89) (tstamp d43e771e-c59f-40ea-b6b2-f1a9a91765ae))
-  (segment (start 366.233001 106.585039) (end 365.854961 106.206999) (width 0.254) (layer "B.Cu") (net 89) (tstamp f368f0dd-9424-41ba-bc16-f2bfeb9ae2f0))
-  (segment (start 335.026 107.696) (end 365.819962 107.696) (width 0.254) (layer "B.Cu") (net 89) (tstamp f4dae5bc-13a0-41bd-a9e0-cd3b08084dcc))
+  (segment (start 366.233001 107.282961) (end 366.233001 106.585039) (width 0.254) (layer "B.Cu") (net 89) (tstamp 0ef8b064-2c7d-45e2-bb08-befea1a05853))
+  (segment (start 366.233001 106.585039) (end 365.854961 106.206999) (width 0.254) (layer "B.Cu") (net 89) (tstamp 1391aae6-dca5-4d8d-a6bf-50514472fe33))
+  (segment (start 362.458 105.469962) (end 362.458 104.635417) (width 0.254) (layer "B.Cu") (net 89) (tstamp 1e962156-e0e0-45f8-a4b6-03c21831e281))
+  (segment (start 336.804 107.696) (end 365.819962 107.696) (width 0.254) (layer "B.Cu") (net 89) (tstamp 3103d8d5-bb78-469d-81c5-5d09881ed3a0))
+  (segment (start 317.5 109.22) (end 318.95099 110.67099) (width 0.254) (layer "B.Cu") (net 89) (tstamp 43a01f75-05e7-4bad-9033-88c09bd42e09))
+  (segment (start 365.854961 106.206999) (end 363.195037 106.206999) (width 0.254) (layer "B.Cu") (net 89) (tstamp 65db6b6f-d6dc-4b1f-aa52-62b0d55c7804))
+  (segment (start 365.819962 107.696) (end 366.233001 107.282961) (width 0.254) (layer "B.Cu") (net 89) (tstamp 6ece8fab-9d30-4ecc-80cb-f234c8379f0e))
+  (segment (start 318.95099 110.67099) (end 333.82901 110.67099) (width 0.254) (layer "B.Cu") (net 89) (tstamp b8033c59-5831-4ed9-881e-0475dd69b2c7))
+  (segment (start 363.195037 106.206999) (end 362.458 105.469962) (width 0.254) (layer "B.Cu") (net 89) (tstamp d2c60cd8-ccff-47fb-9219-443634c47265))
+  (segment (start 333.82901 110.67099) (end 336.804 107.696) (width 0.254) (layer "B.Cu") (net 89) (tstamp fcc45361-7c69-4a7f-8242-c19ff52ab35d))
   (segment (start 360.3475 106.426) (end 361.8465 107.925) (width 0.254) (layer "F.Cu") (net 90) (tstamp 08a56a94-afa9-4049-8497-33a4db540057))
   (segment (start 361.8465 107.925) (end 362.6 107.925) (width 0.254) (layer "F.Cu") (net 90) (tstamp 13be81d1-8949-47af-8cc5-581110ad7181))
   (segment (start 359.08851 105.42101) (end 360.3475 106.68) (width 0.254) (layer "F.Cu") (net 90) (tstamp 572aa7fd-856e-4080-a18e-61aa31780b75))
@@ -11814,85 +11786,80 @@
   (via (at 348.742 115.062) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 101) (tstamp a8c406f3-026b-4cab-bc03-5f6d79eef3f1))
   (via (at 365.252 115.062) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 101) (tstamp fee2351f-a975-4c63-a77d-f5a00ee7e52b))
   (segment (start 348.742 115.062) (end 365.252 115.062) (width 0.254) (layer "B.Cu") (net 101) (tstamp 24c2294b-e58c-4cd6-acb6-320b40046859))
+  (segment (start 275.975 112.391) (end 275.59 112.776) (width 0.254) (layer "F.Cu") (net 102) (tstamp 03628798-b4ac-4c93-916d-991940a3a7a6))
   (segment (start 330.205972 113.84599) (end 340.800962 103.251) (width 0.254) (layer "F.Cu") (net 102) (tstamp 0672f013-4c71-489d-89a4-d7411a06c5ae))
   (segment (start 289.61399 109.52799) (end 288.925 108.839) (width 0.254) (layer "F.Cu") (net 102) (tstamp 24777405-e01e-457b-9ee6-b3d8b1e5192a))
-  (segment (start 282.963222 108.966) (end 284.988 108.966) (width 0.254) (layer "F.Cu") (net 102) (tstamp 24790305-f54c-4314-9f9f-77af6474f68a))
-  (segment (start 275.59 113.284) (end 278.645223 113.284) (width 0.254) (layer "F.Cu") (net 102) (tstamp 548ccff5-3697-4546-895a-ff8ab80d1c96))
+  (segment (start 276.925943 114.24601) (end 276.80601 114.24601) (width 0.254) (layer "F.Cu") (net 102) (tstamp 2c9d301b-1081-43bc-afd2-402cfe29ebe7))
+  (segment (start 276.925943 114.24601) (end 279.32699 114.24601) (width 0.254) (layer "F.Cu") (net 102) (tstamp 4b6f4f41-3bc5-4a06-a82b-c34ad2b8ea93))
+  (segment (start 275.975 110.5925) (end 275.975 112.391) (width 0.254) (layer "F.Cu") (net 102) (tstamp 51eaa2a4-c3fb-44d9-bc18-40264f10adcb))
   (segment (start 288.798 108.712) (end 288.798 107.822) (width 0.254) (layer "F.Cu") (net 102) (tstamp 6c133170-c5ac-49f8-b844-a9ce2f68a186))
-  (segment (start 274.828 112.208038) (end 274.828 112.522) (width 0.254) (layer "F.Cu") (net 102) (tstamp 7466a1ea-0f88-4919-a593-657e46b93efa))
   (segment (start 284.988 108.966) (end 284.988 111.1735) (width 0.254) (layer "F.Cu") (net 102) (tstamp 7a5fe477-7671-4393-8dea-d51c93cdbac6))
+  (segment (start 284.607 108.966) (end 284.988 108.966) (width 0.254) (layer "F.Cu") (net 102) (tstamp 83726a94-251a-4de3-ba55-f20bc29af938))
+  (segment (start 275.59 112.776) (end 275.59 113.03) (width 0.254) (layer "F.Cu") (net 102) (tstamp 8578ce2e-5505-40f9-8a3c-eee3a1af4a1d))
   (segment (start 288.925 108.839) (end 288.798 108.712) (width 0.254) (layer "F.Cu") (net 102) (tstamp 897688f5-9962-4787-973c-9ff4843c86b5))
-  (segment (start 274.828 112.522) (end 275.59 113.284) (width 0.254) (layer "F.Cu") (net 102) (tstamp 9525e750-fb69-42c8-9d78-6b2f844f4a97))
-  (segment (start 276.34375 110.0975) (end 276.34375 110.692288) (width 0.254) (layer "F.Cu") (net 102) (tstamp 9c73f98e-eeca-41bf-b441-0f7ec37500f7))
-  (segment (start 278.645223 113.284) (end 282.963222 108.966) (width 0.254) (layer "F.Cu") (net 102) (tstamp b8147a8f-9dee-4d17-9a5e-feff697ac762))
-  (segment (start 276.34375 110.692288) (end 274.828 112.208038) (width 0.254) (layer "F.Cu") (net 102) (tstamp c2807ab8-b35c-412b-bbd9-c62854b3c85d))
   (segment (start 289.61399 109.52799) (end 290.351307 109.52799) (width 0.254) (layer "F.Cu") (net 102) (tstamp d5794475-351a-44dc-a6a5-671ffd89a8fc))
+  (segment (start 276.80601 114.24601) (end 275.59 113.03) (width 0.254) (layer "F.Cu") (net 102) (tstamp dc657808-dfe5-4f96-8e5b-41f280d41e00))
+  (segment (start 279.32699 114.24601) (end 284.607 108.966) (width 0.254) (layer "F.Cu") (net 102) (tstamp e7587507-2276-42c9-81a1-23d6b5608e48))
   (segment (start 294.669306 113.84599) (end 330.205972 113.84599) (width 0.254) (layer "F.Cu") (net 102) (tstamp ebbbc592-3e6c-47e2-9ab4-169a723c002e))
   (segment (start 340.800962 103.251) (end 341.533 103.251) (width 0.254) (layer "F.Cu") (net 102) (tstamp ef4e24a2-1e07-418a-b9e0-91900730f963))
   (segment (start 290.351307 109.52799) (end 294.669306 113.84599) (width 0.254) (layer "F.Cu") (net 102) (tstamp f9b90d7e-d0be-445a-9632-a9cca24348d0))
+  (via (at 275.59 113.03) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 102) (tstamp 3ac69ddc-4120-420c-8760-941a0eb98d9f))
   (via (at 284.988 108.966) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 102) (tstamp 8ce4f3aa-bd84-47c7-8cf7-ac3463bfd9cc))
   (via (at 288.925 108.839) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 102) (tstamp fda0161f-e708-4c57-a00c-d5c5227a8dfc))
-  (via (at 274.828 112.268) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 102) (tstamp fe20dfa1-1976-47a7-8475-9f9a863d37a1))
-  (segment (start 276.99375 108.8875) (end 276.99375 108.715462) (width 0.254) (layer "B.Cu") (net 102) (tstamp 0efb1080-8d47-42a9-8a5a-4830f1cd2f16))
   (segment (start 284.988 108.966) (end 288.798 108.966) (width 0.254) (layer "B.Cu") (net 102) (tstamp 1dbb4123-dd50-4c57-9a5b-f24707a717aa))
-  (segment (start 276.606 108.327712) (end 276.606 108.071788) (width 0.254) (layer "B.Cu") (net 102) (tstamp 31992ec3-a755-4b8d-a4db-b83c32b3d38d))
-  (segment (start 276.606 108.071788) (end 275.644702 107.11049) (width 0.254) (layer "B.Cu") (net 102) (tstamp 38948c52-afb1-4d2b-90e0-34a60a02cbfb))
-  (segment (start 275.644702 107.11049) (end 272.152258 107.11049) (width 0.254) (layer "B.Cu") (net 102) (tstamp 405a65dd-a86d-48e9-a77b-5b7373254e31))
-  (segment (start 276.99375 108.715462) (end 276.606 108.327712) (width 0.254) (layer "B.Cu") (net 102) (tstamp 40c31ead-90a4-4357-a4c1-eafe98e341e4))
-  (segment (start 271.272 108.900217) (end 274.639783 112.268) (width 0.254) (layer "B.Cu") (net 102) (tstamp 7ae9d17c-30e2-4d35-af20-a7edb2f3519d))
-  (segment (start 272.152258 107.11049) (end 271.272 107.990748) (width 0.254) (layer "B.Cu") (net 102) (tstamp 9647aa03-289b-448c-8529-d907e2bc54f4))
+  (segment (start 276.625 110.882933) (end 277.587001 111.844934) (width 0.254) (layer "B.Cu") (net 102) (tstamp 4b630cde-b5a1-47a1-ab09-5122b13e9082))
+  (segment (start 277.587001 111.844934) (end 277.587001 113.378961) (width 0.254) (layer "B.Cu") (net 102) (tstamp 4e45ab90-b1b2-41c8-bc72-f71a66e2cf0c))
+  (segment (start 276.625 109.3425) (end 276.625 110.882933) (width 0.254) (layer "B.Cu") (net 102) (tstamp 50e387c1-b02d-4be7-a139-006a03e47ec0))
+  (segment (start 277.208961 113.757001) (end 276.317001 113.757001) (width 0.254) (layer "B.Cu") (net 102) (tstamp 96de9149-b327-4fc4-a86b-7bf23a4bf199))
   (segment (start 288.798 108.966) (end 288.925 108.839) (width 0.254) (layer "B.Cu") (net 102) (tstamp ab72ea8a-f996-487a-ad8d-3bf6a0ce4d65))
-  (segment (start 274.639783 112.268) (end 274.828 112.268) (width 0.254) (layer "B.Cu") (net 102) (tstamp b5d971db-1530-46c7-84a5-896422a22acf))
-  (segment (start 271.272 107.990748) (end 271.272 108.900217) (width 0.254) (layer "B.Cu") (net 102) (tstamp c6af84f8-5c2d-4082-8ebb-359867fbb93d))
-  (segment (start 275.844 112.268) (end 276.40599 112.82999) (width 0.254) (layer "F.Cu") (net 103) (tstamp 0eb6d818-e257-4542-a40f-219297b9cc13))
+  (segment (start 277.587001 113.378961) (end 277.208961 113.757001) (width 0.254) (layer "B.Cu") (net 102) (tstamp d63eceea-9199-41f8-9f63-96fc2c793a10))
+  (segment (start 276.317001 113.757001) (end 275.59 113.03) (width 0.254) (layer "B.Cu") (net 102) (tstamp e3b7ac48-4ceb-46b6-95b6-42f3048fa37b))
   (segment (start 286.004 107.95) (end 288.036 109.982) (width 0.254) (layer "F.Cu") (net 103) (tstamp 1044a363-2778-4d03-9e9e-ef2163cc9da5))
-  (segment (start 276.84375 110.0975) (end 276.84375 111.01425) (width 0.254) (layer "F.Cu") (net 103) (tstamp 1502281f-b25f-43c6-826e-42845c18da9a))
-  (segment (start 276.84375 111.01425) (end 275.844 112.014) (width 0.254) (layer "F.Cu") (net 103) (tstamp 2699953a-9a3f-40e1-b7d7-9c42b89d3c51))
   (segment (start 290.16325 109.982) (end 294.48125 114.3) (width 0.254) (layer "F.Cu") (net 103) (tstamp 455a79eb-4cca-4d97-8989-2b730d19ab5b))
+  (segment (start 276.86 113.538) (end 277.114 113.792) (width 0.254) (layer "F.Cu") (net 103) (tstamp 48c3ccce-f667-4e69-b262-c8211617981c))
+  (segment (start 279.086038 113.792) (end 285.056038 107.822) (width 0.254) (layer "F.Cu") (net 103) (tstamp 49dee5c0-2766-42c8-af81-dd1b6c7a0396))
   (segment (start 288.036 109.982) (end 290.16325 109.982) (width 0.254) (layer "F.Cu") (net 103) (tstamp 4b384306-ea23-49e3-906f-5c7e46127818))
-  (segment (start 283.465156 107.822) (end 286.004 107.822) (width 0.254) (layer "F.Cu") (net 103) (tstamp 54683e60-f24b-44b1-9392-f62f799929e4))
   (segment (start 339.598 105.156) (end 341.533 105.156) (width 0.254) (layer "F.Cu") (net 103) (tstamp 5a57d93c-cef1-41d1-b638-c65f1664cf3e))
-  (segment (start 275.844 112.014) (end 275.844 112.268) (width 0.254) (layer "F.Cu") (net 103) (tstamp 6046667e-66ed-4aa9-a339-345f6ed1c992))
-  (segment (start 278.457166 112.82999) (end 283.465156 107.822) (width 0.254) (layer "F.Cu") (net 103) (tstamp b1dc2d13-a387-473b-942a-59783c2caa62))
+  (segment (start 276.475 110.5925) (end 276.475 112.391) (width 0.254) (layer "F.Cu") (net 103) (tstamp 7c50a92a-7f19-405a-a7be-8bf938452595))
+  (segment (start 276.475 112.391) (end 276.86 112.776) (width 0.254) (layer "F.Cu") (net 103) (tstamp 7c544364-15c5-46bb-94db-5b1b6cf9e5f4))
+  (segment (start 285.056038 107.822) (end 286.004 107.822) (width 0.254) (layer "F.Cu") (net 103) (tstamp 818fb393-1f39-4985-8f26-5e05d97a25ad))
   (segment (start 294.48125 114.3) (end 330.454 114.3) (width 0.254) (layer "F.Cu") (net 103) (tstamp b5339563-39f1-424a-aa9c-e24cd9523b6b))
+  (segment (start 276.86 113.03) (end 276.86 113.538) (width 0.254) (layer "F.Cu") (net 103) (tstamp c1a4f574-67b2-45d5-8ce6-889871e3c6fa))
   (segment (start 330.454 114.3) (end 339.598 105.156) (width 0.254) (layer "F.Cu") (net 103) (tstamp cedf9e19-687a-4ae3-8f0f-91035d746af8))
-  (segment (start 276.40599 112.82999) (end 278.457166 112.82999) (width 0.254) (layer "F.Cu") (net 103) (tstamp fa96edb5-2fd6-4fc1-b26d-c9cc722c5ae6))
-  (via (at 275.844 112.268) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 103) (tstamp 307572fb-46f0-4752-83f0-e97244cd93ed))
-  (segment (start 275.844 112.268) (end 276.19375 111.91825) (width 0.254) (layer "B.Cu") (net 103) (tstamp 72436a09-d67d-4691-b589-9e0e3d982a42))
-  (segment (start 276.19375 111.91825) (end 276.19375 108.8875) (width 0.254) (layer "B.Cu") (net 103) (tstamp 73ce30ed-4fdd-4397-8df2-f60fce88cf05))
-  (segment (start 274.393014 106.3625) (end 270.01875 106.3625) (width 0.254) (layer "F.Cu") (net 105) (tstamp 1c959156-a1c6-4a4d-a2b5-452a6e86ef3b))
-  (segment (start 275.79375 108.1875) (end 275.79375 107.763236) (width 0.254) (layer "F.Cu") (net 105) (tstamp 1f6ce4b5-319e-46b0-a9b9-b451afe9fe97))
-  (segment (start 275.79375 107.763236) (end 274.393014 106.3625) (width 0.254) (layer "F.Cu") (net 105) (tstamp 5ac4e306-9575-4243-9fa2-7d83ccf6717e))
-  (segment (start 277.84375 110.71175) (end 277.84375 110.0975) (width 0.3) (layer "F.Cu") (net 106) (tstamp 04e40fb0-e2d4-4e42-9de4-ccfc233d342e))
-  (segment (start 277.84375 110.0975) (end 277.84375 108.9375) (width 0.3) (layer "F.Cu") (net 106) (tstamp 76c1d77a-015a-4afa-b8c7-57c1cc63b983))
-  (segment (start 275.34375 110.0975) (end 275.34375 108.9375) (width 0.3) (layer "F.Cu") (net 106) (tstamp e26b2cab-8638-4cc7-8cfc-106c20970798))
-  (segment (start 278.638 111.506) (end 277.84375 110.71175) (width 0.3) (layer "F.Cu") (net 106) (tstamp ed6db753-a5fe-4111-831d-bf9b3ebaa7e7))
-  (via (at 278.638 111.506) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 106) (tstamp 9f7b9f8f-6d40-4b4d-b605-0399ad79eea4))
-  (segment (start 280.478001 113.346001) (end 284.522001 113.346001) (width 0.381) (layer "B.Cu") (net 106) (tstamp 0507fbb5-cacf-4922-a27b-51160c39cbf6))
-  (segment (start 284.522001 113.346001) (end 285.222 114.046) (width 0.381) (layer "B.Cu") (net 106) (tstamp 4aef6692-26df-4d30-834f-179f8e16eda8))
-  (segment (start 280.478001 113.346001) (end 278.638 111.506) (width 0.381) (layer "B.Cu") (net 106) (tstamp 55cc4ced-48cf-4a3c-bfcf-2aa974d2c3a5))
-  (segment (start 273.2255 113.792) (end 274.574 113.792) (width 0.254) (layer "F.Cu") (net 117) (tstamp 0278a273-cbeb-4dd7-af02-ca952cb60cef))
-  (segment (start 277.34375 111.98975) (end 277.34375 110.0975) (width 0.254) (layer "F.Cu") (net 117) (tstamp c7d3ecd0-f927-427c-bd16-8fc415ec12f9))
-  (segment (start 277.368 112.014) (end 277.34375 111.98975) (width 0.254) (layer "F.Cu") (net 117) (tstamp da43de61-0256-4f07-9c22-31b5ad3be1f5))
-  (via (at 274.574 113.792) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 117) (tstamp 4aa687e7-6591-4774-ac06-7f7d22021c8e))
-  (via (at 277.368 112.014) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 117) (tstamp b568ad7e-8c97-42f7-a186-c02e3f41f4cb))
-  (segment (start 275.59 113.792) (end 277.368 112.014) (width 0.254) (layer "B.Cu") (net 117) (tstamp db5d2d73-7fca-4303-824a-7564530f8a13))
-  (segment (start 274.574 113.792) (end 275.59 113.792) (width 0.254) (layer "B.Cu") (net 117) (tstamp f71c250f-8d14-4f0b-86ad-fdf52261ed60))
-
-  (zone (net 0) (net_name "") (layer "F.Cu") (tstamp 18a05c57-69af-4445-aa9e-3c55f77b600a) (hatch edge 0.508)
-    (connect_pads (clearance 0.508))
-    (min_thickness 0.254)
-    (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508))
-    (polygon
-      (pts
-        (xy 279.908 108.204)
-        (xy 276.352 108.966)
-        (xy 276.352 107.442)
-        (xy 279.908 107.442)
-      )
-    )
-  )
+  (segment (start 277.114 113.792) (end 279.086038 113.792) (width 0.254) (layer "F.Cu") (net 103) (tstamp e843fe64-391e-4559-a236-ee32f0a11b42))
+  (via (at 276.86 113.03) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 103) (tstamp 8b798981-3aa9-4db9-bfa9-d14c7b2ebca3))
+  (segment (start 275.825 110.979) (end 275.825 109.3425) (width 0.254) (layer "B.Cu") (net 103) (tstamp 68d0b084-99e9-454a-834b-9dfab8abfb88))
+  (segment (start 276.86 112.776) (end 276.86 112.014) (width 0.254) (layer "B.Cu") (net 103) (tstamp 6e5d7c36-dd78-4960-934a-55b9fa6c6a78))
+  (segment (start 276.86 112.014) (end 275.825 110.979) (width 0.254) (layer "B.Cu") (net 103) (tstamp a275cfee-0ad1-4de5-b775-79229533615b))
+  (segment (start 275.425 108.6425) (end 275.425 108.182881) (width 0.254) (layer "F.Cu") (net 105) (tstamp 78d02d52-d518-4956-96b9-2be42cad9169))
+  (segment (start 273.604619 106.3625) (end 270.01875 106.3625) (width 0.254) (layer "F.Cu") (net 105) (tstamp a674b002-2d46-404e-8a72-685736eb1aa6))
+  (segment (start 275.425 108.182881) (end 273.604619 106.3625) (width 0.254) (layer "F.Cu") (net 105) (tstamp f5f6aaba-ac11-4fab-b5d4-e87033c20f05))
+  (segment (start 274.975 110.5925) (end 274.975 109.3925) (width 0.254) (layer "F.Cu") (net 106) (tstamp 42da31eb-4a6d-4b63-be76-c378dd839038))
+  (segment (start 277.475 111.4465) (end 278.0425 112.014) (width 0.254) (layer "F.Cu") (net 106) (tstamp 44674def-22cf-47eb-ad3b-46a06abbf25b))
+  (segment (start 277.475 110.5925) (end 277.475 109.3925) (width 0.254) (layer "F.Cu") (net 106) (tstamp 76df021f-00a9-4838-928a-e0a42e0ec42d))
+  (segment (start 277.475 110.5925) (end 277.475 111.4465) (width 0.254) (layer "F.Cu") (net 106) (tstamp a204ff4f-cab4-4dd8-882b-cb4db0687b88))
+  (segment (start 278.0425 112.014) (end 278.384 112.014) (width 0.254) (layer "F.Cu") (net 106) (tstamp aca33533-fc21-4acf-9cba-0b00c8da6bf3))
+  (via (at 278.384 112.014) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 106) (tstamp 9c889de7-3787-41da-b46c-dc88dde58321))
+  (segment (start 275.025 109.3425) (end 275.025 109.802119) (width 0.254) (layer "B.Cu") (net 106) (tstamp 10a5d316-0410-4169-8dab-aa4ba7252902))
+  (segment (start 275.025 109.802119) (end 274.832618 109.994501) (width 0.254) (layer "B.Cu") (net 106) (tstamp 11f3a835-87af-4c6e-bad6-91a181061a90))
+  (segment (start 278.384 112.014) (end 283.19 112.014) (width 0.381) (layer "B.Cu") (net 106) (tstamp 19c0534a-5ed1-4508-8095-03c5e53c341d))
+  (segment (start 283.19 112.014) (end 285.222 114.046) (width 0.381) (layer "B.Cu") (net 106) (tstamp 46e99ae3-89f0-4e25-a0a3-6b19fdaeb00a))
+  (segment (start 279.677001 108.729539) (end 279.677001 109.655461) (width 0.254) (layer "B.Cu") (net 106) (tstamp 4fa96606-2575-43eb-8388-428dec469490))
+  (segment (start 274.832618 109.994501) (end 273.112039 109.994501) (width 0.254) (layer "B.Cu") (net 106) (tstamp 626ec38e-1300-4b90-baff-ecb61e275afa))
+  (segment (start 278.927961 107.980499) (end 279.677001 108.729539) (width 0.254) (layer "B.Cu") (net 106) (tstamp 6c0ad3fc-f800-47b1-b9f8-7c7394c02e0e))
+  (segment (start 272.772999 109.655461) (end 272.772999 108.735001) (width 0.254) (layer "B.Cu") (net 106) (tstamp 92034888-6f4e-4212-84d0-f35b3260543b))
+  (segment (start 272.772999 108.735001) (end 273.527501 107.980499) (width 0.254) (layer "B.Cu") (net 106) (tstamp c8fcf9fe-1643-42e9-927a-09327390fbb4))
+  (segment (start 273.527501 107.980499) (end 278.927961 107.980499) (width 0.254) (layer "B.Cu") (net 106) (tstamp d5709297-6988-41c3-8fc7-cd1539f8c0fa))
+  (segment (start 279.337961 109.994501) (end 277.888501 109.994501) (width 0.254) (layer "B.Cu") (net 106) (tstamp d916ea77-5df0-491e-a82c-493206fd7388))
+  (segment (start 273.112039 109.994501) (end 272.772999 109.655461) (width 0.254) (layer "B.Cu") (net 106) (tstamp df73f83b-5bd3-40ed-8987-c62e215ab992))
+  (segment (start 279.677001 109.655461) (end 279.337961 109.994501) (width 0.254) (layer "B.Cu") (net 106) (tstamp eb06e480-eb70-4684-ab39-cc1127cf7f9c))
+  (segment (start 277.888501 109.994501) (end 277.425 109.531) (width 0.254) (layer "B.Cu") (net 106) (tstamp ee76f3e2-0850-48a1-a4c5-e337ae28d776))
+  (segment (start 276.975 110.5925) (end 276.975 111.904981) (width 0.254) (layer "F.Cu") (net 117) (tstamp 0d4d45b1-0714-4268-af7b-33ad640de552))
+  (segment (start 277.81102 112.741001) (end 279.180999 112.741001) (width 0.254) (layer "F.Cu") (net 117) (tstamp 5719ca00-3a85-4a53-9b94-e67946c450aa))
+  (segment (start 276.975 111.904981) (end 277.81102 112.741001) (width 0.254) (layer "F.Cu") (net 117) (tstamp 67f37236-d23a-46e4-b14f-3dd3aae7eaf3))
+  (segment (start 282.194 109.728) (end 282.194 107.1095) (width 0.254) (layer "F.Cu") (net 117) (tstamp 87b2e7a1-6c4b-4595-b836-a41faf8bbab5))
+  (segment (start 279.180999 112.741001) (end 282.194 109.728) (width 0.254) (layer "F.Cu") (net 117) (tstamp d95a10e1-9fe2-4cfb-abaa-d274367ff6f8))
+
   (zone (net 1) (net_name "GND") (layer "F.Cu") (tstamp 20972ef1-26cf-46e1-b828-2e054af8b632) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
     (min_thickness 0.254) (filled_areas_thickness no)
@@ -12120,21 +12087,21 @@
         (xy 380.057182 115.5599)
         (xy 380.057167 115.559901)
         (xy 379.732829 115.597428)
-        (xy 379.668587 115.612851)
-        (xy 379.597679 115.609304)
-        (xy 379.539945 115.567984)
-        (xy 379.513715 115.502011)
-        (xy 379.527317 115.432329)
-        (xy 379.571052 115.384334)
-        (xy 379.649961 115.333622)
-        (xy 379.792978 115.168574)
-        (xy 379.883702 114.969914)
-        (xy 379.883703 114.969908)
-        (xy 379.906974 114.808062)
-        (xy 379.906974 114.554)
-        (xy 379.16025 114.554)
-        (xy 379.16025 115.513225)
-        (xy 379.165995 115.51897)
+        (xy 379.641849 115.61927)
+        (xy 379.570941 115.615723)
+        (xy 379.513207 115.574403)
+        (xy 379.486977 115.508429)
+        (xy 379.50058 115.438748)
+        (xy 379.544314 115.390753)
+        (xy 379.633211 115.333622)
+        (xy 379.776228 115.168574)
+        (xy 379.866952 114.969914)
+        (xy 379.866953 114.969908)
+        (xy 379.890224 114.808062)
+        (xy 379.890224 114.554)
+        (xy 379.1435 114.554)
+        (xy 379.1435 115.513224)
+        (xy 379.146425 115.513224)
         (xy 379.214546 115.533226)
         (xy 379.261039 115.586882)
         (xy 379.271143 115.657156)
@@ -12205,57 +12172,57 @@
         (xy 376.761889 115.557188)
         (xy 376.768948 115.550129)
         (xy 376.858043 115.513224)
-        (xy 377.30839 115.513224)
-        (xy 377.591237 115.451695)
-        (xy 377.774961 115.333622)
-        (xy 377.871388 115.222341)
-        (xy 377.931115 115.183958)
-        (xy 378.002111 115.183958)
-        (xy 378.07261 115.236733)
-        (xy 378.085128 115.256211)
-        (xy 378.250176 115.399228)
-        (xy 378.448836 115.489952)
-        (xy 378.448842 115.489953)
-        (xy 378.610688 115.513224)
-        (xy 378.65225 115.513224)
-        (xy 378.65225 113.086776)
-        (xy 379.16025 113.086776)
-        (xy 379.16025 114.046)
-        (xy 379.906974 114.046)
-        (xy 379.906974 113.81036)
-        (xy 379.845445 113.527513)
-        (xy 379.727372 113.343789)
-        (xy 379.562324 113.200772)
-        (xy 379.363664 113.110048)
-        (xy 379.363658 113.110047)
-        (xy 379.201812 113.086776)
-        (xy 379.16025 113.086776)
-        (xy 378.65225 113.086776)
-        (xy 378.62911 113.086776)
-        (xy 378.346263 113.148305)
-        (xy 378.162539 113.266378)
-        (xy 378.066112 113.377659)
-        (xy 378.006385 113.416042)
-        (xy 377.935389 113.416042)
-        (xy 377.86489 113.363267)
-        (xy 377.852372 113.343789)
-        (xy 377.687324 113.200772)
-        (xy 377.488664 113.110048)
-        (xy 377.488658 113.110047)
-        (xy 377.326812 113.086776)
-        (xy 376.75411 113.086776)
-        (xy 376.471263 113.148305)
-        (xy 376.287539 113.266378)
-        (xy 376.144522 113.431426)
-        (xy 376.053798 113.630086)
-        (xy 376.053797 113.630092)
-        (xy 376.030526 113.791938)
-        (xy 376.030526 114.134069)
-        (xy 376.010524 114.20219)
-        (xy 375.956868 114.248683)
-        (xy 375.886594 114.258787)
-        (xy 375.841527 114.243189)
-        (xy 375.794227 114.215881)
+        (xy 377.29164 115.513224)
+        (xy 377.574487 115.451695)
+        (xy 377.758211 115.333622)
+        (xy 377.854638 115.222341)
+        (xy 377.914365 115.183958)
+        (xy 377.985361 115.183958)
+        (xy 378.05586 115.236733)
+        (xy 378.068378 115.256211)
+        (xy 378.233426 115.399228)
+        (xy 378.432086 115.489952)
+        (xy 378.432092 115.489953)
+        (xy 378.593938 115.513224)
+        (xy 378.6355 115.513224)
+        (xy 378.6355 113.086776)
+        (xy 379.1435 113.086776)
+        (xy 379.1435 114.046)
+        (xy 379.890224 114.046)
+        (xy 379.890224 113.81036)
+        (xy 379.828695 113.527513)
+        (xy 379.710622 113.343789)
+        (xy 379.545574 113.200772)
+        (xy 379.346914 113.110048)
+        (xy 379.346908 113.110047)
+        (xy 379.185062 113.086776)
+        (xy 379.1435 113.086776)
+        (xy 378.6355 113.086776)
+        (xy 378.61236 113.086776)
+        (xy 378.329513 113.148305)
+        (xy 378.145789 113.266378)
+        (xy 378.049362 113.377659)
+        (xy 377.989635 113.416042)
+        (xy 377.918639 113.416042)
+        (xy 377.84814 113.363267)
+        (xy 377.835622 113.343789)
+        (xy 377.670574 113.200772)
+        (xy 377.471914 113.110048)
+        (xy 377.471908 113.110047)
+        (xy 377.310062 113.086776)
+        (xy 376.73736 113.086776)
+        (xy 376.454513 113.148305)
+        (xy 376.270789 113.266378)
+        (xy 376.127772 113.431426)
+        (xy 376.037048 113.630086)
+        (xy 376.037047 113.630092)
+        (xy 376.013776 113.791938)
+        (xy 376.013776 114.124399)
+        (xy 375.993774 114.19252)
+        (xy 375.940118 114.239013)
+        (xy 375.869844 114.249117)
+        (xy 375.824776 114.233518)
+        (xy 375.794229 114.215882)
         (xy 375.794223 114.215879)
         (xy 375.563288 114.154)
         (xy 375.390028 114.154)
@@ -12453,19 +12420,23 @@
         (xy 373.103304 106.274008)
         (xy 373.088344 106.189143)
         (xy 373.090837 106.175002)
-        (xy 373.090837 104.678578)
-        (xy 373.126 104.593688)
-        (xy 373.126 103.632)
-        (xy 373.634 103.632)
-        (xy 373.634 104.591224)
-        (xy 373.65714 104.591224)
-        (xy 373.939987 104.529695)
-        (xy 374.123711 104.411622)
-        (xy 374.266728 104.246574)
-        (xy 374.357452 104.047914)
-        (xy 374.357453 104.047908)
-        (xy 374.380724 103.886062)
-        (xy 374.380724 103.747438)
+        (xy 373.090837 104.712322)
+        (xy 373.110839 104.644201)
+        (xy 373.164495 104.597708)
+        (xy 373.234769 104.587604)
+        (xy 373.259947 104.591224)
+        (xy 373.3015 104.591224)
+        (xy 373.3015 103.632)
+        (xy 373.8095 103.632)
+        (xy 373.8095 104.591224)
+        (xy 373.83264 104.591224)
+        (xy 374.115487 104.529695)
+        (xy 374.299211 104.411622)
+        (xy 374.442228 104.246574)
+        (xy 374.532952 104.047914)
+        (xy 374.532953 104.047908)
+        (xy 374.556224 103.886062)
+        (xy 374.556224 103.747438)
         (xy 374.960776 103.747438)
         (xy 374.960776 103.789)
         (xy 375.92 103.789001)
@@ -12518,23 +12489,23 @@
         (xy 374.984048 103.585586)
         (xy 374.984047 103.585592)
         (xy 374.960776 103.747438)
-        (xy 374.380724 103.747438)
-        (xy 374.380724 103.632)
-        (xy 373.634 103.632)
-        (xy 373.126 103.632)
-        (xy 373.126 103.25)
-        (xy 373.146002 103.181879)
-        (xy 373.199658 103.135386)
-        (xy 373.252 103.124)
-        (xy 374.380724 103.124)
-        (xy 374.380724 102.88836)
-        (xy 374.319195 102.605513)
-        (xy 374.201122 102.421789)
-        (xy 374.094297 102.329224)
-        (xy 374.055914 102.269498)
-        (xy 374.055914 102.198501)
-        (xy 374.094298 102.138775)
-        (xy 374.17681 102.108)
+        (xy 374.556224 103.747438)
+        (xy 374.556224 103.632)
+        (xy 373.8095 103.632)
+        (xy 373.3015 103.632)
+        (xy 373.3015 103.25)
+        (xy 373.321502 103.181879)
+        (xy 373.375158 103.135386)
+        (xy 373.4275 103.124)
+        (xy 374.556224 103.124)
+        (xy 374.556224 102.88836)
+        (xy 374.494695 102.605513)
+        (xy 374.376622 102.421789)
+        (xy 374.269797 102.329224)
+        (xy 374.231414 102.269498)
+        (xy 374.231414 102.198501)
+        (xy 374.269798 102.138775)
+        (xy 374.35231 102.108)
         (xy 382.513126 102.108)
       )
     )
@@ -13269,6 +13240,220 @@
     (filled_polygon
       (layer F.Cu)
       (pts
+        (xy 271.368119 102.128002)
+        (xy 271.414612 102.181658)
+        (xy 271.424716 102.251932)
+        (xy 271.37895 102.332197)
+        (xy 271.246326 102.438829)
+        (xy 271.119264 102.590257)
+        (xy 271.119262 102.59026)
+        (xy 271.024029 102.763488)
+        (xy 270.964257 102.951912)
+        (xy 270.947 103.116096)
+        (xy 270.947 103.2085)
+        (xy 271.753191 103.208501)
+        (xy 271.753193 103.2085)
+        (xy 272.963 103.208501)
+        (xy 272.963 103.112766)
+        (xy 272.948586 102.965767)
+        (xy 272.948584 102.965757)
+        (xy 272.891451 102.776523)
+        (xy 272.798647 102.601983)
+        (xy 272.673705 102.448789)
+        (xy 272.673704 102.448788)
+        (xy 272.531425 102.331085)
+        (xy 272.491687 102.272251)
+        (xy 272.490064 102.201273)
+        (xy 272.527073 102.140686)
+        (xy 272.61174 102.108)
+        (xy 275.512693 102.108)
+        (xy 275.580814 102.128002)
+        (xy 275.627307 102.181658)
+        (xy 275.636779 102.255879)
+        (xy 275.609163 102.412501)
+        (xy 275.609163 103.412498)
+        (xy 275.678273 103.67042)
+        (xy 275.793426 103.807654)
+        (xy 275.948574 103.897229)
+        (xy 276.125001 103.928337)
+        (xy 276.324998 103.928337)
+        (xy 276.58292 103.859227)
+        (xy 276.638922 103.812235)
+        (xy 279.487 103.812235)
+        (xy 279.501414 103.959238)
+        (xy 279.558547 104.148471)
+        (xy 279.55855 104.148478)
+        (xy 279.651353 104.323017)
+        (xy 279.776295 104.476211)
+        (xy 279.776296 104.476212)
+        (xy 279.928604 104.602212)
+        (xy 280.102496 104.696235)
+        (xy 280.241 104.739108)
+        (xy 280.241 104.738538)
+        (xy 280.748999 104.738538)
+        (xy 280.83289 104.713848)
+        (xy 280.903887 104.713803)
+        (xy 280.963637 104.752149)
+        (xy 280.993171 104.816711)
+        (xy 280.993183 104.852654)
+        (xy 280.980776 104.938947)
+        (xy 280.980776 104.9805)
+        (xy 281.94 104.980501)
+        (xy 281.94 104.9805)
+        (xy 282.447999 104.9805)
+        (xy 283.407224 104.980501)
+        (xy 283.407224 104.971998)
+        (xy 284.888163 104.971998)
+        (xy 284.957273 105.22992)
+        (xy 285.072426 105.367154)
+        (xy 285.227574 105.456729)
+        (xy 285.404001 105.487837)
+        (xy 285.75 105.487837)
+        (xy 286.257999 105.487837)
+        (xy 286.603998 105.487837)
+        (xy 286.86192 105.418727)
+        (xy 286.999154 105.303574)
+        (xy 287.088729 105.148426)
+        (xy 287.088728 105.148426)
+        (xy 287.119837 104.971999)
+        (xy 287.119837 104.971998)
+        (xy 287.682163 104.971998)
+        (xy 287.751273 105.22992)
+        (xy 287.866426 105.367154)
+        (xy 288.021574 105.456729)
+        (xy 288.198001 105.487837)
+        (xy 288.544 105.487837)
+        (xy 289.051999 105.487837)
+        (xy 289.397998 105.487837)
+        (xy 289.65592 105.418727)
+        (xy 289.793154 105.303574)
+        (xy 289.882729 105.148426)
+        (xy 289.882728 105.148426)
+        (xy 289.913837 104.971999)
+        (xy 289.913837 104.776)
+        (xy 289.052 104.775999)
+        (xy 289.051999 105.487837)
+        (xy 288.544 105.487837)
+        (xy 288.544001 104.776)
+        (xy 287.682163 104.775999)
+        (xy 287.682163 104.971998)
+        (xy 287.119837 104.971998)
+        (xy 287.119837 104.776)
+        (xy 286.258 104.775999)
+        (xy 286.257999 105.487837)
+        (xy 285.75 105.487837)
+        (xy 285.750001 104.776)
+        (xy 284.888163 104.775999)
+        (xy 284.888163 104.971998)
+        (xy 283.407224 104.971998)
+        (xy 283.407224 104.95736)
+        (xy 283.345695 104.674513)
+        (xy 283.227622 104.490789)
+        (xy 283.062574 104.347772)
+        (xy 282.863914 104.257048)
+        (xy 282.863908 104.257047)
+        (xy 282.702062 104.233776)
+        (xy 282.448 104.233776)
+        (xy 282.447999 104.9805)
+        (xy 281.94 104.9805)
+        (xy 281.940001 104.233776)
+        (xy 281.70436 104.233776)
+        (xy 281.59342 104.257909)
+        (xy 281.522604 104.252843)
+        (xy 281.465768 104.210296)
+        (xy 281.440958 104.143776)
+        (xy 281.446535 104.09669)
+        (xy 281.454366 104.072001)
+        (xy 284.888163 104.072001)
+        (xy 284.888163 104.268)
+        (xy 285.75 104.268001)
+        (xy 285.75 104.268)
+        (xy 286.257999 104.268)
+        (xy 287.119837 104.268001)
+        (xy 287.119837 104.072002)
+        (xy 287.119837 104.072001)
+        (xy 287.682163 104.072001)
+        (xy 287.682163 104.268)
+        (xy 288.544 104.268001)
+        (xy 288.544 104.268)
+        (xy 289.051999 104.268)
+        (xy 289.913837 104.268001)
+        (xy 289.913837 104.072002)
+        (xy 289.844727 103.814081)
+        (xy 289.729574 103.676846)
+        (xy 289.574426 103.587271)
+        (xy 289.397999 103.556163)
+        (xy 289.052 103.556163)
+        (xy 289.051999 104.268)
+        (xy 288.544 104.268)
+        (xy 288.544001 103.556163)
+        (xy 288.198002 103.556163)
+        (xy 287.940081 103.625273)
+        (xy 287.802846 103.740426)
+        (xy 287.713271 103.895574)
+        (xy 287.682163 104.072001)
+        (xy 287.119837 104.072001)
+        (xy 287.050727 103.814081)
+        (xy 286.935574 103.676846)
+        (xy 286.780426 103.587271)
+        (xy 286.603999 103.556163)
+        (xy 286.258 103.556163)
+        (xy 286.257999 104.268)
+        (xy 285.75 104.268)
+        (xy 285.750001 103.556163)
+        (xy 285.404002 103.556163)
+        (xy 285.146081 103.625273)
+        (xy 285.008846 103.740426)
+        (xy 284.919271 103.895574)
+        (xy 284.888163 104.072001)
+        (xy 281.454366 104.072001)
+        (xy 281.485743 103.973088)
+        (xy 281.503 103.808904)
+        (xy 281.503 103.7165)
+        (xy 280.749 103.716499)
+        (xy 280.748999 104.738538)
+        (xy 280.241 104.738538)
+        (xy 280.241001 103.7165)
+        (xy 279.487 103.716499)
+        (xy 279.487 103.812235)
+        (xy 276.638922 103.812235)
+        (xy 276.720154 103.744074)
+        (xy 276.809729 103.588926)
+        (xy 276.809728 103.588926)
+        (xy 276.840837 103.412499)
+        (xy 276.840837 102.412502)
+        (xy 276.801746 102.266611)
+        (xy 276.803436 102.195635)
+        (xy 276.84323 102.136839)
+        (xy 276.923453 102.108)
+        (xy 279.839998 102.108)
+        (xy 279.908119 102.128002)
+        (xy 279.954612 102.181658)
+        (xy 279.964716 102.251932)
+        (xy 279.91895 102.332197)
+        (xy 279.786326 102.438829)
+        (xy 279.659264 102.590257)
+        (xy 279.659262 102.59026)
+        (xy 279.564029 102.763488)
+        (xy 279.504257 102.951912)
+        (xy 279.487 103.116096)
+        (xy 279.487 103.2085)
+        (xy 280.293191 103.208501)
+        (xy 280.293193 103.2085)
+        (xy 281.503 103.208501)
+        (xy 281.503 103.112766)
+        (xy 281.488586 102.965767)
+        (xy 281.488584 102.965757)
+        (xy 281.431451 102.776523)
+        (xy 281.338647 102.601983)
+        (xy 281.213705 102.448789)
+        (xy 281.213704 102.448788)
+        (xy 281.071425 102.331085)
+        (xy 281.031687 102.272251)
+        (xy 281.030064 102.201273)
+        (xy 281.067073 102.140686)
+        (xy 281.15174 102.108)
+        (xy 337.867882 102.108)
         (xy 337.936003 102.128002)
         (xy 337.982496 102.181658)
         (xy 337.989589 102.266612)
@@ -13626,89 +13811,37 @@
         (xy 286.603999 106.856163)
         (xy 285.404002 106.856163)
         (xy 285.146081 106.925273)
-        (xy 285.008844 107.040427)
-        (xy 284.960594 107.124)
-        (xy 284.909212 107.172993)
-        (xy 284.851475 107.187)
-        (xy 283.409989 107.187)
-        (xy 283.409965 107.187001)
-        (xy 283.36458 107.187001)
-        (xy 283.325898 107.19957)
-        (xy 283.306673 107.204185)
-        (xy 283.266483 107.210551)
-        (xy 283.230231 107.229022)
-        (xy 283.211966 107.236588)
-        (xy 283.173277 107.249159)
-        (xy 283.140366 107.27307)
-        (xy 283.12351 107.2834)
-        (xy 283.087261 107.30187)
-        (xy 283.087261 107.301871)
-        (xy 283.054657 107.334475)
-        (xy 283.054613 107.334516)
-        (xy 281.841285 108.547844)
-        (xy 281.778973 108.58187)
-        (xy 281.708158 108.576805)
-        (xy 281.663095 108.547844)
-        (xy 281.656751 108.5415)
-        (xy 280.925559 108.541499)
-        (xy 280.925557 108.5415)
-        (xy 280.098961 108.541499)
-        (xy 280.098959 108.5415)
-        (xy 279.49375 109.146709)
-        (xy 279.493749 110.1215)
-        (xy 279.473747 110.189621)
-        (xy 279.420091 110.236114)
-        (xy 279.367746 110.2475)
-        (xy 279.319747 110.247499)
-        (xy 279.251627 110.227496)
-        (xy 279.205135 110.173839)
-        (xy 279.19375 110.121499)
-        (xy 279.193751 109.2255)
-        (xy 279.213753 109.157379)
-        (xy 279.2275 109.145467)
-        (xy 279.24654 109.0995)
-        (xy 279.123635 108.976596)
-        (xy 279.08961 108.914284)
-        (xy 279.094674 108.843468)
-        (xy 279.123635 108.798405)
-        (xy 279.639921 108.282119)
-        (xy 279.702615 108.248011)
-        (xy 279.908 108.204)
-        (xy 279.908 108.1595)
-        (xy 279.928002 108.091379)
-        (xy 279.981658 108.044886)
-        (xy 280.034 108.0335)
-        (xy 280.46975 108.033501)
-        (xy 280.46975 108.0335)
-        (xy 280.977749 108.0335)
-        (xy 281.65675 108.033501)
-        (xy 281.65675 107.813604)
-        (xy 281.641388 107.667449)
-        (xy 281.580784 107.480926)
-        (xy 281.482719 107.311075)
-        (xy 281.482714 107.311069)
-        (xy 281.351491 107.16533)
-        (xy 281.351485 107.165325)
-        (xy 281.192824 107.05005)
-        (xy 281.013651 106.970277)
-        (xy 280.97775 106.962646)
-        (xy 280.977749 108.0335)
-        (xy 280.46975 108.0335)
-        (xy 280.469751 106.962646)
-        (xy 280.43385 106.970277)
-        (xy 280.25468 107.050049)
-        (xy 280.096013 107.165327)
-        (xy 279.964783 107.311074)
-        (xy 279.964777 107.311082)
-        (xy 279.925563 107.379001)
-        (xy 279.87418 107.427994)
-        (xy 279.816445 107.442)
-        (xy 276.419245 107.442)
-        (xy 276.351124 107.421998)
-        (xy 276.317308 107.390059)
-        (xy 276.313881 107.385342)
-        (xy 276.171646 107.243108)
-        (xy 275.240539 106.312001)
+        (xy 285.008846 107.040426)
+        (xy 284.946034 107.149219)
+        (xy 284.894651 107.198212)
+        (xy 284.866757 107.207349)
+        (xy 284.866801 107.207485)
+        (xy 284.85737 107.21055)
+        (xy 284.82112 107.22902)
+        (xy 284.802854 107.236586)
+        (xy 284.764159 107.249159)
+        (xy 284.764155 107.249161)
+        (xy 284.731244 107.273073)
+        (xy 284.714384 107.283405)
+        (xy 284.67814 107.301872)
+        (xy 283.044095 108.935918)
+        (xy 282.981783 108.969943)
+        (xy 282.910968 108.964879)
+        (xy 282.854132 108.922332)
+        (xy 282.829 108.846823)
+        (xy 282.829 108.180141)
+        (xy 282.849002 108.11202)
+        (xy 282.928217 108.057021)
+        (xy 282.966484 108.048696)
+        (xy 283.150211 107.930622)
+        (xy 283.293228 107.765574)
+        (xy 283.383952 107.566914)
+        (xy 283.383953 107.566908)
+        (xy 283.407224 107.405062)
+        (xy 283.407224 106.83236)
+        (xy 283.345695 106.549513)
+        (xy 283.227622 106.365789)
+        (xy 283.165549 106.312001)
         (xy 295.966163 106.312001)
         (xy 295.966163 106.608)
         (xy 297.128 106.608001)
@@ -13753,26 +13886,206 @@
         (xy 296.086846 105.980426)
         (xy 295.997271 106.135574)
         (xy 295.966163 106.312001)
-        (xy 275.240539 106.312001)
-        (xy 274.920331 105.991794)
-        (xy 274.920314 105.991774)
-        (xy 274.770912 105.842372)
-        (xy 274.734658 105.8239)
-        (xy 274.717799 105.813568)
-        (xy 274.68489 105.789658)
-        (xy 274.684888 105.789656)
-        (xy 274.646205 105.777088)
-        (xy 274.627937 105.769522)
-        (xy 274.591685 105.751051)
-        (xy 274.551498 105.744686)
-        (xy 274.53227 105.74007)
-        (xy 274.493588 105.727501)
-        (xy 274.448205 105.727501)
-        (xy 274.448181 105.7275)
+        (xy 283.165549 106.312001)
+        (xy 283.116341 106.269362)
+        (xy 283.077958 106.209635)
+        (xy 283.077958 106.138639)
+        (xy 283.130733 106.06814)
+        (xy 283.150211 106.055622)
+        (xy 283.293228 105.890574)
+        (xy 283.383952 105.691914)
+        (xy 283.383953 105.691908)
+        (xy 283.407224 105.530062)
+        (xy 283.407224 105.4885)
+        (xy 282.395809 105.488499)
+        (xy 282.395807 105.4885)
+        (xy 280.980776 105.488499)
+        (xy 280.980776 105.51164)
+        (xy 281.042305 105.794487)
+        (xy 281.160378 105.978211)
+        (xy 281.271659 106.074638)
+        (xy 281.310042 106.134365)
+        (xy 281.310042 106.205361)
+        (xy 281.257267 106.27586)
+        (xy 281.237789 106.288378)
+        (xy 281.094772 106.453426)
+        (xy 281.004048 106.652086)
+        (xy 281.004047 106.652092)
+        (xy 280.980776 106.813938)
+        (xy 280.980776 106.816736)
+        (xy 280.980512 106.817635)
+        (xy 280.980455 106.818431)
+        (xy 280.980282 106.818419)
+        (xy 280.960774 106.884857)
+        (xy 280.907118 106.93135)
+        (xy 280.817517 106.937101)
+        (xy 280.749 106.915892)
+        (xy 280.748999 107.990691)
+        (xy 280.749 107.990693)
+        (xy 280.748999 109.468539)
+        (xy 280.874429 109.431623)
+        (xy 281.049609 109.340042)
+        (xy 281.049615 109.340038)
+        (xy 281.203675 109.216171)
+        (xy 281.334699 109.060021)
+        (xy 281.336258 109.061329)
+        (xy 281.384029 109.02232)
+        (xy 281.454568 109.014274)
+        (xy 281.51826 109.045641)
+        (xy 281.559 109.138414)
+        (xy 281.559 109.412785)
+        (xy 281.522095 109.50188)
+        (xy 279.855932 111.168044)
+        (xy 279.79362 111.202069)
+        (xy 279.722805 111.197005)
+        (xy 279.665969 111.154458)
+        (xy 279.640837 111.078949)
+        (xy 279.640837 110.7425)
+        (xy 279.266837 110.742499)
+        (xy 279.198716 110.722497)
+        (xy 279.152223 110.668841)
+        (xy 279.140837 110.616499)
+        (xy 279.140837 110.5685)
+        (xy 279.160839 110.500379)
+        (xy 279.214495 110.453886)
+        (xy 279.266837 110.4425)
+        (xy 279.640837 110.442501)
+        (xy 279.640837 109.9925)
+        (xy 279.634237 109.967871)
+        (xy 279.551795 110.050314)
+        (xy 279.489483 110.084339)
+        (xy 279.418667 110.079275)
+        (xy 279.373603 110.050314)
+        (xy 279.100485 109.777195)
+        (xy 279.077817 109.746279)
+        (xy 279.071728 109.734582)
+        (xy 278.949488 109.588901)
+        (xy 278.952126 109.586688)
+        (xy 278.923229 109.543252)
+        (xy 278.922105 109.472264)
+        (xy 278.985172 109.394182)
+        (xy 279.091131 109.338788)
+        (xy 279.091132 109.338787)
+        (xy 279.160027 109.280977)
+        (xy 279.225067 109.252512)
+        (xy 279.295172 109.263729)
+        (xy 279.330114 109.288403)
+        (xy 279.765981 109.724271)
+        (xy 279.817259 109.615301)
+        (xy 279.849944 109.471439)
+        (xy 279.884542 109.409443)
+        (xy 279.947164 109.375993)
+        (xy 280.032742 109.388519)
+        (xy 280.102496 109.426235)
+        (xy 280.241 109.469108)
+        (xy 280.241001 108.394309)
+        (xy 280.241 108.394307)
+        (xy 280.241001 106.916461)
+        (xy 280.115571 106.953377)
+        (xy 279.940393 107.044958)
+        (xy 279.940386 107.044962)
+        (xy 279.786326 107.168829)
+        (xy 279.659264 107.320257)
+        (xy 279.659262 107.32026)
+        (xy 279.564028 107.493489)
+        (xy 279.504257 107.681912)
+        (xy 279.487 107.846096)
+        (xy 279.487 108.025953)
+        (xy 279.466998 108.094074)
+        (xy 279.413342 108.140567)
+        (xy 279.343068 108.150671)
+        (xy 279.260637 108.102132)
+        (xy 279.233808 108.066785)
+        (xy 279.233802 108.06678)
+        (xy 279.095981 107.949484)
+        (xy 279.095974 107.949479)
+        (xy 278.93617 107.864511)
+        (xy 278.761855 107.815841)
+        (xy 278.761851 107.81584)
+        (xy 278.581143 107.805738)
+        (xy 278.402489 107.834674)
+        (xy 278.271806 107.886415)
+        (xy 278.201106 107.892894)
+        (xy 278.166268 107.880514)
+        (xy 278.136172 107.864511)
+        (xy 277.961855 107.815841)
+        (xy 277.961851 107.81584)
+        (xy 277.781143 107.805738)
+        (xy 277.602489 107.834674)
+        (xy 277.482587 107.882147)
+        (xy 277.411887 107.888626)
+        (xy 277.37705 107.876247)
+        (xy 277.33617 107.854511)
+        (xy 277.161855 107.805841)
+        (xy 277.161851 107.80584)
+        (xy 276.981143 107.795738)
+        (xy 276.802489 107.824674)
+        (xy 276.63421 107.8913)
+        (xy 276.634207 107.891302)
+        (xy 276.484163 107.992508)
+        (xy 276.359351 108.123574)
+        (xy 276.330052 108.171952)
+        (xy 276.277655 108.219859)
+        (xy 276.207675 108.231832)
+        (xy 276.121913 108.18286)
+        (xy 276.082934 108.131507)
+        (xy 276.065619 108.090908)
+        (xy 276.063064 108.091738)
+        (xy 276.04743 108.043623)
+        (xy 276.042815 108.024398)
+        (xy 276.036449 107.984208)
+        (xy 276.017978 107.947956)
+        (xy 276.010412 107.929691)
+        (xy 275.997841 107.891002)
+        (xy 275.97393 107.858091)
+        (xy 275.9636 107.841235)
+        (xy 275.94513 107.804986)
+        (xy 275.945129 107.804986)
+        (xy 275.912525 107.772382)
+        (xy 275.912498 107.772353)
+        (xy 274.131934 105.991791)
+        (xy 274.131921 105.991776)
+        (xy 273.982517 105.842372)
+        (xy 273.946263 105.8239)
+        (xy 273.929404 105.813568)
+        (xy 273.896495 105.789658)
+        (xy 273.896493 105.789656)
+        (xy 273.85781 105.777088)
+        (xy 273.839542 105.769522)
+        (xy 273.80329 105.751051)
+        (xy 273.763103 105.744686)
+        (xy 273.743875 105.74007)
+        (xy 273.705193 105.727501)
+        (xy 273.65981 105.727501)
+        (xy 273.659786 105.7275)
         (xy 271.089391 105.7275)
         (xy 271.02127 105.707498)
         (xy 270.966271 105.628283)
         (xy 270.957946 105.590016)
+        (xy 270.908131 105.512501)
+        (xy 275.609163 105.512501)
+        (xy 275.609163 106.512498)
+        (xy 275.678273 106.77042)
+        (xy 275.793426 106.907654)
+        (xy 275.948574 106.997229)
+        (xy 276.125001 107.028337)
+        (xy 276.324998 107.028337)
+        (xy 276.58292 106.959227)
+        (xy 276.720154 106.844074)
+        (xy 276.809729 106.688926)
+        (xy 276.809728 106.688926)
+        (xy 276.840837 106.512499)
+        (xy 276.840837 105.512502)
+        (xy 276.771727 105.254581)
+        (xy 276.656574 105.117346)
+        (xy 276.501426 105.027771)
+        (xy 276.324999 104.996663)
+        (xy 276.125002 104.996663)
+        (xy 275.867081 105.065773)
+        (xy 275.729846 105.180926)
+        (xy 275.640271 105.336074)
+        (xy 275.609163 105.512501)
+        (xy 270.908131 105.512501)
         (xy 270.839872 105.406289)
         (xy 270.674824 105.263272)
         (xy 270.476164 105.172548)
@@ -13809,261 +14122,166 @@
         (xy 270.29589 107.575724)
         (xy 270.578737 107.514195)
         (xy 270.762461 107.396122)
-        (xy 270.905478 107.231074)
-        (xy 270.978508 107.071158)
-        (xy 271.025001 107.017502)
+        (xy 270.846508 107.299127)
+        (xy 270.906234 107.260744)
+        (xy 270.959295 107.260744)
+        (xy 270.93675 107.213383)
+        (xy 270.946553 107.141132)
+        (xy 270.978508 107.071159)
+        (xy 271.025001 107.017503)
         (xy 271.093122 106.9975)
-        (xy 271.704124 106.9975)
-        (xy 271.772245 107.017502)
-        (xy 271.818738 107.071158)
-        (xy 271.828842 107.141432)
-        (xy 271.797761 107.20781)
-        (xy 271.704783 107.311074)
-        (xy 271.704782 107.311075)
-        (xy 271.606717 107.480926)
-        (xy 271.546114 107.667444)
-        (xy 271.53075 107.813605)
-        (xy 271.53075 108.0335)
-        (xy 272.261941 108.033501)
-        (xy 272.261943 108.0335)
-        (xy 273.31075 108.033501)
-        (xy 273.378871 108.053503)
-        (xy 273.425364 108.107159)
-        (xy 273.43675 108.159501)
-        (xy 273.43675 108.17129)
-        (xy 274.063865 108.798404)
-        (xy 274.09789 108.860717)
-        (xy 274.092826 108.931532)
-        (xy 274.063865 108.976596)
-        (xy 273.996345 109.044115)
-        (xy 273.934032 109.07814)
-        (xy 273.863217 109.073074)
-        (xy 273.810729 109.036011)
-        (xy 273.745803 108.958636)
-        (xy 273.742687 108.955418)
-        (xy 273.742928 108.955184)
-        (xy 273.73152 108.942287)
-        (xy 273.728008 108.938521)
-        (xy 273.684247 108.903272)
-        (xy 273.679222 108.899003)
-        (xy 273.637417 108.861559)
-        (xy 273.6331 108.85868)
-        (xy 273.618717 108.849622)
-        (xy 273.618529 108.849894)
-        (xy 273.61469 108.847246)
-        (xy 273.609302 108.844091)
-        (xy 273.609259 108.844067)
-        (xy 273.51152 108.787635)
-        (xy 273.507493 108.785678)
-        (xy 273.50764 108.785375)
-        (xy 273.492505 108.777158)
-        (xy 273.487905 108.774814)
-        (xy 273.434762 108.756671)
-        (xy 273.428576 108.754376)
-        (xy 273.37646 108.733478)
-        (xy 273.371431 108.732252)
-        (xy 273.354817 108.728659)
-        (xy 273.354733 108.72898)
-        (xy 273.350199 108.7278)
-        (xy 273.344154 108.726696)
-        (xy 273.343957 108.72666)
-        (xy 273.297784 108.718519)
-        (xy 273.230567 108.683528)
-        (xy 273.08854 108.5415)
-        (xy 272.665559 108.541499)
-        (xy 272.665557 108.5415)
-        (xy 271.53075 108.541499)
-        (xy 271.53075 108.761395)
-        (xy 271.546112 108.90755)
-        (xy 271.606715 109.09407)
-        (xy 271.606718 109.094077)
-        (xy 271.704778 109.263921)
-        (xy 271.704786 109.263931)
-        (xy 271.836009 109.40967)
-        (xy 271.836015 109.409675)
-        (xy 271.958689 109.498804)
-        (xy 272.002043 109.555027)
-        (xy 272.009795 109.58949)
-        (xy 272.009826 109.589486)
-        (xy 272.009882 109.589879)
-        (xy 272.010309 109.591776)
-        (xy 272.010781 109.598394)
-        (xy 272.010445 109.598418)
-        (xy 272.010897 109.615678)
-        (xy 272.011166 109.6208)
-        (xy 272.022027 109.6759)
-        (xy 272.023134 109.682407)
-        (xy 272.031093 109.737985)
-        (xy 272.032537 109.742922)
-        (xy 272.037747 109.759149)
-        (xy 272.038066 109.759061)
-        (xy 272.039309 109.763573)
-        (xy 272.041373 109.769355)
-        (xy 272.041435 109.769528)
-        (xy 272.08002 109.875537)
-        (xy 272.081851 109.879635)
-        (xy 272.081542 109.879773)
-        (xy 272.087836 109.895746)
-        (xy 272.08987 109.900539)
-        (xy 272.118916 109.948595)
-        (xy 272.122178 109.954325)
-        (xy 272.148672 110.003839)
-        (xy 272.151752 110.008032)
-        (xy 272.162162 110.021452)
-        (xy 272.162433 110.021259)
-        (xy 272.165143 110.025073)
-        (xy 272.169103 110.02985)
-        (xy 272.241697 110.116364)
-        (xy 272.244813 110.119582)
-        (xy 272.244572 110.119816)
-        (xy 272.25598 110.132713)
-        (xy 272.259492 110.136479)
-        (xy 272.303253 110.171728)
-        (xy 272.308278 110.175997)
-        (xy 272.350083 110.213441)
-        (xy 272.3544 110.21632)
-        (xy 272.368783 110.225378)
-        (xy 272.368971 110.225106)
-        (xy 272.37281 110.227754)
-        (xy 272.378198 110.230909)
-        (xy 272.378241 110.230933)
-        (xy 272.47598 110.287365)
-        (xy 272.480007 110.289322)
-        (xy 272.47986 110.289625)
-        (xy 272.494995 110.297842)
-        (xy 272.499595 110.300186)
-        (xy 272.552738 110.318329)
-        (xy 272.558924 110.320624)
-        (xy 272.61104 110.341522)
-        (xy 272.616069 110.342748)
-        (xy 272.632683 110.346341)
-        (xy 272.632767 110.34602)
-        (xy 272.637301 110.3472)
-        (xy 272.643346 110.348304)
-        (xy 272.643543 110.34834)
-        (xy 272.754637 110.367928)
-        (xy 272.794459 110.369214)
-        (xy 272.808072 110.370446)
-        (xy 272.808797 110.3705)
-        (xy 272.832259 110.3705)
-        (xy 272.836327 110.370566)
-        (xy 272.900069 110.372625)
-        (xy 272.908994 110.37164)
-        (xy 272.909081 110.372428)
-        (xy 272.92429 110.3705)
-        (xy 273.051913 110.3705)
-        (xy 273.120034 110.390502)
-        (xy 273.166527 110.444158)
-        (xy 273.177913 110.4965)
-        (xy 273.177913 110.547498)
-        (xy 273.247023 110.80542)
-        (xy 273.362176 110.942654)
-        (xy 273.517324 111.032228)
-        (xy 273.69375 111.063337)
-        (xy 273.69375 111.063336)
-        (xy 273.693751 110.222906)
-        (xy 273.722498 110.151212)
-        (xy 273.718483 110.148343)
-        (xy 273.723023 110.14199)
-        (xy 273.738695 110.124706)
-        (xy 273.73846 110.124474)
-        (xy 273.741741 110.121146)
-        (xy 273.7458 110.116367)
-        (xy 273.745881 110.116271)
-        (xy 273.771229 110.086063)
-        (xy 273.83034 110.046737)
-        (xy 273.901327 110.045611)
-        (xy 273.961654 110.083043)
-        (xy 273.99375 110.167055)
-        (xy 273.993749 111.063338)
-        (xy 274.029095 111.098684)
-        (xy 274.066 111.187779)
-        (xy 274.066 111.738062)
-        (xy 274.049119 111.801062)
-        (xy 273.981882 111.917521)
-        (xy 273.981879 111.917527)
-        (xy 273.92 112.148462)
-        (xy 273.92 112.387538)
-        (xy 273.949332 112.497007)
-        (xy 273.947642 112.567983)
-        (xy 273.907848 112.626779)
-        (xy 273.842584 112.654727)
-        (xy 273.775283 112.644232)
-        (xy 273.682914 112.602048)
-        (xy 273.682908 112.602047)
-        (xy 273.521062 112.578776)
-        (xy 272.94836 112.578776)
-        (xy 272.665513 112.640305)
-        (xy 272.481789 112.758378)
-        (xy 272.385362 112.869659)
-        (xy 272.325635 112.908042)
-        (xy 272.254639 112.908042)
-        (xy 272.18414 112.855267)
-        (xy 272.171622 112.835789)
-        (xy 272.006574 112.692772)
-        (xy 271.807914 112.602048)
-        (xy 271.807908 112.602047)
-        (xy 271.646062 112.578776)
-        (xy 271.6045 112.578776)
-        (xy 271.6045 115.005224)
-        (xy 271.62764 115.005224)
-        (xy 271.910487 114.943695)
-        (xy 272.094211 114.825622)
-        (xy 272.190638 114.714341)
-        (xy 272.250365 114.675958)
-        (xy 272.321361 114.675958)
-        (xy 272.39186 114.728733)
-        (xy 272.404378 114.748211)
-        (xy 272.569426 114.891228)
-        (xy 272.768086 114.981952)
-        (xy 272.768092 114.981953)
-        (xy 272.929938 115.005224)
-        (xy 273.50264 115.005224)
-        (xy 273.785487 114.943695)
-        (xy 273.969211 114.825622)
-        (xy 274.097339 114.677756)
-        (xy 274.157065 114.639373)
-        (xy 274.225174 114.638562)
-        (xy 274.454462 114.7)
-        (xy 274.693538 114.7)
-        (xy 274.924473 114.638121)
-        (xy 274.924479 114.638118)
-        (xy 275.131521 114.518583)
-        (xy 275.131531 114.518576)
-        (xy 275.300576 114.349531)
-        (xy 275.300583 114.349521)
-        (xy 275.420118 114.142479)
-        (xy 275.420121 114.142473)
-        (xy 275.454977 114.012389)
-        (xy 275.491929 113.951766)
-        (xy 275.576684 113.919)
-        (xy 278.70039 113.919)
-        (xy 278.700414 113.918999)
-        (xy 278.745797 113.918999)
-        (xy 278.784479 113.90643)
-        (xy 278.803707 113.901814)
-        (xy 278.843894 113.895449)
-        (xy 278.880146 113.876978)
-        (xy 278.898414 113.869412)
-        (xy 278.937097 113.856844)
-        (xy 278.937099 113.856842)
-        (xy 278.970008 113.832932)
-        (xy 278.986867 113.8226)
-        (xy 279.023121 113.804128)
-        (xy 279.172529 113.65472)
-        (xy 279.17254 113.654707)
-        (xy 283.189343 109.637905)
-        (xy 283.278438 109.601)
-        (xy 284.227 109.601)
-        (xy 284.295121 109.621002)
-        (xy 284.341614 109.674658)
-        (xy 284.353 109.727)
-        (xy 284.353001 110.136516)
-        (xy 284.322225 110.219029)
-        (xy 284.179772 110.383426)
-        (xy 284.089048 110.582086)
-        (xy 284.089047 110.582092)
-        (xy 284.065776 110.743938)
+        (xy 271.11988 106.9975)
+        (xy 271.188001 107.017502)
+        (xy 271.234494 107.071158)
+        (xy 271.244598 107.141432)
+        (xy 271.216402 107.20449)
+        (xy 271.157689 107.274463)
+        (xy 271.09858 107.31379)
+        (xy 271.044048 107.314656)
+        (xy 271.06645 107.363709)
+        (xy 271.052147 107.44234)
+        (xy 271.02403 107.493486)
+        (xy 271.024029 107.493488)
+        (xy 270.964257 107.681912)
+        (xy 270.947 107.846096)
+        (xy 270.947 107.9385)
+        (xy 271.753191 107.938501)
+        (xy 271.753193 107.9385)
+        (xy 272.083 107.938501)
+        (xy 272.151121 107.958503)
+        (xy 272.197614 108.012159)
+        (xy 272.209 108.064501)
+        (xy 272.208999 109.468539)
+        (xy 272.334429 109.431623)
+        (xy 272.4188 109.387515)
+        (xy 272.488435 109.373681)
+        (xy 272.554496 109.399691)
+        (xy 272.602485 109.486007)
+        (xy 272.606013 109.519572)
+        (xy 272.606014 109.519576)
+        (xy 272.66314 109.691304)
+        (xy 272.663146 109.691317)
+        (xy 272.683249 109.72504)
+        (xy 272.68325 109.72504)
+        (xy 273.116632 109.291657)
+        (xy 273.178945 109.257632)
+        (xy 273.276914 109.276788)
+        (xy 273.42904 109.380951)
+        (xy 273.42905 109.380956)
+        (xy 273.460372 109.393611)
+        (xy 273.51604 109.437674)
+        (xy 273.539048 109.50484)
+        (xy 273.522091 109.573781)
+        (xy 273.494163 109.606958)
+        (xy 273.429846 109.660926)
+        (xy 273.389048 109.73159)
+        (xy 273.369025 109.757685)
+        (xy 273.076397 110.050314)
+        (xy 273.014084 110.084339)
+        (xy 272.943269 110.079275)
+        (xy 272.898205 110.050314)
+        (xy 272.813844 109.965953)
+        (xy 272.809163 109.992501)
+        (xy 272.809163 110.4425)
+        (xy 273.183163 110.442501)
+        (xy 273.251284 110.462503)
+        (xy 273.297777 110.516159)
+        (xy 273.309163 110.568501)
+        (xy 273.309163 110.6165)
+        (xy 273.289161 110.684621)
+        (xy 273.235505 110.731114)
+        (xy 273.183163 110.7425)
+        (xy 272.809163 110.742499)
+        (xy 272.809163 111.192498)
+        (xy 272.878273 111.45042)
+        (xy 272.993426 111.587654)
+        (xy 273.148574 111.677228)
+        (xy 273.325 111.708337)
+        (xy 273.325123 111.708234)
+        (xy 273.345002 111.64053)
+        (xy 273.398658 111.594037)
+        (xy 273.468932 111.583933)
+        (xy 273.514001 111.599533)
+        (xy 273.562 111.627246)
+        (xy 273.610993 111.678629)
+        (xy 273.616023 111.699362)
+        (xy 273.624998 111.708337)
+        (xy 273.625001 111.708337)
+        (xy 273.677397 111.694298)
+        (xy 273.731886 111.691919)
+        (xy 273.825001 111.708337)
+        (xy 274.125001 111.708337)
+        (xy 274.177397 111.694298)
+        (xy 274.231886 111.691919)
+        (xy 274.325001 111.708337)
+        (xy 274.625001 111.708337)
+        (xy 274.677397 111.694298)
+        (xy 274.731886 111.691919)
+        (xy 274.825001 111.708337)
+        (xy 275.125001 111.708337)
+        (xy 275.177397 111.694298)
+        (xy 275.231879 111.691918)
+        (xy 275.235873 111.692622)
+        (xy 275.299488 111.724145)
+        (xy 275.340001 111.816709)
+        (xy 275.340001 112.060274)
+        (xy 275.319999 112.128395)
+        (xy 275.246609 112.181981)
+        (xy 275.239523 112.18388)
+        (xy 275.032479 112.303417)
+        (xy 275.032469 112.303424)
+        (xy 274.863424 112.472469)
+        (xy 274.863417 112.472479)
+        (xy 274.743882 112.679521)
+        (xy 274.743879 112.679527)
+        (xy 274.682 112.910462)
+        (xy 274.682 113.149538)
+        (xy 274.743879 113.380473)
+        (xy 274.743882 113.380479)
+        (xy 274.863417 113.587521)
+        (xy 274.863424 113.587531)
+        (xy 275.032469 113.756576)
+        (xy 275.032479 113.756583)
+        (xy 275.239521 113.876118)
+        (xy 275.239527 113.876121)
+        (xy 275.470462 113.938)
+        (xy 275.547785 113.938)
+        (xy 275.636881 113.974905)
+        (xy 276.285881 114.623906)
+        (xy 276.428114 114.766139)
+        (xy 276.464356 114.784605)
+        (xy 276.481216 114.794937)
+        (xy 276.514127 114.818849)
+        (xy 276.514131 114.818851)
+        (xy 276.552826 114.831424)
+        (xy 276.571092 114.83899)
+        (xy 276.607341 114.85746)
+        (xy 276.647529 114.863825)
+        (xy 276.666754 114.868441)
+        (xy 276.705435 114.881009)
+        (xy 276.750819 114.881009)
+        (xy 276.750843 114.88101)
+        (xy 279.382157 114.88101)
+        (xy 279.382181 114.881009)
+        (xy 279.427564 114.881009)
+        (xy 279.466246 114.86844)
+        (xy 279.485474 114.863824)
+        (xy 279.525661 114.857459)
+        (xy 279.561913 114.838988)
+        (xy 279.580181 114.831422)
+        (xy 279.618864 114.818854)
+        (xy 279.618866 114.818852)
+        (xy 279.651775 114.794942)
+        (xy 279.668634 114.78461)
+        (xy 279.704888 114.766138)
+        (xy 279.854296 114.61673)
+        (xy 279.854307 114.616717)
+        (xy 283.854962 110.616063)
+        (xy 283.917274 110.582037)
+        (xy 283.98809 110.587102)
+        (xy 284.044925 110.629649)
+        (xy 284.068774 110.723091)
+        (xy 284.065776 110.74394)
         (xy 284.065776 111.74164)
         (xy 284.127305 112.024487)
         (xy 284.245378 112.208211)
@@ -14167,32 +14385,21 @@
         (xy 264.471879 115.330968)
         (xy 264.425386 115.277312)
         (xy 264.414 115.22497)
-        (xy 264.414 114.046)
-        (xy 270.349776 114.046)
-        (xy 270.349776 114.28164)
-        (xy 270.411305 114.564487)
-        (xy 270.529378 114.748211)
-        (xy 270.694426 114.891228)
-        (xy 270.893086 114.981952)
-        (xy 270.893092 114.981953)
-        (xy 271.054938 115.005224)
-        (xy 271.0965 115.005224)
-        (xy 271.0965 114.046)
-        (xy 270.349776 114.046)
-        (xy 264.414 114.046)
-        (xy 264.414 113.283938)
-        (xy 270.349776 113.283938)
-        (xy 270.349776 113.538)
-        (xy 271.0965 113.538)
-        (xy 271.0965 112.578776)
-        (xy 271.07336 112.578776)
-        (xy 270.790513 112.640305)
-        (xy 270.606789 112.758378)
-        (xy 270.463772 112.923426)
-        (xy 270.373048 113.122086)
-        (xy 270.373047 113.122092)
-        (xy 270.349776 113.283938)
-        (xy 264.414 113.283938)
+        (xy 264.414 108.542235)
+        (xy 270.947 108.542235)
+        (xy 270.961414 108.689238)
+        (xy 271.018547 108.878471)
+        (xy 271.01855 108.878478)
+        (xy 271.111353 109.053017)
+        (xy 271.236295 109.206211)
+        (xy 271.236296 109.206212)
+        (xy 271.388604 109.332212)
+        (xy 271.562496 109.426235)
+        (xy 271.701 109.469108)
+        (xy 271.701001 108.4465)
+        (xy 270.947 108.446499)
+        (xy 270.947 108.542235)
+        (xy 264.414 108.542235)
         (xy 264.414 106.85214)
         (xy 267.143026 106.85214)
         (xy 267.204555 107.134987)
@@ -14219,226 +14426,46 @@
         (xy 267.166297 105.692592)
         (xy 267.143026 105.854438)
         (xy 264.414 105.854438)
-        (xy 264.414 104.281395)
-        (xy 271.17075 104.281395)
-        (xy 271.186112 104.42755)
-        (xy 271.246715 104.61407)
-        (xy 271.246718 104.614077)
-        (xy 271.344778 104.783921)
-        (xy 271.344786 104.783931)
-        (xy 271.476009 104.92967)
-        (xy 271.476015 104.929675)
-        (xy 271.634676 105.04495)
-        (xy 271.813849 105.124723)
-        (xy 271.84975 105.132354)
-        (xy 272.357749 105.132354)
-        (xy 272.39365 105.124723)
-        (xy 272.572819 105.044951)
-        (xy 272.731489 104.929672)
-        (xy 272.862718 104.783926)
-        (xy 272.862719 104.783925)
-        (xy 272.960784 104.614074)
-        (xy 273.021388 104.427551)
-        (xy 273.03675 104.281396)
-        (xy 273.03675 104.281395)
-        (xy 280.15075 104.281395)
-        (xy 280.166112 104.42755)
-        (xy 280.226715 104.61407)
-        (xy 280.226718 104.614077)
-        (xy 280.324778 104.783921)
-        (xy 280.324786 104.783931)
-        (xy 280.456009 104.92967)
-        (xy 280.456015 104.929675)
-        (xy 280.614676 105.04495)
-        (xy 280.793849 105.124723)
-        (xy 280.82975 105.132354)
-        (xy 281.337749 105.132354)
-        (xy 281.37365 105.124723)
-        (xy 281.552819 105.044951)
-        (xy 281.653231 104.971998)
-        (xy 284.888163 104.971998)
-        (xy 284.957273 105.22992)
-        (xy 285.072426 105.367154)
-        (xy 285.227574 105.456729)
-        (xy 285.404001 105.487837)
-        (xy 285.75 105.487837)
-        (xy 286.257999 105.487837)
-        (xy 286.603998 105.487837)
-        (xy 286.86192 105.418727)
-        (xy 286.999154 105.303574)
-        (xy 287.088729 105.148426)
-        (xy 287.088728 105.148426)
-        (xy 287.119837 104.971999)
-        (xy 287.119837 104.971998)
-        (xy 287.682163 104.971998)
-        (xy 287.751273 105.22992)
-        (xy 287.866426 105.367154)
-        (xy 288.021574 105.456729)
-        (xy 288.198001 105.487837)
-        (xy 288.544 105.487837)
-        (xy 289.051999 105.487837)
-        (xy 289.397998 105.487837)
-        (xy 289.65592 105.418727)
-        (xy 289.793154 105.303574)
-        (xy 289.882729 105.148426)
-        (xy 289.882728 105.148426)
-        (xy 289.913837 104.971999)
-        (xy 289.913837 104.776)
-        (xy 289.052 104.775999)
-        (xy 289.051999 105.487837)
-        (xy 288.544 105.487837)
-        (xy 288.544001 104.776)
-        (xy 287.682163 104.775999)
-        (xy 287.682163 104.971998)
-        (xy 287.119837 104.971998)
-        (xy 287.119837 104.776)
-        (xy 286.258 104.775999)
-        (xy 286.257999 105.487837)
-        (xy 285.75 105.487837)
-        (xy 285.750001 104.776)
-        (xy 284.888163 104.775999)
-        (xy 284.888163 104.971998)
-        (xy 281.653231 104.971998)
-        (xy 281.711489 104.929672)
-        (xy 281.842718 104.783926)
-        (xy 281.842719 104.783925)
-        (xy 281.940784 104.614074)
-        (xy 282.001388 104.427551)
-        (xy 282.01675 104.281396)
-        (xy 282.01675 104.072001)
-        (xy 284.888163 104.072001)
-        (xy 284.888163 104.268)
-        (xy 285.75 104.268001)
-        (xy 285.75 104.268)
-        (xy 286.257999 104.268)
-        (xy 287.119837 104.268001)
-        (xy 287.119837 104.072002)
-        (xy 287.119837 104.072001)
-        (xy 287.682163 104.072001)
-        (xy 287.682163 104.268)
-        (xy 288.544 104.268001)
-        (xy 288.544 104.268)
-        (xy 289.051999 104.268)
-        (xy 289.913837 104.268001)
-        (xy 289.913837 104.072002)
-        (xy 289.844727 103.814081)
-        (xy 289.729574 103.676846)
-        (xy 289.574426 103.587271)
-        (xy 289.397999 103.556163)
-        (xy 289.052 103.556163)
-        (xy 289.051999 104.268)
-        (xy 288.544 104.268)
-        (xy 288.544001 103.556163)
-        (xy 288.198002 103.556163)
-        (xy 287.940081 103.625273)
-        (xy 287.802846 103.740426)
-        (xy 287.713271 103.895574)
-        (xy 287.682163 104.072001)
-        (xy 287.119837 104.072001)
-        (xy 287.050727 103.814081)
-        (xy 286.935574 103.676846)
-        (xy 286.780426 103.587271)
-        (xy 286.603999 103.556163)
-        (xy 286.258 103.556163)
-        (xy 286.257999 104.268)
-        (xy 285.75 104.268)
-        (xy 285.750001 103.556163)
-        (xy 285.404002 103.556163)
-        (xy 285.146081 103.625273)
-        (xy 285.008846 103.740426)
-        (xy 284.919271 103.895574)
-        (xy 284.888163 104.072001)
-        (xy 282.01675 104.072001)
-        (xy 282.01675 104.0615)
-        (xy 281.33775 104.061499)
-        (xy 281.337749 105.132354)
-        (xy 280.82975 105.132354)
-        (xy 280.829751 104.0615)
-        (xy 280.15075 104.061499)
-        (xy 280.15075 104.281395)
-        (xy 273.03675 104.281395)
-        (xy 273.03675 104.0615)
-        (xy 272.35775 104.061499)
-        (xy 272.357749 105.132354)
-        (xy 271.84975 105.132354)
-        (xy 271.849751 104.0615)
-        (xy 271.17075 104.061499)
-        (xy 271.17075 104.281395)
-        (xy 264.414 104.281395)
-        (xy 264.414 103.333605)
-        (xy 271.17075 103.333605)
-        (xy 271.17075 103.5535)
-        (xy 271.84975 103.553501)
-        (xy 271.84975 103.5535)
-        (xy 272.357749 103.5535)
-        (xy 273.03675 103.553501)
-        (xy 273.03675 103.333605)
-        (xy 280.15075 103.333605)
-        (xy 280.15075 103.5535)
-        (xy 280.82975 103.553501)
-        (xy 280.82975 103.5535)
-        (xy 281.337749 103.5535)
-        (xy 282.01675 103.553501)
-        (xy 282.01675 103.333604)
-        (xy 282.001388 103.187449)
-        (xy 281.940784 103.000926)
-        (xy 281.842719 102.831075)
-        (xy 281.842714 102.831069)
-        (xy 281.711491 102.68533)
-        (xy 281.711485 102.685325)
-        (xy 281.552824 102.57005)
-        (xy 281.373651 102.490277)
-        (xy 281.33775 102.482646)
-        (xy 281.337749 103.5535)
-        (xy 280.82975 103.5535)
-        (xy 280.829751 102.482646)
-        (xy 280.79385 102.490277)
-        (xy 280.61468 102.570049)
-        (xy 280.456013 102.685327)
-        (xy 280.324783 102.831074)
-        (xy 280.324782 102.831075)
-        (xy 280.226717 103.000926)
-        (xy 280.166114 103.187444)
-        (xy 280.15075 103.333605)
-        (xy 273.03675 103.333605)
-        (xy 273.03675 103.333604)
-        (xy 273.021388 103.187449)
-        (xy 272.960784 103.000926)
-        (xy 272.862719 102.831075)
-        (xy 272.862714 102.831069)
-        (xy 272.731491 102.68533)
-        (xy 272.731485 102.685325)
-        (xy 272.572824 102.57005)
-        (xy 272.393651 102.490277)
-        (xy 272.35775 102.482646)
-        (xy 272.357749 103.5535)
-        (xy 271.84975 103.5535)
-        (xy 271.849751 102.482646)
-        (xy 271.81385 102.490277)
-        (xy 271.63468 102.570049)
-        (xy 271.476013 102.685327)
-        (xy 271.344783 102.831074)
-        (xy 271.344782 102.831075)
-        (xy 271.246717 103.000926)
-        (xy 271.186114 103.187444)
-        (xy 271.17075 103.333605)
-        (xy 264.414 103.333605)
+        (xy 264.414 103.812235)
+        (xy 270.947 103.812235)
+        (xy 270.961414 103.959238)
+        (xy 271.018547 104.148471)
+        (xy 271.01855 104.148478)
+        (xy 271.111353 104.323017)
+        (xy 271.236295 104.476211)
+        (xy 271.236296 104.476212)
+        (xy 271.388604 104.602212)
+        (xy 271.562496 104.696235)
+        (xy 271.701 104.739108)
+        (xy 271.701 104.738539)
+        (xy 272.208999 104.738539)
+        (xy 272.334429 104.701623)
+        (xy 272.509609 104.610042)
+        (xy 272.509615 104.610038)
+        (xy 272.663675 104.486171)
+        (xy 272.790737 104.334743)
+        (xy 272.790739 104.33474)
+        (xy 272.885973 104.161509)
+        (xy 272.945743 103.973088)
+        (xy 272.963 103.808904)
+        (xy 272.963 103.7165)
+        (xy 272.209 103.716499)
+        (xy 272.208999 104.738539)
+        (xy 271.701 104.738539)
+        (xy 271.701001 103.7165)
+        (xy 270.947 103.716499)
+        (xy 270.947 103.812235)
+        (xy 264.414 103.812235)
         (xy 264.414 102.234)
         (xy 264.434002 102.165879)
         (xy 264.487658 102.119386)
         (xy 264.54 102.108)
-        (xy 337.867882 102.108)
+        (xy 271.299998 102.108)
       )
     )
     (filled_polygon
       (layer F.Cu)
       (pts
-        (xy 353.783121 108.400002)
-        (xy 353.829614 108.453658)
-        (xy 353.841 108.506)
-        (xy 353.841 108.5065)
-        (xy 354.611793 108.506501)
-        (xy 354.611795 108.5065)
         (xy 354.941602 108.506501)
         (xy 355.009723 108.526503)
         (xy 355.056216 108.580159)
@@ -14447,15 +14474,19 @@
         (xy 355.303242 109.761224)
         (xy 355.586089 109.699695)
         (xy 355.769813 109.581622)
-        (xy 355.892474 109.440065)
-        (xy 355.9522 109.401682)
-        (xy 356.023197 109.401682)
-        (xy 356.076793 109.433483)
-        (xy 356.918215 110.274905)
-        (xy 356.952241 110.337217)
-        (xy 356.947176 110.408032)
-        (xy 356.904629 110.464868)
-        (xy 356.82912 110.49)
+        (xy 355.91283 109.416574)
+        (xy 356.003554 109.217914)
+        (xy 356.003555 109.217908)
+        (xy 356.027358 109.052358)
+        (xy 356.056851 108.987777)
+        (xy 356.116577 108.949394)
+        (xy 356.187573 108.949394)
+        (xy 356.24117 108.981195)
+        (xy 357.534879 110.274905)
+        (xy 357.568905 110.337217)
+        (xy 357.56384 110.408033)
+        (xy 357.521293 110.464868)
+        (xy 357.445784 110.49)
         (xy 353.199215 110.49)
         (xy 353.11012 110.453095)
         (xy 352.621957 109.964932)
@@ -14473,123 +14504,10 @@
         (xy 354.143694 109.737953)
         (xy 354.30554 109.761224)
         (xy 354.559602 109.761224)
-        (xy 354.559603 109.0145)
-        (xy 353.691602 109.014499)
-        (xy 353.623481 108.994497)
-        (xy 353.576988 108.940841)
-        (xy 353.565602 108.888499)
-        (xy 353.565602 108.888)
-        (xy 352.465 108.888)
-        (xy 352.396879 108.867998)
-        (xy 352.350386 108.814342)
-        (xy 352.339 108.762)
-        (xy 352.339 108.506)
-        (xy 352.359002 108.437879)
-        (xy 352.412658 108.391386)
-        (xy 352.465 108.38)
-        (xy 353.715 108.38)
-      )
-    )
-    (filled_polygon
-      (layer F.Cu)
-      (pts
-        (xy 356.382366 106.098602)
-        (xy 356.441161 106.138396)
-        (xy 356.47 106.218619)
-        (xy 356.47 106.291538)
-        (xy 356.531879 106.522473)
-        (xy 356.531882 106.522479)
-        (xy 356.651417 106.729521)
-        (xy 356.651424 106.729531)
-        (xy 356.820469 106.898576)
-        (xy 356.820479 106.898583)
-        (xy 357.027521 107.018118)
-        (xy 357.027527 107.018121)
-        (xy 357.258461 107.08)
-        (xy 357.258705 107.080032)
-        (xy 357.258895 107.080116)
-        (xy 357.266437 107.082137)
-        (xy 357.266122 107.083313)
-        (xy 357.323631 107.108756)
-        (xy 357.342661 107.130638)
-        (xy 357.342782 107.130535)
-        (xy 357.348597 107.137369)
-        (xy 357.405104 107.187273)
-        (xy 357.410795 107.192622)
-        (xy 357.427541 107.209369)
-        (xy 357.427544 107.209371)
-        (xy 357.440554 107.219122)
-        (xy 357.448395 107.225506)
-        (xy 357.461439 107.237026)
-        (xy 357.501153 107.304685)
-        (xy 357.533305 107.452487)
-        (xy 357.651378 107.636212)
-        (xy 357.657278 107.64302)
-        (xy 357.655604 107.64447)
-        (xy 357.687321 107.693825)
-        (xy 357.687319 107.764822)
-        (xy 357.661648 107.811832)
-        (xy 357.634273 107.843424)
-        (xy 357.543548 108.042086)
-        (xy 357.543547 108.042092)
-        (xy 357.520276 108.203938)
-        (xy 357.520276 108.458)
-        (xy 358.649 108.458001)
-        (xy 358.717121 108.478003)
-        (xy 358.763614 108.531659)
-        (xy 358.775 108.584001)
-        (xy 358.774999 108.84)
-        (xy 358.754997 108.908121)
-        (xy 358.701341 108.954614)
-        (xy 358.648999 108.966)
-        (xy 357.493975 108.965999)
-        (xy 357.4896 108.968388)
-        (xy 357.418785 108.963323)
-        (xy 357.373722 108.934362)
-        (xy 356.512517 108.073157)
-        (xy 356.475612 107.984062)
-        (xy 356.475612 107.857343)
-        (xy 356.475611 107.857319)
-        (xy 356.475611 107.811934)
-        (xy 356.463042 107.773252)
-        (xy 356.458427 107.754027)
-        (xy 356.452061 107.713837)
-        (xy 356.43359 107.677585)
-        (xy 356.426024 107.65932)
-        (xy 356.413453 107.620631)
-        (xy 356.389542 107.58772)
-        (xy 356.379211 107.570863)
-        (xy 356.360741 107.534613)
-        (xy 356.330433 107.504307)
-        (xy 356.33042 107.504292)
-        (xy 356.063731 107.237604)
-        (xy 356.026826 107.148508)
-        (xy 356.026826 106.60836)
-        (xy 355.965297 106.325513)
-        (xy 355.963898 106.323336)
-        (xy 355.962686 106.319209)
-        (xy 355.960983 106.315097)
-        (xy 355.961425 106.314914)
-        (xy 355.943898 106.255215)
-        (xy 355.963902 106.187095)
-        (xy 356.017559 106.140603)
-        (xy 356.069898 106.129218)
-        (xy 356.19082 106.129218)
-        (xy 356.311389 106.096912)
-      )
-    )
-  )
-  (zone (net 0) (net_name "") (layer "F.Cu") (tstamp aa98837d-edd5-47e1-bbda-c520ebf250a1) (hatch edge 0.508)
-    (connect_pads (clearance 0.508))
-    (min_thickness 0.254)
-    (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508))
-    (polygon
-      (pts
-        (xy 275.336 111.252)
-        (xy 274.066 112.014)
-        (xy 274.066 110.236)
-        (xy 275.336 110.236)
+        (xy 354.559603 108.6325)
+        (xy 354.579605 108.564379)
+        (xy 354.633261 108.517886)
+        (xy 354.685603 108.5065)
       )
     )
   )
diff --git a/my-keyboard.kicad_pro b/my-keyboard.kicad_pro
index 6452ddf..fbe7dfc 100644
--- a/my-keyboard.kicad_pro
+++ b/my-keyboard.kicad_pro
@@ -26,8 +26,8 @@
         "other_text_upright": false,
         "pads": {
           "drill": 0.0,
-          "height": 0.9,
-          "width": 0.3
+          "height": 1.4,
+          "width": 0.975
         },
         "silk_line_width": 0.12,
         "silk_text_italic": false,
@@ -105,7 +105,8 @@
       "track_widths": [
         0.254,
         0.2032,
-        0.254
+        0.254,
+        0.381
       ],
       "via_dimensions": [
         {
@@ -395,7 +396,7 @@
   },
   "sheets": [
     [
-      "b2090e2f-7756-4542-9065-96f6e5d1569d",
+      "b116fd05-b863-4ba3-8a2e-c31cff4e2b39",
       ""
     ]
   ],
diff --git a/my-keyboard.kicad_sch b/my-keyboard.kicad_sch
index 2952ae6..6e5585b 100644
--- a/my-keyboard.kicad_sch
+++ b/my-keyboard.kicad_sch
@@ -5,174 +5,6 @@
   (paper "A3")
 
   (lib_symbols
-    (symbol "10137061-00021LF:10137061-00021LF"
-      (property "Reference" "J" (id 0) (at -15.24 18.542 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom))
-      )
-      (property "Value" "10137061-00021LF" (id 1) (at -15.24 -22.86 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom))
-      )
-      (property "Footprint" "AMPHENOL_10137061-00021LF" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom) hide)
-      )
-      (property "Datasheet" "Amphenol FCI" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom) hide)
-      )
-      (property "Field4" "3.2mm" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom) hide)
-      )
-      (property "Field5" "Manufacturer recommendations" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom) hide)
-      )
-      (property "Field6" "C" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) (justify left bottom) hide)
-      )
-      (property "ki_locked" "" (id 7) (at 0 0 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (symbol "10137061-00021LF_0_0"
-        (polyline
-          (pts
-            (xy 15.24 17.78)
-            (xy 15.24 -20.32)
-          )
-          (stroke (width 0.1524)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 15.24 -20.32)
-            (xy -15.24 -20.32)
-          )
-          (stroke (width 0.1524)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 -20.32)
-            (xy -15.24 17.78)
-          )
-          (stroke (width 0.1524)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 17.78)
-            (xy 15.24 17.78)
-          )
-          (stroke (width 0.1524)) (fill (type none))
-        )
-        (pin passive line (at -20.32 15.24 0) (length 5.08)
-          (name "GND_A1" (effects (font (size 1.016 1.016))))
-          (number "A1" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 12.7 0) (length 5.08)
-          (name "SSTXP1" (effects (font (size 1.016 1.016))))
-          (number "A2" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 10.16 0) (length 5.08)
-          (name "SSTXN1" (effects (font (size 1.016 1.016))))
-          (number "A3" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 7.62 0) (length 5.08)
-          (name "VBUS_A4" (effects (font (size 1.016 1.016))))
-          (number "A4" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 5.08 0) (length 5.08)
-          (name "CC1" (effects (font (size 1.016 1.016))))
-          (number "A5" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 2.54 0) (length 5.08)
-          (name "DP1" (effects (font (size 1.016 1.016))))
-          (number "A6" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 0 0) (length 5.08)
-          (name "DN1" (effects (font (size 1.016 1.016))))
-          (number "A7" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 -2.54 0) (length 5.08)
-          (name "SBU1" (effects (font (size 1.016 1.016))))
-          (number "A8" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 -7.62 0) (length 5.08)
-          (name "SSRXN2" (effects (font (size 1.016 1.016))))
-          (number "A10" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 -10.16 0) (length 5.08)
-          (name "SSRXP2" (effects (font (size 1.016 1.016))))
-          (number "A11" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 12.7 180) (length 5.08)
-          (name "SSRXP1" (effects (font (size 1.016 1.016))))
-          (number "B11" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 10.16 180) (length 5.08)
-          (name "SSRXN1" (effects (font (size 1.016 1.016))))
-          (number "B10" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 5.08 180) (length 5.08)
-          (name "SBU2" (effects (font (size 1.016 1.016))))
-          (number "B8" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 2.54 180) (length 5.08)
-          (name "DN2" (effects (font (size 1.016 1.016))))
-          (number "B7" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 0 180) (length 5.08)
-          (name "DP2" (effects (font (size 1.016 1.016))))
-          (number "B6" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -2.54 180) (length 5.08)
-          (name "CC2" (effects (font (size 1.016 1.016))))
-          (number "B5" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -7.62 180) (length 5.08)
-          (name "SSTXN2" (effects (font (size 1.016 1.016))))
-          (number "B3" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -10.16 180) (length 5.08)
-          (name "SSTXP2" (effects (font (size 1.016 1.016))))
-          (number "B2" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -17.78 180) (length 5.08)
-          (name "SHIELD" (effects (font (size 1.016 1.016))))
-          (number "S1" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -17.78 180) (length 5.08)
-          (name "SHIELD" (effects (font (size 1.016 1.016))))
-          (number "S2" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -17.78 180) (length 5.08)
-          (name "SHIELD" (effects (font (size 1.016 1.016))))
-          (number "S3" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -17.78 180) (length 5.08)
-          (name "SHIELD" (effects (font (size 1.016 1.016))))
-          (number "S4" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 -12.7 0) (length 5.08)
-          (name "GND_A12" (effects (font (size 1.016 1.016))))
-          (number "A12" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 15.24 180) (length 5.08)
-          (name "GND_B12" (effects (font (size 1.016 1.016))))
-          (number "B12" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -12.7 180) (length 5.08)
-          (name "GND_B1" (effects (font (size 1.016 1.016))))
-          (number "B1" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at -20.32 -5.08 0) (length 5.08)
-          (name "VBUS_A9" (effects (font (size 1.016 1.016))))
-          (number "A9" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 7.62 180) (length 5.08)
-          (name "VBUS_B9" (effects (font (size 1.016 1.016))))
-          (number "B9" (effects (font (size 1.016 1.016))))
-        )
-        (pin passive line (at 20.32 -5.08 180) (length 5.08)
-          (name "VBUS_B4" (effects (font (size 1.016 1.016))))
-          (number "B4" (effects (font (size 1.016 1.016))))
-        )
-      )
-    )
     (symbol "Connector:AVR-ISP-6"
       (property "Reference" "J" (id 0) (at -6.35 11.43 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1008,6 +840,144 @@
         )
       )
     )
+    (symbol "Type-C:Wurth-632723300011"
+      (property "Reference" "USB" (id 0) (at -16.51 0 90)
+        (effects (font (size 1.524 1.524)))
+      )
+      (property "Value" "Wurth-632723300011" (id 1) (at -13.97 0 90)
+        (effects (font (size 1.524 1.524)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.524 1.524)) hide)
+      )
+      (property "Datasheet" "" (id 3) (at 0 0 0)
+        (effects (font (size 1.524 1.524)) hide)
+      )
+      (symbol "Wurth-632723300011_0_1"
+        (rectangle (start -10.16 0) (end 0 -30.48)
+          (stroke (width 0)) (fill (type background))
+        )
+        (rectangle (start -10.16 30.48) (end -20.32 -30.48)
+          (stroke (width 0)) (fill (type background))
+        )
+        (rectangle (start 0 -30.48) (end -20.32 -38.1)
+          (stroke (width 0)) (fill (type background))
+        )
+        (rectangle (start 0 0) (end -10.16 30.48)
+          (stroke (width 0)) (fill (type background))
+        )
+      )
+      (symbol "Wurth-632723300011_1_1"
+        (pin input line (at 2.54 29.21 180) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 26.67 180) (length 2.54)
+          (name "SSTXXp1" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 24.13 180) (length 2.54)
+          (name "SSTXn1" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 21.59 180) (length 2.54)
+          (name "VBUS" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 19.05 180) (length 2.54)
+          (name "CC1" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 16.51 180) (length 2.54)
+          (name "Dp1" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 13.97 180) (length 2.54)
+          (name "Dn1" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 11.43 180) (length 2.54)
+          (name "SBU1" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 8.89 180) (length 2.54)
+          (name "VBUS" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 6.35 180) (length 2.54)
+          (name "SSRXn2" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -19.05 180) (length 2.54)
+          (name "SBU2" (effects (font (size 1.27 1.27))))
+          (number "20" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 3.81 180) (length 2.54)
+          (name "SSRXp2" (effects (font (size 1.27 1.27))))
+          (number "11" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -21.59 180) (length 2.54)
+          (name "VBUS" (effects (font (size 1.27 1.27))))
+          (number "21" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 1.27 180) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "12" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -24.13 180) (length 2.54)
+          (name "SSRXn1" (effects (font (size 1.27 1.27))))
+          (number "22" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -1.27 180) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "13" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -26.67 180) (length 2.54)
+          (name "SSRXp1" (effects (font (size 1.27 1.27))))
+          (number "23" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -3.81 180) (length 2.54)
+          (name "SSTXp2" (effects (font (size 1.27 1.27))))
+          (number "14" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -29.21 180) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "24" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -6.35 180) (length 2.54)
+          (name "SSTXn2" (effects (font (size 1.27 1.27))))
+          (number "15" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -31.75 180) (length 2.54)
+          (name "Center_Plate_Pin" (effects (font (size 1.27 1.27))))
+          (number "25" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -8.89 180) (length 2.54)
+          (name "VBUS" (effects (font (size 1.27 1.27))))
+          (number "16" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -34.29 180) (length 2.54)
+          (name "Connector_Legs" (effects (font (size 1.27 1.27))))
+          (number "26" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -11.43 180) (length 2.54)
+          (name "CC2" (effects (font (size 1.27 1.27))))
+          (number "17" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -36.83 180) (length 2.54)
+          (name "Under-Barrel_Pads" (effects (font (size 1.27 1.27))))
+          (number "27" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -13.97 180) (length 2.54)
+          (name "Dp2" (effects (font (size 1.27 1.27))))
+          (number "18" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 2.54 -16.51 180) (length 2.54)
+          (name "Dn2" (effects (font (size 1.27 1.27))))
+          (number "19" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "power:+5V" (power) (pin_names (offset 0))
       (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -1186,35 +1156,37 @@
     )
   )
 
-  (junction (at 31.75 212.09) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 31.75 229.87) (diameter 1.016) (color 0 0 0 0))
   (junction (at 35.56 119.38) (diameter 1.016) (color 0 0 0 0))
   (junction (at 35.56 127) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 36.83 119.38) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 36.83 127) (diameter 1.016) (color 0 0 0 0))
   (junction (at 43.18 119.38) (diameter 1.016) (color 0 0 0 0))
   (junction (at 43.18 127) (diameter 1.016) (color 0 0 0 0))
   (junction (at 52.07 78.74) (diameter 1.016) (color 0 0 0 0))
   (junction (at 52.07 81.28) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 62.23 81.28) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 68.58 73.66) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 60.96 214.63) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 60.96 217.17) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 60.96 245.11) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 60.96 247.65) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 60.96 250.19) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 60.96 252.73) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 64.77 81.28) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 64.77 189.23) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 64.77 194.31) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 64.77 207.01) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 64.77 224.79) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 67.31 232.41) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 68.58 72.39) (diameter 1.016) (color 0 0 0 0))
   (junction (at 68.58 78.74) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 80.01 58.42) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 80.01 67.31) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 85.09 234.95) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 87.63 209.55) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 69.85 229.87) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 69.85 241.3) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 69.85 255.27) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 73.66 255.27) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 76.2 189.23) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 77.47 255.27) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 80.01 59.69) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 82.55 227.33) (diameter 1.016) (color 0 0 0 0))
   (junction (at 90.17 50.8) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 90.17 191.77) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 90.17 214.63) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 92.71 209.55) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 92.71 217.17) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 92.71 234.95) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 92.71 238.76) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 95.25 191.77) (diameter 1.016) (color 0 0 0 0))
   (junction (at 96.52 154.94) (diameter 1.016) (color 0 0 0 0))
   (junction (at 99.06 53.34) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 100.33 238.76) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 105.41 219.71) (diameter 1.016) (color 0 0 0 0))
   (junction (at 147.32 81.28) (diameter 1.016) (color 0 0 0 0))
   (junction (at 147.32 99.06) (diameter 1.016) (color 0 0 0 0))
   (junction (at 147.32 116.84) (diameter 1.016) (color 0 0 0 0))
@@ -1329,18 +1301,18 @@
   (junction (at 383.54 105.41) (diameter 1.016) (color 0 0 0 0))
   (junction (at 383.54 123.19) (diameter 1.016) (color 0 0 0 0))
 
-  (no_connect (at 85.09 207.01))
-  (no_connect (at 85.09 227.33))
-  (no_connect (at 44.45 204.47))
-  (no_connect (at 44.45 227.33))
-  (no_connect (at 44.45 224.79))
-  (no_connect (at 44.45 219.71))
-  (no_connect (at 85.09 204.47))
-  (no_connect (at 114.3 83.82))
-  (no_connect (at 85.09 224.79))
-  (no_connect (at 44.45 207.01))
-  (no_connect (at 85.09 212.09))
+  (no_connect (at 59.69 234.95))
+  (no_connect (at 59.69 212.09))
+  (no_connect (at 59.69 219.71))
+  (no_connect (at 59.69 242.57))
+  (no_connect (at 59.69 191.77))
+  (no_connect (at 59.69 222.25))
   (no_connect (at 114.3 81.28))
+  (no_connect (at 59.69 204.47))
+  (no_connect (at 59.69 189.23))
+  (no_connect (at 59.69 240.03))
+  (no_connect (at 114.3 83.82))
+  (no_connect (at 59.69 209.55))
 
   (wire (pts (xy 25.4 119.38) (xy 25.4 120.65))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -1351,286 +1323,328 @@
   (wire (pts (xy 25.4 127) (xy 35.56 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 31.75 201.93) (xy 44.45 201.93))
+  (wire (pts (xy 35.56 118.11) (xy 35.56 119.38))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 35.56 119.38) (xy 25.4 119.38))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 31.75 212.09) (xy 31.75 201.93))
+  (wire (pts (xy 35.56 119.38) (xy 35.56 120.65))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 31.75 212.09) (xy 31.75 229.87))
+  (wire (pts (xy 35.56 119.38) (xy 43.18 119.38))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 31.75 212.09) (xy 35.56 212.09))
+  (wire (pts (xy 35.56 125.73) (xy 35.56 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 31.75 229.87) (xy 31.75 231.14))
+  (wire (pts (xy 35.56 127) (xy 35.56 129.54))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 35.56 119.38) (xy 25.4 119.38))
+  (wire (pts (xy 35.56 127) (xy 43.18 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 35.56 119.38) (xy 35.56 120.65))
+  (wire (pts (xy 43.18 119.38) (xy 43.18 120.65))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 35.56 125.73) (xy 35.56 127))
+  (wire (pts (xy 43.18 119.38) (xy 52.07 119.38))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 35.56 127) (xy 36.83 127))
+  (wire (pts (xy 43.18 125.73) (xy 43.18 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 36.83 118.11) (xy 36.83 119.38))
+  (wire (pts (xy 48.26 93.98) (xy 69.85 93.98))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 36.83 119.38) (xy 35.56 119.38))
+  (wire (pts (xy 48.26 96.52) (xy 60.96 96.52))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 36.83 119.38) (xy 43.18 119.38))
+  (wire (pts (xy 52.07 72.39) (xy 52.07 78.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 36.83 127) (xy 36.83 129.54))
+  (wire (pts (xy 52.07 72.39) (xy 59.69 72.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 36.83 220.98) (xy 36.83 222.25))
+  (wire (pts (xy 52.07 78.74) (xy 52.07 81.28))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 36.83 222.25) (xy 44.45 222.25))
+  (wire (pts (xy 52.07 78.74) (xy 54.61 78.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 39.37 207.01) (xy 39.37 209.55))
+  (wire (pts (xy 52.07 81.28) (xy 52.07 83.82))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 40.64 212.09) (xy 44.45 212.09))
+  (wire (pts (xy 52.07 81.28) (xy 64.77 81.28))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 41.91 214.63) (xy 44.45 214.63))
+  (wire (pts (xy 52.07 119.38) (xy 52.07 120.65))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 41.91 217.17) (xy 44.45 217.17))
+  (wire (pts (xy 52.07 125.73) (xy 52.07 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 43.18 119.38) (xy 43.18 120.65))
+  (wire (pts (xy 52.07 127) (xy 43.18 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 43.18 119.38) (xy 52.07 119.38))
+  (wire (pts (xy 59.69 78.74) (xy 68.58 78.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 43.18 125.73) (xy 43.18 127))
+  (wire (pts (xy 59.69 194.31) (xy 64.77 194.31))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 43.18 127) (xy 36.83 127))
+  (wire (pts (xy 59.69 196.85) (xy 67.31 196.85))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 44.45 209.55) (xy 39.37 209.55))
+  (wire (pts (xy 59.69 199.39) (xy 62.23 199.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 44.45 229.87) (xy 31.75 229.87))
+  (wire (pts (xy 59.69 201.93) (xy 62.23 201.93))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 48.26 93.98) (xy 69.85 93.98))
+  (wire (pts (xy 59.69 207.01) (xy 64.77 207.01))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 48.26 96.52) (xy 60.96 96.52))
+  (wire (pts (xy 59.69 214.63) (xy 60.96 214.63))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 52.07 72.39) (xy 52.07 78.74))
+  (wire (pts (xy 59.69 224.79) (xy 64.77 224.79))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 52.07 81.28) (xy 52.07 78.74))
+  (wire (pts (xy 59.69 227.33) (xy 76.2 227.33))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 52.07 81.28) (xy 52.07 83.82))
+  (wire (pts (xy 59.69 229.87) (xy 69.85 229.87))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 52.07 119.38) (xy 52.07 120.65))
+  (wire (pts (xy 59.69 232.41) (xy 67.31 232.41))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 52.07 125.73) (xy 52.07 127))
+  (wire (pts (xy 59.69 237.49) (xy 64.77 237.49))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 52.07 127) (xy 43.18 127))
+  (wire (pts (xy 59.69 245.11) (xy 60.96 245.11))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 59.69 247.65) (xy 60.96 247.65))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 59.69 250.19) (xy 60.96 250.19))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 59.69 252.73) (xy 60.96 252.73))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 60.96 186.69) (xy 59.69 186.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 57.15 72.39) (xy 68.58 72.39))
+  (wire (pts (xy 60.96 214.63) (xy 60.96 186.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 57.15 78.74) (xy 68.58 78.74))
+  (wire (pts (xy 60.96 214.63) (xy 60.96 217.17))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 62.23 76.2) (xy 62.23 81.28))
+  (wire (pts (xy 60.96 217.17) (xy 59.69 217.17))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 62.23 81.28) (xy 52.07 81.28))
+  (wire (pts (xy 60.96 245.11) (xy 60.96 217.17))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 60.96 245.11) (xy 60.96 247.65))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 60.96 247.65) (xy 60.96 250.19))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 60.96 250.19) (xy 60.96 252.73))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 60.96 252.73) (xy 60.96 255.27))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 60.96 255.27) (xy 69.85 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
   (wire (pts (xy 62.23 88.9) (xy 62.23 86.36))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 63.5 67.31) (xy 63.5 68.58))
+  (wire (pts (xy 62.23 186.69) (xy 62.23 189.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 66.04 76.2) (xy 62.23 76.2))
+  (wire (pts (xy 62.23 189.23) (xy 64.77 189.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 66.04 96.52) (xy 83.82 96.52))
+  (wire (pts (xy 64.77 72.39) (xy 68.58 72.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 66.04 101.6) (xy 83.82 101.6))
+  (wire (pts (xy 64.77 76.2) (xy 64.77 81.28))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 66.04 106.68) (xy 66.04 101.6))
+  (wire (pts (xy 64.77 186.69) (xy 64.77 189.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 66.04 111.76) (xy 66.04 116.84))
+  (wire (pts (xy 64.77 189.23) (xy 64.77 194.31))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 67.31 67.31) (xy 63.5 67.31))
+  (wire (pts (xy 64.77 194.31) (xy 64.77 207.01))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 68.58 72.39) (xy 68.58 73.66))
+  (wire (pts (xy 64.77 207.01) (xy 64.77 224.79))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 68.58 73.66) (xy 83.82 73.66))
+  (wire (pts (xy 64.77 224.79) (xy 64.77 237.49))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 68.58 78.74) (xy 83.82 78.74))
+  (wire (pts (xy 66.04 59.69) (xy 67.31 59.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 71.12 76.2) (xy 72.39 76.2))
+  (wire (pts (xy 66.04 60.96) (xy 66.04 59.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 72.39 76.2) (xy 72.39 81.28))
+  (wire (pts (xy 66.04 76.2) (xy 64.77 76.2))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 72.39 81.28) (xy 62.23 81.28))
+  (wire (pts (xy 66.04 96.52) (xy 83.82 96.52))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 74.93 93.98) (xy 83.82 93.98))
+  (wire (pts (xy 66.04 101.6) (xy 83.82 101.6))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 77.47 67.31) (xy 80.01 67.31))
+  (wire (pts (xy 66.04 106.68) (xy 66.04 101.6))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 50.8) (xy 80.01 53.34))
+  (wire (pts (xy 66.04 111.76) (xy 66.04 116.84))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 50.8) (xy 90.17 50.8))
+  (wire (pts (xy 67.31 189.23) (xy 64.77 189.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 58.42) (xy 80.01 67.31))
+  (wire (pts (xy 67.31 215.9) (xy 67.31 232.41))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 58.42) (xy 118.11 58.42))
+  (wire (pts (xy 67.31 232.41) (xy 67.31 236.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 67.31) (xy 80.01 68.58))
+  (wire (pts (xy 67.31 232.41) (xy 73.66 232.41))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 68.58) (xy 83.82 68.58))
+  (wire (pts (xy 67.31 241.3) (xy 69.85 241.3))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 80.01 83.82) (xy 83.82 83.82))
+  (wire (pts (xy 68.58 72.39) (xy 68.58 73.66))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 83.82 88.9) (xy 62.23 88.9))
+  (wire (pts (xy 68.58 72.39) (xy 77.47 72.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 201.93) (xy 105.41 201.93))
+  (wire (pts (xy 68.58 78.74) (xy 83.82 78.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 214.63) (xy 90.17 214.63))
+  (wire (pts (xy 69.85 229.87) (xy 69.85 236.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 217.17) (xy 92.71 217.17))
+  (wire (pts (xy 69.85 229.87) (xy 73.66 229.87))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 219.71) (xy 95.25 219.71))
+  (wire (pts (xy 69.85 241.3) (xy 69.85 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 222.25) (xy 87.63 222.25))
+  (wire (pts (xy 69.85 255.27) (xy 73.66 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 229.87) (xy 85.09 234.95))
+  (wire (pts (xy 71.12 76.2) (xy 72.39 76.2))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 234.95) (xy 85.09 238.76))
+  (wire (pts (xy 72.39 76.2) (xy 72.39 81.28))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 85.09 238.76) (xy 92.71 238.76))
+  (wire (pts (xy 72.39 81.28) (xy 64.77 81.28))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 87.63 207.01) (xy 87.63 209.55))
+  (wire (pts (xy 72.39 189.23) (xy 76.2 189.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 87.63 209.55) (xy 85.09 209.55))
+  (wire (pts (xy 72.39 196.85) (xy 82.55 196.85))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 87.63 222.25) (xy 87.63 209.55))
+  (wire (pts (xy 74.93 93.98) (xy 83.82 93.98))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 88.9 154.94) (xy 88.9 160.02))
+  (wire (pts (xy 76.2 189.23) (xy 76.2 186.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 50.8) (xy 90.17 49.53))
+  (wire (pts (xy 76.2 189.23) (xy 76.2 205.74))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 50.8) (xy 99.06 50.8))
+  (wire (pts (xy 76.2 189.23) (xy 80.01 189.23))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 76.2 210.82) (xy 76.2 215.9))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 190.5) (xy 90.17 191.77))
+  (wire (pts (xy 76.2 215.9) (xy 67.31 215.9))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 191.77) (xy 90.17 193.04))
+  (wire (pts (xy 77.47 59.69) (xy 80.01 59.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 198.12) (xy 90.17 214.63))
+  (wire (pts (xy 77.47 72.39) (xy 77.47 73.66))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 214.63) (xy 90.17 227.33))
+  (wire (pts (xy 77.47 73.66) (xy 83.82 73.66))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 214.63) (xy 107.95 214.63))
+  (wire (pts (xy 77.47 252.73) (xy 77.47 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 232.41) (xy 90.17 234.95))
+  (wire (pts (xy 77.47 255.27) (xy 73.66 255.27))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 80.01 50.8) (xy 80.01 53.34))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 90.17 234.95) (xy 92.71 234.95))
+  (wire (pts (xy 80.01 50.8) (xy 90.17 50.8))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 207.01) (xy 92.71 209.55))
+  (wire (pts (xy 80.01 58.42) (xy 80.01 59.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 209.55) (xy 87.63 209.55))
+  (wire (pts (xy 80.01 59.69) (xy 80.01 68.58))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 217.17) (xy 92.71 227.33))
+  (wire (pts (xy 80.01 59.69) (xy 118.11 59.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 217.17) (xy 107.95 217.17))
+  (wire (pts (xy 80.01 68.58) (xy 83.82 68.58))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 232.41) (xy 92.71 234.95))
+  (wire (pts (xy 80.01 83.82) (xy 83.82 83.82))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 234.95) (xy 92.71 238.76))
+  (wire (pts (xy 80.01 189.23) (xy 80.01 186.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 92.71 238.76) (xy 100.33 238.76))
+  (wire (pts (xy 81.28 227.33) (xy 82.55 227.33))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 95.25 190.5) (xy 95.25 191.77))
+  (wire (pts (xy 82.55 196.85) (xy 82.55 227.33))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 95.25 191.77) (xy 90.17 191.77))
+  (wire (pts (xy 82.55 227.33) (xy 82.55 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 95.25 194.31) (xy 95.25 191.77))
+  (wire (pts (xy 82.55 255.27) (xy 77.47 255.27))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 95.25 199.39) (xy 95.25 209.55))
+  (wire (pts (xy 83.82 88.9) (xy 62.23 88.9))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 95.25 209.55) (xy 92.71 209.55))
+  (wire (pts (xy 88.9 154.94) (xy 88.9 160.02))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 90.17 50.8) (xy 90.17 49.53))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 90.17 50.8) (xy 99.06 50.8))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
   (wire (pts (xy 96.52 53.34) (xy 96.52 60.96))
@@ -1660,24 +1674,9 @@
   (wire (pts (xy 99.06 154.94) (xy 96.52 154.94))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 100.33 219.71) (xy 105.41 219.71))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 100.33 236.22) (xy 100.33 238.76))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 100.33 238.76) (xy 105.41 238.76))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
   (wire (pts (xy 101.6 53.34) (xy 101.6 60.96))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 105.41 201.93) (xy 105.41 219.71))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 105.41 219.71) (xy 105.41 238.76))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
   (wire (pts (xy 106.68 33.02) (xy 106.68 38.1))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
@@ -1747,7 +1746,10 @@
   (wire (pts (xy 114.3 142.24) (xy 118.11 142.24))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
-  (wire (pts (xy 118.11 45.72) (xy 118.11 58.42))
+  (wire (pts (xy 118.11 46.99) (xy 118.11 45.72))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+  )
+  (wire (pts (xy 118.11 46.99) (xy 118.11 59.69))
     (stroke (width 0) (type solid) (color 0 0 0 0))
   )
   (wire (pts (xy 120.65 45.72) (xy 120.65 71.12))
@@ -2588,7 +2590,7 @@
   (text "DECOUPLING" (at 19.05 113.03 0)
     (effects (font (size 3.988 3.988)) (justify left bottom))
   )
-  (text "USB" (at 63.5 184.15 0)
+  (text "USB" (at 62.23 175.26 0)
     (effects (font (size 3.988 3.988)) (justify left bottom))
   )
   (text "PROG" (at 114.3 22.86 0)
@@ -2604,27 +2606,27 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
   )
 
-  (label "D+" (at 41.91 214.63 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-  )
-  (label "D-" (at 41.91 217.17 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-  )
   (label "D+" (at 48.26 93.98 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
   )
   (label "D-" (at 48.26 96.52 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
   )
-  (label "COL0" (at 80.01 83.82 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+  (label "D+" (at 62.23 199.39 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+  )
+  (label "D-" (at 62.23 201.93 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
   )
-  (label "D-" (at 107.95 214.63 0)
+  (label "D+" (at 73.66 229.87 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
   )
-  (label "D+" (at 107.95 217.17 0)
+  (label "D-" (at 73.66 232.41 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
   )
+  (label "COL0" (at 80.01 83.82 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+  )
   (label "COL8" (at 118.11 68.58 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
   )
@@ -2749,92 +2751,66 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 92.71 207.01 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 62.23 186.69 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "2da881a8-d647-4753-ab20-f32f2c11bc4c")
-    (property "Reference" "#FLG0102" (id 0) (at 92.71 205.105 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "PWR_FLAG" (id 1) (at 92.71 208.28 0))
-    (property "Footprint" "" (id 2) (at 92.71 207.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 92.71 207.01 0)
+    (uuid "9e98645b-b440-4485-8a29-e2635c9b052e")
+    (property "Reference" "#FLG0101" (id 0) (at 62.23 184.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-  )
-
-  (symbol (lib_id "power:PWR_FLAG") (at 95.25 190.5 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "9e98645b-b440-4485-8a29-e2635c9b052e")
-    (property "Reference" "#FLG0101" (id 0) (at 95.25 188.595 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 62.23 182.366 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 95.25 186.1756 0))
-    (property "Footprint" "" (id 2) (at 95.25 190.5 0)
+    (property "Footprint" "" (id 2) (at 62.23 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 95.25 190.5 0)
+    (property "Datasheet" "~" (id 3) (at 62.23 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 100.33 236.22 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 77.47 252.73 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "2b560990-52f2-4213-89c8-34ab9c7f4f70")
-    (property "Reference" "#FLG0103" (id 0) (at 100.33 234.315 0)
+    (property "Reference" "#FLG0103" (id 0) (at 77.47 250.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 100.33 231.8956 0))
-    (property "Footprint" "" (id 2) (at 100.33 236.22 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 77.47 248.4056 0))
+    (property "Footprint" "" (id 2) (at 77.47 252.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 100.33 236.22 0)
+    (property "Datasheet" "~" (id 3) (at 77.47 252.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:+5V") (at 36.83 118.11 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 80.01 186.69 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e81d24d")
-    (property "Reference" "#PWR0103" (id 0) (at 36.83 121.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+5V" (id 1) (at 37.211 113.7158 0))
-    (property "Footprint" "" (id 2) (at 36.83 118.11 0)
+    (uuid "2da881a8-d647-4753-ab20-f32f2c11bc4c")
+    (property "Reference" "#FLG0102" (id 0) (at 80.01 184.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 36.83 118.11 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 80.01 187.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-  )
-
-  (symbol (lib_id "power:VCC") (at 36.83 220.98 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "c79a26c3-2327-4bed-b5d5-d2c6359f9f01")
-    (property "Reference" "#PWR0111" (id 0) (at 36.83 224.79 0)
+    (property "Footprint" "" (id 2) (at 80.01 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "VCC" (id 1) (at 37.2618 216.5858 0))
-    (property "Footprint" "" (id 2) (at 36.83 220.98 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 36.83 220.98 0)
+    (property "Datasheet" "~" (id 3) (at 80.01 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:VCC") (at 39.37 207.01 0) (unit 1)
+  (symbol (lib_id "power:+5V") (at 35.56 118.11 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "aed454b2-a3b4-46e8-b7b4-e2c83b3a8c41")
-    (property "Reference" "#PWR0113" (id 0) (at 39.37 210.82 0)
+    (uuid "00000000-0000-0000-0000-00005e81d24d")
+    (property "Reference" "#PWR0103" (id 0) (at 35.56 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "VCC" (id 1) (at 39.8018 202.6158 0))
-    (property "Footprint" "" (id 2) (at 39.37 207.01 0)
+    (property "Value" "+5V" (id 1) (at 35.941 113.7158 0))
+    (property "Footprint" "" (id 2) (at 35.56 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 39.37 207.01 0)
+    (property "Datasheet" "" (id 3) (at 35.56 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2854,94 +2830,79 @@
     )
   )
 
-  (symbol (lib_id "power:VCC") (at 87.63 207.01 0) (unit 1)
+  (symbol (lib_id "power:VCC") (at 64.77 186.69 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "40e7256f-dbc7-45d8-a5f7-9060252b73f5")
-    (property "Reference" "#PWR0116" (id 0) (at 87.63 210.82 0)
+    (property "Reference" "#PWR0116" (id 0) (at 64.77 190.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "VCC" (id 1) (at 88.0618 202.6158 0))
-    (property "Footprint" "" (id 2) (at 87.63 207.01 0)
+    (property "Value" "VCC" (id 1) (at 65.2018 182.2958 0))
+    (property "Footprint" "" (id 2) (at 64.77 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 87.63 207.01 0)
+    (property "Datasheet" "" (id 3) (at 64.77 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:+5V") (at 90.17 49.53 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e82b4af")
-    (property "Reference" "#PWR0108" (id 0) (at 90.17 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+5V" (id 1) (at 90.551 45.1358 0))
-    (property "Footprint" "" (id 2) (at 90.17 49.53 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 90.17 49.53 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
-
-  (symbol (lib_id "power:+5V") (at 90.17 190.5 0) (unit 1)
+  (symbol (lib_id "power:+5V") (at 76.2 186.69 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "599b2579-c641-4a27-b49a-0bbfe000f883")
-    (property "Reference" "#PWR0115" (id 0) (at 90.17 188.214 0)
+    (property "Reference" "#PWR0115" (id 0) (at 76.2 184.404 0)
       (effects (font (size 0.508 0.508)) hide)
     )
-    (property "Value" "+5V" (id 1) (at 90.0684 187.2488 0)
+    (property "Value" "+5V" (id 1) (at 76.0984 183.4388 0)
       (effects (font (size 0.762 0.762)))
     )
-    (property "Footprint" "" (id 2) (at 90.17 190.5 0)
+    (property "Footprint" "" (id 2) (at 76.2 186.69 0)
       (effects (font (size 1.524 1.524)))
     )
-    (property "Datasheet" "" (id 3) (at 90.17 190.5 0)
+    (property "Datasheet" "" (id 3) (at 76.2 186.69 0)
       (effects (font (size 1.524 1.524)))
     )
   )
 
-  (symbol (lib_id "power:+5V") (at 138.43 27.94 0) (unit 1)
+  (symbol (lib_id "power:+5V") (at 90.17 49.53 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e91dbad")
-    (property "Reference" "#PWR0114" (id 0) (at 138.43 31.75 0)
+    (uuid "00000000-0000-0000-0000-00005e82b4af")
+    (property "Reference" "#PWR0108" (id 0) (at 90.17 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+5V" (id 1) (at 138.811 23.5458 0))
-    (property "Footprint" "" (id 2) (at 138.43 27.94 0)
+    (property "Value" "+5V" (id 1) (at 90.551 45.1358 0))
+    (property "Footprint" "" (id 2) (at 90.17 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 138.43 27.94 0)
+    (property "Datasheet" "" (id 3) (at 90.17 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:GND") (at 31.75 231.14 0) (unit 1)
+  (symbol (lib_id "power:+5V") (at 138.43 27.94 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "e79b96ff-a7d5-4672-b716-b1f14b015a75")
-    (property "Reference" "#PWR0112" (id 0) (at 31.75 237.49 0)
+    (uuid "00000000-0000-0000-0000-00005e91dbad")
+    (property "Reference" "#PWR0114" (id 0) (at 138.43 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 31.877 235.5342 0))
-    (property "Footprint" "" (id 2) (at 31.75 231.14 0)
+    (property "Value" "+5V" (id 1) (at 138.811 23.5458 0))
+    (property "Footprint" "" (id 2) (at 138.43 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 31.75 231.14 0)
+    (property "Datasheet" "" (id 3) (at 138.43 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:GND") (at 36.83 129.54 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 35.56 129.54 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "00000000-0000-0000-0000-00005e81ce3c")
-    (property "Reference" "#PWR0101" (id 0) (at 36.83 135.89 0)
+    (property "Reference" "#PWR0101" (id 0) (at 35.56 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 36.957 133.9342 0))
-    (property "Footprint" "" (id 2) (at 36.83 129.54 0)
+    (property "Value" "GND" (id 1) (at 35.687 133.9342 0))
+    (property "Footprint" "" (id 2) (at 35.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 36.83 129.54 0)
+    (property "Datasheet" "" (id 3) (at 35.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2961,17 +2922,17 @@
     )
   )
 
-  (symbol (lib_id "power:GND") (at 63.5 68.58 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 66.04 60.96 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "00000000-0000-0000-0000-00005e829410")
-    (property "Reference" "#PWR0106" (id 0) (at 63.5 74.93 0)
+    (property "Reference" "#PWR0106" (id 0) (at 66.04 67.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 63.627 72.9742 0))
-    (property "Footprint" "" (id 2) (at 63.5 68.58 0)
+    (property "Value" "GND" (id 1) (at 66.167 65.3542 0))
+    (property "Footprint" "" (id 2) (at 66.04 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 63.5 68.58 0)
+    (property "Datasheet" "" (id 3) (at 66.04 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2991,32 +2952,32 @@
     )
   )
 
-  (symbol (lib_id "power:GND") (at 88.9 160.02 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 73.66 255.27 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e816c41")
-    (property "Reference" "#PWR0104" (id 0) (at 88.9 166.37 0)
+    (uuid "8feca043-b8fd-4734-a55b-500f4ed0c05c")
+    (property "Reference" "#PWR0117" (id 0) (at 73.66 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 89.027 164.4142 0))
-    (property "Footprint" "" (id 2) (at 88.9 160.02 0)
+    (property "Value" "GND" (id 1) (at 73.787 259.6642 0))
+    (property "Footprint" "" (id 2) (at 73.66 255.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 88.9 160.02 0)
+    (property "Datasheet" "" (id 3) (at 73.66 255.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "power:GND") (at 92.71 238.76 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 88.9 160.02 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "8feca043-b8fd-4734-a55b-500f4ed0c05c")
-    (property "Reference" "#PWR0117" (id 0) (at 92.71 245.11 0)
+    (uuid "00000000-0000-0000-0000-00005e816c41")
+    (property "Reference" "#PWR0104" (id 0) (at 88.9 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 92.837 243.1542 0))
-    (property "Footprint" "" (id 2) (at 92.71 238.76 0)
+    (property "Value" "GND" (id 1) (at 89.027 164.4142 0))
+    (property "Footprint" "" (id 2) (at 88.9 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 92.71 238.76 0)
+    (property "Datasheet" "" (id 3) (at 88.9 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -3051,36 +3012,36 @@
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 38.1 212.09 90) (unit 1)
+  (symbol (lib_name "Device:R_Small_2") (lib_id "Device:R_Small") (at 63.5 96.52 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "bfb0acdd-c511-4ef5-ae30-49ca9f392e5a")
-    (property "Reference" "R6" (id 0) (at 38.1 209.55 90))
-    (property "Value" "5.1k" (id 1) (at 38.1 212.09 90)
-      (effects (font (size 0.9906 0.9906)))
-    )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 38.1 212.09 0)
+    (uuid "00000000-0000-0000-0000-00005e81ad41")
+    (property "Reference" "R1" (id 0) (at 63.5 91.567 90))
+    (property "Value" "22" (id 1) (at 63.5 93.8784 90))
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 63.5 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 38.1 212.09 0)
+    (property "Datasheet" "~" (id 3) (at 63.5 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "CR0805-FX-5101ELF " (id 4) (at 38.1 212.09 0)
+    (property "SKU" "GWCR0805-75RFT5 " (id 4) (at 63.5 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_name "Device:R_Small_2") (lib_id "Device:R_Small") (at 63.5 96.52 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 69.85 196.85 270) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e81ad41")
-    (property "Reference" "R1" (id 0) (at 63.5 91.567 90))
-    (property "Value" "75" (id 1) (at 63.5 93.8784 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 63.5 96.52 0)
+    (uuid "bfb0acdd-c511-4ef5-ae30-49ca9f392e5a")
+    (property "Reference" "R6" (id 0) (at 69.85 199.39 90))
+    (property "Value" "5.1k" (id 1) (at 69.85 196.85 90)
+      (effects (font (size 0.9906 0.9906)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 69.85 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 63.5 96.52 0)
+    (property "Datasheet" "~" (id 3) (at 69.85 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "GWCR0805-75RFT5 " (id 4) (at 63.5 96.52 0)
+    (property "SKU" "CR0805-FX-5101ELF " (id 4) (at 69.85 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -3089,7 +3050,7 @@
     (in_bom yes) (on_board yes)
     (uuid "00000000-0000-0000-0000-00005e81a4b9")
     (property "Reference" "R2" (id 0) (at 72.39 89.027 90))
-    (property "Value" "75" (id 1) (at 72.39 91.3384 90))
+    (property "Value" "22" (id 1) (at 72.39 91.3384 90))
     (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 72.39 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3101,60 +3062,60 @@
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 80.01 55.88 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 76.2 208.28 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e82a086")
-    (property "Reference" "R3" (id 0) (at 81.5086 54.737 0)
+    (uuid "03805411-ba4a-4057-9ba2-35e46a401626")
+    (property "Reference" "R7" (id 0) (at 77.47 204.47 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 81.5086 57.023 0)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "1.5k" (id 1) (at 76.2 209.55 90)
+      (effects (font (size 0.9906 0.9906)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 80.01 55.88 0)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 76.2 208.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 80.01 55.88 0)
+    (property "Datasheet" "~" (id 3) (at 76.2 208.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "WCR0805-10KFI " (id 4) (at 80.01 55.88 0)
+    (property "SKU" "CR0805-FX-1501ELF " (id 4) (at 76.2 208.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 90.17 195.58 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 78.74 227.33 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "03805411-ba4a-4057-9ba2-35e46a401626")
-    (property "Reference" "R7" (id 0) (at 91.44 191.77 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1.5k" (id 1) (at 90.17 196.85 90)
-      (effects (font (size 0.9906 0.9906)) (justify left))
+    (uuid "3bb53bac-47db-41aa-8a68-8968ba052249")
+    (property "Reference" "R5" (id 0) (at 78.74 224.79 90))
+    (property "Value" "5.1k" (id 1) (at 78.74 227.33 90)
+      (effects (font (size 0.9906 0.9906)))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 90.17 195.58 0)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 78.74 227.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 90.17 195.58 0)
+    (property "Datasheet" "~" (id 3) (at 78.74 227.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "CR0805-FX-1501ELF " (id 4) (at 90.17 195.58 0)
+    (property "SKU" "CR0805-FX-5101ELF " (id 4) (at 78.74 227.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 97.79 219.71 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 80.01 55.88 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "3bb53bac-47db-41aa-8a68-8968ba052249")
-    (property "Reference" "R5" (id 0) (at 97.79 217.17 90))
-    (property "Value" "5.1k" (id 1) (at 97.79 219.71 90)
-      (effects (font (size 0.9906 0.9906)))
+    (uuid "00000000-0000-0000-0000-00005e82a086")
+    (property "Reference" "R3" (id 0) (at 81.5086 54.737 0)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 97.79 219.71 0)
+    (property "Value" "10k" (id 1) (at 81.5086 57.023 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 80.01 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 97.79 219.71 0)
+    (property "Datasheet" "~" (id 3) (at 80.01 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "CR0805-FX-5101ELF " (id 4) (at 97.79 219.71 0)
+    (property "SKU" "WCR0805-10KFI " (id 4) (at 80.01 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -3175,62 +3136,62 @@
     )
   )
 
-  (symbol (lib_name "Device:Polyfuse_Small_1") (lib_id "Device:Polyfuse_Small") (at 95.25 196.85 0) (unit 1)
+  (symbol (lib_name "Device:Polyfuse_Small_1") (lib_id "Device:Polyfuse_Small") (at 69.85 189.23 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "c621e329-b637-4aed-b5ee-b0790c7e11d9")
-    (property "Reference" "F1" (id 0) (at 96.9772 195.6816 0)
+    (property "Reference" "F1" (id 0) (at 68.58 191.77 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "500mA" (id 1) (at 96.9772 197.993 0)
+    (property "Value" "500mA" (id 1) (at 67.31 186.69 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "cftkb:polyfuse_5.1mm" (id 2) (at 96.52 201.93 0)
+    (property "Footprint" "cftkb:polyfuse_5.1mm" (id 2) (at 64.77 190.5 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 95.25 196.85 0)
+    (property "Datasheet" "~" (id 3) (at 69.85 189.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "MF-R050" (id 4) (at 95.25 196.85 0)
+    (property "SKU" "MF-R050" (id 4) (at 69.85 189.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "Device:D_Zener_Small") (at 90.17 229.87 270) (unit 1)
+  (symbol (lib_id "Device:D_Zener_Small") (at 67.31 238.76 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "b3be5a97-6d81-47a5-8443-6c359d7132c2")
-    (property "Reference" "D86" (id 0) (at 87.63 227.33 90)
+    (property "Reference" "D86" (id 0) (at 64.77 236.22 90)
       (effects (font (size 0.991 0.991)) (justify left))
     )
-    (property "Value" "3.6V" (id 1) (at 92.71 228.6 90)
+    (property "Value" "3.6V" (id 1) (at 69.85 237.49 90)
       (effects (font (size 0.9906 0.9906)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (id 2) (at 90.17 229.87 90)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (id 2) (at 67.31 238.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 90.17 229.87 90)
+    (property "Datasheet" "~" (id 3) (at 67.31 238.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "MMSZ4685T1G" (id 4) (at 90.17 229.87 0)
+    (property "SKU" "MMSZ4685T1G" (id 4) (at 67.31 238.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "Device:D_Zener_Small") (at 92.71 229.87 270) (unit 1)
+  (symbol (lib_id "Device:D_Zener_Small") (at 69.85 238.76 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "89d382fd-5625-4cac-b68b-0fbf8b81a0c1")
-    (property "Reference" "D87" (id 0) (at 92.71 227.33 90)
+    (property "Reference" "D87" (id 0) (at 69.85 236.22 90)
       (effects (font (size 0.991 0.991)) (justify left))
     )
-    (property "Value" "3.6V" (id 1) (at 87.63 228.6 90)
+    (property "Value" "3.6V" (id 1) (at 64.77 237.49 90)
       (effects (font (size 0.9906 0.9906)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (id 2) (at 92.71 229.87 90)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (id 2) (at 69.85 238.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 92.71 229.87 90)
+    (property "Datasheet" "~" (id 3) (at 69.85 238.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "MMSZ4685T1G" (id 4) (at 92.71 229.87 0)
+    (property "SKU" "MMSZ4685T1G" (id 4) (at 69.85 238.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -4581,7 +4542,7 @@
     (property "Reference" "C1" (id 0) (at 27.7368 122.047 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 27.7368 124.333 0)
+    (property "Value" "0.1u" (id 1) (at 27.737 124.333 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 25.4 123.19 0)
@@ -4601,7 +4562,7 @@
     (property "Reference" "C2" (id 0) (at 37.8968 122.047 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 37.8968 124.333 0)
+    (property "Value" "0.1u" (id 1) (at 37.897 124.333 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 35.56 123.19 0)
@@ -4621,7 +4582,7 @@
     (property "Reference" "C3" (id 0) (at 45.5168 122.047 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "0.1uF" (id 1) (at 45.5168 124.333 0)
+    (property "Value" "0.1u" (id 1) (at 45.517 124.333 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 43.18 123.19 0)
@@ -4641,7 +4602,7 @@
     (property "Reference" "C4" (id 0) (at 54.4068 122.047 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10uF" (id 1) (at 54.4068 124.333 0)
+    (property "Value" "10u" (id 1) (at 54.407 124.333 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 52.07 123.19 0)
@@ -4655,34 +4616,34 @@
     )
   )
 
-  (symbol (lib_id "Device:C_Small") (at 54.61 72.39 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 57.15 78.74 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e825944")
-    (property "Reference" "C5" (id 0) (at 54.61 66.6242 90))
-    (property "Value" "22pF" (id 1) (at 54.61 68.9102 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 54.61 72.39 0)
+    (uuid "00000000-0000-0000-0000-00005e8268bc")
+    (property "Reference" "C6" (id 0) (at 57.15 72.9742 90))
+    (property "Value" "22p" (id 1) (at 57.15 75.26 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 57.15 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 54.61 72.39 0)
+    (property "Datasheet" "~" (id 3) (at 57.15 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "C0805X220K3GACAUTO" (id 4) (at 54.61 72.39 0)
+    (property "SKU" "C0805X220K3GACAUTO" (id 4) (at 57.15 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
 
-  (symbol (lib_id "Device:C_Small") (at 54.61 78.74 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 62.23 72.39 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005e8268bc")
-    (property "Reference" "C6" (id 0) (at 54.61 72.9742 90))
-    (property "Value" "22pF" (id 1) (at 54.61 75.2602 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 54.61 78.74 0)
+    (uuid "00000000-0000-0000-0000-00005e825944")
+    (property "Reference" "C5" (id 0) (at 62.23 66.6242 90))
+    (property "Value" "22p" (id 1) (at 62.23 68.91 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 62.23 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 54.61 78.74 0)
+    (property "Datasheet" "~" (id 3) (at 62.23 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "C0805X220K3GACAUTO" (id 4) (at 54.61 78.74 0)
+    (property "SKU" "C0805X220K3GACAUTO" (id 4) (at 62.23 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -4693,7 +4654,7 @@
     (property "Reference" "C7" (id 0) (at 68.3768 108.077 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1uF" (id 1) (at 68.3768 110.363 0)
+    (property "Value" "1u" (id 1) (at 68.377 110.363 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 66.04 109.22 0)
@@ -4727,18 +4688,18 @@
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 72.39 67.31 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 72.39 59.69 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid "00000000-0000-0000-0000-00005e828aec")
-    (property "Reference" "SW1" (id 0) (at 72.39 60.0964 0))
-    (property "Value" "SW_Push" (id 1) (at 72.39 62.4078 0))
-    (property "Footprint" "Random Keyboard Parts:SKQGADE010" (id 2) (at 72.39 62.23 0)
+    (property "Reference" "SW1" (id 0) (at 72.39 52.4764 0))
+    (property "Value" "SW_Push" (id 1) (at 72.39 54.7878 0))
+    (property "Footprint" "Random Keyboard Parts:SKQGADE010" (id 2) (at 72.39 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 72.39 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 72.39 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "SKU" "SKQGADE010" (id 4) (at 72.39 67.31 0)
+    (property "SKU" "SKQGADE010" (id 4) (at 72.39 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -6099,22 +6060,22 @@
     )
   )
 
-  (symbol (lib_id "10137061-00021LF:10137061-00021LF") (at 64.77 217.17 0) (unit 1)
+  (symbol (lib_id "Type-C:Wurth-632723300011") (at 57.15 215.9 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "7a64ceac-9ab1-4bf6-9a33-ec9c357daa77")
-    (property "Reference" "USB1" (id 0) (at 60.515 190.883 0)
+    (uuid "665e9f3a-e0a2-466a-bd9f-8b3e350b60e6")
+    (property "Reference" "USB1" (id 0) (at 47.117 180.4949 0)
       (effects (font (size 1.524 1.524)))
     )
-    (property "Value" "USB_C_GCT_USB4085-Type-C" (id 1) (at 60.5155 193.5911 0)
+    (property "Value" "Wurth-632723300011" (id 1) (at 47.117 183.2025 0)
       (effects (font (size 1.524 1.524)))
     )
-    (property "Footprint" "cftkb:USB_C_GCT_USB4085" (id 2) (at 64.77 217.17 0)
+    (property "Footprint" "Type-C:Wurth-632723300011" (id 2) (at 57.15 215.9 0)
       (effects (font (size 1.524 1.524)) hide)
     )
-    (property "Datasheet" "https://www.amphenol-icc.com/media/wysiwyg/files/documentation/datasheet/inputoutput/io_usb31typec_g1_connector.pdf?__cf_chl_jschl_tk__=d965b15c609665cf5c72b5c8184a1b71be5d322d-1601856344-0-Aey402PXkvxEcaW5JwCDZhJmdYi2Q6n0mbTeCe_GoKH-LOQOnm9wJ1QKAQqhB9zJbGkn13d1ygWD2ynVQy9H-26rKbUue8sENlr1i11gf72YSrZlIPC6nqnvrhtxtJroAJ91Ss_2b_W2Xi8CneF-z3S-GY_a2VGSl3q_qPZRaFIqCLvsaNBYD7stsmJRmA2XDUS5AQSbztPYo-uEN2avsMmmb_JoU5hZMm9DtYQj2sc2VgohERNI2yyR5b0oZ9_tdE2_dgdNv3CL1bku6iss2g-llIFe7pVjim-Rz5Is9lscPObh4squlEdBaqnIbV5Qw0afK20E7D_MqszdKhIAjIrmkRC6CGNCrqwfR1j0MVA5pmm2Ka4uDJtzAzZdIb2RIGldsY3a1VI0OZrRmJnIjun_jhql_E77uSwRkUUkDr_q4FwirHF-boc__nPxMppzag" (id 3) (at 64.77 217.17 0)
+    (property "Datasheet" "https://www.mouser.com/datasheet/2/445/632723300011-1718173.pdf" (id 3) (at 57.15 215.9 0)
       (effects (font (size 1.524 1.524)) hide)
     )
-    (property "SKU" "10137061-00021LF" (id 4) (at 64.77 217.17 0)
+    (property "SKU" "632723300011" (id 4) (at 57.15 215.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -6175,15 +6136,6 @@
     (path "/00000000-0000-0000-0000-00005e8281ed"
       (reference "#PWR0110") (unit 1)
     )
-    (path "/c79a26c3-2327-4bed-b5d5-d2c6359f9f01"
-      (reference "#PWR0111") (unit 1)
-    )
-    (path "/e79b96ff-a7d5-4672-b716-b1f14b015a75"
-      (reference "#PWR0112") (unit 1)
-    )
-    (path "/aed454b2-a3b4-46e8-b7b4-e2c83b3a8c41"
-      (reference "#PWR0113") (unit 1)
-    )
     (path "/00000000-0000-0000-0000-00005e91dbad"
       (reference "#PWR0114") (unit 1)
     )
@@ -6658,7 +6610,7 @@
     (path "/00000000-0000-0000-0000-00005e8139cd"
       (reference "U1") (unit 1)
     )
-    (path "/7a64ceac-9ab1-4bf6-9a33-ec9c357daa77"
+    (path "/665e9f3a-e0a2-466a-bd9f-8b3e350b60e6"
       (reference "USB1") (unit 1)
     )
     (path "/00000000-0000-0000-0000-00005e8219ea"
diff --git a/sym-lib-table b/sym-lib-table
index 9ec2629..7e0cbdf 100644
--- a/sym-lib-table
+++ b/sym-lib-table
@@ -3,4 +3,5 @@
   (lib (name "random-keyboard-parts")(type "Legacy")(uri "${KIPRJMOD}/random-keyboard-parts.pretty/Schematic Library/random-keyboard-parts.lib")(options "")(descr ""))
   (lib (name "discipline-pcb-rescue")(type "Legacy")(uri "${KIPRJMOD}/MX_Alps_Hybrid.pretty/Schematic Library/discipline-pcb-rescue.lib")(options "")(descr ""))
   (lib (name "10137061-00021LF")(type "Legacy")(uri "${KIPRJMOD}/10137061-00021LF/10137061-00021LF.lib")(options "")(descr ""))
+  (lib (name "Type-C")(type "Legacy")(uri "${KIPRJMOD}/Type-C.pretty/Type-C.lib")(options "")(descr ""))
 )