reform

commit 976056c3a03f92f04a525de49e09d528bdf7c7bd
parent 36b3c3944e7bf11536211bd76e91bb96e09ac0b4
Author: mntmn <lukas@mntmn.com>
Date:   Wed, 29 May 2019 22:47:26 +0200

WIP reform2 kbd: restructure switches, led, finer placement, some routing

Diffstat:
M
reform2-keyboard-pcb/reform-kbd-mcu.sch
 | 
844
++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
M
reform2-keyboard-pcb/reform2-keyboard-cache.lib
 | 
185
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
M
reform2-keyboard-pcb/reform2-keyboard.kicad_pcb
 | 
3251
+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
M
reform2-keyboard-pcb/reform2-keyboard.pro
 | 
22
+++++++++++-----------
M
reform2-keyboard-pcb/reform2-keyboard.sch
 | 
4
++--

5 files changed, 2686 insertions(+), 1620 deletions(-)
diff --git a/reform2-keyboard-pcb/reform-kbd-mcu.sch b/reform2-keyboard-pcb/reform-kbd-mcu.sch
@@ -6,9 +6,9 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 2
 Title "Reform Keyboard"
-Date "2019-03-29"
-Rev "0.5"
-Comp "MNT Media and Technology UG"
+Date "2019-05-29"
+Rev "0.6"
+Comp "MNT Research GmbH"
 Comment1 "License: GPLv3+ https://www.gnu.org/licenses/gpl-3.0.en.html"
 Comment2 "Copyright 2017,2018,2019 Lukas F. Hartmann / mntmn"
 Comment3 "https://mntre.com/reform"
@@ -17,440 +17,750 @@ $EndDescr
 $Comp
 L power:GND #PWR01
 U 1 1 5A20720B
-P 4650 4450
-F 0 "#PWR01" H 4650 4200 50  0001 C CNN
-F 1 "GND" H 4650 4300 50  0000 C CNN
-F 2 "" H 4650 4450 50  0001 C CNN
-F 3 "" H 4650 4450 50  0001 C CNN
-	1    4650 4450
+P 3450 4850
+F 0 "#PWR01" H 3450 4600 50  0001 C CNN
+F 1 "GND" H 3450 4700 50  0000 C CNN
+F 2 "" H 3450 4850 50  0001 C CNN
+F 3 "" H 3450 4850 50  0001 C CNN
+	1    3450 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C1
 U 1 1 5A2073AA
-P 3500 3400
-F 0 "C1" H 3510 3470 50  0000 L CNN
-F 1 "18pF" H 3510 3320 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3500 3400 50  0001 C CNN
-F 3 "" H 3500 3400 50  0001 C CNN
-	1    3500 3400
+P 2050 3850
+F 0 "C1" H 2060 3920 50  0000 L CNN
+F 1 "18pF" H 2060 3770 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2050 3850 50  0001 C CNN
+F 3 "" H 2050 3850 50  0001 C CNN
+	1    2050 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C2
 U 1 1 5A2073F7
-P 4100 3400
-F 0 "C2" H 4110 3470 50  0000 L CNN
-F 1 "18pF" H 4110 3320 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4100 3400 50  0001 C CNN
-F 3 "" H 4100 3400 50  0001 C CNN
-	1    4100 3400
+P 2650 3850
+F 0 "C2" H 2660 3920 50  0000 L CNN
+F 1 "18pF" H 2660 3770 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2650 3850 50  0001 C CNN
+F 3 "" H 2650 3850 50  0001 C CNN
+	1    2650 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR02
 U 1 1 5A207477
-P 3800 3650
-F 0 "#PWR02" H 3800 3400 50  0001 C CNN
-F 1 "GND" H 3800 3500 50  0000 C CNN
-F 2 "" H 3800 3650 50  0001 C CNN
-F 3 "" H 3800 3650 50  0001 C CNN
-	1    3800 3650
+P 2350 4100
+F 0 "#PWR02" H 2350 3850 50  0001 C CNN
+F 1 "GND" H 2350 3950 50  0000 C CNN
+F 2 "" H 2350 4100 50  0001 C CNN
+F 3 "" H 2350 4100 50  0001 C CNN
+	1    2350 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C3
 U 1 1 5A20764E
-P 4650 4250
-F 0 "C3" H 4660 4320 50  0000 L CNN
-F 1 "1uF" H 4660 4170 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4650 4250 50  0001 C CNN
-F 3 "" H 4650 4250 50  0001 C CNN
-	1    4650 4250
+P 3450 4700
+F 0 "C3" H 3460 4770 50  0000 L CNN
+F 1 "1uF" H 3460 4620 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3450 4700 50  0001 C CNN
+F 3 "" H 3450 4700 50  0001 C CNN
+	1    3450 4700
 	1    0    0    -1  
 $EndComp
-Text GLabel 8900 3800 2    60   Input ~ 0
-UVCC
-$Comp
-L power:GND #PWR03
-U 1 1 5A2077AE
-P 9350 3850
-F 0 "#PWR03" H 9350 3600 50  0001 C CNN
-F 1 "GND" H 9350 3700 50  0000 C CNN
-F 2 "" H 9350 3850 50  0001 C CNN
-F 3 "" H 9350 3850 50  0001 C CNN
-	1    9350 3850
-	1    0    0    -1  
-$EndComp
-Text GLabel 8900 3600 2    60   Input ~ 0
+Text GLabel 7550 4200 2    60   Input ~ 0
 D+
-Text GLabel 8900 3700 2    60   Input ~ 0
+Text GLabel 7550 4300 2    60   Input ~ 0
 D-
-Text GLabel 4750 3350 0    60   Input ~ 0
-UVCC
-Text GLabel 4450 3700 0    60   Input ~ 0
+Text GLabel 3000 4150 0    60   Input ~ 0
 D+
-Text GLabel 4450 3800 0    60   Input ~ 0
+Text GLabel 3000 4250 0    60   Input ~ 0
 D-
-Text GLabel 5550 1850 1    60   Input ~ 0
-UVCC
 $Comp
 L power:GND #PWR04
 U 1 1 5A207A65
-P 5550 6350
-F 0 "#PWR04" H 5550 6100 50  0001 C CNN
-F 1 "GND" H 5550 6200 50  0000 C CNN
-F 2 "" H 5550 6350 50  0001 C CNN
-F 3 "" H 5550 6350 50  0001 C CNN
-	1    5550 6350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Connector_Generic:Conn_01x02 J1
-U 1 1 5A207D64
-P 7700 2950
-F 0 "J1" H 7700 3050 50  0000 C CNN
-F 1 "RST" H 7700 2750 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.00mm" H 7700 2950 50  0001 C CNN
-F 3 "" H 7700 2950 50  0001 C CNN
-	1    7700 2950
-	-1   0    0    1   
-$EndComp
-Text GLabel 7900 2850 2    60   Input ~ 0
-RESET
-Text GLabel 4750 2700 0    60   Input ~ 0
-RESET
-$Comp
-L power:GND #PWR05
-U 1 1 5A207DEF
-P 8000 3100
-F 0 "#PWR05" H 8000 2850 50  0001 C CNN
-F 1 "GND" H 8000 2950 50  0000 C CNN
-F 2 "" H 8000 3100 50  0001 C CNN
-F 3 "" H 8000 3100 50  0001 C CNN
-	1    8000 3100
+P 4100 6550
+F 0 "#PWR04" H 4100 6300 50  0001 C CNN
+F 1 "GND" H 4100 6400 50  0000 C CNN
+F 2 "" H 4100 6550 50  0001 C CNN
+F 3 "" H 4100 6550 50  0001 C CNN
+	1    4100 6550
 	1    0    0    -1  
 $EndComp
-Text GLabel 6250 3300 2    60   Input ~ 0
+Text GLabel 3300 3150 0    60   Input ~ 0
+RESET
+Text GLabel 4800 3750 2    60   Input ~ 0
 ROW1
-Text GLabel 6250 3200 2    60   Input ~ 0
+Text GLabel 4800 3650 2    60   Input ~ 0
 ROW2
-Text GLabel 6250 3100 2    60   Input ~ 0
+Text GLabel 4800 3550 2    60   Input ~ 0
 ROW3
-Text GLabel 6250 4600 2    60   Input ~ 0
+Text GLabel 4800 5050 2    60   Input ~ 0
 ROW4
-Text GLabel 6250 4500 2    60   Input ~ 0
+Text GLabel 4800 4950 2    60   Input ~ 0
 ROW5
-Text GLabel 6250 4300 2    60   Input ~ 0
+Text GLabel 4800 4750 2    60   Input ~ 0
 ROW6
-Text GLabel 6250 4400 2    60   Input ~ 0
+Text GLabel 4800 4850 2    60   Input ~ 0
 COL1
-Text GLabel 6250 4200 2    60   Input ~ 0
+Text GLabel 4800 4650 2    60   Input ~ 0
 COL2
-Text GLabel 6250 4100 2    60   Input ~ 0
+Text GLabel 4800 4550 2    60   Input ~ 0
 COL3
-Text GLabel 6250 4000 2    60   Input ~ 0
+Text GLabel 4800 4450 2    60   Input ~ 0
 COL4
-Text GLabel 6250 3000 2    60   Input ~ 0
+Text GLabel 4800 3450 2    60   Input ~ 0
 COL5
-Text GLabel 6250 2900 2    60   Input ~ 0
+Text GLabel 4800 3350 2    60   Input ~ 0
 COL6
-Text GLabel 6250 2800 2    60   Input ~ 0
+Text GLabel 4800 3250 2    60   Input ~ 0
 COL7
-Text GLabel 6250 2700 2    60   Input ~ 0
+Text GLabel 4800 3150 2    60   Input ~ 0
 COL8
-Text GLabel 6250 5100 2    60   Input ~ 0
+Text GLabel 4800 5550 2    60   Input ~ 0
 COL9
-Text GLabel 6250 5200 2    60   Input ~ 0
+Text GLabel 4800 5650 2    60   Input ~ 0
 COL10
-Text GLabel 6250 5300 2    60   Input ~ 0
+Text GLabel 4800 5750 2    60   Input ~ 0
 COL11
-Text GLabel 6250 5400 2    60   Input ~ 0
+Text GLabel 4800 5850 2    60   Input ~ 0
 COL12
-Text GLabel 6250 5500 2    60   Input ~ 0
+Text GLabel 4800 5950 2    60   Input ~ 0
 COL13
-Text GLabel 6250 5600 2    60   Input ~ 0
+Text GLabel 4800 4050 2    60   Input ~ 0
 COL14
 $Comp
 L Device:R_Small R2
 U 1 1 5A213EDF
-P 4600 3800
-F 0 "R2" V 4700 3750 50  0000 L CNN
-F 1 "0" V 4700 3900 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" H 4600 3800 50  0001 C CNN
-F 3 "" H 4600 3800 50  0001 C CNN
-	1    4600 3800
+P 3150 4250
+F 0 "R2" V 3250 4200 50  0000 L CNN
+F 1 "0" V 3250 4350 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3150 4250 50  0001 C CNN
+F 3 "" H 3150 4250 50  0001 C CNN
+	1    3150 4250
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R_Small R1
 U 1 1 5A213F64
-P 4600 3700
-F 0 "R1" V 4500 3650 50  0000 L CNN
-F 1 "0" V 4500 3800 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" H 4600 3700 50  0001 C CNN
-F 3 "" H 4600 3700 50  0001 C CNN
-	1    4600 3700
+P 3150 4150
+F 0 "R1" V 3050 4100 50  0000 L CNN
+F 1 "0" V 3050 4250 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3150 4150 50  0001 C CNN
+F 3 "" H 3150 4150 50  0001 C CNN
+	1    3150 4150
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C_Small C4
 U 1 1 5A2148C0
-P 5300 2150
-F 0 "C4" H 5310 2220 50  0000 L CNN
-F 1 "1uF" H 5310 2070 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 5300 2150 50  0001 C CNN
-F 3 "" H 5300 2150 50  0001 C CNN
-	1    5300 2150
+P 3850 2600
+F 0 "C4" H 3860 2670 50  0000 L CNN
+F 1 "1uF" H 3860 2520 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3850 2600 50  0001 C CNN
+F 3 "" H 3850 2600 50  0001 C CNN
+	1    3850 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C5
 U 1 1 5A214A09
-P 6000 2100
-F 0 "C5" H 6010 2170 50  0000 L CNN
-F 1 "1uF" H 6010 2020 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 6000 2100 50  0001 C CNN
-F 3 "" H 6000 2100 50  0001 C CNN
-	1    6000 2100
+P 4550 2550
+F 0 "C5" H 4560 2620 50  0000 L CNN
+F 1 "0.1uF" H 4560 2470 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 4550 2550 50  0001 C CNN
+F 3 "" H 4550 2550 50  0001 C CNN
+	1    4550 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR06
 U 1 1 5A214AB7
-P 5300 2250
-F 0 "#PWR06" H 5300 2000 50  0001 C CNN
-F 1 "GND" H 5300 2100 50  0000 C CNN
-F 2 "" H 5300 2250 50  0001 C CNN
-F 3 "" H 5300 2250 50  0001 C CNN
-	1    5300 2250
+P 3850 2700
+F 0 "#PWR06" H 3850 2450 50  0001 C CNN
+F 1 "GND" H 3850 2550 50  0000 C CNN
+F 2 "" H 3850 2700 50  0001 C CNN
+F 3 "" H 3850 2700 50  0001 C CNN
+	1    3850 2700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR07
 U 1 1 5A214B4F
-P 6000 2250
-F 0 "#PWR07" H 6000 2000 50  0001 C CNN
-F 1 "GND" H 6000 2100 50  0000 C CNN
-F 2 "" H 6000 2250 50  0001 C CNN
-F 3 "" H 6000 2250 50  0001 C CNN
-	1    6000 2250
+P 4550 2700
+F 0 "#PWR07" H 4550 2450 50  0001 C CNN
+F 1 "GND" H 4550 2550 50  0000 C CNN
+F 2 "" H 4550 2700 50  0001 C CNN
+F 3 "" H 4550 2700 50  0001 C CNN
+	1    4550 2700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+5V #PWR08
 U 1 1 5A635C68
-P 5750 2000
-F 0 "#PWR08" H 5750 1850 50  0001 C CNN
-F 1 "+5V" H 5750 2140 50  0000 C CNN
-F 2 "" H 5750 2000 50  0001 C CNN
-F 3 "" H 5750 2000 50  0001 C CNN
-	1    5750 2000
+P 4300 2450
+F 0 "#PWR08" H 4300 2300 50  0001 C CNN
+F 1 "+5V" H 4300 2590 50  0000 C CNN
+F 2 "" H 4300 2450 50  0001 C CNN
+F 3 "" H 4300 2450 50  0001 C CNN
+	1    4300 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+5V #PWR09
 U 1 1 5A635C9E
-P 4850 2050
-F 0 "#PWR09" H 4850 1900 50  0001 C CNN
-F 1 "+5V" H 4850 2190 50  0000 C CNN
-F 2 "" H 4850 2050 50  0001 C CNN
-F 3 "" H 4850 2050 50  0001 C CNN
-	1    4850 2050
+P 3400 2500
+F 0 "#PWR09" H 3400 2350 50  0001 C CNN
+F 1 "+5V" H 3400 2640 50  0000 C CNN
+F 2 "" H 3400 2500 50  0001 C CNN
+F 3 "" H 3400 2500 50  0001 C CNN
+	1    3400 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R_Small R3
 U 1 1 5A21443A
-P 4850 2350
-F 0 "R3" H 4880 2370 50  0000 L CNN
-F 1 "10k" H 4880 2310 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" H 4850 2350 50  0001 C CNN
-F 3 "" H 4850 2350 50  0001 C CNN
-	1    4850 2350
+P 3400 2800
+F 0 "R3" H 3430 2820 50  0000 L CNN
+F 1 "10k" H 3430 2760 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3400 2800 50  0001 C CNN
+F 3 "" H 3400 2800 50  0001 C CNN
+	1    3400 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:Crystal_GND24 Y1
 U 1 1 5A6378F6
-P 3800 3100
-F 0 "Y1" H 3925 3300 50  0000 L CNN
-F 1 "16MHz" H 3925 3225 50  0000 L CNN
-F 2 "Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm_HandSoldering" H 3800 3100 50  0001 C CNN
-F 3 "" H 3800 3100 50  0001 C CNN
-	1    3800 3100
+P 2350 3550
+F 0 "Y1" H 2475 3750 50  0000 L CNN
+F 1 "16MHz" H 2475 3675 50  0000 L CNN
+F 2 "Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm_HandSoldering" H 2350 3550 50  0001 C CNN
+F 3 "" H 2350 3550 50  0001 C CNN
+	1    2350 3550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4100 3100 4100 3300
+	2650 3550 2650 3750
 Wire Wire Line
-	3500 2800 3500 3100
+	2050 3250 2050 3550
 Wire Wire Line
-	3500 3600 3800 3600
+	2050 4050 2350 4050
 Wire Wire Line
-	3800 3300 3800 3350
+	2350 3750 2350 3800
 Wire Wire Line
-	4100 3600 4100 3500
-Connection ~ 3800 3600
+	2650 4050 2650 3950
+Connection ~ 2350 4050
 Wire Wire Line
-	9350 3850 9350 3500
+	7800 4100 7550 4100
 Wire Wire Line
-	9350 3500 8900 3500
+	3450 4850 3450 4800
 Wire Wire Line
-	8000 3100 8000 2950
+	4200 2850 4200 2700
+Connection ~ 4200 2700
 Wire Wire Line
-	8000 2950 7900 2950
+	4300 2700 4300 2850
 Wire Wire Line
-	4650 4450 4650 4350
+	3850 2450 4100 2450
+Connection ~ 4100 2450
 Wire Wire Line
-	5550 1850 5550 2000
+	4200 2450 4300 2450
 Wire Wire Line
-	5650 2400 5650 2250
-Connection ~ 5650 2250
+	3050 4250 3000 4250
 Wire Wire Line
-	5750 2250 5750 2400
+	3050 4150 3000 4150
 Wire Wire Line
-	5300 2000 5550 2000
-Connection ~ 5550 2000
+	3400 2900 3400 3150
 Wire Wire Line
-	5650 2000 5750 2000
+	3300 3150 3400 3150
+Connection ~ 3400 3150
+Connection ~ 4300 2450
 Wire Wire Line
-	4500 3800 4450 3800
+	4550 2700 4550 2650
 Wire Wire Line
-	4500 3700 4450 3700
+	3850 2500 3850 2450
 Wire Wire Line
-	4750 3350 4850 3350
+	2650 3350 2650 3250
 Wire Wire Line
-	4850 3350 4850 3500
+	2650 3250 2050 3250
+Connection ~ 2050 3550
+Connection ~ 2650 3550
 Wire Wire Line
-	4850 2450 4850 2700
+	2050 4050 2050 3950
 Wire Wire Line
-	4750 2700 4850 2700
-Connection ~ 4850 2700
-Connection ~ 5750 2000
+	2500 3550 2650 3550
 Wire Wire Line
-	6000 2250 6000 2200
+	2200 3550 2050 3550
 Wire Wire Line
-	5300 2050 5300 2000
+	2350 3350 2150 3350
 Wire Wire Line
-	4100 2900 4100 2800
+	2150 3350 2150 3800
 Wire Wire Line
-	4100 2800 3500 2800
-Connection ~ 3500 3100
-Connection ~ 4100 3100
+	2150 3800 2350 3800
+Connection ~ 2350 3800
 Wire Wire Line
-	3500 3600 3500 3500
+	2350 4050 2650 4050
 Wire Wire Line
-	3950 3100 4100 3100
+	2350 4050 2350 4100
 Wire Wire Line
-	3650 3100 3500 3100
+	4200 2700 4300 2700
 Wire Wire Line
-	3800 2900 3600 2900
+	4100 2450 4100 2850
 Wire Wire Line
-	3600 2900 3600 3350
+	4200 2450 4200 2700
 Wire Wire Line
-	3600 3350 3800 3350
-Connection ~ 3800 3350
+	3400 3150 3600 3150
 Wire Wire Line
-	3800 3600 4100 3600
+	4300 2450 4550 2450
 Wire Wire Line
-	3800 3600 3800 3650
+	2050 3550 2050 3750
 Wire Wire Line
-	5650 2250 5750 2250
+	2350 3800 2350 4050
 Wire Wire Line
-	5550 2000 5550 2400
+	2650 3350 3600 3350
 Wire Wire Line
-	5650 2000 5650 2250
+	2650 3550 3600 3550
 Wire Wire Line
-	4850 2700 5050 2700
+	3100 3950 3350 3950
 Wire Wire Line
-	5750 2000 6000 2000
+	3250 4150 3600 4150
 Wire Wire Line
-	3500 3100 3500 3300
+	3250 4250 3600 4250
 Wire Wire Line
-	3800 3350 3800 3600
+	3450 4450 3600 4450
 Wire Wire Line
-	4100 2900 5050 2900
+	3450 4450 3450 4600
 Wire Wire Line
-	4100 3100 5050 3100
+	4100 6450 4100 6550
+$Comp
+L MCU_Microchip_ATmega:ATmega32U4-AU U1
+U 1 1 5A21306C
+P 4200 4650
+F 0 "U1" H 4450 2900 50  0000 C CNN
+F 1 "ATMEGA32U4-AU" H 4700 2800 50  0000 C CNN
+F 2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" H 4200 4650 50  0001 C CIN
+F 3 "" H 5300 5750 50  0001 C CNN
+	1    4200 4650
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	4850 3500 5050 3500
+	4200 6450 4100 6450
+Connection ~ 4100 6450
 Wire Wire Line
-	4700 3700 5050 3700
+	3400 2500 3400 2700
 Wire Wire Line
