diff --git a/analog.sch b/analog.sch
index 1404f81..ed67273 100644
--- a/analog.sch
+++ b/analog.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L JACK_TRS_6PINS AUDIO1
+L micro-hdmi-d:JACK_TRS_6PINS AUDIO1
 U 1 1 58D82C05
 P 2550 2350
 F 0 "AUDIO1" H 2550 2750 50  0000 C CNN
@@ -72,7 +30,7 @@ F 7 "490-SJ-43516-SMT-TR " H 2550 2350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR141
+L power:GND #PWR141
 U 1 1 58D9043A
 P 2950 2150
 F 0 "#PWR141" H 2950 1900 50  0001 C CNN
@@ -83,7 +41,7 @@ F 3 "" H 2950 2150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R17
+L ulx3s-rescue:R R17
 U 1 1 58D90455
 P 3750 2350
 F 0 "R17" V 3830 2350 50  0000 C CNN
@@ -94,7 +52,7 @@ F 3 "" H 3750 2350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R16
+L ulx3s-rescue:R R16
 U 1 1 58D904AE
 P 3750 2200
 F 0 "R16" V 3830 2200 50  0000 C CNN
@@ -105,7 +63,7 @@ F 3 "" H 3750 2200 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R15
+L ulx3s-rescue:R R15
 U 1 1 58D904D5
 P 3750 2050
 F 0 "R15" V 3830 2050 50  0000 C CNN
@@ -116,7 +74,7 @@ F 3 "" H 3750 2050 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R14
+L ulx3s-rescue:R R14
 U 1 1 58D90500
 P 3750 1900
 F 0 "R14" V 3830 1900 50  0000 C CNN
@@ -148,7 +106,7 @@ AUDIO_L2
 Text GLabel 3900 2350 2    60   Input ~ 0
 AUDIO_L3
 $Comp
-L R R21
+L ulx3s-rescue:R R21
 U 1 1 58D907CA
 P 3750 3000
 F 0 "R21" V 3830 3000 50  0000 C CNN
@@ -159,7 +117,7 @@ F 3 "" H 3750 3000 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R20
+L ulx3s-rescue:R R20
 U 1 1 58D907D0
 P 3750 2850
 F 0 "R20" V 3830 2850 50  0000 C CNN
@@ -170,7 +128,7 @@ F 3 "" H 3750 2850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R19
+L ulx3s-rescue:R R19
 U 1 1 58D907D6
 P 3750 2700
 F 0 "R19" V 3830 2700 50  0000 C CNN
@@ -181,7 +139,7 @@ F 3 "" H 3750 2700 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R18
+L ulx3s-rescue:R R18
 U 1 1 58D907DC
 P 3750 2550
 F 0 "R18" V 3830 2550 50  0000 C CNN
@@ -219,7 +177,7 @@ AUDIO_L
 Text Label 3050 2550 0    60   ~ 0
 AUDIO_R
 $Comp
-L GND #PWR139
+L power:GND #PWR139
 U 1 1 595A57AD
 P 2800 5800
 F 0 "#PWR139" H 2800 5550 50  0001 C CNN
@@ -248,7 +206,7 @@ Wire Wire Line
 	3700 4700 3800 4700
 Connection ~ 3800 4700
 $Comp
-L GND #PWR145
+L power:GND #PWR145
 U 1 1 595A622F
 P 3950 4800
 F 0 "#PWR145" H 3950 4550 50  0001 C CNN
@@ -259,7 +217,7 @@ F 3 "" H 3950 4800 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L MAX11123 U8
+L max1112x:MAX11123 U8
 U 1 1 595A6DC1
 P 3300 4900
 F 0 "U8" H 3250 5800 50  0000 L CNN
@@ -302,7 +260,7 @@ GN17
 Text GLabel 2900 5200 0    60   Input ~ 0
 GP17
 $Comp
-L +3V3 #PWR138
+L power:+3V3 #PWR138
 U 1 1 595BB15C
 P 2800 4250
 F 0 "#PWR138" H 2800 4100 50  0001 C CNN
@@ -320,7 +278,7 @@ Wire Wire Line
 	2850 4350 2900 4350
 Connection ~ 2850 4250
 $Comp
-L +3V3 #PWR144
+L power:+3V3 #PWR144
 U 1 1 595BB1ED
 P 3850 4250
 F 0 "#PWR144" H 3850 4100 50  0001 C CNN
@@ -333,7 +291,7 @@ $EndComp
 Wire Wire Line
 	3700 4250 3850 4250
 $Comp
-L GND #PWR142
+L power:GND #PWR142
 U 1 1 595BB251
 P 3700 4350
 F 0 "#PWR142" H 3700 4100 50  0001 C CNN
@@ -344,7 +302,7 @@ F 3 "" H 3700 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR140
+L power:+3V3 #PWR140
 U 1 1 595BC3C0
 P 2900 5450
 F 0 "#PWR140" H 2900 5300 50  0001 C CNN
@@ -355,7 +313,7 @@ F 3 "" H 2900 5450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR143
+L power:GND #PWR143
 U 1 1 595BC42E
 P 3700 5200
 F 0 "#PWR143" H 3700 4950 50  0001 C CNN
@@ -378,7 +336,7 @@ ADC_SCLK
 Text Notes 4900 2300 0    60   ~ 0
 JACK pinout for SJ-43516-SMT-TR\nhttp://www.cui.com/product/resource/sj-4351x-smt-series.pdf\npin 1 - sleeve (GND)\npin 2 - tip (left channel)\npin 3 - ring1 (right channel)\npin 4 - ring2 (video)\npin 5 - tip switch\npin 6 - ring1 switch
 $Comp
-L R R60
+L ulx3s-rescue:R R60
 U 1 1 5A05BC31
 P 3750 1700
 F 0 "R60" V 3830 1700 50  0000 C CNN
@@ -389,7 +347,7 @@ F 3 "" H 3750 1700 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R59
+L ulx3s-rescue:R R59
 U 1 1 5A05BC37
 P 3750 1550
 F 0 "R59" V 3830 1550 50  0000 C CNN
@@ -400,7 +358,7 @@ F 3 "" H 3750 1550 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R58
+L ulx3s-rescue:R R58
 U 1 1 5A05BC3D
 P 3750 1400
 F 0 "R58" V 3830 1400 50  0000 C CNN
@@ -411,7 +369,7 @@ F 3 "" H 3750 1400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R57
+L ulx3s-rescue:R R57
 U 1 1 5A05BC43
 P 3750 1250
 F 0 "R57" V 3830 1250 50  0000 C CNN
diff --git a/blinkey.sch b/blinkey.sch
index b8ab3f5..02875b0 100644
--- a/blinkey.sch
+++ b/blinkey.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -71,7 +29,7 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR86
+L power:GND #PWR86
 U 1 1 58D66047
 P 4850 1250
 F 0 "#PWR86" H 4850 1000 50  0001 C CNN
@@ -82,7 +40,7 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR87
+L power:+3V3 #PWR87
 U 1 1 58D66055
 P 5350 1350
 F 0 "#PWR87" H 5350 1200 50  0001 C CNN
@@ -103,7 +61,7 @@ OLED_DC
 Text GLabel 4850 1850 2    60   Input ~ 0
 OLED_CS
 $Comp
-L CONN_02X01 BTN1
+L micro-hdmi-d:CONN_02X01 BTN1
 U 1 1 58D66056
 P 3100 2950
 F 0 "BTN1" H 3100 3050 50  0000 C CNN
@@ -131,7 +89,7 @@ Wire Wire Line
 Wire Wire Line
 	2750 3150 2850 3150
 $Comp
-L +3V3 #PWR81
+L power:+3V3 #PWR81
 U 1 1 58D6605C
 P 1750 2750
 F 0 "#PWR81" H 1750 2600 50  0001 C CNN
@@ -166,7 +124,7 @@ BTN_L
 Text GLabel 3450 3950 2    60   Input ~ 0
 BTN_R
 $Comp
-L R R7
+L ulx3s-rescue:R R7
 U 1 1 58D6605D
 P 1900 2750
 F 0 "R7" V 1980 2750 50  0000 C CNN
@@ -203,7 +161,7 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR83
+L power:GND #PWR83
 U 1 1 58D681C3
 P 4250 4100
 F 0 "#PWR83" H 4250 3850 50  0001 C CNN
@@ -249,7 +207,7 @@ LED7
 Text Label 2100 2750 0    60   ~ 0
 BTNPUL
 $Comp
-L SSD_13xx OLED1
+L ssd_13xx:SSD_13xx OLED1
 U 1 1 58E6D4AC
 P 4750 1550
 F 0 "OLED1" H 4750 1150 50  0000 C CNN
@@ -266,7 +224,7 @@ $EndComp
 Text GLabel 5650 4600 2    60   Input ~ 0
 FTDI_nSLEEP
 $Comp
-L LED_ALT D18
+L ulx3s-rescue:LED_ALT D18
 U 1 1 590B4E85
 P 5500 4600
 F 0 "D18" H 5500 4700 50  0000 C CNN
@@ -281,7 +239,7 @@ F 7 "859-LTST-C170KGKT " H 5500 4600 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R36
+L ulx3s-rescue:R R36
 U 1 1 590B507C
 P 4550 4600
 F 0 "R36" V 4630 4600 50  0000 C CNN
@@ -300,7 +258,7 @@ Wire Wire Line
 Wire Wire Line
 	4250 4600 4250 4950
 $Comp
-L GND #PWR84
+L power:GND #PWR84
 U 1 1 590B5B6D
 P 4250 4950
 F 0 "#PWR84" H 4250 4700 50  0001 C CNN
@@ -313,7 +271,7 @@ $EndComp
 Text GLabel 5650 5350 2    60   Input ~ 0
 FTDI_nTXLED
 $Comp
-L LED_ALT D19
+L ulx3s-rescue:LED_ALT D19
 U 1 1 590B86F4
 P 4550 5350
 F 0 "D19" H 4550 5450 50  0000 C CNN
@@ -328,7 +286,7 @@ F 7 "859-LTST-C170KRKT" H 4550 5350 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R37
+L ulx3s-rescue:R R37
 U 1 1 590B86FA
 P 5500 5350
 F 0 "R37" V 5580 5350 50  0000 C CNN
@@ -351,7 +309,7 @@ Wire Wire Line
 Wire Wire Line
 	2750 2750 2750 3150
 $Comp
-L +3V3 #PWR82
+L power:+3V3 #PWR82
 U 1 1 591B548D
 P 1750 4150
 F 0 "#PWR82" H 1750 4000 50  0001 C CNN
@@ -362,7 +320,7 @@ F 3 "" H 1750 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R39
+L ulx3s-rescue:R R39
 U 1 1 591B5493
 P 1900 4150
 F 0 "R39" V 1980 4150 50  0000 C CNN
@@ -381,7 +339,7 @@ Wire Wire Line
 Connection ~ 2750 2950
 Connection ~ 2750 3950
 $Comp
-L R R41
+L ulx3s-rescue:R R41
 U 1 1 591E1845
 P 5250 2550
 F 0 "R41" V 5330 2550 50  0000 C CNN
@@ -392,7 +350,7 @@ F 3 "" H 5250 2550 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R42
+L ulx3s-rescue:R R42
 U 1 1 591E199B
 P 5250 2750
 F 0 "R42" V 5330 2750 50  0000 C CNN
@@ -403,7 +361,7 @@ F 3 "" H 5250 2750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R43
+L ulx3s-rescue:R R43
 U 1 1 591E1A9D
 P 5250 2950
 F 0 "R43" V 5330 2950 50  0000 C CNN
@@ -414,7 +372,7 @@ F 3 "" H 5250 2950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R44
+L ulx3s-rescue:R R44
 U 1 1 591E1AA3
 P 5250 3150
 F 0 "R44" V 5330 3150 50  0000 C CNN
@@ -425,7 +383,7 @@ F 3 "" H 5250 3150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R45
+L ulx3s-rescue:R R45
 U 1 1 591E1BA5
 P 5250 3350
 F 0 "R45" V 5330 3350 50  0000 C CNN
@@ -436,7 +394,7 @@ F 3 "" H 5250 3350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R46
+L ulx3s-rescue:R R46
 U 1 1 591E1BAB
 P 5250 3550
 F 0 "R46" V 5330 3550 50  0000 C CNN
@@ -447,7 +405,7 @@ F 3 "" H 5250 3550 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R47
+L ulx3s-rescue:R R47
 U 1 1 591E1BB1
 P 5250 3750
 F 0 "R47" V 5330 3750 50  0000 C CNN
@@ -458,7 +416,7 @@ F 3 "" H 5250 3750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R48
+L ulx3s-rescue:R R48
 U 1 1 591E1BB7
 P 5250 3950
 F 0 "R48" V 5330 3950 50  0000 C CNN
@@ -489,7 +447,7 @@ LEDs connected to\nBANK7 on "gpio" sheet
 Text Notes 2100 4400 0    60   ~ 0
 BTN_R,U to BANK2,3 on "ram" sheet\nBTN_F1,F2,D,L to BANK8 on "flash" sheet
 $Comp
-L DIL8 SW1
+L micro-hdmi-d:DIL8 SW1
 U 1 1 595B94DC
 P 8150 3250
 F 0 "SW1" H 8150 3500 50  0000 C CNN
@@ -504,7 +462,7 @@ F 7 "774-2194MST " H 8150 3250 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R51
+L ulx3s-rescue:R R51
 U 1 1 595B9C2F
 P 7250 3400
 F 0 "R51" V 7330 3400 50  0000 C CNN
@@ -515,7 +473,7 @@ F 3 "" H 7250 3400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR90
+L power:+3V3 #PWR90
 U 1 1 595BA1C1
 P 7100 3400
 F 0 "#PWR90" H 7100 3250 50  0001 C CNN
@@ -553,7 +511,7 @@ To fix issues with FT231XS rev A,B,C\nShort-circuit D18 LED, but then\nboard can
 Text GLabel 5650 5850 2    60   Input ~ 0
 WIFI_GPIO5
 $Comp
-L LED_ALT D22
+L ulx3s-rescue:LED_ALT D22
 U 1 1 5A07AFD2
 P 5500 5850
 F 0 "D22" H 5500 5950 50  0000 C CNN
@@ -568,7 +526,7 @@ F 7 "859-LTST-C170TBKT" H 5500 5850 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R62
+L ulx3s-rescue:R R62
 U 1 1 5A07AFD8
 P 4550 5850
 F 0 "R62" V 4630 5850 50  0000 C CNN
@@ -587,7 +545,7 @@ Wire Wire Line
 Wire Wire Line
 	4250 5850 4250 6200
 $Comp
-L GND #PWR85
+L power:GND #PWR85
 U 1 1 5A07AFE2
 P 4250 6200
 F 0 "#PWR85" H 4250 5950 50  0001 C CNN
@@ -604,7 +562,7 @@ TXLED blinks when FPGA sends data to FTDI
 Text Notes 4850 2150 0    60   ~ 0
 OLED connected to\nBANK6 on "usb" sheet
 $Comp
-L LED_ALT D7
+L ulx3s-rescue:LED_ALT D7
 U 1 1 5A54C340
 P 4550 3950
 F 0 "D7" H 4550 4050 50  0000 C CNN
@@ -619,7 +577,7 @@ F 7 "859-LTST-C170TBKT" H 4550 3950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D6
+L ulx3s-rescue:LED_ALT D6
 U 1 1 5A54CAEF
 P 4550 3750
 F 0 "D6" H 4550 3850 50  0000 C CNN
@@ -634,7 +592,7 @@ F 7 "859-LTST-C170KGKT " H 4550 3750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D4
+L ulx3s-rescue:LED_ALT D4
 U 1 1 5A54CF8A
 P 4550 3350
 F 0 "D4" H 4550 3450 50  0000 C CNN
@@ -649,7 +607,7 @@ F 7 "859-LTST-C170KRKT" H 4550 3350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D5
+L ulx3s-rescue:LED_ALT D5
 U 1 1 5A54D428
 P 4550 3550
 F 0 "D5" H 4550 3650 50  0000 C CNN
@@ -664,7 +622,7 @@ F 7 "859-LTST-C170KFKT" H 4550 3550 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D3
+L ulx3s-rescue:LED_ALT D3
 U 1 1 5A54DCE5
 P 4550 3150
 F 0 "D3" H 4550 3250 50  0000 C CNN
@@ -679,7 +637,7 @@ F 7 "859-LTST-C170TBKT" H 4550 3150 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D2
+L ulx3s-rescue:LED_ALT D2
 U 1 1 5A54DCEF
 P 4550 2950
 F 0 "D2" H 4550 3050 50  0000 C CNN
@@ -694,7 +652,7 @@ F 7 "859-LTST-C170KGKT " H 4550 2950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D0
+L ulx3s-rescue:LED_ALT D0
 U 1 1 5A54DCF9
 P 4550 2550
 F 0 "D0" H 4550 2650 50  0000 C CNN
@@ -709,7 +667,7 @@ F 7 "859-LTST-C170KRKT" H 4550 2550 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D1
+L ulx3s-rescue:LED_ALT D1
 U 1 1 5A54DD03
 P 4550 2750
 F 0 "D1" H 4550 2850 50  0000 C CNN
@@ -724,7 +682,7 @@ F 7 "859-LTST-C170KFKT" H 4550 2750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X01 BTN2
+L micro-hdmi-d:CONN_02X01 BTN2
 U 1 1 5A556C72
 P 3100 3150
 F 0 "BTN2" H 3100 3250 50  0000 C CNN
@@ -738,7 +696,7 @@ F 6 "www.mouser.com" H 3100 3150 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X01 BTN3
+L micro-hdmi-d:CONN_02X01 BTN3
 U 1 1 5A556E0A
 P 3100 3350
 F 0 "BTN3" H 3100 3450 50  0000 C CNN
@@ -752,7 +710,7 @@ F 6 "www.mouser.com" H 3100 3350 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X01 BTN4
+L micro-hdmi-d:CONN_02X01 BTN4
 U 1 1 5A556FAC
 P 3100 3550
 F 0 "BTN4" H 3100 3650 50  0000 C CNN
@@ -766,7 +724,7 @@ F 6 "www.mouser.com" H 3100 3550 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X01 BTN5
+L micro-hdmi-d:CONN_02X01 BTN5
 U 1 1 5A557167
 P 3100 3750
 F 0 "BTN5" H 3100 3850 50  0000 C CNN
@@ -780,7 +738,7 @@ F 6 "www.mouser.com" H 3100 3750 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X01 BTN6
+L micro-hdmi-d:CONN_02X01 BTN6
 U 1 1 5A557341
 P 3100 3950
 F 0 "BTN6" H 3100 4050 50  0000 C CNN
@@ -808,7 +766,7 @@ LEFT
 Text Notes 2100 4000 0    60   ~ 0
 RIGHT
 $Comp
-L C C46
+L ulx3s-rescue:C C46
 U 1 1 5A881E8B
 P 6650 1350
 F 0 "C46" H 6675 1450 50  0000 L CNN
@@ -819,7 +777,7 @@ F 3 "" H 6650 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR88
+L power:+3V3 #PWR88
 U 1 1 5A881F6A
 P 6650 1200
 F 0 "#PWR88" H 6650 1050 50  0001 C CNN
@@ -830,7 +788,7 @@ F 3 "" H 6650 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR89
+L power:GND #PWR89
 U 1 1 5A882046
 P 6650 1500
 F 0 "#PWR89" H 6650 1250 50  0001 C CNN
diff --git a/flash.sch b/flash.sch
index ddfc38f..4cb92a7 100644
--- a/flash.sch
+++ b/flash.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L MB85RS16 U10
+L ulx3s-rescue:MB85RS16 U10
 U 1 1 58D913F5
 P 3650 4350
 F 0 "U10" H 3350 4600 50  0000 L CNN
@@ -72,7 +30,7 @@ F 7 "870-IS25LP032DJNLETR" H 3650 4350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR155
+L power:+3V3 #PWR155
 U 1 1 58D9149E
 P 3650 4050
 F 0 "#PWR155" H 3650 3900 50  0001 C CNN
@@ -83,7 +41,7 @@ F 3 "" H 3650 4050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR156
+L power:GND #PWR156
 U 1 1 58D914B4
 P 3650 4650
 F 0 "#PWR156" H 3650 4400 50  0001 C CNN
@@ -130,7 +88,7 @@ Wire Wire Line
 Text Label 5550 4300 0    60   ~ 0
 FLASH_nCS
 $Comp
-L R R27
+L ulx3s-rescue:R R27
 U 1 1 58EC0EFE
 P 3450 2350
 F 0 "R27" V 3530 2350 50  0000 C CNN
@@ -145,7 +103,7 @@ Wire Wire Line
 Text Label 3450 3150 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR153
+L power:+3V3 #PWR153
 U 1 1 58EC0F61
 P 3450 2200
 F 0 "#PWR153" H 3450 2050 50  0001 C CNN
@@ -156,7 +114,7 @@ F 3 "" H 3450 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R28
+L ulx3s-rescue:R R28
 U 1 1 58EC0F8E
 P 3650 2350
 F 0 "R28" V 3730 2350 50  0000 C CNN
@@ -171,7 +129,7 @@ Wire Wire Line
 Text Label 3650 3150 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR154
+L power:+3V3 #PWR154
 U 1 1 58EC0F96
 P 3650 2200
 F 0 "#PWR154" H 3650 2050 50  0001 C CNN
@@ -182,7 +140,7 @@ F 3 "" H 3650 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R29
+L ulx3s-rescue:R R29
 U 1 1 58EC15E1
 P 3850 2350
 F 0 "R29" V 3930 2350 50  0000 C CNN
@@ -197,7 +155,7 @@ Wire Wire Line
 Text Label 3850 3150 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR157
+L power:+3V3 #PWR157
 U 1 1 58EC15E9
 P 3850 2200
 F 0 "#PWR157" H 3850 2050 50  0001 C CNN
@@ -212,7 +170,7 @@ Wire Wire Line
 Text Label 5550 4700 0    60   ~ 0
 FLASH_SCK
 $Comp
-L R R30
+L ulx3s-rescue:R R30
 U 1 1 58EC1C84
 P 4050 2350
 F 0 "R30" V 4130 2350 50  0000 C CNN
@@ -227,7 +185,7 @@ Wire Wire Line
 Text Label 4050 3150 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR158
+L power:+3V3 #PWR158
 U 1 1 58EC1C8C
 P 4050 2200
 F 0 "#PWR158" H 4050 2050 50  0001 C CNN
@@ -240,7 +198,7 @@ $EndComp
 Text Notes 2600 1950 0    60   ~ 0
 pullups for Master SPI (MSPI) required by\nTN1260: lattice ECP5 sysCONFIG guide p.6
 $Comp
-L R R11
+L ulx3s-rescue:R R11
 U 1 1 58EC4E77
 P 3050 2350
 F 0 "R11" V 3130 2350 50  0000 C CNN
@@ -255,7 +213,7 @@ Wire Wire Line
 Text Label 3050 3150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR151
+L power:+3V3 #PWR151
 U 1 1 58EC4E7F
 P 3050 2200
 F 0 "#PWR151" H 3050 2050 50  0001 C CNN
@@ -266,7 +224,7 @@ F 3 "" H 3050 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R12
+L ulx3s-rescue:R R12
 U 1 1 58EC4E85
 P 3250 2350
 F 0 "R12" V 3330 2350 50  0000 C CNN
@@ -281,7 +239,7 @@ Wire Wire Line
 Text Label 3250 3150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR152
+L power:+3V3 #PWR152
 U 1 1 58EC4E8D
 P 3250 2200
 F 0 "#PWR152" H 3250 2050 50  0001 C CNN
@@ -292,7 +250,7 @@ F 3 "" H 3250 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR162
+L power:+3V3 #PWR162
 U 1 1 58EC58A7
 P 6300 5000
 F 0 "#PWR162" H 6300 4850 50  0001 C CNN
@@ -303,7 +261,7 @@ F 3 "" H 6300 5000 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR166
+L power:GND #PWR166
 U 1 1 58EC58CB
 P 6500 5100
 F 0 "#PWR166" H 6500 4850 50  0001 C CNN
@@ -314,7 +272,7 @@ F 3 "" H 6500 5100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR165
+L power:GND #PWR165
 U 1 1 58EC58EF
 P 6500 4900
 F 0 "#PWR165" H 6500 4650 50  0001 C CNN
@@ -337,7 +295,7 @@ FPGA_PROGRAMN
 Text Label 5550 4800 0    60   ~ 0
 FPGA_DONE
 $Comp
-L R R31
+L ulx3s-rescue:R R31
 U 1 1 58EC68DC
 P 5200 2350
 F 0 "R31" V 5280 2350 50  0000 C CNN
@@ -352,7 +310,7 @@ Wire Wire Line
 Text Label 5200 3300 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR159
+L power:+3V3 #PWR159
 U 1 1 58EC68E4
 P 5200 2200
 F 0 "#PWR159" H 5200 2050 50  0001 C CNN
@@ -363,7 +321,7 @@ F 3 "" H 5200 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R32
+L ulx3s-rescue:R R32
 U 1 1 58EC68EA
 P 5400 2350
 F 0 "R32" V 5480 2350 50  0000 C CNN
@@ -378,7 +336,7 @@ Wire Wire Line
 Text Label 5400 3300 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR160
+L power:+3V3 #PWR160
 U 1 1 58EC68F2
 P 5400 2200
 F 0 "#PWR160" H 5400 2050 50  0001 C CNN
@@ -393,7 +351,7 @@ Wire Wire Line
 Text Label 5550 4400 0    60   ~ 0
 FPGA_INITN
 $Comp
-L R R33
+L ulx3s-rescue:R R33
 U 1 1 58EC72FD
 P 5600 2350
 F 0 "R33" V 5680 2350 50  0000 C CNN
@@ -408,7 +366,7 @@ Wire Wire Line
 Text Label 5600 3300 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR161
+L power:+3V3 #PWR161
 U 1 1 58EC7305
 P 5600 2200
 F 0 "#PWR161" H 5600 2050 50  0001 C CNN
@@ -419,7 +377,7 @@ F 3 "" H 5600 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR164
+L power:+3V3 #PWR164
 U 1 1 58EC879F
 P 6500 4600
 F 0 "#PWR164" H 6500 4450 50  0001 C CNN
@@ -430,7 +388,7 @@ F 3 "" H 6500 4600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR163
+L power:+3V3 #PWR163
 U 1 1 58EC8800
 P 6500 4200
 F 0 "#PWR163" H 6500 4050 50  0001 C CNN
@@ -441,7 +399,7 @@ F 3 "" H 6500 4200 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR167
+L power:+3V3 #PWR167
 U 1 1 58EC882A
 P 8000 4200
 F 0 "#PWR167" H 8000 4050 50  0001 C CNN
@@ -462,7 +420,7 @@ BTN_L
 Text Notes 4700 1950 0    60   ~ 0
 pullups to allow entering USER mode\nTN1260: lattice ECP5 sysCONFIG guide p.6, p.8, p.13
 $Comp
-L R R55
+L ulx3s-rescue:R R55
 U 1 1 59DEB568
 P 5350 4800
 F 0 "R55" V 5430 4800 50  0000 C CNN
@@ -475,7 +433,7 @@ $EndComp
 Text GLabel 5200 4800 0    60   Input ~ 0
 PROG_DONE
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 7 1 5A07BEF6
 P 7250 4500
 AR Path="/5A07BEF6" Ref="U1"  Part="7" 
diff --git a/gpdi.sch b/gpdi.sch
index 653ac74..bba5132 100644
--- a/gpdi.sch
+++ b/gpdi.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L MICRO-HDMI-D GPDI1
+L micro-hdmi-d:MICRO-HDMI-D GPDI1
 U 1 1 58D69067
 P 8950 2950
 F 0 "GPDI1" H 8950 4000 50  0000 C CNN
@@ -72,7 +30,7 @@ F 7 "649-10029449-111RLF" H 8950 2950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR96
+L power:GND #PWR96
 U 1 1 58D69073
 P 8700 2000
 F 0 "#PWR96" H 8700 1750 50  0001 C CNN
@@ -83,7 +41,7 @@ F 3 "" H 8700 2000 60  0000 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR101
+L power:GND #PWR101
 U 1 1 58D69074
 P 8700 3700
 F 0 "#PWR101" H 8700 3450 50  0001 C CNN
@@ -94,7 +52,7 @@ F 3 "" H 8700 3700 60  0000 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR100
+L power:GND #PWR100
 U 1 1 58D69075
 P 8700 3100
 F 0 "#PWR100" H 8700 2850 50  0001 C CNN
@@ -105,7 +63,7 @@ F 3 "" H 8700 3100 60  0000 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR99
+L power:GND #PWR99
 U 1 1 58D69076
 P 8700 2800
 F 0 "#PWR99" H 8700 2550 50  0001 C CNN
@@ -116,7 +74,7 @@ F 3 "" H 8700 2800 60  0000 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR98
+L power:GND #PWR98
 U 1 1 58D69077
 P 8700 2500
 F 0 "#PWR98" H 8700 2250 50  0001 C CNN
@@ -127,7 +85,7 @@ F 3 "" H 8700 2500 60  0000 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR97
+L power:GND #PWR97
 U 1 1 58D69078
 P 8700 2200
 F 0 "#PWR97" H 8700 1950 50  0001 C CNN
@@ -138,7 +96,7 @@ F 3 "" H 8700 2200 60  0000 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L +5V #PWR95
+L power:+5V #PWR95
 U 1 1 58D6907F
 P 8450 3800
 F 0 "#PWR95" H 8450 3650 50  0001 C CNN
@@ -175,7 +133,7 @@ GPDI_SCL
 Text GLabel 8500 3600 0    60   Input ~ 0
 GPDI_SDA
 $Comp
-L DIL8 U11
+L micro-hdmi-d:DIL8 U11
 U 1 1 58D91A1E
 P 5300 5500
 F 0 "U11" H 5300 5750 50  0000 C CNN
@@ -190,7 +148,7 @@ F 7 "771-PCA9306D-T" H 5300 5500 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R24
+L ulx3s-rescue:R R24
 U 1 1 58D92136
 P 6100 5100
 F 0 "R24" V 6180 5100 50  0000 C CNN
@@ -201,7 +159,7 @@ F 3 "" H 6100 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R25
+L ulx3s-rescue:R R25
 U 1 1 58D921DD
 P 6300 5100
 F 0 "R25" V 6380 5100 50  0000 C CNN
@@ -212,7 +170,7 @@ F 3 "" H 6300 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R26
+L ulx3s-rescue:R R26
 U 1 1 58D92237
 P 6500 5100
 F 0 "R26" V 6580 5100 50  0000 C CNN
@@ -223,7 +181,7 @@ F 3 "" H 6500 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR94
+L power:+5V #PWR94
 U 1 1 58D92625
 P 6300 4700
 F 0 "#PWR94" H 6300 4550 50  0001 C CNN
@@ -234,7 +192,7 @@ F 3 "" H 6300 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C18
+L ulx3s-rescue:C C18
 U 1 1 58D92807
 P 6100 5900
 F 0 "C18" H 6125 6000 50  0000 L CNN
@@ -245,7 +203,7 @@ F 3 "" H 6100 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR93
+L power:GND #PWR93
 U 1 1 58D92889
 P 6100 6100
 F 0 "#PWR93" H 6100 5850 50  0001 C CNN
@@ -256,7 +214,7 @@ F 3 "" H 6100 6100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR91
+L power:+3V3 #PWR91
 U 1 1 58D92A40
 P 4700 5000
 F 0 "#PWR91" H 4700 4850 50  0001 C CNN
@@ -267,7 +225,7 @@ F 3 "" H 4700 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR92
+L power:GND #PWR92
 U 1 1 58D92B02
 P 4950 5350
 F 0 "#PWR92" H 4950 5100 50  0001 C CNN
@@ -278,7 +236,7 @@ F 3 "" H 4950 5350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R23
+L ulx3s-rescue:R R23
 U 1 1 58D92CF9
 P 4400 5300
 F 0 "R23" V 4480 5300 50  0000 C CNN
@@ -289,7 +247,7 @@ F 3 "" H 4400 5300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R22
+L ulx3s-rescue:R R22
 U 1 1 58D92D93
 P 4250 5300
 F 0 "R22" V 4330 5300 50  0000 C CNN
@@ -453,7 +411,7 @@ Connection ~ 6100 5450
 Wire Wire Line
 	6100 4850 6500 4850
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 2 1 5A07A906
 P 3600 2900
 AR Path="/5A07A906" Ref="U1"  Part="2" 
@@ -468,7 +426,7 @@ F 5 "www.mouser.com" H 3600 2900 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R61
+L ulx3s-rescue:R R61
 U 1 1 5A0777ED
 P 1600 2300
 F 0 "R61" V 1680 2300 50  0000 C CNN
@@ -499,7 +457,7 @@ USB_FPGA_D+
 Text GLabel 4350 2800 2    60   Input ~ 0
 USB_FPGA_D-
 $Comp
-L C C36
+L ulx3s-rescue:C C36
 U 1 1 5A878883
 P 7250 3400
 F 0 "C36" V 7300 3500 50  0000 L CNN
@@ -510,7 +468,7 @@ F 3 "" H 7250 3400 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C37
+L ulx3s-rescue:C C37
 U 1 1 5A878B40
 P 7550 3900
 F 0 "C37" V 7600 3950 50  0000 L CNN
@@ -521,7 +479,7 @@ F 3 "" H 7550 3900 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C45
+L ulx3s-rescue:C C45
 U 1 1 5A87EC41
 P 7250 3000
 F 0 "C45" V 7300 3050 50  0000 L CNN
@@ -532,7 +490,7 @@ F 3 "" H 7250 3000 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C41
+L ulx3s-rescue:C C41
 U 1 1 5A87EC93
 P 7550 3200
 F 0 "C41" V 7600 3250 50  0000 L CNN
@@ -543,7 +501,7 @@ F 3 "" H 7550 3200 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C40
+L ulx3s-rescue:C C40
 U 1 1 5A87EEE5
 P 7550 2900
 F 0 "C40" V 7600 2950 50  0000 L CNN
@@ -554,7 +512,7 @@ F 3 "" H 7550 2900 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C44
+L ulx3s-rescue:C C44
 U 1 1 5A87EF45
 P 7250 2700
 F 0 "C44" V 7300 2750 50  0000 L CNN
@@ -571,7 +529,7 @@ Wire Wire Line
 Wire Wire Line
 	7400 3200 6950 3200
 $Comp
-L C C39
+L ulx3s-rescue:C C39
 U 1 1 5A87F247
 P 7550 2600
 F 0 "C39" V 7600 2650 50  0000 L CNN
@@ -582,7 +540,7 @@ F 3 "" H 7550 2600 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C43
+L ulx3s-rescue:C C43
 U 1 1 5A87F2A7
 P 7250 2400
 F 0 "C43" V 7300 2450 50  0000 L CNN
@@ -597,7 +555,7 @@ Wire Wire Line
 Wire Wire Line
 	7400 2600 6950 2600
 $Comp
-L C C42
+L ulx3s-rescue:C C42
 U 1 1 5A87F538
 P 7250 2100
 F 0 "C42" V 7300 2150 50  0000 L CNN
@@ -608,7 +566,7 @@ F 3 "" H 7250 2100 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C38
+L ulx3s-rescue:C C38
 U 1 1 5A87F5AA
 P 7550 2300
 F 0 "C38" V 7600 2350 50  0000 L CNN
diff --git a/gpio.sch b/gpio.sch
index c7024fa..94166ba 100644
--- a/gpio.sch
+++ b/gpio.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR16
+L power:GND #PWR16
 U 1 1 56AC4825
 P 7800 3550
 F 0 "#PWR16" H 7800 3300 50  0001 C CNN
@@ -68,7 +26,7 @@ F 3 "" H 7800 3550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR17
+L power:GND #PWR17
 U 1 1 56AC482D
 P 9000 3550
 F 0 "#PWR17" H 9000 3300 50  0001 C CNN
@@ -79,7 +37,7 @@ F 3 "" H 9000 3550 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L D_Schottky_Small D51
+L ulx3s-rescue:D_Schottky_Small D51
 U 1 1 56AC483B
 P 7450 5350
 F 0 "D51" H 7400 5430 50  0000 L CNN
@@ -95,7 +53,7 @@ $EndComp
 Text Label 7900 5350 0    60   ~ 0
 IN5V
 $Comp
-L D_Schottky_Small D52
+L ulx3s-rescue:D_Schottky_Small D52
 U 1 1 56AC4846
 P 9400 5350
 F 0 "D52" H 9350 5430 50  0000 L CNN
@@ -111,7 +69,7 @@ $EndComp
 Text Label 8700 5350 0    60   ~ 0
 OUT5V
 $Comp
-L +5V #PWR11
+L power:+5V #PWR11
 U 1 1 56AC484F
 P 7350 5350
 F 0 "#PWR11" H 7350 5200 50  0001 C CNN
@@ -122,7 +80,7 @@ F 3 "" H 7350 5350 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR20
+L power:+3V3 #PWR20
 U 1 1 58D5FBBC
 P 9150 3450
 F 0 "#PWR20" H 9150 3300 50  0001 C CNN
@@ -133,7 +91,7 @@ F 3 "" H 9150 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR13
+L power:+3V3 #PWR13
 U 1 1 58D5FBF3
 P 7650 3450
 F 0 "#PWR13" H 7650 3300 50  0001 C CNN
@@ -144,7 +102,7 @@ F 3 "" H 7650 3450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_02X20 J2
+L micro-hdmi-d:CONN_02X20 J2
 U 1 1 58E6B7F6
 P 8400 4400
 F 0 "J2" H 8400 5450 50  0000 C CNN
@@ -156,7 +114,7 @@ F 4 "Do not install" H 8400 4400 60  0001 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X20 J1
+L micro-hdmi-d:CONN_02X20 J1
 U 1 1 58E6B835
 P 1850 4450
 F 0 "J1" H 1850 5500 50  0000 C CNN
@@ -168,7 +126,7 @@ F 4 "Do not install" H 1850 4450 60  0001 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR14
+L power:GND #PWR14
 U 1 1 58E6D572
 P 7750 4450
 F 0 "#PWR14" H 7750 4200 50  0001 C CNN
@@ -179,7 +137,7 @@ F 3 "" H 7750 4450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR12
+L power:+3V3 #PWR12
 U 1 1 58E6D578
 P 7600 4350
 F 0 "#PWR12" H 7600 4200 50  0001 C CNN
@@ -190,7 +148,7 @@ F 3 "" H 7600 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR18
+L power:GND #PWR18
 U 1 1 58E6D59D
 P 9050 4450
 F 0 "#PWR18" H 9050 4200 50  0001 C CNN
@@ -201,7 +159,7 @@ F 3 "" H 9050 4450 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR21
+L power:+3V3 #PWR21
 U 1 1 58E6D5A3
 P 9200 4350
 F 0 "#PWR21" H 9200 4200 50  0001 C CNN
@@ -212,7 +170,7 @@ F 3 "" H 9200 4350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR15
+L power:GND #PWR15
 U 1 1 58E6E4EC
 P 7750 5250
 F 0 "#PWR15" H 7750 5000 50  0001 C CNN
@@ -223,7 +181,7 @@ F 3 "" H 7750 5250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR19
+L power:GND #PWR19
 U 1 1 58E6E536
 P 9050 5250
 F 0 "#PWR19" H 9050 5000 50  0001 C CNN
@@ -262,7 +220,7 @@ Wire Wire Line
 Wire Wire Line
 	7750 5250 8150 5250
 $Comp
-L GND #PWR5
+L power:GND #PWR5
 U 1 1 58E710CC
 P 1200 3600
 F 0 "#PWR5" H 1200 3350 50  0001 C CNN
@@ -273,7 +231,7 @@ F 3 "" H 1200 3600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR6
+L power:GND #PWR6
 U 1 1 58E710E6
 P 1200 4500
 F 0 "#PWR6" H 1200 4250 50  0001 C CNN
@@ -284,7 +242,7 @@ F 3 "" H 1200 4500 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR7
+L power:GND #PWR7
 U 1 1 58E710F2
 P 1200 5300
 F 0 "#PWR7" H 1200 5050 50  0001 C CNN
@@ -305,7 +263,7 @@ Wire Wire Line
 Wire Wire Line
 	1200 5300 1600 5300
 $Comp
-L GND #PWR10
+L power:GND #PWR10
 U 1 1 58E7117D
 P 2550 3600
 F 0 "#PWR10" H 2550 3350 50  0001 C CNN
@@ -316,7 +274,7 @@ F 3 "" H 2550 3600 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR8
+L power:GND #PWR8
 U 1 1 58E71197
 P 2500 4500
 F 0 "#PWR8" H 2500 4250 50  0001 C CNN
@@ -327,7 +285,7 @@ F 3 "" H 2500 4500 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR9
+L power:GND #PWR9
 U 1 1 58E711A3
 P 2500 5300
 F 0 "#PWR9" H 2500 5050 50  0001 C CNN
@@ -348,7 +306,7 @@ Wire Wire Line
 Wire Wire Line
 	2100 5300 2500 5300
 $Comp
-L +5V #PWR22
+L power:+5V #PWR22
 U 1 1 58E75077
 P 9500 5350
 F 0 "#PWR22" H 9500 5200 50  0001 C CNN
@@ -581,7 +539,7 @@ AUDIO_V1
 Text GLabel 4150 5250 0    60   Input ~ 0
 AUDIO_V0
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 6 1 5A0783C9
 P 4900 4750
 AR Path="/5A0783C9" Ref="U1"  Part="6" 
@@ -597,7 +555,7 @@ F 6 "842-LFE5U45F6BG381C" H 4900 4750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 1 1 5A0737C6
 P 4950 2500
 AR Path="/5A0737C6" Ref="U1"  Part="1" 
diff --git a/power.sch b/power.sch
index fd8dc1e..c5d8913 100644
--- a/power.sch
+++ b/power.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR45
+L power:GND #PWR45
 U 1 1 58D54769
 P 4950 2700
 F 0 "#PWR45" H 4950 2450 50  0001 C CNN
@@ -68,7 +26,7 @@ F 3 "" H 4950 2700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR72
+L power:GND #PWR72
 U 1 1 58D58A0B
 P 8050 3900
 F 0 "#PWR72" H 8050 3650 50  0001 C CNN
@@ -79,7 +37,7 @@ F 3 "" H 8050 3900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR65
+L power:+5V #PWR65
 U 1 1 58D58F93
 P 7400 3250
 F 0 "#PWR65" H 7400 3100 50  0001 C CNN
@@ -90,7 +48,7 @@ F 3 "" H 7400 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR66
+L power:GND #PWR66
 U 1 1 58D5989A
 P 7400 3900
 F 0 "#PWR66" H 7400 3650 50  0001 C CNN
@@ -101,9 +59,11 @@ F 3 "" H 7400 3900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C1
+L ulx3s-rescue:C C1
 U 1 1 58D598B7
 P 7400 3700
+AR Path="/58D598B7" Ref="C1"  Part="1" 
+AR Path="/58D51CAD/58D598B7" Ref="C1"  Part="1" 
 F 0 "C1" H 7425 3800 50  0000 L CNN
 F 1 "22uF" H 7425 3600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7438 3550 50  0001 C CNN
@@ -112,9 +72,11 @@ F 3 "" H 7400 3700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C2
+L ulx3s-rescue:C C2
 U 1 1 58D5A146
 P 9100 3300
+AR Path="/58D5A146" Ref="C2"  Part="1" 
+AR Path="/58D51CAD/58D5A146" Ref="C2"  Part="1" 
 F 0 "C2" H 9125 3400 50  0000 L CNN
 F 1 "470pF" H 9125 3200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9138 3150 50  0001 C CNN
@@ -123,9 +85,11 @@ F 3 "" H 9100 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R RA1
+L ulx3s-rescue:R RA1
 U 1 1 58D5A193
 P 9400 3300
+AR Path="/58D5A193" Ref="RA1"  Part="1" 
+AR Path="/58D51CAD/58D5A193" Ref="RA1"  Part="1" 
 F 0 "RA1" V 9480 3300 50  0000 C CNN
 F 1 "15k" V 9400 3300 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 9330 3300 50  0001 C CNN
@@ -134,9 +98,11 @@ F 3 "" H 9400 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R RB1
+L ulx3s-rescue:R RB1
 U 1 1 58D5A1E5
 P 9600 3500
+AR Path="/58D5A1E5" Ref="RB1"  Part="1" 
+AR Path="/58D51CAD/58D5A1E5" Ref="RB1"  Part="1" 
 F 0 "RB1" V 9680 3500 50  0000 C CNN
 F 1 "18k" V 9600 3500 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 9530 3500 50  0001 C CNN
@@ -145,7 +111,7 @@ F 3 "" H 9600 3500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR75
+L power:GND #PWR75
 U 1 1 58D5AE5E
 P 9800 3600
 F 0 "#PWR75" H 9800 3350 50  0001 C CNN
@@ -156,9 +122,11 @@ F 3 "" H 9800 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C3
+L ulx3s-rescue:C C3
 U 1 1 58D5AE64
 P 9800 3300
+AR Path="/58D5AE64" Ref="C3"  Part="1" 
+AR Path="/58D51CAD/58D5AE64" Ref="C3"  Part="1" 
 F 0 "C3" H 9825 3400 50  0000 L CNN
 F 1 "22uF" H 9825 3200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9838 3150 50  0001 C CNN
@@ -167,9 +135,11 @@ F 3 "" H 9800 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C4
+L ulx3s-rescue:C C4
 U 1 1 58D5AEB3
 P 10150 3300
+AR Path="/58D5AEB3" Ref="C4"  Part="1" 
+AR Path="/58D51CAD/58D5AEB3" Ref="C4"  Part="1" 
 F 0 "C4" H 10175 3400 50  0000 L CNN
 F 1 "22uF" H 10175 3200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10188 3150 50  0001 C CNN
@@ -178,7 +148,7 @@ F 3 "" H 10150 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR48
+L power:+3V3 #PWR48
 U 1 1 58D5CFDD
 P 5300 950
 F 0 "#PWR48" H 5300 800 50  0001 C CNN
@@ -189,7 +159,7 @@ F 3 "" H 5300 950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR74
+L power:GND #PWR74
 U 1 1 58D6294C
 P 8050 6300
 F 0 "#PWR74" H 8050 6050 50  0001 C CNN
@@ -200,7 +170,7 @@ F 3 "" H 8050 6300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR69
+L power:+5V #PWR69
 U 1 1 58D62952
 P 7400 5650
 F 0 "#PWR69" H 7400 5500 50  0001 C CNN
@@ -211,7 +181,7 @@ F 3 "" H 7400 5650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR70
+L power:GND #PWR70
 U 1 1 58D62958
 P 7400 6300
 F 0 "#PWR70" H 7400 6050 50  0001 C CNN
@@ -222,9 +192,11 @@ F 3 "" H 7400 6300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C5
+L ulx3s-rescue:C C5
 U 1 1 58D6295E
 P 7400 6100
+AR Path="/58D6295E" Ref="C5"  Part="1" 
+AR Path="/58D51CAD/58D6295E" Ref="C5"  Part="1" 
 F 0 "C5" H 7425 6200 50  0000 L CNN
 F 1 "22uF" H 7425 6000 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7438 5950 50  0001 C CNN
@@ -233,9 +205,11 @@ F 3 "" H 7400 6100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L ulx3s-rescue:C C6
 U 1 1 58D6296A
 P 9100 5700
+AR Path="/58D6296A" Ref="C6"  Part="1" 
+AR Path="/58D51CAD/58D6296A" Ref="C6"  Part="1" 
 F 0 "C6" H 9125 5800 50  0000 L CNN
 F 1 "470pF" H 9125 5600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9138 5550 50  0001 C CNN
@@ -244,9 +218,11 @@ F 3 "" H 9100 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R RA3
+L ulx3s-rescue:R RA3
 U 1 1 58D62970
 P 9400 5700
+AR Path="/58D62970" Ref="RA3"  Part="1" 
+AR Path="/58D51CAD/58D62970" Ref="RA3"  Part="1" 
 F 0 "RA3" V 9480 5700 50  0000 C CNN
 F 1 "15k" V 9400 5700 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 9330 5700 50  0001 C CNN
@@ -255,9 +231,11 @@ F 3 "" H 9400 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R RB3
+L ulx3s-rescue:R RB3
 U 1 1 58D62976
 P 9600 5900
+AR Path="/58D62976" Ref="RB3"  Part="1" 
+AR Path="/58D51CAD/58D62976" Ref="RB3"  Part="1" 
 F 0 "RB3" V 9680 5900 50  0000 C CNN
 F 1 "3.3k" V 9600 5900 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 9530 5900 50  0001 C CNN
@@ -266,7 +244,7 @@ F 3 "" H 9600 5900 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR77
+L power:GND #PWR77
 U 1 1 58D62982
 P 9800 6000
 F 0 "#PWR77" H 9800 5750 50  0001 C CNN
@@ -277,9 +255,11 @@ F 3 "" H 9800 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C7
+L ulx3s-rescue:C C7
 U 1 1 58D62988
 P 9800 5700
+AR Path="/58D62988" Ref="C7"  Part="1" 
+AR Path="/58D51CAD/58D62988" Ref="C7"  Part="1" 
 F 0 "C7" H 9825 5800 50  0000 L CNN
 F 1 "22uF" H 9825 5600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9838 5550 50  0001 C CNN
@@ -288,9 +268,11 @@ F 3 "" H 9800 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C8
+L ulx3s-rescue:C C8
 U 1 1 58D6298E
 P 10150 5700
+AR Path="/58D6298E" Ref="C8"  Part="1" 
+AR Path="/58D51CAD/58D6298E" Ref="C8"  Part="1" 
 F 0 "C8" H 10175 5800 50  0000 L CNN
 F 1 "22uF" H 10175 5600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10188 5550 50  0001 C CNN
@@ -299,7 +281,7 @@ F 3 "" H 10150 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR80
+L power:+3V3 #PWR80
 U 1 1 58D62CE2
 P 10850 5450
 F 0 "#PWR80" H 10850 5300 50  0001 C CNN
@@ -312,7 +294,7 @@ $EndComp
 Text Notes 6250 3000 0    60   ~ 0
 voltage setting: 0.6V at FB pin\nVout = (RA/RB+1)*0.6V\n
 $Comp
-L AP3429A U5
+L ap3429a:AP3429A U5
 U 1 1 58D67BBA
 P 8050 5800
 F 0 "U5" H 8050 5950 60  0000 C CNN
@@ -327,7 +309,7 @@ F 7 "595-TLV62569DBVR" H 8050 5800 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR73
+L power:GND #PWR73
 U 1 1 58D67BC0
 P 8050 5100
 F 0 "#PWR73" H 8050 4850 50  0001 C CNN
@@ -338,7 +320,7 @@ F 3 "" H 8050 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR67
+L power:+5V #PWR67
 U 1 1 58D67BC6
 P 7400 4450
 F 0 "#PWR67" H 7400 4300 50  0001 C CNN
@@ -349,7 +331,7 @@ F 3 "" H 7400 4450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR68
+L power:GND #PWR68
 U 1 1 58D67BCC
 P 7400 5100
 F 0 "#PWR68" H 7400 4850 50  0001 C CNN
@@ -360,9 +342,11 @@ F 3 "" H 7400 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C9
+L ulx3s-rescue:C C9
 U 1 1 58D67BD2
 P 7400 4900
+AR Path="/58D67BD2" Ref="C9"  Part="1" 
+AR Path="/58D51CAD/58D67BD2" Ref="C9"  Part="1" 
 F 0 "C9" H 7425 5000 50  0000 L CNN
 F 1 "22uF" H 7425 4800 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7438 4750 50  0001 C CNN
@@ -371,7 +355,7 @@ F 3 "" H 7400 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L2
+L ulx3s-rescue:L L2
 U 1 1 58D67BD8
 P 8900 4300
 F 0 "L2" V 8850 4300 50  0000 C CNN
@@ -386,9 +370,11 @@ F 7 "652-SRP2512A-2R2M" H 8900 4300 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C10
+L ulx3s-rescue:C C10
 U 1 1 58D67BDE
 P 9100 4500
+AR Path="/58D67BDE" Ref="C10"  Part="1" 
+AR Path="/58D51CAD/58D67BDE" Ref="C10"  Part="1" 
 F 0 "C10" H 9125 4600 50  0000 L CNN
 F 1 "470pF" H 9125 4400 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9138 4350 50  0001 C CNN
@@ -397,9 +383,11 @@ F 3 "" H 9100 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R RA2
+L ulx3s-rescue:R RA2
 U 1 1 58D67BE4
 P 9400 4500
+AR Path="/58D67BE4" Ref="RA2"  Part="1" 
+AR Path="/58D51CAD/58D67BE4" Ref="RA2"  Part="1" 
 F 0 "RA2" V 9480 4500 50  0000 C CNN
 F 1 "15k" V 9400 4500 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 9330 4500 50  0001 C CNN
@@ -408,9 +396,11 @@ F 3 "" H 9400 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R RB2
+L ulx3s-rescue:R RB2
 U 1 1 58D67BEA
 P 9600 4700
+AR Path="/58D67BEA" Ref="RB2"  Part="1" 
+AR Path="/58D51CAD/58D67BEA" Ref="RB2"  Part="1" 
 F 0 "RB2" V 9680 4700 50  0000 C CNN
 F 1 "4.7k" V 9600 4700 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 9530 4700 50  0001 C CNN
@@ -419,7 +409,7 @@ F 3 "" H 9600 4700 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR76
+L power:GND #PWR76
 U 1 1 58D67BF0
 P 9800 4800
 F 0 "#PWR76" H 9800 4550 50  0001 C CNN
@@ -430,9 +420,11 @@ F 3 "" H 9800 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C11
+L ulx3s-rescue:C C11
 U 1 1 58D67BF6
 P 9800 4500
+AR Path="/58D67BF6" Ref="C11"  Part="1" 
+AR Path="/58D51CAD/58D67BF6" Ref="C11"  Part="1" 
 F 0 "C11" H 9825 4600 50  0000 L CNN
 F 1 "22uF" H 9825 4400 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9838 4350 50  0001 C CNN
@@ -441,9 +433,11 @@ F 3 "" H 9800 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C12
+L ulx3s-rescue:C C12
 U 1 1 58D67BFC
 P 10150 4500
+AR Path="/58D67BFC" Ref="C12"  Part="1" 
+AR Path="/58D51CAD/58D67BFC" Ref="C12"  Part="1" 
 F 0 "C12" H 10175 4600 50  0000 L CNN
 F 1 "22uF" H 10175 4400 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10188 4350 50  0001 C CNN
@@ -452,9 +446,11 @@ F 3 "" H 10150 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L ulx3s-rescue:R R1
 U 1 1 58D67C1D
 P 4300 4700
+AR Path="/58D67C1D" Ref="R1"  Part="1" 
+AR Path="/58D51CAD/58D67C1D" Ref="R1"  Part="1" 
 F 0 "R1" V 4380 4700 50  0000 C CNN
 F 1 "15k" V 4300 4700 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4230 4700 50  0001 C CNN
@@ -463,7 +459,7 @@ F 3 "" H 4300 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR79
+L power:+2V5 #PWR79
 U 1 1 58D681D4
 P 10850 4250
 F 0 "#PWR79" H 10850 4100 50  0001 C CNN
@@ -494,7 +490,7 @@ FB3
 Text Label 8800 4700 0    60   ~ 0
 FB2
 $Comp
-L +2V5 #PWR40
+L power:+2V5 #PWR40
 U 1 1 58D68750
 P 4200 950
 F 0 "#PWR40" H 4200 800 50  0001 C CNN
@@ -505,7 +501,7 @@ F 3 "" H 4200 950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR64
+L power:+3V3 #PWR64
 U 1 1 58D69259
 P 6950 950
 F 0 "#PWR64" H 6950 800 50  0001 C CNN
@@ -516,9 +512,11 @@ F 3 "" H 6950 950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PCF8563 U7
+L ulx3s-rescue:PCF8563 U7
 U 1 1 58D70684
 P 1950 3650
+AR Path="/58D70684" Ref="U7"  Part="1" 
+AR Path="/58D51CAD/58D70684" Ref="U7"  Part="1" 
 F 0 "U7" H 1650 4000 50  0000 L CNN
 F 1 "PCF8523" H 2050 4000 50  0000 L CNN
 F 2 "SOT96-1:SOT96-1" H 1950 3650 50  0001 C CNN
@@ -531,7 +529,7 @@ F 7 "https://www.nxp.com/docs/en/packing/SOT96-1_118.pdf" H 1950 3650 60  0001 C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR28
+L power:GND #PWR28
 U 1 1 58D7085C
 P 1950 4150
 F 0 "#PWR28" H 1950 3900 50  0001 C CNN
@@ -546,9 +544,11 @@ FPDI_SCL
 Text GLabel 2450 3550 2    60   Input ~ 0
 FPDI_SDA
 $Comp
-L Battery_Cell BAT1
+L ulx3s-rescue:Battery_Cell BAT1
 U 1 1 58D72202
 P 2650 4100
+AR Path="/58D72202" Ref="BAT1"  Part="1" 
+AR Path="/58D51CAD/58D72202" Ref="BAT1"  Part="1" 
 F 0 "BAT1" H 2350 4200 50  0000 L CNN
 F 1 "CR1225" H 2250 4100 50  0000 L CNN
 F 2 "Keystone_3000_2.5x12.5mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2650 4160 50  0001 C CNN
@@ -561,7 +561,7 @@ F 7 "534-3000TR" H 2650 4100 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR26
+L power:GND #PWR26
 U 1 1 58D72406
 P 1900 4600
 F 0 "#PWR26" H 1900 4350 50  0001 C CNN
@@ -576,7 +576,7 @@ VBAT
 Text Notes 6250 3350 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
-L D D10
+L ulx3s-rescue:D D10
 U 1 1 58D79CB5
 P 4300 4250
 F 0 "D10" H 4300 4350 50  0000 C CNN
@@ -587,9 +587,11 @@ F 3 "" H 4300 4250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C13
+L ulx3s-rescue:C C13
 U 1 1 58D7A3F0
 P 4300 3750
+AR Path="/58D7A3F0" Ref="C13"  Part="1" 
+AR Path="/58D51CAD/58D7A3F0" Ref="C13"  Part="1" 
 F 0 "C13" H 4325 3850 50  0000 L CNN
 F 1 "2.2uF" H 4325 3650 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4338 3600 50  0001 C CNN
@@ -598,9 +600,11 @@ F 3 "" H 4300 3750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R2
+L ulx3s-rescue:R R2
 U 1 1 58D7BDD9
 P 4300 5600
+AR Path="/58D7BDD9" Ref="R2"  Part="1" 
+AR Path="/58D51CAD/58D7BDD9" Ref="R2"  Part="1" 
 F 0 "R2" V 4380 5600 50  0000 C CNN
 F 1 "47k" V 4300 5600 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4230 5600 50  0001 C CNN
@@ -609,7 +613,7 @@ F 3 "" H 4300 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR42
+L power:GND #PWR42
 U 1 1 58D7C223
 P 4300 6200
 F 0 "#PWR42" H 4300 5950 50  0001 C CNN
@@ -620,9 +624,11 @@ F 3 "" H 4300 6200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R4
+L ulx3s-rescue:R R4
 U 1 1 58D7CBD5
 P 4850 4700
+AR Path="/58D7CBD5" Ref="R4"  Part="1" 
+AR Path="/58D51CAD/58D7CBD5" Ref="R4"  Part="1" 
 F 0 "R4" V 4930 4700 50  0000 C CNN
 F 1 "4.7k" V 4850 4700 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4780 4700 50  0001 C CNN
@@ -631,9 +637,11 @@ F 3 "" H 4850 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_ALT D11
+L ulx3s-rescue:LED_ALT D11
 U 1 1 58D7CBDC
 P 4850 4200
+AR Path="/58D7CBDC" Ref="D11"  Part="1" 
+AR Path="/58D51CAD/58D7CBDC" Ref="D11"  Part="1" 
 F 0 "D11" H 4850 4300 50  0000 C CNN
 F 1 "RED" H 4850 4100 50  0000 C CNN
 F 2 "LEDs:LED_0805" H 4850 4200 50  0001 C CNN
@@ -646,9 +654,11 @@ WAKEUPn\nopen drain \nactive low
 Text Label 2400 3750 0    60   ~ 0
 WAKEUPn
 $Comp
-L C C14
+L ulx3s-rescue:C C14
 U 1 1 58D84952
 P 3700 5850
+AR Path="/58D84952" Ref="C14"  Part="1" 
+AR Path="/58D51CAD/58D84952" Ref="C14"  Part="1" 
 F 0 "C14" H 3725 5950 50  0000 L CNN
 F 1 "100nF" H 3725 5750 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 3738 5700 50  0001 C CNN
@@ -657,7 +667,7 @@ F 3 "" H 3700 5850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Schottky D15
+L ulx3s-rescue:D_Schottky D15
 U 1 1 58D84D8A
 P 3100 5600
 F 0 "D15" H 3100 5700 50  0000 C CNN
@@ -668,9 +678,11 @@ F 3 "" H 3100 5600 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R5
+L ulx3s-rescue:R R5
 U 1 1 58D85B68
 P 3400 5850
+AR Path="/58D85B68" Ref="R5"  Part="1" 
+AR Path="/58D51CAD/58D85B68" Ref="R5"  Part="1" 
 F 0 "R5" V 3480 5850 50  0000 C CNN
 F 1 "4.7M" V 3400 5850 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 3330 5850 50  0001 C CNN
@@ -689,9 +701,11 @@ HOLD
 Text Label 3450 5600 0    60   ~ 0
 SHUT
 $Comp
-L R R6
+L ulx3s-rescue:R R6
 U 1 1 58D7B291
 P 3400 3750
+AR Path="/58D7B291" Ref="R6"  Part="1" 
+AR Path="/58D51CAD/58D7B291" Ref="R6"  Part="1" 
 F 0 "R6" V 3480 3750 50  0000 C CNN
 F 1 "1k" V 3400 3750 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 3330 3750 50  0001 C CNN
@@ -702,7 +716,7 @@ $EndComp
 Text Label 3550 3750 0    60   ~ 0
 WKn
 $Comp
-L D_Schottky D12
+L ulx3s-rescue:D_Schottky D12
 U 1 1 58D7BC4A
 P 3800 4950
 F 0 "D12" H 3800 5050 50  0000 C CNN
@@ -713,9 +727,11 @@ F 3 "" H 3800 4950 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R8
+L ulx3s-rescue:R R8
 U 1 1 58D8111E
 P 4100 5200
+AR Path="/58D8111E" Ref="R8"  Part="1" 
+AR Path="/58D51CAD/58D8111E" Ref="R8"  Part="1" 
 F 0 "R8" V 4180 5200 50  0000 C CNN
 F 1 "1k" V 4100 5200 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4030 5200 50  0001 C CNN
@@ -724,7 +740,7 @@ F 3 "" H 4100 5200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal_GND23 Y2
+L ulx3s-rescue:Crystal_GND23 Y2
 U 1 1 58D85AAB
 P 900 3650
 F 0 "Y2" V 750 3450 50  0000 L CNN
@@ -745,9 +761,11 @@ OSCI_32k
 Text Label 1050 3850 0    60   ~ 0
 OSCO_32k
 $Comp
-L Q_NMOS_GSD Q2
+L ulx3s-rescue:Q_NMOS_GSD Q2
 U 1 1 58D883BD
 P 4000 5600
+AR Path="/58D883BD" Ref="Q2"  Part="1" 
+AR Path="/58D51CAD/58D883BD" Ref="Q2"  Part="1" 
 F 0 "Q2" H 3850 5700 50  0000 L CNN
 F 1 "2N7002" H 3750 5800 50  0000 L CNN
 F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4200 5700 50  0001 C CNN
@@ -759,9 +777,11 @@ F 6 "512-2N7002 " H 4000 5600 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_PNP_BEC Q1
+L ulx3s-rescue:Q_PNP_BEC Q1
 U 1 1 58D89315
 P 3950 3750
+AR Path="/58D89315" Ref="Q1"  Part="1" 
+AR Path="/58D51CAD/58D89315" Ref="Q1"  Part="1" 
 F 0 "Q1" H 3800 3650 50  0000 L CNN
 F 1 "BC857" H 3750 3950 50  0000 L CNN
 F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4150 3850 50  0001 C CNN
@@ -773,9 +793,11 @@ F 6 "771-BC857B-T/R" H 3950 3750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R13
+L ulx3s-rescue:R R13
 U 1 1 58DA1F4D
 P 2850 5850
+AR Path="/58DA1F4D" Ref="R13"  Part="1" 
+AR Path="/58D51CAD/58DA1F4D" Ref="R13"  Part="1" 
 F 0 "R13" V 2930 5850 50  0000 C CNN
 F 1 "15k" V 2850 5850 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2780 5850 50  0001 C CNN
@@ -784,7 +806,7 @@ F 3 "" H 2850 5850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D D13
+L ulx3s-rescue:D D13
 U 1 1 58DA2DA9
 P 4050 4250
 F 0 "D13" H 4050 4350 50  0000 C CNN
@@ -795,7 +817,7 @@ F 3 "" H 4050 4250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR39
+L power:GND #PWR39
 U 1 1 58DA2E46
 P 4050 4400
 F 0 "#PWR39" H 4050 4150 50  0001 C CNN
@@ -806,7 +828,7 @@ F 3 "" H 4050 4400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR41
+L power:+5V #PWR41
 U 1 1 58D67C25
 P 4300 3400
 F 0 "#PWR41" H 4300 3250 50  0001 C CNN
@@ -819,7 +841,7 @@ $EndComp
 Text Notes 3450 4750 0    60   ~ 0
 D13 discharges\nC13 at shutdown
 $Comp
-L D D14
+L ulx3s-rescue:D D14
 U 1 1 58DA55D7
 P 3400 5400
 F 0 "D14" H 3400 5500 50  0000 C CNN
@@ -830,7 +852,7 @@ F 3 "" H 3400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR33
+L power:+3V3 #PWR33
 U 1 1 58DA569C
 P 3400 5250
 F 0 "#PWR33" H 3400 5100 50  0001 C CNN
@@ -845,9 +867,11 @@ D14 discharges\nC14 at shutdown
 Text GLabel 2700 5600 0    60   Input ~ 0
 SHUTDOWN
 $Comp
-L R R3
+L ulx3s-rescue:R R3
 U 1 1 58E810CC
 P 3150 4400
+AR Path="/58E810CC" Ref="R3"  Part="1" 
+AR Path="/58D51CAD/58E810CC" Ref="R3"  Part="1" 
 F 0 "R3" V 3250 4400 50  0000 C CNN
 F 1 "4.7k" V 3150 4400 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 3080 4400 50  0001 C CNN
@@ -856,7 +880,7 @@ F 3 "" H 3150 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L D D16
+L ulx3s-rescue:D D16
 U 1 1 58E813AE
 P 2900 3950
 F 0 "D16" H 2900 4050 50  0000 C CNN
@@ -867,7 +891,7 @@ F 3 "" H 2900 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR32
+L power:+5V #PWR32
 U 1 1 58E82A7E
 P 3300 4400
 F 0 "#PWR32" H 3300 4250 50  0001 C CNN
@@ -878,7 +902,7 @@ F 3 "" H 3300 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L D D17
+L ulx3s-rescue:D D17
 U 1 1 58E82B1D
 P 3150 4150
 F 0 "D17" H 3150 4050 50  0000 C CNN
@@ -891,7 +915,7 @@ $EndComp
 Text GLabel 3300 4150 2    60   Input ~ 0
 BTN_PWRn
 $Comp
-L CONN_02X01 BTN0
+L micro-hdmi-d:CONN_02X01 BTN0
 U 1 1 58E83FE0
 P 2150 4600
 F 0 "BTN0" H 2150 4700 50  0000 C CNN
@@ -905,13 +929,13 @@ F 6 "www.mouser.com" H 2150 4600 60  0001 C CNN "Distributor1_URL"
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	2350 2600 10750 2600
+	2350 2600 2450 2600
 Wire Wire Line
 	2000 1050 2000 1150
 Wire Wire Line
 	2500 1050 2500 1150
 Wire Wire Line
-	2100 950  2100 1150
+	2100 950  2100 1050
 Connection ~ 2100 1050
 Wire Wire Line
 	2200 1050 2200 1150
@@ -1000,7 +1024,7 @@ Wire Wire Line
 	4850 2500 4850 2600
 Connection ~ 4850 2600
 Wire Wire Line
-	4950 2500 4950 2700
+	4950 2500 4950 2600
 Connection ~ 4950 2600
 Wire Wire Line
 	5050 2500 5050 2600
@@ -1179,14 +1203,14 @@ Wire Wire Line
 	7450 1050 7450 1150
 Connection ~ 2500 1050
 Wire Wire Line
-	7350 950  7350 1150
+	7350 950  7350 1050
 Connection ~ 7350 1050
 Wire Wire Line
 	7250 1050 7250 1150
 Wire Wire Line
 	7050 1050 7050 1150
 Wire Wire Line
-	6950 950  6950 1150
+	6950 950  6950 1050
 Connection ~ 6950 1050
 Wire Wire Line
 	6850 1050 6850 1150
@@ -1202,7 +1226,7 @@ Wire Wire Line
 	5400 1050 5400 1150
 Connection ~ 5400 1050
 Wire Wire Line
-	5300 950  5300 1150
+	5300 950  5300 1050
 Connection ~ 5300 1050
 Wire Wire Line
 	5200 1050 5200 1150
@@ -1213,7 +1237,7 @@ Connection ~ 5000 1050
 Wire Wire Line
 	4900 1050 4900 1150
 Wire Wire Line
-	4700 950  4700 1150
+	4700 950  4700 1050
 Connection ~ 4700 1050
 Wire Wire Line
 	4400 1050 4400 1150
@@ -1221,7 +1245,7 @@ Wire Wire Line
 	4300 1050 4300 1150
 Connection ~ 4300 1050
 Wire Wire Line
-	4200 950  4200 1150
+	4200 950  4200 1050
 Connection ~ 4200 1050
 Wire Wire Line
 	4100 1150 4100 1050
@@ -1269,7 +1293,7 @@ Connection ~ 2600 1050
 Wire Wire Line
 	8050 3800 8050 3900
 Wire Wire Line
-	7400 3250 7400 3550
+	7400 3250 7400 3300
 Wire Wire Line
 	7400 3850 7400 3900
 Wire Wire Line
@@ -1285,13 +1309,13 @@ Wire Wire Line
 Wire Wire Line
 	9400 3500 9400 3450
 Wire Wire Line
-	8650 3500 9450 3500
+	8650 3500 9100 3500
 Wire Wire Line
-	9800 3450 9800 3600
+	9800 3450 9800 3500
 Wire Wire Line
 	10150 3500 10150 3450
 Wire Wire Line
-	9750 3500 10850 3500
+	9750 3500 9800 3500
 Connection ~ 9800 3500
 Wire Wire Line
 	9800 3100 9800 3150
@@ -1302,7 +1326,7 @@ Wire Wire Line
 	8700 3100 8750 3100
 Connection ~ 10150 3100
 Wire Wire Line
-	2000 1050 3900 1050
+	2000 1050 2100 1050
 Connection ~ 7400 3300
 Wire Wire Line
 	7400 3300 7450 3300
@@ -1311,7 +1335,7 @@ Wire Wire Line
 Wire Wire Line
 	8050 6200 8050 6300
 Wire Wire Line
-	7400 5650 7400 5950
+	7400 5650 7400 5700
 Wire Wire Line
 	7400 6250 7400 6300
 Wire Wire Line
@@ -1327,13 +1351,13 @@ Wire Wire Line
 Wire Wire Line
 	9400 5900 9400 5850
 Wire Wire Line
-	8650 5900 9450 5900
+	8650 5900 9100 5900
 Wire Wire Line
-	9800 5850 9800 6000
+	9800 5850 9800 5900
 Wire Wire Line
 	10150 5900 10150 5850
 Wire Wire Line
-	9750 5900 10850 5900
+	9750 5900 9800 5900
 Connection ~ 9800 5900
 Wire Wire Line
 	9800 5500 9800 5550
@@ -1355,7 +1379,7 @@ Connection ~ 9400 3100
 Wire Wire Line
 	8050 5000 8050 5100
 Wire Wire Line
-	7400 4450 7400 4750
+	7400 4450 7400 4500
 Wire Wire Line
 	7400 5050 7400 5100
 Wire Wire Line
@@ -1371,13 +1395,13 @@ Wire Wire Line
 Wire Wire Line
 	9400 4700 9400 4650
 Wire Wire Line
-	8650 4700 9450 4700
+	8650 4700 9100 4700
 Wire Wire Line
-	9800 4650 9800 4800
+	9800 4650 9800 4700
 Wire Wire Line
 	10150 4700 10150 4650
 Wire Wire Line
-	9750 4700 10850 4700
+	9750 4700 9800 4700
 Connection ~ 9800 4700
 Wire Wire Line
 	9800 4300 9800 4350
@@ -1397,11 +1421,11 @@ Wire Wire Line
 Wire Wire Line
 	4300 4550 4300 4400
 Wire Wire Line
-	4300 4850 4300 5450
+	4300 4850 4300 4950
 Wire Wire Line
-	3950 4950 4850 4950
+	3950 4950 4100 4950
 Wire Wire Line
-	4100 1050 4400 1050
+	4100 1050 4200 1050
 Wire Wire Line
 	4600 1050 4600 1150
 Wire Wire Line
@@ -1427,18 +1451,18 @@ Wire Wire Line
 Wire Wire Line
 	1950 3250 1950 3150
 Wire Wire Line
-	4300 3900 4300 4100
+	4300 3900 4300 4000
 Wire Wire Line
-	4300 3400 4300 3600
+	4300 3400 4300 3500
 Connection ~ 4300 4000
 Connection ~ 4300 3500
 Connection ~ 4300 4950
 Wire Wire Line
-	4300 5750 4300 6200
+	4300 5750 4300 6100
 Wire Wire Line
 	4850 4550 4850 4350
 Wire Wire Line
-	2350 3750 3250 3750
+	2350 3750 2900 3750
 Wire Wire Line
 	3700 6100 3700 6000
 Wire Wire Line
@@ -1448,15 +1472,15 @@ Wire Wire Line
 Wire Wire Line
 	4100 6100 4100 5800
 Wire Wire Line
-	3250 5600 3800 5600
+	3250 5600 3400 5600
 Wire Wire Line
-	2700 5600 2950 5600
+	2700 5600 2850 5600
 Connection ~ 3700 5600
 Connection ~ 3400 5600
 Wire Wire Line
 	3400 6000 3400 6100
 Wire Wire Line
-	2850 6100 4300 6100
+	2850 6100 3400 6100
 Connection ~ 3700 6100
 Connection ~ 4300 6100
 Connection ~ 4100 6100
@@ -1476,23 +1500,23 @@ Wire Wire Line
 Wire Wire Line
 	4050 3500 4300 3500
 Wire Wire Line
-	4050 3950 4050 4100
+	4050 3950 4050 4000
 Wire Wire Line
 	4300 4000 4050 4000
 Connection ~ 4050 4000
 Wire Wire Line
 	2850 5600 2850 5700
 Wire Wire Line
-	3400 5550 3400 5700
+	3400 5550 3400 5600
 Wire Wire Line
 	3700 5600 3700 5700
 Wire Wire Line
 	7750 1050 7750 1150
 Wire Wire Line
-	7650 950  7650 1150
+	7650 950  7650 1050
 Connection ~ 7650 1050
 $Comp
-L +3V3 #PWR27
+L power:+3V3 #PWR27
 U 1 1 591C4E6A
 P 1950 3150
 F 0 "#PWR27" H 1950 3000 50  0001 C CNN
@@ -1507,9 +1531,11 @@ RTC can also be powered from 2.5V\nbut it is easier to route 3.3V
 Text GLabel 2500 4950 0    60   Input ~ 0
 FTDI_nSLEEP
 $Comp
-L R R10
+L ulx3s-rescue:R R10
 U 1 1 591E4865
 P 2700 4950
+AR Path="/591E4865" Ref="R10"  Part="1" 
+AR Path="/58D51CAD/591E4865" Ref="R10"  Part="1" 
 F 0 "R10" V 2780 4950 50  0000 C CNN
 F 1 "150" V 2700 4950 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2630 4950 50  0001 C CNN
@@ -1522,9 +1548,11 @@ Wire Wire Line
 Text Label 2900 4950 0    60   ~ 0
 FTDI_nSUSPEND
 $Comp
-L C C17
+L ulx3s-rescue:C C17
 U 1 1 592462C1
 P 10850 3300
+AR Path="/592462C1" Ref="C17"  Part="1" 
+AR Path="/58D51CAD/592462C1" Ref="C17"  Part="1" 
 F 0 "C17" H 10875 3400 50  0000 L CNN
 F 1 "2.2uF" H 10875 3200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10888 3150 50  0001 C CNN
@@ -1533,9 +1561,11 @@ F 3 "" H 10850 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C19
+L ulx3s-rescue:C C19
 U 1 1 59246A2A
 P 10850 4500
+AR Path="/59246A2A" Ref="C19"  Part="1" 
+AR Path="/58D51CAD/59246A2A" Ref="C19"  Part="1" 
 F 0 "C19" H 10875 4600 50  0000 L CNN
 F 1 "2.2uF" H 10875 4400 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10888 4350 50  0001 C CNN
@@ -1544,9 +1574,11 @@ F 3 "" H 10850 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C20
+L ulx3s-rescue:C C20
 U 1 1 59246E14
 P 10850 5700
+AR Path="/59246E14" Ref="C20"  Part="1" 
+AR Path="/58D51CAD/59246E14" Ref="C20"  Part="1" 
 F 0 "C20" H 10875 5800 50  0000 L CNN
 F 1 "2.2uF" H 10875 5600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10888 5550 50  0001 C CNN
@@ -1573,7 +1605,7 @@ Wire Wire Line
 	2900 3750 2900 3800
 Connection ~ 2900 3750
 $Comp
-L GND #PWR30
+L power:GND #PWR30
 U 1 1 59D5B51B
 P 2650 4250
 F 0 "#PWR30" H 2650 4000 50  0001 C CNN
@@ -1586,13 +1618,15 @@ $EndComp
 Wire Wire Line
 	2900 4600 2400 4600
 Wire Wire Line
-	2900 4100 2900 4600
+	2900 4100 2900 4150
 Text Label 2450 4600 0    60   ~ 0
 PWRBTn
 $Comp
-L C C22
+L ulx3s-rescue:C C22
 U 1 1 59D56B84
 P 10500 3300
+AR Path="/59D56B84" Ref="C22"  Part="1" 
+AR Path="/58D51CAD/59D56B84" Ref="C22"  Part="1" 
 F 0 "C22" H 10525 3400 50  0000 L CNN
 F 1 "2.2uF" H 10525 3200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10538 3150 50  0001 C CNN
@@ -1601,9 +1635,11 @@ F 3 "" H 10500 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C23
+L ulx3s-rescue:C C23
 U 1 1 59D56D50
 P 10500 4500
+AR Path="/59D56D50" Ref="C23"  Part="1" 
+AR Path="/58D51CAD/59D56D50" Ref="C23"  Part="1" 
 F 0 "C23" H 10525 4600 50  0000 L CNN
 F 1 "2.2uF" H 10525 4400 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10538 4350 50  0001 C CNN
@@ -1612,9 +1648,11 @@ F 3 "" H 10500 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C24
+L ulx3s-rescue:C C24
 U 1 1 59D56EAA
 P 10500 5700
+AR Path="/59D56EAA" Ref="C24"  Part="1" 
+AR Path="/58D51CAD/59D56EAA" Ref="C24"  Part="1" 
 F 0 "C24" H 10525 5800 50  0000 L CNN
 F 1 "2.2uF" H 10525 5600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10538 5550 50  0001 C CNN
@@ -1623,25 +1661,25 @@ F 3 "" H 10500 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10850 3050 10850 3150
+	10850 3050 10850 3100
 Connection ~ 10500 3100
 Wire Wire Line
 	10850 3500 10850 3450
 Connection ~ 10500 3500
 Wire Wire Line
-	10850 5450 10850 5550
+	10850 5450 10850 5500
 Connection ~ 10500 5500
 Wire Wire Line
 	10850 5900 10850 5850
 Connection ~ 10500 5900
 Wire Wire Line
-	10850 4250 10850 4350
+	10850 4250 10850 4300
 Connection ~ 10500 4300
 Wire Wire Line
 	10850 4700 10850 4650
 Connection ~ 10500 4700
 $Comp
-L Jumper_NC_Small RP1
+L ulx3s-rescue:Jumper_NC_Small RP1
 U 1 1 59DFB08A
 P 10700 3100
 F 0 "RP1" H 10700 3180 50  0000 C CNN
@@ -1653,7 +1691,7 @@ F 4 "www.mouser.com" H 10700 3100 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Jumper_NC_Small RP2
+L ulx3s-rescue:Jumper_NC_Small RP2
 U 1 1 59DFB617
 P 10700 4300
 F 0 "RP2" H 10700 4380 50  0000 C CNN
@@ -1665,7 +1703,7 @@ F 4 "www.mouser.com" H 10700 4300 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Jumper_NC_Small RP3
+L ulx3s-rescue:Jumper_NC_Small RP3
 U 1 1 59DFBF34
 P 10700 5500
 F 0 "RP3" H 10700 5580 50  0000 C CNN
@@ -1691,15 +1729,15 @@ P3V3
 Wire Wire Line
 	10150 3100 10150 3150
 Wire Wire Line
-	9050 5500 10600 5500
+	9050 5500 9100 5500
 Wire Wire Line
 	10150 5500 10150 5550
 Wire Wire Line
-	9050 4300 10600 4300
+	9050 4300 9100 4300
 Wire Wire Line
 	10150 4300 10150 4350
 Wire Wire Line
-	9050 3100 10600 3100
+	9050 3100 9100 3100
 Wire Wire Line
 	10500 3100 10500 3150
 Wire Wire Line
@@ -1718,11 +1756,11 @@ Connection ~ 10850 5500
 Wire Wire Line
 	4850 5500 4750 5500
 Wire Wire Line
-	4750 5500 4750 7450
+	4750 5500 4750 5700
 Wire Wire Line
 	6550 5500 6650 5500
 Wire Wire Line
-	6650 5500 6650 7450
+	6650 5500 6650 5700
 Wire Wire Line
 	4850 5700 4750 5700
 Connection ~ 4750 5700
@@ -1800,7 +1838,7 @@ Wire Wire Line
 	6550 7350 6650 7350
 Connection ~ 6650 7350
 $Comp
-L GND #PWR43
+L power:GND #PWR43
 U 1 1 59EF897E
 P 4750 7450
 F 0 "#PWR43" H 4750 7200 50  0001 C CNN
@@ -1811,7 +1849,7 @@ F 3 "" H 4750 7450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR63
+L power:GND #PWR63
 U 1 1 59EF8A0A
 P 6650 7450
 F 0 "#PWR63" H 6650 7200 50  0001 C CNN
@@ -1828,7 +1866,7 @@ L1,L2,L3: Isat>3A Rdc<100mohm L=2.5-5.8mm W<3mm\nMurata DFE322512F-2R2M=P2, DFE2
 Text Notes 950  6200 0    60   ~ 0
 WARNING\nECP5 family datasheet\np.48: Power Supply Ramp rates\nfor all supplies 0.01-10V/ms\n
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 8 1 5A076CD7
 P 5700 6400
 AR Path="/5A076CD7" Ref="U1"  Part="8" 
@@ -1844,7 +1882,7 @@ F 6 "842-LFE5U45F6BG381C" H 5700 6400 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 9 1 5A077765
 P 6200 1800
 AR Path="/5A077765" Ref="U1"  Part="9" 
@@ -1861,7 +1899,7 @@ F 7 "842-LFE5U45F6BG381C" H 6200 1800 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR29
+L power:+1V1 #PWR29
 U 1 1 5A0B33B0
 P 2100 950
 F 0 "#PWR29" H 2100 800 50  0001 C CNN
@@ -1872,7 +1910,7 @@ F 3 "" H 2100 950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR78
+L power:+1V1 #PWR78
 U 1 1 5A0B387F
 P 10850 3050
 F 0 "#PWR78" H 10850 2900 50  0001 C CNN
@@ -1889,7 +1927,7 @@ SHUTDOWN connected to\nBANK2 on "ram" sheet
 Text Notes 2750 6350 0    60   ~ 0
 Works without R5
 $Comp
-L +3V3 #PWR44
+L power:+3V3 #PWR44
 U 1 1 5A404030
 P 4850 4050
 F 0 "#PWR44" H 4850 3900 50  0001 C CNN
@@ -1900,7 +1938,7 @@ F 3 "" H 4850 4050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L AP3429A U4
+L ap3429a:AP3429A U4
 U 1 1 5A57BC36
 P 8050 4600
 F 0 "U4" H 8050 4750 60  0000 C CNN
@@ -1915,7 +1953,7 @@ F 7 "595-TLV62569DBVR" H 8050 4600 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L AP3429A U3
+L ap3429a:AP3429A U3
 U 1 1 5A57BFD7
 P 8050 3400
 F 0 "U3" H 8050 3550 60  0000 C CNN
@@ -1932,9 +1970,11 @@ $EndComp
 Text Notes 7900 1200 0    60   ~ 0
 Decoupling capacitors: see Lattice\nPower Decoupling and Bypass Filtering for Programmable Devices
 $Comp
-L C C25
+L ulx3s-rescue:C C25
 U 1 1 5A5F6DD9
 P 5500 4750
+AR Path="/5A5F6DD9" Ref="C25"  Part="1" 
+AR Path="/58D51CAD/5A5F6DD9" Ref="C25"  Part="1" 
 F 0 "C25" H 5525 4850 50  0000 L CNN
 F 1 "22nF" H 5525 4650 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5538 4600 50  0001 C CNN
@@ -1943,7 +1983,7 @@ F 3 "" H 5500 4750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR54
+L power:GND #PWR54
 U 1 1 5A5F72AC
 P 5500 4900
 F 0 "#PWR54" H 5500 4650 50  0001 C CNN
@@ -1954,7 +1994,7 @@ F 3 "" H 5500 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR53
+L power:+3V3 #PWR53
 U 1 1 5A5F7519
 P 5500 4600
 F 0 "#PWR53" H 5500 4450 50  0001 C CNN
@@ -1965,9 +2005,11 @@ F 3 "" H 5500 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C27
+L ulx3s-rescue:C C27
 U 1 1 5A5FA778
 P 5450 3250
+AR Path="/5A5FA778" Ref="C27"  Part="1" 
+AR Path="/58D51CAD/5A5FA778" Ref="C27"  Part="1" 
 F 0 "C27" H 5475 3350 50  0000 L CNN
 F 1 "22nF" H 5475 3150 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5488 3100 50  0001 C CNN
@@ -1976,7 +2018,7 @@ F 3 "" H 5450 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR50
+L power:GND #PWR50
 U 1 1 5A5FA77E
 P 5450 3400
 F 0 "#PWR50" H 5450 3150 50  0001 C CNN
@@ -1987,9 +2029,11 @@ F 3 "" H 5450 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C28
+L ulx3s-rescue:C C28
 U 1 1 5A5FA78A
 P 5750 3250
+AR Path="/5A5FA78A" Ref="C28"  Part="1" 
+AR Path="/58D51CAD/5A5FA78A" Ref="C28"  Part="1" 
 F 0 "C28" H 5775 3350 50  0000 L CNN
 F 1 "22nF" H 5775 3150 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5788 3100 50  0001 C CNN
@@ -1998,7 +2042,7 @@ F 3 "" H 5750 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR56
+L power:GND #PWR56
 U 1 1 5A5FA790
 P 5750 3400
 F 0 "#PWR56" H 5750 3150 50  0001 C CNN
@@ -2009,7 +2053,7 @@ F 3 "" H 5750 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR49
+L power:+1V1 #PWR49
 U 1 1 5A5FAAE2
 P 5450 3100
 F 0 "#PWR49" H 5450 2950 50  0001 C CNN
@@ -2020,7 +2064,7 @@ F 3 "" H 5450 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR55
+L power:+1V1 #PWR55
 U 1 1 5A5FAE2D
 P 5750 3100
 F 0 "#PWR55" H 5750 2950 50  0001 C CNN
@@ -2031,9 +2075,11 @@ F 3 "" H 5750 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C29
+L ulx3s-rescue:C C29
 U 1 1 5A5FC3F6
 P 5450 4000
+AR Path="/5A5FC3F6" Ref="C29"  Part="1" 
+AR Path="/58D51CAD/5A5FC3F6" Ref="C29"  Part="1" 
 F 0 "C29" H 5475 4100 50  0000 L CNN
 F 1 "22nF" H 5475 3900 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5488 3850 50  0001 C CNN
@@ -2042,7 +2088,7 @@ F 3 "" H 5450 4000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR52
+L power:GND #PWR52
 U 1 1 5A5FC3FC
 P 5450 4150
 F 0 "#PWR52" H 5450 3900 50  0001 C CNN
@@ -2053,9 +2099,11 @@ F 3 "" H 5450 4150 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C30
+L ulx3s-rescue:C C30
 U 1 1 5A5FC402
 P 5750 4000
+AR Path="/5A5FC402" Ref="C30"  Part="1" 
+AR Path="/58D51CAD/5A5FC402" Ref="C30"  Part="1" 
 F 0 "C30" H 5775 4100 50  0000 L CNN
 F 1 "22nF" H 5775 3900 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5788 3850 50  0001 C CNN
@@ -2064,7 +2112,7 @@ F 3 "" H 5750 4000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR58
+L power:GND #PWR58
 U 1 1 5A5FC408
 P 5750 4150
 F 0 "#PWR58" H 5750 3900 50  0001 C CNN
@@ -2075,7 +2123,7 @@ F 3 "" H 5750 4150 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR51
+L power:+2V5 #PWR51
 U 1 1 5A5FCA42
 P 5450 3850
 F 0 "#PWR51" H 5450 3700 50  0001 C CNN
@@ -2086,7 +2134,7 @@ F 3 "" H 5450 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR57
+L power:+2V5 #PWR57
 U 1 1 5A5FCEF1
 P 5750 3850
 F 0 "#PWR57" H 5750 3700 50  0001 C CNN
@@ -2097,7 +2145,7 @@ F 3 "" H 5750 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR61
+L power:GND #PWR61
 U 1 1 5A5F9204
 P 6050 4900
 F 0 "#PWR61" H 6050 4650 50  0001 C CNN
@@ -2108,9 +2156,11 @@ F 3 "" H 6050 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C26
+L ulx3s-rescue:C C26
 U 1 1 5A5F91FE
 P 6050 4750
+AR Path="/5A5F91FE" Ref="C26"  Part="1" 
+AR Path="/58D51CAD/5A5F91FE" Ref="C26"  Part="1" 
 F 0 "C26" H 6075 4850 50  0000 L CNN
 F 1 "22nF" H 6075 4650 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 6088 4600 50  0001 C CNN
@@ -2119,7 +2169,7 @@ F 3 "" H 6050 4750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR59
+L power:+3V3 #PWR59
 U 1 1 5A5FEE9A
 P 5750 4600
 F 0 "#PWR59" H 5750 4450 50  0001 C CNN
@@ -2130,7 +2180,7 @@ F 3 "" H 5750 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR60
+L power:GND #PWR60
 U 1 1 5A5FEEA0
 P 5750 4900
 F 0 "#PWR60" H 5750 4650 50  0001 C CNN
@@ -2141,9 +2191,11 @@ F 3 "" H 5750 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C31
+L ulx3s-rescue:C C31
 U 1 1 5A5FEEA6
 P 5750 4750
+AR Path="/5A5FEEA6" Ref="C31"  Part="1" 
+AR Path="/58D51CAD/5A5FEEA6" Ref="C31"  Part="1" 
 F 0 "C31" H 5775 4850 50  0000 L CNN
 F 1 "22nF" H 5775 4650 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5788 4600 50  0001 C CNN
@@ -2152,9 +2204,11 @@ F 3 "" H 5750 4750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C32
+L ulx3s-rescue:C C32
 U 1 1 5A6007F1
 P 5250 4750
+AR Path="/5A6007F1" Ref="C32"  Part="1" 
+AR Path="/58D51CAD/5A6007F1" Ref="C32"  Part="1" 
 F 0 "C32" H 5275 4850 50  0000 L CNN
 F 1 "22nF" H 5275 4650 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 5288 4600 50  0001 C CNN
@@ -2163,7 +2217,7 @@ F 3 "" H 5250 4750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR47
+L power:GND #PWR47
 U 1 1 5A6007F7
 P 5250 4900
 F 0 "#PWR47" H 5250 4650 50  0001 C CNN
@@ -2174,7 +2228,7 @@ F 3 "" H 5250 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR46
+L power:+3V3 #PWR46
 U 1 1 5A6007FD
 P 5250 4600
 F 0 "#PWR46" H 5250 4450 50  0001 C CNN
@@ -2185,7 +2239,7 @@ F 3 "" H 5250 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L1
+L ulx3s-rescue:L L1
 U 1 1 5A73C9EB
 P 8900 3100
 F 0 "L1" V 8850 3100 50  0000 C CNN
@@ -2200,7 +2254,7 @@ F 7 "652-SRP2512A-2R2M" H 8900 3100 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L L L3
+L ulx3s-rescue:L L3
 U 1 1 5A73CDB3
 P 8900 5500
 F 0 "L3" V 8850 5500 50  0000 C CNN
@@ -2215,11 +2269,11 @@ F 7 "652-SRP2512A-2R2M" H 8900 5500 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	4900 1050 5800 1050
+	4900 1050 5000 1050
 Wire Wire Line
 	4600 1050 4700 1050
 $Comp
-L +3V3 #PWR71
+L power:+3V3 #PWR71
 U 1 1 5AA28D56
 P 7650 950
 F 0 "#PWR71" H 7650 800 50  0001 C CNN
@@ -2230,9 +2284,9 @@ F 3 "" H 7650 950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6850 1050 7050 1050
+	6850 1050 6950 1050
 Wire Wire Line
-	7250 1050 7450 1050
+	7250 1050 7350 1050
 Wire Wire Line
 	7650 1050 7750 1050
 Text GLabel 4700 950  1    60   Input ~ 0
@@ -2240,9 +2294,11 @@ Text GLabel 4700 950  1    60   Input ~ 0
 Text GLabel 7350 950  1    60   Input ~ 0
 2V5_3V3
 $Comp
-L Conn_01x03 J5
+L ulx3s-rescue:Conn_01x03 J5
 U 1 1 5AA2A24D
 P 1400 1850
+AR Path="/5AA2A24D" Ref="J5"  Part="1" 
+AR Path="/58D51CAD/5AA2A24D" Ref="J5"  Part="1" 
 F 0 "J5" H 1400 2050 50  0000 C CNN
 F 1 "VJ1" H 1400 1650 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Angled_1x03_Pitch2.54mm" H 1400 1850 50  0001 C CNN
@@ -2255,7 +2311,7 @@ $EndComp
 Text GLabel 1200 1850 0    60   Input ~ 0
 2V5_3V3
 $Comp
-L +2V5 #PWR23
+L power:+2V5 #PWR23
 U 1 1 5AA2ABFC
 P 750 1750
 F 0 "#PWR23" H 750 1600 50  0001 C CNN
@@ -2266,7 +2322,7 @@ F 3 "" H 750 1750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR24
+L power:+3V3 #PWR24
 U 1 1 5AA2AD24
 P 750 1950
 F 0 "#PWR24" H 750 1800 50  0001 C CNN
@@ -2283,9 +2339,11 @@ Wire Wire Line
 Text GLabel 6050 4600 1    60   Input ~ 0
 2V5_3V3
 $Comp
-L C C47
+L ulx3s-rescue:C C47
 U 1 1 5AB6B7B8
 P 950 2650
+AR Path="/5AB6B7B8" Ref="C47"  Part="1" 
+AR Path="/58D51CAD/5AB6B7B8" Ref="C47"  Part="1" 
 F 0 "C47" H 975 2750 50  0000 L CNN
 F 1 "2.2uF" H 975 2550 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 988 2500 50  0001 C CNN
@@ -2296,7 +2354,7 @@ $EndComp
 Text GLabel 950  2500 1    60   Input ~ 0
 2V5_3V3
 $Comp
-L GND #PWR25
+L power:GND #PWR25
 U 1 1 5AB6BA00
 P 950 2800
 F 0 "#PWR25" H 950 2550 50  0001 C CNN
@@ -2307,9 +2365,11 @@ F 3 "" H 950 2800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C50
+L ulx3s-rescue:C C50
 U 1 1 5ABCEAC4
 P 3750 7100
+AR Path="/5ABCEAC4" Ref="C50"  Part="1" 
+AR Path="/58D51CAD/5ABCEAC4" Ref="C50"  Part="1" 
 F 0 "C50" H 3775 7200 50  0000 L CNN
 F 1 "22nF" H 3775 7000 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 3788 6950 50  0001 C CNN
@@ -2318,7 +2378,7 @@ F 3 "" H 3750 7100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR36
+L power:GND #PWR36
 U 1 1 5ABCEACA
 P 3750 7250
 F 0 "#PWR36" H 3750 7000 50  0001 C CNN
@@ -2329,7 +2389,7 @@ F 3 "" H 3750 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR35
+L power:+3V3 #PWR35
 U 1 1 5ABCEAD0
 P 3750 6950
 F 0 "#PWR35" H 3750 6800 50  0001 C CNN
@@ -2340,7 +2400,7 @@ F 3 "" H 3750 6950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR31
+L power:GND #PWR31
 U 1 1 5ABCEAD6
 P 3250 7250
 F 0 "#PWR31" H 3250 7000 50  0001 C CNN
@@ -2351,9 +2411,11 @@ F 3 "" H 3250 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C48
+L ulx3s-rescue:C C48
 U 1 1 5ABCEADC
 P 3250 7100
+AR Path="/5ABCEADC" Ref="C48"  Part="1" 
+AR Path="/58D51CAD/5ABCEADC" Ref="C48"  Part="1" 
 F 0 "C48" H 3275 7200 50  0000 L CNN
 F 1 "22nF" H 3275 7000 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 3288 6950 50  0001 C CNN
@@ -2362,7 +2424,7 @@ F 3 "" H 3250 7100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR37
+L power:+3V3 #PWR37
 U 1 1 5ABCEAE2
 P 4000 6950
 F 0 "#PWR37" H 4000 6800 50  0001 C CNN
@@ -2373,7 +2435,7 @@ F 3 "" H 4000 6950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR38
+L power:GND #PWR38
 U 1 1 5ABCEAE8
 P 4000 7250
 F 0 "#PWR38" H 4000 7000 50  0001 C CNN
@@ -2384,9 +2446,11 @@ F 3 "" H 4000 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C51
+L ulx3s-rescue:C C51
 U 1 1 5ABCEAEE
 P 4000 7100
+AR Path="/5ABCEAEE" Ref="C51"  Part="1" 
+AR Path="/58D51CAD/5ABCEAEE" Ref="C51"  Part="1" 
 F 0 "C51" H 4025 7200 50  0000 L CNN
 F 1 "22nF" H 4025 7000 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 4038 6950 50  0001 C CNN
@@ -2397,7 +2461,7 @@ $EndComp
 Text GLabel 3250 6950 1    60   Input ~ 0
 2V5_3V3
 $Comp
-L GND #PWR34
+L power:GND #PWR34
 U 1 1 5ABCECEB
 P 3500 7250
 F 0 "#PWR34" H 3500 7000 50  0001 C CNN
@@ -2408,9 +2472,11 @@ F 3 "" H 3500 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C49
+L ulx3s-rescue:C C49
 U 1 1 5ABCECF1
 P 3500 7100
+AR Path="/5ABCECF1" Ref="C49"  Part="1" 
+AR Path="/58D51CAD/5ABCECF1" Ref="C49"  Part="1" 
 F 0 "C49" H 3525 7200 50  0000 L CNN
 F 1 "22nF" H 3525 7000 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 3538 6950 50  0001 C CNN
@@ -2423,7 +2489,7 @@ Text GLabel 3500 6950 1    60   Input ~ 0
 Text Notes 2850 7550 0    60   ~ 0
 Capacitors near J1,2 connector
 $Comp
-L GND #PWR62
+L power:GND #PWR62
 U 1 1 5AC310ED
 P 6300 4900
 F 0 "#PWR62" H 6300 4650 50  0001 C CNN
@@ -2434,9 +2500,11 @@ F 3 "" H 6300 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C53
+L ulx3s-rescue:C C53
 U 1 1 5AC310F3
 P 6300 4750
+AR Path="/5AC310F3" Ref="C53"  Part="1" 
+AR Path="/58D51CAD/5AC310F3" Ref="C53"  Part="1" 
 F 0 "C53" H 6325 4850 50  0000 L CNN
 F 1 "22nF" H 6325 4650 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 6338 4600 50  0001 C CNN
@@ -2446,4 +2514,406 @@ F 3 "" H 6300 4750 50  0000 C CNN
 $EndComp
 Text GLabel 6300 4600 1    60   Input ~ 0
 2V5_3V3
+Wire Wire Line
+	2100 1050 2100 1150
+Wire Wire Line
+	2100 1050 2200 1050
+Wire Wire Line
+	2200 1050 2300 1050
+Wire Wire Line
+	2300 1050 2400 1050
+Wire Wire Line
+	2400 1050 2500 1050
+Wire Wire Line
+	2450 2600 2550 2600
+Wire Wire Line
+	2550 2600 2650 2600
+Wire Wire Line
+	2650 2600 2750 2600
+Wire Wire Line
+	2750 2600 2850 2600
+Wire Wire Line
+	2850 2600 2950 2600
+Wire Wire Line
+	2950 2600 3050 2600
+Wire Wire Line
+	3050 2600 3150 2600
+Wire Wire Line
+	3150 2600 3250 2600
+Wire Wire Line
+	3250 2600 3350 2600
+Wire Wire Line
+	3350 2600 3450 2600
+Wire Wire Line
+	3450 2600 3550 2600
+Wire Wire Line
+	3550 2600 3650 2600
+Wire Wire Line
+	3650 2600 3750 2600
+Wire Wire Line
+	3750 2600 3850 2600
+Wire Wire Line
+	3850 2600 3950 2600
+Wire Wire Line
+	3950 2600 4050 2600
+Wire Wire Line
+	4050 2600 4150 2600
+Wire Wire Line
+	4150 2600 4250 2600
+Wire Wire Line
+	4250 2600 4350 2600
+Wire Wire Line
+	4350 2600 4450 2600
+Wire Wire Line
+	4450 2600 4550 2600
+Wire Wire Line
+	4550 2600 4650 2600
+Wire Wire Line
+	4650 2600 4750 2600
+Wire Wire Line
+	4750 2600 4850 2600
+Wire Wire Line
+	4850 2600 4950 2600
+Wire Wire Line
+	4950 2600 4950 2700
+Wire Wire Line
+	4950 2600 5050 2600
+Wire Wire Line
+	5050 2600 5150 2600
+Wire Wire Line
+	5150 2600 5250 2600
+Wire Wire Line
+	5250 2600 5350 2600
+Wire Wire Line
+	5350 2600 5450 2600
+Wire Wire Line
+	5450 2600 5550 2600
+Wire Wire Line
+	5550 2600 5650 2600
+Wire Wire Line
+	5650 2600 5750 2600
+Wire Wire Line
+	5750 2600 5850 2600
+Wire Wire Line
+	5850 2600 5950 2600
+Wire Wire Line
+	5950 2600 6050 2600
+Wire Wire Line
+	6050 2600 6150 2600
+Wire Wire Line
+	6150 2600 6250 2600
+Wire Wire Line
+	6250 2600 6350 2600
+Wire Wire Line
+	6350 2600 6450 2600
+Wire Wire Line
+	6450 2600 6550 2600
+Wire Wire Line
+	6550 2600 6650 2600
+Wire Wire Line
+	6650 2600 6750 2600
+Wire Wire Line
+	6750 2600 6850 2600
+Wire Wire Line
+	6850 2600 6950 2600
+Wire Wire Line
+	6950 2600 7050 2600
+Wire Wire Line
+	7050 2600 7150 2600
+Wire Wire Line
+	7150 2600 7250 2600
+Wire Wire Line
+	7250 2600 7350 2600
+Wire Wire Line
+	7350 2600 7450 2600
+Wire Wire Line
+	7450 2600 7550 2600
+Wire Wire Line
+	7550 2600 7650 2600
+Wire Wire Line
+	7650 2600 7750 2600
+Wire Wire Line
+	7750 2600 7850 2600
+Wire Wire Line
+	7850 2600 7950 2600
+Wire Wire Line
+	7950 2600 8050 2600
+Wire Wire Line
+	8050 2600 8150 2600
+Wire Wire Line
+	8150 2600 8250 2600
+Wire Wire Line
+	8250 2600 8350 2600
+Wire Wire Line
+	8350 2600 8450 2600
+Wire Wire Line
+	8450 2600 8550 2600
+Wire Wire Line
+	8550 2600 8650 2600
+Wire Wire Line
+	8650 2600 8750 2600
+Wire Wire Line
+	8750 2600 8850 2600
+Wire Wire Line
+	8850 2600 8950 2600
+Wire Wire Line
+	8950 2600 9050 2600
+Wire Wire Line
+	9050 2600 9150 2600
+Wire Wire Line
+	9150 2600 9250 2600
+Wire Wire Line
+	9250 2600 9350 2600
+Wire Wire Line
+	9350 2600 9450 2600
+Wire Wire Line
+	9450 2600 9550 2600
+Wire Wire Line
+	9550 2600 9650 2600
+Wire Wire Line
+	9650 2600 9750 2600
+Wire Wire Line
+	9750 2600 9850 2600
+Wire Wire Line
+	9850 2600 9950 2600
+Wire Wire Line
+	9950 2600 10050 2600
+Wire Wire Line
+	10050 2600 10150 2600
+Wire Wire Line
+	10150 2600 10250 2600
+Wire Wire Line
+	10250 2600 10350 2600
+Wire Wire Line
+	10350 2600 10450 2600
+Wire Wire Line
+	10450 2600 10550 2600
+Wire Wire Line
+	10550 2600 10650 2600
+Wire Wire Line
+	10650 2600 10750 2600
+Wire Wire Line
+	2500 1050 2600 1050
+Wire Wire Line
+	7350 1050 7350 1150
+Wire Wire Line
+	7350 1050 7450 1050
+Wire Wire Line
+	6950 1050 6950 1150
+Wire Wire Line
+	6950 1050 7050 1050
+Wire Wire Line
+	5700 1050 5800 1050
+Wire Wire Line
+	5600 1050 5700 1050
+Wire Wire Line
+	5400 1050 5600 1050
+Wire Wire Line
+	5300 1050 5300 1150
+Wire Wire Line
+	5300 1050 5400 1050
+Wire Wire Line
+	5200 1050 5300 1050
+Wire Wire Line
+	5000 1050 5200 1050
+Wire Wire Line
+	4700 1050 4700 1150
+Wire Wire Line
+	4300 1050 4400 1050
+Wire Wire Line
+	4200 1050 4200 1150
+Wire Wire Line
+	4200 1050 4300 1050
+Wire Wire Line
+	3800 1050 3900 1050
+Wire Wire Line
+	3700 1050 3800 1050
+Wire Wire Line
+	3600 1050 3700 1050
+Wire Wire Line
+	3500 1050 3600 1050
+Wire Wire Line
+	3400 1050 3500 1050
+Wire Wire Line
+	3300 1050 3400 1050
+Wire Wire Line
+	3200 1050 3300 1050
+Wire Wire Line
+	3100 1050 3200 1050
+Wire Wire Line
+	3000 1050 3100 1050
+Wire Wire Line
+	2900 1050 3000 1050
+Wire Wire Line
+	2800 1050 2900 1050
+Wire Wire Line
+	2700 1050 2800 1050
+Wire Wire Line
+	2600 1050 2700 1050
+Wire Wire Line
+	9800 3500 9800 3600
+Wire Wire Line
+	9800 3500 10150 3500
+Wire Wire Line
+	9400 3500 9450 3500
+Wire Wire Line
+	9100 3500 9400 3500
+Wire Wire Line
+	9100 3100 9400 3100
+Wire Wire Line
+	10150 3100 10500 3100
+Wire Wire Line
+	7400 3300 7400 3550
+Wire Wire Line
+	9800 5900 9800 6000
+Wire Wire Line
+	9800 5900 10150 5900
+Wire Wire Line
+	9800 5500 10150 5500
+Wire Wire Line
+	9400 5900 9450 5900
+Wire Wire Line
+	9100 5900 9400 5900
+Wire Wire Line
+	9400 5500 9800 5500
+Wire Wire Line
+	9100 5500 9400 5500
+Wire Wire Line
+	10150 5500 10500 5500
+Wire Wire Line
+	7400 5700 7400 5950
+Wire Wire Line
+	9800 3100 10150 3100
+Wire Wire Line
+	9400 3100 9800 3100
+Wire Wire Line
+	9800 4700 9800 4800
+Wire Wire Line
+	9800 4700 10150 4700
+Wire Wire Line
+	9800 4300 10150 4300
+Wire Wire Line
+	9400 4700 9450 4700
+Wire Wire Line
+	9100 4700 9400 4700
+Wire Wire Line
+	9400 4300 9800 4300
+Wire Wire Line
+	9100 4300 9400 4300
+Wire Wire Line
+	10150 4300 10500 4300
+Wire Wire Line
+	7400 4500 7400 4750
+Wire Wire Line
+	4300 4000 4300 4100
+Wire Wire Line
+	4300 3500 4300 3600
+Wire Wire Line
+	4300 4950 4300 5450
+Wire Wire Line
+	4300 4950 4850 4950
+Wire Wire Line
+	3700 5600 3800 5600
+Wire Wire Line
+	3400 5600 3700 5600
+Wire Wire Line
+	3400 5600 3400 5700
+Wire Wire Line
+	3700 6100 4100 6100
+Wire Wire Line
+	4300 6100 4300 6200
+Wire Wire Line
+	4100 6100 4300 6100
+Wire Wire Line
+	2850 5600 2950 5600
+Wire Wire Line
+	3400 6100 3700 6100
+Wire Wire Line
+	4100 4950 4300 4950
+Wire Wire Line
+	4050 4000 4050 4100
+Wire Wire Line
+	7650 1050 7650 1150
+Wire Wire Line
+	10150 3500 10500 3500
+Wire Wire Line
+	10150 4700 10500 4700
+Wire Wire Line
+	10150 5900 10500 5900
+Wire Wire Line
+	2900 4150 2900 4400
+Wire Wire Line
+	2900 4400 2900 4600
+Wire Wire Line
+	2900 3750 3250 3750
+Wire Wire Line
+	10500 3100 10600 3100
+Wire Wire Line
+	10500 3500 10850 3500
+Wire Wire Line
+	10500 5500 10600 5500
+Wire Wire Line
+	10500 5900 10850 5900
+Wire Wire Line
+	10500 4300 10600 4300
+Wire Wire Line
+	10500 4700 10850 4700
+Wire Wire Line
+	10850 3100 10850 3150
+Wire Wire Line
+	10850 4300 10850 4350
+Wire Wire Line
+	10850 5500 10850 5550
+Wire Wire Line
+	4750 5700 4750 5900
+Wire Wire Line
+	4750 5900 4750 6050
+Wire Wire Line
+	6650 5700 6650 5900
+Wire Wire Line
+	6650 5900 6650 6050
+Wire Wire Line
+	4750 6050 4750 6150
+Wire Wire Line
+	4750 6150 4750 6250
+Wire Wire Line
+	4750 6250 4750 6350
+Wire Wire Line
+	4750 6350 4750 6500
+Wire Wire Line
+	4750 6500 4750 6600
+Wire Wire Line
+	4750 6600 4750 6700
+Wire Wire Line
+	4750 6700 4750 6800
+Wire Wire Line
+	4750 6800 4750 6950
+Wire Wire Line
+	6650 6800 6650 6950
+Wire Wire Line
+	6650 6700 6650 6800
+Wire Wire Line
+	6650 6600 6650 6700
+Wire Wire Line
+	6650 6500 6650 6600
+Wire Wire Line
+	6650 6350 6650 6500
+Wire Wire Line
+	6650 6250 6650 6350
+Wire Wire Line
+	6650 6150 6650 6250
+Wire Wire Line
+	6650 6050 6650 6150
+Wire Wire Line
+	4750 6950 4750 7150
+Wire Wire Line
+	4750 7150 4750 7350
+Wire Wire Line
+	4750 7350 4750 7450
+Wire Wire Line
+	6650 6950 6650 7150
+Wire Wire Line
+	6650 7150 6650 7350
+Wire Wire Line
+	6650 7350 6650 7450
 $EndSCHEMATC
diff --git a/ram.sch b/ram.sch
index 3d8832e..749d249 100644
--- a/ram.sch
+++ b/ram.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -78,7 +36,7 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR124
+L power:+3V3 #PWR124
 U 1 1 58D928FF
 P 5250 2000
 F 0 "#PWR124" H 5250 1850 50  0001 C CNN
@@ -89,7 +47,7 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR128
+L power:+3V3 #PWR128
 U 1 1 58D92915
 P 5550 2000
 F 0 "#PWR128" H 5550 1850 50  0001 C CNN
@@ -121,7 +79,7 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR125
+L power:GND #PWR125
 U 1 1 58D929C8
 P 5250 5000
 F 0 "#PWR125" H 5250 4750 50  0001 C CNN
@@ -132,7 +90,7 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR129
+L power:GND #PWR129
 U 1 1 58D929DE
 P 5550 5000
 F 0 "#PWR129" H 5550 4750 50  0001 C CNN
@@ -327,7 +285,7 @@ GN17
 Text GLabel 8550 5850 0    60   Input ~ 0
 GP17
 $Comp
-L C C16
+L ulx3s-rescue:C C16
 U 1 1 59131F17
 P 5350 5900
 F 0 "C16" H 5375 6000 50  0000 L CNN
@@ -338,7 +296,7 @@ F 3 "" H 5350 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR127
+L power:GND #PWR127
 U 1 1 59131FCA
 P 5350 6050
 F 0 "#PWR127" H 5350 5800 50  0001 C CNN
@@ -349,7 +307,7 @@ F 3 "" H 5350 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR126
+L power:+3V3 #PWR126
 U 1 1 59132092
 P 5350 5750
 F 0 "#PWR126" H 5350 5600 50  0001 C CNN
@@ -374,7 +332,7 @@ USB_FPGA_D-
 Text GLabel 4650 3650 0    60   Input ~ 0
 SDRAM_A12
 $Comp
-L MT48LC16M16A2TG U9
+L mt48lc16m16a2tg:MT48LC16M16A2TG U9
 U 1 1 5A04F49A
 P 5450 3500
 AR Path="/5A04F49A" Ref="U9"  Part="1" 
@@ -393,7 +351,7 @@ $EndComp
 Text GLabel 8550 2750 0    60   Input ~ 0
 SDRAM_A12
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 3 1 5A07B063
 P 9300 3150
 AR Path="/5A07B063" Ref="U1"  Part="3" 
@@ -409,7 +367,7 @@ F 6 "842-LFE5U45F6BG381C" H 9300 3150 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 4 1 5A07B0B9
 P 9300 5250
 AR Path="/5A07B0B9" Ref="U1"  Part="4" 
@@ -431,7 +389,7 @@ BTN_U
 Text GLabel 10050 3450 2    60   Input ~ 0
 BTN_R
 $Comp
-L C C33
+L ulx3s-rescue:C C33
 U 1 1 5A5FD142
 P 5900 5900
 F 0 "C33" H 5925 6000 50  0000 L CNN
@@ -442,7 +400,7 @@ F 3 "" H 5900 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR131
+L power:GND #PWR131
 U 1 1 5A5FD148
 P 5900 6050
 F 0 "#PWR131" H 5900 5800 50  0001 C CNN
@@ -453,7 +411,7 @@ F 3 "" H 5900 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR130
+L power:+3V3 #PWR130
 U 1 1 5A5FD14E
 P 5900 5750
 F 0 "#PWR130" H 5900 5600 50  0001 C CNN
@@ -464,7 +422,7 @@ F 3 "" H 5900 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C34
+L ulx3s-rescue:C C34
 U 1 1 5A5FD1C1
 P 6200 5900
 F 0 "C34" H 6225 6000 50  0000 L CNN
@@ -475,7 +433,7 @@ F 3 "" H 6200 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR133
+L power:GND #PWR133
 U 1 1 5A5FD1C7
 P 6200 6050
 F 0 "#PWR133" H 6200 5800 50  0001 C CNN
@@ -486,7 +444,7 @@ F 3 "" H 6200 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR132
+L power:+3V3 #PWR132
 U 1 1 5A5FD1CD
 P 6200 5750
 F 0 "#PWR132" H 6200 5600 50  0001 C CNN
@@ -497,7 +455,7 @@ F 3 "" H 6200 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C35
+L ulx3s-rescue:C C35
 U 1 1 5A5FD26F
 P 6500 5900
 F 0 "C35" H 6525 6000 50  0000 L CNN
@@ -508,7 +466,7 @@ F 3 "" H 6500 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR135
+L power:GND #PWR135
 U 1 1 5A5FD275
 P 6500 6050
 F 0 "#PWR135" H 6500 5800 50  0001 C CNN
@@ -519,7 +477,7 @@ F 3 "" H 6500 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR134
+L power:+3V3 #PWR134
 U 1 1 5A5FD27B
 P 6500 5750
 F 0 "#PWR134" H 6500 5600 50  0001 C CNN
@@ -530,7 +488,7 @@ F 3 "" H 6500 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C52
+L ulx3s-rescue:C C52
 U 1 1 5AC202C5
 P 6800 5900
 F 0 "C52" H 6825 6000 50  0000 L CNN
@@ -541,7 +499,7 @@ F 3 "" H 6800 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR137
+L power:GND #PWR137
 U 1 1 5AC202CB
 P 6800 6050
 F 0 "#PWR137" H 6800 5800 50  0001 C CNN
@@ -552,7 +510,7 @@ F 3 "" H 6800 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR136
+L power:+3V3 #PWR136
 U 1 1 5AC202D1
 P 6800 5750
 F 0 "#PWR136" H 6800 5600 50  0001 C CNN
diff --git a/sdcard.sch b/sdcard.sch
index fe55481..0055bd1 100644
--- a/sdcard.sch
+++ b/sdcard.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR148
+L power:GND #PWR148
 U 1 1 58DA7C6F
 P 3550 3650
 F 0 "#PWR148" H 3550 3400 50  0001 C CNN
@@ -68,7 +26,7 @@ F 3 "" H 3550 3650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR150
+L power:GND #PWR150
 U 1 1 58DA7C71
 P 5800 3950
 F 0 "#PWR150" H 5800 3700 50  0001 C CNN
@@ -79,7 +37,7 @@ F 3 "" H 5800 3950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR146
+L power:+3V3 #PWR146
 U 1 1 58DA7C72
 P 3150 2950
 F 0 "#PWR146" H 3150 2800 50  0001 C CNN
@@ -104,7 +62,7 @@ SD_D1
 Text Notes 4200 4750 0    60   ~ 0
 minimum pins for compatible mode\nSD_CLK, SD_CMD, SD_D0, SD_D3
 $Comp
-L R R38
+L ulx3s-rescue:R R38
 U 1 1 590C5D62
 P 3150 3100
 F 0 "R38" V 3230 3100 50  0000 C CNN
@@ -115,7 +73,7 @@ F 3 "" H 3150 3100 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR147
+L power:GND #PWR147
 U 1 1 590C5E90
 P 3150 3650
 F 0 "#PWR147" H 3150 3400 50  0001 C CNN
@@ -131,7 +89,7 @@ Connection ~ 3150 3300
 Text Label 3250 3300 0    60   ~ 0
 SD3V3
 $Comp
-L C C15
+L ulx3s-rescue:C C15
 U 1 1 590C7447
 P 3150 3500
 F 0 "C15" H 3175 3600 50  0000 L CNN
@@ -142,7 +100,7 @@ F 3 "" H 3150 3500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Micro_SD_Card_CD SD1
+L micro_sd_card_cd:Micro_SD_Card_CD SD1
 U 1 1 590C84AE
 P 4950 3300
 F 0 "SD1" H 4300 3900 50  0000 C CNN
@@ -171,7 +129,7 @@ Wire Wire Line
 Text Notes 3050 4100 0    60   ~ 0
 SDcard connected to\nBANK6 on "usb" sheet
 $Comp
-L GND #PWR149
+L power:GND #PWR149
 U 1 1 5A2A690D
 P 4900 4250
 F 0 "#PWR149" H 4900 4000 50  0001 C CNN
diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index 8eeecf6..ce09c24 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -1,72 +1,63 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# +1V1
+# ESP32_ESP-32S
 #
-DEF +1V1 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V1" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V1 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +2V5
-#
-DEF +2V5 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+2V5" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +2V5 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +3V3
-#
-DEF +3V3 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+3V3" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +3V3 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5V
-#
-DEF +5V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF ESP32_ESP-32S U 0 40 Y Y 1 F N
+F0 "U" -700 1250 60 H V C CNN
+F1 "ESP32_ESP-32S" 500 1250 60 H V C CNN
+F2 "ESP32-footprints-Lib:ESP-32S" 350 1350 60 H I C CNN
+F3 "" -450 450 60 H I C CNN
 DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5V 1 0 0 0 U 50 50 1 1 W N
+S -750 1200 700 -850 0 1 0 f
+P 12 0 1 35 -500 650 -500 1100 -300 1100 -300 850 -100 850 -100 1100 100 1100 100 850 300 850 300 1100 500 1100 500 850 N
+X GND 1 -950 700 200 R 50 50 1 1 w
+X IO25 10 -950 -200 200 R 50 50 1 1 B
+X IO26 11 -950 -300 200 R 50 50 1 1 B
+X IO27 12 -950 -400 200 R 50 50 1 1 B
+X IO14 13 -950 -500 200 R 50 50 1 1 B
+X IO12 14 -950 -600 200 R 50 50 1 1 B
+X GND 15 -450 -1050 200 U 50 50 1 1 W
+X IO13 16 -350 -1050 200 U 50 50 1 1 B
+X SD2 17 -250 -1050 200 U 50 50 1 1 B
+X SD3 18 -150 -1050 200 U 50 50 1 1 B
+X CMD 19 -50 -1050 200 U 50 50 1 1 B
+X 3V3 2 -950 600 200 R 50 50 1 1 W
+X CLK 20 50 -1050 200 U 50 50 1 1 I
+X SDO 21 150 -1050 200 U 50 50 1 1 B
+X SD1 22 250 -1050 200 U 50 50 1 1 B
+X IO15 23 350 -1050 200 U 50 50 1 1 B
+X IO2 24 450 -1050 200 U 50 50 1 1 B
+X IO0 25 900 -650 200 L 50 50 1 1 B
+X IO4 26 900 -550 200 L 50 50 1 1 I
+X IO16 27 900 -450 200 L 50 50 1 1 B
+X IO17 28 900 -350 200 L 50 50 1 1 B
+X IO5 29 900 -250 200 L 50 50 1 1 B
+X EN 3 -950 500 200 R 50 50 1 1 I
+X IO18 30 900 -150 200 L 50 50 1 1 I
+X IO19 31 900 -50 200 L 50 50 1 1 B
+X NC 32 900 50 200 L 50 50 1 1 N
+X IO21 33 900 150 200 L 50 50 1 1 B
+X RXD0 34 900 250 200 L 50 50 1 1 B
+X TXD0 35 900 350 200 L 50 50 1 1 B
+X IO22 36 900 450 200 L 50 50 1 1 B
+X IO23 37 900 550 200 L 50 50 1 1 B
+X GND 38 900 650 200 L 50 50 1 1 W
+X GND-PAD 39 900 750 200 L 50 50 1 1 W
+X SENSOR_VP 4 -950 400 200 R 50 50 1 1 I
+X SENSOR_VN 5 -950 300 200 R 50 50 1 1 I
+X IO34 6 -950 200 200 R 50 50 1 1 B
+X IO35 7 -950 100 200 R 50 50 1 1 B
+X IO32 8 -950 0 200 R 50 50 1 1 B
+X IO33 9 -950 -100 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AP3429A
+# ap3429a_AP3429A
 #
-DEF AP3429A U 0 40 Y Y 1 F N
+DEF ap3429a_AP3429A U 0 40 Y Y 1 F N
 F0 "U" 0 150 60 H V C CNN
-F1 "AP3429A" 0 50 60 H V C CNN
+F1 "ap3429a_AP3429A" 0 50 60 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 $FPLIST
@@ -82,619 +73,50 @@ X FB 5 600 -100 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# Antenna
-#
-DEF Antenna AE 0 40 N N 1 F N
-F0 "AE" -75 75 50 H V R CNN
-F1 "Antenna" -75 0 50 H V R CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 10 0 100 0 -150 N
-P 3 0 1 10 50 100 0 -100 -50 100 N
-X A 1 0 -200 100 U 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Battery_Cell
-#
-DEF Battery_Cell BT 0 0 N N 1 F N
-F0 "BT" 100 100 50 H V L CNN
-F1 "Battery_Cell" 100 0 50 H V L CNN
-F2 "" 0 60 50 V I C CNN
-F3 "" 0 60 50 V I C CNN
-DRAW
-S -90 70 90 60 0 1 0 F
-S -62 47 58 27 0 1 0 F
-P 2 0 1 0 0 30 0 0 N
-P 2 0 1 0 0 70 0 100 N
-P 2 0 1 10 20 135 60 135 N
-P 2 0 1 10 40 155 40 115 N
-X + 1 0 200 100 D 50 50 1 1 P
-X - 2 0 -100 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C
+# ftdi_FT231XS
 #
-DEF C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H I C CNN
+DEF ftdi_FT231XS U 0 40 Y Y 1 F N
+F0 "U" -550 800 50 H V L CNN
+F1 "ftdi_FT231XS" 300 800 50 H V L CNN
+F2 "SSOP-20" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- C_*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 50 50 1 1 P
-X ~ 2 0 -150 110 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_01X01
-#
-DEF CONN_01X01 P 0 40 Y N 1 F N
-F0 "P" 0 100 50 H V C CNN
-F1 "CONN_01X01" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-$FPLIST
- Pin_Header_Straight_1X01
- Pin_Header_Angled_1X01
- Socket_Strip_Straight_1X01
- Socket_Strip_Angled_1X01
-$ENDFPLIST
-DRAW
-S -50 5 10 -5 0 1 0 N
-S -50 50 50 -50 0 1 0 N
-X P1 1 -200 0 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_02X01
-#
-DEF CONN_02X01 P 0 1 Y N 1 F N
-F0 "P" 0 100 50 H V C CNN
-F1 "CONN_02X01" 0 -100 50 H V C CNN
-F2 "" 0 -1200 60 H V C CNN
-F3 "" 0 -1200 60 H V C CNN
-$FPLIST
- Pin_Header_Straight_2X01
- Pin_Header_Angled_2X01
- Socket_Strip_Straight_2X01
- Socket_Strip_Angled_2X01
-$ENDFPLIST
-DRAW
-S -100 5 -50 -5 0 1 0 N
-S -100 50 100 -50 0 1 0 N
-S 50 5 100 -5 0 1 0 N
-X P1 1 -250 0 150 R 50 50 1 1 P
-X P2 2 250 0 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_02X03
-#
-DEF CONN_02X03 P 0 1 Y N 1 F N
-F0 "P" 0 200 50 H V C CNN
-F1 "CONN_02X03" 0 -200 50 H V C CNN
-F2 "" 0 -1200 60 H V C CNN
-F3 "" 0 -1200 60 H V C CNN
-$FPLIST
- Pin_Header_Straight_2X03
- Pin_Header_Angled_2X03
- Socket_Strip_Straight_2X03
- Socket_Strip_Angled_2X03
+ SSOP*
 $ENDFPLIST
 DRAW
-S -100 -95 -50 -105 0 1 0 N
-S -100 5 -50 -5 0 1 0 N
-S -100 105 -50 95 0 1 0 N
-S -100 150 100 -150 0 1 0 N
-S 50 -95 100 -105 0 1 0 N
-S 50 5 100 -5 0 1 0 N
-S 50 105 100 95 0 1 0 N
-X P1 1 -250 100 150 R 50 50 1 1 P
-X P2 2 250 100 150 L 50 50 1 1 P
-X P3 3 -250 0 150 R 50 50 1 1 P
-X P4 4 250 0 150 L 50 50 1 1 P
-X P5 5 -250 -100 150 R 50 50 1 1 P
-X P6 6 250 -100 150 L 50 50 1 1 P
+S -550 750 550 -750 0 1 10 f
+X ~DTR 1 700 200 150 L 50 50 1 1 O
+X CBUS2 10 700 -500 150 L 50 50 1 1 B
+X USBDP 11 -700 200 150 R 50 50 1 1 B
+X USBDM 12 -700 300 150 R 50 50 1 1 B
+X 3V3OUT 13 -700 600 150 R 50 50 1 1 w
+X ~RESET 14 -700 0 150 R 50 50 1 1 I
+X VCC 15 -100 900 150 D 50 50 1 1 W
+X GND 16 100 -900 150 U 50 50 1 1 W
+X CBUS1 17 700 -400 150 L 50 50 1 1 B
+X CBUS0 18 700 -300 150 L 50 50 1 1 B
+X CBUS3 19 700 -600 150 L 50 50 1 1 B
+X ~RTS 2 700 400 150 L 50 50 1 1 I
+X TXD 20 700 600 150 L 50 50 1 1 O
+X VCCIO 3 100 900 150 D 50 50 1 1 W
+X RXD 4 700 500 150 L 50 50 1 1 I
+X ~RI 5 700 -100 150 L 50 50 1 1 I
+X GND 6 -100 -900 150 U 50 50 1 1 W
+X ~DSR 7 700 100 150 L 50 50 1 1 O
+X ~DCD 8 700 0 150 L 50 50 1 1 I
+X ~CTS 9 700 300 150 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# CONN_02X20
+# lfe5bg381_LFE5U-45F-6BG381C
 #
-DEF CONN_02X20 P 0 1 Y N 1 F N
-F0 "P" 0 1050 50 H V C CNN
-F1 "CONN_02X20" 0 0 50 V V C CNN
-F2 "" 0 -950 60 H V C CNN
-F3 "" 0 -950 60 H V C CNN
+DEF lfe5bg381_LFE5U-45F-6BG381C U 0 40 Y Y 10 L N
+F0 "U" 0 950 60 H V C CNN
+F1 "lfe5bg381_LFE5U-45F-6BG381C" 0 850 60 H V C CNN
+F2 "" -1050 950 60 H V C CNN
+F3 "" -1050 950 60 H V C CNN
 $FPLIST
- Pin_Header_Straight_2X20
- Pin_Header_Angled_2X20
- Socket_Strip_Straight_2X20
- Socket_Strip_Angled_2X20
-$ENDFPLIST
-DRAW
-S -100 -945 -50 -955 0 1 0 N
-S -100 -845 -50 -855 0 1 0 N
-S -100 -745 -50 -755 0 1 0 N
-S -100 -645 -50 -655 0 1 0 N
-S -100 -545 -50 -555 0 1 0 N
-S -100 -445 -50 -455 0 1 0 N
-S -100 -345 -50 -355 0 1 0 N
-S -100 -245 -50 -255 0 1 0 N
-S -100 -145 -50 -155 0 1 0 N
-S -100 -45 -50 -55 0 1 0 N
-S -100 55 -50 45 0 1 0 N
-S -100 155 -50 145 0 1 0 N
-S -100 255 -50 245 0 1 0 N
-S -100 355 -50 345 0 1 0 N
-S -100 455 -50 445 0 1 0 N
-S -100 555 -50 545 0 1 0 N
-S -100 655 -50 645 0 1 0 N
-S -100 755 -50 745 0 1 0 N
-S -100 855 -50 845 0 1 0 N
-S -100 955 -50 945 0 1 0 N
-S -100 1000 100 -1000 0 1 0 N
-S 50 -945 100 -955 0 1 0 N
-S 50 -845 100 -855 0 1 0 N
-S 50 -745 100 -755 0 1 0 N
-S 50 -645 100 -655 0 1 0 N
-S 50 -545 100 -555 0 1 0 N
-S 50 -445 100 -455 0 1 0 N
-S 50 -345 100 -355 0 1 0 N
-S 50 -245 100 -255 0 1 0 N
-S 50 -145 100 -155 0 1 0 N
-S 50 -45 100 -55 0 1 0 N
-S 50 55 100 45 0 1 0 N
-S 50 155 100 145 0 1 0 N
-S 50 255 100 245 0 1 0 N
-S 50 355 100 345 0 1 0 N
-S 50 455 100 445 0 1 0 N
-S 50 555 100 545 0 1 0 N
-S 50 655 100 645 0 1 0 N
-S 50 755 100 745 0 1 0 N
-S 50 855 100 845 0 1 0 N
-S 50 955 100 945 0 1 0 N
-X P1 1 -250 950 150 R 50 50 1 1 P
-X P2 2 250 950 150 L 50 50 1 1 P
-X P3 3 -250 850 150 R 50 50 1 1 P
-X P4 4 250 850 150 L 50 50 1 1 P
-X P5 5 -250 750 150 R 50 50 1 1 P
-X P6 6 250 750 150 L 50 50 1 1 P
-X P7 7 -250 650 150 R 50 50 1 1 P
-X P8 8 250 650 150 L 50 50 1 1 P
-X P9 9 -250 550 150 R 50 50 1 1 P
-X P10 10 250 550 150 L 50 50 1 1 P
-X P20 20 250 50 150 L 50 50 1 1 P
-X P30 30 250 -450 150 L 50 50 1 1 P
-X P40 40 250 -950 150 L 50 50 1 1 P
-X P11 11 -250 450 150 R 50 50 1 1 P
-X P21 21 -250 -50 150 R 50 50 1 1 P
-X P31 31 -250 -550 150 R 50 50 1 1 P
-X P12 12 250 450 150 L 50 50 1 1 P
-X P22 22 250 -50 150 L 50 50 1 1 P
-X P32 32 250 -550 150 L 50 50 1 1 P
-X P13 13 -250 350 150 R 50 50 1 1 P
-X P23 23 -250 -150 150 R 50 50 1 1 P
-X P33 33 -250 -650 150 R 50 50 1 1 P
-X P14 14 250 350 150 L 50 50 1 1 P
-X P24 24 250 -150 150 L 50 50 1 1 P
-X P34 34 250 -650 150 L 50 50 1 1 P
-X P15 15 -250 250 150 R 50 50 1 1 P
-X P25 25 -250 -250 150 R 50 50 1 1 P
-X P35 35 -250 -750 150 R 50 50 1 1 P
-X P16 16 250 250 150 L 50 50 1 1 P
-X P26 26 250 -250 150 L 50 50 1 1 P
-X P36 36 250 -750 150 L 50 50 1 1 P
-X P17 17 -250 150 150 R 50 50 1 1 P
-X P27 27 -250 -350 150 R 50 50 1 1 P
-X P37 37 -250 -850 150 R 50 50 1 1 P
-X P18 18 250 150 150 L 50 50 1 1 P
-X P28 28 250 -350 150 L 50 50 1 1 P
-X P38 38 250 -850 150 L 50 50 1 1 P
-X P19 19 -250 50 150 R 50 50 1 1 P
-X P29 29 -250 -450 150 R 50 50 1 1 P
-X P39 39 -250 -950 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Conn_01x03
-#
-DEF Conn_01x03 J 0 40 Y N 1 F N
-F0 "J" 0 200 50 H V C CNN
-F1 "Conn_01x03" 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*:*_??x*mm*
- Connector*:*1x??x*mm*
- Pin?Header?Straight?1X*
- Pin?Header?Angled?1X*
- Socket?Strip?Straight?1X*
- Socket?Strip?Angled?1X*
-$ENDFPLIST
-DRAW
-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 150 50 -150 1 1 10 f
-X Pin_1 1 -200 100 150 R 50 50 1 1 P
-X Pin_2 2 -200 0 150 R 50 50 1 1 P
-X Pin_3 3 -200 -100 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Crystal_GND23
-#
-DEF Crystal_GND23 Y 0 40 Y N 1 F N
-F0 "Y" 125 200 50 H V L CNN
-F1 "Crystal_GND23" 125 125 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Crystal*
-$ENDFPLIST
-DRAW
-S -45 100 45 -100 0 1 12 N
-P 2 0 1 0 -100 0 -80 0 N
-P 2 0 1 20 -80 -50 -80 50 N
-P 2 0 1 0 0 -150 0 -140 N
-P 2 0 1 0 0 140 0 150 N
-P 2 0 1 20 80 -50 80 50 N
-P 2 0 1 0 80 0 100 0 N
-P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
-P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
-X 1 1 -150 0 50 R 50 50 1 1 P
-X 2 2 0 200 50 D 50 50 1 1 P
-X 3 3 0 -200 50 U 50 50 1 1 P
-X 4 4 150 0 50 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Crystal_GND24
-#
-DEF Crystal_GND24 Y 0 40 Y N 1 F N
-F0 "Y" 125 200 50 H V L CNN
-F1 "Crystal_GND24" 125 125 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Crystal*
-$ENDFPLIST
-DRAW
-S -45 100 45 -100 0 1 12 N
-P 2 0 1 0 -100 0 -80 0 N
-P 2 0 1 20 -80 -50 -80 50 N
-P 2 0 1 0 0 -150 0 -140 N
-P 2 0 1 0 0 140 0 150 N
-P 2 0 1 20 80 -50 80 50 N
-P 2 0 1 0 80 0 100 0 N
-P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
-P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
-X 1 1 -150 0 50 R 50 50 1 1 P
-X 2 2 0 200 50 D 50 50 1 1 P
-X 3 3 150 0 50 L 50 50 1 1 P
-X 4 4 0 -200 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D
-#
-DEF D D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 8 -50 50 -50 -50 N
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# DIL8
-#
-DEF DIL8 P 0 40 Y N 1 F N
-F0 "P" 0 250 60 H V C CNN
-F1 "DIL8" 0 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -50 200 50 -200 0 1 0 N
-X P1 1 -350 150 300 R 60 60 1 1 P I
-X P2 2 -350 50 300 R 60 60 1 1 P I
-X P3 3 -350 -50 300 R 60 60 1 1 P I
-X P4 4 -350 -150 300 R 60 60 1 1 P I
-X P5 5 350 -150 300 L 60 60 1 1 P I
-X P6 6 350 -50 300 L 60 60 1 1 P I
-X P7 7 350 50 300 L 60 60 1 1 P I
-X P8 8 350 150 300 L 60 60 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# D_Schottky
-#
-DEF D_Schottky D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_Small
-#
-DEF D_Schottky_Small D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Schottky_Small" -280 -80 50 H V L CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -30 -40 -30 40 N
-P 2 0 1 0 -30 0 30 0 N
-P 3 0 1 0 -30 -40 -20 -40 -20 -30 N
-P 3 0 1 0 -30 40 -40 40 -40 30 N
-P 4 0 1 0 30 -40 -30 0 30 40 30 -40 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
-#
-# D_Zener_Small_ALT
-#
-DEF D_Zener_Small_ALT D 0 10 N N 1 F N
-F0 "D" 0 90 50 H V C CNN
-F1 "D_Zener_Small_ALT" 0 -90 50 H V C CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 30 0 -30 0 N
-P 3 0 1 0 -10 40 -30 40 -30 -40 N
-P 4 0 1 0 30 40 -30 0 30 -40 30 40 F
-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
-#
-# ESP-32S
-#
-DEF ESP-32S U 0 40 Y Y 1 F N
-F0 "U" -700 1250 60 H V C CNN
-F1 "ESP-32S" 500 1250 60 H V C CNN
-F2 "ESP32-footprints-Lib:ESP-32S" 350 1350 60 H I C CNN
-F3 "" -450 450 60 H I C CNN
-DRAW
-S -750 1200 700 -850 0 1 0 f
-P 12 0 1 35 -500 650 -500 1100 -300 1100 -300 850 -100 850 -100 1100 100 1100 100 850 300 850 300 1100 500 1100 500 850 N
-X GND 1 -950 700 200 R 50 50 1 1 w
-X 3V3 2 -950 600 200 R 50 50 1 1 W
-X EN 3 -950 500 200 R 50 50 1 1 I
-X SENSOR_VP 4 -950 400 200 R 50 50 1 1 I
-X SENSOR_VN 5 -950 300 200 R 50 50 1 1 I
-X IO34 6 -950 200 200 R 50 50 1 1 B
-X IO35 7 -950 100 200 R 50 50 1 1 B
-X IO32 8 -950 0 200 R 50 50 1 1 B
-X IO33 9 -950 -100 200 R 50 50 1 1 B
-X IO25 10 -950 -200 200 R 50 50 1 1 B
-X CLK 20 50 -1050 200 U 50 50 1 1 I
-X IO18 30 900 -150 200 L 50 50 1 1 I
-X IO26 11 -950 -300 200 R 50 50 1 1 B
-X SDO 21 150 -1050 200 U 50 50 1 1 B
-X IO19 31 900 -50 200 L 50 50 1 1 B
-X IO27 12 -950 -400 200 R 50 50 1 1 B
-X SD1 22 250 -1050 200 U 50 50 1 1 B
-X NC 32 900 50 200 L 50 50 1 1 N
-X IO14 13 -950 -500 200 R 50 50 1 1 B
-X IO15 23 350 -1050 200 U 50 50 1 1 B
-X IO21 33 900 150 200 L 50 50 1 1 B
-X IO12 14 -950 -600 200 R 50 50 1 1 B
-X IO2 24 450 -1050 200 U 50 50 1 1 B
-X RXD0 34 900 250 200 L 50 50 1 1 B
-X GND 15 -450 -1050 200 U 50 50 1 1 W
-X IO0 25 900 -650 200 L 50 50 1 1 B
-X TXD0 35 900 350 200 L 50 50 1 1 B
-X IO13 16 -350 -1050 200 U 50 50 1 1 B
-X IO4 26 900 -550 200 L 50 50 1 1 I
-X IO22 36 900 450 200 L 50 50 1 1 B
-X SD2 17 -250 -1050 200 U 50 50 1 1 B
-X IO16 27 900 -450 200 L 50 50 1 1 B
-X IO23 37 900 550 200 L 50 50 1 1 B
-X SD3 18 -150 -1050 200 U 50 50 1 1 B
-X IO17 28 900 -350 200 L 50 50 1 1 B
-X GND 38 900 650 200 L 50 50 1 1 W
-X CMD 19 -50 -1050 200 U 50 50 1 1 B
-X IO5 29 900 -250 200 L 50 50 1 1 B
-X GND-PAD 39 900 750 200 L 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# FT231XS
-#
-DEF FT231XS U 0 40 Y Y 1 F N
-F0 "U" -550 800 50 H V L CNN
-F1 "FT231XS" 300 800 50 H V L CNN
-F2 "SSOP-20" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SSOP*
-$ENDFPLIST
-DRAW
-S -550 750 550 -750 0 1 10 f
-X ~DTR 1 700 200 150 L 50 50 1 1 O
-X ~RTS 2 700 400 150 L 50 50 1 1 I
-X VCCIO 3 100 900 150 D 50 50 1 1 W
-X RXD 4 700 500 150 L 50 50 1 1 I
-X ~RI 5 700 -100 150 L 50 50 1 1 I
-X GND 6 -100 -900 150 U 50 50 1 1 W
-X ~DSR 7 700 100 150 L 50 50 1 1 O
-X ~DCD 8 700 0 150 L 50 50 1 1 I
-X ~CTS 9 700 300 150 L 50 50 1 1 I
-X CBUS2 10 700 -500 150 L 50 50 1 1 B
-X TXD 20 700 600 150 L 50 50 1 1 O
-X USBDP 11 -700 200 150 R 50 50 1 1 B
-X USBDM 12 -700 300 150 R 50 50 1 1 B
-X 3V3OUT 13 -700 600 150 R 50 50 1 1 w
-X ~RESET 14 -700 0 150 R 50 50 1 1 I
-X VCC 15 -100 900 150 D 50 50 1 1 W
-X GND 16 100 -900 150 U 50 50 1 1 W
-X CBUS1 17 700 -400 150 L 50 50 1 1 B
-X CBUS0 18 700 -300 150 L 50 50 1 1 B
-X CBUS3 19 700 -600 150 L 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# JACK_TRS_6PINS
-#
-DEF JACK_TRS_6PINS J 0 30 Y Y 1 F N
-F0 "J" 0 400 50 H V C CNN
-F1 "JACK_TRS_6PINS" -50 -300 50 H V C CNN
-F2 "" 100 -150 60 H V C CNN
-F3 "" 100 -150 60 H V C CNN
-DRAW
-P 3 0 0 0 150 -200 150 -100 300 -100 N
-P 3 0 0 0 150 0 150 100 300 100 N
-P 3 0 0 0 150 200 150 300 300 300 N
-P 4 0 0 0 -350 200 -300 150 -250 200 300 200 N
-P 4 0 0 0 -250 0 -200 50 50 -200 300 -200 N
-S -450 200 -400 -50 0 1 0 F
-S 300 -250 -400 350 0 1 0 N
-P 2 0 1 0 50 0 300 0 N
-P 4 0 1 0 50 0 0 50 -50 0 -50 0 N
-P 4 0 1 0 100 -150 150 -200 200 -150 200 -150 N
-P 4 0 1 0 100 50 150 0 200 50 200 50 N
-P 4 0 1 0 100 250 150 200 200 250 200 250 N
-X S 1 400 200 100 L 50 50 1 1 P
-X T 2 400 0 100 L 50 50 1 1 P
-X R 3 400 -200 100 L 50 50 1 1 P
-X SN 4 400 300 100 L 50 50 1 1 P
-X TN 5 400 100 100 L 50 50 1 1 P
-X RN 6 400 -100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NC_Small
-#
-DEF Jumper_NC_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NC_Small" 10 -60 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# L
-#
-DEF L L 0 40 N N 1 F N
-F0 "L" -50 0 50 V V C CNN
-F1 "L" 75 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Choke_*
- *Coil*
- Inductor_*
- L_*
-$ENDFPLIST
-DRAW
-A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
-A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
-A 0 25 25 -899 899 0 1 0 N 0 0 0 50
-A 0 75 25 -899 899 0 1 0 N 0 50 0 100
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_ALT
-#
-DEF LED_ALT D 0 40 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "LED_ALT" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
-$ENDFPLIST
-DRAW
-P 2 0 1 8 -50 -50 -50 50 N
-P 2 0 1 0 -50 0 50 0 N
-P 4 0 1 8 50 -50 50 50 -50 0 50 -50 F
-P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
-P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LFE5U-45F-6BG381C
-#
-DEF LFE5U-45F-6BG381C U 0 40 Y Y 10 L N
-F0 "U" 0 950 60 H V C CNN
-F1 "LFE5U-45F-6BG381C" 0 850 60 H V C CNN
-F2 "" -1050 950 60 H V C CNN
-F3 "" -1050 950 60 H V C CNN
-$FPLIST
- BGA381
+ BGA381
 $ENDFPLIST
 DRAW
 T 0 0 -1050 60 0 2 0 BANK1 Normal 0 C C
@@ -706,640 +128,1242 @@ T 0 0 -950 60 0 7 0 BANK8 Normal 0 C C
 T 0 0 -1100 60 0 8 0 BANK50,51 Normal 0 C C
 T 0 0 50 60 0 10 0 JTAG Normal 0 C C
 T 0 0 -750 60 0 1 1 BANK0 Normal 0 C C
+T 0 0 -1200 60 0 8 1 SERDES Normal 0 C C
+T 0 0 150 60 0 9 1 POWER Normal 0 C C
+T 0 0 -50 60 0 10 1 PROG Normal 0 C C
 S -550 800 550 -700 1 1 0 N
 S -250 250 250 -250 1 1 0 N
 S -200 200 0 100 1 1 0 N
+S -550 800 550 -1000 2 1 0 N
+S -250 250 250 -250 2 1 0 N
+S 0 200 200 100 2 1 0 N
+S -550 800 550 -900 3 1 0 N
+S -250 250 250 -250 3 1 0 N
+S 200 200 100 0 3 1 0 N
+S -550 800 550 -1000 4 1 0 N
+S -250 250 250 -250 4 1 0 N
+S 100 0 200 -200 4 1 0 N
+S -550 800 550 -1000 5 1 0 N
+S -250 250 250 -250 5 1 0 N
+S -200 0 -100 -200 5 1 0 N
+S -550 800 550 -900 6 1 0 N
+S -250 250 250 -250 6 1 0 N
+S -200 200 -100 0 6 1 0 N
+S -550 800 550 -900 7 1 0 N
+S -250 250 250 -250 7 1 0 N
+S -200 -200 0 -100 7 1 0 N
+S -650 1000 650 -1050 8 1 0 N
+S -250 250 250 -250 8 1 0 N
+S 150 -200 -150 -150 8 1 0 N
+S -4300 450 4650 -500 9 1 0 N
+S -250 250 250 -250 9 1 0 N
+S -100 100 100 -100 9 1 0 N
+S -500 250 300 -250 10 1 0 N
+X PCLKT0_1 A10 -750 600 200 R 50 50 1 1 I
+X PCLKC0_1 A11 750 600 200 L 50 50 1 1 I
 X PT4A A6 -750 -400 200 R 50 50 1 1 I
-X PT4B B6 750 -400 200 L 50 50 1 1 I
-X PT11A C6 -750 -100 200 R 50 50 1 1 I
-X PT6B D6 750 -300 200 L 50 50 1 1 I
-X PT6A E6 -750 -300 200 R 50 50 1 1 I
 X PT18A A7 -750 200 200 R 50 50 1 1 I
-X PT11B C7 750 -100 200 L 50 50 1 1 I
-X PT9B D7 750 -200 200 L 50 50 1 1 I
-X PT9A E7 -750 -200 200 R 50 50 1 1 I
 X PT18B A8 750 200 200 L 50 50 1 1 I
-X PT15B B8 750 100 200 L 50 50 1 1 I
-X PT15A C8 -750 100 200 R 50 50 1 1 I
-X PT13B D8 750 0 200 L 50 50 1 1 I
-X PT13A E8 -750 0 200 R 50 50 1 1 I
 X GR_PCLK0_1 A9 -750 500 200 R 50 50 1 1 I
-X PT31A B9 -750 400 200 R 50 50 1 1 I
-X PT27A C9 -750 -600 200 R 50 50 1 1 I
-X PT20A D9 -750 300 200 R 50 50 1 1 I
-X PT20B E9 750 300 200 L 50 50 1 1 I
-X PCLKT0_1 A10 -750 600 200 R 50 50 1 1 I
 X GR_PCLK0_0 B10 750 500 200 L 50 50 1 1 I
+X PCLKT0_0 B11 -750 700 200 R 50 50 1 1 I
+X PT4B B6 750 -400 200 L 50 50 1 1 I
+X PT15B B8 750 100 200 L 50 50 1 1 I
+X PT31A B9 -750 400 200 R 50 50 1 1 I
 X PT31B C10 750 400 200 L 50 50 1 1 I
+X PCLKC0_0 C11 750 700 200 L 50 50 1 1 I
+X PT11A C6 -750 -100 200 R 50 50 1 1 I
+X PT11B C7 750 -100 200 L 50 50 1 1 I
+X PT15A C8 -750 100 200 R 50 50 1 1 I
+X PT27A C9 -750 -600 200 R 50 50 1 1 I
 X PT29A D10 -750 -500 200 R 50 50 1 1 I
+X PT6B D6 750 -300 200 L 50 50 1 1 I
+X PT9B D7 750 -200 200 L 50 50 1 1 I
+X PT13B D8 750 0 200 L 50 50 1 1 I
+X PT20A D9 -750 300 200 R 50 50 1 1 I
 X PT29B E10 750 -500 200 L 50 50 1 1 I
-X PCLKC0_1 A11 750 600 200 L 50 50 1 1 I
-X PCLKT0_0 B11 -750 700 200 R 50 50 1 1 I
-X PCLKC0_0 C11 750 700 200 L 50 50 1 1 I
-S -550 800 550 -1000 2 1 0 N
-S -250 250 250 -250 2 1 0 N
-S 0 200 200 100 2 1 0 N
-X PT85B B20 750 700 200 L 50 50 2 1 I
-X PCLKT1_1 D11 -750 -800 200 R 50 50 2 1 I
-X PCLKC1_1 E11 750 -800 200 L 50 50 2 1 I
+X PT6A E6 -750 -300 200 R 50 50 1 1 I
+X PT9A E7 -750 -200 200 R 50 50 1 1 I
+X PT13A E8 -750 0 200 R 50 50 1 1 I
+X PT20B E9 750 300 200 L 50 50 1 1 I
 X PT49A A12 -750 -500 200 R 50 50 2 1 I
-X PCLKT1_0 B12 -750 -700 200 R 50 50 2 1 I
-X PCLKC1_0 C12 750 -700 200 L 50 50 2 1 I
-X GR_PCLK1_0 D12 -750 -600 200 R 50 50 2 1 I
-X GR_PCLK1_1 E12 750 -600 200 L 50 50 2 1 I
 X PT49B A13 750 -500 200 L 50 50 2 1 I
-X PT51A B13 -750 -400 200 R 50 50 2 1 I
-X PT51B C13 750 -400 200 L 50 50 2 1 I
-X PT53A D13 -750 -300 200 R 50 50 2 1 I
-X PT53B E13 750 -300 200 L 50 50 2 1 I
 X PT56A A14 -750 -200 200 R 50 50 2 1 I
-X PT56B C14 750 -200 200 L 50 50 2 1 I
-X PT58A D14 -750 -100 200 R 50 50 2 1 I
-X PT58B E14 750 -100 200 L 50 50 2 1 I
 X PT67A A15 -750 -900 200 R 50 50 2 1 I
-X PT69A B15 -750 0 200 R 50 50 2 1 I
-X PT69B C15 750 0 200 L 50 50 2 1 I
-X PT71A D15 -750 100 200 R 50 50 2 1 I
-X PT71B E15 750 100 200 L 50 50 2 1 I
 X PT74A A16 -750 200 200 R 50 50 2 1 I
-X PT74B B16 750 200 200 L 50 50 2 1 I
-X PT76A C16 -750 300 200 R 50 50 2 1 I
-X PT76B D16 750 300 200 L 50 50 2 1 I
 X PT80A A17 -750 500 200 R 50 50 2 1 I
-X PT78A B17 -750 400 200 R 50 50 2 1 I
-X PT78B C17 750 400 200 L 50 50 2 1 I
 X PT83A A18 -750 600 200 R 50 50 2 1 I
-X PT80B B18 750 500 200 L 50 50 2 1 I
 X PT85A A19 -750 700 200 R 50 50 2 1 I
+X PCLKT1_0 B12 -750 -700 200 R 50 50 2 1 I
+X PT51A B13 -750 -400 200 R 50 50 2 1 I
+X PT69A B15 -750 0 200 R 50 50 2 1 I
+X PT74B B16 750 200 200 L 50 50 2 1 I
+X PT78A B17 -750 400 200 R 50 50 2 1 I
+X PT80B B18 750 500 200 L 50 50 2 1 I
 X PT83B B19 750 600 200 L 50 50 2 1 I
-S -550 800 550 -900 3 1 0 N
-S -250 250 250 -250 3 1 0 N
-S 200 200 100 0 3 1 0 N
+X PT85B B20 750 700 200 L 50 50 2 1 I
+X PCLKC1_0 C12 750 -700 200 L 50 50 2 1 I
+X PT51B C13 750 -400 200 L 50 50 2 1 I
+X PT56B C14 750 -200 200 L 50 50 2 1 I
+X PT69B C15 750 0 200 L 50 50 2 1 I
+X PT76A C16 -750 300 200 R 50 50 2 1 I
+X PT78B C17 750 400 200 L 50 50 2 1 I
+X PCLKT1_1 D11 -750 -800 200 R 50 50 2 1 I
+X GR_PCLK1_0 D12 -750 -600 200 R 50 50 2 1 I
+X PT53A D13 -750 -300 200 R 50 50 2 1 I
+X PT58A D14 -750 -100 200 R 50 50 2 1 I
+X PT71A D15 -750 100 200 R 50 50 2 1 I
+X PT76B D16 750 300 200 L 50 50 2 1 I
+X PCLKC1_1 E11 750 -800 200 L 50 50 2 1 I
+X GR_PCLK1_1 E12 750 -600 200 L 50 50 2 1 I
+X PT53B E13 750 -300 200 L 50 50 2 1 I
+X PT58B E14 750 -100 200 L 50 50 2 1 I
+X PT71B E15 750 100 200 L 50 50 2 1 I
+X PR11A C18 -750 -800 200 R 50 50 3 1 I
 X PR23A C20 -750 0 200 R 50 50 3 1 I
+X PR11B D17 750 -800 200 L 50 50 3 1 I
+X PR14A D18 -750 -600 200 R 50 50 3 1 I
+X PR23B D19 750 0 200 L 50 50 3 1 I
 X VREF1_2 D20 -750 100 200 R 50 50 3 1 I
-X PR26A E20 -750 200 200 R 50 50 3 1 I
-X PR26C F20 -750 300 200 R 50 50 3 1 I
-X PR26D G20 750 300 200 L 50 50 3 1 I
-X PR29B H20 750 400 200 L 50 50 3 1 I
-X PCLKT2_0 J20 -750 700 200 R 50 50 3 1 I
-X PCLKC2_0 K20 750 700 200 L 50 50 3 1 I
 X PR11C E16 -750 -700 200 R 50 50 3 1 I
-X PR11D F16 750 -700 200 L 50 50 3 1 I
-X PR17C G16 -750 -300 200 R 50 50 3 1 I
-X PR17D H16 750 -300 200 L 50 50 3 1 I
-X PR20D J16 750 -100 200 L 50 50 3 1 I
-X PR11B D17 750 -800 200 L 50 50 3 1 I
 X PR14B E17 750 -600 200 L 50 50 3 1 I
-X PR17A F17 -750 -400 200 R 50 50 3 1 I
-X PR20B H17 750 -200 200 L 50 50 3 1 I
-X PR20C J17 -750 -100 200 R 50 50 3 1 I
-X PR11A C18 -750 -800 200 R 50 50 3 1 I
-X PR14A D18 -750 -600 200 R 50 50 3 1 I
 X PR14C E18 -750 -500 200 R 50 50 3 1 I
+X PR23D E19 750 100 200 L 50 50 3 1 I
+X PR26A E20 -750 200 200 R 50 50 3 1 I
+X PR11D F16 750 -700 200 L 50 50 3 1 I
+X PR17A F17 -750 -400 200 R 50 50 3 1 I
 X PR14D F18 750 -500 200 L 50 50 3 1 I
+X PR26B F19 750 200 200 L 50 50 3 1 I
+X PR26C F20 -750 300 200 R 50 50 3 1 I
+X PR17C G16 -750 -300 200 R 50 50 3 1 I
 X PR17B G18 750 -400 200 L 50 50 3 1 I
+X GR_PCLK2_1 G19 -750 400 200 R 50 50 3 1 I
+X PR26D G20 750 300 200 L 50 50 3 1 I
+X PR17D H16 750 -300 200 L 50 50 3 1 I
+X PR20B H17 750 -200 200 L 50 50 3 1 I
 X PR20A H18 -750 -200 200 R 50 50 3 1 I
+X PR29B H20 750 400 200 L 50 50 3 1 I
+X PR20D J16 750 -100 200 L 50 50 3 1 I
+X PR20C J17 -750 -100 200 R 50 50 3 1 I
 X GR_PCLK2_0 J18 -750 500 200 R 50 50 3 1 I
-X PR29D K18 750 500 200 L 50 50 3 1 I
-X PR23B D19 750 0 200 L 50 50 3 1 I
-X PR23D E19 750 100 200 L 50 50 3 1 I
-X PR26B F19 750 200 200 L 50 50 3 1 I
-X GR_PCLK2_1 G19 -750 400 200 R 50 50 3 1 I
 X PCLKT2_1 J19 -750 600 200 R 50 50 3 1 I
+X PCLKT2_0 J20 -750 700 200 R 50 50 3 1 I
+X PR29D K18 750 500 200 L 50 50 3 1 I
 X PCLKC2_1 K19 750 600 200 L 50 50 3 1 I
-S -550 800 550 -1000 4 1 0 N
-S -250 250 250 -250 4 1 0 N
-S 100 0 200 -200 4 1 0 N
-X PCLKT3_1 L20 -750 -800 200 R 50 50 4 1 I
-X PCLKC3_1 M20 750 -800 200 L 50 50 4 1 I
-X PR59B N20 750 0 200 L 50 50 4 1 I
-X PR62A P20 -750 200 200 R 50 50 4 1 I
-X PR62B R20 750 200 200 L 50 50 4 1 I
-X PR62C T20 -750 300 200 R 50 50 4 1 I
-X PR62D U20 750 300 200 L 50 50 4 1 I
+X PCLKC2_0 K20 750 700 200 L 50 50 3 1 I
 X GR_PCLK3_0 L16 -750 -600 200 R 50 50 4 1 I
-X PR41A N16 -750 -400 200 R 50 50 4 1 I
-X VREF1_3 P16 750 -200 200 L 50 50 4 1 I
-X PR44C R16 -750 -100 200 R 50 50 4 1 I
-X PR53A T16 -750 -900 200 R 50 50 4 1 I
-X GPLL0T_IN U16 -750 700 200 R 50 50 4 1 I
 X PR38B L17 750 -600 200 L 50 50 4 1 I
-X PR41B M17 750 -400 200 L 50 50 4 1 I
-X PR44A N17 -750 -200 200 R 50 50 4 1 I
-X PR41D P17 750 -300 200 L 50 50 4 1 I
-X PR44D R17 750 -100 200 L 50 50 4 1 I
-X GPLL0C_IN T17 750 700 200 L 50 50 4 1 I
-X PR68B U17 750 600 200 L 50 50 4 1 I
 X GR_PCLK3_1 L18 -750 -500 200 R 50 50 4 1 I
+X PCLKT3_0 L19 -750 -700 200 R 50 50 4 1 I
+X PCLKT3_1 L20 -750 -800 200 R 50 50 4 1 I
+X PR41B M17 750 -400 200 L 50 50 4 1 I
 X PR38D M18 750 -500 200 L 50 50 4 1 I
+X PCLKC3_0 M19 750 -700 200 L 50 50 4 1 I
+X PCLKC3_1 M20 750 -800 200 L 50 50 4 1 I
+X PR41A N16 -750 -400 200 R 50 50 4 1 I
+X PR44A N17 -750 -200 200 R 50 50 4 1 I
 X PR41C N18 -750 -300 200 R 50 50 4 1 I
+X PR59A N19 -750 0 200 R 50 50 4 1 I
+X PR59B N20 750 0 200 L 50 50 4 1 I
+X VREF1_3 P16 750 -200 200 L 50 50 4 1 I
+X PR41D P17 750 -300 200 L 50 50 4 1 I
 X PR59D P18 750 100 200 L 50 50 4 1 I
+X PR59C P19 -750 100 200 R 50 50 4 1 I
+X PR62A P20 -750 200 200 R 50 50 4 1 I
+X PR44C R16 -750 -100 200 R 50 50 4 1 I
+X PR44D R17 750 -100 200 L 50 50 4 1 I
 X PR65B R18 750 400 200 L 50 50 4 1 I
+X PR62B R20 750 200 200 L 50 50 4 1 I
+X PR53A T16 -750 -900 200 R 50 50 4 1 I
+X GPLL0C_IN T17 750 700 200 L 50 50 4 1 I
 X PR65D T18 750 500 200 L 50 50 4 1 I
-X PR68A U18 -750 600 200 R 50 50 4 1 I
-X PCLKT3_0 L19 -750 -700 200 R 50 50 4 1 I
-X PCLKC3_0 M19 750 -700 200 L 50 50 4 1 I
-X PR59A N19 -750 0 200 R 50 50 4 1 I
-X PR59C P19 -750 100 200 R 50 50 4 1 I
 X PR65A T19 -750 400 200 R 50 50 4 1 I
+X PR62C T20 -750 300 200 R 50 50 4 1 I
+X GPLL0T_IN U16 -750 700 200 R 50 50 4 1 I
+X PR68B U17 750 600 200 L 50 50 4 1 I
+X PR68A U18 -750 600 200 R 50 50 4 1 I
 X PR65C U19 -750 500 200 R 50 50 4 1 I
-S -550 800 550 -1000 5 1 0 N
-S -250 250 250 -250 5 1 0 N
-S -200 0 -100 -200 5 1 0 N
+X PR62D U20 750 300 200 L 50 50 4 1 I
 X PCLKC6_1 F1 750 600 200 L 50 50 5 1 I
 X PCLKC6_0 G1 750 700 200 L 50 50 5 1 I
-X PL41C H1 -750 300 200 R 50 50 5 1 I
-X PL41B J1 750 200 200 L 50 50 5 1 I
-X PL41D K1 750 300 200 L 50 50 5 1 I
-X PL65C L1 -750 -500 200 R 50 50 5 1 I
-X PL65B M1 750 -600 200 L 50 50 5 1 I
-X PL65D N1 750 -500 200 L 50 50 5 1 I
-X PL68A P1 -750 -800 200 R 50 50 5 1 I
 X PCLKT6_1 G2 -750 600 200 R 50 50 5 1 I
-X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
-X PL41A K2 -750 200 200 R 50 50 5 1 I
-X PL62D L2 750 -300 200 L 50 50 5 1 I
-X PL65A N2 -750 -600 200 R 50 50 5 1 I
-X PL68B P2 750 -800 200 L 50 50 5 1 I
+X PL41C H1 -750 300 200 R 50 50 5 1 I
+X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
+X PL41B J1 750 200 200 L 50 50 5 1 I
 X GR_PCLK6_1 J3 -750 500 200 R 50 50 5 1 I
-X PL38D K3 750 500 200 L 50 50 5 1 I
-X PL62C L3 -750 -300 200 R 50 50 5 1 I
-X PL62B M3 750 -400 200 L 50 50 5 1 I
-X PL62A N3 -750 -400 200 R 50 50 5 1 I
-X GPLL0T_IN P3 -750 -700 200 R 50 50 5 1 I
 X GR_PCLK6_0 J4 -750 400 200 R 50 50 5 1 I
-X PL44A K4 -750 0 200 R 50 50 5 1 I
-X PL44C L4 -750 100 200 R 50 50 5 1 I
-X PL59A M4 -750 -200 200 R 50 50 5 1 I
-X PL59C N4 -750 -100 200 R 50 50 5 1 I
-X GPLL0C_IN P4 750 -700 200 L 50 50 5 1 I
 X PL38B J5 750 400 200 L 50 50 5 1 I
+X PL41D K1 750 300 200 L 50 50 5 1 I
+X PL41A K2 -750 200 200 R 50 50 5 1 I
+X PL38D K3 750 500 200 L 50 50 5 1 I
+X PL44A K4 -750 0 200 R 50 50 5 1 I
 X VREF1_6 K5 750 0 200 L 50 50 5 1 I
+X PL65C L1 -750 -500 200 R 50 50 5 1 I
+X PL62D L2 750 -300 200 L 50 50 5 1 I
+X PL62C L3 -750 -300 200 R 50 50 5 1 I
+X PL44C L4 -750 100 200 R 50 50 5 1 I
 X PL44D L5 750 100 200 L 50 50 5 1 I
+X PL65B M1 750 -600 200 L 50 50 5 1 I
+X PL62B M3 750 -400 200 L 50 50 5 1 I
+X PL59A M4 -750 -200 200 R 50 50 5 1 I
 X PL53A M5 -750 -900 200 R 50 50 5 1 I
+X PL65D N1 750 -500 200 L 50 50 5 1 I
+X PL65A N2 -750 -600 200 R 50 50 5 1 I
+X PL62A N3 -750 -400 200 R 50 50 5 1 I
+X PL59C N4 -750 -100 200 R 50 50 5 1 I
 X PL59B N5 750 -200 200 L 50 50 5 1 I
+X PL68A P1 -750 -800 200 R 50 50 5 1 I
+X PL68B P2 750 -800 200 L 50 50 5 1 I
+X GPLL0T_IN P3 -750 -700 200 R 50 50 5 1 I
+X GPLL0C_IN P4 750 -700 200 L 50 50 5 1 I
 X PL59D P5 750 -100 200 L 50 50 5 1 I
-S -550 800 550 -900 6 1 0 N
-S -250 250 250 -250 6 1 0 N
-S -200 200 -100 0 6 1 0 N
-X PL23B B1 750 -200 200 L 50 50 6 1 I
-X PL26A C1 -750 -400 200 R 50 50 6 1 I
-X PL26B D1 750 -400 200 L 50 50 6 1 I
-X PL26D E1 750 -300 200 L 50 50 6 1 I
 X PL23A A2 -750 -200 200 R 50 50 6 1 I
-X VREF1_7 B2 -750 -100 200 R 50 50 6 1 I
-X PL23D C2 750 -100 200 L 50 50 6 1 I
-X PL26C D2 -750 -300 200 R 50 50 6 1 I
-X PCLKC7_0 E2 750 -700 200 L 50 50 6 1 I
-X PCLKT7_0 F2 -750 -700 200 R 50 50 6 1 I
 X PL14C A3 -750 500 200 R 50 50 6 1 I
-X PL14D B3 750 500 200 L 50 50 6 1 I
-X PL17C C3 -750 300 200 R 50 50 6 1 I
-X PL17D D3 750 300 200 L 50 50 6 1 I
-X PL20B E3 750 0 200 L 50 50 6 1 I
-X PCLKC7_1 F3 750 -800 200 L 50 50 6 1 I
-X PCLKT7_1 G3 -750 -800 200 R 50 50 6 1 I
-X PL29D H3 750 -500 200 L 50 50 6 1 I
 X PL11A A4 -750 600 200 R 50 50 6 1 I
-X PL14B B4 750 400 200 L 50 50 6 1 I
-X PL14A C4 -750 400 200 R 50 50 6 1 I
-X PL17A E4 -750 200 200 R 50 50 6 1 I
-X PL20A F4 -750 0 200 R 50 50 6 1 I
-X GR_PCLK7_1 H4 -750 -600 200 R 50 50 6 1 I
 X PL11B A5 750 600 200 L 50 50 6 1 I
+X PL23B B1 750 -200 200 L 50 50 6 1 I
+X VREF1_7 B2 -750 -100 200 R 50 50 6 1 I
+X PL14D B3 750 500 200 L 50 50 6 1 I
+X PL14B B4 750 400 200 L 50 50 6 1 I
 X PL11C B5 -750 700 200 R 50 50 6 1 I
+X PL26A C1 -750 -400 200 R 50 50 6 1 I
+X PL23D C2 750 -100 200 L 50 50 6 1 I
+X PL17C C3 -750 300 200 R 50 50 6 1 I
+X PL14A C4 -750 400 200 R 50 50 6 1 I
 X PL11D C5 750 700 200 L 50 50 6 1 I
+X PL26B D1 750 -400 200 L 50 50 6 1 I
+X PL26C D2 -750 -300 200 R 50 50 6 1 I
+X PL17D D3 750 300 200 L 50 50 6 1 I
 X PL17B D5 750 200 200 L 50 50 6 1 I
+X PL26D E1 750 -300 200 L 50 50 6 1 I
+X PCLKC7_0 E2 750 -700 200 L 50 50 6 1 I
+X PL20B E3 750 0 200 L 50 50 6 1 I
+X PL17A E4 -750 200 200 R 50 50 6 1 I
 X PL20C E5 -750 100 200 R 50 50 6 1 I
+X PCLKT7_0 F2 -750 -700 200 R 50 50 6 1 I
+X PCLKC7_1 F3 750 -800 200 L 50 50 6 1 I
+X PL20A F4 -750 0 200 R 50 50 6 1 I
 X PL20D F5 750 100 200 L 50 50 6 1 I
+X PCLKT7_1 G3 -750 -800 200 R 50 50 6 1 I
 X PL29B G5 750 -600 200 L 50 50 6 1 I
+X PL29D H3 750 -500 200 L 50 50 6 1 I
+X GR_PCLK7_1 H4 -750 -600 200 R 50 50 6 1 I
 X GR_PCLK7_0 H5 -750 -500 200 R 50 50 6 1 I
-S -550 800 550 -900 7 1 0 N
-S -250 250 250 -250 7 1 0 N
-S -200 -200 0 -100 7 1 0 N
 X D7 R1 -750 700 200 R 50 50 7 1 I
-X D6 T1 750 700 200 L 50 50 7 1 I
-X D5/MISO2 U1 -750 600 200 R 50 50 7 1 I
-X D4/MOSI2 V1 750 600 200 L 50 50 7 1 I
-X D3/HOLDn W1 -750 500 200 R 50 50 7 1 I
 X CSSPIN R2 -750 200 200 R 50 50 7 1 I
-X SN/CSn T2 -750 300 200 R 50 50 7 1 I
-X CS1n U2 750 300 200 L 50 50 7 1 I
-X D1/MISO V2 -750 400 200 R 50 50 7 1 I
-X D0/MOSI W2 750 400 200 L 50 50 7 1 I
-X D2/WPn Y2 750 500 200 L 50 50 7 1 I
 X DOUT/CSOn R3 750 200 200 L 50 50 7 1 I
+X CFG_2 R4 -750 -400 200 R 50 50 7 1 I
+X D6 T1 750 700 200 L 50 50 7 1 I
+X SN/CSn T2 -750 300 200 R 50 50 7 1 I
 X WRITEn T3 -750 -100 200 R 50 50 7 1 I
+X CFG_1 T4 -750 -500 200 R 50 50 7 1 I
+X D5/MISO2 U1 -750 600 200 R 50 50 7 1 I
+X CS1n U2 750 300 200 L 50 50 7 1 I
 X CCLK U3 -750 -200 200 R 50 50 7 1 I
+X CFG_0 U4 -750 -600 200 R 50 50 7 1 I
+X D4/MOSI2 V1 750 600 200 L 50 50 7 1 I
+X D1/MISO V2 -750 400 200 R 50 50 7 1 I
 X INITn V3 -750 100 200 R 50 50 7 1 I
+X D3/HOLDn W1 -750 500 200 R 50 50 7 1 I
+X D0/MOSI W2 750 400 200 L 50 50 7 1 I
 X PROGRAMn W3 -750 0 200 R 50 50 7 1 I
+X D2/WPn Y2 750 500 200 L 50 50 7 1 I
 X DONE Y3 -750 -300 200 R 50 50 7 1 I
-X CFG_2 R4 -750 -400 200 R 50 50 7 1 I
-X CFG_1 T4 -750 -500 200 R 50 50 7 1 I
-X CFG_0 U4 -750 -600 200 R 50 50 7 1 I
-T 0 0 -1200 60 0 8 1 SERDES Normal 0 C C
-S -650 1000 650 -1050 8 1 0 N
-S -250 250 250 -250 8 1 0 N
-S 150 -200 -150 -150 8 1 0 N
-X RESERVED W4 -850 800 200 R 50 50 8 1 I
-X RESERVED W5 850 800 200 L 50 50 8 1 I
-X GND Y5 -850 700 200 R 50 50 8 1 I
+X GND T10 850 350 200 L 50 50 8 1 I
+X GND T11 -850 -300 200 R 50 50 8 1 I
+X GND T12 -850 -400 200 R 50 50 8 1 I
+X GND T13 850 -400 200 L 50 50 8 1 I
+X GND T14 850 -300 200 L 50 50 8 1 I
+X GND T15 -850 -100 200 R 50 50 8 1 I
 X GND T6 -850 150 200 R 50 50 8 1 I
-X GND U6 -850 50 200 R 50 50 8 1 I
-X GND Y6 850 700 200 L 50 50 8 1 I
 X GND T7 -850 350 200 R 50 50 8 1 I
-X GND Y7 -850 500 200 R 50 50 8 1 I
 X GND T8 -850 250 200 R 50 50 8 1 I
-X RESERVED W8 -850 600 200 R 50 50 8 1 I
-X GND Y8 850 500 200 L 50 50 8 1 I
 X GND T9 850 250 200 L 50 50 8 1 I
-X RESERVED W9 850 600 200 L 50 50 8 1 I
-X GND T10 850 350 200 L 50 50 8 1 I
+X GND U15 -850 -200 200 R 50 50 8 1 I
+X GND U6 -850 50 200 R 50 50 8 1 I
 X GND V10 850 150 200 L 50 50 8 1 I
-X GND W20 850 -550 200 L 50 50 8 1 I
-X GND T11 -850 -300 200 R 50 50 8 1 I
 X GND V11 850 50 200 L 50 50 8 1 I
-X GND Y11 -850 900 200 R 50 50 8 1 I
-X GND T12 -850 -400 200 R 50 50 8 1 I
-X GND Y12 850 900 200 L 50 50 8 1 I
-X GND T13 850 -400 200 L 50 50 8 1 I
+X GND V17 850 -100 200 L 50 50 8 1 I
+X GND V18 850 -200 200 L 50 50 8 1 I
 X RESERVED W13 -850 -650 200 R 50 50 8 1 I
-X GND T14 850 -300 200 L 50 50 8 1 I
 X RESERVED W14 850 -650 200 L 50 50 8 1 I
+X RESERVED W17 -850 -850 200 R 50 50 8 1 I
+X RESERVED W18 850 -850 200 L 50 50 8 1 I
+X GND W20 850 -550 200 L 50 50 8 1 I
+X RESERVED W4 -850 800 200 R 50 50 8 1 I
+X RESERVED W5 850 800 200 L 50 50 8 1 I
+X RESERVED W8 -850 600 200 R 50 50 8 1 I
+X RESERVED W9 850 600 200 L 50 50 8 1 I
+X GND Y11 -850 900 200 R 50 50 8 1 I
+X GND Y12 850 900 200 L 50 50 8 1 I
 X GND Y14 -850 -750 200 R 50 50 8 1 I
-X GND T15 -850 -100 200 R 50 50 8 1 I
-X GND U15 -850 -200 200 R 50 50 8 1 I
 X GND Y15 850 -750 200 L 50 50 8 1 I
 X GND Y16 -850 -950 200 R 50 50 8 1 I
-X GND V17 850 -100 200 L 50 50 8 1 I
-X RESERVED W17 -850 -850 200 R 50 50 8 1 I
 X GND Y17 850 -950 200 L 50 50 8 1 I
-X GND V18 850 -200 200 L 50 50 8 1 I
-X RESERVED W18 850 -850 200 L 50 50 8 1 I
 X GND Y19 -850 -550 200 R 50 50 8 1 I
-T 0 0 150 60 0 9 1 POWER Normal 0 C C
-S -4300 450 4650 -500 9 1 0 N
-S -250 250 250 -250 9 1 0 N
-S -100 100 100 -100 9 1 0 N
-X GND J2 1850 -700 200 U 50 50 9 1 I
-X GND M2 1950 -700 200 U 50 50 9 1 I
-X GND D4 1650 -700 200 U 50 50 9 1 I
-X GND G4 1750 -700 200 U 50 50 9 1 I
-X GND V5 2850 -700 200 U 50 50 9 1 I
-X VCCAUX F6 -1900 650 200 D 50 50 9 1 I
-X GND G6 1350 -700 200 U 50 50 9 1 I
-X VCCio7 H6 1150 650 200 D 50 50 9 1 I
-X VCCio7 J6 1250 650 200 D 50 50 9 1 I
-X GND K6 1450 -700 200 U 50 50 9 1 I
-X VCCio6 L6 750 650 200 D 50 50 9 1 I
-X VCCio6 M6 850 650 200 D 50 50 9 1 I
-X GND N6 1550 -700 200 U 50 50 9 1 I
-X VCCAUX P6 -1800 650 200 D 50 50 9 1 I
-X GND V6 3050 -700 200 U 50 50 9 1 I
-X GND W6 2950 -700 200 U 50 50 9 1 I
-X GND B7 550 -700 200 U 50 50 9 1 I
-X GND F7 650 -700 200 U 50 50 9 1 I
-X GND G7 750 -700 200 U 50 50 9 1 I
-X VCCio7 H7 1050 650 200 D 50 50 9 1 I
-X GND J7 850 -700 200 U 50 50 9 1 I
-X GND K7 950 -700 200 U 50 50 9 1 I
-X VCCio6 L7 650 650 200 D 50 50 9 1 I
-X GND M7 1050 -700 200 U 50 50 9 1 I
-X GND N7 1150 -700 200 U 50 50 9 1 I
-X GND P7 1250 -700 200 U 50 50 9 1 I
-X GND U7 2350 -700 200 U 50 50 9 1 I
-X GND V7 2050 -700 200 U 50 50 9 1 I
-X GND W7 3150 -700 200 U 50 50 9 1 I
-X GND F8 250 -700 200 U 50 50 9 1 I
-X GND G8 350 -700 200 U 50 50 9 1 I
-X VCC H8 -2800 650 200 D 50 50 9 1 I
-X VCC J8 -2700 650 200 D 50 50 9 1 I
-X VCC K8 -2600 650 200 D 50 50 9 1 I
-X VCC L8 -2500 650 200 D 50 50 9 1 I
-X VCC M8 -2400 650 200 D 50 50 9 1 I
-X VCC N8 -2300 650 200 D 50 50 9 1 I
-X GND P8 450 -700 200 U 50 50 9 1 I
-X GND U8 2450 -700 200 U 50 50 9 1 I
-X GND V8 2150 -700 200 U 50 50 9 1 I
-X VCCio0 F9 -1500 650 200 D 50 50 9 1 I
-X GND G9 -250 -700 200 U 50 50 9 1 I
-X VCC H9 -3000 650 200 D 50 50 9 1 I
-X GND J9 -150 -700 200 U 50 50 9 1 I
-X GND K9 -50 -700 200 U 50 50 9 1 I
-X GND L9 50 -700 200 U 50 50 9 1 I
-X GND M9 150 -700 200 U 50 50 9 1 I
-X VCC N9 -2900 650 200 D 50 50 9 1 I
-X VCCio8 P9 1550 650 200 D 50 50 9 1 I
-X GND U9 2550 -700 200 U 50 50 9 1 I
-X GND V9 2250 -700 200 U 50 50 9 1 I
-X VCCio0 F10 -1600 650 200 D 50 50 9 1 I
-X GND G10 -750 -700 200 U 50 50 9 1 I
-X VCC H10 -3200 650 200 D 50 50 9 1 I
-X GND J10 -650 -700 200 U 50 50 9 1 I
-X GND K10 -550 -700 200 U 50 50 9 1 I
-X GND L10 -450 -700 200 U 50 50 9 1 I
-X GND M10 -350 -700 200 U 50 50 9 1 I
-X VCC N10 -3100 650 200 D 50 50 9 1 I
-X VCCio8 P10 1450 650 200 D 50 50 9 1 I
-X GND U10 2650 -700 200 U 50 50 9 1 I
-X GND V20 2750 -700 200 U 50 50 9 1 I
-X VCCio1 F11 -1200 650 200 D 50 50 9 1 I
-X GND G11 -1350 -700 200 U 50 50 9 1 I
-X VCC H11 -3400 650 200 D 50 50 9 1 I
-X GND J11 -1250 -700 200 U 50 50 9 1 I
-X GND K11 -1150 -700 200 U 50 50 9 1 I
-X GND L11 -1050 -700 200 U 50 50 9 1 I
-X GND M11 -950 -700 200 U 50 50 9 1 I
-X VCC N11 -3300 650 200 D 50 50 9 1 I
-X GND P11 -850 -700 200 U 50 50 9 1 I
-X GND U11 4550 -700 200 U 50 50 9 1 I
-X VCCio1 F12 -1300 650 200 D 50 50 9 1 I
-X GND G12 -1950 -700 200 U 50 50 9 1 I
-X VCC H12 -3600 650 200 D 50 50 9 1 I
-X GND J12 -1850 -700 200 U 50 50 9 1 I
-X GND K12 -1750 -700 200 U 50 50 9 1 I
-X GND L12 -1650 -700 200 U 50 50 9 1 I
-X GND M12 -1550 -700 200 U 50 50 9 1 I
-X VCC N12 -3500 650 200 D 50 50 9 1 I
-X GND P12 -1450 -700 200 U 50 50 9 1 I
-X GND U12 4250 -700 200 U 50 50 9 1 I
-X GND V12 4350 -700 200 U 50 50 9 1 I
-X GND W12 4450 -700 200 U 50 50 9 1 I
-X GND F13 -2250 -700 200 U 50 50 9 1 I
-X GND G13 -2150 -700 200 U 50 50 9 1 I
-X VCC H13 -4200 650 200 D 50 50 9 1 I
-X VCC J13 -4100 650 200 D 50 50 9 1 I
-X VCC K13 -4000 650 200 D 50 50 9 1 I
-X VCC L13 -3900 650 200 D 50 50 9 1 I
-X VCC M13 -3800 650 200 D 50 50 9 1 I
-X VCC N13 -3700 650 200 D 50 50 9 1 I
-X GND P13 -2050 -700 200 U 50 50 9 1 I
-X GND U13 4050 -700 200 U 50 50 9 1 I
-X GND V13 4150 -700 200 U 50 50 9 1 I
+X GND Y5 -850 700 200 R 50 50 8 1 I
+X GND Y6 850 700 200 L 50 50 8 1 I
+X GND Y7 -850 500 200 R 50 50 8 1 I
+X GND Y8 850 500 200 L 50 50 8 1 I
 X GND B14 -3050 -700 200 U 50 50 9 1 I
+X GND B7 550 -700 200 U 50 50 9 1 I
+X GND C19 -3850 -700 200 U 50 50 9 1 I
+X GND D4 1650 -700 200 U 50 50 9 1 I
+X VCCio0 F10 -1600 650 200 D 50 50 9 1 I
+X VCCio1 F11 -1200 650 200 D 50 50 9 1 I
+X VCCio1 F12 -1300 650 200 D 50 50 9 1 I
+X GND F13 -2250 -700 200 U 50 50 9 1 I
 X GND F14 -2950 -700 200 U 50 50 9 1 I
+X VCCAUX F15 -2100 650 200 D 50 50 9 1 I
+X VCCAUX F6 -1900 650 200 D 50 50 9 1 I
+X GND F7 650 -700 200 U 50 50 9 1 I
+X GND F8 250 -700 200 U 50 50 9 1 I
+X VCCio0 F9 -1500 650 200 D 50 50 9 1 I
+X GND G10 -750 -700 200 U 50 50 9 1 I
+X GND G11 -1350 -700 200 U 50 50 9 1 I
+X GND G12 -1950 -700 200 U 50 50 9 1 I
+X GND G13 -2150 -700 200 U 50 50 9 1 I
 X GND G14 -2850 -700 200 U 50 50 9 1 I
+X GND G15 -3350 -700 200 U 50 50 9 1 I
+X GND G17 -3550 -700 200 U 50 50 9 1 I
+X GND G4 1750 -700 200 U 50 50 9 1 I
+X GND G6 1350 -700 200 U 50 50 9 1 I
+X GND G7 750 -700 200 U 50 50 9 1 I
+X GND G8 350 -700 200 U 50 50 9 1 I
+X GND G9 -250 -700 200 U 50 50 9 1 I
+X VCC H10 -3200 650 200 D 50 50 9 1 I
+X VCC H11 -3400 650 200 D 50 50 9 1 I
+X VCC H12 -3600 650 200 D 50 50 9 1 I
+X VCC H13 -4200 650 200 D 50 50 9 1 I
 X VCCio2 H14 -800 650 200 D 50 50 9 1 I
+X VCCio2 H15 -1000 650 200 D 50 50 9 1 I
+X GND H19 -3750 -700 200 U 50 50 9 1 I
+X VCCio7 H6 1150 650 200 D 50 50 9 1 I
+X VCCio7 H7 1050 650 200 D 50 50 9 1 I
+X VCC H8 -2800 650 200 D 50 50 9 1 I
+X VCC H9 -3000 650 200 D 50 50 9 1 I
+X GND J10 -650 -700 200 U 50 50 9 1 I
+X GND J11 -1250 -700 200 U 50 50 9 1 I
+X GND J12 -1850 -700 200 U 50 50 9 1 I
+X VCC J13 -4100 650 200 D 50 50 9 1 I
 X GND J14 -2750 -700 200 U 50 50 9 1 I
+X VCCio2 J15 -900 650 200 D 50 50 9 1 I
+X GND J2 1850 -700 200 U 50 50 9 1 I
+X VCCio7 J6 1250 650 200 D 50 50 9 1 I
+X GND J7 850 -700 200 U 50 50 9 1 I
+X VCC J8 -2700 650 200 D 50 50 9 1 I
+X GND J9 -150 -700 200 U 50 50 9 1 I
+X GND K10 -550 -700 200 U 50 50 9 1 I
+X GND K11 -1150 -700 200 U 50 50 9 1 I
+X GND K12 -1750 -700 200 U 50 50 9 1 I
+X VCC K13 -4000 650 200 D 50 50 9 1 I
 X GND K14 -2650 -700 200 U 50 50 9 1 I
+X GND K15 -3250 -700 200 U 50 50 9 1 I
+X GND K6 1450 -700 200 U 50 50 9 1 I
+X GND K7 950 -700 200 U 50 50 9 1 I
+X VCC K8 -2600 650 200 D 50 50 9 1 I
+X GND K9 -50 -700 200 U 50 50 9 1 I
+X GND L10 -450 -700 200 U 50 50 9 1 I
+X GND L11 -1050 -700 200 U 50 50 9 1 I
+X GND L12 -1650 -700 200 U 50 50 9 1 I
+X VCC L13 -3900 650 200 D 50 50 9 1 I
 X VCCio3 L14 -400 650 200 D 50 50 9 1 I
+X VCCio3 L15 -600 650 200 D 50 50 9 1 I
+X VCCio6 L6 750 650 200 D 50 50 9 1 I
+X VCCio6 L7 650 650 200 D 50 50 9 1 I
+X VCC L8 -2500 650 200 D 50 50 9 1 I
+X GND L9 50 -700 200 U 50 50 9 1 I
+X GND M10 -350 -700 200 U 50 50 9 1 I
+X GND M11 -950 -700 200 U 50 50 9 1 I
+X GND M12 -1550 -700 200 U 50 50 9 1 I
+X VCC M13 -3800 650 200 D 50 50 9 1 I
 X GND M14 -2550 -700 200 U 50 50 9 1 I
+X VCCio3 M15 -500 650 200 D 50 50 9 1 I
+X GND M16 -3450 -700 200 U 50 50 9 1 I
+X GND M2 1950 -700 200 U 50 50 9 1 I
+X VCCio6 M6 850 650 200 D 50 50 9 1 I
+X GND M7 1050 -700 200 U 50 50 9 1 I
+X VCC M8 -2400 650 200 D 50 50 9 1 I
+X GND M9 150 -700 200 U 50 50 9 1 I
+X VCC N10 -3100 650 200 D 50 50 9 1 I
+X VCC N11 -3300 650 200 D 50 50 9 1 I
+X VCC N12 -3500 650 200 D 50 50 9 1 I
+X VCC N13 -3700 650 200 D 50 50 9 1 I
 X GND N14 -2450 -700 200 U 50 50 9 1 I
+X GND N15 -3150 -700 200 U 50 50 9 1 I
+X GND N6 1550 -700 200 U 50 50 9 1 I
+X GND N7 1150 -700 200 U 50 50 9 1 I
+X VCC N8 -2300 650 200 D 50 50 9 1 I
+X VCC N9 -2900 650 200 D 50 50 9 1 I
+X VCCio8 P10 1450 650 200 D 50 50 9 1 I
+X GND P11 -850 -700 200 U 50 50 9 1 I
+X GND P12 -1450 -700 200 U 50 50 9 1 I
+X GND P13 -2050 -700 200 U 50 50 9 1 I
 X GND P14 -2350 -700 200 U 50 50 9 1 I
+X VCCAUX P15 -2000 650 200 D 50 50 9 1 I
+X VCCAUX P6 -1800 650 200 D 50 50 9 1 I
+X GND P7 1250 -700 200 U 50 50 9 1 I
+X GND P8 450 -700 200 U 50 50 9 1 I
+X VCCio8 P9 1550 650 200 D 50 50 9 1 I
+X GND R19 -3650 -700 200 U 50 50 9 1 I
+X GND U10 2650 -700 200 U 50 50 9 1 I
+X GND U11 4550 -700 200 U 50 50 9 1 I
+X GND U12 4250 -700 200 U 50 50 9 1 I
+X GND U13 4050 -700 200 U 50 50 9 1 I
 X GND U14 3850 -700 200 U 50 50 9 1 I
+X GND U7 2350 -700 200 U 50 50 9 1 I
+X GND U8 2450 -700 200 U 50 50 9 1 I
+X GND U9 2550 -700 200 U 50 50 9 1 I
+X GND V12 4350 -700 200 U 50 50 9 1 I
+X GND V13 4150 -700 200 U 50 50 9 1 I
 X GND V14 3750 -700 200 U 50 50 9 1 I
-X VCCAUX F15 -2100 650 200 D 50 50 9 1 I
-X GND G15 -3350 -700 200 U 50 50 9 1 I
-X VCCio2 H15 -1000 650 200 D 50 50 9 1 I
-X VCCio2 J15 -900 650 200 D 50 50 9 1 I
-X GND K15 -3250 -700 200 U 50 50 9 1 I
-X VCCio3 L15 -600 650 200 D 50 50 9 1 I
-X VCCio3 M15 -500 650 200 D 50 50 9 1 I
-X GND N15 -3150 -700 200 U 50 50 9 1 I
-X VCCAUX P15 -2000 650 200 D 50 50 9 1 I
 X GND V15 3250 -700 200 U 50 50 9 1 I
-X GND W15 3950 -700 200 U 50 50 9 1 I
-X GND M16 -3450 -700 200 U 50 50 9 1 I
 X GND V16 3450 -700 200 U 50 50 9 1 I
-X GND W16 3350 -700 200 U 50 50 9 1 I
-X GND G17 -3550 -700 200 U 50 50 9 1 I
-X GND C19 -3850 -700 200 U 50 50 9 1 I
-X GND H19 -3750 -700 200 U 50 50 9 1 I
-X GND R19 -3650 -700 200 U 50 50 9 1 I
 X GND V19 3650 -700 200 U 50 50 9 1 I
+X GND V20 2750 -700 200 U 50 50 9 1 I
+X GND V5 2850 -700 200 U 50 50 9 1 I
+X GND V6 3050 -700 200 U 50 50 9 1 I
+X GND V7 2050 -700 200 U 50 50 9 1 I
+X GND V8 2150 -700 200 U 50 50 9 1 I
+X GND V9 2250 -700 200 U 50 50 9 1 I
+X GND W12 4450 -700 200 U 50 50 9 1 I
+X GND W15 3950 -700 200 U 50 50 9 1 I
+X GND W16 3350 -700 200 U 50 50 9 1 I
 X GND W19 3550 -700 200 U 50 50 9 1 I
-T 0 0 -50 60 0 10 1 PROG Normal 0 C C
-S -500 250 300 -250 10 1 0 N
-X TDO V4 -700 50 200 R 50 50 10 1 I
+X GND W6 2950 -700 200 U 50 50 9 1 I
+X GND W7 3150 -700 200 U 50 50 9 1 I
 X TDI R5 -700 150 200 R 50 50 10 1 I
 X TCK T5 -700 -50 200 R 50 50 10 1 I
 X TMS U5 -700 -150 200 R 50 50 10 1 I
+X TDO V4 -700 50 200 R 50 50 10 1 I
+ENDDRAW
+ENDDEF
+#
+# max1112x_MAX11123
+#
+DEF max1112x_MAX11123 U 0 40 Y Y 1 F N
+F0 "U" -50 900 50 H V L CNN
+F1 "max1112x_MAX11123" -200 800 50 H V L CNN
+F2 "" 0 50 50 H V C CNN
+F3 "" 0 50 50 H V C CNN
+$FPLIST
+ TQFN28
+ QFN28
+$ENDFPLIST
+DRAW
+S -300 750 300 -1000 0 1 10 f
+X AIN3 1 -400 100 100 R 50 50 1 1 O
+X GND 10 400 0 100 L 50 50 1 1 O
+X GND 11 400 -100 100 L 50 50 1 1 O
+X CNVSTn 12 400 -200 100 L 50 50 1 1 O
+X REF- 13 400 -300 100 L 50 50 1 1 I
+X GND 14 -400 -700 100 R 50 50 1 1 W
+X REF+ 15 -400 -550 100 R 50 50 1 1 O
+X GND 16 -400 -800 100 R 50 50 1 1 W
+X VDD 17 -400 650 100 R 50 50 1 1 W
+X VDD 18 -400 550 100 R 50 50 1 1 W
+X SCLK 19 400 -450 100 L 50 50 1 1 O C
+X AIN4 2 -400 0 100 R 50 50 1 1 O
+X CSn 20 400 -650 100 L 50 50 1 1 O
+X DIN 21 400 -750 100 L 50 50 1 1 O
+X DGND 22 400 550 100 L 50 50 1 1 W
+X OVDD 23 400 650 100 L 50 50 1 1 O
+X DOUT 24 400 -550 100 L 50 50 1 1 O
+X EOCn 25 -400 -450 100 R 50 50 1 1 W
+X AIN0 26 -400 400 100 R 50 50 1 1 I
+X AIN1 27 -400 300 100 R 50 50 1 1 I
+X AIN2 28 -400 200 100 R 50 50 1 1 O
+X GND 29 -400 -900 100 R 50 50 1 1 W
+X AIN5 3 -400 -100 100 R 50 50 1 1 O
+X AIN6 4 -400 -200 100 R 50 50 1 1 O
+X AIN7 5 -400 -300 100 R 50 50 1 1 I
+X GND 6 400 400 100 L 50 50 1 1 I
+X GND 7 400 300 100 L 50 50 1 1 I
+X GND 8 400 200 100 L 50 50 1 1 O
+X GND 9 400 100 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_CONN_01X01
+#
+DEF micro-hdmi-d_CONN_01X01 P 0 40 Y N 1 F N
+F0 "P" 0 100 50 H V C CNN
+F1 "micro-hdmi-d_CONN_01X01" 100 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X01
+ Pin_Header_Angled_1X01
+ Socket_Strip_Straight_1X01
+ Socket_Strip_Angled_1X01
+$ENDFPLIST
+DRAW
+S -50 5 10 -5 0 1 0 N
+S -50 50 50 -50 0 1 0 N
+X P1 1 -200 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_CONN_02X01
+#
+DEF micro-hdmi-d_CONN_02X01 P 0 1 Y N 1 F N
+F0 "P" 0 100 50 H V C CNN
+F1 "micro-hdmi-d_CONN_02X01" 0 -100 50 H V C CNN
+F2 "" 0 -1200 60 H V C CNN
+F3 "" 0 -1200 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X01
+ Pin_Header_Angled_2X01
+ Socket_Strip_Straight_2X01
+ Socket_Strip_Angled_2X01
+$ENDFPLIST
+DRAW
+S -100 5 -50 -5 0 1 0 N
+S -100 50 100 -50 0 1 0 N
+S 50 5 100 -5 0 1 0 N
+X P1 1 -250 0 150 R 50 50 1 1 P
+X P2 2 250 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_CONN_02X03
+#
+DEF micro-hdmi-d_CONN_02X03 P 0 1 Y N 1 F N
+F0 "P" 0 200 50 H V C CNN
+F1 "micro-hdmi-d_CONN_02X03" 0 -200 50 H V C CNN
+F2 "" 0 -1200 60 H V C CNN
+F3 "" 0 -1200 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X03
+ Pin_Header_Angled_2X03
+ Socket_Strip_Straight_2X03
+ Socket_Strip_Angled_2X03
+$ENDFPLIST
+DRAW
+S -100 -95 -50 -105 0 1 0 N
+S -100 5 -50 -5 0 1 0 N
+S -100 105 -50 95 0 1 0 N
+S -100 150 100 -150 0 1 0 N
+S 50 -95 100 -105 0 1 0 N
+S 50 5 100 -5 0 1 0 N
+S 50 105 100 95 0 1 0 N
+X P1 1 -250 100 150 R 50 50 1 1 P
+X P2 2 250 100 150 L 50 50 1 1 P
+X P3 3 -250 0 150 R 50 50 1 1 P
+X P4 4 250 0 150 L 50 50 1 1 P
+X P5 5 -250 -100 150 R 50 50 1 1 P
+X P6 6 250 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_CONN_02X20
+#
+DEF micro-hdmi-d_CONN_02X20 P 0 1 Y N 1 F N
+F0 "P" 0 1050 50 H V C CNN
+F1 "micro-hdmi-d_CONN_02X20" 0 0 50 V V C CNN
+F2 "" 0 -950 60 H V C CNN
+F3 "" 0 -950 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X20
+ Pin_Header_Angled_2X20
+ Socket_Strip_Straight_2X20
+ Socket_Strip_Angled_2X20
+$ENDFPLIST
+DRAW
+S -100 -945 -50 -955 0 1 0 N
+S -100 -845 -50 -855 0 1 0 N
+S -100 -745 -50 -755 0 1 0 N
+S -100 -645 -50 -655 0 1 0 N
+S -100 -545 -50 -555 0 1 0 N
+S -100 -445 -50 -455 0 1 0 N
+S -100 -345 -50 -355 0 1 0 N
+S -100 -245 -50 -255 0 1 0 N
+S -100 -145 -50 -155 0 1 0 N
+S -100 -45 -50 -55 0 1 0 N
+S -100 55 -50 45 0 1 0 N
+S -100 155 -50 145 0 1 0 N
+S -100 255 -50 245 0 1 0 N
+S -100 355 -50 345 0 1 0 N
+S -100 455 -50 445 0 1 0 N
+S -100 555 -50 545 0 1 0 N
+S -100 655 -50 645 0 1 0 N
+S -100 755 -50 745 0 1 0 N
+S -100 855 -50 845 0 1 0 N
+S -100 955 -50 945 0 1 0 N
+S -100 1000 100 -1000 0 1 0 N
+S 50 -945 100 -955 0 1 0 N
+S 50 -845 100 -855 0 1 0 N
+S 50 -745 100 -755 0 1 0 N
+S 50 -645 100 -655 0 1 0 N
+S 50 -545 100 -555 0 1 0 N
+S 50 -445 100 -455 0 1 0 N
+S 50 -345 100 -355 0 1 0 N
+S 50 -245 100 -255 0 1 0 N
+S 50 -145 100 -155 0 1 0 N
+S 50 -45 100 -55 0 1 0 N
+S 50 55 100 45 0 1 0 N
+S 50 155 100 145 0 1 0 N
+S 50 255 100 245 0 1 0 N
+S 50 355 100 345 0 1 0 N
+S 50 455 100 445 0 1 0 N
+S 50 555 100 545 0 1 0 N
+S 50 655 100 645 0 1 0 N
+S 50 755 100 745 0 1 0 N
+S 50 855 100 845 0 1 0 N
+S 50 955 100 945 0 1 0 N
+X P1 1 -250 950 150 R 50 50 1 1 P
+X P10 10 250 550 150 L 50 50 1 1 P
+X P11 11 -250 450 150 R 50 50 1 1 P
+X P12 12 250 450 150 L 50 50 1 1 P
+X P13 13 -250 350 150 R 50 50 1 1 P
+X P14 14 250 350 150 L 50 50 1 1 P
+X P15 15 -250 250 150 R 50 50 1 1 P
+X P16 16 250 250 150 L 50 50 1 1 P
+X P17 17 -250 150 150 R 50 50 1 1 P
+X P18 18 250 150 150 L 50 50 1 1 P
+X P19 19 -250 50 150 R 50 50 1 1 P
+X P2 2 250 950 150 L 50 50 1 1 P
+X P20 20 250 50 150 L 50 50 1 1 P
+X P21 21 -250 -50 150 R 50 50 1 1 P
+X P22 22 250 -50 150 L 50 50 1 1 P
+X P23 23 -250 -150 150 R 50 50 1 1 P
+X P24 24 250 -150 150 L 50 50 1 1 P
+X P25 25 -250 -250 150 R 50 50 1 1 P
+X P26 26 250 -250 150 L 50 50 1 1 P
+X P27 27 -250 -350 150 R 50 50 1 1 P
+X P28 28 250 -350 150 L 50 50 1 1 P
+X P29 29 -250 -450 150 R 50 50 1 1 P
+X P3 3 -250 850 150 R 50 50 1 1 P
+X P30 30 250 -450 150 L 50 50 1 1 P
+X P31 31 -250 -550 150 R 50 50 1 1 P
+X P32 32 250 -550 150 L 50 50 1 1 P
+X P33 33 -250 -650 150 R 50 50 1 1 P
+X P34 34 250 -650 150 L 50 50 1 1 P
+X P35 35 -250 -750 150 R 50 50 1 1 P
+X P36 36 250 -750 150 L 50 50 1 1 P
+X P37 37 -250 -850 150 R 50 50 1 1 P
+X P38 38 250 -850 150 L 50 50 1 1 P
+X P39 39 -250 -950 150 R 50 50 1 1 P
+X P4 4 250 850 150 L 50 50 1 1 P
+X P40 40 250 -950 150 L 50 50 1 1 P
+X P5 5 -250 750 150 R 50 50 1 1 P
+X P6 6 250 750 150 L 50 50 1 1 P
+X P7 7 -250 650 150 R 50 50 1 1 P
+X P8 8 250 650 150 L 50 50 1 1 P
+X P9 9 -250 550 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_DIL8
+#
+DEF micro-hdmi-d_DIL8 P 0 40 Y N 1 F N
+F0 "P" 0 250 60 H V C CNN
+F1 "micro-hdmi-d_DIL8" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -50 200 50 -200 0 1 0 N
+X P1 1 -350 150 300 R 60 60 1 1 P I
+X P2 2 -350 50 300 R 60 60 1 1 P I
+X P3 3 -350 -50 300 R 60 60 1 1 P I
+X P4 4 -350 -150 300 R 60 60 1 1 P I
+X P5 5 350 -150 300 L 60 60 1 1 P I
+X P6 6 350 -50 300 L 60 60 1 1 P I
+X P7 7 350 50 300 L 60 60 1 1 P I
+X P8 8 350 150 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_JACK_TRS_6PINS
+#
+DEF micro-hdmi-d_JACK_TRS_6PINS J 0 30 Y Y 1 F N
+F0 "J" 0 400 50 H V C CNN
+F1 "micro-hdmi-d_JACK_TRS_6PINS" -50 -300 50 H V C CNN
+F2 "" 100 -150 60 H V C CNN
+F3 "" 100 -150 60 H V C CNN
+DRAW
+S -450 200 -400 -50 0 1 0 F
+S 300 -250 -400 350 0 1 0 N
+P 3 0 0 0 150 -200 150 -100 300 -100 N
+P 3 0 0 0 150 0 150 100 300 100 N
+P 3 0 0 0 150 200 150 300 300 300 N
+P 4 0 0 0 -350 200 -300 150 -250 200 300 200 N
+P 4 0 0 0 -250 0 -200 50 50 -200 300 -200 N
+P 2 0 1 0 50 0 300 0 N
+P 4 0 1 0 50 0 0 50 -50 0 -50 0 N
+P 4 0 1 0 100 -150 150 -200 200 -150 200 -150 N
+P 4 0 1 0 100 50 150 0 200 50 200 50 N
+P 4 0 1 0 100 250 150 200 200 250 200 250 N
+X S 1 400 200 100 L 50 50 1 1 P
+X T 2 400 0 100 L 50 50 1 1 P
+X R 3 400 -200 100 L 50 50 1 1 P
+X SN 4 400 300 100 L 50 50 1 1 P
+X TN 5 400 100 100 L 50 50 1 1 P
+X RN 6 400 -100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# micro-hdmi-d_MICRO-HDMI-D
+#
+DEF micro-hdmi-d_MICRO-HDMI-D P 0 40 Y N 1 F N
+F0 "P" 0 1050 50 H V C CNN
+F1 "micro-hdmi-d_MICRO-HDMI-D" 100 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ micro-hdmi-d
+$ENDFPLIST
+DRAW
+S -50 -1000 50 1000 0 1 0 N
+S -50 -945 10 -955 0 1 0 N
+S -50 -845 10 -855 0 1 0 N
+S -50 -745 10 -755 0 1 0 N
+S -50 -645 10 -655 0 1 0 N
+S -50 -545 10 -555 0 1 0 N
+S -50 -445 10 -455 0 1 0 N
+S -50 -345 10 -355 0 1 0 N
+S -50 -245 10 -255 0 1 0 N
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 255 10 245 0 1 0 N
+S -50 355 10 345 0 1 0 N
+S -50 455 10 445 0 1 0 N
+S -50 555 10 545 0 1 0 N
+S -50 655 10 645 0 1 0 N
+S -50 755 10 745 0 1 0 N
+S -50 855 10 845 0 1 0 N
+S -50 955 10 945 0 1 0 N
+X 0 0 -200 950 150 R 50 50 1 1 P
+X P1 1 -200 850 150 R 50 50 1 1 P
+X P10 10 -200 -50 150 R 50 50 1 1 P
+X P11 11 -200 -150 150 R 50 50 1 1 P
+X P12 12 -200 -250 150 R 50 50 1 1 P
+X P13 13 -200 -350 150 R 50 50 1 1 P
+X P14 14 -200 -450 150 R 50 50 1 1 P
+X P15 15 -200 -550 150 R 50 50 1 1 P
+X P16 16 -200 -650 150 R 50 50 1 1 P
+X P17 17 -200 -750 150 R 50 50 1 1 P
+X P18 18 -200 -850 150 R 50 50 1 1 P
+X P19 19 -200 -950 150 R 50 50 1 1 P
+X P2 2 -200 750 150 R 50 50 1 1 P
+X P3 3 -200 650 150 R 50 50 1 1 P
+X P4 4 -200 550 150 R 50 50 1 1 P
+X P5 5 -200 450 150 R 50 50 1 1 P
+X P6 6 -200 350 150 R 50 50 1 1 P
+X P7 7 -200 250 150 R 50 50 1 1 P
+X P8 8 -200 150 150 R 50 50 1 1 P
+X P9 9 -200 50 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# micro_sd_card_cd_Micro_SD_Card_CD
+#
+DEF micro_sd_card_cd_Micro_SD_Card_CD J 0 40 Y Y 1 F N
+F0 "J" -650 600 50 H V C CNN
+F1 "micro_sd_card_cd_Micro_SD_Card_CD" 650 600 50 H V R CNN
+F2 "" 1150 300 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -300 -375 -200 -425 0 1 0 F
+S -300 -275 -200 -325 0 1 0 F
+S -300 -175 -200 -225 0 1 0 F
+S -300 -75 -200 -125 0 1 0 F
+S -300 25 -200 -25 0 1 0 F
+S -300 125 -200 75 0 1 0 F
+S -300 225 -200 175 0 1 0 F
+S -300 325 -200 275 0 1 0 F
+P 6 0 1 10 650 500 650 550 -750 550 -750 -650 650 -650 650 -450 N
+P 11 0 1 10 -350 -450 -350 350 -50 350 100 500 150 500 150 450 250 450 300 500 800 500 800 -450 -350 -450 f
+X DAT2 1 -900 300 150 R 50 50 1 1 B
+X CD 10 -50 -850 200 U 50 50 1 1 I
+X CD 11 50 -850 200 U 50 50 1 1 I
+X DAT3/CD 2 -900 200 150 R 50 50 1 1 B
+X CMD 3 -900 100 150 R 50 50 1 1 I
+X VDD 4 -900 0 150 R 50 50 1 1 W
+X CLK 5 -900 -100 150 R 50 50 1 1 I
+X VSS 6 -900 -200 150 R 50 50 1 1 W
+X DAT0 7 -900 -300 150 R 50 50 1 1 I
+X DAT1 8 -900 -400 150 R 50 50 1 1 I
+X SHIELD 9 800 -600 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# mt48lc16m16a2tg_MT48LC16M16A2TG
+#
+DEF mt48lc16m16a2tg_MT48LC16M16A2TG U 0 40 Y Y 1 F N
+F0 "U" -600 1200 50 H V C CNN
+F1 "mt48lc16m16a2tg_MT48LC16M16A2TG" 650 -1200 50 H V C CNN
+F2 "TSOPII-54" 0 0 50 H I C CIN
+F3 "" 0 -250 50 H I C CNN
+DRAW
+S -650 1150 650 -1150 0 1 10 f
+X VDD 1 -300 1300 150 D 40 40 1 1 W
+X DQ5 10 800 550 150 L 40 40 1 1 B
+X DQ6 11 800 450 150 L 40 40 1 1 B
+X VSSQ 12 100 -1300 150 U 40 40 1 1 W
+X DQ7 13 800 350 150 L 40 40 1 1 B
+X VDD 14 -200 1300 150 D 40 40 1 1 W
+X DQML 15 800 -700 150 L 40 40 1 1 I
+X ~WE~ 16 -800 -900 150 R 40 40 1 1 I
+X ~CAS~ 17 -800 -800 150 R 40 40 1 1 I
+X ~RAS~ 18 -800 -700 150 R 40 40 1 1 I
+X ~CS~ 19 -800 -1050 150 R 40 40 1 1 I
+X DQ0 2 800 1050 150 L 40 40 1 1 B
+X BA0 20 -800 -250 150 R 40 40 1 1 I
+X BA1 21 -800 -350 150 R 40 40 1 1 I
+X A10 22 -800 50 150 R 40 40 1 1 I
+X A0 23 -800 1050 150 R 40 40 1 1 I
+X A1 24 -800 950 150 R 40 40 1 1 I
+X A2 25 -800 850 150 R 40 40 1 1 I
+X A3 26 -800 750 150 R 40 40 1 1 I
+X VDD 27 -100 1300 150 D 40 40 1 1 W
+X VSS 28 -300 -1300 150 U 40 40 1 1 W
+X A4 29 -800 650 150 R 40 40 1 1 I
+X VDDQ 3 0 1300 150 D 40 40 1 1 W
+X A5 30 -800 550 150 R 40 40 1 1 I
+X A6 31 -800 450 150 R 40 40 1 1 I
+X A7 32 -800 350 150 R 40 40 1 1 I
+X A8 33 -800 250 150 R 40 40 1 1 I
+X A9 34 -800 150 150 R 40 40 1 1 I
+X A11 35 -800 -50 150 R 40 40 1 1 I
+X A12 36 -800 -150 150 R 40 40 1 1 I
+X CKE 37 -800 -600 150 R 40 40 1 1 I
+X CLK 38 -800 -500 150 R 40 40 1 1 I
+X DQMH 39 800 -800 150 L 40 40 1 1 I
+X DQ1 4 800 950 150 L 40 40 1 1 B
+X VSS 41 -200 -1300 150 U 40 40 1 1 W
+X DQ8 42 800 250 150 L 40 40 1 1 B
+X VDDQ 43 200 1300 150 D 40 40 1 1 W
+X DQ9 44 800 150 150 L 40 40 1 1 B
+X DQ10 45 800 50 150 L 40 40 1 1 B
+X VSSQ 46 200 -1300 150 U 40 40 1 1 W
+X DQ11 47 800 -50 150 L 40 40 1 1 B
+X DQ12 48 800 -150 150 L 40 40 1 1 B
+X VDDQ 49 300 1300 150 D 40 40 1 1 W
+X DQ2 5 800 850 150 L 40 40 1 1 B
+X DQ13 50 800 -250 150 L 40 40 1 1 B
+X DQ14 51 800 -350 150 L 40 40 1 1 B
+X VSSQ 52 300 -1300 150 U 40 40 1 1 W
+X DQ15 53 800 -450 150 L 40 40 1 1 B
+X VSS 54 -100 -1300 150 U 40 40 1 1 W
+X VSSQ 6 0 -1300 150 U 40 40 1 1 W
+X DQ3 7 800 750 150 L 40 40 1 1 B
+X DQ4 8 800 650 150 L 40 40 1 1 B
+X VDDQ 9 100 1300 150 D 40 40 1 1 W
+ENDDRAW
+ENDDEF
+#
+# power_+1V1
+#
+DEF power_+1V1 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+1V1" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V1 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_+2V5
+#
+DEF power_+2V5 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+2V5" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +2V5 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_+3V3
+#
+DEF power_+3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_+5V
+#
+DEF power_+5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# ssd_13xx_SSD_13xx
+#
+DEF ssd_13xx_SSD_13xx OLED 0 40 Y Y 1 F N
+F0 "OLED" 0 -400 50 H V C CNN
+F1 "ssd_13xx_SSD_13xx" 0 -500 50 H V C CNN
+F2 "" 0 -200 50 V V C CNN
+F3 "" 0 -200 50 V V C CNN
+$FPLIST
+ Pin_Header_Straight_1X07
+ Pin_Header_Angled_1X07
+ Socket_Strip_Straight_1X07
+ Socket_Strip_Angled_1X07
+$ENDFPLIST
+DRAW
+S 400 -150 -400 -600 0 1 0 N
+X GND 1 -300 0 150 D 50 50 1 1 P
+X VCC 2 -200 0 150 D 50 50 1 1 P
+X SCL 3 -100 0 150 D 50 50 1 1 P
+X SDA 4 0 0 150 D 50 50 1 1 P
+X RES 5 100 0 150 D 50 50 1 1 P
+X DC 6 200 0 150 D 50 50 1 1 P
+X CS 7 300 0 150 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_Antenna
+#
+DEF ulx3s-rescue_Antenna AE 0 40 N N 1 F N
+F0 "AE" -75 75 50 H V R CNN
+F1 "ulx3s-rescue_Antenna" -75 0 50 H V R CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 10 0 100 0 -150 N
+P 3 0 1 10 50 100 0 -100 -50 100 N
+X A 1 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_Battery_Cell
+#
+DEF ulx3s-rescue_Battery_Cell BT 0 0 N N 1 F N
+F0 "BT" 100 100 50 H V L CNN
+F1 "ulx3s-rescue_Battery_Cell" 100 0 50 H V L CNN
+F2 "" 0 60 50 V I C CNN
+F3 "" 0 60 50 V I C CNN
+DRAW
+S -90 70 90 60 0 1 0 F
+S -62 47 58 27 0 1 0 F
+P 2 0 1 0 0 30 0 0 N
+P 2 0 1 0 0 70 0 100 N
+P 2 0 1 10 20 135 60 135 N
+P 2 0 1 10 40 155 40 115 N
+X + 1 0 200 100 D 50 50 1 1 P
+X - 2 0 -100 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_C
+#
+DEF ulx3s-rescue_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "ulx3s-rescue_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_Conn_01x03
+#
+DEF ulx3s-rescue_Conn_01x03 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "ulx3s-rescue_Conn_01x03" 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*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+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 150 50 -150 1 1 10 f
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_Crystal_GND23
+#
+DEF ulx3s-rescue_Crystal_GND23 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "ulx3s-rescue_Crystal_GND23" 125 125 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 20 -80 -50 -80 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 0 140 0 150 N
+P 2 0 1 20 80 -50 80 50 N
+P 2 0 1 0 80 0 100 0 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 0 200 50 D 50 50 1 1 P
+X 3 3 0 -200 50 U 50 50 1 1 P
+X 4 4 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_Crystal_GND24
+#
+DEF ulx3s-rescue_Crystal_GND24 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "ulx3s-rescue_Crystal_GND24" 125 125 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 20 -80 -50 -80 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 0 140 0 150 N
+P 2 0 1 20 80 -50 80 50 N
+P 2 0 1 0 80 0 100 0 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 0 200 50 D 50 50 1 1 P
+X 3 3 150 0 50 L 50 50 1 1 P
+X 4 4 0 -200 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_D
+#
+DEF ulx3s-rescue_D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ulx3s-rescue_D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_D_Schottky
+#
+DEF ulx3s-rescue_D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ulx3s-rescue_D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ulx3s-rescue_D_Schottky_Small
+#
+DEF ulx3s-rescue_D_Schottky_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "ulx3s-rescue_D_Schottky_Small" -280 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 2 0 1 0 -30 0 30 0 N
+P 3 0 1 0 -30 -40 -20 -40 -20 -30 N
+P 3 0 1 0 -30 40 -40 40 -40 30 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 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
 #
-# MAX11123
+# ulx3s-rescue_D_Zener_Small_ALT
 #
-DEF MAX11123 U 0 40 Y Y 1 F N
-F0 "U" -50 900 50 H V L CNN
-F1 "MAX11123" -200 800 50 H V L CNN
-F2 "" 0 50 50 H V C CNN
-F3 "" 0 50 50 H V C CNN
+DEF ulx3s-rescue_D_Zener_Small_ALT D 0 10 N N 1 F N
+F0 "D" 0 90 50 H V C CNN
+F1 "ulx3s-rescue_D_Zener_Small_ALT" 0 -90 50 H V C CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
 $FPLIST
- TQFN28
- QFN28
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
 $ENDFPLIST
 DRAW
-S -300 750 300 -1000 0 1 10 f
-X AIN3 1 -400 100 100 R 50 50 1 1 O
-X AIN4 2 -400 0 100 R 50 50 1 1 O
-X AIN5 3 -400 -100 100 R 50 50 1 1 O
-X AIN6 4 -400 -200 100 R 50 50 1 1 O
-X AIN7 5 -400 -300 100 R 50 50 1 1 I
-X GND 6 400 400 100 L 50 50 1 1 I
-X GND 7 400 300 100 L 50 50 1 1 I
-X GND 8 400 200 100 L 50 50 1 1 O
-X GND 9 400 100 100 L 50 50 1 1 O
-X GND 10 400 0 100 L 50 50 1 1 O
-X CSn 20 400 -650 100 L 50 50 1 1 O
-X GND 11 400 -100 100 L 50 50 1 1 O
-X DIN 21 400 -750 100 L 50 50 1 1 O
-X CNVSTn 12 400 -200 100 L 50 50 1 1 O
-X DGND 22 400 550 100 L 50 50 1 1 W
-X REF- 13 400 -300 100 L 50 50 1 1 I
-X OVDD 23 400 650 100 L 50 50 1 1 O
-X GND 14 -400 -700 100 R 50 50 1 1 W
-X DOUT 24 400 -550 100 L 50 50 1 1 O
-X REF+ 15 -400 -550 100 R 50 50 1 1 O
-X EOCn 25 -400 -450 100 R 50 50 1 1 W
-X GND 16 -400 -800 100 R 50 50 1 1 W
-X AIN0 26 -400 400 100 R 50 50 1 1 I
-X VDD 17 -400 650 100 R 50 50 1 1 W
-X AIN1 27 -400 300 100 R 50 50 1 1 I
-X VDD 18 -400 550 100 R 50 50 1 1 W
-X AIN2 28 -400 200 100 R 50 50 1 1 O
-X SCLK 19 400 -450 100 L 50 50 1 1 O C
-X GND 29 -400 -900 100 R 50 50 1 1 W
+P 2 0 1 0 30 0 -30 0 N
+P 3 0 1 0 -10 40 -30 40 -30 -40 N
+P 4 0 1 0 30 40 -30 0 30 -40 30 40 F
+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
 #
-# MB85RS16
+# ulx3s-rescue_Jumper_NC_Small
 #
-DEF MB85RS16 U 0 40 Y Y 1 F N
-F0 "U" -300 250 50 H V L CNN
-F1 "MB85RS16" 50 250 50 H V L CNN
-F2 "" -350 -50 50 H I C CNN
-F3 "" -350 -50 50 H I C CNN
-ALIAS MB85RS64 MB85RS128B MB85RS256B MB85RS512T MB85RS1MT MB85RS2MT
+DEF ulx3s-rescue_Jumper_NC_Small JP 0 30 N N 1 F N
+F0 "JP" 0 80 50 H V C CNN
+F1 "ulx3s-rescue_Jumper_NC_Small" 10 -60 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-S -300 200 300 -200 0 1 10 f
-X ~CS 1 -400 -100 100 R 50 50 1 1 I
-X MISO 2 400 -100 100 L 50 50 1 1 I
-X ~WP 3 -400 100 100 R 50 50 1 1 I
-X GND 4 0 -300 100 U 50 50 1 1 W
-X MOSI 5 400 0 100 L 50 50 1 1 I
-X SCK 6 400 100 100 L 50 50 1 1 I
-X ~HOLD 7 -400 0 100 R 50 50 1 1 I
-X Vcc 8 0 300 100 D 50 50 1 1 W
+A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
+C -40 0 20 0 1 0 N
+C 40 0 20 0 1 0 N
+X 1 1 -100 0 40 R 50 50 0 1 P
+X 2 2 100 0 40 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# MICRO-HDMI-D
+# ulx3s-rescue_L
 #
-DEF MICRO-HDMI-D P 0 40 Y N 1 F N
-F0 "P" 0 1050 50 H V C CNN
-F1 "MICRO-HDMI-D" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+DEF ulx3s-rescue_L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "ulx3s-rescue_L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- micro-hdmi-d
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
 $ENDFPLIST
 DRAW
-S -50 -1000 50 1000 0 1 0 N
-S -50 -945 10 -955 0 1 0 N
-S -50 -845 10 -855 0 1 0 N
-S -50 -745 10 -755 0 1 0 N
-S -50 -645 10 -655 0 1 0 N
-S -50 -545 10 -555 0 1 0 N
-S -50 -445 10 -455 0 1 0 N
-S -50 -345 10 -355 0 1 0 N
-S -50 -245 10 -255 0 1 0 N
-S -50 -145 10 -155 0 1 0 N
-S -50 -45 10 -55 0 1 0 N
-S -50 55 10 45 0 1 0 N
-S -50 155 10 145 0 1 0 N
-S -50 255 10 245 0 1 0 N
-S -50 355 10 345 0 1 0 N
-S -50 455 10 445 0 1 0 N
-S -50 555 10 545 0 1 0 N
-S -50 655 10 645 0 1 0 N
-S -50 755 10 745 0 1 0 N
-S -50 855 10 845 0 1 0 N
-S -50 955 10 945 0 1 0 N
-X 0 0 -200 950 150 R 50 50 1 1 P
-X P1 1 -200 850 150 R 50 50 1 1 P
-X P2 2 -200 750 150 R 50 50 1 1 P
-X P3 3 -200 650 150 R 50 50 1 1 P
-X P4 4 -200 550 150 R 50 50 1 1 P
-X P5 5 -200 450 150 R 50 50 1 1 P
-X P6 6 -200 350 150 R 50 50 1 1 P
-X P7 7 -200 250 150 R 50 50 1 1 P
-X P8 8 -200 150 150 R 50 50 1 1 P
-X P9 9 -200 50 150 R 50 50 1 1 P
-X P10 10 -200 -50 150 R 50 50 1 1 P
-X P11 11 -200 -150 150 R 50 50 1 1 P
-X P12 12 -200 -250 150 R 50 50 1 1 P
-X P13 13 -200 -350 150 R 50 50 1 1 P
-X P14 14 -200 -450 150 R 50 50 1 1 P
-X P15 15 -200 -550 150 R 50 50 1 1 P
-X P16 16 -200 -650 150 R 50 50 1 1 P
-X P17 17 -200 -750 150 R 50 50 1 1 P
-X P18 18 -200 -850 150 R 50 50 1 1 P
-X P19 19 -200 -950 150 R 50 50 1 1 P
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MT48LC16M16A2TG
+# ulx3s-rescue_LED_ALT
 #
-DEF MT48LC16M16A2TG U 0 40 Y Y 1 F N
-F0 "U" -600 1200 50 H V C CNN
-F1 "MT48LC16M16A2TG" 650 -1200 50 H V C CNN
-F2 "TSOPII-54" 0 0 50 H I C CIN
-F3 "" 0 -250 50 H I C CNN
+DEF ulx3s-rescue_LED_ALT D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ulx3s-rescue_LED_ALT" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
 DRAW
-S -650 1150 650 -1150 0 1 10 f
-X VDD 1 -300 1300 150 D 40 40 1 1 W
-X DQ0 2 800 1050 150 L 40 40 1 1 B
-X VDDQ 3 0 1300 150 D 40 40 1 1 W
-X DQ1 4 800 950 150 L 40 40 1 1 B
-X DQ2 5 800 850 150 L 40 40 1 1 B
-X VSSQ 6 0 -1300 150 U 40 40 1 1 W
-X DQ3 7 800 750 150 L 40 40 1 1 B
-X DQ4 8 800 650 150 L 40 40 1 1 B
-X VDDQ 9 100 1300 150 D 40 40 1 1 W
-X DQ5 10 800 550 150 L 40 40 1 1 B
-X BA0 20 -800 -250 150 R 40 40 1 1 I
-X A5 30 -800 550 150 R 40 40 1 1 I
-X DQ13 50 800 -250 150 L 40 40 1 1 B
-X DQ6 11 800 450 150 L 40 40 1 1 B
-X BA1 21 -800 -350 150 R 40 40 1 1 I
-X A6 31 -800 450 150 R 40 40 1 1 I
-X VSS 41 -200 -1300 150 U 40 40 1 1 W
-X DQ14 51 800 -350 150 L 40 40 1 1 B
-X VSSQ 12 100 -1300 150 U 40 40 1 1 W
-X A10 22 -800 50 150 R 40 40 1 1 I
-X A7 32 -800 350 150 R 40 40 1 1 I
-X DQ8 42 800 250 150 L 40 40 1 1 B
-X VSSQ 52 300 -1300 150 U 40 40 1 1 W
-X DQ7 13 800 350 150 L 40 40 1 1 B
-X A0 23 -800 1050 150 R 40 40 1 1 I
-X A8 33 -800 250 150 R 40 40 1 1 I
-X VDDQ 43 200 1300 150 D 40 40 1 1 W
-X DQ15 53 800 -450 150 L 40 40 1 1 B
-X VDD 14 -200 1300 150 D 40 40 1 1 W
-X A1 24 -800 950 150 R 40 40 1 1 I
-X A9 34 -800 150 150 R 40 40 1 1 I
-X DQ9 44 800 150 150 L 40 40 1 1 B
-X VSS 54 -100 -1300 150 U 40 40 1 1 W
-X DQML 15 800 -700 150 L 40 40 1 1 I
-X A2 25 -800 850 150 R 40 40 1 1 I
-X A11 35 -800 -50 150 R 40 40 1 1 I
-X DQ10 45 800 50 150 L 40 40 1 1 B
-X ~WE~ 16 -800 -900 150 R 40 40 1 1 I
-X A3 26 -800 750 150 R 40 40 1 1 I
-X A12 36 -800 -150 150 R 40 40 1 1 I
-X VSSQ 46 200 -1300 150 U 40 40 1 1 W
-X ~CAS~ 17 -800 -800 150 R 40 40 1 1 I
-X VDD 27 -100 1300 150 D 40 40 1 1 W
-X CKE 37 -800 -600 150 R 40 40 1 1 I
-X DQ11 47 800 -50 150 L 40 40 1 1 B
-X ~RAS~ 18 -800 -700 150 R 40 40 1 1 I
-X VSS 28 -300 -1300 150 U 40 40 1 1 W
-X CLK 38 -800 -500 150 R 40 40 1 1 I
-X DQ12 48 800 -150 150 L 40 40 1 1 B
-X ~CS~ 19 -800 -1050 150 R 40 40 1 1 I
-X A4 29 -800 650 150 R 40 40 1 1 I
-X DQMH 39 800 -800 150 L 40 40 1 1 I
-X VDDQ 49 300 1300 150 D 40 40 1 1 W
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 F
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Micro_SD_Card_CD
+# ulx3s-rescue_MB85RS16
 #
-DEF Micro_SD_Card_CD J 0 40 Y Y 1 F N
-F0 "J" -650 600 50 H V C CNN
-F1 "Micro_SD_Card_CD" 650 600 50 H V R CNN
-F2 "" 1150 300 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF ulx3s-rescue_MB85RS16 U 0 40 Y Y 1 F N
+F0 "U" -300 250 50 H V L CNN
+F1 "ulx3s-rescue_MB85RS16" 50 250 50 H V L CNN
+F2 "" -350 -50 50 H I C CNN
+F3 "" -350 -50 50 H I C CNN
 DRAW
-S -300 -375 -200 -425 0 1 0 F
-S -300 -275 -200 -325 0 1 0 F
-S -300 -175 -200 -225 0 1 0 F
-S -300 -75 -200 -125 0 1 0 F
-S -300 25 -200 -25 0 1 0 F
-S -300 125 -200 75 0 1 0 F
-S -300 225 -200 175 0 1 0 F
-S -300 325 -200 275 0 1 0 F
-P 6 0 1 10 650 500 650 550 -750 550 -750 -650 650 -650 650 -450 N
-P 11 0 1 10 -350 -450 -350 350 -50 350 100 500 150 500 150 450 250 450 300 500 800 500 800 -450 -350 -450 f
-X DAT2 1 -900 300 150 R 50 50 1 1 B
-X DAT3/CD 2 -900 200 150 R 50 50 1 1 B
-X CMD 3 -900 100 150 R 50 50 1 1 I
-X VDD 4 -900 0 150 R 50 50 1 1 W
-X CLK 5 -900 -100 150 R 50 50 1 1 I
-X VSS 6 -900 -200 150 R 50 50 1 1 W
-X DAT0 7 -900 -300 150 R 50 50 1 1 I
-X DAT1 8 -900 -400 150 R 50 50 1 1 I
-X SHIELD 9 800 -600 150 L 50 50 1 1 P
-X CD 10 -50 -850 200 U 50 50 1 1 I
-X CD 11 50 -850 200 U 50 50 1 1 I
+S -300 200 300 -200 0 1 10 f
+X ~CS 1 -400 -100 100 R 50 50 1 1 I
+X MISO 2 400 -100 100 L 50 50 1 1 I
+X ~WP 3 -400 100 100 R 50 50 1 1 I
+X GND 4 0 -300 100 U 50 50 1 1 W
+X MOSI 5 400 0 100 L 50 50 1 1 I
+X SCK 6 400 100 100 L 50 50 1 1 I
+X ~HOLD 7 -400 0 100 R 50 50 1 1 I
+X Vcc 8 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# PCF8563
+# ulx3s-rescue_PCF8563
 #
-DEF PCF8563 U 0 40 Y Y 1 F N
+DEF ulx3s-rescue_PCF8563 U 0 40 Y Y 1 F N
 F0 "U" -300 350 50 H V L CNN
-F1 "PCF8563" 100 350 50 H V L CNN
+F1 "ulx3s-rescue_PCF8563" 100 350 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1362,11 +1386,11 @@ X VDD 8 0 400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# Q_NMOS_GSD
+# ulx3s-rescue_Q_NMOS_GSD
 #
-DEF Q_NMOS_GSD Q 0 0 Y N 1 F N
+DEF ulx3s-rescue_Q_NMOS_GSD Q 0 0 Y N 1 F N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_NMOS_GSD" 200 -50 50 H V L CNN
+F1 "ulx3s-rescue_Q_NMOS_GSD" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -1394,11 +1418,11 @@ X D 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_PNP_BEC
+# ulx3s-rescue_Q_PNP_BEC
 #
-DEF Q_PNP_BEC Q 0 0 Y N 1 F N
+DEF ulx3s-rescue_Q_PNP_BEC Q 0 0 Y N 1 F N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_PNP_BEC" 200 -50 50 H V L CNN
+F1 "ulx3s-rescue_Q_PNP_BEC" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -1413,11 +1437,11 @@ X C 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R
+# ulx3s-rescue_R
 #
-DEF R R 0 0 N Y 1 F N
+DEF ulx3s-rescue_R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "ulx3s-rescue_R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1431,36 +1455,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# SSD_13xx
-#
-DEF SSD_13xx OLED 0 40 Y Y 1 F N
-F0 "OLED" 0 -400 50 H V C CNN
-F1 "SSD_13xx" 0 -500 50 H V C CNN
-F2 "" 0 -200 50 V V C CNN
-F3 "" 0 -200 50 V V C CNN
-$FPLIST
- Pin_Header_Straight_1X07
- Pin_Header_Angled_1X07
- Socket_Strip_Straight_1X07
- Socket_Strip_Angled_1X07
-$ENDFPLIST
-DRAW
-S 400 -150 -400 -600 0 1 0 N
-X GND 1 -300 0 150 D 50 50 1 1 P
-X VCC 2 -200 0 150 D 50 50 1 1 P
-X SCL 3 -100 0 150 D 50 50 1 1 P
-X SDA 4 0 0 150 D 50 50 1 1 P
-X RES 5 100 0 150 D 50 50 1 1 P
-X DC 6 200 0 150 D 50 50 1 1 P
-X CS 7 300 0 150 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# USB_OTG1
+# usb_otg_USB_OTG1
 #
-DEF USB_OTG1 P 0 40 Y Y 1 F N
+DEF usb_otg_USB_OTG1 P 0 40 Y Y 1 F N
 F0 "P" 325 -125 50 H V C CNN
-F1 "USB_OTG1" 0 200 50 H V C CNN
+F1 "usb_otg_USB_OTG1" 0 200 50 H V C CNN
 F2 "" -50 -100 50 V V C CNN
 F3 "" -50 -100 50 V V C CNN
 $FPLIST
diff --git a/ulx3s-rescue.lib b/ulx3s-rescue.lib
index 192fa07..4843e22 100644
--- a/ulx3s-rescue.lib
+++ b/ulx3s-rescue.lib
@@ -1,6 +1,291 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# Antenna
+#
+DEF Antenna AE 0 40 N N 1 F N
+F0 "AE" -75 75 50 H V R CNN
+F1 "Antenna" -75 0 50 H V R CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 10 0 100 0 -150 N
+P 3 0 1 10 50 100 0 -100 -50 100 N
+X A 1 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Battery_Cell
+#
+DEF Battery_Cell BT 0 0 N N 1 F N
+F0 "BT" 100 100 50 H V L CNN
+F1 "Battery_Cell" 100 0 50 H V L CNN
+F2 "" 0 60 50 V I C CNN
+F3 "" 0 60 50 V I C CNN
+DRAW
+S -90 70 90 60 0 1 0 F
+S -62 47 58 27 0 1 0 F
+P 2 0 1 0 0 30 0 0 N
+P 2 0 1 0 0 70 0 100 N
+P 2 0 1 10 20 135 60 135 N
+P 2 0 1 10 40 155 40 115 N
+X + 1 0 200 100 D 50 50 1 1 P
+X - 2 0 -100 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_01x03
+#
+DEF Conn_01x03 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Conn_01x03" 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*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
+DRAW
+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 150 50 -150 1 1 10 f
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal_GND23
+#
+DEF Crystal_GND23 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "Crystal_GND23" 125 125 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 20 -80 -50 -80 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 0 140 0 150 N
+P 2 0 1 20 80 -50 80 50 N
+P 2 0 1 0 80 0 100 0 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 0 200 50 D 50 50 1 1 P
+X 3 3 0 -200 50 U 50 50 1 1 P
+X 4 4 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal_GND24
+#
+DEF Crystal_GND24 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "Crystal_GND24" 125 125 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 20 -80 -50 -80 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 0 140 0 150 N
+P 2 0 1 20 80 -50 80 50 N
+P 2 0 1 0 80 0 100 0 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 0 200 50 D 50 50 1 1 P
+X 3 3 150 0 50 L 50 50 1 1 P
+X 4 4 0 -200 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky
+#
+DEF D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Small
+#
+DEF D_Schottky_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Schottky_Small" -280 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 2 0 1 0 -30 0 30 0 N
+P 3 0 1 0 -30 -40 -20 -40 -20 -30 N
+P 3 0 1 0 -30 40 -40 40 -40 30 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 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
+#
+# D_Zener_Small_ALT
+#
+DEF D_Zener_Small_ALT D 0 10 N N 1 F N
+F0 "D" 0 90 50 H V C CNN
+F1 "D_Zener_Small_ALT" 0 -90 50 H V C CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 30 0 -30 0 N
+P 3 0 1 0 -10 40 -30 40 -30 -40 N
+P 4 0 1 0 30 40 -30 0 30 -40 30 40 F
+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
+#
+# Jumper_NC_Small
+#
+DEF Jumper_NC_Small JP 0 30 N N 1 F N
+F0 "JP" 0 80 50 H V C CNN
+F1 "Jumper_NC_Small" 10 -60 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
+C -40 0 20 0 1 0 N
+C 40 0 20 0 1 0 N
+X 1 1 -100 0 40 R 50 50 0 1 P
+X 2 2 100 0 40 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# L
+#
+DEF L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_ALT
+#
+DEF LED_ALT D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED_ALT" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 F
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # LFE5U-45F-6BG381C-RESCUE-ulx3s
 #
 DEF LFE5U-45F-6BG381C-RESCUE-ulx3s U 0 40 Y Y 10 L N
@@ -21,414 +306,530 @@ T 0 0 -950 60 0 7 0 BANK8 Normal 0 C C
 T 0 0 -1100 60 0 8 0 BANK50,51 Normal 0 C C
 T 0 0 50 60 0 10 0 JTAG Normal 0 C C
 T 0 0 -750 60 0 1 1 BANK0 Normal 0 C C
+T 0 0 -1200 60 0 8 1 SERDES Normal 0 C C
+T 0 0 150 60 0 9 1 POWER Normal 0 C C
+T 0 0 -50 60 0 10 1 PROG Normal 0 C C
 S -550 800 550 -700 1 1 0 N
 S -250 250 250 -250 1 1 0 N
 S -200 200 0 100 1 1 0 N
+S -550 800 550 -1000 2 1 0 N
+S -250 250 250 -250 2 1 0 N
+S 0 200 200 100 2 1 0 N
+S -550 800 550 -900 3 1 0 N
+S -250 250 250 -250 3 1 0 N
+S 200 200 100 0 3 1 0 N
+S -550 800 550 -1000 4 1 0 N
+S -250 250 250 -250 4 1 0 N
+S 100 0 200 -200 4 1 0 N
+S -550 800 550 -1000 5 1 0 N
+S -250 250 250 -250 5 1 0 N
+S -200 0 -100 -200 5 1 0 N
+S -550 800 550 -900 6 1 0 N
+S -250 250 250 -250 6 1 0 N
+S -200 200 -100 0 6 1 0 N
+S -550 800 550 -900 7 1 0 N
+S -250 250 250 -250 7 1 0 N
+S -200 -200 0 -100 7 1 0 N
+S -650 1000 650 -1050 8 1 0 N
+S -250 250 250 -250 8 1 0 N
+S 150 -200 -150 -150 8 1 0 N
+S -4300 450 4650 -500 9 1 0 N
+S -250 250 250 -250 9 1 0 N
+S -100 100 100 -100 9 1 0 N
+S -500 250 300 -250 10 1 0 N
+X PCLKT0_1 A10 -750 600 200 R 50 50 1 1 I
+X PCLKC0_1 A11 750 600 200 L 50 50 1 1 I
 X PT4A A6 -750 -400 200 R 50 50 1 1 I
-X PT4B B6 750 -400 200 L 50 50 1 1 I
-X PT11A C6 -750 -100 200 R 50 50 1 1 I
-X PT6B D6 750 -300 200 L 50 50 1 1 I
-X PT6A E6 -750 -300 200 R 50 50 1 1 I
 X PT18A A7 -750 200 200 R 50 50 1 1 I
-X PT11B C7 750 -100 200 L 50 50 1 1 I
-X PT9B D7 750 -200 200 L 50 50 1 1 I
-X PT9A E7 -750 -200 200 R 50 50 1 1 I
 X PT18B A8 750 200 200 L 50 50 1 1 I
-X PT15B B8 750 100 200 L 50 50 1 1 I
-X PT15A C8 -750 100 200 R 50 50 1 1 I
-X PT13B D8 750 0 200 L 50 50 1 1 I
-X PT13A E8 -750 0 200 R 50 50 1 1 I
 X GR_PCLK0_1 A9 -750 500 200 R 50 50 1 1 I
-X PT31A B9 -750 400 200 R 50 50 1 1 I
-X PT27A C9 -750 -600 200 R 50 50 1 1 I
-X PT20A D9 -750 300 200 R 50 50 1 1 I
-X PT20B E9 750 300 200 L 50 50 1 1 I
-X PCLKT0_1 A10 -750 600 200 R 50 50 1 1 I
 X GR_PCLK0_0 B10 750 500 200 L 50 50 1 1 I
+X PCLKT0_0 B11 -750 700 200 R 50 50 1 1 I
+X PT4B B6 750 -400 200 L 50 50 1 1 I
+X PT15B B8 750 100 200 L 50 50 1 1 I
+X PT31A B9 -750 400 200 R 50 50 1 1 I
 X PT31B C10 750 400 200 L 50 50 1 1 I
+X PCLKC0_0 C11 750 700 200 L 50 50 1 1 I
+X PT11A C6 -750 -100 200 R 50 50 1 1 I
+X PT11B C7 750 -100 200 L 50 50 1 1 I
+X PT15A C8 -750 100 200 R 50 50 1 1 I
+X PT27A C9 -750 -600 200 R 50 50 1 1 I
 X PT29A D10 -750 -500 200 R 50 50 1 1 I
+X PT6B D6 750 -300 200 L 50 50 1 1 I
+X PT9B D7 750 -200 200 L 50 50 1 1 I
+X PT13B D8 750 0 200 L 50 50 1 1 I
+X PT20A D9 -750 300 200 R 50 50 1 1 I
 X PT29B E10 750 -500 200 L 50 50 1 1 I
-X PCLKC0_1 A11 750 600 200 L 50 50 1 1 I
-X PCLKT0_0 B11 -750 700 200 R 50 50 1 1 I
-X PCLKC0_0 C11 750 700 200 L 50 50 1 1 I
-S -550 800 550 -1000 2 1 0 N
-S -250 250 250 -250 2 1 0 N
-S 0 200 200 100 2 1 0 N
-X PT85B B20 750 700 200 L 50 50 2 1 I
-X PCLKT1_1 D11 -750 -800 200 R 50 50 2 1 I
-X PCLKC1_1 E11 750 -800 200 L 50 50 2 1 I
+X PT6A E6 -750 -300 200 R 50 50 1 1 I
+X PT9A E7 -750 -200 200 R 50 50 1 1 I
+X PT13A E8 -750 0 200 R 50 50 1 1 I
+X PT20B E9 750 300 200 L 50 50 1 1 I
 X PT49A A12 -750 -500 200 R 50 50 2 1 I
-X PCLKT1_0 B12 -750 -700 200 R 50 50 2 1 I
-X PCLKC1_0 C12 750 -700 200 L 50 50 2 1 I
-X GR_PCLK1_0 D12 -750 -600 200 R 50 50 2 1 I
-X GR_PCLK1_1 E12 750 -600 200 L 50 50 2 1 I
 X PT49B A13 750 -500 200 L 50 50 2 1 I
-X PT51A B13 -750 -400 200 R 50 50 2 1 I
-X PT51B C13 750 -400 200 L 50 50 2 1 I
-X PT53A D13 -750 -300 200 R 50 50 2 1 I
-X PT53B E13 750 -300 200 L 50 50 2 1 I
 X PT56A A14 -750 -200 200 R 50 50 2 1 I
-X PT56B C14 750 -200 200 L 50 50 2 1 I
-X PT58A D14 -750 -100 200 R 50 50 2 1 I
-X PT58B E14 750 -100 200 L 50 50 2 1 I
 X PT67A A15 -750 -900 200 R 50 50 2 1 I
-X PT69A B15 -750 0 200 R 50 50 2 1 I
-X PT69B C15 750 0 200 L 50 50 2 1 I
-X PT71A D15 -750 100 200 R 50 50 2 1 I
-X PT71B E15 750 100 200 L 50 50 2 1 I
 X PT74A A16 -750 200 200 R 50 50 2 1 I
-X PT74B B16 750 200 200 L 50 50 2 1 I
-X PT76A C16 -750 300 200 R 50 50 2 1 I
-X PT76B D16 750 300 200 L 50 50 2 1 I
 X PT80A A17 -750 500 200 R 50 50 2 1 I
-X PT78A B17 -750 400 200 R 50 50 2 1 I
-X PT78B C17 750 400 200 L 50 50 2 1 I
 X PT83A A18 -750 600 200 R 50 50 2 1 I
-X PT80B B18 750 500 200 L 50 50 2 1 I
 X PT85A A19 -750 700 200 R 50 50 2 1 I
+X PCLKT1_0 B12 -750 -700 200 R 50 50 2 1 I
+X PT51A B13 -750 -400 200 R 50 50 2 1 I
+X PT69A B15 -750 0 200 R 50 50 2 1 I
+X PT74B B16 750 200 200 L 50 50 2 1 I
+X PT78A B17 -750 400 200 R 50 50 2 1 I
+X PT80B B18 750 500 200 L 50 50 2 1 I
 X PT83B B19 750 600 200 L 50 50 2 1 I
-S -550 800 550 -900 3 1 0 N
-S -250 250 250 -250 3 1 0 N
-S 200 200 100 0 3 1 0 N
+X PT85B B20 750 700 200 L 50 50 2 1 I
+X PCLKC1_0 C12 750 -700 200 L 50 50 2 1 I
+X PT51B C13 750 -400 200 L 50 50 2 1 I
+X PT56B C14 750 -200 200 L 50 50 2 1 I
+X PT69B C15 750 0 200 L 50 50 2 1 I
+X PT76A C16 -750 300 200 R 50 50 2 1 I
+X PT78B C17 750 400 200 L 50 50 2 1 I
+X PCLKT1_1 D11 -750 -800 200 R 50 50 2 1 I
+X GR_PCLK1_0 D12 -750 -600 200 R 50 50 2 1 I
+X PT53A D13 -750 -300 200 R 50 50 2 1 I
+X PT58A D14 -750 -100 200 R 50 50 2 1 I
+X PT71A D15 -750 100 200 R 50 50 2 1 I
+X PT76B D16 750 300 200 L 50 50 2 1 I
+X PCLKC1_1 E11 750 -800 200 L 50 50 2 1 I
+X GR_PCLK1_1 E12 750 -600 200 L 50 50 2 1 I
+X PT53B E13 750 -300 200 L 50 50 2 1 I
+X PT58B E14 750 -100 200 L 50 50 2 1 I
+X PT71B E15 750 100 200 L 50 50 2 1 I
+X PR11A C18 -750 -800 200 R 50 50 3 1 I
 X PR23A C20 -750 0 200 R 50 50 3 1 I
+X PR11B D17 750 -800 200 L 50 50 3 1 I
+X PR14A D18 -750 -600 200 R 50 50 3 1 I
+X PR23B D19 750 0 200 L 50 50 3 1 I
 X VREF1_2 D20 -750 100 200 R 50 50 3 1 I
-X PR26A E20 -750 200 200 R 50 50 3 1 I
-X PR26C F20 -750 300 200 R 50 50 3 1 I
-X PR26D G20 750 300 200 L 50 50 3 1 I
-X PR29B H20 750 400 200 L 50 50 3 1 I
-X PCLKT2_0 J20 -750 700 200 R 50 50 3 1 I
-X PCLKC2_0 K20 750 700 200 L 50 50 3 1 I
 X PR11C E16 -750 -700 200 R 50 50 3 1 I
-X PR11D F16 750 -700 200 L 50 50 3 1 I
-X PR17C G16 -750 -300 200 R 50 50 3 1 I
-X PR17D H16 750 -300 200 L 50 50 3 1 I
-X PR20D J16 750 -100 200 L 50 50 3 1 I
-X PR11B D17 750 -800 200 L 50 50 3 1 I
 X PR14B E17 750 -600 200 L 50 50 3 1 I
-X PR17A F17 -750 -400 200 R 50 50 3 1 I
-X PR20B H17 750 -200 200 L 50 50 3 1 I
-X PR20C J17 -750 -100 200 R 50 50 3 1 I
-X PR11A C18 -750 -800 200 R 50 50 3 1 I
-X PR14A D18 -750 -600 200 R 50 50 3 1 I
 X PR14C E18 -750 -500 200 R 50 50 3 1 I
+X PR23D E19 750 100 200 L 50 50 3 1 I
+X PR26A E20 -750 200 200 R 50 50 3 1 I
+X PR11D F16 750 -700 200 L 50 50 3 1 I
+X PR17A F17 -750 -400 200 R 50 50 3 1 I
 X PR14D F18 750 -500 200 L 50 50 3 1 I
+X PR26B F19 750 200 200 L 50 50 3 1 I
+X PR26C F20 -750 300 200 R 50 50 3 1 I
+X PR17C G16 -750 -300 200 R 50 50 3 1 I
 X PR17B G18 750 -400 200 L 50 50 3 1 I
+X GR_PCLK2_1 G19 -750 400 200 R 50 50 3 1 I
+X PR26D G20 750 300 200 L 50 50 3 1 I
+X PR17D H16 750 -300 200 L 50 50 3 1 I
+X PR20B H17 750 -200 200 L 50 50 3 1 I
 X PR20A H18 -750 -200 200 R 50 50 3 1 I
+X PR29B H20 750 400 200 L 50 50 3 1 I
+X PR20D J16 750 -100 200 L 50 50 3 1 I
+X PR20C J17 -750 -100 200 R 50 50 3 1 I
 X GR_PCLK2_0 J18 -750 500 200 R 50 50 3 1 I
-X PR29D K18 750 500 200 L 50 50 3 1 I
-X PR23B D19 750 0 200 L 50 50 3 1 I
-X PR23D E19 750 100 200 L 50 50 3 1 I
-X PR26B F19 750 200 200 L 50 50 3 1 I
-X GR_PCLK2_1 G19 -750 400 200 R 50 50 3 1 I
 X PCLKT2_1 J19 -750 600 200 R 50 50 3 1 I
+X PCLKT2_0 J20 -750 700 200 R 50 50 3 1 I
+X PR29D K18 750 500 200 L 50 50 3 1 I
 X PCLKC2_1 K19 750 600 200 L 50 50 3 1 I
-S -550 800 550 -1000 4 1 0 N
-S -250 250 250 -250 4 1 0 N
-S 100 0 200 -200 4 1 0 N
+X PCLKC2_0 K20 750 700 200 L 50 50 3 1 I
+X GR_PCLK3_0 L16 -750 -600 200 R 50 50 4 1 I
+X PR38B L17 750 -600 200 L 50 50 4 1 I
+X GR_PCLK3_1 L18 -750 -500 200 R 50 50 4 1 I
+X PCLKT3_0 L19 -750 -700 200 R 50 50 4 1 I
 X PCLKT3_1 L20 -750 -800 200 R 50 50 4 1 I
-X PCLKC3_1 M20 750 -800 200 L 50 50 4 1 I
-X PR59B N20 750 0 200 L 50 50 4 1 I
-X PR62A P20 -750 200 200 R 50 50 4 1 I
-X PR62B R20 750 200 200 L 50 50 4 1 I
-X PR62C T20 -750 300 200 R 50 50 4 1 I
-X PR62D U20 750 300 200 L 50 50 4 1 I
-X GR_PCLK3_0 L16 -750 -600 200 R 50 50 4 1 I
-X PR41A N16 -750 -400 200 R 50 50 4 1 I
-X VREF1_3 P16 750 -200 200 L 50 50 4 1 I
-X PR44C R16 -750 -100 200 R 50 50 4 1 I
-X PR53A T16 -750 -900 200 R 50 50 4 1 I
-X GPLL0T_IN U16 -750 700 200 R 50 50 4 1 I
-X PR38B L17 750 -600 200 L 50 50 4 1 I
 X PR41B M17 750 -400 200 L 50 50 4 1 I
-X PR44A N17 -750 -200 200 R 50 50 4 1 I
-X PR41D P17 750 -300 200 L 50 50 4 1 I
-X PR44D R17 750 -100 200 L 50 50 4 1 I
-X GPLL0C_IN T17 750 700 200 L 50 50 4 1 I
-X PR68B U17 750 600 200 L 50 50 4 1 I
-X GR_PCLK3_1 L18 -750 -500 200 R 50 50 4 1 I
 X PR38D M18 750 -500 200 L 50 50 4 1 I
+X PCLKC3_0 M19 750 -700 200 L 50 50 4 1 I
+X PCLKC3_1 M20 750 -800 200 L 50 50 4 1 I
+X PR41A N16 -750 -400 200 R 50 50 4 1 I
+X PR44A N17 -750 -200 200 R 50 50 4 1 I
 X PR41C N18 -750 -300 200 R 50 50 4 1 I
+X PR59A N19 -750 0 200 R 50 50 4 1 I
+X PR59B N20 750 0 200 L 50 50 4 1 I
+X VREF1_3 P16 750 -200 200 L 50 50 4 1 I
+X PR41D P17 750 -300 200 L 50 50 4 1 I
 X PR59D P18 750 100 200 L 50 50 4 1 I
+X PR59C P19 -750 100 200 R 50 50 4 1 I
+X PR62A P20 -750 200 200 R 50 50 4 1 I
+X PR44C R16 -750 -100 200 R 50 50 4 1 I
+X PR44D R17 750 -100 200 L 50 50 4 1 I
 X PR65B R18 750 400 200 L 50 50 4 1 I
+X PR62B R20 750 200 200 L 50 50 4 1 I
+X PR53A T16 -750 -900 200 R 50 50 4 1 I
+X GPLL0C_IN T17 750 700 200 L 50 50 4 1 I
 X PR65D T18 750 500 200 L 50 50 4 1 I
-X PR68A U18 -750 600 200 R 50 50 4 1 I
-X PCLKT3_0 L19 -750 -700 200 R 50 50 4 1 I
-X PCLKC3_0 M19 750 -700 200 L 50 50 4 1 I
-X PR59A N19 -750 0 200 R 50 50 4 1 I
-X PR59C P19 -750 100 200 R 50 50 4 1 I
 X PR65A T19 -750 400 200 R 50 50 4 1 I
+X PR62C T20 -750 300 200 R 50 50 4 1 I
+X GPLL0T_IN U16 -750 700 200 R 50 50 4 1 I
+X PR68B U17 750 600 200 L 50 50 4 1 I
+X PR68A U18 -750 600 200 R 50 50 4 1 I
 X PR65C U19 -750 500 200 R 50 50 4 1 I
-S -550 800 550 -1000 5 1 0 N
-S -250 250 250 -250 5 1 0 N
-S -200 0 -100 -200 5 1 0 N
+X PR62D U20 750 300 200 L 50 50 4 1 I
 X PCLKC6_1 F1 750 600 200 L 50 50 5 1 I
 X PCLKC6_0 G1 750 700 200 L 50 50 5 1 I
+X PCLKT6_1 G2 -750 600 200 R 50 50 5 1 I
 X PL41C H1 -750 300 200 R 50 50 5 1 I
+X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
 X PL41B J1 750 200 200 L 50 50 5 1 I
+X GR_PCLK6_1 J3 -750 500 200 R 50 50 5 1 I
+X GR_PCLK6_0 J4 -750 400 200 R 50 50 5 1 I
+X PL38B J5 750 400 200 L 50 50 5 1 I
 X PL41D K1 750 300 200 L 50 50 5 1 I
-X PL65C L1 -750 -500 200 R 50 50 5 1 I
-X PL65B M1 750 -600 200 L 50 50 5 1 I
-X PL65D N1 750 -500 200 L 50 50 5 1 I
-X PL68A P1 -750 -800 200 R 50 50 5 1 I
-X PCLKT6_1 G2 -750 600 200 R 50 50 5 1 I
-X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
 X PL41A K2 -750 200 200 R 50 50 5 1 I
-X PL62D L2 750 -300 200 L 50 50 5 1 I
-X PL65A N2 -750 -600 200 R 50 50 5 1 I
-X PL68B P2 750 -800 200 L 50 50 5 1 I
-X GR_PCLK6_1 J3 -750 500 200 R 50 50 5 1 I
 X PL38D K3 750 500 200 L 50 50 5 1 I
-X PL62C L3 -750 -300 200 R 50 50 5 1 I
-X PL62B M3 750 -400 200 L 50 50 5 1 I
-X PL62A N3 -750 -400 200 R 50 50 5 1 I
-X GPLL0T_IN P3 -750 -700 200 R 50 50 5 1 I
-X GR_PCLK6_0 J4 -750 400 200 R 50 50 5 1 I
 X PL44A K4 -750 0 200 R 50 50 5 1 I
-X PL44C L4 -750 100 200 R 50 50 5 1 I
-X PL59A M4 -750 -200 200 R 50 50 5 1 I
-X PL59C N4 -750 -100 200 R 50 50 5 1 I
-X GPLL0C_IN P4 750 -700 200 L 50 50 5 1 I
-X PL38B J5 750 400 200 L 50 50 5 1 I
 X VREF1_6 K5 750 0 200 L 50 50 5 1 I
+X PL65C L1 -750 -500 200 R 50 50 5 1 I
+X PL62D L2 750 -300 200 L 50 50 5 1 I
+X PL62C L3 -750 -300 200 R 50 50 5 1 I
+X PL44C L4 -750 100 200 R 50 50 5 1 I
 X PL44D L5 750 100 200 L 50 50 5 1 I
+X PL65B M1 750 -600 200 L 50 50 5 1 I
+X PL62B M3 750 -400 200 L 50 50 5 1 I
+X PL59A M4 -750 -200 200 R 50 50 5 1 I
 X PL53A M5 -750 -900 200 R 50 50 5 1 I
+X PL65D N1 750 -500 200 L 50 50 5 1 I
+X PL65A N2 -750 -600 200 R 50 50 5 1 I
+X PL62A N3 -750 -400 200 R 50 50 5 1 I
+X PL59C N4 -750 -100 200 R 50 50 5 1 I
 X PL59B N5 750 -200 200 L 50 50 5 1 I
+X PL68A P1 -750 -800 200 R 50 50 5 1 I
+X PL68B P2 750 -800 200 L 50 50 5 1 I
+X GPLL0T_IN P3 -750 -700 200 R 50 50 5 1 I
+X GPLL0C_IN P4 750 -700 200 L 50 50 5 1 I
 X PL59D P5 750 -100 200 L 50 50 5 1 I
-S -550 800 550 -900 6 1 0 N
-S -250 250 250 -250 6 1 0 N
-S -200 200 -100 0 6 1 0 N
-X PL23B B1 750 -200 200 L 50 50 6 1 I
-X PL26A C1 -750 -400 200 R 50 50 6 1 I
-X PL26B D1 750 -400 200 L 50 50 6 1 I
-X PL26D E1 750 -300 200 L 50 50 6 1 I
 X PL23A A2 -750 -200 200 R 50 50 6 1 I
-X VREF1_7 B2 -750 -100 200 R 50 50 6 1 I
-X PL23D C2 750 -100 200 L 50 50 6 1 I
-X PL26C D2 -750 -300 200 R 50 50 6 1 I
-X PCLKC7_0 E2 750 -700 200 L 50 50 6 1 I
-X PCLKT7_0 F2 -750 -700 200 R 50 50 6 1 I
 X PL14C A3 -750 500 200 R 50 50 6 1 I
-X PL14D B3 750 500 200 L 50 50 6 1 I
-X PL17C C3 -750 300 200 R 50 50 6 1 I
-X PL17D D3 750 300 200 L 50 50 6 1 I
-X PL20B E3 750 0 200 L 50 50 6 1 I
-X PCLKC7_1 F3 750 -800 200 L 50 50 6 1 I
-X PCLKT7_1 G3 -750 -800 200 R 50 50 6 1 I
-X PL29D H3 750 -500 200 L 50 50 6 1 I
 X PL11A A4 -750 600 200 R 50 50 6 1 I
-X PL14B B4 750 400 200 L 50 50 6 1 I
-X PL14A C4 -750 400 200 R 50 50 6 1 I
-X PL17A E4 -750 200 200 R 50 50 6 1 I
-X PL20A F4 -750 0 200 R 50 50 6 1 I
-X GR_PCLK7_1 H4 -750 -600 200 R 50 50 6 1 I
 X PL11B A5 750 600 200 L 50 50 6 1 I
+X PL23B B1 750 -200 200 L 50 50 6 1 I
+X VREF1_7 B2 -750 -100 200 R 50 50 6 1 I
+X PL14D B3 750 500 200 L 50 50 6 1 I
+X PL14B B4 750 400 200 L 50 50 6 1 I
 X PL11C B5 -750 700 200 R 50 50 6 1 I
+X PL26A C1 -750 -400 200 R 50 50 6 1 I
+X PL23D C2 750 -100 200 L 50 50 6 1 I
+X PL17C C3 -750 300 200 R 50 50 6 1 I
+X PL14A C4 -750 400 200 R 50 50 6 1 I
 X PL11D C5 750 700 200 L 50 50 6 1 I
+X PL26B D1 750 -400 200 L 50 50 6 1 I
+X PL26C D2 -750 -300 200 R 50 50 6 1 I
+X PL17D D3 750 300 200 L 50 50 6 1 I
 X PL17B D5 750 200 200 L 50 50 6 1 I
+X PL26D E1 750 -300 200 L 50 50 6 1 I
+X PCLKC7_0 E2 750 -700 200 L 50 50 6 1 I
+X PL20B E3 750 0 200 L 50 50 6 1 I
+X PL17A E4 -750 200 200 R 50 50 6 1 I
 X PL20C E5 -750 100 200 R 50 50 6 1 I
+X PCLKT7_0 F2 -750 -700 200 R 50 50 6 1 I
+X PCLKC7_1 F3 750 -800 200 L 50 50 6 1 I
+X PL20A F4 -750 0 200 R 50 50 6 1 I
 X PL20D F5 750 100 200 L 50 50 6 1 I
+X PCLKT7_1 G3 -750 -800 200 R 50 50 6 1 I
 X PL29B G5 750 -600 200 L 50 50 6 1 I
+X PL29D H3 750 -500 200 L 50 50 6 1 I
+X GR_PCLK7_1 H4 -750 -600 200 R 50 50 6 1 I
 X GR_PCLK7_0 H5 -750 -500 200 R 50 50 6 1 I
-S -550 800 550 -900 7 1 0 N
-S -250 250 250 -250 7 1 0 N
-S -200 -200 0 -100 7 1 0 N
 X D7 R1 -750 700 200 R 50 50 7 1 I
-X D6 T1 750 700 200 L 50 50 7 1 I
-X D5/MISO2 U1 -750 600 200 R 50 50 7 1 I
-X D4/MOSI2 V1 750 600 200 L 50 50 7 1 I
-X D3 W1 -750 500 200 R 50 50 7 1 I
 X CSSPIN R2 -750 200 200 R 50 50 7 1 I
-X SN/CSN T2 -750 300 200 R 50 50 7 1 I
-X CS1N U2 750 300 200 L 50 50 7 1 I
-X D1/MISO V2 -750 400 200 R 50 50 7 1 I
-X D0/MOSI W2 750 400 200 L 50 50 7 1 I
-X D2 Y2 750 500 200 L 50 50 7 1 I
 X DOUT/CSON R3 750 200 200 L 50 50 7 1 I
+X CFG_2 R4 -750 -400 200 R 50 50 7 1 I
+X D6 T1 750 700 200 L 50 50 7 1 I
+X SN/CSN T2 -750 300 200 R 50 50 7 1 I
 X WRITEN T3 -750 -100 200 R 50 50 7 1 I
+X CFG_1 T4 -750 -500 200 R 50 50 7 1 I
+X D5/MISO2 U1 -750 600 200 R 50 50 7 1 I
+X CS1N U2 750 300 200 L 50 50 7 1 I
 X CCLK U3 -750 -200 200 R 50 50 7 1 I
+X CFG_0 U4 -750 -600 200 R 50 50 7 1 I
+X D4/MOSI2 V1 750 600 200 L 50 50 7 1 I
+X D1/MISO V2 -750 400 200 R 50 50 7 1 I
 X INITN V3 -750 100 200 R 50 50 7 1 I
+X D3 W1 -750 500 200 R 50 50 7 1 I
+X D0/MOSI W2 750 400 200 L 50 50 7 1 I
 X PROGRAMN W3 -750 0 200 R 50 50 7 1 I
+X D2 Y2 750 500 200 L 50 50 7 1 I
 X DONE Y3 -750 -300 200 R 50 50 7 1 I
-X CFG_2 R4 -750 -400 200 R 50 50 7 1 I
-X CFG_1 T4 -750 -500 200 R 50 50 7 1 I
-X CFG_0 U4 -750 -600 200 R 50 50 7 1 I
-T 0 0 -1200 60 0 8 1 SERDES Normal 0 C C
-S -650 1000 650 -1050 8 1 0 N
-S -250 250 250 -250 8 1 0 N
-S 150 -200 -150 -150 8 1 0 N
-X RESERVED W4 -850 800 200 R 50 50 8 1 I
-X RESERVED W5 850 800 200 L 50 50 8 1 I
-X GND Y5 -850 700 200 R 50 50 8 1 I
+X GND T10 850 350 200 L 50 50 8 1 I
+X GND T11 -850 -300 200 R 50 50 8 1 I
+X GND T12 -850 -400 200 R 50 50 8 1 I
+X GND T13 850 -400 200 L 50 50 8 1 I
+X GND T14 850 -300 200 L 50 50 8 1 I
+X GND T15 -850 -100 200 R 50 50 8 1 I
 X GND T6 -850 150 200 R 50 50 8 1 I
-X GND U6 -850 50 200 R 50 50 8 1 I
-X GND Y6 850 700 200 L 50 50 8 1 I
 X GND T7 -850 350 200 R 50 50 8 1 I
-X GND Y7 -850 500 200 R 50 50 8 1 I
 X GND T8 -850 250 200 R 50 50 8 1 I
-X RESERVED W8 -850 600 200 R 50 50 8 1 I
-X GND Y8 850 500 200 L 50 50 8 1 I
 X GND T9 850 250 200 L 50 50 8 1 I
-X RESERVED W9 850 600 200 L 50 50 8 1 I
-X GND T10 850 350 200 L 50 50 8 1 I
+X GND U15 -850 -200 200 R 50 50 8 1 I
+X GND U6 -850 50 200 R 50 50 8 1 I
 X GND V10 850 150 200 L 50 50 8 1 I
-X GND W20 850 -550 200 L 50 50 8 1 I
-X GND T11 -850 -300 200 R 50 50 8 1 I
 X GND V11 850 50 200 L 50 50 8 1 I
-X GND Y11 -850 900 200 R 50 50 8 1 I
-X GND T12 -850 -400 200 R 50 50 8 1 I
-X GND Y12 850 900 200 L 50 50 8 1 I
-X GND T13 850 -400 200 L 50 50 8 1 I
+X GND V17 850 -100 200 L 50 50 8 1 I
+X GND V18 850 -200 200 L 50 50 8 1 I
 X RESERVED W13 -850 -650 200 R 50 50 8 1 I
-X GND T14 850 -300 200 L 50 50 8 1 I
 X RESERVED W14 850 -650 200 L 50 50 8 1 I
+X RESERVED W17 -850 -850 200 R 50 50 8 1 I
+X RESERVED W18 850 -850 200 L 50 50 8 1 I
+X GND W20 850 -550 200 L 50 50 8 1 I
+X RESERVED W4 -850 800 200 R 50 50 8 1 I
+X RESERVED W5 850 800 200 L 50 50 8 1 I
+X RESERVED W8 -850 600 200 R 50 50 8 1 I
+X RESERVED W9 850 600 200 L 50 50 8 1 I
+X GND Y11 -850 900 200 R 50 50 8 1 I
+X GND Y12 850 900 200 L 50 50 8 1 I
 X GND Y14 -850 -750 200 R 50 50 8 1 I
-X GND T15 -850 -100 200 R 50 50 8 1 I
-X GND U15 -850 -200 200 R 50 50 8 1 I
 X GND Y15 850 -750 200 L 50 50 8 1 I
 X GND Y16 -850 -950 200 R 50 50 8 1 I
-X GND V17 850 -100 200 L 50 50 8 1 I
-X RESERVED W17 -850 -850 200 R 50 50 8 1 I
 X GND Y17 850 -950 200 L 50 50 8 1 I
-X GND V18 850 -200 200 L 50 50 8 1 I
-X RESERVED W18 850 -850 200 L 50 50 8 1 I
 X GND Y19 -850 -550 200 R 50 50 8 1 I
-T 0 0 150 60 0 9 1 POWER Normal 0 C C
-S -4300 450 4650 -500 9 1 0 N
-S -250 250 250 -250 9 1 0 N
-S -100 100 100 -100 9 1 0 N
-X GND J2 1850 -700 200 U 50 50 9 1 I
-X GND M2 1950 -700 200 U 50 50 9 1 I
+X GND Y5 -850 700 200 R 50 50 8 1 I
+X GND Y6 850 700 200 L 50 50 8 1 I
+X GND Y7 -850 500 200 R 50 50 8 1 I
+X GND Y8 850 500 200 L 50 50 8 1 I
+X GND B14 -3050 -700 200 U 50 50 9 1 I
+X GND B7 550 -700 200 U 50 50 9 1 I
+X GND C19 -3850 -700 200 U 50 50 9 1 I
 X GND D4 1650 -700 200 U 50 50 9 1 I
-X GND G4 1750 -700 200 U 50 50 9 1 I
-X GND V5 2850 -700 200 U 50 50 9 1 I
+X VCCio0 F10 -1600 650 200 D 50 50 9 1 I
+X VCCio1 F11 -1200 650 200 D 50 50 9 1 I
+X VCCio1 F12 -1300 650 200 D 50 50 9 1 I
+X GND F13 -2250 -700 200 U 50 50 9 1 I
+X GND F14 -2950 -700 200 U 50 50 9 1 I
+X VCCAUX F15 -2100 650 200 D 50 50 9 1 I
 X VCCAUX F6 -1900 650 200 D 50 50 9 1 I
-X GND G6 1350 -700 200 U 50 50 9 1 I
-X VCCio7 H6 1150 650 200 D 50 50 9 1 I
-X VCCio7 J6 1250 650 200 D 50 50 9 1 I
-X GND K6 1450 -700 200 U 50 50 9 1 I
-X VCCio6 L6 750 650 200 D 50 50 9 1 I
-X VCCio6 M6 850 650 200 D 50 50 9 1 I
-X GND N6 1550 -700 200 U 50 50 9 1 I
-X VCCAUX P6 -1800 650 200 D 50 50 9 1 I
-X GND V6 3050 -700 200 U 50 50 9 1 I
-X GND W6 2950 -700 200 U 50 50 9 1 I
-X GND B7 550 -700 200 U 50 50 9 1 I
 X GND F7 650 -700 200 U 50 50 9 1 I
-X GND G7 750 -700 200 U 50 50 9 1 I
-X VCCio7 H7 1050 650 200 D 50 50 9 1 I
-X GND J7 850 -700 200 U 50 50 9 1 I
-X GND K7 950 -700 200 U 50 50 9 1 I
-X VCCio6 L7 650 650 200 D 50 50 9 1 I
-X GND M7 1050 -700 200 U 50 50 9 1 I
-X GND N7 1150 -700 200 U 50 50 9 1 I
-X GND P7 1250 -700 200 U 50 50 9 1 I
-X GND U7 2350 -700 200 U 50 50 9 1 I
-X GND V7 2050 -700 200 U 50 50 9 1 I
-X GND W7 3150 -700 200 U 50 50 9 1 I
 X GND F8 250 -700 200 U 50 50 9 1 I
-X GND G8 350 -700 200 U 50 50 9 1 I
-X VCC H8 -2800 650 200 D 50 50 9 1 I
-X VCC J8 -2700 650 200 D 50 50 9 1 I
-X VCC K8 -2600 650 200 D 50 50 9 1 I
-X VCC L8 -2500 650 200 D 50 50 9 1 I
-X VCC M8 -2400 650 200 D 50 50 9 1 I
-X VCC N8 -2300 650 200 D 50 50 9 1 I
-X GND P8 450 -700 200 U 50 50 9 1 I
-X GND U8 2450 -700 200 U 50 50 9 1 I
-X GND V8 2150 -700 200 U 50 50 9 1 I
 X VCCio0 F9 -1500 650 200 D 50 50 9 1 I
-X GND G9 -250 -700 200 U 50 50 9 1 I
-X VCC H9 -3000 650 200 D 50 50 9 1 I
-X GND J9 -150 -700 200 U 50 50 9 1 I
-X GND K9 -50 -700 200 U 50 50 9 1 I
-X GND L9 50 -700 200 U 50 50 9 1 I
-X GND M9 150 -700 200 U 50 50 9 1 I
-X VCC N9 -2900 650 200 D 50 50 9 1 I
-X VCCio8 P9 1550 650 200 D 50 50 9 1 I
-X GND U9 2550 -700 200 U 50 50 9 1 I
-X GND V9 2250 -700 200 U 50 50 9 1 I
-X VCCio0 F10 -1600 650 200 D 50 50 9 1 I
 X GND G10 -750 -700 200 U 50 50 9 1 I
-X VCC H10 -3200 650 200 D 50 50 9 1 I
-X GND J10 -650 -700 200 U 50 50 9 1 I
-X GND K10 -550 -700 200 U 50 50 9 1 I
-X GND L10 -450 -700 200 U 50 50 9 1 I
-X GND M10 -350 -700 200 U 50 50 9 1 I
-X VCC N10 -3100 650 200 D 50 50 9 1 I
-X VCCio8 P10 1450 650 200 D 50 50 9 1 I
-X GND U10 2650 -700 200 U 50 50 9 1 I
-X GND V20 2750 -700 200 U 50 50 9 1 I
-X VCCio1 F11 -1200 650 200 D 50 50 9 1 I
 X GND G11 -1350 -700 200 U 50 50 9 1 I
-X VCC H11 -3400 650 200 D 50 50 9 1 I
-X GND J11 -1250 -700 200 U 50 50 9 1 I
-X GND K11 -1150 -700 200 U 50 50 9 1 I
-X GND L11 -1050 -700 200 U 50 50 9 1 I
-X GND M11 -950 -700 200 U 50 50 9 1 I
-X VCC N11 -3300 650 200 D 50 50 9 1 I
-X GND P11 -850 -700 200 U 50 50 9 1 I
-X GND U11 4550 -700 200 U 50 50 9 1 I
-X VCCio1 F12 -1300 650 200 D 50 50 9 1 I
 X GND G12 -1950 -700 200 U 50 50 9 1 I
-X VCC H12 -3600 650 200 D 50 50 9 1 I
-X GND J12 -1850 -700 200 U 50 50 9 1 I
-X GND K12 -1750 -700 200 U 50 50 9 1 I
-X GND L12 -1650 -700 200 U 50 50 9 1 I
-X GND M12 -1550 -700 200 U 50 50 9 1 I
-X VCC N12 -3500 650 200 D 50 50 9 1 I
-X GND P12 -1450 -700 200 U 50 50 9 1 I
-X GND U12 4250 -700 200 U 50 50 9 1 I
-X GND V12 4350 -700 200 U 50 50 9 1 I
-X GND W12 4450 -700 200 U 50 50 9 1 I
-X GND F13 -2250 -700 200 U 50 50 9 1 I
 X GND G13 -2150 -700 200 U 50 50 9 1 I
-X VCC H13 -4200 650 200 D 50 50 9 1 I
-X VCC J13 -4100 650 200 D 50 50 9 1 I
-X VCC K13 -4000 650 200 D 50 50 9 1 I
-X VCC L13 -3900 650 200 D 50 50 9 1 I
-X VCC M13 -3800 650 200 D 50 50 9 1 I
-X VCC N13 -3700 650 200 D 50 50 9 1 I
-X GND P13 -2050 -700 200 U 50 50 9 1 I
-X GND U13 4050 -700 200 U 50 50 9 1 I
-X GND V13 4150 -700 200 U 50 50 9 1 I
-X GND B14 -3050 -700 200 U 50 50 9 1 I
-X GND F14 -2950 -700 200 U 50 50 9 1 I
 X GND G14 -2850 -700 200 U 50 50 9 1 I
+X GND G15 -3350 -700 200 U 50 50 9 1 I
+X GND G17 -3550 -700 200 U 50 50 9 1 I
+X GND G4 1750 -700 200 U 50 50 9 1 I
+X GND G6 1350 -700 200 U 50 50 9 1 I
+X GND G7 750 -700 200 U 50 50 9 1 I
+X GND G8 350 -700 200 U 50 50 9 1 I
+X GND G9 -250 -700 200 U 50 50 9 1 I
+X VCC H10 -3200 650 200 D 50 50 9 1 I
+X VCC H11 -3400 650 200 D 50 50 9 1 I
+X VCC H12 -3600 650 200 D 50 50 9 1 I
+X VCC H13 -4200 650 200 D 50 50 9 1 I
 X VCCio2 H14 -800 650 200 D 50 50 9 1 I
+X VCCio2 H15 -1000 650 200 D 50 50 9 1 I
+X GND H19 -3750 -700 200 U 50 50 9 1 I
+X VCCio7 H6 1150 650 200 D 50 50 9 1 I
+X VCCio7 H7 1050 650 200 D 50 50 9 1 I
+X VCC H8 -2800 650 200 D 50 50 9 1 I
+X VCC H9 -3000 650 200 D 50 50 9 1 I
+X GND J10 -650 -700 200 U 50 50 9 1 I
+X GND J11 -1250 -700 200 U 50 50 9 1 I
+X GND J12 -1850 -700 200 U 50 50 9 1 I
+X VCC J13 -4100 650 200 D 50 50 9 1 I
 X GND J14 -2750 -700 200 U 50 50 9 1 I
+X VCCio2 J15 -900 650 200 D 50 50 9 1 I
+X GND J2 1850 -700 200 U 50 50 9 1 I
+X VCCio7 J6 1250 650 200 D 50 50 9 1 I
+X GND J7 850 -700 200 U 50 50 9 1 I
+X VCC J8 -2700 650 200 D 50 50 9 1 I
+X GND J9 -150 -700 200 U 50 50 9 1 I
+X GND K10 -550 -700 200 U 50 50 9 1 I
+X GND K11 -1150 -700 200 U 50 50 9 1 I
+X GND K12 -1750 -700 200 U 50 50 9 1 I
+X VCC K13 -4000 650 200 D 50 50 9 1 I
 X GND K14 -2650 -700 200 U 50 50 9 1 I
+X GND K15 -3250 -700 200 U 50 50 9 1 I
+X GND K6 1450 -700 200 U 50 50 9 1 I
+X GND K7 950 -700 200 U 50 50 9 1 I
+X VCC K8 -2600 650 200 D 50 50 9 1 I
+X GND K9 -50 -700 200 U 50 50 9 1 I
+X GND L10 -450 -700 200 U 50 50 9 1 I
+X GND L11 -1050 -700 200 U 50 50 9 1 I
+X GND L12 -1650 -700 200 U 50 50 9 1 I
+X VCC L13 -3900 650 200 D 50 50 9 1 I
 X VCCio3 L14 -400 650 200 D 50 50 9 1 I
+X VCCio3 L15 -600 650 200 D 50 50 9 1 I
+X VCCio6 L6 750 650 200 D 50 50 9 1 I
+X VCCio6 L7 650 650 200 D 50 50 9 1 I
+X VCC L8 -2500 650 200 D 50 50 9 1 I
+X GND L9 50 -700 200 U 50 50 9 1 I
+X GND M10 -350 -700 200 U 50 50 9 1 I
+X GND M11 -950 -700 200 U 50 50 9 1 I
+X GND M12 -1550 -700 200 U 50 50 9 1 I
+X VCC M13 -3800 650 200 D 50 50 9 1 I
 X GND M14 -2550 -700 200 U 50 50 9 1 I
+X VCCio3 M15 -500 650 200 D 50 50 9 1 I
+X GND M16 -3450 -700 200 U 50 50 9 1 I
+X GND M2 1950 -700 200 U 50 50 9 1 I
+X VCCio6 M6 850 650 200 D 50 50 9 1 I
+X GND M7 1050 -700 200 U 50 50 9 1 I
+X VCC M8 -2400 650 200 D 50 50 9 1 I
+X GND M9 150 -700 200 U 50 50 9 1 I
+X VCC N10 -3100 650 200 D 50 50 9 1 I
+X VCC N11 -3300 650 200 D 50 50 9 1 I
+X VCC N12 -3500 650 200 D 50 50 9 1 I
+X VCC N13 -3700 650 200 D 50 50 9 1 I
 X GND N14 -2450 -700 200 U 50 50 9 1 I
+X GND N15 -3150 -700 200 U 50 50 9 1 I
+X GND N6 1550 -700 200 U 50 50 9 1 I
+X GND N7 1150 -700 200 U 50 50 9 1 I
+X VCC N8 -2300 650 200 D 50 50 9 1 I
+X VCC N9 -2900 650 200 D 50 50 9 1 I
+X VCCio8 P10 1450 650 200 D 50 50 9 1 I
+X GND P11 -850 -700 200 U 50 50 9 1 I
+X GND P12 -1450 -700 200 U 50 50 9 1 I
+X GND P13 -2050 -700 200 U 50 50 9 1 I
 X GND P14 -2350 -700 200 U 50 50 9 1 I
+X VCCAUX P15 -2000 650 200 D 50 50 9 1 I
+X VCCAUX P6 -1800 650 200 D 50 50 9 1 I
+X GND P7 1250 -700 200 U 50 50 9 1 I
+X GND P8 450 -700 200 U 50 50 9 1 I
+X VCCio8 P9 1550 650 200 D 50 50 9 1 I
+X GND R19 -3650 -700 200 U 50 50 9 1 I
+X GND U10 2650 -700 200 U 50 50 9 1 I
+X GND U11 4550 -700 200 U 50 50 9 1 I
+X GND U12 4250 -700 200 U 50 50 9 1 I
+X GND U13 4050 -700 200 U 50 50 9 1 I
 X GND U14 3850 -700 200 U 50 50 9 1 I
+X GND U7 2350 -700 200 U 50 50 9 1 I
+X GND U8 2450 -700 200 U 50 50 9 1 I
+X GND U9 2550 -700 200 U 50 50 9 1 I
+X GND V12 4350 -700 200 U 50 50 9 1 I
+X GND V13 4150 -700 200 U 50 50 9 1 I
 X GND V14 3750 -700 200 U 50 50 9 1 I
-X VCCAUX F15 -2100 650 200 D 50 50 9 1 I
-X GND G15 -3350 -700 200 U 50 50 9 1 I
-X VCCio2 H15 -1000 650 200 D 50 50 9 1 I
-X VCCio2 J15 -900 650 200 D 50 50 9 1 I
-X GND K15 -3250 -700 200 U 50 50 9 1 I
-X VCCio3 L15 -600 650 200 D 50 50 9 1 I
-X VCCio3 M15 -500 650 200 D 50 50 9 1 I
-X GND N15 -3150 -700 200 U 50 50 9 1 I
-X VCCAUX P15 -2000 650 200 D 50 50 9 1 I
 X GND V15 3250 -700 200 U 50 50 9 1 I
-X GND W15 3950 -700 200 U 50 50 9 1 I
-X GND M16 -3450 -700 200 U 50 50 9 1 I
 X GND V16 3450 -700 200 U 50 50 9 1 I
-X GND W16 3350 -700 200 U 50 50 9 1 I
-X GND G17 -3550 -700 200 U 50 50 9 1 I
-X GND C19 -3850 -700 200 U 50 50 9 1 I
-X GND H19 -3750 -700 200 U 50 50 9 1 I
-X GND R19 -3650 -700 200 U 50 50 9 1 I
 X GND V19 3650 -700 200 U 50 50 9 1 I
+X GND V20 2750 -700 200 U 50 50 9 1 I
+X GND V5 2850 -700 200 U 50 50 9 1 I
+X GND V6 3050 -700 200 U 50 50 9 1 I
+X GND V7 2050 -700 200 U 50 50 9 1 I
+X GND V8 2150 -700 200 U 50 50 9 1 I
+X GND V9 2250 -700 200 U 50 50 9 1 I
+X GND W12 4450 -700 200 U 50 50 9 1 I
+X GND W15 3950 -700 200 U 50 50 9 1 I
+X GND W16 3350 -700 200 U 50 50 9 1 I
 X GND W19 3550 -700 200 U 50 50 9 1 I
-T 0 0 -50 60 0 10 1 PROG Normal 0 C C
-S -500 250 300 -250 10 1 0 N
-X TDO V4 -700 50 200 R 50 50 10 1 I
+X GND W6 2950 -700 200 U 50 50 9 1 I
+X GND W7 3150 -700 200 U 50 50 9 1 I
 X TDI R5 -700 150 200 R 50 50 10 1 I
 X TCK T5 -700 -50 200 R 50 50 10 1 I
 X TMS U5 -700 -150 200 R 50 50 10 1 I
+X TDO V4 -700 50 200 R 50 50 10 1 I
+ENDDRAW
+ENDDEF
+#
+# MB85RS16
+#
+DEF MB85RS16 U 0 40 Y Y 1 F N
+F0 "U" -300 250 50 H V L CNN
+F1 "MB85RS16" 50 250 50 H V L CNN
+F2 "" -350 -50 50 H I C CNN
+F3 "" -350 -50 50 H I C CNN
+DRAW
+S -300 200 300 -200 0 1 10 f
+X ~CS 1 -400 -100 100 R 50 50 1 1 I
+X MISO 2 400 -100 100 L 50 50 1 1 I
+X ~WP 3 -400 100 100 R 50 50 1 1 I
+X GND 4 0 -300 100 U 50 50 1 1 W
+X MOSI 5 400 0 100 L 50 50 1 1 I
+X SCK 6 400 100 100 L 50 50 1 1 I
+X ~HOLD 7 -400 0 100 R 50 50 1 1 I
+X Vcc 8 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# PCF8563
+#
+DEF PCF8563 U 0 40 Y Y 1 F N
+F0 "U" -300 350 50 H V L CNN
+F1 "PCF8563" 100 350 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIP*
+ PDIP*
+ SOIC*
+ SO*
+ TSSOP*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X OSCI 1 -400 200 100 R 50 50 1 1 I
+X OSCO 2 -400 -200 100 R 50 50 1 1 O
+X ~INT~ 3 400 -200 100 L 50 50 1 1 O
+X VSS 4 0 -400 100 U 50 50 1 1 W
+X SDA 5 400 100 100 L 50 50 1 1 B
+X SCL 6 400 200 100 L 50 50 1 1 I
+X CLKO 7 400 -100 100 L 50 50 1 1 O C
+X VDD 8 0 400 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_GSD
+#
+DEF Q_NMOS_GSD Q 0 0 Y N 1 F N
+F0 "Q" 200 50 50 H V L CNN
+F1 "Q_NMOS_GSD" 200 -50 50 H V L CNN
+F2 "" 200 100 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 65 0 111 0 1 10 N
+C 100 -70 11 0 1 0 F
+C 100 70 11 0 1 0 F
+P 2 0 1 0 2 0 10 0 N
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+P 4 0 1 0 100 -70 130 -70 130 70 100 70 N
+P 4 0 1 0 110 20 115 15 145 15 150 10 N
+P 4 0 1 0 130 15 115 -10 145 -10 130 15 N
+X G 1 -200 0 200 R 50 50 1 1 I
+X S 2 100 -200 100 U 50 50 1 1 P
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_BEC
+#
+DEF Q_PNP_BEC Q 0 0 Y N 1 F N
+F0 "Q" 200 50 50 H V L CNN
+F1 "Q_PNP_BEC" 200 -50 50 H V L CNN
+F2 "" 200 100 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+X B 1 -200 0 225 R 50 50 1 1 I
+X E 2 100 -200 100 U 50 50 1 1 P
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/ulx3s.pro b/ulx3s.pro
index b4aff21..0cad769 100644
--- a/ulx3s.pro
+++ b/ulx3s.pro
@@ -1,4 +1,4 @@
-update=ponedjeljak, 02. travnja 2018. 17:22:15 CEST
+update=srijeda, 11. travnja 2018. 12:56:49 CEST
 version=1
 last_client=kicad
 [pcbnew]
@@ -25,52 +25,6 @@ version=1
 NetIExt=net
 [general]
 version=1
-[eeschema]
-version=1
-LibDir=footprints/esp8266;footprints/lattice;footprints/micro-hdmi-d;footprints/dcdc_converter;footprints/usbserial;footprints/esp32;footprints/oled;footprints/adc/max1112x;footprints/sdram;footprints/micro-sd/micro-sd;footprints/usb_otg
-[eeschema/libraries]
-LibName1=ulx3s-rescue
-LibName2=power
-LibName3=device
-LibName4=transistors
-LibName5=conn
-LibName6=linear
-LibName7=regul
-LibName8=74xx
-LibName9=cmos4000
-LibName10=adc-dac
-LibName11=memory
-LibName12=xilinx
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=footprints/esp8266/ESP8266
-LibName32=footprints/lattice/lfe5bg381
-LibName33=footprints/micro-hdmi-d/micro-hdmi-d
-LibName34=footprints/dcdc_converter/ap3429a
-LibName35=footprints/usbserial/ft2232
-LibName36=footprints/esp32/ESP32
-LibName37=footprints/oled/ssd_13xx
-LibName38=footprints/usbserial/ftdi
-LibName39=footprints/adc/max1112x/max1112x
-LibName40=footprints/micro-sd/micro_sd_card_cd
-LibName41=footprints/sdram/mt48lc16m16a2tg
-LibName42=footprints/usb_otg/usb_otg
 [schematic_editor]
 version=1
 PageLayoutDescrFile=
@@ -81,3 +35,6 @@ NetFmtName=Pcbnew
 SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
+[eeschema]
+version=1
+LibDir=
diff --git a/ulx3s.sch b/ulx3s.sch
index 5f0ef08..54dddee 100644
--- a/ulx3s.sch
+++ b/ulx3s.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -119,7 +77,7 @@ F0 "flash" 60
 F1 "flash.sch" 60
 $EndSheet
 $Comp
-L CONN_01X01 H1
+L micro-hdmi-d:CONN_01X01 H1
 U 1 1 58E6B981
 P 3150 6350
 F 0 "H1" H 3150 6450 50  0000 C CNN
@@ -130,7 +88,7 @@ F 3 "" H 3150 6350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_01X01 H2
+L micro-hdmi-d:CONN_01X01 H2
 U 1 1 58E6BACE
 P 4250 6350
 F 0 "H2" H 4250 6450 50  0000 C CNN
@@ -141,7 +99,7 @@ F 3 "" H 4250 6350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_01X01 H3
+L micro-hdmi-d:CONN_01X01 H3
 U 1 1 58E6BAEF
 P 4250 5650
 F 0 "H3" H 4250 5750 50  0000 C CNN
@@ -152,7 +110,7 @@ F 3 "" H 4250 5650 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_01X01 H4
+L micro-hdmi-d:CONN_01X01 H4
 U 1 1 58E6BBE9
 P 3150 5600
 F 0 "H4" H 3150 5700 50  0000 C CNN
@@ -163,7 +121,7 @@ F 3 "" H 3150 5600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR2
+L power:GND #PWR2
 U 1 1 58E6BC0E
 P 3150 6550
 F 0 "#PWR2" H 3150 6300 50  0001 C CNN
@@ -174,7 +132,7 @@ F 3 "" H 3150 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L power:GND #PWR4
 U 1 1 58E6BC2E
 P 4250 6550
 F 0 "#PWR4" H 4250 6300 50  0001 C CNN
@@ -185,7 +143,7 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR3
+L power:GND #PWR3
 U 1 1 58E6BC56
 P 4250 5850
 F 0 "#PWR3" H 4250 5600 50  0001 C CNN
@@ -196,7 +154,7 @@ F 3 "" H 4250 5850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR1
+L power:GND #PWR1
 U 1 1 58E6BC72
 P 3150 5800
 F 0 "#PWR1" H 3150 5550 50  0001 C CNN
diff --git a/usb.bak b/usb.bak
index 44a2338..0767139 100644
--- a/usb.bak
+++ b/usb.bak
@@ -526,8 +526,11 @@ P 2600 3000
 F 0 "D20" H 2800 2900 50  0000 C CNN
 F 1 "3.6V" H 2600 2910 50  0000 C CNN
 F 2 "Diodes_SMD:D_SOD-323_HandSoldering" V 2600 3000 50  0001 C CNN
-F 3 "" V 2600 3000 50  0001 C CNN
-F 4 "BZT52C3V6S" H 2600 3000 60  0001 C CNN "MFG_PN"
+F 3 "http://www.taiwansemi.com/products/datasheet/BZT52C2V4S%20SERIES_H1709.pdf" V 2600 3000 50  0001 C CNN
+F 4 "http://www.taiwansemi.com/en" H 2600 3000 60  0001 C CNN "MFG_URL"
+F 5 "BZT52C3V6S" H 2600 3000 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 2600 3000 60  0001 C CNN "Distributor1_URL"
+F 7 "821-BZT52C3V6S" H 2600 3000 60  0001 C CNN "Distributor1_PN"
 	1    2600 3000
 	0    1    1    0   
 $EndComp
@@ -538,8 +541,11 @@ P 2700 3000
 F 0 "D21" H 2900 3100 50  0000 C CNN
 F 1 "3.6V" H 2700 3100 50  0000 C CNN
 F 2 "Diodes_SMD:D_SOD-323_HandSoldering" V 2700 3000 50  0001 C CNN
-F 3 "" V 2700 3000 50  0001 C CNN
-F 4 "BZT52C3V6S" H 2700 3000 60  0001 C CNN "MFG_PN"
+F 3 "http://www.taiwansemi.com/products/datasheet/BZT52C2V4S%20SERIES_H1709.pdf" V 2700 3000 50  0001 C CNN
+F 4 "http://www.taiwansemi.com/en" H 2700 3000 60  0001 C CNN "MFG_URL"
+F 5 "BZT52C3V6S" H 2700 3000 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 2700 3000 60  0001 C CNN "Distributor1_URL"
+F 7 "821-BZT52C3V6S" H 2700 3000 60  0001 C CNN "Distributor1_PN"
 	1    2700 3000
 	0    1    1    0   
 $EndComp
diff --git a/usb.sch b/usb.sch
index 0767139..2148e0a 100644
--- a/usb.sch
+++ b/usb.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -57,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L D_Schottky_Small D8
+L ulx3s-rescue:D_Schottky_Small D8
 U 1 1 58D6C83A
 P 2300 1700
 F 0 "D8" H 2350 1650 50  0000 L CNN
@@ -71,7 +29,7 @@ F 6 "511-STPS2L30AF " H 2300 1700 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L +5V #PWR107
+L power:+5V #PWR107
 U 1 1 58D6C83B
 P 3050 1700
 F 0 "#PWR107" H 3050 1550 50  0001 C CNN
@@ -82,7 +40,7 @@ F 3 "" H 3050 1700 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L D_Schottky_Small D9
+L ulx3s-rescue:D_Schottky_Small D9
 U 1 1 58D6C83C
 P 2600 2650
 F 0 "D9" H 2450 2700 50  0000 L CNN
@@ -96,7 +54,7 @@ F 6 "511-STPS2L30AF " H 2600 2650 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR108
+L power:+5V #PWR108
 U 1 1 58D6C83D
 P 3200 2650
 F 0 "#PWR108" H 3200 2500 50  0001 C CNN
@@ -107,7 +65,7 @@ F 3 "" H 3200 2650 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L USB_OTG1 US1
+L usb_otg:USB_OTG1 US1
 U 1 1 58D6C840
 P 1500 1900
 AR Path="/58D6C840" Ref="US1"  Part="1" 
@@ -123,7 +81,7 @@ F 6 "www.mouser.com" H 1500 1900 60  0001 C CNN "Distributor1_URL"
 	0    -1   1    0   
 $EndComp
 $Comp
-L USB_OTG1 US2
+L usb_otg:USB_OTG1 US2
 U 1 1 58D6C841
 P 1500 2850
 AR Path="/58D6C841" Ref="US2"  Part="1" 
@@ -139,7 +97,7 @@ F 6 "www.mouser.com" H 1500 2850 60  0001 C CNN "Distributor1_URL"
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR104
+L power:GND #PWR104
 U 1 1 58D6C842
 P 1850 2100
 F 0 "#PWR104" H 1850 1850 50  0001 C CNN
@@ -150,7 +108,7 @@ F 3 "" H 1850 2100 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR105
+L power:GND #PWR105
 U 1 1 58D6C843
 P 1850 3050
 F 0 "#PWR105" H 1850 2800 50  0001 C CNN
@@ -171,7 +129,7 @@ USB_FPGA_D+
 NoConn ~ 1850 2950
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR102
+L power:GND #PWR102
 U 1 1 58D82518
 P 1400 2300
 F 0 "#PWR102" H 1400 2050 50  0001 C CNN
@@ -182,7 +140,7 @@ F 3 "" H 1400 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR103
+L power:GND #PWR103
 U 1 1 58D8254A
 P 1400 3250
 F 0 "#PWR103" H 1400 3000 50  0001 C CNN
@@ -193,7 +151,7 @@ F 3 "" H 1400 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR111
+L power:GND #PWR111
 U 1 1 58D8877C
 P 5600 4500
 F 0 "#PWR111" H 5600 4250 50  0001 C CNN
@@ -234,7 +192,7 @@ JTAG_TMS
 Text GLabel 2150 1500 2    60   Input ~ 0
 USB5V
 $Comp
-L FT231XS U6
+L ftdi:FT231XS U6
 U 1 1 58EB61C6
 P 5700 3400
 F 0 "U6" H 5150 4200 50  0000 L CNN
@@ -249,7 +207,7 @@ F 7 "895-FT231XS-R" H 5700 3400 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1800 1700 2200 1700
+	1800 1700 1950 1700
 Wire Wire Line
 	2400 1700 3050 1700
 Wire Wire Line
@@ -273,10 +231,10 @@ Wire Wire Line
 Wire Wire Line
 	1800 2000 1850 2000
 Wire Wire Line
-	5600 4300 5600 4500
+	5600 4300 5600 4400
 Connection ~ 5600 4400
 Wire Wire Line
-	6400 3700 6550 3700
+	6400 3700 6450 3700
 Wire Wire Line
 	6400 3800 6550 3800
 Wire Wire Line
@@ -311,11 +269,13 @@ Wire Wire Line
 Text GLabel 4850 3400 0    60   Input ~ 0
 nRESET
 Wire Wire Line
-	4850 3400 5000 3400
+	4850 3400 4950 3400
 $Comp
-L R R9
+L ulx3s-rescue:R R9
 U 1 1 58EB9CB5
 P 4700 3600
+AR Path="/58EB9CB5" Ref="R9"  Part="1" 
+AR Path="/58D6BF46/58EB9CB5" Ref="R9"  Part="1" 
 F 0 "R9" V 4780 3600 50  0000 C CNN
 F 1 "15k" V 4700 3600 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4630 3600 50  0001 C CNN
@@ -397,9 +357,11 @@ VNC2 programming pins:\nTXD RXD TXDEN
 Text Notes 4350 5900 0    60   ~ 0
 warning:\nULX3S has different pinout\nfor simpler PCB routing and\nbecause FT230X has weak CTS\ndrive capability. (Undocumented,\nFLEAfpga mail from 13-Nov-2015)\nULX2S pinout was:\nTCK = DSR\nTMS = RI\nTDI = CTS\nTDO = DCD\n
 $Comp
-L R R40
+L ulx3s-rescue:R R40
 U 1 1 591C69FB
 P 2250 4850
+AR Path="/591C69FB" Ref="R40"  Part="1" 
+AR Path="/58D6BF46/591C69FB" Ref="R40"  Part="1" 
 F 0 "R40" V 2330 4850 50  0000 C CNN
 F 1 "1.5k" V 2250 4850 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603" V 2180 4850 50  0001 C CNN
@@ -412,7 +374,7 @@ D+ 1.5k pullp for \nfull speed device\nmode USB1.1
 Text GLabel 8650 1450 0    60   Input ~ 0
 CLK_25MHz
 $Comp
-L CONN_02X03 J4
+L micro-hdmi-d:CONN_02X03 J4
 U 1 1 591E0E6A
 P 9400 5000
 F 0 "J4" H 9400 5200 50  0000 C CNN
@@ -432,7 +394,7 @@ JTAG_TCK
 Text GLabel 9150 5100 0    60   Input ~ 0
 JTAG_TMS
 $Comp
-L GND #PWR113
+L power:GND #PWR113
 U 1 1 591E1000
 P 8700 4900
 F 0 "#PWR113" H 8700 4650 50  0001 C CNN
@@ -443,7 +405,7 @@ F 3 "" H 8700 4900 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR114
+L power:+3V3 #PWR114
 U 1 1 591E1028
 P 10100 4900
 F 0 "#PWR114" H 10100 4750 50  0001 C CNN
@@ -458,9 +420,11 @@ Wire Wire Line
 Wire Wire Line
 	8700 4900 9150 4900
 $Comp
-L R R49
+L ulx3s-rescue:R R49
 U 1 1 59274246
 P 2300 1800
+AR Path="/59274246" Ref="R49"  Part="1" 
+AR Path="/58D6BF46/59274246" Ref="R49"  Part="1" 
 F 0 "R49" V 2250 2000 50  0000 C CNN
 F 1 "27" V 2300 1800 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2230 1800 50  0001 C CNN
@@ -469,9 +433,11 @@ F 3 "" H 2300 1800 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R50
+L ulx3s-rescue:R R50
 U 1 1 592743C8
 P 2300 1900
+AR Path="/592743C8" Ref="R50"  Part="1" 
+AR Path="/58D6BF46/592743C8" Ref="R50"  Part="1" 
 F 0 "R50" V 2250 2100 50  0000 C CNN
 F 1 "27" V 2300 1900 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2230 1900 50  0001 C CNN
@@ -490,9 +456,11 @@ FTD+
 Text Notes 2850 3250 0    60   ~ 0
 USB_FPGA connected to\nBANK1 on "gpdi" sheet and\nBANK2 on "ram" sheet
 $Comp
-L R R52
+L ulx3s-rescue:R R52
 U 1 1 59C0F7B0
 P 2250 2750
+AR Path="/59C0F7B0" Ref="R52"  Part="1" 
+AR Path="/58D6BF46/59C0F7B0" Ref="R52"  Part="1" 
 F 0 "R52" V 2200 2950 50  0000 C CNN
 F 1 "27" V 2250 2750 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2180 2750 50  0001 C CNN
@@ -501,9 +469,11 @@ F 3 "" H 2250 2750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R53
+L ulx3s-rescue:R R53
 U 1 1 59C0F7B6
 P 2250 2850
+AR Path="/59C0F7B6" Ref="R53"  Part="1" 
+AR Path="/58D6BF46/59C0F7B6" Ref="R53"  Part="1" 
 F 0 "R53" V 2200 3050 50  0000 C CNN
 F 1 "27" V 2250 2850 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2180 2850 50  0001 C CNN
@@ -512,15 +482,15 @@ F 3 "" H 2250 2850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2400 2750 3150 2750
+	2400 2750 2700 2750
 Wire Wire Line
-	2400 2850 3150 2850
+	2400 2850 2600 2850
 Text Label 1850 2750 0    60   ~ 0
 FPD-
 Text Label 1850 2850 0    60   ~ 0
 FPD+
 $Comp
-L D_Zener_Small_ALT D20
+L ulx3s-rescue:D_Zener_Small_ALT D20
 U 1 1 59C133D8
 P 2600 3000
 F 0 "D20" H 2800 2900 50  0000 C CNN
@@ -535,7 +505,7 @@ F 7 "821-BZT52C3V6S" H 2600 3000 60  0001 C CNN "Distributor1_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L D_Zener_Small_ALT D21
+L ulx3s-rescue:D_Zener_Small_ALT D21
 U 1 1 59C134C9
 P 2700 3000
 F 0 "D21" H 2900 3100 50  0000 C CNN
@@ -552,11 +522,11 @@ $EndComp
 Wire Wire Line
 	2600 3100 2600 3200
 Wire Wire Line
-	2600 3200 2700 3200
+	2600 3200 2650 3200
 Wire Wire Line
 	2700 3200 2700 3100
 $Comp
-L GND #PWR106
+L power:GND #PWR106
 U 1 1 59C1372A
 P 2650 3250
 F 0 "#PWR106" H 2650 3000 50  0001 C CNN
@@ -574,9 +544,11 @@ Connection ~ 2700 2750
 Text GLabel 8650 2550 0    60   Input ~ 0
 WIFI_GPIO16
 $Comp
-L Antenna AE1
+L ulx3s-rescue:Antenna AE1
 U 1 1 59C3AE47
 P 10950 1350
+AR Path="/59C3AE47" Ref="AE1"  Part="1" 
+AR Path="/58D6BF46/59C3AE47" Ref="AE1"  Part="1" 
 F 0 "AE1" H 10875 1425 50  0000 R CNN
 F 1 "433MHz" H 10875 1350 50  0000 R CNN
 F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 10950 1350 50  0001 C CNN
@@ -592,9 +564,11 @@ ANT_433MHz
 Text Notes 650  4100 0    60   ~ 0
 D8,D9: Schottky 2A/30V \nLow drop Vfmax=0.375V
 $Comp
-L R R54
+L ulx3s-rescue:R R54
 U 1 1 59D562D0
 P 2250 5450
+AR Path="/59D562D0" Ref="R54"  Part="1" 
+AR Path="/58D6BF46/59D562D0" Ref="R54"  Part="1" 
 F 0 "R54" V 2150 5450 50  0000 C CNN
 F 1 "1.5k" V 2250 5450 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603" V 2180 5450 50  0001 C CNN
@@ -607,9 +581,11 @@ D- 1.5k pullp for \nlow speed device\nmode USB1.0
 Text GLabel 8650 2350 0    60   Input ~ 0
 FTDI_TXDEN
 $Comp
-L R R56
+L ulx3s-rescue:R R56
 U 1 1 59DFFFBE
 P 6450 4250
+AR Path="/59DFFFBE" Ref="R56"  Part="1" 
+AR Path="/58D6BF46/59DFFFBE" Ref="R56"  Part="1" 
 F 0 "R56" V 6530 4250 50  0000 C CNN
 F 1 "0" V 6450 4250 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 6380 4250 50  0001 C CNN
@@ -622,7 +598,7 @@ Wire Wire Line
 	6450 4100 6450 3700
 Connection ~ 6450 3700
 $Comp
-L GND #PWR112
+L power:GND #PWR112
 U 1 1 59E000AB
 P 6450 4400
 F 0 "#PWR112" H 6450 4150 50  0001 C CNN
@@ -635,7 +611,7 @@ $EndComp
 Text Notes 6100 5000 0    60   ~ 0
 Short circuit R56\nfor chip rev A,B,C\nworkaround in \nTN140_FT231X Errata
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 5 1 5A079A7A
 P 9400 2050
 AR Path="/5A079A7A" Ref="U1"  Part="5" 
@@ -650,7 +626,7 @@ F 5 "www.mouser.com" H 9400 2050 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LFE5U-45F-6BG381C U1
+L lfe5bg381:LFE5U-45F-6BG381C U1
 U 10 1 5A07A05D
 P 8600 3950
 AR Path="/5A07A05D" Ref="U1"  Part="10" 
@@ -666,7 +642,7 @@ F 6 "842-LFE5U45F6BG381C" H 8600 3950 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Crystal_GND24 Y1
+L ulx3s-rescue:Crystal_GND24 Y1
 U 1 1 5A079883
 P 5450 1450
 F 0 "Y1" H 5575 1650 50  0000 L CNN
@@ -681,7 +657,7 @@ F 7 "729-FNETHE025" H 5450 1450 60  0001 C CNN "Distributor1_PN"
 	1    0    0    1   
 $EndComp
 Wire Wire Line
-	5450 1150 5450 1250
+	5450 1150 5450 1200
 Wire Wire Line
 	5300 1450 5200 1450
 Wire Wire Line
@@ -690,7 +666,7 @@ Wire Wire Line
 	5200 1200 5450 1200
 Connection ~ 5450 1200
 $Comp
-L GND #PWR110
+L power:GND #PWR110
 U 1 1 5A07A1D3
 P 5450 1650
 F 0 "#PWR110" H 5450 1400 50  0001 C CNN
@@ -703,7 +679,7 @@ $EndComp
 Text GLabel 5600 1450 2    60   Input ~ 0
 CLK_25MHz
 $Comp
-L +3V3 #PWR109
+L power:+3V3 #PWR109
 U 1 1 5A07A3D1
 P 5450 1150
 F 0 "#PWR109" H 5450 1000 50  0001 C CNN
@@ -736,9 +712,11 @@ USB_FPGA_PULL_D+
 Text GLabel 1600 5250 0    60   Input ~ 0
 USB_FPGA_PULL_D-
 $Comp
-L R R63
+L ulx3s-rescue:R R63
 U 1 1 5A71E38F
 P 2250 4650
+AR Path="/5A71E38F" Ref="R63"  Part="1" 
+AR Path="/58D6BF46/5A71E38F" Ref="R63"  Part="1" 
 F 0 "R63" V 2330 4650 50  0000 C CNN
 F 1 "15k" V 2250 4650 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603" V 2180 4650 50  0001 C CNN
@@ -747,9 +725,11 @@ F 3 "" H 2250 4650 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R64
+L ulx3s-rescue:R R64
 U 1 1 5A71E566
 P 2250 5250
+AR Path="/5A71E566" Ref="R64"  Part="1" 
+AR Path="/58D6BF46/5A71E566" Ref="R64"  Part="1" 
 F 0 "R64" V 2330 5250 50  0000 C CNN
 F 1 "15k" V 2250 5250 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603" V 2180 5250 50  0001 C CNN
@@ -758,13 +738,13 @@ F 3 "" H 2250 5250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	2400 4650 2750 4650
+	2400 4650 2550 4650
 Wire Wire Line
-	2400 5250 2750 5250
+	2400 5250 2550 5250
 Text Notes 650  4450 0    60   ~ 0
 USB pull lines connected to\nBANK0 on "gpio" sheet
 $Comp
-L D_Schottky D23
+L ulx3s-rescue:D_Schottky D23
 U 1 1 5A720D44
 P 1950 4650
 F 0 "D23" H 1650 4750 50  0000 C CNN
@@ -775,7 +755,7 @@ F 3 "" V 1950 4650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Schottky D24
+L ulx3s-rescue:D_Schottky D24
 U 1 1 5A7212CC
 P 1950 4850
 F 0 "D24" H 2250 4950 50  0000 C CNN
@@ -786,7 +766,7 @@ F 3 "" V 1950 4850 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L D_Schottky D25
+L ulx3s-rescue:D_Schottky D25
 U 1 1 5A72158A
 P 1950 5250
 F 0 "D25" H 1650 5350 50  0000 C CNN
@@ -797,7 +777,7 @@ F 3 "" V 1950 5250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Schottky D26
+L ulx3s-rescue:D_Schottky D26
 U 1 1 5A7218C4
 P 1950 5450
 F 0 "D26" H 2250 5550 50  0000 C CNN
@@ -818,14 +798,14 @@ Wire Wire Line
 	2550 5450 2550 5250
 Connection ~ 2550 5250
 Wire Wire Line
-	1600 4650 1800 4650
+	1600 4650 1700 4650
 Wire Wire Line
 	1700 4650 1700 4850
 Wire Wire Line
 	1700 4850 1800 4850
 Connection ~ 1700 4650
 Wire Wire Line
-	1600 5250 1800 5250
+	1600 5250 1700 5250
 Wire Wire Line
 	1700 5250 1700 5450
 Wire Wire Line
@@ -841,4 +821,28 @@ Text GLabel 2750 5250 2    60   Input ~ 0
 USB_FPGA_D-
 Text Notes 2750 4550 0    60   ~ 0
 D+,D- 15k pulldown \nfor host mode
+Wire Wire Line
+	5600 4400 5600 4500
+Wire Wire Line
+	1950 1700 2200 1700
+Wire Wire Line
+	4950 3400 5000 3400
+Wire Wire Line
+	2650 3200 2700 3200
+Wire Wire Line
+	2600 2850 3150 2850
+Wire Wire Line
+	2700 2750 3150 2750
+Wire Wire Line
+	6450 3700 6550 3700
+Wire Wire Line
+	5450 1200 5450 1250
+Wire Wire Line
+	2550 4650 2750 4650
+Wire Wire Line
+	2550 5250 2750 5250
+Wire Wire Line
+	1700 4650 1800 4650
+Wire Wire Line
+	1700 5250 1800 5250
 $EndSCHEMATC
diff --git a/wifi.sch b/wifi.sch
index 1693cdf..7217633 100644
--- a/wifi.sch
+++ b/wifi.sch
@@ -1,48 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:ulx3s-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:ESP8266
-LIBS:lfe5bg381
-LIBS:micro-hdmi-d
-LIBS:ap3429a
-LIBS:ft2232
-LIBS:ESP32
-LIBS:ssd_13xx
-LIBS:ftdi
-LIBS:max1112x
-LIBS:micro_sd_card_cd
-LIBS:mt48lc16m16a2tg
-LIBS:usb_otg
+EESchema Schematic File Version 4
 LIBS:ulx3s-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -83,7 +41,7 @@ JTAG_TCK
 Text GLabel 7550 3300 2    60   Input ~ 0
 JTAG_TMS
 $Comp
-L ESP-32S U9
+L ESP32:ESP-32S U9
 U 1 1 58E5662B
 P 6650 3450
 F 0 "U9" H 5950 4700 60  0000 C CNN
@@ -98,7 +56,7 @@ F 7 "Do not install" H 6650 3450 60  0001 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR120
+L power:GND #PWR120
 U 1 1 58E56E8D
 P 5300 2750
 F 0 "#PWR120" H 5300 2500 50  0001 C CNN
@@ -109,7 +67,7 @@ F 3 "" H 5300 2750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR119
+L power:+3V3 #PWR119
 U 1 1 58E56EA3
 P 5150 2850
 F 0 "#PWR119" H 5150 2700 50  0001 C CNN
@@ -124,7 +82,7 @@ Wire Wire Line
 Wire Wire Line
 	5150 2850 5700 2850
 $Comp
-L +3V3 #PWR117
+L power:+3V3 #PWR117
 U 1 1 58ED6C57
 P 4550 2200
 F 0 "#PWR117" H 4550 2050 50  0001 C CNN
@@ -135,7 +93,7 @@ F 3 "" H 4550 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R34
+L ulx3s-rescue:R R34
 U 1 1 58ED6C6D
 P 4550 2350
 F 0 "R34" V 4630 2350 50  0000 C CNN
@@ -153,7 +111,7 @@ Wire Wire Line
 	4550 2550 4700 2550
 Connection ~ 4550 2550
 $Comp
-L GND #PWR118
+L power:GND #PWR118
 U 1 1 58EE2982
 P 4550 3500
 F 0 "#PWR118" H 4550 3250 50  0001 C CNN
@@ -164,7 +122,7 @@ F 3 "" H 4550 3500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X01 J3
+L micro-hdmi-d:CONN_02X01 J3
 U 1 1 58EE29FF
 P 4550 3250
 F 0 "J3" H 4550 3350 50  0000 C CNN
@@ -178,7 +136,7 @@ $EndComp
 Text Notes 8500 3300 0    60   ~ 0
 Programming pins:\nTXD RXD EN GPIO0
 $Comp
-L R R35
+L ulx3s-rescue:R R35
 U 1 1 58FD4C5D
 P 4550 2750
 F 0 "R35" V 4630 2750 50  0000 C CNN
@@ -189,7 +147,7 @@ F 3 "" H 4550 2750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C21
+L ulx3s-rescue:C C21
 U 1 1 5924A09B
 P 3650 3100
 F 0 "C21" H 3675 3200 50  0000 L CNN
@@ -200,7 +158,7 @@ F 3 "" H 3650 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR115
+L power:+3V3 #PWR115
 U 1 1 5924A1EA
 P 3650 2950
 F 0 "#PWR115" H 3650 2800 50  0001 C CNN
@@ -211,7 +169,7 @@ F 3 "" H 3650 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR116
+L power:GND #PWR116
 U 1 1 5924A206
 P 3650 3250
 F 0 "#PWR116" H 3650 3000 50  0001 C CNN
@@ -248,7 +206,7 @@ GN11
 Text GLabel 7550 3900 2    60   Input ~ 0
 WIFI_GPIO16
 $Comp
-L GND #PWR123
+L power:GND #PWR123
 U 1 1 59C1BF96
 P 7650 2800
 F 0 "#PWR123" H 7650 2550 50  0001 C CNN
@@ -261,7 +219,7 @@ $EndComp
 Wire Wire Line
 	7550 2800 7650 2800
 $Comp
-L GND #PWR122
+L power:GND #PWR122
 U 1 1 59C1BFCC
 P 7650 2700
 F 0 "#PWR122" H 7650 2450 50  0001 C CNN
@@ -278,7 +236,7 @@ PROG_DONE
 Text Notes 8500 3050 0    60   ~ 0
 PROG_DONE on\n"flash" sheet
 $Comp
-L GND #PWR121
+L power:GND #PWR121
 U 1 1 59DEDA17
 P 6200 4900
 F 0 "#PWR121" H 6200 4650 50  0001 C CNN