-	4700 3800 5050 3800
+	4200 2450 4100 2450
+Connection ~ 4200 2450
+$Comp
+L Connector_Generic:Conn_01x04 J2
+U 1 1 5A213B3D
+P 7350 4300
+F 0 "J2" H 7350 4600 50  0000 C CNN
+F 1 "USB" H 7350 3900 50  0000 C CNN
+F 2 "Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal" H 7350 4300 50  0001 C CNN
+F 3 "" H 7350 4300 50  0001 C CNN
+	1    7350 4300
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+5V #PWR0101
+U 1 1 5CF326CA
+P 3100 3950
+F 0 "#PWR0101" H 3100 3800 50  0001 C CNN
+F 1 "+5V" H 3100 4090 50  0000 C CNN
+F 2 "" H 3100 3950 50  0001 C CNN
+F 3 "" H 3100 3950 50  0001 C CNN
+	1    3100 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR0102
+U 1 1 5CF32B25
+P 7800 4400
+F 0 "#PWR0102" H 7800 4250 50  0001 C CNN
+F 1 "+5V" H 7800 4540 50  0000 C CNN
+F 2 "" H 7800 4400 50  0001 C CNN
+F 3 "" H 7800 4400 50  0001 C CNN
+	1    7800 4400
+	0    1    1    0   
+$EndComp
 Wire Wire Line
-	4650 4000 5050 4000
+	7800 4400 7550 4400
+Text GLabel 6000 4300 0    60   Input ~ 0
+PROG
+Text GLabel 4800 5250 2    60   Input ~ 0
+PROG
+$Comp
+L Sensor_Magnetic:SM351LT U2
+U 1 1 5CF3B985
+P 6250 2100
+F 0 "U2" H 5920 2146 50  0000 R CNN
+F 1 "SM351LT" H 5920 2055 50  0000 R CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 6200 2100 50  0001 C CNN
+F 3 "https://sensing.honeywell.com/honeywell-sensing-nanopower-series-product-sheet-50095501-a-en.pdf" H 6200 2100 50  0001 C CNN
+	1    6250 2100
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_SPST SW91
+U 1 1 5CF3DA9E
+P 6250 3600
+F 0 "SW91" H 6250 3835 50  0000 C CNN
+F 1 "RESET" H 6250 3744 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_Push_1P1T_NO_CK_KMR2" H 6250 3600 50  0001 C CNN
+F 3 "~" H 6250 3600 50  0001 C CNN
+	1    6250 3600
+	1    0    0    -1  
+$EndComp
+Text GLabel 6000 3600 0    60   Input ~ 0
+RESET
 Wire Wire Line
-	4650 4000 4650 4150
+	6000 3600 6050 3600
+$Comp
+L power:GND #PWR0103
+U 1 1 5CF3FA6D
+P 6550 3600
+F 0 "#PWR0103" H 6550 3350 50  0001 C CNN
+F 1 "GND" H 6550 3450 50  0000 C CNN
+F 2 "" H 6550 3600 50  0001 C CNN
+F 3 "" H 6550 3600 50  0001 C CNN
+	1    6550 3600
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	5550 6000 5550 6350
+	6550 3600 6450 3600
+Text GLabel 6650 2100 2    60   Input ~ 0
+LID_SENSE
 $Comp
-L MCU_Microchip_ATmega:ATmega32U4-AU U1
-U 1 1 5A21306C
-P 5650 4200
-F 0 "U1" H 5900 2450 50  0000 C CNN
-F 1 "ATMEGA32U4-AU" H 6150 2350 50  0000 C CNN
-F 2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" H 5650 4200 50  0001 C CIN
-F 3 "" H 6750 5300 50  0001 C CNN
-	1    5650 4200
+L power:+5V #PWR0104
+U 1 1 5CF44292
+P 6050 1750
+F 0 "#PWR0104" H 6050 1600 50  0001 C CNN
+F 1 "+5V" H 6050 1890 50  0000 C CNN
+F 2 "" H 6050 1750 50  0001 C CNN
+F 3 "" H 6050 1750 50  0001 C CNN
+	1    6050 1750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6050 1750 6050 1800
+$Comp
+L power:GND #PWR0105
+U 1 1 5CF45385
+P 6050 2450
+F 0 "#PWR0105" H 6050 2200 50  0001 C CNN
+F 1 "GND" H 6050 2300 50  0000 C CNN
+F 2 "" H 6050 2450 50  0001 C CNN
+F 3 "" H 6050 2450 50  0001 C CNN
+	1    6050 2450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6050 2450 6050 2400
+Text GLabel 4800 6050 2    60   Input ~ 0
+LID_SENSE
+Text GLabel 4800 3850 2    60   Input ~ 0
+LED
+$Comp
+L Switch:SW_DIP_x02 SW92
+U 1 1 5CF54073
+P 6350 4300
+F 0 "SW92" H 6350 4667 50  0000 C CNN
+F 1 "SW_DIP_x02" H 6350 4576 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm" H 6350 4300 50  0001 C CNN
+F 3 "~" H 6350 4300 50  0001 C CNN
+	1    6350 4300
 	1    0    0    -1  
 $EndComp
+$Comp
+L power:GND #PWR0109
+U 1 1 5CF5456D
+P 6750 4350
+F 0 "#PWR0109" H 6750 4100 50  0001 C CNN
+F 1 "GND" H 6750 4200 50  0000 C CNN
+F 2 "" H 6750 4350 50  0001 C CNN
+F 3 "" H 6750 4350 50  0001 C CNN
+	1    6750 4350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6750 4350 6750 4300
+Wire Wire Line
+	6750 4300 6650 4300
+Wire Wire Line
+	6650 4200 6750 4200
 Wire Wire Line
-	5650 6000 5550 6000
-Connection ~ 5550 6000
+	6750 4200 6750 4300
+Connection ~ 6750 4300
 Wire Wire Line
-	4850 2050 4850 2250
+	6000 4200 6050 4200
+Text GLabel 6000 4200 0    60   Input ~ 0
+AUX
 Wire Wire Line
-	5650 2000 5550 2000
-Connection ~ 5650 2000
+	6000 4300 6050 4300
+$Comp
+L Device:R_Small R4
+U 1 1 5CF5B5C6
+P 3500 3750
+F 0 "R4" H 3530 3770 50  0000 L CNN
+F 1 "0" H 3530 3710 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3500 3750 50  0001 C CNN
+F 3 "" H 3500 3750 50  0001 C CNN
+	1    3500 3750
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3350 3950 3350 3750
 Wire Wire Line
-	6250 4900 7050 4900
+	3350 3750 3400 3750
+Connection ~ 3350 3950
+Wire Wire Line
+	3350 3950 3600 3950
+Text GLabel 4800 4150 2    60   Input ~ 0
+AUX
+$Comp
+L Connector_Generic:Conn_01x04 J1
+U 1 1 5CF60438
+P 8400 4300
+F 0 "J1" H 8400 4600 50  0000 C CNN
+F 1 "UART" H 8400 3900 50  0000 C CNN
+F 2 "Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal" H 8400 4300 50  0001 C CNN
+F 3 "" H 8400 4300 50  0001 C CNN
+	1    8400 4300
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+5V #PWR0110
+U 1 1 5CF60921
+P 9050 4400
+F 0 "#PWR0110" H 9050 4250 50  0001 C CNN
+F 1 "+5V" H 9050 4540 50  0000 C CNN
+F 2 "" H 9050 4400 50  0001 C CNN
+F 3 "" H 9050 4400 50  0001 C CNN
+	1    9050 4400
+	0    1    1    0   
+$EndComp
 Wire Wire Line
-	7150 5250 7400 5250
+	9050 4400 8600 4400
+$Comp
+L power:GND #PWR0111
+U 1 1 5CF623ED
+P 9050 4100
+F 0 "#PWR0111" H 9050 3850 50  0001 C CNN
+F 1 "GND" H 9050 3950 50  0000 C CNN
+F 2 "" H 9050 4100 50  0001 C CNN
+F 3 "" H 9050 4100 50  0001 C CNN
+	1    9050 4100
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
-	7150 4900 7150 5250
+	9050 4100 8600 4100
 $Comp
-L power:GND #PWR010
-U 1 1 5A667BAA
-P 7400 5300
-F 0 "#PWR010" H 7400 5050 50  0001 C CNN
-F 1 "GND" H 7400 5150 50  0000 C CNN
-F 2 "" H 7400 5300 50  0001 C CNN
-F 3 "" H 7400 5300 50  0001 C CNN
-	1    7400 5300
+L power:GND #PWR0112
+U 1 1 5CF6539C
+P 7800 4100
+F 0 "#PWR0112" H 7800 3850 50  0001 C CNN
+F 1 "GND" H 7800 3950 50  0000 C CNN
+F 2 "" H 7800 4100 50  0001 C CNN
+F 3 "" H 7800 4100 50  0001 C CNN
+	1    7800 4100
+	0    -1   -1   0   
+$EndComp
+Text GLabel 8600 4200 2    60   Input ~ 0
+UART_TX
+Text GLabel 8600 4300 2    60   Input ~ 0
+UART_RX
+Text GLabel 4800 4350 2    60   Input ~ 0
+UART_TX
+Text GLabel 4800 5350 2    60   Input ~ 0
+UART_RX
+$Comp
+L power:GND #PWR03
+U 1 1 5CF87582
+P 7750 3150
+F 0 "#PWR03" H 7750 2900 50  0001 C CNN
+F 1 "GND" V 7755 3022 50  0000 R CNN
+F 2 "" H 7750 3150 50  0001 C CNN
+F 3 "" H 7750 3150 50  0001 C CNN
+	1    7750 3150
+	0    1    1    0   
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad H1
+U 1 1 5CFAB6F9
+P 7800 5150
+F 0 "H1" H 7900 5199 50  0000 L CNN
+F 1 "MH1" H 7900 5108 50  0000 L CNN
+F 2 "MountingHole:MountingHole_2.2mm_M2_Pad" H 7800 5150 50  0001 C CNN
+F 3 "~" H 7800 5150 50  0001 C CNN
+	1    7800 5150
 	1    0    0    -1  
 $EndComp
+$Comp
+L Mechanical:MountingHole_Pad H2
+U 1 1 5CFABDD2
+P 8150 5150
+F 0 "H2" H 8250 5199 50  0000 L CNN
+F 1 "MH2" H 8250 5108 50  0000 L CNN
+F 2 "MountingHole:MountingHole_2.2mm_M2_Pad" H 8150 5150 50  0001 C CNN
+F 3 "~" H 8150 5150 50  0001 C CNN
+	1    8150 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad H3
+U 1 1 5CFAC2C0
+P 8500 5150
+F 0 "H3" H 8600 5199 50  0000 L CNN
+F 1 "MH3" H 8600 5108 50  0000 L CNN
+F 2 "MountingHole:MountingHole_2.2mm_M2_Pad" H 8500 5150 50  0001 C CNN
+F 3 "~" H 8500 5150 50  0001 C CNN
+	1    8500 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad H4
+U 1 1 5CFAC2CA
+P 8850 5150
+F 0 "H4" H 8950 5199 50  0000 L CNN
+F 1 "MH4" H 8950 5108 50  0000 L CNN
+F 2 "MountingHole:MountingHole_2.2mm_M2_Pad" H 8850 5150 50  0001 C CNN
+F 3 "~" H 8850 5150 50  0001 C CNN
+	1    8850 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR05
+U 1 1 5CFB0132
+P 7800 5350
+F 0 "#PWR05" H 7800 5100 50  0001 C CNN
+F 1 "GND" H 7800 5200 50  0000 C CNN
+F 2 "" H 7800 5350 50  0001 C CNN
+F 3 "" H 7800 5350 50  0001 C CNN
+	1    7800 5350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7800 5350 7800 5250
 Wire Wire Line
-	7150 4900 7200 4900
+	7800 5250 8150 5250
+Connection ~ 7800 5250
+Connection ~ 8150 5250
 Wire Wire Line
-	7400 5300 7400 5250
+	8150 5250 8500 5250
+Connection ~ 8500 5250
 Wire Wire Line
-	7050 5000 7200 5000
+	8500 5250 8850 5250
+$Comp
+L Mechanical:MountingHole GFX1
+U 1 1 5CFBB66E
+P 8850 5900
+F 0 "GFX1" H 8950 5946 50  0000 L CNN
+F 1 "MNT" H 8950 5855 50  0000 L CNN
+F 2 "reform2-keyboard:mntreform" H 8850 5900 50  0001 C CNN
+F 3 "~" H 8850 5900 50  0001 C CNN
+	1    8850 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole GFX2
+U 1 1 5CFBBDCD
+P 9350 5900
+F 0 "GFX2" H 9450 5946 50  0000 L CNN
+F 1 "MNT" H 9450 5855 50  0000 L CNN
+F 2 "reform2-keyboard:mntreform" H 9350 5900 50  0001 C CNN
+F 3 "~" H 9350 5900 50  0001 C CNN
+	1    9350 5900
+	1    0    0    -1  
+$EndComp
+Text Label 3400 4150 0    60   ~ 0
+UD+
+Text Label 3400 4250 0    60   ~ 0
+UD-
+$Comp
+L Device:LED_Small D83
+U 1 1 5CFE699E
+P 6600 5200
+F 0 "D83" H 6600 4995 50  0000 C CNN
+F 1 "LED_Small" H 6600 5086 50  0000 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 6600 5200 50  0001 C CNN
+F 3 "~" V 6600 5200 50  0001 C CNN
+	1    6600 5200
+	-1   0    0    1   
+$EndComp
+Text GLabel 6100 5200 0    60   Input ~ 0
+LED
+$Comp
+L Device:R_Small R5
+U 1 1 5CFE99A4
+P 6250 5200
+F 0 "R5" V 6054 5200 50  0000 C CNN
+F 1 "330" V 6145 5200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6250 5200 50  0001 C CNN
+F 3 "~" H 6250 5200 50  0001 C CNN
+	1    6250 5200
+	0    1    1    0   
+$EndComp
 Wire Wire Line
-	7050 4900 7050 5000
+	6150 5200 6100 5200
 Wire Wire Line
-	6250 4800 7200 4800
+	6350 5200 6500 5200
+$Comp
+L power:GND #PWR0106
+U 1 1 5CFECA83
+P 6700 5200
+F 0 "#PWR0106" H 6700 4950 50  0001 C CNN
+F 1 "GND" H 6700 5050 50  0000 C CNN
+F 2 "" H 6700 5200 50  0001 C CNN
+F 3 "" H 6700 5200 50  0001 C CNN
+	1    6700 5200
+	0    -1   -1   0   
+$EndComp
+Text GLabel 8100 2450 0    60   Input ~ 0
+PWRIN
+Text GLabel 8500 2550 2    60   Input ~ 0
+PWROUT
 $Comp
-L Connector_Generic:Conn_01x05 J3
-U 1 1 5A6671A0
-P 7400 4800
-F 0 "J3" H 7400 5100 50  0000 C CNN
-F 1 "AUX" H 7400 4500 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.00mm" H 7400 4800 50  0001 C CNN
-F 3 "" H 7400 4800 50  0001 C CNN
-	1    7400 4800
+L Switch:SW_DPDT_x2 SW90
+U 2 1 5D0073D5
+P 8300 2450
+F 0 "SW90" H 8300 2735 50  0000 C CNN
+F 1 "POWER" H 8300 2644 50  0000 C CNN
+F 2 "Button_Switch_THT:SW_E-Switch_EG1271_DPDT" H 8300 2450 50  0001 C CNN
+F 3 "~" H 8300 2450 50  0001 C CNN
+	2    8300 2450
 	1    0    0    -1  
 $EndComp
 $Comp
-L Connector_Generic:Conn_01x04 J2
-U 1 1 5A213B3D
-P 8700 3700
-F 0 "J2" H 8700 4000 50  0000 C CNN
-F 1 "USB" H 8700 3300 50  0000 C CNN
-F 2 "Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal" H 8700 3700 50  0001 C CNN
-F 3 "" H 8700 3700 50  0001 C CNN
-	1    8700 3700
+L Switch:SW_DPDT_x2 SW90
+U 1 1 5D000D72
+P 8300 1850
+F 0 "SW90" H 8300 2135 50  0000 C CNN
+F 1 "POWER" H 8300 2044 50  0000 C CNN
+F 2 "Button_Switch_THT:SW_E-Switch_EG1271_DPDT" H 8300 1850 50  0001 C CNN
+F 3 "~" H 8300 1850 50  0001 C CNN
+	1    8300 1850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7750 3150 8250 3150
+$Comp
+L Connector:Conn_01x03_Male J3
+U 1 1 5CF86675
+P 8450 3150
+F 0 "J3" H 8422 3082 50  0000 R CNN
+F 1 "POWERCONN" H 8422 3173 50  0000 R CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal" H 8450 3150 50  0001 C CNN
+F 3 "~" H 8450 3150 50  0001 C CNN
+	1    8450 3150
 	-1   0    0    1   
 $EndComp
+Text GLabel 8250 3250 0    60   Input ~ 0
+PWROUT
+Text GLabel 8250 3050 0    60   Input ~ 0
+PWRIN
+Text GLabel 8500 1950 2    60   Input ~ 0
+PWROUT
+Text GLabel 8100 1850 0    60   Input ~ 0
+PWRIN
 $EndSCHEMATC
diff --git a/reform2-keyboard-pcb/reform2-keyboard-cache.lib b/reform2-keyboard-pcb/reform2-keyboard-cache.lib
@@ -1,22 +1,26 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Connector_Generic_Conn_01x02
+# Connector_Conn_01x03_Male
 #
-DEF Connector_Generic_Conn_01x02 J 0 40 Y N 1 F N
-F0 "J" 0 100 50 H V C CNN
-F1 "Connector_Generic_Conn_01x02" 0 -200 50 H V C CNN
+DEF Connector_Conn_01x03_Male J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Connector_Conn_01x03_Male" 0 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  Connector*:*_1x??_*
 $ENDFPLIST
 DRAW
-S -50 -95 0 -105 1 1 6 N
-S -50 5 0 -5 1 1 6 N
-S -50 50 50 -150 1 1 10 f
-X Pin_1 1 -200 0 150 R 50 50 1 1 P
-X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+X Pin_1 1 200 100 150 L 50 50 1 1 P
+X Pin_2 2 200 0 150 L 50 50 1 1 P
+X Pin_3 3 200 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -43,31 +47,6 @@ X Pin_4 4 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic_Conn_01x05
-#
-DEF Connector_Generic_Conn_01x05 J 0 40 Y N 1 F N
-F0 "J" 0 300 50 H V C CNN
-F1 "Connector_Generic_Conn_01x05" 0 -300 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*_1x??_*
-$ENDFPLIST
-DRAW
-S -50 -195 0 -205 1 1 6 N
-S -50 -95 0 -105 1 1 6 N
-S -50 5 0 -5 1 1 6 N
-S -50 105 0 95 1 1 6 N
-S -50 205 0 195 1 1 6 N
-S -50 250 50 -250 1 1 10 f
-X Pin_1 1 -200 200 150 R 50 50 1 1 P
-X Pin_2 2 -200 100 150 R 50 50 1 1 P
-X Pin_3 3 -200 0 150 R 50 50 1 1 P
-X Pin_4 4 -200 -100 150 R 50 50 1 1 P
-X Pin_5 5 -200 -200 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Device_C_Small
 #
 DEF Device_C_Small C 0 10 N N 1 F N
@@ -135,6 +114,29 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_LED_Small
+#
+DEF Device_LED_Small D 0 10 N N 1 F N
+F0 "D" -50 125 50 H V L CNN
+F1 "Device_LED_Small" -175 -100 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 2 0 1 0 40 0 -30 0 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 N
+P 5 0 1 0 0 30 -20 50 -10 50 -20 50 -20 40 N
+P 5 0 1 0 20 50 0 70 10 70 0 70 0 60 N
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_R_Small
 #
 DEF Device_R_Small R 0 10 N N 1 F N
@@ -212,6 +214,121 @@ X PB1 9 600 1400 100 L 50 50 1 1 T
 ENDDRAW
 ENDDEF
 #
+# Mechanical_MountingHole
+#
+DEF Mechanical_MountingHole H 0 40 Y Y 1 F N
+F0 "H" 0 200 50 H V C CNN
+F1 "Mechanical_MountingHole" 0 125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MountingHole*
+$ENDFPLIST
+DRAW
+C 0 0 50 0 1 50 N
+ENDDRAW
+ENDDEF
+#
+# Mechanical_MountingHole_Pad
+#
+DEF Mechanical_MountingHole_Pad H 0 40 N N 1 F N
+F0 "H" 0 250 50 H V C CNN
+F1 "Mechanical_MountingHole_Pad" 0 175 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MountingHole*Pad*
+$ENDFPLIST
+DRAW
+C 0 50 50 0 1 50 N
+X 1 1 0 -100 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Sensor_Magnetic_SM351LT
+#
+DEF Sensor_Magnetic_SM351LT U 0 20 Y Y 1 F N
+F0 "U" 200 350 50 H V C CNN
+F1 "Sensor_Magnetic_SM351LT" 100 250 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-23" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
+ALIAS SM353LT
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S 300 200 -300 -200 0 1 10 f
+X VCC 1 -200 300 100 D 50 50 1 1 W
+X OUTPUT 2 400 0 100 L 50 50 1 1 O
+X GND 3 -200 -300 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# Switch_SW_DIP_x02
+#
+DEF Switch_SW_DIP_x02 SW 0 0 Y N 1 F N
+F0 "SW" 0 250 50 H V C CNN
+F1 "Switch_SW_DIP_x02" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SW?DIP?x2*
+$ENDFPLIST
+DRAW
+C -80 0 20 0 0 0 N
+C -80 100 20 0 0 0 N
+C 80 0 20 0 0 0 N
+C 80 100 20 0 0 0 N
+S -150 200 150 -100 0 1 10 f
+P 2 0 0 0 -60 5 93 46 N
+P 2 0 0 0 -60 105 93 146 N
+X ~ 1 -300 100 200 R 50 50 1 1 P
+X ~ 2 -300 0 200 R 50 50 1 1 P
+X ~ 3 300 0 200 L 50 50 1 1 P
+X ~ 4 300 100 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Switch_SW_DPDT_x2
+#
+DEF Switch_SW_DPDT_x2 SW 0 0 Y N 2 F N
+F0 "SW" 0 170 50 H V C CNN
+F1 "Switch_SW_DPDT_x2" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SW*DPDT*
+$ENDFPLIST
+DRAW
+C -80 0 20 0 0 0 N
+C 80 -100 20 0 0 0 N
+C 80 100 20 0 1 0 N
+P 2 0 1 0 -60 10 65 90 N
+X A 1 200 100 100 L 50 50 1 1 P
+X B 2 -200 0 100 R 50 50 1 1 P
+X C 3 200 -100 100 L 50 50 1 1 P
+X A 4 200 100 100 L 50 50 2 1 P
+X B 5 -200 0 100 R 50 50 2 1 P
+X C 6 200 -100 100 L 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# Switch_SW_SPST
+#
+DEF Switch_SW_SPST SW 0 0 Y N 1 F N
+F0 "SW" 0 125 50 H V C CNN
+F1 "Switch_SW_SPST" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C -80 0 20 0 0 0 N
+C 80 0 20 0 0 0 N
+P 2 0 0 0 -60 10 60 70 N
+X A 1 -200 0 100 R 50 50 1 1 P
+X B 2 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # mntcomp-keyboard_Choc
 #
 DEF mntcomp-keyboard_Choc SW 0 40 N N 1 F N
diff --git a/reform2-keyboard-pcb/reform2-keyboard.kicad_pcb b/reform2-keyboard-pcb/reform2-keyboard.kicad_pcb
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 1089)
-    (tracks 313)
+    (tracks 538)
     (zones 0)
-    (modules 185)
-    (nets 115)
+    (modules 190)
+    (nets 125)
   )
 
   (page A4)
@@ -170,40 +170,50 @@
   (net 78 "Net-(C1-Pad1)")
   (net 79 GND)
   (net 80 "Net-(C3-Pad1)")
-  (net 81 UVCC)
-  (net 82 ROW1)
-  (net 83 ROW2)
-  (net 84 ROW3)
-  (net 85 ROW4)
-  (net 86 ROW5)
-  (net 87 ROW6)
-  (net 88 RESET)
-  (net 89 D-)
-  (net 90 D+)
-  (net 91 "Net-(R1-Pad1)")
-  (net 92 "Net-(R2-Pad1)")
-  (net 93 COL1)
-  (net 94 COL2)
-  (net 95 COL3)
-  (net 96 COL4)
-  (net 97 COL5)
-  (net 98 COL6)
-  (net 99 COL7)
-  (net 100 COL8)
-  (net 101 COL9)
-  (net 102 COL10)
-  (net 103 COL11)
-  (net 104 COL12)
-  (net 105 COL13)
-  (net 106 COL14)
-  (net 107 "Net-(J3-Pad3)")
-  (net 108 "Net-(C2-Pad1)")
-  (net 109 "Net-(D78-Pad2)")
-  (net 110 "Net-(D79-Pad2)")
-  (net 111 "Net-(D80-Pad2)")
-  (net 112 "Net-(D81-Pad2)")
-  (net 113 "Net-(J3-Pad5)")
-  (net 114 "Net-(D82-Pad2)")
+  (net 81 ROW1)
+  (net 82 ROW2)
+  (net 83 ROW3)
+  (net 84 ROW4)
+  (net 85 ROW5)
+  (net 86 ROW6)
+  (net 87 RESET)
+  (net 88 D-)
+  (net 89 D+)
+  (net 90 COL1)
+  (net 91 COL2)
+  (net 92 COL3)
+  (net 93 COL4)
+  (net 94 COL5)
+  (net 95 COL6)
+  (net 96 COL7)
+  (net 97 COL8)
+  (net 98 COL9)
+  (net 99 COL10)
+  (net 100 COL11)
+  (net 101 COL12)
+  (net 102 COL13)
+  (net 103 COL14)
+  (net 104 "Net-(C2-Pad1)")
+  (net 105 "Net-(D78-Pad2)")
+  (net 106 "Net-(D79-Pad2)")
+  (net 107 "Net-(D80-Pad2)")
+  (net 108 "Net-(D81-Pad2)")
+  (net 109 "Net-(D82-Pad2)")
+  (net 110 +5V)
+  (net 111 "Net-(D83-Pad2)")
+  (net 112 UART_TX)
+  (net 113 UART_RX)
+  (net 114 PWRIN)
+  (net 115 PWROUT)
+  (net 116 "Net-(R4-Pad1)")
+  (net 117 AUX)
+  (net 118 PROG)
+  (net 119 LID_SENSE)
+  (net 120 "/Reform KBD MCU/UD+")
+  (net 121 "/Reform KBD MCU/UD-")
+  (net 122 LED)
+  (net 123 "Net-(SW90-Pad4)")
+  (net 124 "Net-(SW90-Pad1)")
 
   (net_class Default "This is the default net class."
     (clearance 0.25)
@@ -212,6 +222,10 @@
     (via_drill 0.4)
     (uvia_dia 0.3)
     (uvia_drill 0.1)
+    (add_net +5V)
+    (add_net "/Reform KBD MCU/UD+")
+    (add_net "/Reform KBD MCU/UD-")
+    (add_net AUX)
     (add_net COL1)
     (add_net COL10)
     (add_net COL11)
@@ -229,6 +243,8 @@
     (add_net D+)
     (add_net D-)
     (add_net GND)
+    (add_net LED)
+    (add_net LID_SENSE)
     (add_net "Net-(C1-Pad1)")
     (add_net "Net-(C2-Pad1)")
     (add_net "Net-(C3-Pad1)")
@@ -313,11 +329,14 @@
     (add_net "Net-(D80-Pad2)")
     (add_net "Net-(D81-Pad2)")
     (add_net "Net-(D82-Pad2)")
+    (add_net "Net-(D83-Pad2)")
     (add_net "Net-(D9-Pad2)")
-    (add_net "Net-(J3-Pad3)")
-    (add_net "Net-(J3-Pad5)")
-    (add_net "Net-(R1-Pad1)")
-    (add_net "Net-(R2-Pad1)")
+    (add_net "Net-(R4-Pad1)")
+    (add_net "Net-(SW90-Pad1)")
+    (add_net "Net-(SW90-Pad4)")
+    (add_net PROG)
+    (add_net PWRIN)
+    (add_net PWROUT)
     (add_net RESET)
     (add_net ROW1)
     (add_net ROW2)
@@ -325,141 +344,312 @@
     (add_net ROW4)
     (add_net ROW5)
     (add_net ROW6)
-    (add_net UVCC)
+    (add_net UART_RX)
+    (add_net UART_TX)
   )
 
-  (module LED_SMD:LED_RGB_1210 (layer F.Cu) (tedit 5979AE99) (tstamp 5CC5D2C2)
-    (at 17.6 33.5)
-    (descr "RGB LED 3.2x2.7mm http://www.avagotech.com/docs/AV02-0610EN")
-    (tags "LED 3227")
+  (module Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBD) (tstamp 5CF2BABF)
+    (at 100.9 64.7 180)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5A2069AE/5CFE99A4)
     (attr smd)
-    (fp_text reference REF** (at 0 -2.3) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference R5 (at 0 1.43) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value LED_RGB_1210 (at 0 2.45) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text value 330 (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 -2.3) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
     )
-    (fp_line (start -1.6 -0.675) (end -0.925 -1.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.35) (end -1.6 -0.675) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 1.35) (end -1.6 1.35) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.6 -1.35) (end 1.6 1.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.925 -1.35) (end 1.6 -1.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.8 -0.5) (end -2.8 -1.5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.7 -1.5) (end -2.8 -1.5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.7 1.5) (end -2.7 1.5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.85 1.65) (end 2.85 -1.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.85 -1.65) (end -2.95 -1.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.95 -1.65) (end -2.95 1.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.95 1.65) (end 2.85 1.65) (layer F.CrtYd) (width 0.05))
-    (pad 3 smd rect (at 1.75 0.7 180) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
-    (pad 4 smd rect (at 1.75 -0.7 180) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
-    (pad 2 smd rect (at -1.75 0.7 180) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
-    (pad 1 smd rect (at -1.75 -0.7 180) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
-    (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_RGB_1210.wrl
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0 180) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 122 LED))
+    (pad 1 smd roundrect (at -0.875 0 180) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 111 "Net-(D83-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module reform2-keyboard:E-Switch-EG5137 (layer F.Cu) (tedit 5CC3212D) (tstamp 5CC5C1E9)
-    (at 54.8 22.5)
-    (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+  (module LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B4B45C9) (tstamp 5CF2B82C)
+    (at 100.9 68.7)
+    (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "LED handsolder")
+    (path /5A2069AE/5CFE699E)
+    (attr smd)
+    (fp_text reference D83 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value E-Switch-EG5137 (at 0 -0.5) (layer F.Fab)
+    (fp_text value LED_Small (at 0 1.43) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 3 thru_hole circle (at 4.639 3.048) (size 3 3) (drill 1.85) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -0.061 3.048) (size 3 3) (drill 1.85) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at -4.761 3.048) (size 3 3) (drill 1.85) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/500SSPxS2M2xEA.wrl
-      (offset (xyz 0 -3 0))
-      (scale (xyz 0.4 0.4 0.4))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.65 0.73) (end -1.65 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.65 -0.73) (end 1.65 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end 1.65 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end -1.65 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.66 0.735) (end 0.8 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.66 -0.735) (end -1.66 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.735) (end -1.66 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.1) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 111 "Net-(D83-Pad2)"))
+    (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 79 GND))
+    (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC591A7)
-    (at 7 126.02)
-    (descr "Mounting Hole 2.2mm, M2, DIN965")
-    (tags "mounting hole 2.2mm m2 din965")
-    (attr virtual)
-    (fp_text reference REF** (at 0 -2.9) (layer F.SilkS)
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5CF08756)
+    (at 203.5 25.5)
+    (descr "SOT-23, Standard")
+    (tags SOT-23)
+    (path /5A2069AE/5CF3B985)
+    (attr smd)
+    (fp_text reference U2 (at 0 -2.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.2mm_M2_DIN965_Pad (at 0 2.9) (layer F.Fab)
+    (fp_text value SM351LT (at 0 2.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 79 GND))
+    (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 119 LID_SENSE))
+    (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 110 +5V))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
     )
-    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC591A0)
-    (at 279 126.02)
-    (descr "Mounting Hole 2.2mm, M2, DIN965")
-    (tags "mounting hole 2.2mm m2 din965")
-    (attr virtual)
-    (fp_text reference REF** (at 0 -2.9) (layer F.SilkS)
+  (module Button_Switch_SMD:SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm (layer F.Cu) (tedit 5AC88315) (tstamp 5CF086AF)
+    (at 166.2 25.2)
+    (descr "SMD 2x-dip-switch SPST Omron_A6S-210x, Slide, row spacing 8.9 mm (350 mils), body size  (see http://omronfs.omron.com/en_US/ecb/products/pdf/en-a6s.pdf)")
+    (tags "SMD DIP Switch SPST Slide 8.9mm 350mil")
+    (path /5A2069AE/5CF54073)
+    (attr smd)
+    (fp_text reference SW92 (at 0 -4.07) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.2mm_M2_DIN965_Pad (at 0 2.9) (layer F.Fab)
+    (fp_text value SW_DIP_x02 (at 0 4.07) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text user on (at 0.075 -2.415) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_text user %R (at 2.3 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start 5.45 -3.35) (end -5.45 -3.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.45 3.35) (end 5.45 -3.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.45 3.35) (end 5.45 3.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.45 -3.35) (end -5.45 3.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.16 1.331) (end 3.16 3.071) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.16 1.331) (end -3.16 3.071) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.16 -3.07) (end 3.16 -1.331) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.16 -3.07) (end 3.16 -3.07) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.16 -3.07) (end -3.16 -2.121) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.2 -2.121) (end -3.16 -2.121) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.16 3.071) (end 3.16 3.071) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.5 0.72) (end -0.5 1.82) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.72) (end -0.5 1.72) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.62) (end -0.5 1.62) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.52) (end -0.5 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.42) (end -0.5 1.42) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.32) (end -0.5 1.32) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.22) (end -0.5 1.22) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.12) (end -0.5 1.12) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.02) (end -0.5 1.02) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 0.92) (end -0.5 0.92) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 0.82) (end -0.5 0.82) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 0.72) (end -1.5 0.72) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 1.82) (end 1.5 0.72) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 1.82) (end 1.5 1.82) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 0.72) (end -1.5 1.82) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -1.82) (end -0.5 -0.72) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.72) (end -0.5 -0.72) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.82) (end -0.5 -0.82) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.92) (end -0.5 -0.92) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.02) (end -0.5 -1.02) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.12) (end -0.5 -1.12) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.22) (end -0.5 -1.22) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.32) (end -0.5 -1.32) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.42) (end -0.5 -1.42) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.52) (end -0.5 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.62) (end -0.5 -1.62) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.72) (end -0.5 -1.72) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -1.82) (end -1.5 -1.82) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.72) (end 1.5 -1.82) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.72) (end 1.5 -0.72) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -1.82) (end -1.5 -0.72) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.1 -2.01) (end -2.1 -3.01) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.1 3.01) (end -3.1 -2.01) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.1 3.01) (end -3.1 3.01) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.1 -3.01) (end 3.1 3.01) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.1 -3.01) (end 3.1 -3.01) (layer F.Fab) (width 0.1))
+    (pad 4 smd rect (at 4.45 -1.27) (size 1.5 1.1) (layers F.Cu F.Paste F.Mask)
+      (net 79 GND))
+    (pad 2 smd rect (at -4.45 1.27) (size 1.5 1.1) (layers F.Cu F.Paste F.Mask)
+      (net 118 PROG))
+    (pad 3 smd rect (at 4.45 1.27) (size 1.5 1.1) (layers F.Cu F.Paste F.Mask)
+      (net 79 GND))
+    (pad 1 smd rect (at -4.45 -1.27) (size 1.5 1.1) (layers F.Cu F.Paste F.Mask)
+      (net 117 AUX))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC5912C)
-    (at 279 38)
-    (descr "Mounting Hole 2.2mm, M2, DIN965")
-    (tags "mounting hole 2.2mm m2 din965")
-    (attr virtual)
-    (fp_text reference REF** (at 0 -2.9) (layer F.SilkS)
+  (module Button_Switch_SMD:SW_Push_1P1T_NO_CK_KMR2 (layer F.Cu) (tedit 5A02FC95) (tstamp 5CF08676)
+    (at 155 25 180)
+    (descr "CK components KMR2 tactile switch http://www.ckswitches.com/media/1479/kmr2.pdf")
+    (tags "tactile switch kmr2")
+    (path /5A2069AE/5CF3DA9E)
+    (attr smd)
+    (fp_text reference SW91 (at 0 -2.45) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.2mm_M2_DIN965_Pad (at 0 2.9) (layer F.Fab)
+    (fp_text value RESET (at 0 2.55) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
+    (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.2 -1.55) (end -2.2 -1.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.2 1.55) (end 2.2 1.55) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 0 0) (end 0 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.8 1.8) (end -2.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 1.8) (end -2.8 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 -1.8) (end 2.8 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.8 -1.8) (end 2.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.1 1.4) (end -2.1 -1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.1 1.4) (end -2.1 1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.1 -1.4) (end 2.1 1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.1 -1.4) (end 2.1 -1.4) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 -2.45) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask))
+    (pad 2 smd rect (at 2.05 0.8 270) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 79 GND))
+    (pad 1 smd rect (at 2.05 -0.8 270) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 87 RESET))
+    (pad 2 smd rect (at -2.05 0.8 270) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 79 GND))
+    (pad 1 smd rect (at -2.05 -0.8 270) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 87 RESET))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T_NO_CK_KMR2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
   )
 
-  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC59123)
-    (at 7 38)
-    (descr "Mounting Hole 2.2mm, M2, DIN965")
-    (tags "mounting hole 2.2mm m2 din965")
-    (attr virtual)
-    (fp_text reference REF** (at 0 -2.9) (layer F.SilkS)
+  (module Button_Switch_THT:SW_E-Switch_EG1271_DPDT (layer F.Cu) (tedit 5BB336EF) (tstamp 5CF08660)
+    (at 70.8 23.8)
+    (descr "E-Switch sub miniature slide switch, EG series, DPDT, http://spec_sheets.e-switch.com/specs/P040047.pdf")
+    (tags "switch DPDT")
+    (path /5A2069AE/5D0073D5)
+    (fp_text reference SW90 (at 2.5 -1.65) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.2mm_M2_DIN965_Pad (at 0 2.9) (layer F.Fab)
+    (fp_text value POWER (at 2.5 5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
+    (fp_text user %R (at 2.5 -1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask))
+    (fp_line (start -2 4.25) (end -2 -1.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7 4.25) (end -2 4.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7 -1.05) (end 7 4.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -1.05) (end 7 -1.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.15 -0.55) (end -1.15 -0.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.15 0.45) (end -2.15 -0.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 3.45) (end -1.85 -0.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.97 3.45) (end -1.85 3.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.53 3.45) (end 0.97 3.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.02 3.45) (end 3.47 3.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.85 3.45) (end 5.98 3.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.85 -0.25) (end 6.85 3.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.97 -0.25) (end 6.85 -0.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.47 -0.25) (end 4.03 -0.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 -0.25) (end 1.53 -0.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 -0.25) (end -1 -0.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 -0.15) (end -1.75 3.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.75 3.35) (end -1.75 3.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.75 -0.15) (end 6.75 3.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 -0.15) (end 6.75 -0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.15 0.6) (end 2.15 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.8 0.6) (end 1.8 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.45 0.6) (end 1.45 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.1 0.6) (end 1.1 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.75 0.6) (end 0.75 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 0.6) (end 2.5 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.4 0.6) (end 0.4 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.6 2.6) (end 0.4 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.6 0.6) (end 4.6 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.4 0.6) (end 4.6 0.6) (layer F.Fab) (width 0.1))
+    (pad 6 thru_hole circle (at 5 3.2) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 115 PWROUT))
+    (pad 5 thru_hole circle (at 2.5 3.2) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 114 PWRIN))
+    (pad 4 thru_hole circle (at 0 3.2) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 123 "Net-(SW90-Pad4)"))
+    (pad 3 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 115 PWROUT))
+    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 114 PWRIN))
+    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 124 "Net-(SW90-Pad1)"))
+    (model ${KISYS3DMOD}/Button_Switch_THT.3dshapes/SW_E-Switch_EG1271_DPDT.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC4096F)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC4096F)
     (at 152 126.24)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -470,42 +660,42 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 95 COL6))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 76 "Net-(D76-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 98 COL6))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC11811)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC11811)
     (at 124.1 126.24)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -516,42 +706,42 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 94 COL5))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 75 "Net-(D75-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 97 COL5))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC117D7)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC117D7)
     (at 96.3 126.24)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -562,42 +752,42 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 93 COL4))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 74 "Net-(D74-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 96 COL4))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC1179D)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC1179D)
     (at 68.5 126.24)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -608,42 +798,42 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 92 COL3))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 73 "Net-(D73-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 95 COL3))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC11763)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC11763)
     (at 40.7 126.24)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -654,42 +844,42 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 91 COL2))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 72 "Net-(D72-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 94 COL2))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC113FD)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC113FD)
     (at 22 108.64)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -700,134 +890,134 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 90 COL1))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 57 "Net-(D57-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 93 COL1))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC10DA5)
-    (at 22 73.44)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC113C3)
+    (at 263.8 91.04)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
-    (path /594DACC2)
-    (fp_text reference SW29 (at 0 8.3) (layer B.SilkS)
+    (path /594DCAF8)
+    (fp_text reference SW56 (at 0 8.3) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 29 "Net-(D29-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 93 COL1))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
     (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 103 COL14))
+    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 56 "Net-(D56-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC113C3)
-    (at 263.8 91.04)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC10DA5)
+    (at 22 73.44)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
-    (path /594DCAF8)
-    (fp_text reference SW56 (at 0 8.3) (layer B.SilkS)
+    (path /594DACC2)
+    (fp_text reference SW29 (at 0 8.3) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 56 "Net-(D56-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 106 COL14))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
     (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 90 COL1))
+    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 29 "Net-(D29-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC10D6B)
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC10D6B)
     (at 263.8 55.84)
     (descr "Kailh \"Choc\" PG1350 keyswitch")
     (tags kailh,choc)
@@ -838,93 +1028,681 @@
     (fp_text value ML (at 0 -8.7) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
     (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 103 COL14))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 28 "Net-(D28-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 106 COL14))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
+      (scale (xyz 0.4 0.4 0.4))
+      (rotate (xyz -90 0 0))
+    )
+  )
+
+  (module keyswitches:PG1350 (layer F.Cu) (tedit 5CC31ACC) (tstamp 5CC10A3F)
+    (at 263.8 38.24)
+    (descr "Kailh \"Choc\" PG1350 keyswitch")
+    (tags kailh,choc)
+    (path /594D9711)
+    (fp_text reference SW14 (at 0 8.3) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value ML (at 0 -8.7) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
+    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
     (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
+    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 103 COL14))
+    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 14 "Net-(D14-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
+    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
+      (offset (xyz 0 0 7.1))
       (scale (xyz 0.4 0.4 0.4))
       (rotate (xyz -90 0 0))
     )
   )
 
-  (module keyswitches:PG1350-1.5 (layer F.Cu) (tedit 5CC21A83) (tstamp 5CC10A3F)
-    (at 263.8 38.24)
-    (descr "Kailh \"Choc\" PG1350 keyswitch")
-    (tags kailh,choc)
-    (path /594D9711)
-    (fp_text reference SW14 (at 0 8.3) (layer B.SilkS)
+  (module Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBD) (tstamp 5CF074C5)
+    (at 144.6 37.3 270)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5A2069AE/5CF5B5C6)
+    (attr smd)
+    (fp_text reference R4 (at -1.7 -1.5 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 0 (at 0 -1.43 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0 270) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 110 +5V))
+    (pad 1 smd roundrect (at -0.875 0 270) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 116 "Net-(R4-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBD) (tstamp 5A207687)
+    (at 129.7 29.3)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5A2069AE/5A21443A)
+    (attr smd)
+    (fp_text reference R3 (at 0 1.43) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 10k (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 87 RESET))
+    (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 110 +5V))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBD) (tstamp 5CC4E733)
+    (at 117.7 26.1 180)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5A2069AE/5A213EDF)
+    (attr smd)
+    (fp_text reference R2 (at 0 1.43) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 0 (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0 180) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 88 D-))
+    (pad 1 smd roundrect (at -0.875 0 180) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 121 "/Reform KBD MCU/UD-"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBD) (tstamp 5CF0995C)
+    (at 117.7 28 180)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5A2069AE/5A213F64)
+    (attr smd)
+    (fp_text reference R1 (at 0 -1.6) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 0 (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0 180) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 89 D+))
+    (pad 1 smd roundrect (at -0.875 0 180) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 120 "/Reform KBD MCU/UD+"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal (layer B.Cu) (tedit 59FED5CB) (tstamp 5CED749C)
+    (at 64 23.1 180)
+    (descr "Through hole angled pin header, 1x03, 2.54mm pitch, 6mm pin length, single row")
+    (tags "Through hole angled pin header THT 1x03 2.54mm single row")
+    (path /5A2069AE/5CF86675)
+    (fp_text reference J3 (at 4.385 2.27) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value POWERCONN (at 4.385 -7.35) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 2.77 -2.54 -90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start 10.55 1.8) (end -1.8 1.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 10.55 -6.85) (end 10.55 1.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -6.85) (end 10.55 -6.85) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.8 1.8) (end -1.8 -6.85) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.27 1.27) (end 0 1.27) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.27 0) (end -1.27 1.27) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.042929 -5.46) (end 1.44 -5.46) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.042929 -4.7) (end 1.44 -4.7) (layer B.SilkS) (width 0.12))
+    (fp_line (start 10.1 -5.46) (end 4.1 -5.46) (layer B.SilkS) (width 0.12))
+    (fp_line (start 10.1 -4.7) (end 10.1 -5.46) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 -4.7) (end 10.1 -4.7) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -3.81) (end 4.1 -3.81) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.042929 -2.92) (end 1.44 -2.92) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.042929 -2.16) (end 1.44 -2.16) (layer B.SilkS) (width 0.12))
+    (fp_line (start 10.1 -2.92) (end 4.1 -2.92) (layer B.SilkS) (width 0.12))
+    (fp_line (start 10.1 -2.16) (end 10.1 -2.92) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 -2.16) (end 10.1 -2.16) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -1.27) (end 4.1 -1.27) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.11 -0.38) (end 1.44 -0.38) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.11 0.38) (end 1.44 0.38) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 -0.28) (end 10.1 -0.28) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 -0.16) (end 10.1 -0.16) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 -0.04) (end 10.1 -0.04) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 0.08) (end 10.1 0.08) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 0.2) (end 10.1 0.2) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 0.32) (end 10.1 0.32) (layer B.SilkS) (width 0.12))
+    (fp_line (start 10.1 -0.38) (end 4.1 -0.38) (layer B.SilkS) (width 0.12))
+    (fp_line (start 10.1 0.38) (end 10.1 -0.38) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 0.38) (end 10.1 0.38) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 1.33) (end 1.44 1.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.1 -6.41) (end 4.1 1.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -6.41) (end 4.1 -6.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 1.33) (end 1.44 -6.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 4.04 -5.4) (end 10.04 -5.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 10.04 -4.76) (end 10.04 -5.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 -4.76) (end 10.04 -4.76) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -5.4) (end 1.5 -5.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -4.76) (end -0.32 -5.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -4.76) (end 1.5 -4.76) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 -2.86) (end 10.04 -2.86) (layer B.Fab) (width 0.1))
+    (fp_line (start 10.04 -2.22) (end 10.04 -2.86) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 -2.22) (end 10.04 -2.22) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -2.86) (end 1.5 -2.86) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -2.22) (end -0.32 -2.86) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -2.22) (end 1.5 -2.22) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 -0.32) (end 10.04 -0.32) (layer B.Fab) (width 0.1))
+    (fp_line (start 10.04 0.32) (end 10.04 -0.32) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 0.32) (end 10.04 0.32) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 -0.32) (end 1.5 -0.32) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 0.32) (end -0.32 -0.32) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.32 0.32) (end 1.5 0.32) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.5 0.635) (end 2.135 1.27) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.5 -6.35) (end 1.5 0.635) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 -6.35) (end 1.5 -6.35) (layer B.Fab) (width 0.1))
+    (fp_line (start 4.04 1.27) (end 4.04 -6.35) (layer B.Fab) (width 0.1))
+    (fp_line (start 2.135 1.27) (end 4.04 1.27) (layer B.Fab) (width 0.1))
+    (pad 3 thru_hole oval (at 0 -5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 114 PWRIN))
+    (pad 2 thru_hole oval (at 0 -2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 79 GND))
+    (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 115 PWROUT))
+    (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x03_P2.54mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal (layer B.Cu) (tedit 59FED667) (tstamp 5A20766B)
+    (at 175.8 28.2)
+    (descr "Through hole angled pin header, 1x04, 2.00mm pitch, 4.2mm pin length, single row")
+    (tags "Through hole angled pin header THT 1x04 2.00mm single row")
+    (path /5A2069AE/5CF60438)
+    (fp_text reference J1 (at -2.1 -6.7) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value UART (at 3.1 -8) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 2.25 -3 270) (layer B.Fab)
+      (effects (font (size 0.9 0.9) (thickness 0.135)) (justify mirror))
+    )
+    (fp_line (start 7.7 1.5) (end -1.5 1.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 7.7 -7.5) (end 7.7 1.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.5 -7.5) (end 7.7 -7.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.5 1.5) (end -1.5 -7.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1 1) (end 0 1) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1 0) (end -1 1) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.882114 -6.31) (end 1.44 -6.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.882114 -5.69) (end 1.44 -5.69) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -6.31) (end 3.06 -6.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -5.69) (end 7.26 -6.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 -5.69) (end 7.26 -5.69) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -5) (end 3.06 -5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.882114 -4.31) (end 1.44 -4.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.882114 -3.69) (end 1.44 -3.69) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -4.31) (end 3.06 -4.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -3.69) (end 7.26 -4.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 -3.69) (end 7.26 -3.69) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -3) (end 3.06 -3) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.882114 -2.31) (end 1.44 -2.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.882114 -1.69) (end 1.44 -1.69) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -2.31) (end 3.06 -2.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -1.69) (end 7.26 -2.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.69) (end 7.26 -1.69) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -1) (end 3.06 -1) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.935 -0.31) (end 1.44 -0.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.935 0.31) (end 1.44 0.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 -0.23) (end 7.26 -0.23) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 -0.11) (end 7.26 -0.11) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 0.01) (end 7.26 0.01) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 0.13) (end 7.26 0.13) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 0.25) (end 7.26 0.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 -0.31) (end 3.06 -0.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 7.26 0.31) (end 7.26 -0.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 0.31) (end 7.26 0.31) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.06) (end 1.44 1.06) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3.06 -7.06) (end 3.06 1.06) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 -7.06) (end 3.06 -7.06) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.44 1.06) (end 1.44 -7.06) (layer B.SilkS) (width 0.12))
+    (fp_line (start 3 -6.25) (end 7.2 -6.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 7.2 -5.75) (end 7.2 -6.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -5.75) (end 7.2 -5.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -6.25) (end 1.5 -6.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -5.75) (end -0.25 -6.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -5.75) (end 1.5 -5.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -4.25) (end 7.2 -4.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 7.2 -3.75) (end 7.2 -4.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -3.75) (end 7.2 -3.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -4.25) (end 1.5 -4.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -3.75) (end -0.25 -4.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -3.75) (end 1.5 -3.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -2.25) (end 7.2 -2.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 7.2 -1.75) (end 7.2 -2.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -1.75) (end 7.2 -1.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -2.25) (end 1.5 -2.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -1.75) (end -0.25 -2.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -1.75) (end 1.5 -1.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -0.25) (end 7.2 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 7.2 0.25) (end 7.2 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 0.25) (end 7.2 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 -0.25) (end 1.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 0.25) (end -0.25 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 0.25) (end 1.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.5 0.625) (end 1.875 1) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.5 -7) (end 1.5 0.625) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 -7) (end 1.5 -7) (layer B.Fab) (width 0.1))
+    (fp_line (start 3 1) (end 3 -7) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.875 1) (end 3 1) (layer B.Fab) (width 0.1))
+    (pad 4 thru_hole oval (at 0 -6) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 79 GND))
+    (pad 3 thru_hole oval (at 0 -4) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 112 UART_TX))
+    (pad 2 thru_hole oval (at 0 -2) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 113 UART_RX))
+    (pad 1 thru_hole rect (at 0 0) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 110 +5V))
+    (model ${KISYS3DMOD}/Connector_PinHeader_2.00mm.3dshapes/PinHeader_1x04_P2.00mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC591A0)
+    (at 278.5 126.02)
+    (descr "Mounting Hole 2.2mm, M2")
+    (tags "mounting hole 2.2mm m2")
+    (path /5A2069AE/5CFAC2CA)
+    (attr virtual)
+    (fp_text reference H4 (at 0 -3.2) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MH4 (at 0 3.2) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.45 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.2 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 4.4 4.4) (drill 2.2) (layers *.Cu *.Mask)
+      (net 79 GND))
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC591A7)
+    (at 7 126.02)
+    (descr "Mounting Hole 2.2mm, M2")
+    (tags "mounting hole 2.2mm m2")
+    (path /5A2069AE/5CFAC2C0)
+    (attr virtual)
+    (fp_text reference H3 (at 0 -3.2) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MH3 (at 0 3.2) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.45 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.2 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 4.4 4.4) (drill 2.2) (layers *.Cu *.Mask)
+      (net 79 GND))
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC5912C)
+    (at 278.5 38)
+    (descr "Mounting Hole 2.2mm, M2")
+    (tags "mounting hole 2.2mm m2")
+    (path /5A2069AE/5CFABDD2)
+    (attr virtual)
+    (fp_text reference H2 (at 0 -3.2) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MH2 (at 0 3.2) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.45 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.2 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 4.4 4.4) (drill 2.2) (layers *.Cu *.Mask)
+      (net 79 GND))
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5CC59123)
+    (at 7 38)
+    (descr "Mounting Hole 2.2mm, M2")
+    (tags "mounting hole 2.2mm m2")
+    (path /5A2069AE/5CFAB6F9)
+    (attr virtual)
+    (fp_text reference H1 (at 0 -3.2) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MH1 (at 0 3.2) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.45 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.2 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 4.4 4.4) (drill 2.2) (layers *.Cu *.Mask)
+      (net 79 GND))
+  )
+
+  (module Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBE) (tstamp 5A207665)
+    (at 147.2 22.9)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5A2069AE/5A214A09)
+    (attr smd)
+    (fp_text reference C5 (at 0 1.43) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 0.1uF (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 79 GND))
+    (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 110 +5V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBE) (tstamp 5CED74DC)
+    (at 145.7 21.1)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5A2069AE/5A2148C0)
+    (attr smd)
+    (fp_text reference C4 (at 2.8 0.1) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 1uF (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 79 GND))
+    (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 110 +5V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBE) (tstamp 5A207659)
+    (at 135.1 36.1)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5A2069AE/5A20764E)
+    (attr smd)
+    (fp_text reference C3 (at 1.8 1.6) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 1uF (at 0 -1.43) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 79 GND))
+    (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 80 "Net-(C3-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBE) (tstamp 5A207653)
+    (at 130.7 25 90)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5A2069AE/5A2073F7)
+    (attr smd)
+    (fp_text reference C2 (at 0 1.43 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 18pF (at 0 -1.43 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 79 GND))
+    (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 104 "Net-(C2-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer B.Cu) (tedit 5B301BBE) (tstamp 5A20764D)
+    (at 122.9 25.7 270)
+    (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5A2069AE/5A2073AA)
+    (attr smd)
+    (fp_text reference C1 (at 0 1.43 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value ML (at 0 -8.7) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text value 18pF (at 0 -1.43 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -2.6 -3.1) (end 2.6 -3.1) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -3.1) (end 2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start 2.6 -6.3) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -2.6 -3.1) (end -2.6 -6.3) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7 -6) (end -7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 -7) (end -6 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6 7) (end -7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start -7 7) (end -7 6) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 6) (end 7 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 7) (end 6 7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 6 -7) (end 7 -7) (layer B.SilkS) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -6) (layer B.SilkS) (width 0.15))
-    (fp_line (start -6.9 6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start 6.9 -6.9) (end 6.9 6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -6.9 6.9) (end -6.9 -6.9) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 -7.5) (end 7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 -7.5) (end 7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start 7.5 7.5) (end -7.5 7.5) (layer Eco2.User) (width 0.15))
-    (fp_line (start -7.5 7.5) (end -7.5 -7.5) (layer Eco2.User) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 14 "Net-(D14-Pad2)"))
-    (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 106 COL14))
-    (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-    (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1.5x1.wrl
-      (offset (xyz -42.35 0 7.1))
-      (scale (xyz 0.4 0.4 0.4))
-      (rotate (xyz -90 0 0))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
+    )
+    (fp_line (start 1.65 -0.73) (end -1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.65 0.73) (end 1.65 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 0.73) (end 1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.65 -0.73) (end -1.65 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.875 0 270) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 79 GND))
+    (pad 1 smd roundrect (at -0.875 0 270) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 78 "Net-(C1-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
     )
   )
 
   (module reform2-keyboard:mntreform (layer F.Cu) (tedit 0) (tstamp 5CEDE3EA)
     (at 229.6 25.6)
-    (fp_text reference G*** (at 0 0) (layer F.SilkS) hide
+    (path /5A2069AE/5CFBB66E)
+    (fp_text reference GFX1 (at 0 0) (layer F.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)))
     )
-    (fp_text value LOGO (at 0.75 0) (layer F.SilkS) hide
+    (fp_text value MNT (at 0.75 0) (layer F.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)))
     )
     (fp_poly (pts (xy 15.028334 4.826) (xy -0.296333 4.826) (xy -0.296333 3.771528) (xy 4.691425 3.771528)
@@ -1080,7 +1858,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 94 COL2))
+      (net 91 COL2))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 2 "Net-(D2-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -1092,11 +1870,12 @@
   )
 
   (module reform2-keyboard:mntreform (layer B.Cu) (tedit 0) (tstamp 5CC7127A)
-    (at 166.6 25.7 180)
-    (fp_text reference G*** (at 0 0 180) (layer B.SilkS) hide
+    (at 229.7 25.6 180)
+    (path /5A2069AE/5CFBBDCD)
+    (fp_text reference GFX2 (at 0 0 180) (layer B.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)) (justify mirror))
     )
-    (fp_text value LOGO (at 0.75 0 180) (layer B.SilkS) hide
+    (fp_text value MNT (at 0.75 0 180) (layer B.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)) (justify mirror))
     )
     (fp_poly (pts (xy 10.117124 -2.042305) (xy 10.213493 -2.068317) (xy 10.2362 -2.0828) (xy 10.283474 -2.182328)
@@ -1252,9 +2031,9 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 114 "Net-(D82-Pad2)"))
+      (net 109 "Net-(D82-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
       (offset (xyz 0 0 7.1))
@@ -1293,7 +2072,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 55 "Net-(D55-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1328,9 +2107,10 @@
     (fp_line (start -0.8 0.1) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
     (fp_line (start -0.5 0.4) (end -0.8 0.1) (layer B.Fab) (width 0.1))
     (fp_line (start 0.8 0.4) (end -0.5 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25))
+    (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 109 "Net-(D82-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1366,9 +2146,9 @@
     (fp_line (start -0.5 0.4) (end -0.8 0.1) (layer B.Fab) (width 0.1))
     (fp_line (start 0.8 0.4) (end -0.5 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 112 "Net-(D81-Pad2)"))
+      (net 108 "Net-(D81-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1404,9 +2184,9 @@
     (fp_line (start -0.5 0.4) (end -0.8 0.1) (layer B.Fab) (width 0.1))
     (fp_line (start 0.8 0.4) (end -0.5 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 111 "Net-(D80-Pad2)"))
+      (net 107 "Net-(D80-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1442,9 +2222,9 @@
     (fp_line (start -0.5 0.4) (end -0.8 0.1) (layer B.Fab) (width 0.1))
     (fp_line (start 0.8 0.4) (end -0.5 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 110 "Net-(D79-Pad2)"))
+      (net 106 "Net-(D79-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1480,9 +2260,9 @@
     (fp_line (start -0.5 0.4) (end -0.8 0.1) (layer B.Fab) (width 0.1))
     (fp_line (start 0.8 0.4) (end -0.5 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 109 "Net-(D78-Pad2)"))
+      (net 105 "Net-(D78-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1520,7 +2300,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 77 "Net-(D77-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1558,7 +2338,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 76 "Net-(D76-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1596,7 +2376,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 75 "Net-(D75-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1634,7 +2414,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 74 "Net-(D74-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1672,7 +2452,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 73 "Net-(D73-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1710,7 +2490,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 72 "Net-(D72-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1748,7 +2528,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 71 "Net-(D71-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1786,7 +2566,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 70 "Net-(D70-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1824,7 +2604,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 69 "Net-(D69-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1862,7 +2642,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 68 "Net-(D68-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1898,7 +2678,7 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
     )
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 67 "Net-(D67-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
@@ -1938,7 +2718,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 66 "Net-(D66-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1976,7 +2756,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 65 "Net-(D65-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2014,7 +2794,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 64 "Net-(D64-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2052,7 +2832,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 63 "Net-(D63-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2090,7 +2870,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 62 "Net-(D62-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2128,7 +2908,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 61 "Net-(D61-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2166,7 +2946,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 60 "Net-(D60-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2204,7 +2984,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 59 "Net-(D59-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2242,7 +3022,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 58 "Net-(D58-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2280,7 +3060,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 57 "Net-(D57-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2318,7 +3098,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 56 "Net-(D56-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2356,7 +3136,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 54 "Net-(D54-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2394,7 +3174,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 53 "Net-(D53-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2432,7 +3212,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 52 "Net-(D52-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2470,7 +3250,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 51 "Net-(D51-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2508,7 +3288,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 50 "Net-(D50-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2546,7 +3326,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 49 "Net-(D49-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2584,7 +3364,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 48 "Net-(D48-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2622,7 +3402,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 47 "Net-(D47-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2660,7 +3440,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 46 "Net-(D46-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2698,7 +3478,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 45 "Net-(D45-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2736,7 +3516,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 44 "Net-(D44-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2774,7 +3554,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 43 "Net-(D43-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2812,7 +3592,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 42 "Net-(D42-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2850,7 +3630,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 41 "Net-(D41-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2888,7 +3668,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 40 "Net-(D40-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2926,7 +3706,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 39 "Net-(D39-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2964,7 +3744,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 38 "Net-(D38-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3002,7 +3782,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 37 "Net-(D37-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3040,7 +3820,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 36 "Net-(D36-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3078,7 +3858,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 35 "Net-(D35-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3116,7 +3896,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 34 "Net-(D34-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3154,7 +3934,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 33 "Net-(D33-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3192,7 +3972,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 32 "Net-(D32-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3230,7 +4010,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 31 "Net-(D31-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3268,7 +4048,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 30 "Net-(D30-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3306,7 +4086,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 29 "Net-(D29-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3344,7 +4124,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 28 "Net-(D28-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3382,7 +4162,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 27 "Net-(D27-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3420,7 +4200,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 26 "Net-(D26-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3458,7 +4238,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 25 "Net-(D25-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3496,7 +4276,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 24 "Net-(D24-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3534,7 +4314,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 23 "Net-(D23-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3572,7 +4352,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 22 "Net-(D22-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3610,7 +4390,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 21 "Net-(D21-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3648,7 +4428,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 20 "Net-(D20-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3686,7 +4466,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 19 "Net-(D19-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3724,7 +4504,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 18 "Net-(D18-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3762,7 +4542,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 17 "Net-(D17-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3800,7 +4580,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 16 "Net-(D16-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3838,7 +4618,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 15 "Net-(D15-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3876,7 +4656,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 14 "Net-(D14-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3914,7 +4694,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 13 "Net-(D13-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3952,7 +4732,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 12 "Net-(D12-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3966,7 +4746,7 @@
     (tags "diode handsolder")
     (path /594D96FF)
     (attr smd)
-    (fp_text reference D11 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference D11 (at 3.14 -0.2 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D_Small (at 0 -1.43 90) (layer B.Fab)
@@ -3990,7 +4770,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 11 "Net-(D11-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4004,7 +4784,7 @@
     (tags "diode handsolder")
     (path /594D96EB)
     (attr smd)
-    (fp_text reference D10 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference D10 (at 3.14 -0.1 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D_Small (at 0 -1.43 90) (layer B.Fab)
@@ -4028,7 +4808,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 10 "Net-(D10-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4042,7 +4822,7 @@
     (tags "diode handsolder")
     (path /594D96E5)
     (attr smd)
-    (fp_text reference D9 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference D9 (at 2.74 0.1 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D_Small (at 0 -1.43 90) (layer B.Fab)
@@ -4066,7 +4846,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 9 "Net-(D9-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4080,7 +4860,7 @@
     (tags "diode handsolder")
     (path /594D8B6C)
     (attr smd)
-    (fp_text reference D8 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference D8 (at 2.34 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D_Small (at 0 -1.43 90) (layer B.Fab)
@@ -4104,7 +4884,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 8 "Net-(D8-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4142,7 +4922,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 7 "Net-(D7-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4180,7 +4960,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 6 "Net-(D6-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4218,7 +4998,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 5 "Net-(D5-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4256,7 +5036,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 4 "Net-(D4-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4294,7 +5074,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 3 "Net-(D3-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4332,7 +5112,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 2 "Net-(D2-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4341,11 +5121,11 @@
   )
 
   (module Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal (layer B.Cu) (tedit 59FED667) (tstamp 5A207675)
-    (at 96.9 6.3 180)
+    (at 114.5 24.1 180)
     (descr "Through hole angled pin header, 1x04, 2.00mm pitch, 4.2mm pin length, single row")
     (tags "Through hole angled pin header THT 1x04 2.00mm single row")
     (path /5A2069AE/5A213B3D)
-    (fp_text reference J2 (at -2.54 0 180) (layer B.SilkS)
+    (fp_text reference J2 (at -2.6 0.8 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value USB (at 3.1 -8 180) (layer B.Fab)
@@ -4424,11 +5204,11 @@
     (pad 4 thru_hole oval (at 0 -6 180) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
       (net 79 GND))
     (pad 3 thru_hole oval (at 0 -4 180) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 90 D+))
+      (net 89 D+))
     (pad 2 thru_hole oval (at 0 -2 180) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 89 D-))
+      (net 88 D-))
     (pad 1 thru_hole rect (at 0 0 180) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (model ${KISYS3DMOD}/Connector_PinHeader_2.00mm.3dshapes/PinHeader_1x04_P2.00mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4466,7 +5246,7 @@
     (pad 2 smd roundrect (at 0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 1 "Net-(D1-Pad2)"))
     (pad 1 smd roundrect (at -0.875 0 90) (size 1.05 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 82 ROW1))
+      (net 81 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4509,9 +5289,9 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 112 "Net-(D81-Pad2)"))
+      (net 108 "Net-(D81-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
       (offset (xyz 0 0 7.1))
@@ -4555,9 +5335,9 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 111 "Net-(D80-Pad2)"))
+      (net 107 "Net-(D80-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
       (offset (xyz 0 0 7.1))
@@ -4601,9 +5381,9 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 101 COL9))
+      (net 98 COL9))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 110 "Net-(D79-Pad2)"))
+      (net 106 "Net-(D79-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
       (offset (xyz 0 0 7.1))
@@ -4647,9 +5427,9 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 109 "Net-(D78-Pad2)"))
+      (net 105 "Net-(D78-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
       (offset (xyz 0 0 7.1))
@@ -4693,7 +5473,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 77 "Net-(D77-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -4739,7 +5519,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 93 COL1))
+      (net 90 COL1))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 71 "Net-(D71-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -4785,7 +5565,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 106 COL14))
+      (net 103 COL14))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 70 "Net-(D70-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -4831,7 +5611,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 105 COL13))
+      (net 102 COL13))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 69 "Net-(D69-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -4877,7 +5657,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 68 "Net-(D68-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -4923,7 +5703,7 @@
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 67 "Net-(D67-Pad2)"))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
@@ -4969,7 +5749,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 66 "Net-(D66-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5015,7 +5795,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 101 COL9))
+      (net 98 COL9))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 65 "Net-(D65-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5061,7 +5841,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 64 "Net-(D64-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5107,7 +5887,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 63 "Net-(D63-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5153,7 +5933,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 98 COL6))
+      (net 95 COL6))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 62 "Net-(D62-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5199,7 +5979,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 97 COL5))
+      (net 94 COL5))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 61 "Net-(D61-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5245,7 +6025,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 96 COL4))
+      (net 93 COL4))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 60 "Net-(D60-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5291,7 +6071,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 95 COL3))
+      (net 92 COL3))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 59 "Net-(D59-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5337,7 +6117,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 94 COL2))
+      (net 91 COL2))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 58 "Net-(D58-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5383,8 +6163,9 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 105 COL13))
-    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask))
+      (net 102 COL13))
+    (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
+      (net 55 "Net-(D55-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/Kailh_keycap-switch_system_1x1.wrl
       (offset (xyz 0 0 7.1))
@@ -5428,7 +6209,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 54 "Net-(D54-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5474,7 +6255,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 53 "Net-(D53-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5520,7 +6301,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 52 "Net-(D52-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5566,7 +6347,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 101 COL9))
+      (net 98 COL9))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 51 "Net-(D51-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5612,7 +6393,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 50 "Net-(D50-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5658,7 +6439,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 49 "Net-(D49-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5704,7 +6485,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 98 COL6))
+      (net 95 COL6))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 48 "Net-(D48-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5750,7 +6531,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 97 COL5))
+      (net 94 COL5))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 47 "Net-(D47-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5796,7 +6577,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 96 COL4))
+      (net 93 COL4))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 46 "Net-(D46-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5842,7 +6623,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 95 COL3))
+      (net 92 COL3))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 45 "Net-(D45-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5888,7 +6669,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 94 COL2))
+      (net 91 COL2))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 44 "Net-(D44-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5934,7 +6715,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 93 COL1))
+      (net 90 COL1))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 43 "Net-(D43-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -5980,7 +6761,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 106 COL14))
+      (net 103 COL14))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 42 "Net-(D42-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6026,7 +6807,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 105 COL13))
+      (net 102 COL13))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 41 "Net-(D41-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6072,7 +6853,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 40 "Net-(D40-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6118,7 +6899,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 39 "Net-(D39-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6164,7 +6945,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 38 "Net-(D38-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6210,7 +6991,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 101 COL9))
+      (net 98 COL9))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 37 "Net-(D37-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6256,7 +7037,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 36 "Net-(D36-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6302,7 +7083,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 35 "Net-(D35-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6348,7 +7129,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 98 COL6))
+      (net 95 COL6))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 34 "Net-(D34-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6394,7 +7175,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 97 COL5))
+      (net 94 COL5))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 33 "Net-(D33-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6440,7 +7221,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 96 COL4))
+      (net 93 COL4))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 32 "Net-(D32-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6486,7 +7267,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 95 COL3))
+      (net 92 COL3))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 31 "Net-(D31-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6532,7 +7313,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 94 COL2))
+      (net 91 COL2))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 30 "Net-(D30-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6578,7 +7359,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 105 COL13))
+      (net 102 COL13))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 27 "Net-(D27-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6624,7 +7405,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 26 "Net-(D26-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6670,7 +7451,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 25 "Net-(D25-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6716,7 +7497,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 24 "Net-(D24-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6762,7 +7543,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 101 COL9))
+      (net 98 COL9))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 23 "Net-(D23-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6808,7 +7589,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 22 "Net-(D22-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6854,7 +7635,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 21 "Net-(D21-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6900,7 +7681,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 98 COL6))
+      (net 95 COL6))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 20 "Net-(D20-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6946,7 +7727,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 97 COL5))
+      (net 94 COL5))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 19 "Net-(D19-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -6992,7 +7773,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 96 COL4))
+      (net 93 COL4))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 18 "Net-(D18-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7038,7 +7819,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 95 COL3))
+      (net 92 COL3))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 17 "Net-(D17-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7084,7 +7865,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 94 COL2))
+      (net 91 COL2))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 16 "Net-(D16-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7130,7 +7911,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 93 COL1))
+      (net 90 COL1))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 15 "Net-(D15-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7176,7 +7957,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 105 COL13))
+      (net 102 COL13))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 13 "Net-(D13-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7222,7 +8003,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 12 "Net-(D12-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7268,7 +8049,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 11 "Net-(D11-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7314,7 +8095,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 10 "Net-(D10-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7360,7 +8141,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 101 COL9))
+      (net 98 COL9))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 9 "Net-(D9-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7406,7 +8187,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 8 "Net-(D8-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7452,7 +8233,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 7 "Net-(D7-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7498,7 +8279,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 98 COL6))
+      (net 95 COL6))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 6 "Net-(D6-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7544,7 +8325,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 97 COL5))
+      (net 94 COL5))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 5 "Net-(D5-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7590,7 +8371,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 96 COL4))
+      (net 93 COL4))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 4 "Net-(D4-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7636,7 +8417,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 95 COL3))
+      (net 92 COL3))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 3 "Net-(D3-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7682,7 +8463,7 @@
     (pad "" np_thru_hole circle (at 5.5 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 5.22 -4.2) (size 0.9906 0.9906) (drill 0.9906) (layers *.Cu *.Mask))
     (pad 1 thru_hole circle (at 0 5.207) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
-      (net 93 COL1))
+      (net 90 COL1))
     (pad 2 thru_hole circle (at -5 3.8) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask)
       (net 1 "Net-(D1-Pad2)"))
     (pad "" np_thru_hole circle (at 0 0) (size 3.429 3.429) (drill 3.429) (layers *.Cu *.Mask))
@@ -7693,334 +8474,6 @@
     )
   )
 
-  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58E0A804) (tstamp 5CC4E703)
-    (at 101.0455 9.9515 180)
-    (descr "Resistor SMD 0603, hand soldering")
-    (tags "resistor 0603")
-    (path /5A2069AE/5A213F64)
-    (attr smd)
-    (fp_text reference R1 (at -3.063 0.05 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 0 (at 0 -1.55 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start 1.95 -0.7) (end -1.96 -0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.95 -0.7) (end 1.95 0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.96 0.7) (end -1.96 -0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.96 0.7) (end 1.95 0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.5 0.68) (end 0.5 0.68) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.5 -0.68) (end -0.5 -0.68) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)) (justify mirror))
-    )
-    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
-      (net 90 D+))
-    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(R1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58E0A804) (tstamp 5CC4E733)
-    (at 101.0605 8.1735 180)
-    (descr "Resistor SMD 0603, hand soldering")
-    (tags "resistor 0603")
-    (path /5A2069AE/5A213EDF)
-    (attr smd)
-    (fp_text reference R2 (at -3.048 0 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 0 (at 0 -1.55 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.68) (end -0.5 -0.68) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.5 0.68) (end 0.5 0.68) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.96 0.7) (end 1.95 0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.96 0.7) (end -1.96 -0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.95 -0.7) (end 1.95 0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.95 -0.7) (end -1.96 -0.7) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
-      (net 92 "Net-(R2-Pad1)"))
-    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
-      (net 89 D-))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 58AA848B) (tstamp 5A207659)
-    (at 125.8 28.7 90)
-    (descr "Capacitor SMD 0603, hand soldering")
-    (tags "capacitor 0603")
-    (path /5A2069AE/5A20764E)
-    (attr smd)
-    (fp_text reference C3 (at 2.8 0 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1uF (at 0 -1.5 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 1.25 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.8 0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.8 0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0 90) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 80 "Net-(C3-Pad1)"))
-    (pad 2 smd rect (at 0.95 0 90) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 79 GND))
-    (model Capacitors_SMD.3dshapes/C_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 58AA848B) (tstamp 5CED74DC)
-    (at 146.3735 21.0655)
-    (descr "Capacitor SMD 0603, hand soldering")
-    (tags "capacitor 0603")
-    (path /5A2069AE/5A2148C0)
-    (attr smd)
-    (fp_text reference C4 (at 2.85 0) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1uF (at 0 -1.5) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 1.25) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.8 0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.8 0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
-    (pad 2 smd rect (at 0.95 0) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 79 GND))
-    (model Capacitors_SMD.3dshapes/C_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 58AA848B) (tstamp 5A20764D)
-    (at 117.65 25.3 270)
-    (descr "Capacitor SMD 0603, hand soldering")
-    (tags "capacitor 0603")
-    (path /5A2069AE/5A2073AA)
-    (attr smd)
-    (fp_text reference C1 (at 3 -0.05 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 18pF (at 4 0 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 1 1.5 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.8 0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.8 0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0 270) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 78 "Net-(C1-Pad1)"))
-    (pad 2 smd rect (at 0.95 0 270) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 79 GND))
-    (model Capacitors_SMD.3dshapes/C_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 58AA848B) (tstamp 5A207653)
-    (at 120.85 29.95 180)
-    (descr "Capacitor SMD 0603, hand soldering")
-    (tags "capacitor 0603")
-    (path /5A2069AE/5A2073F7)
-    (attr smd)
-    (fp_text reference C2 (at 3 0 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 18pF (at 0 -1.5 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 1.25 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.8 0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.8 0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0 180) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 108 "Net-(C2-Pad1)"))
-    (pad 2 smd rect (at 0.95 0 180) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 79 GND))
-    (model Capacitors_SMD.3dshapes/C_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 58AA848B) (tstamp 5A207665)
-    (at 124.1 28.6 90)
-    (descr "Capacitor SMD 0603, hand soldering")
-    (tags "capacitor 0603")
-    (path /5A2069AE/5A214A09)
-    (attr smd)
-    (fp_text reference C5 (at 1.05 1.4 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1uF (at 0 -1.5 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 1.25 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.8 0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.8 0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end 1.8 0.65) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.8 -0.65) (end -1.8 -0.65) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.95 0 90) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
-    (pad 2 smd rect (at 0.95 0 90) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
-      (net 79 GND))
-    (model Capacitors_SMD.3dshapes/C_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.00mm (layer B.Cu) (tedit 59650533) (tstamp 5A20766B)
-    (at 114.4605 26.7455 180)
-    (descr "Through hole straight pin header, 1x02, 2.00mm pitch, single row")
-    (tags "Through hole pin header THT 1x02 2.00mm single row")
-    (path /5A2069AE/5A207D64)
-    (fp_text reference J1 (at 0 2.06 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value RST (at 0 -4.06 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -0.5 1) (end 1 1) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 1) (end 1 -3) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -3) (end -1 -3) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 -3) (end -1 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.5) (end -0.5 1) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.06 -3.06) (end 1.06 -3.06) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.06 -1) (end -1.06 -3.06) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.06 -1) (end 1.06 -3.06) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.06 -1) (end 1.06 -1) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.06 0) (end -1.06 1.06) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.06 1.06) (end 0 1.06) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.5 1.5) (end -1.5 -3.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.5 -3.5) (end 1.5 -3.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.5 -3.5) (end 1.5 1.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 -1 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (pad 1 thru_hole rect (at 0 0 180) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 79 GND))
-    (pad 2 thru_hole oval (at 0 -2 180) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 88 RESET))
-    (model ${KISYS3DMOD}/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.00mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58E0A804) (tstamp 5A207687)
-    (at 129.1 26.5)
-    (descr "Resistor SMD 0603, hand soldering")
-    (tags "resistor 0603")
-    (path /5A2069AE/5A21443A)
-    (attr smd)
-    (fp_text reference R3 (at 0 1.45 -180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 10k (at 0 -1.55 -180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 -180) (layer B.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)) (justify mirror))
-    )
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.68) (end -0.5 -0.68) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.5 0.68) (end 0.5 0.68) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.96 0.7) (end 1.95 0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.96 0.7) (end -1.96 -0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.95 -0.7) (end 1.95 0.7) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.95 -0.7) (end -1.96 -0.7) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
-    (pad 2 smd rect (at 1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
-      (net 88 RESET))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm (layer B.Cu) (tedit 58CC9A48) (tstamp 5CED7400)
     (at 140.15 28.4 45)
     (descr "44-Lead Plastic Thin Quad Flatpack (PT) - 10x10x1.0 mm Body [TQFP] (see Microchip Packaging Specification 00000049BS.pdf)")
@@ -8055,88 +8508,93 @@
     (fp_line (start 5.175 5.175) (end 4.5 5.175) (layer B.SilkS) (width 0.15))
     (fp_line (start -5.175 4.6) (end -6.45 4.6) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -5.7 4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 113 "Net-(J3-Pad5)"))
+      (net 113 UART_RX))
     (pad 2 smd rect (at -5.7 3.2 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (pad 3 smd rect (at -5.7 2.4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 92 "Net-(R2-Pad1)"))
+      (net 121 "/Reform KBD MCU/UD-"))
     (pad 4 smd rect (at -5.7 1.6 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(R1-Pad1)"))
+      (net 120 "/Reform KBD MCU/UD+"))
     (pad 5 smd rect (at -5.7 0.8 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
     (pad 6 smd rect (at -5.7 0 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 80 "Net-(C3-Pad1)"))
     (pad 7 smd rect (at -5.7 -0.8 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (pad 8 smd rect (at -5.7 -1.6 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 100 COL8))
+      (net 97 COL8))
     (pad 9 smd rect (at -5.7 -2.4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 99 COL7))
+      (net 96 COL7))
     (pad 10 smd rect (at -5.7 -3.2 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 98 COL6))
+      (net 95 COL6))
     (pad 11 smd rect (at -5.7 -4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 97 COL5))
-    (pad 12 smd rect (at -4 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask))
+      (net 94 COL5))
+    (pad 12 smd rect (at -4 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
+      (net 122 LED))
     (pad 13 smd rect (at -3.2 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 88 RESET))
+      (net 87 RESET))
     (pad 14 smd rect (at -2.4 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (pad 15 smd rect (at -1.6 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
     (pad 16 smd rect (at -0.8 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 108 "Net-(C2-Pad1)"))
+      (net 104 "Net-(C2-Pad1)"))
     (pad 17 smd rect (at 0 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 78 "Net-(C1-Pad1)"))
-    (pad 18 smd rect (at 0.8 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask))
+    (pad 18 smd rect (at 0.8 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
+      (net 112 UART_TX))
     (pad 19 smd rect (at 1.6 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 96 COL4))
+      (net 93 COL4))
     (pad 20 smd rect (at 2.4 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 95 COL3))
+      (net 92 COL3))
     (pad 21 smd rect (at 3.2 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 94 COL2))
+      (net 91 COL2))
     (pad 22 smd rect (at 4 -5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 93 COL1))
+      (net 90 COL1))
     (pad 23 smd rect (at 5.7 -4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
     (pad 24 smd rect (at 5.7 -3.2 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (pad 25 smd rect (at 5.7 -2.4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 87 ROW6))
+      (net 86 ROW6))
     (pad 26 smd rect (at 5.7 -1.6 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 86 ROW5))
+      (net 85 ROW5))
     (pad 27 smd rect (at 5.7 -0.8 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 85 ROW4))
+      (net 84 ROW4))
     (pad 28 smd rect (at 5.7 0 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 84 ROW3))
+      (net 83 ROW3))
     (pad 29 smd rect (at 5.7 0.8 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 83 ROW2))
+      (net 82 ROW2))
     (pad 30 smd rect (at 5.7 1.6 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 82 ROW1))
-    (pad 31 smd rect (at 5.7 2.4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask))
-    (pad 32 smd rect (at 5.7 3.2 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask))
+      (net 81 ROW1))
+    (pad 31 smd rect (at 5.7 2.4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
+      (net 103 COL14))
+    (pad 32 smd rect (at 5.7 3.2 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
+      (net 117 AUX))
     (pad 33 smd rect (at 5.7 4 45) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 107 "Net-(J3-Pad3)"))
+      (net 118 PROG))
     (pad 34 smd rect (at 4 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (pad 35 smd rect (at 3.2 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
     (pad 36 smd rect (at 2.4 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 106 COL14))
+      (net 119 LID_SENSE))
     (pad 37 smd rect (at 1.6 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 105 COL13))
+      (net 102 COL13))
     (pad 38 smd rect (at 0.8 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 104 COL12))
+      (net 101 COL12))
     (pad 39 smd rect (at 0 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 103 COL11))
+      (net 100 COL11))
     (pad 40 smd rect (at -0.8 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 102 COL10))
+      (net 99 COL10))
     (pad 41 smd rect (at -1.6 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 101 COL9))
-    (pad 42 smd rect (at -2.4 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask))
+      (net 98 COL9))
+    (pad 42 smd rect (at -2.4 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
+      (net 116 "Net-(R4-Pad1)"))
     (pad 43 smd rect (at -3.2 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
     (pad 44 smd rect (at -4 5.7 315) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 81 UVCC))
+      (net 110 +5V))
     (model ${KISYS3DMOD}/Housings_QFP.3dshapes/TQFP-44_10x10mm_Pitch0.8mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8145,18 +8603,18 @@
   )
 
   (module Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm_HandSoldering (layer B.Cu) (tedit 58CD2E9C) (tstamp 5A6375D7)
-    (at 120.85 26.3 270)
+    (at 126.9 25.6)
     (descr "SMD Crystal SERIES SMD3225/4 http://www.txccrystal.com/images/pdf/7m-accuracy.pdf, hand-soldering, 3.2x2.5mm^2 package")
     (tags "SMD SMT crystal hand-soldering")
     (path /5A2069AE/5A6378F6)
     (attr smd)
-    (fp_text reference Y1 (at -3.856 0.27) (layer B.SilkS)
+    (fp_text reference Y1 (at -1.8 3.1) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 16MHz (at -0.25 4.75 270) (layer B.Fab)
+    (fp_text value 16MHz (at -0.25 4.75 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.7 0.7) (thickness 0.105)) (justify mirror))
     )
     (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
@@ -8170,13 +8628,13 @@
     (fp_line (start -2.8 -2.3) (end 2.8 -2.3) (layer B.CrtYd) (width 0.05))
     (fp_line (start 2.8 -2.3) (end 2.8 2.3) (layer B.CrtYd) (width 0.05))
     (fp_line (start 2.8 2.3) (end -2.8 2.3) (layer B.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.45 -1.15 270) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.45 -1.15) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
       (net 78 "Net-(C1-Pad1)"))
-    (pad 2 smd rect (at 1.45 -1.15 270) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.45 -1.15) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
-    (pad 3 smd rect (at 1.45 1.15 270) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
-      (net 108 "Net-(C2-Pad1)"))
-    (pad 4 smd rect (at -1.45 1.15 270) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
+    (pad 3 smd rect (at 1.45 1.15) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
+      (net 104 "Net-(C2-Pad1)"))
+    (pad 4 smd rect (at -1.45 1.15) (size 2.1 1.8) (layers B.Cu B.Paste B.Mask)
       (net 79 GND))
     (model ${KISYS3DMOD}/Crystals.3dshapes/Crystal_SMD_3225-4pin_3.2x2.5mm_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -8185,50 +8643,6 @@
     )
   )
 
-  (module Pin_Headers:Pin_Header_Straight_1x05_Pitch2.00mm (layer F.Cu) (tedit 59650533) (tstamp 5CED749C)
-    (at 160.788 23.669 270)
-    (descr "Through hole straight pin header, 1x05, 2.00mm pitch, single row")
-    (tags "Through hole pin header THT 1x05 2.00mm single row")
-    (path /5A2069AE/5A6671A0)
-    (fp_text reference J3 (at 0 -2.06 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value AUX (at 0 10.06 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -0.5 -1) (end 1 -1) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -1) (end 1 9) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 9) (end -1 9) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 9) (end -1 -0.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.5) (end -0.5 -1) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.06 9.06) (end 1.06 9.06) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.06 1) (end -1.06 9.06) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.06 1) (end 1.06 9.06) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.06 1) (end 1.06 1) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.06 0) (end -1.06 -1.06) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.06 -1.06) (end 0 -1.06) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.5 -1.5) (end -1.5 9.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.5 9.5) (end 1.5 9.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.5 9.5) (end 1.5 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.5 -1.5) (end -1.5 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 4) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole rect (at 0 0 270) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask))
-    (pad 2 thru_hole oval (at 0 2 270) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask))
-    (pad 3 thru_hole oval (at 0 4 270) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 107 "Net-(J3-Pad3)"))
-    (pad 4 thru_hole oval (at 0 6 270) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 79 GND))
-    (pad 5 thru_hole oval (at 0 8 270) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 113 "Net-(J3-Pad5)"))
-    (model ${KISYS3DMOD}/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.00mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (dimension 6.59 (width 0.15) (layer Dwgs.User)
     (gr_text "6.590 mm" (at 0.29 129.325 90) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -9418,6 +9832,10 @@
   (gr_line (start 5 132.64) (end 5 30.4) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 281 132.64) (end 5 132.64) (layer Edge.Cuts) (width 0.15))
 
+  (segment (start 14.975 42.04) (end 15 42.065) (width 0.25) (layer B.Cu) (net 1))
+  (segment (start 12.5 42.04) (end 14.975 42.04) (width 0.25) (layer B.Cu) (net 1))
+  (segment (start 33.475 42.04) (end 33.5 42.065) (width 0.25) (layer B.Cu) (net 2))
+  (segment (start 31.1 42.04) (end 33.475 42.04) (width 0.25) (layer B.Cu) (net 2))
   (segment (start 19.408 112.44) (end 19.433 112.415) (width 0.25) (layer B.Cu) (net 57))
   (segment (start 17 112.44) (end 19.408 112.44) (width 0.25) (layer B.Cu) (net 57))
   (segment (start 42.485 112.44) (end 42.55 112.375) (width 0.25) (layer B.Cu) (net 58))
@@ -9446,290 +9864,511 @@
   (segment (start 155.85 129.065) (end 147.975 129.065) (width 0.25) (layer B.Cu) (net 76))
   (segment (start 171.325 129.015) (end 170.3 130.04) (width 0.25) (layer B.Cu) (net 77))
   (segment (start 179.333 129.015) (end 171.325 129.015) (width 0.25) (layer B.Cu) (net 77))
-  (via (at 143.1 28.2) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 82))
-  (segment (start 143.2 28.1) (end 143.1 28.2) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 145.31188 25.500862) (end 143.2 27.612742) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 143.2 27.612742) (end 143.2 28.1) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 144.600928 44.314072) (end 145.1 43.815) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 144.076999 44.838001) (end 144.600928 44.314072) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 126.5 44.44) (end 126.898001 44.838001) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 126.5 43.815) (end 126.5 44.44) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 138.70001 44.176012) (end 139.361999 44.838001) (width 0.25) (layer F.Cu) (net 82))
-  (segment (start 139.8 34.6) (end 138.70001 35.69999) (width 0.25) (layer F.Cu) (net 82))
-  (segment (start 139.361999 44.838001) (end 144.076999 44.838001) (width 0.25) (layer B.Cu) (net 82))
-  (segment (start 138.70001 35.69999) (end 138.70001 44.176012) (width 0.25) (layer F.Cu) (net 82))
-  (segment (start 126.898001 44.838001) (end 139.361999 44.838001) (width 0.25) (layer B.Cu) (net 82))
-  (via (at 139.361999 44.838001) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 82))
-  (segment (start 143.1 28.2) (end 143.1 31.11424) (width 0.25) (layer F.Cu) (net 82))
-  (segment (start 143.1 31.11424) (end 139.8 34.41424) (width 0.25) (layer F.Cu) (net 82))
-  (segment (start 139.8 34.41424) (end 139.8 34.6) (width 0.25) (layer F.Cu) (net 82))
-  (via (at 141.8 28.4) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 83))
-  (segment (start 144.746194 24.935177) (end 141.8 27.881371) (width 0.25) (layer B.Cu) (net 83))
-  (segment (start 141.8 27.881371) (end 141.8 28.4) (width 0.25) (layer B.Cu) (net 83))
-  (segment (start 144.700928 61.914072) (end 145.2 61.415) (width 0.25) (layer B.Cu) (net 83))
-  (segment (start 143.715 62.9) (end 144.700928 61.914072) (width 0.25) (layer B.Cu) (net 83))
-  (segment (start 126.6 61.415) (end 128.085 62.9) (width 0.25) (layer B.Cu) (net 83))
-  (segment (start 138.2 62.3) (end 138.8 62.9) (width 0.25) (layer F.Cu) (net 83))
-  (segment (start 138.8 62.9) (end 143.715 62.9) (width 0.25) (layer B.Cu) (net 83))
-  (via (at 138.8 62.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 83))
-  (segment (start 138.2 35.30712) (end 138.2 62.3) (width 0.25) (layer F.Cu) (net 83))
-  (segment (start 141.8 28.4) (end 141.8 31.70712) (width 0.25) (layer F.Cu) (net 83))
-  (segment (start 128.085 62.9) (end 138.8 62.9) (width 0.25) (layer B.Cu) (net 83))
-  (segment (start 141.8 31.70712) (end 138.2 35.30712) (width 0.25) (layer F.Cu) (net 83))
-  (segment (start 140.5 28.6) (end 140.9 29) (width 0.25) (layer B.Cu) (net 84))
-  (via (at 140.9 29) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 84))
-  (segment (start 144.180509 24.369491) (end 140.5 28.05) (width 0.25) (layer B.Cu) (net 84))
-  (segment (start 140.5 28.05) (end 140.5 28.6) (width 0.25) (layer B.Cu) (net 84))
-  (segment (start 153.600928 79.514072) (end 154.1 79.015) (width 0.25) (layer B.Cu) (net 84))
-  (segment (start 152.315 80.8) (end 153.600928 79.514072) (width 0.25) (layer B.Cu) (net 84))
-  (segment (start 135.5 79.015) (end 137.285 80.8) (width 0.25) (layer B.Cu) (net 84))
-  (via (at 142.1 80.8) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 84))
-  (segment (start 137.285 80.8) (end 142.1 80.8) (width 0.25) (layer B.Cu) (net 84))
-  (segment (start 142.1 80.8) (end 152.315 80.8) (width 0.25) (layer B.Cu) (net 84))
-  (segment (start 141.3 80) (end 142.1 80.8) (width 0.25) (layer F.Cu) (net 84))
-  (segment (start 141.3 71.28576) (end 141.3 80) (width 0.25) (layer F.Cu) (net 84))
-  (segment (start 137.7 67.68576) (end 141.3 71.28576) (width 0.25) (layer F.Cu) (net 84))
-  (segment (start 137.7 35.1) (end 137.7 67.68576) (width 0.25) (layer F.Cu) (net 84))
-  (segment (start 140.9 31.9) (end 137.7 35.1) (width 0.25) (layer F.Cu) (net 84))
-  (segment (start 140.9 29) (end 140.9 31.9) (width 0.25) (layer F.Cu) (net 84))
-  (via (at 139.8 29.8) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 85))
-  (segment (start 139.7 29.7) (end 139.8 29.8) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 143.614823 23.803806) (end 139.7 27.718629) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 139.7 27.718629) (end 139.7 29.7) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 141.615659 96.615) (end 144.525 96.615) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 126.5 96.615) (end 128.259001 94.855999) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 144.525 96.615) (end 145.1 96.615) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 128.259001 94.855999) (end 139.856658 94.855999) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 140.900329 95.899671) (end 141.615659 96.615) (width 0.25) (layer B.Cu) (net 85))
-  (segment (start 139.856658 94.855999) (end 140.900329 95.899671) (width 0.25) (layer B.Cu) (net 85))
-  (via (at 140.900329 95.899671) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 85))
-  (segment (start 139.8 29.8) (end 139.8 31.80712) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 137.1 67.79288) (end 140.799989 71.492871) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 140.79999 95.233647) (end 140.900329 95.333986) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 140.799989 71.492871) (end 140.79999 95.233647) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 140.900329 95.333986) (end 140.900329 95.899671) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 139.8 31.80712) (end 137.1 34.50712) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 137.1 34.50712) (end 137.1 67.79288) (width 0.25) (layer F.Cu) (net 85))
-  (segment (start 39.726318 114.125) (end 41.975 114.125) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 41.975 114.125) (end 42.55 114.125) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 38.057317 112.455999) (end 39.726318 114.125) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 21.142001 112.455999) (end 38.057317 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 19.433 114.165) (end 21.142001 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 60.608 114.215) (end 61.183 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 58.416318 114.215) (end 60.608 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 56.657317 112.455999) (end 58.416318 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 44.219001 112.455999) (end 56.657317 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 42.55 114.125) (end 44.219001 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 79.208 114.215) (end 79.783 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 77.016318 114.215) (end 79.208 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 75.257317 112.455999) (end 77.016318 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 62.942001 112.455999) (end 75.257317 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 61.183 114.215) (end 62.942001 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 97.758 114.215) (end 98.333 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 95.616318 114.215) (end 97.758 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 93.857317 112.455999) (end 95.616318 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 81.542001 112.455999) (end 93.857317 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 79.783 114.215) (end 81.542001 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 116.358 114.215) (end 116.933 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 114.216318 114.215) (end 116.358 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 112.457317 112.455999) (end 114.216318 114.215) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 100.092001 112.455999) (end 112.457317 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 98.333 114.215) (end 100.092001 112.455999) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 142.448098 23.83916) (end 142.26084 23.83916) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 143.049138 23.23812) (end 142.448098 23.83916) (width 0.25) (layer B.Cu) (net 86))
-  (via (at 138.9 30.8) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 86))
-  (segment (start 142.26084 23.83916) (end 138.9 27.2) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 138.9 27.2) (end 138.9 30.8) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 153.633928 114.664072) (end 154.133 114.165) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 153.059999 115.238001) (end 153.633928 114.664072) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 135.533 114.215) (end 136.556001 115.238001) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 142.038001 115.238001) (end 153.059999 115.238001) (width 0.25) (layer B.Cu) (net 86))
-  (segment (start 136.556001 115.238001) (end 142.038001 115.238001) (width 0.25) (layer B.Cu) (net 86))
-  (via (at 142.038001 115.238001) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 86))
-  (segment (start 140.000011 105.600011) (end 141.4 107) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 141.4 107) (end 141.4 114.6) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 135.9 88.992878) (end 140.000011 93.092889) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 141.4 114.6) (end 142.038001 115.238001) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 138.9 32) (end 136.510509 34.389491) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 136.510508 67.91051) (end 135.9 68.521018) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 140.000011 93.092889) (end 140.000011 105.600011) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 135.9 68.521018) (end 135.9 88.992878) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 136.510509 34.389491) (end 136.510508 67.91051) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 138.9 30.8) (end 138.9 32) (width 0.25) (layer F.Cu) (net 86))
-  (segment (start 44.200928 130.315928) (end 44.7 130.815) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 36.9 131.9) (end 39.2 129.6) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 21.583 130.815) (end 22.668 131.9) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 43.485 129.6) (end 44.200928 130.315928) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 39.2 129.6) (end 43.485 129.6) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 22.668 131.9) (end 36.9 131.9) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 72.050928 130.275928) (end 72.55 130.775) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 67.5 129.7) (end 71.475 129.7) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 65.3 131.9) (end 67.5 129.7) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 71.475 129.7) (end 72.050928 130.275928) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 44.7 130.815) (end 45.785 131.9) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 45.785 131.9) (end 65.3 131.9) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 122.9 129.2) (end 126.568 129.2) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 120.3 131.8) (end 122.9 129.2) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 126.568 129.2) (end 127.683928 130.315928) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 100.4 130.815) (end 101.385 131.8) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 127.683928 130.315928) (end 128.183 130.815) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 101.385 131.8) (end 120.3 131.8) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 99.900928 130.315928) (end 100.4 130.815) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 99.185 129.6) (end 99.900928 130.315928) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 95.7 129.6) (end 99.185 129.6) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 93.7 131.6) (end 95.7 129.6) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 72.55 130.775) (end 73.375 131.6) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 73.375 131.6) (end 93.7 131.6) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 141.882412 23.273475) (end 141.882412 23.317588) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 142.483452 22.672435) (end 141.882412 23.273475) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 141.882412 23.317588) (end 138.1 27.1) (width 0.25) (layer B.Cu) (net 87))
-  (via (at 138.1 31.5) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 87))
-  (segment (start 138.1 27.1) (end 138.1 31.5) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 155.350928 130.315928) (end 155.85 130.815) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 151.332319 130.055999) (end 155.090999 130.055999) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 149.688318 131.7) (end 151.332319 130.055999) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 128.183 130.815) (end 129.068 131.7) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 155.090999 130.055999) (end 155.350928 130.315928) (width 0.25) (layer B.Cu) (net 87))
-  (via (at 132.6 131.7) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 87))
-  (segment (start 129.068 131.7) (end 132.6 131.7) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 132.6 131.7) (end 149.688318 131.7) (width 0.25) (layer B.Cu) (net 87))
-  (segment (start 135.39999 89.19999) (end 139.5 93.3) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 139.500001 105.807123) (end 140.6 106.907122) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 139.5 93.3) (end 139.500001 105.807123) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 140.6 123.7) (end 132.999999 131.300001) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 136.010499 33.589501) (end 136.010498 34.18238) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 135.399989 68.313907) (end 135.39999 89.19999) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 140.6 106.907122) (end 140.6 123.7) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 136.010498 67.703398) (end 135.399989 68.313907) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 132.999999 131.300001) (end 132.6 131.7) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 136.010498 34.18238) (end 136.010498 67.703398) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 138.1 31.5) (end 136.010499 33.589501) (width 0.25) (layer F.Cu) (net 87))
-  (segment (start 138.346878 20.940024) (end 138.947918 21.541064) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 39.062823 31.430055) (end 49.69888 20.793998) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 20.617499 40.329501) (end 31.670499 40.329501) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 17.5 43.447) (end 20.617499 40.329501) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 31.670499 40.329501) (end 33.3 38.7) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 49.69888 20.793998) (end 138.200853 20.793999) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 33.3 36.4) (end 38.269945 31.430055) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 138.200853 20.793999) (end 138.346878 20.940024) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 33.3 38.7) (end 33.3 36.4) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 38.269945 31.430055) (end 39.062823 31.430055) (width 0.25) (layer B.Cu) (net 93))
-  (segment (start 16.484001 60.031001) (end 17.5 61.047) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 14.9 58.447) (end 16.484001 60.031001) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 17.5 43.447) (end 14.9 46.047) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 14.9 46.047) (end 14.9 58.447) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 20.984001 77.631001) (end 22 78.647) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 19.5 76.147) (end 20.984001 77.631001) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 17.5 61.047) (end 19.5 63.047) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 19.5 63.047) (end 19.5 76.147) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 20.6 93.147) (end 18.515999 95.231001) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 18.515999 95.231001) (end 17.5 96.247) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 22 78.647) (end 20.6 80.047) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 20.6 80.047) (end 20.6 93.147) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 20.984001 112.831001) (end 22 113.847) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 18.6 110.447) (end 20.984001 112.831001) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 17.5 96.247) (end 18.6 97.347) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 18.6 97.347) (end 18.6 110.447) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 20.5 128.447) (end 18.515999 130.431001) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 22 113.847) (end 20.5 115.347) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 18.515999 130.431001) (end 17.5 131.447) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 20.5 115.347) (end 20.5 128.447) (width 0.25) (layer F.Cu) (net 93))
-  (segment (start 49.905991 21.294009) (end 137.569492 21.294009) (width 0.25) (layer B.Cu) (net 94))
-  (segment (start 39.562833 38.462833) (end 39.562833 31.637167) (width 0.25) (layer B.Cu) (net 94))
-  (segment (start 36.1 41.925666) (end 39.562833 38.462833) (width 0.25) (layer B.Cu) (net 94))
-  (segment (start 36.1 43.447) (end 36.1 41.925666) (width 0.25) (layer B.Cu) (net 94))
-  (segment (start 137.569492 21.294009) (end 138.382233 22.10675) (width 0.25) (layer B.Cu) (net 94))
-  (segment (start 39.562833 31.637167) (end 49.905991 21.294009) (width 0.25) (layer B.Cu) (net 94))
-  (segment (start 55.715999 42.431001) (end 54.7 43.447) (width 0.25) (layer B.Cu) (net 95))
-  (segment (start 58.2 33.1) (end 58.2 39.947) (width 0.25) (layer B.Cu) (net 95))
-  (segment (start 69.5 21.8) (end 58.2 33.1) (width 0.25) (layer B.Cu) (net 95))
-  (segment (start 58.2 39.947) (end 55.715999 42.431001) (width 0.25) (layer B.Cu) (net 95))
-  (segment (start 137.816548 22.672435) (end 136.944113 21.8) (width 0.25) (layer B.Cu) (net 95))
-  (segment (start 136.944113 21.8) (end 69.5 21.8) (width 0.25) (layer B.Cu) (net 95))
-  (segment (start 76.7 32) (end 76.7 40.047) (width 0.25) (layer B.Cu) (net 96))
-  (segment (start 76.7 40.047) (end 73.3 43.447) (width 0.25) (layer B.Cu) (net 96))
-  (segment (start 86.4 22.3) (end 76.7 32) (width 0.25) (layer B.Cu) (net 96))
-  (segment (start 137.250862 23.23812) (end 136.312742 22.3) (width 0.25) (layer B.Cu) (net 96))
-  (segment (start 136.312742 22.3) (end 86.4 22.3) (width 0.25) (layer B.Cu) (net 96))
-  (segment (start 127.5 35.4) (end 133.291064 29.608936) (width 0.25) (layer B.Cu) (net 97))
-  (segment (start 97.5 35.4) (end 127.5 35.4) (width 0.25) (layer B.Cu) (net 97))
-  (segment (start 94.5735 38.3265) (end 97.5 35.4) (width 0.25) (layer B.Cu) (net 97))
-  (segment (start 133.291064 29.608936) (end 133.291064 29.602082) (width 0.25) (layer B.Cu) (net 97))
-  (segment (start 91.9 43.447) (end 94.5735 40.7735) (width 0.25) (layer B.Cu) (net 97))
-  (segment (start 94.5735 40.7735) (end 94.5735 38.3265) (width 0.25) (layer B.Cu) (net 97))
-  (segment (start 113.4 39.6) (end 110.5 42.5) (width 0.25) (layer B.Cu) (net 98))
-  (segment (start 110.5 42.5) (end 110.5 43.447) (width 0.25) (layer B.Cu) (net 98))
-  (segment (start 113.4 37.6) (end 113.4 39.6) (width 0.25) (layer B.Cu) (net 98))
-  (segment (start 114.9 36.1) (end 113.4 37.6) (width 0.25) (layer B.Cu) (net 98))
-  (segment (start 133.85675 30.167767) (end 127.924517 36.1) (width 0.25) (layer B.Cu) (net 98))
-  (segment (start 127.924517 36.1) (end 114.9 36.1) (width 0.25) (layer B.Cu) (net 98))
-  (segment (start 134.422435 30.733452) (end 132.3 32.855887) (width 0.25) (layer B.Cu) (net 99))
-  (segment (start 132.3 40.247) (end 129.1 43.447) (width 0.25) (layer B.Cu) (net 99))
-  (segment (start 132.3 32.855887) (end 132.3 40.247) (width 0.25) (layer B.Cu) (net 99))
-  (segment (start 147.7 42.01016) (end 147.7 43.447) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 147.48984 41.8) (end 147.7 42.01016) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 145.3 39.9) (end 147.2 41.8) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 133 33.287258) (end 133 35.4) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 134.98812 31.299138) (end 133 33.287258) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 133 35.4) (end 133.754023 36.154023) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 147.2 41.8) (end 147.48984 41.8) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 133.754023 36.154023) (end 135.145977 36.154023) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 135.145977 36.154023) (end 138.891954 39.9) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 138.891954 39.9) (end 145.3 39.9) (width 0.25) (layer B.Cu) (net 100))
-  (segment (start 163.187167 38.812833) (end 166.3 41.925666) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 161.8 36.3) (end 163.187167 37.687167) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 150.1 36.3) (end 161.8 36.3) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 143.795363 34.095988) (end 144.007497 34.095988) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 144.007497 34.095988) (end 144.008753 34.097244) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 166.3 42.01016) (end 166.3 43.447) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 163.187167 37.687167) (end 163.187167 38.812833) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 143.699375 34) (end 143.795363 34.095988) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 144.008753 34.097244) (end 147.897244 34.097244) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 166.3 41.925666) (end 166.3 42.01016) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 143.487258 34) (end 143.699375 34) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 147.897244 34.097244) (end 150.1 36.3) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 143.049138 33.56188) (end 143.487258 34) (width 0.25) (layer B.Cu) (net 101))
-  (segment (start 184.9 42.01016) (end 184.9 43.447) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 150.399989 35.799989) (end 180.39999 35.79999) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 181.55 36.95) (end 181.55 38.65) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 184.9 42) (end 184.9 42.01016) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 143.614823 32.996194) (end 144.215863 33.597234) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 144.215863 33.597234) (end 148.197234 33.597234) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 148.197234 33.597234) (end 150.399989 35.799989) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 180.39999 35.79999) (end 181.55 36.95) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 181.55 38.65) (end 184.9 42) (width 0.25) (layer B.Cu) (net 102))
-  (segment (start 144.781549 33.031549) (end 197.131549 33.031549) (width 0.25) (layer B.Cu) (net 103))
-  (segment (start 144.180509 32.430509) (end 144.781549 33.031549) (width 0.25) (layer B.Cu) (net 103))
-  (segment (start 197.131549 33.031549) (end 200.4 36.3) (width 0.25) (layer B.Cu) (net 103))
-  (segment (start 200.4 36.3) (end 200.4 38.9) (width 0.25) (layer B.Cu) (net 103))
-  (segment (start 203.5 42) (end 203.5 43.447) (width 0.25) (layer B.Cu) (net 103))
-  (segment (start 200.4 38.9) (end 203.5 42) (width 0.25) (layer B.Cu) (net 103))
-  (segment (start 222.1 42.01016) (end 222.1 43.447) (width 0.25) (layer B.Cu) (net 104))
-  (segment (start 218.4 38.31016) (end 222.1 42.01016) (width 0.25) (layer B.Cu) (net 104))
-  (segment (start 218.4 36.2) (end 218.4 38.31016) (width 0.25) (layer B.Cu) (net 104))
-  (segment (start 214.665863 32.465863) (end 218.4 36.2) (width 0.25) (layer B.Cu) (net 104))
-  (segment (start 144.746194 31.864823) (end 145.347234 32.465863) (width 0.25) (layer B.Cu) (net 104))
-  (segment (start 145.347234 32.465863) (end 214.665863 32.465863) (width 0.25) (layer B.Cu) (net 104))
-  (segment (start 145.91292 31.900178) (end 234.000178 31.900178) (width 0.25) (layer B.Cu) (net 105))
-  (segment (start 145.31188 31.299138) (end 145.91292 31.900178) (width 0.25) (layer B.Cu) (net 105))
-  (segment (start 234.000178 31.900178) (end 237.8 35.7) (width 0.25) (layer B.Cu) (net 105))
-  (segment (start 237.8 35.7) (end 237.8 39.1) (width 0.25) (layer B.Cu) (net 105))
-  (segment (start 240.7 42) (end 240.7 43.447) (width 0.25) (layer B.Cu) (net 105))
-  (segment (start 237.8 39.1) (end 240.7 42) (width 0.25) (layer B.Cu) (net 105))
-  (segment (start 146.544113 31.4) (end 255.1 31.4) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 145.877565 30.733452) (end 146.544113 31.4) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 255.1 31.4) (end 260.9 37.2) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 260.9 37.2) (end 260.9 39.2) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 263.8 42.01016) (end 263.8 43.447) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 260.98984 39.2) (end 263.8 42.01016) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 260.9 39.2) (end 260.98984 39.2) (width 0.25) (layer B.Cu) (net 106))
-  (segment (start 189.925 129.015) (end 188.9 130.04) (width 0.25) (layer B.Cu) (net 109))
-  (segment (start 197.933 129.015) (end 189.925 129.015) (width 0.25) (layer B.Cu) (net 109))
-  (segment (start 208.575 128.965) (end 207.5 130.04) (width 0.25) (layer B.Cu) (net 110))
-  (segment (start 216.6 128.965) (end 208.575 128.965) (width 0.25) (layer B.Cu) (net 110))
-  (segment (start 227.175 128.965) (end 226.1 130.04) (width 0.25) (layer B.Cu) (net 111))
-  (segment (start 235.2 128.965) (end 227.175 128.965) (width 0.25) (layer B.Cu) (net 111))
-  (segment (start 245.675 129.065) (end 244.7 130.04) (width 0.25) (layer B.Cu) (net 112))
-  (segment (start 253.8 129.065) (end 245.675 129.065) (width 0.25) (layer B.Cu) (net 112))
+  (segment (start 125.075 24.825) (end 125.45 24.45) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 122.9 24.825) (end 125.075 24.825) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 136.119491 24.319491) (end 136.119491 24.369491) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 125.45 23.3) (end 126.15 22.6) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 125.45 24.45) (end 125.45 23.3) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 134.4 22.6) (end 136.119491 24.319491) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 126.15 22.6) (end 134.4 22.6) (width 0.25) (layer B.Cu) (net 78))
+  (segment (start 135.975 35.525) (end 135.975 36.1) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 136.084137 33.597234) (end 136.084137 35.415863) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 136.084137 35.415863) (end 135.975 35.525) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 136.685177 32.996194) (end 136.084137 33.597234) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 125.275 26.575) (end 125.45 26.75) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 122.9 26.575) (end 125.275 26.575) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 128.825 24.925) (end 128.35 24.45) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 170.65 26.47) (end 170.65 23.93) (width 0.25) (layer F.Cu) (net 79))
+  (segment (start 174.07 23.93) (end 175.8 22.2) (width 0.25) (layer F.Cu) (net 79))
+  (segment (start 170.65 23.93) (end 174.07 23.93) (width 0.25) (layer F.Cu) (net 79))
+  (segment (start 152.95 24.2) (end 157.05 24.2) (width 0.25) (layer F.Cu) (net 79))
+  (segment (start 146.575 21.4) (end 148.075 22.9) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 146.575 21.1) (end 146.575 21.4) (width 0.25) (layer B.Cu) (net 79))
+  (via (at 133 23.5) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 79))
+  (segment (start 130.7 24.125) (end 131.325 23.5) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 131.325 23.5) (end 133 23.5) (width 0.25) (layer B.Cu) (net 79))
+  (via (at 136.3 26.6) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 79))
+  (segment (start 133 23.5) (end 136.1 26.6) (width 0.25) (layer F.Cu) (net 79))
+  (segment (start 136.1 26.6) (end 136.3 26.6) (width 0.25) (layer F.Cu) (net 79))
+  (segment (start 136.087258 26.6) (end 134.98812 25.500862) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 136.3 26.6) (end 136.087258 26.6) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 130.375 24.45) (end 130.7 24.125) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 128.35 24.45) (end 130.375 24.45) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 119.375 30.1) (end 122.9 26.575) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 114.5 30.1) (end 119.375 30.1) (width 0.25) (layer B.Cu) (net 79))
+  (segment (start 135.518451 34.806549) (end 134.724072 35.600928) (width 0.25) (layer B.Cu) (net 80))
+  (segment (start 135.518451 33.031549) (end 135.518451 34.806549) (width 0.25) (layer B.Cu) (net 80))
+  (segment (start 134.724072 35.600928) (end 134.225 36.1) (width 0.25) (layer B.Cu) (net 80))
+  (segment (start 136.119491 32.430509) (end 135.518451 33.031549) (width 0.25) (layer B.Cu) (net 80))
+  (segment (start 144.600928 44.314072) (end 145.1 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 144.076999 44.838001) (end 144.600928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 139.361999 44.838001) (end 144.076999 44.838001) (width 0.25) (layer B.Cu) (net 81))
+  (via (at 139.361999 44.838001) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 81))
+  (segment (start 51.600928 44.314072) (end 52.1 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 49.715 46.2) (end 51.600928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 35.26 46.2) (end 49.715 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 33.5 43.815) (end 33.5 44.44) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 33.5 44.44) (end 35.26 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 33.000928 44.314072) (end 33.5 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 31.115 46.2) (end 33.000928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 15 43.815) (end 17.385 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 17.385 46.2) (end 31.115 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 70.250928 44.314072) (end 70.75 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 68.365 46.2) (end 70.250928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 52.1 43.815) (end 54.485 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 54.485 46.2) (end 68.365 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 88.900928 44.314072) (end 89.4 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 87.015 46.2) (end 88.900928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 70.75 43.815) (end 73.135 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 73.135 46.2) (end 87.015 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 107.500928 44.314072) (end 108 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 89.4 43.815) (end 91.785 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 105.615 46.2) (end 107.500928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 91.785 46.2) (end 105.615 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 126.000928 44.314072) (end 126.5 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 124.115 46.2) (end 126.000928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 108 43.815) (end 110.385 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 110.385 46.2) (end 124.115 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 138 46.2) (end 139.361999 44.838001) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 128.26 46.2) (end 138 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 126.5 43.815) (end 126.5 44.44) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 126.5 44.44) (end 128.26 46.2) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 163.200928 44.314072) (end 163.7 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 161.515 46) (end 163.200928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 147.86 46) (end 161.515 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 145.1 43.815) (end 145.675 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 145.675 43.815) (end 147.86 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 181.900928 44.314072) (end 182.4 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 180.215 46) (end 181.900928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 163.7 43.815) (end 165.885 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 165.885 46) (end 180.215 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 198.815 46) (end 200.500928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 183.96 46) (end 198.815 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 200.500928 44.314072) (end 201 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 182.4 43.815) (end 182.4 44.44) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 182.4 44.44) (end 183.96 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 217.315 46) (end 219.000928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 202.56 46) (end 217.315 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 219.000928 44.314072) (end 219.5 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 201 43.815) (end 201 44.44) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 201 44.44) (end 202.56 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 237.600928 44.314072) (end 238.1 43.815) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 235.915 46) (end 237.600928 44.314072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 219.5 43.815) (end 221.685 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 221.685 46) (end 235.915 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 258.915 46) (end 260.700928 44.214072) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 260.700928 44.214072) (end 261.2 43.715) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 239.66 46) (end 258.915 46) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 238.1 43.815) (end 238.1 44.44) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 238.1 44.44) (end 239.66 46) (width 0.25) (layer B.Cu) (net 81))
+  (via (at 144.499998 27.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 81))
+  (segment (start 145.31188 25.500862) (end 144.499998 26.312744) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 144.499998 29.714242) (end 144.499998 28.465685) (width 0.25) (layer F.Cu) (net 81))
+  (segment (start 144.499998 28.465685) (end 144.499998 27.9) (width 0.25) (layer F.Cu) (net 81))
+  (segment (start 139.361999 34.852241) (end 144.499998 29.714242) (width 0.25) (layer F.Cu) (net 81))
+  (segment (start 139.361999 44.838001) (end 139.361999 34.852241) (width 0.25) (layer F.Cu) (net 81))
+  (segment (start 144.499998 27.334315) (end 144.499998 27.9) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 144.499998 26.312744) (end 144.499998 27.334315) (width 0.25) (layer B.Cu) (net 81))
+  (segment (start 144.700928 61.914072) (end 145.2 61.415) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 143.715 62.9) (end 144.700928 61.914072) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 126.6 61.415) (end 128.085 62.9) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 138.8 62.9) (end 143.715 62.9) (width 0.25) (layer B.Cu) (net 82))
+  (via (at 138.8 62.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 82))
+  (segment (start 128.085 62.9) (end 138.8 62.9) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 31.415 63.6) (end 33.100928 61.914072) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 33.100928 61.914072) (end 33.6 61.415) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 15 61.415) (end 15 62.04) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 16.56 63.6) (end 31.415 63.6) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 15 62.04) (end 16.56 63.6) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 138.400001 62.500001) (end 138.400001 35.107119) (width 0.25) (layer F.Cu) (net 82))
+  (segment (start 143.7 29.80712) (end 143.7 27.565685) (width 0.25) (layer F.Cu) (net 82))
+  (segment (start 143.7 27.565685) (end 143.7 27) (width 0.25) (layer F.Cu) (net 82))
+  (segment (start 143.7 25.981371) (end 143.7 26.434315) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 143.7 26.434315) (end 143.7 27) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 144.746194 24.935177) (end 143.7 25.981371) (width 0.25) (layer B.Cu) (net 82))
+  (segment (start 138.400001 35.107119) (end 143.7 29.80712) (width 0.25) (layer F.Cu) (net 82))
+  (via (at 143.7 27) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 82))
+  (segment (start 138.8 62.9) (end 138.400001 62.500001) (width 0.25) (layer F.Cu) (net 82))
+  (segment (start 153.600928 79.514072) (end 154.1 79.015) (width 0.25) (layer B.Cu) (net 83))
+  (segment (start 152.315 80.8) (end 153.600928 79.514072) (width 0.25) (layer B.Cu) (net 83))
+  (segment (start 135.5 79.015) (end 137.285 80.8) (width 0.25) (layer B.Cu) (net 83))
+  (via (at 142.1 80.8) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 83))
+  (segment (start 137.285 80.8) (end 142.1 80.8) (width 0.25) (layer B.Cu) (net 83))
+  (segment (start 142.1 80.8) (end 152.315 80.8) (width 0.25) (layer B.Cu) (net 83))
+  (segment (start 142.1 80.8) (end 142.1 72.08576) (width 0.25) (layer F.Cu) (net 83))
+  (segment (start 137.7 67.68576) (end 137.7 35.1) (width 0.25) (layer F.Cu) (net 83))
+  (segment (start 142.1 72.08576) (end 137.7 67.68576) (width 0.25) (layer F.Cu) (net 83))
+  (segment (start 142.8 28.465685) (end 142.8 27.9) (width 0.25) (layer F.Cu) (net 83))
+  (segment (start 142.8 25.75) (end 142.8 27.334315) (width 0.25) (layer B.Cu) (net 83))
+  (via (at 142.8 27.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 83))
+  (segment (start 144.180509 24.369491) (end 142.8 25.75) (width 0.25) (layer B.Cu) (net 83))
+  (segment (start 142.8 27.334315) (end 142.8 27.9) (width 0.25) (layer B.Cu) (net 83))
+  (segment (start 137.7 35.1) (end 142.8 30) (width 0.25) (layer F.Cu) (net 83))
+  (segment (start 142.8 30) (end 142.8 28.465685) (width 0.25) (layer F.Cu) (net 83))
+  (segment (start 141.615659 96.615) (end 144.525 96.615) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 126.5 96.615) (end 128.259001 94.855999) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 144.525 96.615) (end 145.1 96.615) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 128.259001 94.855999) (end 139.856658 94.855999) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 140.900329 95.899671) (end 141.615659 96.615) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 139.856658 94.855999) (end 140.900329 95.899671) (width 0.25) (layer B.Cu) (net 84))
+  (via (at 140.900329 95.899671) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 84))
+  (via (at 141.899996 26.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 84))
+  (segment (start 143.614823 23.803806) (end 141.899996 25.518633) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 141.899996 25.518633) (end 141.899996 26.334315) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 141.899996 26.334315) (end 141.899996 26.9) (width 0.25) (layer B.Cu) (net 84))
+  (segment (start 140.900329 95.899671) (end 140.900329 71.593209) (width 0.25) (layer F.Cu) (net 84))
+  (segment (start 140.900329 71.593209) (end 137.1 67.79288) (width 0.25) (layer F.Cu) (net 84))
+  (segment (start 137.1 34.914244) (end 141.899996 30.114248) (width 0.25) (layer F.Cu) (net 84))
+  (segment (start 141.899996 27.465685) (end 141.899996 26.9) (width 0.25) (layer F.Cu) (net 84))
+  (segment (start 141.899996 30.114248) (end 141.899996 27.465685) (width 0.25) (layer F.Cu) (net 84))
+  (segment (start 137.1 67.79288) (end 137.1 34.914244) (width 0.25) (layer F.Cu) (net 84))
+  (segment (start 39.726318 114.125) (end 41.975 114.125) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 41.975 114.125) (end 42.55 114.125) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 38.057317 112.455999) (end 39.726318 114.125) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 21.142001 112.455999) (end 38.057317 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 19.433 114.165) (end 21.142001 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 60.608 114.215) (end 61.183 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 58.416318 114.215) (end 60.608 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 56.657317 112.455999) (end 58.416318 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 44.219001 112.455999) (end 56.657317 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 42.55 114.125) (end 44.219001 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 79.208 114.215) (end 79.783 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 77.016318 114.215) (end 79.208 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 75.257317 112.455999) (end 77.016318 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 62.942001 112.455999) (end 75.257317 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 61.183 114.215) (end 62.942001 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 97.758 114.215) (end 98.333 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 95.616318 114.215) (end 97.758 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 93.857317 112.455999) (end 95.616318 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 81.542001 112.455999) (end 93.857317 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 79.783 114.215) (end 81.542001 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 116.358 114.215) (end 116.933 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 114.216318 114.215) (end 116.358 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 112.457317 112.455999) (end 114.216318 114.215) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 100.092001 112.455999) (end 112.457317 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 98.333 114.215) (end 100.092001 112.455999) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 153.633928 114.664072) (end 154.133 114.165) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 153.059999 115.238001) (end 153.633928 114.664072) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 135.533 114.215) (end 136.556001 115.238001) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 142.038001 115.238001) (end 153.059999 115.238001) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 136.556001 115.238001) (end 142.038001 115.238001) (width 0.25) (layer B.Cu) (net 85))
+  (via (at 142.038001 115.238001) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 85))
+  (via (at 141.000002 27.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 85))
+  (segment (start 143.049138 23.23812) (end 141.000002 25.287256) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 141.000002 25.287256) (end 141.000002 27.334315) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 141.000002 27.334315) (end 141.000002 27.9) (width 0.25) (layer B.Cu) (net 85))
+  (segment (start 141.000002 28.465685) (end 141.000002 27.9) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 135.9 68.521018) (end 136.510509 67.910509) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 136.510509 67.910509) (end 136.510509 34.796613) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 140.00001 93.092888) (end 135.9 88.992878) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 135.9 88.992878) (end 135.9 68.521018) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 142.038001 107.638001) (end 140.000011 105.600011) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 136.510509 34.796613) (end 141.000002 30.30712) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 140.000011 105.600011) (end 140.00001 93.092888) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 142.038001 115.238001) (end 142.038001 107.638001) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 141.000002 30.30712) (end 141.000002 28.465685) (width 0.25) (layer F.Cu) (net 85))
+  (segment (start 44.200928 130.315928) (end 44.7 130.815) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 36.9 131.9) (end 39.2 129.6) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 21.583 130.815) (end 22.668 131.9) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 43.485 129.6) (end 44.200928 130.315928) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 39.2 129.6) (end 43.485 129.6) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 22.668 131.9) (end 36.9 131.9) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 72.050928 130.275928) (end 72.55 130.775) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 67.5 129.7) (end 71.475 129.7) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 65.3 131.9) (end 67.5 129.7) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 71.475 129.7) (end 72.050928 130.275928) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 44.7 130.815) (end 45.785 131.9) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 45.785 131.9) (end 65.3 131.9) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 122.9 129.2) (end 126.568 129.2) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 120.3 131.8) (end 122.9 129.2) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 126.568 129.2) (end 127.683928 130.315928) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 100.4 130.815) (end 101.385 131.8) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 127.683928 130.315928) (end 128.183 130.815) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 101.385 131.8) (end 120.3 131.8) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 99.900928 130.315928) (end 100.4 130.815) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 99.185 129.6) (end 99.900928 130.315928) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 95.7 129.6) (end 99.185 129.6) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 93.7 131.6) (end 95.7 129.6) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 72.55 130.775) (end 73.375 131.6) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 73.375 131.6) (end 93.7 131.6) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 155.350928 130.315928) (end 155.85 130.815) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 151.332319 130.055999) (end 155.090999 130.055999) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 149.688318 131.7) (end 151.332319 130.055999) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 128.183 130.815) (end 129.068 131.7) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 155.090999 130.055999) (end 155.350928 130.315928) (width 0.25) (layer B.Cu) (net 86))
+  (via (at 132.6 131.7) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 86))
+  (segment (start 129.068 131.7) (end 132.6 131.7) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 132.6 131.7) (end 149.688318 131.7) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 142.483452 22.672435) (end 140.1 25.055887) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 140.1 26.334315) (end 140.1 26.9) (width 0.25) (layer B.Cu) (net 86))
+  (segment (start 140.1 25.055887) (end 140.1 26.334315) (width 0.25) (layer B.Cu) (net 86))
+  (via (at 140.1 26.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 86))
+  (segment (start 139.700001 27.299999) (end 140.1 26.9) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 135.39999 89.19999) (end 135.399989 68.313907) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 140.6 106.907122) (end 139.500001 105.807123) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 136.010498 67.703398) (end 136.010498 34.589502) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 140.6 123.7) (end 140.6 106.907122) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 139.700001 30.899999) (end 139.700001 27.299999) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 139.500001 105.807123) (end 139.5 93.3) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 139.5 93.3) (end 135.39999 89.19999) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 135.399989 68.313907) (end 136.010498 67.703398) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 132.6 131.7) (end 140.6 123.7) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 136.010498 34.589502) (end 139.700001 30.899999) (width 0.25) (layer F.Cu) (net 86))
+  (segment (start 133.25571 26.031193) (end 133.85675 26.632233) (width 0.25) (layer B.Cu) (net 87))
+  (segment (start 132.866783 26.031193) (end 133.25571 26.031193) (width 0.25) (layer B.Cu) (net 87))
+  (segment (start 130.575 29.3) (end 130.575 28.322976) (width 0.25) (layer B.Cu) (net 87))
+  (segment (start 130.575 28.322976) (end 132.866783 26.031193) (width 0.25) (layer B.Cu) (net 87))
+  (via (at 137.7 26.8) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 87))
+  (segment (start 152.95 25.8) (end 138.7 25.8) (width 0.25) (layer F.Cu) (net 87))
+  (segment (start 138.7 25.8) (end 137.7 26.8) (width 0.25) (layer F.Cu) (net 87))
+  (segment (start 135.024517 27.8) (end 133.85675 26.632233) (width 0.25) (layer B.Cu) (net 87))
+  (segment (start 137.7 26.8) (end 136.7 27.8) (width 0.25) (layer B.Cu) (net 87))
+  (segment (start 136.7 27.8) (end 135.024517 27.8) (width 0.25) (layer B.Cu) (net 87))
+  (segment (start 152.95 25.8) (end 157.05 25.8) (width 0.25) (layer F.Cu) (net 87))
+  (segment (start 114.5 26.1) (end 116.825 26.1) (width 0.25) (layer B.Cu) (net 88))
+  (segment (start 114.6 28) (end 114.5 28.1) (width 0.25) (layer B.Cu) (net 89))
+  (segment (start 116.825 28) (end 114.6 28) (width 0.25) (layer B.Cu) (net 89))
+  (segment (start 16.484001 60.031001) (end 17.5 61.047) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 14.9 58.447) (end 16.484001 60.031001) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 17.5 43.447) (end 14.9 46.047) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 14.9 46.047) (end 14.9 58.447) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.984001 77.631001) (end 22 78.647) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 19.5 76.147) (end 20.984001 77.631001) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 17.5 61.047) (end 19.5 63.047) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 19.5 63.047) (end 19.5 76.147) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.6 93.147) (end 18.515999 95.231001) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 18.515999 95.231001) (end 17.5 96.247) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 22 78.647) (end 20.6 80.047) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.6 80.047) (end 20.6 93.147) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.984001 112.831001) (end 22 113.847) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 18.6 110.447) (end 20.984001 112.831001) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 17.5 96.247) (end 18.6 97.347) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 18.6 97.347) (end 18.6 110.447) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.5 128.447) (end 18.515999 130.431001) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 22 113.847) (end 20.5 115.347) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 18.515999 130.431001) (end 17.5 131.447) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.5 115.347) (end 20.5 128.447) (width 0.25) (layer F.Cu) (net 90))
+  (segment (start 20.617499 40.329501) (end 18.515999 42.431001) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 31.670499 40.329501) (end 20.617499 40.329501) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 138.006813 20.599959) (end 49.892919 20.599959) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 18.515999 42.431001) (end 17.5 43.447) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 49.892919 20.599959) (end 39.062823 31.430055) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 138.947918 21.541064) (end 138.006813 20.599959) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 39.062823 31.430055) (end 38.269945 31.430055) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 38.269945 31.430055) (end 33.3 36.4) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 33.3 38.7) (end 31.670499 40.329501) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 33.3 36.4) (end 33.3 38.7) (width 0.25) (layer B.Cu) (net 90))
+  (segment (start 40.699989 30.500011) (end 39.562833 31.637167) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 87.307153 21.099969) (end 77.907111 30.500011) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 37.115999 42.431001) (end 36.1 43.447) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 39.562833 39.984167) (end 37.115999 42.431001) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 77.907111 30.500011) (end 40.699989 30.500011) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 39.562833 31.637167) (end 39.562833 39.984167) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 137.375452 21.099969) (end 87.307153 21.099969) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 138.382233 22.10675) (end 137.375452 21.099969) (width 0.25) (layer B.Cu) (net 91))
+  (segment (start 136.744092 21.599979) (end 87.514265 21.599979) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 78.114222 31.000022) (end 61.014222 31.000022) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 87.514265 21.599979) (end 78.114222 31.000022) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 137.816548 22.672435) (end 136.744092 21.599979) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 61.014222 31.000022) (end 58.2 33.814244) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 58.2 33.814244) (end 58.2 39.947) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 55.715999 42.431001) (end 54.7 43.447) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 58.2 39.947) (end 55.715999 42.431001) (width 0.25) (layer B.Cu) (net 92))
+  (segment (start 87.721377 22.099989) (end 76.7 33.121366) (width 0.25) (layer B.Cu) (net 93))
+  (segment (start 136.112731 22.099989) (end 87.721377 22.099989) (width 0.25) (layer B.Cu) (net 93))
+  (segment (start 76.7 40.047) (end 74.315999 42.431001) (width 0.25) (layer B.Cu) (net 93))
+  (segment (start 74.315999 42.431001) (end 73.3 43.447) (width 0.25) (layer B.Cu) (net 93))
+  (segment (start 137.250862 23.23812) (end 136.112731 22.099989) (width 0.25) (layer B.Cu) (net 93))
+  (segment (start 76.7 33.121366) (end 76.7 40.047) (width 0.25) (layer B.Cu) (net 93))
+  (segment (start 127.5 35.4) (end 133.291064 29.608936) (width 0.25) (layer B.Cu) (net 94))
+  (segment (start 97.5 35.4) (end 127.5 35.4) (width 0.25) (layer B.Cu) (net 94))
+  (segment (start 94.5735 38.3265) (end 97.5 35.4) (width 0.25) (layer B.Cu) (net 94))
+  (segment (start 133.291064 29.608936) (end 133.291064 29.602082) (width 0.25) (layer B.Cu) (net 94))
+  (segment (start 91.9 43.447) (end 94.5735 40.7735) (width 0.25) (layer B.Cu) (net 94))
+  (segment (start 94.5735 40.7735) (end 94.5735 38.3265) (width 0.25) (layer B.Cu) (net 94))
+  (segment (start 113.4 39.6) (end 110.5 42.5) (width 0.25) (layer B.Cu) (net 95))
+  (segment (start 110.5 42.5) (end 110.5 43.447) (width 0.25) (layer B.Cu) (net 95))
+  (segment (start 113.4 37.6) (end 113.4 39.6) (width 0.25) (layer B.Cu) (net 95))
+  (segment (start 114.9 36.1) (end 113.4 37.6) (width 0.25) (layer B.Cu) (net 95))
+  (segment (start 133.85675 30.167767) (end 127.924517 36.1) (width 0.25) (layer B.Cu) (net 95))
+  (segment (start 127.924517 36.1) (end 114.9 36.1) (width 0.25) (layer B.Cu) (net 95))
+  (segment (start 130.115999 42.431001) (end 129.1 43.447) (width 0.25) (layer B.Cu) (net 96))
+  (segment (start 134.422435 30.733452) (end 131.499989 33.655898) (width 0.25) (layer B.Cu) (net 96))
+  (segment (start 131.499989 33.655898) (end 131.499989 41.047011) (width 0.25) (layer B.Cu) (net 96))
+  (segment (start 131.499989 41.047011) (end 130.115999 42.431001) (width 0.25) (layer B.Cu) (net 96))
+  (segment (start 147.7 42.01016) (end 147.7 43.447) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 145.58984 39.9) (end 147.7 42.01016) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 134.98812 31.299138) (end 132 34.287258) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 139.2 42) (end 141.3 39.9) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 132 34.287258) (end 132 39.1) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 132 39.1) (end 134.9 42) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 134.9 42) (end 139.2 42) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 141.3 39.9) (end 145.58984 39.9) (width 0.25) (layer B.Cu) (net 97))
+  (segment (start 163.187167 38.812833) (end 166.3 41.925666) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 161.8 36.3) (end 163.187167 37.687167) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 150.1 36.3) (end 161.8 36.3) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 143.795363 34.095988) (end 144.007497 34.095988) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 144.007497 34.095988) (end 144.008753 34.097244) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 166.3 42.01016) (end 166.3 43.447) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 163.187167 37.687167) (end 163.187167 38.812833) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 143.699375 34) (end 143.795363 34.095988) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 144.008753 34.097244) (end 147.897244 34.097244) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 166.3 41.925666) (end 166.3 42.01016) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 143.487258 34) (end 143.699375 34) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 147.897244 34.097244) (end 150.1 36.3) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 143.049138 33.56188) (end 143.487258 34) (width 0.25) (layer B.Cu) (net 98))
+  (segment (start 184.9 42.01016) (end 184.9 43.447) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 150.399989 35.799989) (end 180.39999 35.79999) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 181.55 36.95) (end 181.55 38.65) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 184.9 42) (end 184.9 42.01016) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 143.614823 32.996194) (end 144.215863 33.597234) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 144.215863 33.597234) (end 148.197234 33.597234) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 148.197234 33.597234) (end 150.399989 35.799989) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 180.39999 35.79999) (end 181.55 36.95) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 181.55 38.65) (end 184.9 42) (width 0.25) (layer B.Cu) (net 99))
+  (segment (start 144.781549 33.031549) (end 197.131549 33.031549) (width 0.25) (layer B.Cu) (net 100))
+  (segment (start 144.180509 32.430509) (end 144.781549 33.031549) (width 0.25) (layer B.Cu) (net 100))
+  (segment (start 197.131549 33.031549) (end 200.4 36.3) (width 0.25) (layer B.Cu) (net 100))
+  (segment (start 200.4 36.3) (end 200.4 38.9) (width 0.25) (layer B.Cu) (net 100))
+  (segment (start 203.5 42) (end 203.5 43.447) (width 0.25) (layer B.Cu) (net 100))
+  (segment (start 200.4 38.9) (end 203.5 42) (width 0.25) (layer B.Cu) (net 100))
+  (segment (start 222.1 42.01016) (end 222.1 43.447) (width 0.25) (layer B.Cu) (net 101))
+  (segment (start 218.4 38.31016) (end 222.1 42.01016) (width 0.25) (layer B.Cu) (net 101))
+  (segment (start 218.4 36.2) (end 218.4 38.31016) (width 0.25) (layer B.Cu) (net 101))
+  (segment (start 214.665863 32.465863) (end 218.4 36.2) (width 0.25) (layer B.Cu) (net 101))
+  (segment (start 144.746194 31.864823) (end 145.347234 32.465863) (width 0.25) (layer B.Cu) (net 101))
+  (segment (start 145.347234 32.465863) (end 214.665863 32.465863) (width 0.25) (layer B.Cu) (net 101))
+  (segment (start 145.91292 31.900178) (end 234.000178 31.900178) (width 0.25) (layer B.Cu) (net 102))
+  (segment (start 145.31188 31.299138) (end 145.91292 31.900178) (width 0.25) (layer B.Cu) (net 102))
+  (segment (start 234.000178 31.900178) (end 237.8 35.7) (width 0.25) (layer B.Cu) (net 102))
+  (segment (start 237.8 35.7) (end 237.8 39.1) (width 0.25) (layer B.Cu) (net 102))
+  (segment (start 240.7 42) (end 240.7 43.447) (width 0.25) (layer B.Cu) (net 102))
+  (segment (start 237.8 39.1) (end 240.7 42) (width 0.25) (layer B.Cu) (net 102))
+  (segment (start 263.8 42) (end 263.8 43.447) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 255.000168 31.400168) (end 260.8 37.2) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 146.478605 25.465508) (end 149.51251 25.465508) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 260.8 39) (end 263.8 42) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 260.8 37.2) (end 260.8 39) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 152.1 28.052998) (end 152.1 29.4) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 145.877565 26.066548) (end 146.478605 25.465508) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 149.51251 25.465508) (end 152.1 28.052998) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 152.1 29.4) (end 154.100168 31.400168) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 154.100168 31.400168) (end 255.000168 31.400168) (width 0.25) (layer B.Cu) (net 103))
+  (segment (start 134.952766 24.334137) (end 135.553806 24.935177) (width 0.25) (layer B.Cu) (net 104))
+  (segment (start 132.240863 24.334137) (end 134.952766 24.334137) (width 0.25) (layer B.Cu) (net 104))
+  (segment (start 130.7 25.875) (end 132.240863 24.334137) (width 0.25) (layer B.Cu) (net 104))
+  (segment (start 189.925 129.015) (end 188.9 130.04) (width 0.25) (layer B.Cu) (net 105))
+  (segment (start 197.933 129.015) (end 189.925 129.015) (width 0.25) (layer B.Cu) (net 105))
+  (segment (start 208.575 128.965) (end 207.5 130.04) (width 0.25) (layer B.Cu) (net 106))
+  (segment (start 216.6 128.965) (end 208.575 128.965) (width 0.25) (layer B.Cu) (net 106))
+  (segment (start 227.175 128.965) (end 226.1 130.04) (width 0.25) (layer B.Cu) (net 107))
+  (segment (start 235.2 128.965) (end 227.175 128.965) (width 0.25) (layer B.Cu) (net 107))
+  (segment (start 245.675 129.065) (end 244.7 130.04) (width 0.25) (layer B.Cu) (net 108))
+  (segment (start 253.8 129.065) (end 245.675 129.065) (width 0.25) (layer B.Cu) (net 108))
+  (segment (start 146.325 22.6) (end 144.825 21.1) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 146.325 22.9) (end 146.325 22.6) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 142.924517 21.1) (end 141.917767 22.10675) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 144.825 21.1) (end 142.924517 21.1) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 133.821395 25.465508) (end 134.422435 26.066548) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 132.659492 25.465508) (end 133.821395 25.465508) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 128.825 29.3) (end 132.659492 25.465508) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 144.268146 38.175) (end 144.6 38.175) (width 0.25) (layer B.Cu) (net 110))
+  (segment (start 141.352082 35.258936) (end 144.268146 38.175) (width 0.25) (layer B.Cu) (net 110))
+  (via (at 101.8 67.2) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 111))
+  (segment (start 101.775 64.7) (end 101.775 67.175) (width 0.25) (layer B.Cu) (net 111))
+  (segment (start 101.775 67.175) (end 101.8 67.2) (width 0.25) (layer B.Cu) (net 111))
+  (segment (start 101.8 68.675) (end 101.775 68.7) (width 0.25) (layer F.Cu) (net 111))
+  (segment (start 101.8 67.2) (end 101.8 68.675) (width 0.25) (layer F.Cu) (net 111))
+  (via (at 138 24.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 112))
+  (segment (start 137.781371 24.9) (end 136.685177 23.803806) (width 0.25) (layer B.Cu) (net 112))
+  (segment (start 138 24.9) (end 137.781371 24.9) (width 0.25) (layer B.Cu) (net 112))
+  (via (at 150.500002 24.2) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 112))
+  (segment (start 175.8 24.2) (end 174.845406 24.2) (width 0.25) (layer B.Cu) (net 112))
+  (segment (start 174.845406 24.2) (end 150.500002 24.2) (width 0.25) (layer B.Cu) (net 112))
+  (segment (start 138 24.9) (end 138.7 24.2) (width 0.25) (layer F.Cu) (net 112))
+  (segment (start 138.7 24.2) (end 149.934317 24.2) (width 0.25) (layer F.Cu) (net 112))
+  (segment (start 149.934317 24.2) (end 150.500002 24.2) (width 0.25) (layer F.Cu) (net 112))
+  (segment (start 175.8 26.2) (end 156.275 26.2) (width 0.25) (layer B.Cu) (net 113))
+  (via (at 153.5 28.975) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 113))
+  (segment (start 156.275 26.2) (end 153.5 28.975) (width 0.25) (layer B.Cu) (net 113))
+  (via (at 140.6 36.7) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 113))
+  (segment (start 140.388982 36.7) (end 138.947918 35.258936) (width 0.25) (layer B.Cu) (net 113))
+  (segment (start 140.6 36.7) (end 140.388982 36.7) (width 0.25) (layer B.Cu) (net 113))
+  (segment (start 140.6 34.6) (end 140.6 36.7) (width 0.25) (layer F.Cu) (net 113))
+  (segment (start 145.1 30.1) (end 140.6 34.6) (width 0.25) (layer F.Cu) (net 113))
+  (segment (start 153.5 28.975) (end 145.725 28.975) (width 0.25) (layer F.Cu) (net 113))
+  (segment (start 145.1 29.6) (end 145.1 30.1) (width 0.25) (layer F.Cu) (net 113))
+  (segment (start 145.725 28.975) (end 145.1 29.6) (width 0.25) (layer F.Cu) (net 113))
+  (segment (start 144.6 36.244113) (end 144.6 36.425) (width 0.25) (layer B.Cu) (net 116))
+  (segment (start 142.483452 34.127565) (end 144.6 36.244113) (width 0.25) (layer B.Cu) (net 116))
+  (via (at 149.9 27) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 117))
+  (segment (start 148.931193 26.031193) (end 149.9 27) (width 0.25) (layer B.Cu) (net 117))
+  (segment (start 146.44325 26.632233) (end 147.04429 26.031193) (width 0.25) (layer B.Cu) (net 117))
+  (segment (start 147.04429 26.031193) (end 148.931193 26.031193) (width 0.25) (layer B.Cu) (net 117))
+  (segment (start 161.55 23.93) (end 161.75 23.93) (width 0.25) (layer F.Cu) (net 117))
+  (segment (start 157.88 27.6) (end 161.55 23.93) (width 0.25) (layer F.Cu) (net 117))
+  (segment (start 149.9 27) (end 150.5 27.6) (width 0.25) (layer F.Cu) (net 117))
+  (segment (start 150.5 27.6) (end 157.88 27.6) (width 0.25) (layer F.Cu) (net 117))
+  (via (at 149.4 28.2) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 118))
+  (segment (start 147.008936 27.197918) (end 148.397918 27.197918) (width 0.25) (layer B.Cu) (net 118))
+  (segment (start 149.000001 27.800001) (end 149.4 28.2) (width 0.25) (layer B.Cu) (net 118))
+  (segment (start 148.397918 27.197918) (end 149.000001 27.800001) (width 0.25) (layer B.Cu) (net 118))
+  (segment (start 149.965685 28.2) (end 149.4 28.2) (width 0.25) (layer F.Cu) (net 118))
+  (segment (start 158 28.2) (end 149.965685 28.2) (width 0.25) (layer F.Cu) (net 118))
+  (segment (start 161.75 26.47) (end 159.73 26.47) (width 0.25) (layer F.Cu) (net 118))
+  (segment (start 159.73 26.47) (end 158 28.2) (width 0.25) (layer F.Cu) (net 118))
+  (via (at 200.7 26.7) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 119))
+  (segment (start 202.5 26.45) (end 200.95 26.45) (width 0.25) (layer F.Cu) (net 119))
+  (segment (start 200.95 26.45) (end 200.7 26.7) (width 0.25) (layer F.Cu) (net 119))
+  (via (at 155.2 30.4) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 119))
+  (segment (start 200.7 26.7) (end 197 30.4) (width 0.25) (layer B.Cu) (net 119))
+  (segment (start 197 30.4) (end 155.2 30.4) (width 0.25) (layer B.Cu) (net 119))
+  (via (at 149.2 31) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 119))
+  (segment (start 149.8 30.4) (end 149.599999 30.600001) (width 0.25) (layer F.Cu) (net 119))
+  (segment (start 146.478605 31.334492) (end 148.865508 31.334492) (width 0.25) (layer B.Cu) (net 119))
+  (segment (start 149.599999 30.600001) (end 149.2 31) (width 0.25) (layer F.Cu) (net 119))
+  (segment (start 148.865508 31.334492) (end 149.2 31) (width 0.25) (layer B.Cu) (net 119))
+  (segment (start 145.877565 30.733452) (end 146.478605 31.334492) (width 0.25) (layer B.Cu) (net 119))
+  (segment (start 155.2 30.4) (end 149.8 30.4) (width 0.25) (layer F.Cu) (net 119))
+  (segment (start 137.875 33.185229) (end 137.875 30.7) (width 0.2) (layer B.Cu) (net 120))
+  (segment (start 137.875 30.7) (end 137.575 30.4) (width 0.2) (layer B.Cu) (net 120))
+  (via (at 137.575 30.4) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 120))
+  (segment (start 137.250862 33.56188) (end 137.498349 33.56188) (width 0.2) (layer B.Cu) (net 120))
+  (segment (start 137.498349 33.56188) (end 137.875 33.185229) (width 0.2) (layer B.Cu) (net 120))
+  (segment (start 137.575 29.986397) (end 134.813603 27.225) (width 0.2) (layer F.Cu) (net 120))
+  (segment (start 134.813603 27.225) (end 120.7 27.225) (width 0.2) (layer F.Cu) (net 120))
+  (segment (start 137.575 30.4) (end 137.575 29.986397) (width 0.2) (layer F.Cu) (net 120))
+  (via (at 120.4 27.525) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 120))
+  (segment (start 120.7 27.225) (end 120.4 27.525) (width 0.2) (layer F.Cu) (net 120))
+  (segment (start 119.05 27.525) (end 118.575 28) (width 0.25) (layer B.Cu) (net 120))
+  (segment (start 120.4 27.525) (end 119.05 27.525) (width 0.25) (layer B.Cu) (net 120))
+  (segment (start 138.325 33.080368) (end 138.325 30.7) (width 0.2) (layer B.Cu) (net 121))
+  (segment (start 138.325656 33.081024) (end 138.325 33.080368) (width 0.2) (layer B.Cu) (net 121))
+  (segment (start 138.325656 33.370984) (end 138.325656 33.081024) (width 0.2) (layer B.Cu) (net 121))
+  (segment (start 137.816548 34.127565) (end 137.816548 33.880092) (width 0.2) (layer B.Cu) (net 121))
+  (via (at 138.625 30.4) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 121))
+  (segment (start 137.816548 33.880092) (end 138.325656 33.370984) (width 0.2) (layer B.Cu) (net 121))
+  (segment (start 138.325 30.7) (end 138.625 30.4) (width 0.2) (layer B.Cu) (net 121))
+  (segment (start 137.935001 29.649999) (end 137.874999 29.649999) (width 0.2) (layer F.Cu) (net 121))
+  (segment (start 138.325001 30.039999) (end 137.935001 29.649999) (width 0.2) (layer F.Cu) (net 121))
+  (segment (start 138.325001 30.100001) (end 138.325001 30.039999) (width 0.2) (layer F.Cu) (net 121))
+  (segment (start 120.7 26.775) (end 120.4 26.475) (width 0.2) (layer F.Cu) (net 121))
+  (segment (start 138.625 30.4) (end 138.325001 30.100001) (width 0.2) (layer F.Cu) (net 121))
+  (via (at 120.4 26.475) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 121))
+  (segment (start 135 26.775) (end 120.7 26.775) (width 0.2) (layer F.Cu) (net 121))
+  (segment (start 137.874999 29.649999) (end 135 26.775) (width 0.2) (layer F.Cu) (net 121))
+  (segment (start 118.95 26.475) (end 118.575 26.1) (width 0.25) (layer B.Cu) (net 121))
+  (segment (start 120.4 26.475) (end 118.95 26.475) (width 0.25) (layer B.Cu) (net 121))
+  (via (at 100.8 63.1) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 122))
+  (segment (start 100.025 64.7) (end 100.025 63.875) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 100.025 63.875) (end 100.8 63.1) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 132.4 28.088982) (end 132.4 28.1) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 100.8 35.5) (end 103.130301 33.169699) (width 0.25) (layer F.Cu) (net 122))
+  (segment (start 127.330301 33.169699) (end 132.000001 28.499999) (width 0.25) (layer F.Cu) (net 122))
+  (segment (start 132.000001 28.499999) (end 132.4 28.1) (width 0.25) (layer F.Cu) (net 122))
+  (segment (start 103.130301 33.169699) (end 127.330301 33.169699) (width 0.25) (layer F.Cu) (net 122))
+  (segment (start 100.8 63.1) (end 100.8 35.5) (width 0.25) (layer F.Cu) (net 122))
+  (segment (start 133.291064 27.197918) (end 132.4 28.088982) (width 0.25) (layer B.Cu) (net 122))
+  (via (at 132.4 28.1) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 122))
 
 )
diff --git a/reform2-keyboard-pcb/reform2-keyboard.pro b/reform2-keyboard-pcb/reform2-keyboard.pro
@@ -1,4 +1,4 @@
-update=Tue 28 May 2019 07:16:44 PM CEST
+update=Wed 29 May 2019 09:57:39 PM CEST
 version=1
 last_client=kicad
 [cvpcb]
@@ -6,16 +6,6 @@ version=1
 NetIExt=net
 [general]
 version=1
-[schematic_editor]
-version=1
-PageLayoutDescrFile=
-PlotDirectoryName=/tmp/
-SubpartIdSeparator=0
-SubpartFirstId=65
-NetFmtName=
-SpiceAjustPassiveValues=0
-LabSize=60
-ERC_TestSimilarLabels=1
 [eeschema]
 version=1
 LibDir=
@@ -243,3 +233,13 @@ uViaDrill=0.1
 dPairWidth=0.2
 dPairGap=0.25
 dPairViaGap=0.25
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=/tmp/
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=
+SpiceAjustPassiveValues=0
+LabSize=60
+ERC_TestSimilarLabels=1
diff --git a/reform2-keyboard-pcb/reform2-keyboard.sch b/reform2-keyboard-pcb/reform2-keyboard.sch
@@ -6,8 +6,8 @@ $Descr A3 16535 11693
 encoding utf-8
 Sheet 1 2
 Title "Reform Keyboard"
-Date "2019-03-29"
-Rev "0.5"
+Date "2019-05-29"
+Rev "0.6"
 Comp "MNT Research GmbH"
 Comment1 "License: GPLv3+ https://www.gnu.org/licenses/gpl-3.0.en.html"
 Comment2 "Copyright 2017,2018,2019 Lukas F. Hartmann / mntmn"