diff --git a/analog.bak b/analog.bak
index 40ccc8d..77ecf04 100644
--- a/analog.bak
+++ b/analog.bak
@@ -41,7 +41,7 @@ F 3 "" H 2950 2150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R17
+L Device:R R17
 U 1 1 58D90455
 P 3750 2350
 F 0 "R17" V 3830 2350 50  0000 C CNN
@@ -53,7 +53,7 @@ F 4 "AC0603FR-07150RL" V 3750 2350 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R16
+L Device:R R16
 U 1 1 58D904AE
 P 3750 2200
 F 0 "R16" V 3830 2200 50  0000 C CNN
@@ -65,7 +65,7 @@ F 4 "RC0603JR-07330RP" V 3750 2200 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R15
+L Device:R R15
 U 1 1 58D904D5
 P 3750 2050
 F 0 "R15" V 3830 2050 50  0000 C CNN
@@ -77,7 +77,7 @@ F 4 "RC0603FR-10680RL" V 3750 2050 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R14
+L Device:R R14
 U 1 1 58D90500
 P 3750 1900
 F 0 "R14" V 3830 1900 50  0000 C CNN
@@ -110,7 +110,7 @@ AUDIO_L2
 Text GLabel 3900 2350 2    60   Input ~ 0
 AUDIO_L3
 $Comp
-L ulx3s-rescue:R R21
+L Device:R R21
 U 1 1 58D907CA
 P 3750 3000
 F 0 "R21" V 3830 3000 50  0000 C CNN
@@ -122,7 +122,7 @@ F 4 "AC0603FR-07150RL" V 3750 3000 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R20
+L Device:R R20
 U 1 1 58D907D0
 P 3750 2850
 F 0 "R20" V 3830 2850 50  0000 C CNN
@@ -134,7 +134,7 @@ F 4 "RC0603JR-07330RP" V 3750 2850 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R19
+L Device:R R19
 U 1 1 58D907D6
 P 3750 2700
 F 0 "R19" V 3830 2700 50  0000 C CNN
@@ -146,7 +146,7 @@ F 4 "RC0603FR-10680RL" V 3750 2700 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R18
+L Device:R R18
 U 1 1 58D907DC
 P 3750 2550
 F 0 "R18" V 3830 2550 50  0000 C CNN
@@ -344,7 +344,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 ulx3s-rescue:R R60
+L Device:R R60
 U 1 1 5A05BC31
 P 3750 1700
 F 0 "R60" V 3830 1700 50  0000 C CNN
@@ -356,7 +356,7 @@ F 4 "AC0603FR-07150RL" V 3750 1700 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R59
+L Device:R R59
 U 1 1 5A05BC37
 P 3750 1550
 F 0 "R59" V 3830 1550 50  0000 C CNN
@@ -368,7 +368,7 @@ F 4 "RC0603JR-07330RP" V 3750 1550 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R58
+L Device:R R58
 U 1 1 5A05BC3D
 P 3750 1400
 F 0 "R58" V 3830 1400 50  0000 C CNN
@@ -380,7 +380,7 @@ F 4 "RC0603FR-10680RL" V 3750 1400 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R57
+L Device:R R57
 U 1 1 5A05BC43
 P 3750 1250
 F 0 "R57" V 3830 1250 50  0000 C CNN
diff --git a/analog.sch b/analog.sch
index 40ccc8d..77ecf04 100644
--- a/analog.sch
+++ b/analog.sch
@@ -41,7 +41,7 @@ F 3 "" H 2950 2150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R17
+L Device:R R17
 U 1 1 58D90455
 P 3750 2350
 F 0 "R17" V 3830 2350 50  0000 C CNN
@@ -53,7 +53,7 @@ F 4 "AC0603FR-07150RL" V 3750 2350 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R16
+L Device:R R16
 U 1 1 58D904AE
 P 3750 2200
 F 0 "R16" V 3830 2200 50  0000 C CNN
@@ -65,7 +65,7 @@ F 4 "RC0603JR-07330RP" V 3750 2200 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R15
+L Device:R R15
 U 1 1 58D904D5
 P 3750 2050
 F 0 "R15" V 3830 2050 50  0000 C CNN
@@ -77,7 +77,7 @@ F 4 "RC0603FR-10680RL" V 3750 2050 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R14
+L Device:R R14
 U 1 1 58D90500
 P 3750 1900
 F 0 "R14" V 3830 1900 50  0000 C CNN
@@ -110,7 +110,7 @@ AUDIO_L2
 Text GLabel 3900 2350 2    60   Input ~ 0
 AUDIO_L3
 $Comp
-L ulx3s-rescue:R R21
+L Device:R R21
 U 1 1 58D907CA
 P 3750 3000
 F 0 "R21" V 3830 3000 50  0000 C CNN
@@ -122,7 +122,7 @@ F 4 "AC0603FR-07150RL" V 3750 3000 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R20
+L Device:R R20
 U 1 1 58D907D0
 P 3750 2850
 F 0 "R20" V 3830 2850 50  0000 C CNN
@@ -134,7 +134,7 @@ F 4 "RC0603JR-07330RP" V 3750 2850 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R19
+L Device:R R19
 U 1 1 58D907D6
 P 3750 2700
 F 0 "R19" V 3830 2700 50  0000 C CNN
@@ -146,7 +146,7 @@ F 4 "RC0603FR-10680RL" V 3750 2700 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R18
+L Device:R R18
 U 1 1 58D907DC
 P 3750 2550
 F 0 "R18" V 3830 2550 50  0000 C CNN
@@ -344,7 +344,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 ulx3s-rescue:R R60
+L Device:R R60
 U 1 1 5A05BC31
 P 3750 1700
 F 0 "R60" V 3830 1700 50  0000 C CNN
@@ -356,7 +356,7 @@ F 4 "AC0603FR-07150RL" V 3750 1700 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R59
+L Device:R R59
 U 1 1 5A05BC37
 P 3750 1550
 F 0 "R59" V 3830 1550 50  0000 C CNN
@@ -368,7 +368,7 @@ F 4 "RC0603JR-07330RP" V 3750 1550 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R58
+L Device:R R58
 U 1 1 5A05BC3D
 P 3750 1400
 F 0 "R58" V 3830 1400 50  0000 C CNN
@@ -380,7 +380,7 @@ F 4 "RC0603FR-10680RL" V 3750 1400 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R57
+L Device:R R57
 U 1 1 5A05BC43
 P 3750 1250
 F 0 "R57" V 3830 1250 50  0000 C CNN
diff --git a/blinkey.bak b/blinkey.bak
index dd2d81d..4162bf3 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -124,7 +124,7 @@ BTN_L
 Text GLabel 3350 3950 2    60   Input ~ 0
 BTN_R
 $Comp
-L ulx3s-rescue:R R7
+L Device:R R7
 U 1 1 58D6605D
 P 1900 2750
 F 0 "R7" V 1980 2750 50  0000 C CNN
@@ -225,7 +225,7 @@ $EndComp
 Text GLabel 5650 4600 2    60   Input ~ 0
 FTDI_nSLEEP
 $Comp
-L ulx3s-rescue:LED_ALT D18
+L Device:LED_ALT D18
 U 1 1 590B4E85
 P 5500 4600
 F 0 "D18" H 5500 4700 50  0000 C CNN
@@ -240,7 +240,7 @@ F 7 "859-LTST-C170KGKT " H 5500 4600 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R36
+L Device:R R36
 U 1 1 590B507C
 P 4550 4600
 F 0 "R36" V 4630 4600 50  0000 C CNN
@@ -273,7 +273,7 @@ $EndComp
 Text GLabel 5650 5350 2    60   Input ~ 0
 FTDI_nTXLED
 $Comp
-L ulx3s-rescue:LED_ALT D19
+L Device:LED_ALT D19
 U 1 1 590B86F4
 P 4550 5350
 F 0 "D19" H 4550 5450 50  0000 C CNN
@@ -288,7 +288,7 @@ F 7 "859-LTST-C170KRKT" H 4550 5350 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:R R37
+L Device:R R37
 U 1 1 590B86FA
 P 5500 5350
 F 0 "R37" V 5580 5350 50  0000 C CNN
@@ -323,7 +323,7 @@ F 3 "" H 1750 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R39
+L Device:R R39
 U 1 1 591B5493
 P 1900 4150
 F 0 "R39" V 1980 4150 50  0000 C CNN
@@ -343,7 +343,7 @@ Wire Wire Line
 Connection ~ 2750 2950
 Connection ~ 2750 3950
 $Comp
-L ulx3s-rescue:R R41
+L Device:R R41
 U 1 1 591E1845
 P 5250 2550
 F 0 "R41" V 5330 2550 50  0000 C CNN
@@ -355,7 +355,7 @@ F 4 "RC0603FR-071KL" V 5250 2550 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R42
+L Device:R R42
 U 1 1 591E199B
 P 5250 2750
 F 0 "R42" V 5330 2750 50  0000 C CNN
@@ -367,7 +367,7 @@ F 4 "RC0603FR-071KL" V 5250 2750 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R43
+L Device:R R43
 U 1 1 591E1A9D
 P 5250 2950
 F 0 "R43" V 5330 2950 50  0000 C CNN
@@ -379,7 +379,7 @@ F 4 "RC0603FR-071KL" V 5250 2950 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R44
+L Device:R R44
 U 1 1 591E1AA3
 P 5250 3150
 F 0 "R44" V 5330 3150 50  0000 C CNN
@@ -391,7 +391,7 @@ F 4 "RC0603FR-071KL" V 5250 3150 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R45
+L Device:R R45
 U 1 1 591E1BA5
 P 5250 3350
 F 0 "R45" V 5330 3350 50  0000 C CNN
@@ -403,7 +403,7 @@ F 4 "RC0603FR-071KL" V 5250 3350 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R46
+L Device:R R46
 U 1 1 591E1BAB
 P 5250 3550
 F 0 "R46" V 5330 3550 50  0000 C CNN
@@ -415,7 +415,7 @@ F 4 "RC0603FR-071KL" V 5250 3550 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R47
+L Device:R R47
 U 1 1 591E1BB1
 P 5250 3750
 F 0 "R47" V 5330 3750 50  0000 C CNN
@@ -427,7 +427,7 @@ F 4 "RC0603FR-071KL" V 5250 3750 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R48
+L Device:R R48
 U 1 1 591E1BB7
 P 5250 3950
 F 0 "R48" V 5330 3950 50  0000 C CNN
@@ -474,7 +474,7 @@ F 7 "774-2194MST " H 8000 3200 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R51
+L Device:R R51
 U 1 1 595B9C2F
 P 7250 3400
 F 0 "R51" V 7330 3400 50  0000 C CNN
@@ -524,7 +524,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 ulx3s-rescue:LED_ALT D22
+L Device:LED_ALT D22
 U 1 1 5A07AFD2
 P 5500 5850
 F 0 "D22" H 5500 5950 50  0000 C CNN
@@ -539,7 +539,7 @@ F 7 "859-LTST-C170TBKT" H 5500 5850 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R62
+L Device:R R62
 U 1 1 5A07AFD8
 P 4550 5850
 F 0 "R62" V 4630 5850 50  0000 C CNN
@@ -576,7 +576,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 ulx3s-rescue:LED_ALT D7
+L Device:LED_ALT D7
 U 1 1 5A54C340
 P 4550 3950
 F 0 "D7" H 4550 4050 50  0000 C CNN
@@ -591,7 +591,7 @@ F 7 "859-LTST-C170TBKT" H 4550 3950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D6
+L Device:LED_ALT D6
 U 1 1 5A54CAEF
 P 4550 3750
 F 0 "D6" H 4550 3850 50  0000 C CNN
@@ -606,7 +606,7 @@ F 7 "859-LTST-C170KGKT " H 4550 3750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D4
+L Device:LED_ALT D4
 U 1 1 5A54CF8A
 P 4550 3350
 F 0 "D4" H 4550 3450 50  0000 C CNN
@@ -621,7 +621,7 @@ F 7 "859-LTST-C170KRKT" H 4550 3350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D5
+L Device:LED_ALT D5
 U 1 1 5A54D428
 P 4550 3550
 F 0 "D5" H 4550 3650 50  0000 C CNN
@@ -636,7 +636,7 @@ F 7 "859-LTST-C170KFKT" H 4550 3550 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D3
+L Device:LED_ALT D3
 U 1 1 5A54DCE5
 P 4550 3150
 F 0 "D3" H 4550 3250 50  0000 C CNN
@@ -651,7 +651,7 @@ F 7 "859-LTST-C170TBKT" H 4550 3150 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D2
+L Device:LED_ALT D2
 U 1 1 5A54DCEF
 P 4550 2950
 F 0 "D2" H 4550 3050 50  0000 C CNN
@@ -666,7 +666,7 @@ F 7 "859-LTST-C170KGKT " H 4550 2950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D0
+L Device:LED_ALT D0
 U 1 1 5A54DCF9
 P 4550 2550
 F 0 "D0" H 4550 2650 50  0000 C CNN
@@ -681,7 +681,7 @@ F 7 "859-LTST-C170KRKT" H 4550 2550 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D1
+L Device:LED_ALT D1
 U 1 1 5A54DD03
 P 4550 2750
 F 0 "D1" H 4550 2850 50  0000 C CNN
@@ -780,7 +780,7 @@ LEFT
 Text Notes 2100 4000 0    60   ~ 0
 RIGHT
 $Comp
-L ulx3s-rescue:C C46
+L Device:C C46
 U 1 1 5A881E8B
 P 6650 1350
 F 0 "C46" H 6675 1450 50  0000 L CNN
diff --git a/blinkey.sch b/blinkey.sch
index dd2d81d..4162bf3 100644
--- a/blinkey.sch
+++ b/blinkey.sch
@@ -124,7 +124,7 @@ BTN_L
 Text GLabel 3350 3950 2    60   Input ~ 0
 BTN_R
 $Comp
-L ulx3s-rescue:R R7
+L Device:R R7
 U 1 1 58D6605D
 P 1900 2750
 F 0 "R7" V 1980 2750 50  0000 C CNN
@@ -225,7 +225,7 @@ $EndComp
 Text GLabel 5650 4600 2    60   Input ~ 0
 FTDI_nSLEEP
 $Comp
-L ulx3s-rescue:LED_ALT D18
+L Device:LED_ALT D18
 U 1 1 590B4E85
 P 5500 4600
 F 0 "D18" H 5500 4700 50  0000 C CNN
@@ -240,7 +240,7 @@ F 7 "859-LTST-C170KGKT " H 5500 4600 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R36
+L Device:R R36
 U 1 1 590B507C
 P 4550 4600
 F 0 "R36" V 4630 4600 50  0000 C CNN
@@ -273,7 +273,7 @@ $EndComp
 Text GLabel 5650 5350 2    60   Input ~ 0
 FTDI_nTXLED
 $Comp
-L ulx3s-rescue:LED_ALT D19
+L Device:LED_ALT D19
 U 1 1 590B86F4
 P 4550 5350
 F 0 "D19" H 4550 5450 50  0000 C CNN
@@ -288,7 +288,7 @@ F 7 "859-LTST-C170KRKT" H 4550 5350 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:R R37
+L Device:R R37
 U 1 1 590B86FA
 P 5500 5350
 F 0 "R37" V 5580 5350 50  0000 C CNN
@@ -323,7 +323,7 @@ F 3 "" H 1750 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R39
+L Device:R R39
 U 1 1 591B5493
 P 1900 4150
 F 0 "R39" V 1980 4150 50  0000 C CNN
@@ -343,7 +343,7 @@ Wire Wire Line
 Connection ~ 2750 2950
 Connection ~ 2750 3950
 $Comp
-L ulx3s-rescue:R R41
+L Device:R R41
 U 1 1 591E1845
 P 5250 2550
 F 0 "R41" V 5330 2550 50  0000 C CNN
@@ -355,7 +355,7 @@ F 4 "RC0603FR-071KL" V 5250 2550 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R42
+L Device:R R42
 U 1 1 591E199B
 P 5250 2750
 F 0 "R42" V 5330 2750 50  0000 C CNN
@@ -367,7 +367,7 @@ F 4 "RC0603FR-071KL" V 5250 2750 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R43
+L Device:R R43
 U 1 1 591E1A9D
 P 5250 2950
 F 0 "R43" V 5330 2950 50  0000 C CNN
@@ -379,7 +379,7 @@ F 4 "RC0603FR-071KL" V 5250 2950 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R44
+L Device:R R44
 U 1 1 591E1AA3
 P 5250 3150
 F 0 "R44" V 5330 3150 50  0000 C CNN
@@ -391,7 +391,7 @@ F 4 "RC0603FR-071KL" V 5250 3150 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R45
+L Device:R R45
 U 1 1 591E1BA5
 P 5250 3350
 F 0 "R45" V 5330 3350 50  0000 C CNN
@@ -403,7 +403,7 @@ F 4 "RC0603FR-071KL" V 5250 3350 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R46
+L Device:R R46
 U 1 1 591E1BAB
 P 5250 3550
 F 0 "R46" V 5330 3550 50  0000 C CNN
@@ -415,7 +415,7 @@ F 4 "RC0603FR-071KL" V 5250 3550 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R47
+L Device:R R47
 U 1 1 591E1BB1
 P 5250 3750
 F 0 "R47" V 5330 3750 50  0000 C CNN
@@ -427,7 +427,7 @@ F 4 "RC0603FR-071KL" V 5250 3750 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R48
+L Device:R R48
 U 1 1 591E1BB7
 P 5250 3950
 F 0 "R48" V 5330 3950 50  0000 C CNN
@@ -474,7 +474,7 @@ F 7 "774-2194MST " H 8000 3200 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R51
+L Device:R R51
 U 1 1 595B9C2F
 P 7250 3400
 F 0 "R51" V 7330 3400 50  0000 C CNN
@@ -524,7 +524,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 ulx3s-rescue:LED_ALT D22
+L Device:LED_ALT D22
 U 1 1 5A07AFD2
 P 5500 5850
 F 0 "D22" H 5500 5950 50  0000 C CNN
@@ -539,7 +539,7 @@ F 7 "859-LTST-C170TBKT" H 5500 5850 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R62
+L Device:R R62
 U 1 1 5A07AFD8
 P 4550 5850
 F 0 "R62" V 4630 5850 50  0000 C CNN
@@ -576,7 +576,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 ulx3s-rescue:LED_ALT D7
+L Device:LED_ALT D7
 U 1 1 5A54C340
 P 4550 3950
 F 0 "D7" H 4550 4050 50  0000 C CNN
@@ -591,7 +591,7 @@ F 7 "859-LTST-C170TBKT" H 4550 3950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D6
+L Device:LED_ALT D6
 U 1 1 5A54CAEF
 P 4550 3750
 F 0 "D6" H 4550 3850 50  0000 C CNN
@@ -606,7 +606,7 @@ F 7 "859-LTST-C170KGKT " H 4550 3750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D4
+L Device:LED_ALT D4
 U 1 1 5A54CF8A
 P 4550 3350
 F 0 "D4" H 4550 3450 50  0000 C CNN
@@ -621,7 +621,7 @@ F 7 "859-LTST-C170KRKT" H 4550 3350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D5
+L Device:LED_ALT D5
 U 1 1 5A54D428
 P 4550 3550
 F 0 "D5" H 4550 3650 50  0000 C CNN
@@ -636,7 +636,7 @@ F 7 "859-LTST-C170KFKT" H 4550 3550 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D3
+L Device:LED_ALT D3
 U 1 1 5A54DCE5
 P 4550 3150
 F 0 "D3" H 4550 3250 50  0000 C CNN
@@ -651,7 +651,7 @@ F 7 "859-LTST-C170TBKT" H 4550 3150 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D2
+L Device:LED_ALT D2
 U 1 1 5A54DCEF
 P 4550 2950
 F 0 "D2" H 4550 3050 50  0000 C CNN
@@ -666,7 +666,7 @@ F 7 "859-LTST-C170KGKT " H 4550 2950 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D0
+L Device:LED_ALT D0
 U 1 1 5A54DCF9
 P 4550 2550
 F 0 "D0" H 4550 2650 50  0000 C CNN
@@ -681,7 +681,7 @@ F 7 "859-LTST-C170KRKT" H 4550 2550 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D1
+L Device:LED_ALT D1
 U 1 1 5A54DD03
 P 4550 2750
 F 0 "D1" H 4550 2850 50  0000 C CNN
@@ -780,7 +780,7 @@ LEFT
 Text Notes 2100 4000 0    60   ~ 0
 RIGHT
 $Comp
-L ulx3s-rescue:C C46
+L Device:C C46
 U 1 1 5A881E8B
 P 6650 1350
 F 0 "C46" H 6675 1450 50  0000 L CNN
diff --git a/flash.bak b/flash.bak
index 5db6b73..762c006 100644
--- a/flash.bak
+++ b/flash.bak
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ulx3s-rescue:MB85RS16 U10
+L Memory_NVRAM:MB85RS16 U10
 U 1 1 58D913F5
 P 3650 4350
 F 0 "U10" H 3350 4600 50  0000 L CNN
@@ -88,7 +88,7 @@ Wire Wire Line
 Text Label 5550 4300 0    60   ~ 0
 FLASH_nCS
 $Comp
-L ulx3s-rescue:R R27
+L Device:R R27
 U 1 1 58EC0EFE
 P 3450 2350
 F 0 "R27" V 3530 2350 50  0000 C CNN
@@ -115,7 +115,7 @@ F 3 "" H 3450 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R28
+L Device:R R28
 U 1 1 58EC0F8E
 P 3650 2350
 F 0 "R28" V 3730 2350 50  0000 C CNN
@@ -142,7 +142,7 @@ F 3 "" H 3650 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R29
+L Device:R R29
 U 1 1 58EC15E1
 P 3850 2350
 F 0 "R29" V 3930 2350 50  0000 C CNN
@@ -173,7 +173,7 @@ Wire Wire Line
 Text Label 5550 4700 0    60   ~ 0
 FLASH_SCK
 $Comp
-L ulx3s-rescue:R R30
+L Device:R R30
 U 1 1 58EC1C84
 P 4050 2350
 F 0 "R30" V 4130 2350 50  0000 C CNN
@@ -201,7 +201,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 ulx3s-rescue:R R11
+L Device:R R11
 U 1 1 58EC4E77
 P 3050 2350
 F 0 "R11" V 3130 2350 50  0000 C CNN
@@ -228,7 +228,7 @@ F 3 "" H 3050 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R12
+L Device:R R12
 U 1 1 58EC4E85
 P 3250 2350
 F 0 "R12" V 3330 2350 50  0000 C CNN
@@ -300,7 +300,7 @@ FPGA_PROGRAMN
 Text Label 5550 4800 0    60   ~ 0
 FPGA_DONE
 $Comp
-L ulx3s-rescue:R R31
+L Device:R R31
 U 1 1 58EC68DC
 P 5200 2350
 F 0 "R31" V 5280 2350 50  0000 C CNN
@@ -327,7 +327,7 @@ F 3 "" H 5200 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R32
+L Device:R R32
 U 1 1 58EC68EA
 P 5400 2350
 F 0 "R32" V 5480 2350 50  0000 C CNN
@@ -358,7 +358,7 @@ Wire Wire Line
 Text Label 5550 4400 0    60   ~ 0
 FPGA_INITN
 $Comp
-L ulx3s-rescue:R R33
+L Device:R R33
 U 1 1 58EC72FD
 P 5600 2350
 F 0 "R33" V 5680 2350 50  0000 C CNN
@@ -428,7 +428,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 ulx3s-rescue:R R55
+L Device:R R55
 U 1 1 59DEB568
 P 5350 4800
 F 0 "R55" V 5430 4800 50  0000 C CNN
diff --git a/flash.sch b/flash.sch
index 5db6b73..762c006 100644
--- a/flash.sch
+++ b/flash.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ulx3s-rescue:MB85RS16 U10
+L Memory_NVRAM:MB85RS16 U10
 U 1 1 58D913F5
 P 3650 4350
 F 0 "U10" H 3350 4600 50  0000 L CNN
@@ -88,7 +88,7 @@ Wire Wire Line
 Text Label 5550 4300 0    60   ~ 0
 FLASH_nCS
 $Comp
-L ulx3s-rescue:R R27
+L Device:R R27
 U 1 1 58EC0EFE
 P 3450 2350
 F 0 "R27" V 3530 2350 50  0000 C CNN
@@ -115,7 +115,7 @@ F 3 "" H 3450 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R28
+L Device:R R28
 U 1 1 58EC0F8E
 P 3650 2350
 F 0 "R28" V 3730 2350 50  0000 C CNN
@@ -142,7 +142,7 @@ F 3 "" H 3650 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R29
+L Device:R R29
 U 1 1 58EC15E1
 P 3850 2350
 F 0 "R29" V 3930 2350 50  0000 C CNN
@@ -173,7 +173,7 @@ Wire Wire Line
 Text Label 5550 4700 0    60   ~ 0
 FLASH_SCK
 $Comp
-L ulx3s-rescue:R R30
+L Device:R R30
 U 1 1 58EC1C84
 P 4050 2350
 F 0 "R30" V 4130 2350 50  0000 C CNN
@@ -201,7 +201,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 ulx3s-rescue:R R11
+L Device:R R11
 U 1 1 58EC4E77
 P 3050 2350
 F 0 "R11" V 3130 2350 50  0000 C CNN
@@ -228,7 +228,7 @@ F 3 "" H 3050 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R12
+L Device:R R12
 U 1 1 58EC4E85
 P 3250 2350
 F 0 "R12" V 3330 2350 50  0000 C CNN
@@ -300,7 +300,7 @@ FPGA_PROGRAMN
 Text Label 5550 4800 0    60   ~ 0
 FPGA_DONE
 $Comp
-L ulx3s-rescue:R R31
+L Device:R R31
 U 1 1 58EC68DC
 P 5200 2350
 F 0 "R31" V 5280 2350 50  0000 C CNN
@@ -327,7 +327,7 @@ F 3 "" H 5200 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R32
+L Device:R R32
 U 1 1 58EC68EA
 P 5400 2350
 F 0 "R32" V 5480 2350 50  0000 C CNN
@@ -358,7 +358,7 @@ Wire Wire Line
 Text Label 5550 4400 0    60   ~ 0
 FPGA_INITN
 $Comp
-L ulx3s-rescue:R R33
+L Device:R R33
 U 1 1 58EC72FD
 P 5600 2350
 F 0 "R33" V 5680 2350 50  0000 C CNN
@@ -428,7 +428,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 ulx3s-rescue:R R55
+L Device:R R55
 U 1 1 59DEB568
 P 5350 4800
 F 0 "R55" V 5430 4800 50  0000 C CNN
diff --git a/gpdi.bak b/gpdi.bak
index 030453c..e9cc0fc 100644
--- a/gpdi.bak
+++ b/gpdi.bak
@@ -151,7 +151,7 @@ F 7 "771-PCA9306D-T" H 5350 5450 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R24
+L Device:R R24
 U 1 1 58D92136
 P 6100 5100
 F 0 "R24" V 6180 5100 50  0000 C CNN
@@ -163,7 +163,7 @@ F 4 "AC0603FR-10100KL" V 6100 5100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R25
+L Device:R R25
 U 1 1 58D921DD
 P 6300 5100
 F 0 "R25" V 6380 5100 50  0000 C CNN
@@ -175,7 +175,7 @@ F 4 "AC0603FR-104K7L" V 6300 5100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R26
+L Device:R R26
 U 1 1 58D92237
 P 6500 5100
 F 0 "R26" V 6580 5100 50  0000 C CNN
@@ -198,7 +198,7 @@ F 3 "" H 6300 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C18
+L Device:C C18
 U 1 1 58D92807
 P 6100 5900
 F 0 "C18" H 6125 6000 50  0000 L CNN
@@ -243,7 +243,7 @@ F 3 "" H 5150 5350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R23
+L Device:R R23
 U 1 1 58D92CF9
 P 4600 5300
 F 0 "R23" V 4680 5300 50  0000 C CNN
@@ -255,7 +255,7 @@ F 4 "RC0603FR-072K2L" V 4600 5300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R22
+L Device:R R22
 U 1 1 58D92D93
 P 4450 5300
 F 0 "R22" V 4530 5300 50  0000 C CNN
@@ -433,7 +433,7 @@ F 5 "www.mouser.com" H 3600 2900 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R61
+L Device:R R61
 U 1 1 5A0777ED
 P 1600 2300
 F 0 "R61" V 1680 2300 50  0000 C CNN
@@ -465,7 +465,7 @@ USB_FPGA_D+
 Text GLabel 4350 2800 2    60   Input ~ 0
 USB_FPGA_D-
 $Comp
-L ulx3s-rescue:C C36
+L Device:C C36
 U 1 1 5A878883
 P 7250 3400
 F 0 "C36" V 7300 3500 50  0000 L CNN
@@ -477,7 +477,7 @@ F 4 "CC0603KRX7R8BB104" V 7250 3400 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C37
+L Device:C C37
 U 1 1 5A878B40
 P 7550 3900
 F 0 "C37" V 7600 3950 50  0000 L CNN
@@ -489,7 +489,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 3900 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C45
+L Device:C C45
 U 1 1 5A87EC41
 P 7250 3000
 F 0 "C45" V 7300 3050 50  0000 L CNN
@@ -501,7 +501,7 @@ F 4 "CC0603KRX7R8BB104" V 7250 3000 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C41
+L Device:C C41
 U 1 1 5A87EC93
 P 7550 3200
 F 0 "C41" V 7600 3250 50  0000 L CNN
@@ -513,7 +513,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 3200 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C40
+L Device:C C40
 U 1 1 5A87EEE5
 P 7550 2900
 F 0 "C40" V 7600 2950 50  0000 L CNN
@@ -525,7 +525,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 2900 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C44
+L Device:C C44
 U 1 1 5A87EF45
 P 7250 2700
 F 0 "C44" V 7300 2750 50  0000 L CNN
@@ -543,7 +543,7 @@ Wire Wire Line
 Wire Wire Line
 	7400 3200 6950 3200
 $Comp
-L ulx3s-rescue:C C39
+L Device:C C39
 U 1 1 5A87F247
 P 7550 2600
 F 0 "C39" V 7600 2650 50  0000 L CNN
@@ -555,7 +555,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 2600 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C43
+L Device:C C43
 U 1 1 5A87F2A7
 P 7250 2400
 F 0 "C43" V 7300 2450 50  0000 L CNN
@@ -571,7 +571,7 @@ Wire Wire Line
 Wire Wire Line
 	7400 2600 6950 2600
 $Comp
-L ulx3s-rescue:C C42
+L Device:C C42
 U 1 1 5A87F538
 P 7250 2100
 F 0 "C42" V 7300 2150 50  0000 L CNN
@@ -583,7 +583,7 @@ F 4 "CC0603KRX7R8BB104" V 7250 2100 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C38
+L Device:C C38
 U 1 1 5A87F5AA
 P 7550 2300
 F 0 "C38" V 7600 2350 50  0000 L CNN
diff --git a/gpdi.sch b/gpdi.sch
index 030453c..e9cc0fc 100644
--- a/gpdi.sch
+++ b/gpdi.sch
@@ -151,7 +151,7 @@ F 7 "771-PCA9306D-T" H 5350 5450 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R24
+L Device:R R24
 U 1 1 58D92136
 P 6100 5100
 F 0 "R24" V 6180 5100 50  0000 C CNN
@@ -163,7 +163,7 @@ F 4 "AC0603FR-10100KL" V 6100 5100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R25
+L Device:R R25
 U 1 1 58D921DD
 P 6300 5100
 F 0 "R25" V 6380 5100 50  0000 C CNN
@@ -175,7 +175,7 @@ F 4 "AC0603FR-104K7L" V 6300 5100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R26
+L Device:R R26
 U 1 1 58D92237
 P 6500 5100
 F 0 "R26" V 6580 5100 50  0000 C CNN
@@ -198,7 +198,7 @@ F 3 "" H 6300 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C18
+L Device:C C18
 U 1 1 58D92807
 P 6100 5900
 F 0 "C18" H 6125 6000 50  0000 L CNN
@@ -243,7 +243,7 @@ F 3 "" H 5150 5350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R23
+L Device:R R23
 U 1 1 58D92CF9
 P 4600 5300
 F 0 "R23" V 4680 5300 50  0000 C CNN
@@ -255,7 +255,7 @@ F 4 "RC0603FR-072K2L" V 4600 5300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R22
+L Device:R R22
 U 1 1 58D92D93
 P 4450 5300
 F 0 "R22" V 4530 5300 50  0000 C CNN
@@ -433,7 +433,7 @@ F 5 "www.mouser.com" H 3600 2900 60  0001 C CNN "Distributor1_URL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R61
+L Device:R R61
 U 1 1 5A0777ED
 P 1600 2300
 F 0 "R61" V 1680 2300 50  0000 C CNN
@@ -465,7 +465,7 @@ USB_FPGA_D+
 Text GLabel 4350 2800 2    60   Input ~ 0
 USB_FPGA_D-
 $Comp
-L ulx3s-rescue:C C36
+L Device:C C36
 U 1 1 5A878883
 P 7250 3400
 F 0 "C36" V 7300 3500 50  0000 L CNN
@@ -477,7 +477,7 @@ F 4 "CC0603KRX7R8BB104" V 7250 3400 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C37
+L Device:C C37
 U 1 1 5A878B40
 P 7550 3900
 F 0 "C37" V 7600 3950 50  0000 L CNN
@@ -489,7 +489,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 3900 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C45
+L Device:C C45
 U 1 1 5A87EC41
 P 7250 3000
 F 0 "C45" V 7300 3050 50  0000 L CNN
@@ -501,7 +501,7 @@ F 4 "CC0603KRX7R8BB104" V 7250 3000 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C41
+L Device:C C41
 U 1 1 5A87EC93
 P 7550 3200
 F 0 "C41" V 7600 3250 50  0000 L CNN
@@ -513,7 +513,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 3200 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C40
+L Device:C C40
 U 1 1 5A87EEE5
 P 7550 2900
 F 0 "C40" V 7600 2950 50  0000 L CNN
@@ -525,7 +525,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 2900 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C44
+L Device:C C44
 U 1 1 5A87EF45
 P 7250 2700
 F 0 "C44" V 7300 2750 50  0000 L CNN
@@ -543,7 +543,7 @@ Wire Wire Line
 Wire Wire Line
 	7400 3200 6950 3200
 $Comp
-L ulx3s-rescue:C C39
+L Device:C C39
 U 1 1 5A87F247
 P 7550 2600
 F 0 "C39" V 7600 2650 50  0000 L CNN
@@ -555,7 +555,7 @@ F 4 "CC0603KRX7R8BB104" V 7550 2600 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C43
+L Device:C C43
 U 1 1 5A87F2A7
 P 7250 2400
 F 0 "C43" V 7300 2450 50  0000 L CNN
@@ -571,7 +571,7 @@ Wire Wire Line
 Wire Wire Line
 	7400 2600 6950 2600
 $Comp
-L ulx3s-rescue:C C42
+L Device:C C42
 U 1 1 5A87F538
 P 7250 2100
 F 0 "C42" V 7300 2150 50  0000 L CNN
@@ -583,7 +583,7 @@ F 4 "CC0603KRX7R8BB104" V 7250 2100 50  0001 C CNN "MFG_PN"
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C38
+L Device:C C38
 U 1 1 5A87F5AA
 P 7550 2300
 F 0 "C38" V 7600 2350 50  0000 L CNN
diff --git a/gpio.bak b/gpio.bak
index 66ff1de..372b8fc 100644
--- a/gpio.bak
+++ b/gpio.bak
@@ -37,7 +37,7 @@ F 3 "" H 9000 3550 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky_Small D51
+L Device:D_Schottky_Small D51
 U 1 1 56AC483B
 P 7450 5350
 F 0 "D51" H 7400 5430 50  0000 L CNN
@@ -53,7 +53,7 @@ $EndComp
 Text Label 7900 5350 0    60   ~ 0
 IN5V
 $Comp
-L ulx3s-rescue:D_Schottky_Small D52
+L Device:D_Schottky_Small D52
 U 1 1 56AC4846
 P 9400 5350
 F 0 "D52" H 9350 5430 50  0000 L CNN
diff --git a/gpio.sch b/gpio.sch
index 66ff1de..372b8fc 100644
--- a/gpio.sch
+++ b/gpio.sch
@@ -37,7 +37,7 @@ F 3 "" H 9000 3550 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky_Small D51
+L Device:D_Schottky_Small D51
 U 1 1 56AC483B
 P 7450 5350
 F 0 "D51" H 7400 5430 50  0000 L CNN
@@ -53,7 +53,7 @@ $EndComp
 Text Label 7900 5350 0    60   ~ 0
 IN5V
 $Comp
-L ulx3s-rescue:D_Schottky_Small D52
+L Device:D_Schottky_Small D52
 U 1 1 56AC4846
 P 9400 5350
 F 0 "D52" H 9350 5430 50  0000 L CNN
diff --git a/power.bak b/power.bak
index 9f8c157..274ad35 100644
--- a/power.bak
+++ b/power.bak
@@ -59,7 +59,7 @@ F 3 "" H 7400 3900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C1
+L Device:C C1
 U 1 1 58D598B7
 P 7400 3700
 AR Path="/58D598B7" Ref="C1"  Part="1" 
@@ -73,7 +73,7 @@ F 4 "CC0805ZKY5V5BB226 " H 7400 3700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C2
+L Device:C C2
 U 1 1 58D5A146
 P 9100 3300
 AR Path="/58D5A146" Ref="C2"  Part="1" 
@@ -87,7 +87,7 @@ F 4 "CS0603KRX7R9BB471" H 9100 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RA1
+L Device:R RA1
 U 1 1 58D5A193
 P 9400 3300
 AR Path="/58D5A193" Ref="RA1"  Part="1" 
@@ -101,7 +101,7 @@ F 4 "AC0603FR-1015KL" V 9400 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RB1
+L Device:R RB1
 U 1 1 58D5A1E5
 P 9600 3500
 AR Path="/58D5A1E5" Ref="RB1"  Part="1" 
@@ -126,7 +126,7 @@ F 3 "" H 9800 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C3
+L Device:C C3
 U 1 1 58D5AE64
 P 9800 3300
 AR Path="/58D5AE64" Ref="C3"  Part="1" 
@@ -140,7 +140,7 @@ F 4 "CC0805ZKY5V5BB226 " H 9800 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C4
+L Device:C C4
 U 1 1 58D5AEB3
 P 10150 3300
 AR Path="/58D5AEB3" Ref="C4"  Part="1" 
@@ -198,7 +198,7 @@ F 3 "" H 7400 6300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C5
+L Device:C C5
 U 1 1 58D6295E
 P 7400 6100
 AR Path="/58D6295E" Ref="C5"  Part="1" 
@@ -212,7 +212,7 @@ F 4 "CC0805ZKY5V5BB226 " H 7400 6100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C6
+L Device:C C6
 U 1 1 58D6296A
 P 9100 5700
 AR Path="/58D6296A" Ref="C6"  Part="1" 
@@ -226,7 +226,7 @@ F 4 "CS0603KRX7R9BB471" H 9100 5700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RA3
+L Device:R RA3
 U 1 1 58D62970
 P 9400 5700
 AR Path="/58D62970" Ref="RA3"  Part="1" 
@@ -240,7 +240,7 @@ F 4 "AC0603FR-1015KL" V 9400 5700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RB3
+L Device:R RB3
 U 1 1 58D62976
 P 9600 5900
 AR Path="/58D62976" Ref="RB3"  Part="1" 
@@ -265,7 +265,7 @@ F 3 "" H 9800 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C7
+L Device:C C7
 U 1 1 58D62988
 P 9800 5700
 AR Path="/58D62988" Ref="C7"  Part="1" 
@@ -279,7 +279,7 @@ F 4 "CC0805ZKY5V5BB226 " H 9800 5700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C8
+L Device:C C8
 U 1 1 58D6298E
 P 10150 5700
 AR Path="/58D6298E" Ref="C8"  Part="1" 
@@ -339,7 +339,7 @@ F 3 "" H 7400 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C9
+L Device:C C9
 U 1 1 58D67BD2
 P 7400 4900
 AR Path="/58D67BD2" Ref="C9"  Part="1" 
@@ -353,7 +353,7 @@ F 4 "CC0805ZKY5V5BB226 " H 7400 4900 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:L L2
+L Device:L L2
 U 1 1 58D67BD8
 P 8900 4300
 F 0 "L2" V 8850 4300 50  0000 C CNN
@@ -368,7 +368,7 @@ F 7 "652-SRP2512A-2R2M" H 8900 4300 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C10
+L Device:C C10
 U 1 1 58D67BDE
 P 9100 4500
 AR Path="/58D67BDE" Ref="C10"  Part="1" 
@@ -382,7 +382,7 @@ F 4 "CS0603KRX7R9BB471" H 9100 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RA2
+L Device:R RA2
 U 1 1 58D67BE4
 P 9400 4500
 AR Path="/58D67BE4" Ref="RA2"  Part="1" 
@@ -396,7 +396,7 @@ F 4 "AC0603FR-1015KL" V 9400 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RB2
+L Device:R RB2
 U 1 1 58D67BEA
 P 9600 4700
 AR Path="/58D67BEA" Ref="RB2"  Part="1" 
@@ -421,7 +421,7 @@ F 3 "" H 9800 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C11
+L Device:C C11
 U 1 1 58D67BF6
 P 9800 4500
 AR Path="/58D67BF6" Ref="C11"  Part="1" 
@@ -435,7 +435,7 @@ F 4 "CC0805ZKY5V5BB226 " H 9800 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C12
+L Device:C C12
 U 1 1 58D67BFC
 P 10150 4500
 AR Path="/58D67BFC" Ref="C12"  Part="1" 
@@ -449,7 +449,7 @@ F 4 "CC0805ZKY5V5BB226 " H 10150 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R1
+L Device:R R1
 U 1 1 58D67C1D
 P 4300 4700
 AR Path="/58D67C1D" Ref="R1"  Part="1" 
@@ -548,7 +548,7 @@ FPDI_SCL
 Text GLabel 2450 3550 2    60   Input ~ 0
 FPDI_SDA
 $Comp
-L ulx3s-rescue:Battery_Cell BAT1
+L Device:Battery_Cell BAT1
 U 1 1 58D72202
 P 2650 4100
 AR Path="/58D72202" Ref="BAT1"  Part="1" 
@@ -580,7 +580,7 @@ VBAT
 Text Notes 6250 3350 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
-L ulx3s-rescue:D D10
+L Device:D D10
 U 1 1 58D79CB5
 P 4300 4250
 F 0 "D10" H 4300 4350 50  0000 C CNN
@@ -591,7 +591,7 @@ F 3 "" H 4300 4250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C13
+L Device:C C13
 U 1 1 58D7A3F0
 P 4300 3750
 AR Path="/58D7A3F0" Ref="C13"  Part="1" 
@@ -605,7 +605,7 @@ F 4 "CC0805MRX5R6BB225" H 4300 3750 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R2
+L Device:R R2
 U 1 1 58D7BDD9
 P 4300 5600
 AR Path="/58D7BDD9" Ref="R2"  Part="1" 
@@ -630,7 +630,7 @@ F 3 "" H 4300 6200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R4
+L Device:R R4
 U 1 1 58D7CBD5
 P 4850 4700
 AR Path="/58D7CBD5" Ref="R4"  Part="1" 
@@ -644,7 +644,7 @@ F 4 "AC0603FR-104K7L" V 4850 4700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D11
+L Device:LED_ALT D11
 U 1 1 58D7CBDC
 P 4850 4200
 AR Path="/58D7CBDC" Ref="D11"  Part="1" 
@@ -661,7 +661,7 @@ WAKEUPn\nopen drain \nactive low
 Text Label 2400 3750 0    60   ~ 0
 WAKEUPn
 $Comp
-L ulx3s-rescue:C C14
+L Device:C C14
 U 1 1 58D84952
 P 3700 5850
 AR Path="/58D84952" Ref="C14"  Part="1" 
@@ -675,7 +675,7 @@ F 4 "CC0603KRX7R8BB104" H 3700 5850 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R5
+L Device:R R5
 U 1 1 58D85B68
 P 3400 5850
 AR Path="/58D85B68" Ref="R5"  Part="1" 
@@ -699,7 +699,7 @@ HOLD
 Text Label 3450 5600 0    60   ~ 0
 SHUT
 $Comp
-L ulx3s-rescue:R R6
+L Device:R R6
 U 1 1 58D7B291
 P 3400 3750
 AR Path="/58D7B291" Ref="R6"  Part="1" 
@@ -715,7 +715,7 @@ $EndComp
 Text Label 3550 3750 0    60   ~ 0
 WKn
 $Comp
-L ulx3s-rescue:D_Schottky D12
+L Device:D_Schottky D12
 U 1 1 58D7BC4A
 P 3800 4950
 F 0 "D12" H 3800 5050 50  0000 C CNN
@@ -730,7 +730,7 @@ F 7 "621-BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:R R8
+L Device:R R8
 U 1 1 58D8111E
 P 4100 5200
 AR Path="/58D8111E" Ref="R8"  Part="1" 
@@ -744,7 +744,7 @@ F 4 "RC0603FR-071KL" V 4100 5200 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Crystal_GND23 Y2
+L Device:Crystal_GND23 Y2
 U 1 1 58D85AAB
 P 900 3650
 F 0 "Y2" V 750 3450 50  0000 L CNN
@@ -765,7 +765,7 @@ OSCI_32k
 Text Label 1050 3850 0    60   ~ 0
 OSCO_32k
 $Comp
-L ulx3s-rescue:Q_NMOS_GSD Q2
+L Device:Q_NMOS_GSD Q2
 U 1 1 58D883BD
 P 4000 5600
 AR Path="/58D883BD" Ref="Q2"  Part="1" 
@@ -774,14 +774,15 @@ F 0 "Q2" H 3850 5700 50  0000 L CNN
 F 1 "2N7002" H 3750 5800 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-23_Handsoldering" H 4200 5700 50  0001 C CNN
 F 3 "https://assets.nexperia.com/documents/data_sheet/2N7002.pdf" H 4000 5600 50  0001 C CNN
-F 4 "2N7002P,215" H 4000 5600 60  0001 C CNN "MFG_PN"
-F 5 "www.mouser.com" H 4000 5600 60  0001 C CNN "Distributor1_URL"
-F 6 "771-2N7002P-215" H 4000 5600 60  0001 C CNN "Distributor1_PN"
+F 4 "www.nexperia.com" H 4000 5600 50  0001 C CNN "MFG_URL"
+F 5 "2N7002P,215" H 4000 5600 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 4000 5600 60  0001 C CNN "Distributor1_URL"
+F 7 "771-2N7002P-215" H 4000 5600 60  0001 C CNN "Distributor1_PN"
 	1    4000 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Q_PNP_BEC Q1
+L Device:Q_PNP_BEC Q1
 U 1 1 58D89315
 P 3950 3750
 AR Path="/58D89315" Ref="Q1"  Part="1" 
@@ -797,7 +798,7 @@ F 6 "771-BC857B-T/R" H 3950 3750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:R R13
+L Device:R R13
 U 1 1 58DA1F4D
 P 2850 5850
 AR Path="/58DA1F4D" Ref="R13"  Part="1" 
@@ -811,7 +812,7 @@ F 4 "AC0603FR-1015KL" V 2850 5850 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:D D13
+L Device:D D13
 U 1 1 58DA2DA9
 P 4050 4250
 F 0 "D13" H 4050 4350 50  0000 C CNN
@@ -846,7 +847,7 @@ $EndComp
 Text Notes 3450 4750 0    60   ~ 0
 D13 discharges\nC13 at shutdown
 $Comp
-L ulx3s-rescue:D D14
+L Device:D D14
 U 1 1 58DA55D7
 P 3400 5400
 F 0 "D14" H 3400 5500 50  0000 C CNN
@@ -872,7 +873,7 @@ D14 discharges\nC14 at shutdown
 Text GLabel 2700 5600 0    60   Input ~ 0
 SHUTDOWN
 $Comp
-L ulx3s-rescue:R R3
+L Device:R R3
 U 1 1 58E810CC
 P 3150 4400
 AR Path="/58E810CC" Ref="R3"  Part="1" 
@@ -886,7 +887,7 @@ F 4 "AC0603FR-104K7L" V 3150 4400 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D D16
+L Device:D D16
 U 1 1 58E813AE
 P 2900 3950
 F 0 "D16" H 2900 4050 50  0000 C CNN
@@ -908,7 +909,7 @@ F 3 "" H 3300 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D D17
+L Device:D D17
 U 1 1 58E82B1D
 P 3150 4150
 F 0 "D17" H 3150 4050 50  0000 C CNN
@@ -1537,7 +1538,7 @@ 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 ulx3s-rescue:R R10
+L Device:R R10
 U 1 1 591E4865
 P 2700 4950
 AR Path="/591E4865" Ref="R10"  Part="1" 
@@ -1555,7 +1556,7 @@ Wire Wire Line
 Text Label 2900 4950 0    60   ~ 0
 FTDI_nSUSPEND
 $Comp
-L ulx3s-rescue:C C17
+L Device:C C17
 U 1 1 592462C1
 P 10850 3300
 AR Path="/592462C1" Ref="C17"  Part="1" 
@@ -1569,7 +1570,7 @@ F 4 "CC0805MRX5R6BB225" H 10850 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C19
+L Device:C C19
 U 1 1 59246A2A
 P 10850 4500
 AR Path="/59246A2A" Ref="C19"  Part="1" 
@@ -1583,7 +1584,7 @@ F 4 "CC0805MRX5R6BB225" H 10850 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C20
+L Device:C C20
 U 1 1 59246E14
 P 10850 5700
 AR Path="/59246E14" Ref="C20"  Part="1" 
@@ -1632,7 +1633,7 @@ Wire Wire Line
 Text Label 2450 4600 0    60   ~ 0
 PWRBTn
 $Comp
-L ulx3s-rescue:C C22
+L Device:C C22
 U 1 1 59D56B84
 P 10500 3300
 AR Path="/59D56B84" Ref="C22"  Part="1" 
@@ -1646,7 +1647,7 @@ F 4 "CC0805MRX5R6BB225" H 10500 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C23
+L Device:C C23
 U 1 1 59D56D50
 P 10500 4500
 AR Path="/59D56D50" Ref="C23"  Part="1" 
@@ -1660,7 +1661,7 @@ F 4 "CC0805MRX5R6BB225" H 10500 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C24
+L Device:C C24
 U 1 1 59D56EAA
 P 10500 5700
 AR Path="/59D56EAA" Ref="C24"  Part="1" 
@@ -1692,7 +1693,7 @@ Wire Wire Line
 	10850 4700 10850 4650
 Connection ~ 10500 4700
 $Comp
-L ulx3s-rescue:Jumper_NC_Small RP1
+L Device:Jumper_NC_Small RP1
 U 1 1 59DFB08A
 P 10700 3100
 F 0 "RP1" H 10700 3180 50  0000 C CNN
@@ -1705,7 +1706,7 @@ F 5 "RC0603JR-070RL" H 10700 3100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Jumper_NC_Small RP2
+L Device:Jumper_NC_Small RP2
 U 1 1 59DFB617
 P 10700 4300
 F 0 "RP2" H 10700 4380 50  0000 C CNN
@@ -1718,7 +1719,7 @@ F 5 "RC0603JR-070RL" H 10700 4300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Jumper_NC_Small RP3
+L Device:Jumper_NC_Small RP3
 U 1 1 59DFBF34
 P 10700 5500
 F 0 "RP3" H 10700 5580 50  0000 C CNN
@@ -1956,7 +1957,7 @@ $EndComp
 Text Notes 7900 1200 0    60   ~ 0
 Decoupling capacitors: see Lattice\nPower Decoupling and Bypass Filtering for Programmable Devices
 $Comp
-L ulx3s-rescue:C C25
+L Device:C C25
 U 1 1 5A5F6DD9
 P 5500 4750
 AR Path="/5A5F6DD9" Ref="C25"  Part="1" 
@@ -1992,7 +1993,7 @@ F 3 "" H 5500 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C27
+L Device:C C27
 U 1 1 5A5FA778
 P 5450 3250
 AR Path="/5A5FA778" Ref="C27"  Part="1" 
@@ -2017,7 +2018,7 @@ F 3 "" H 5450 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C28
+L Device:C C28
 U 1 1 5A5FA78A
 P 5750 3250
 AR Path="/5A5FA78A" Ref="C28"  Part="1" 
@@ -2064,7 +2065,7 @@ F 3 "" H 5750 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C29
+L Device:C C29
 U 1 1 5A5FC3F6
 P 5450 4000
 AR Path="/5A5FC3F6" Ref="C29"  Part="1" 
@@ -2089,7 +2090,7 @@ F 3 "" H 5450 4150 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C30
+L Device:C C30
 U 1 1 5A5FC402
 P 5750 4000
 AR Path="/5A5FC402" Ref="C30"  Part="1" 
@@ -2147,7 +2148,7 @@ F 3 "" H 6050 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C26
+L Device:C C26
 U 1 1 5A5F91FE
 P 6050 4750
 AR Path="/5A5F91FE" Ref="C26"  Part="1" 
@@ -2183,7 +2184,7 @@ F 3 "" H 5750 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C31
+L Device:C C31
 U 1 1 5A5FEEA6
 P 5750 4750
 AR Path="/5A5FEEA6" Ref="C31"  Part="1" 
@@ -2197,7 +2198,7 @@ F 4 "CX0603MRX7R8BB223" H 5750 4750 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C32
+L Device:C C32
 U 1 1 5A6007F1
 P 5250 4750
 AR Path="/5A6007F1" Ref="C32"  Part="1" 
@@ -2233,7 +2234,7 @@ F 3 "" H 5250 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:L L1
+L Device:L L1
 U 1 1 5A73C9EB
 P 8900 3100
 F 0 "L1" V 8850 3100 50  0000 C CNN
@@ -2248,7 +2249,7 @@ F 7 "652-SRP2512A-2R2M" H 8900 3100 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:L L3
+L Device:L L3
 U 1 1 5A73CDB3
 P 8900 5500
 F 0 "L3" V 8850 5500 50  0000 C CNN
@@ -2333,7 +2334,7 @@ Wire Wire Line
 Text GLabel 6050 4600 1    60   Input ~ 0
 2V5_3V3
 $Comp
-L ulx3s-rescue:C C47
+L Device:C C47
 U 1 1 5AB6B7B8
 P 950 2650
 AR Path="/5AB6B7B8" Ref="C47"  Part="1" 
@@ -2360,7 +2361,7 @@ F 3 "" H 950 2800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C50
+L Device:C C50
 U 1 1 5ABCEAC4
 P 3750 7100
 AR Path="/5ABCEAC4" Ref="C50"  Part="1" 
@@ -2407,7 +2408,7 @@ F 3 "" H 3250 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C48
+L Device:C C48
 U 1 1 5ABCEADC
 P 3250 7100
 AR Path="/5ABCEADC" Ref="C48"  Part="1" 
@@ -2443,7 +2444,7 @@ F 3 "" H 4000 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C51
+L Device:C C51
 U 1 1 5ABCEAEE
 P 4000 7100
 AR Path="/5ABCEAEE" Ref="C51"  Part="1" 
@@ -2470,7 +2471,7 @@ F 3 "" H 3500 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C49
+L Device:C C49
 U 1 1 5ABCECF1
 P 3500 7100
 AR Path="/5ABCECF1" Ref="C49"  Part="1" 
@@ -2499,7 +2500,7 @@ F 3 "" H 6300 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C53
+L Device:C C53
 U 1 1 5AC310F3
 P 6300 4750
 AR Path="/5AC310F3" Ref="C53"  Part="1" 
@@ -2917,7 +2918,7 @@ Wire Wire Line
 Wire Wire Line
 	6650 7350 6650 7450
 $Comp
-L ulx3s-rescue:C C54
+L Device:C C54
 U 1 1 5AEDFB32
 P 2400 4050
 F 0 "C54" H 2150 4050 50  0000 L CNN
@@ -3055,7 +3056,7 @@ F 7 "595-TLV62569DBVR" H 8050 5800 50  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky D15
+L Device:D_Schottky D15
 U 1 1 5AF673FF
 P 3100 5600
 F 0 "D15" H 3100 5700 50  0000 C CNN
diff --git a/power.sch b/power.sch
index 22f5e3e..9eaab95 100644
--- a/power.sch
+++ b/power.sch
@@ -59,7 +59,7 @@ F 3 "" H 7400 3900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C1
+L Device:C C1
 U 1 1 58D598B7
 P 7400 3700
 AR Path="/58D598B7" Ref="C1"  Part="1" 
@@ -73,7 +73,7 @@ F 4 "CC0805ZKY5V5BB226 " H 7400 3700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C2
+L Device:C C2
 U 1 1 58D5A146
 P 9100 3300
 AR Path="/58D5A146" Ref="C2"  Part="1" 
@@ -87,7 +87,7 @@ F 4 "CS0603KRX7R9BB471" H 9100 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RA1
+L Device:R RA1
 U 1 1 58D5A193
 P 9400 3300
 AR Path="/58D5A193" Ref="RA1"  Part="1" 
@@ -101,7 +101,7 @@ F 4 "AC0603FR-1015KL" V 9400 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RB1
+L Device:R RB1
 U 1 1 58D5A1E5
 P 9600 3500
 AR Path="/58D5A1E5" Ref="RB1"  Part="1" 
@@ -126,7 +126,7 @@ F 3 "" H 9800 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C3
+L Device:C C3
 U 1 1 58D5AE64
 P 9800 3300
 AR Path="/58D5AE64" Ref="C3"  Part="1" 
@@ -140,7 +140,7 @@ F 4 "CC0805ZKY5V5BB226 " H 9800 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C4
+L Device:C C4
 U 1 1 58D5AEB3
 P 10150 3300
 AR Path="/58D5AEB3" Ref="C4"  Part="1" 
@@ -198,7 +198,7 @@ F 3 "" H 7400 6300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C5
+L Device:C C5
 U 1 1 58D6295E
 P 7400 6100
 AR Path="/58D6295E" Ref="C5"  Part="1" 
@@ -212,7 +212,7 @@ F 4 "CC0805ZKY5V5BB226 " H 7400 6100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C6
+L Device:C C6
 U 1 1 58D6296A
 P 9100 5700
 AR Path="/58D6296A" Ref="C6"  Part="1" 
@@ -226,7 +226,7 @@ F 4 "CS0603KRX7R9BB471" H 9100 5700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RA3
+L Device:R RA3
 U 1 1 58D62970
 P 9400 5700
 AR Path="/58D62970" Ref="RA3"  Part="1" 
@@ -240,7 +240,7 @@ F 4 "AC0603FR-1015KL" V 9400 5700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RB3
+L Device:R RB3
 U 1 1 58D62976
 P 9600 5900
 AR Path="/58D62976" Ref="RB3"  Part="1" 
@@ -265,7 +265,7 @@ F 3 "" H 9800 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C7
+L Device:C C7
 U 1 1 58D62988
 P 9800 5700
 AR Path="/58D62988" Ref="C7"  Part="1" 
@@ -279,7 +279,7 @@ F 4 "CC0805ZKY5V5BB226 " H 9800 5700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C8
+L Device:C C8
 U 1 1 58D6298E
 P 10150 5700
 AR Path="/58D6298E" Ref="C8"  Part="1" 
@@ -339,7 +339,7 @@ F 3 "" H 7400 5100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C9
+L Device:C C9
 U 1 1 58D67BD2
 P 7400 4900
 AR Path="/58D67BD2" Ref="C9"  Part="1" 
@@ -353,7 +353,7 @@ F 4 "CC0805ZKY5V5BB226 " H 7400 4900 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:L L2
+L Device:L L2
 U 1 1 58D67BD8
 P 8900 4300
 F 0 "L2" V 8850 4300 50  0000 C CNN
@@ -368,7 +368,7 @@ F 7 "652-SRP2512A-2R2M" H 8900 4300 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C10
+L Device:C C10
 U 1 1 58D67BDE
 P 9100 4500
 AR Path="/58D67BDE" Ref="C10"  Part="1" 
@@ -382,7 +382,7 @@ F 4 "CS0603KRX7R9BB471" H 9100 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RA2
+L Device:R RA2
 U 1 1 58D67BE4
 P 9400 4500
 AR Path="/58D67BE4" Ref="RA2"  Part="1" 
@@ -396,7 +396,7 @@ F 4 "AC0603FR-1015KL" V 9400 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R RB2
+L Device:R RB2
 U 1 1 58D67BEA
 P 9600 4700
 AR Path="/58D67BEA" Ref="RB2"  Part="1" 
@@ -421,7 +421,7 @@ F 3 "" H 9800 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C11
+L Device:C C11
 U 1 1 58D67BF6
 P 9800 4500
 AR Path="/58D67BF6" Ref="C11"  Part="1" 
@@ -435,7 +435,7 @@ F 4 "CC0805ZKY5V5BB226 " H 9800 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C12
+L Device:C C12
 U 1 1 58D67BFC
 P 10150 4500
 AR Path="/58D67BFC" Ref="C12"  Part="1" 
@@ -449,7 +449,7 @@ F 4 "CC0805ZKY5V5BB226 " H 10150 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R1
+L Device:R R1
 U 1 1 58D67C1D
 P 4300 4700
 AR Path="/58D67C1D" Ref="R1"  Part="1" 
@@ -516,7 +516,7 @@ F 3 "" H 6950 950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:PCF8563 U7
+L Timer_RTC:PCF8563T U7
 U 1 1 58D70684
 P 1950 3650
 AR Path="/58D70684" Ref="U7"  Part="1" 
@@ -548,7 +548,7 @@ FPDI_SCL
 Text GLabel 2450 3550 2    60   Input ~ 0
 FPDI_SDA
 $Comp
-L ulx3s-rescue:Battery_Cell BAT1
+L Device:Battery_Cell BAT1
 U 1 1 58D72202
 P 2650 4100
 AR Path="/58D72202" Ref="BAT1"  Part="1" 
@@ -580,7 +580,7 @@ VBAT
 Text Notes 6250 3350 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
-L ulx3s-rescue:D D10
+L Device:D D10
 U 1 1 58D79CB5
 P 4300 4250
 F 0 "D10" H 4300 4350 50  0000 C CNN
@@ -591,7 +591,7 @@ F 3 "" H 4300 4250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:C C13
+L Device:C C13
 U 1 1 58D7A3F0
 P 4300 3750
 AR Path="/58D7A3F0" Ref="C13"  Part="1" 
@@ -605,7 +605,7 @@ F 4 "CC0805MRX5R6BB225" H 4300 3750 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R2
+L Device:R R2
 U 1 1 58D7BDD9
 P 4300 5600
 AR Path="/58D7BDD9" Ref="R2"  Part="1" 
@@ -630,7 +630,7 @@ F 3 "" H 4300 6200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R4
+L Device:R R4
 U 1 1 58D7CBD5
 P 4850 4700
 AR Path="/58D7CBD5" Ref="R4"  Part="1" 
@@ -644,7 +644,7 @@ F 4 "AC0603FR-104K7L" V 4850 4700 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:LED_ALT D11
+L Device:LED_ALT D11
 U 1 1 58D7CBDC
 P 4850 4200
 AR Path="/58D7CBDC" Ref="D11"  Part="1" 
@@ -661,7 +661,7 @@ WAKEUPn\nopen drain \nactive low
 Text Label 2400 3750 0    60   ~ 0
 WAKEUPn
 $Comp
-L ulx3s-rescue:C C14
+L Device:C C14
 U 1 1 58D84952
 P 3700 5850
 AR Path="/58D84952" Ref="C14"  Part="1" 
@@ -675,7 +675,7 @@ F 4 "CC0603KRX7R8BB104" H 3700 5850 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R5
+L Device:R R5
 U 1 1 58D85B68
 P 3400 5850
 AR Path="/58D85B68" Ref="R5"  Part="1" 
@@ -699,7 +699,7 @@ HOLD
 Text Label 3450 5600 0    60   ~ 0
 SHUT
 $Comp
-L ulx3s-rescue:R R6
+L Device:R R6
 U 1 1 58D7B291
 P 3400 3750
 AR Path="/58D7B291" Ref="R6"  Part="1" 
@@ -715,7 +715,7 @@ $EndComp
 Text Label 3550 3750 0    60   ~ 0
 WKn
 $Comp
-L ulx3s-rescue:D_Schottky D12
+L Device:D_Schottky D12
 U 1 1 58D7BC4A
 P 3800 4950
 F 0 "D12" H 3800 5050 50  0000 C CNN
@@ -730,7 +730,7 @@ F 7 "621-BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:R R8
+L Device:R R8
 U 1 1 58D8111E
 P 4100 5200
 AR Path="/58D8111E" Ref="R8"  Part="1" 
@@ -744,7 +744,7 @@ F 4 "RC0603FR-071KL" V 4100 5200 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Crystal_GND23 Y2
+L Device:Crystal_GND23 Y2
 U 1 1 58D85AAB
 P 900 3650
 F 0 "Y2" V 750 3450 50  0000 L CNN
@@ -765,7 +765,7 @@ OSCI_32k
 Text Label 1050 3850 0    60   ~ 0
 OSCO_32k
 $Comp
-L ulx3s-rescue:Q_NMOS_GSD Q2
+L Device:Q_NMOS_GSD Q2
 U 1 1 58D883BD
 P 4000 5600
 AR Path="/58D883BD" Ref="Q2"  Part="1" 
@@ -782,7 +782,7 @@ F 7 "771-2N7002P-215" H 4000 5600 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Q_PNP_BEC Q1
+L Device:Q_PNP_BEC Q1
 U 1 1 58D89315
 P 3950 3750
 AR Path="/58D89315" Ref="Q1"  Part="1" 
@@ -798,7 +798,7 @@ F 6 "771-BC857B-T/R" H 3950 3750 60  0001 C CNN "Distributor1_PN"
 	1    0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:R R13
+L Device:R R13
 U 1 1 58DA1F4D
 P 2850 5850
 AR Path="/58DA1F4D" Ref="R13"  Part="1" 
@@ -812,7 +812,7 @@ F 4 "AC0603FR-1015KL" V 2850 5850 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:D D13
+L Device:D D13
 U 1 1 58DA2DA9
 P 4050 4250
 F 0 "D13" H 4050 4350 50  0000 C CNN
@@ -847,7 +847,7 @@ $EndComp
 Text Notes 3450 4750 0    60   ~ 0
 D13 discharges\nC13 at shutdown
 $Comp
-L ulx3s-rescue:D D14
+L Device:D D14
 U 1 1 58DA55D7
 P 3400 5400
 F 0 "D14" H 3400 5500 50  0000 C CNN
@@ -873,7 +873,7 @@ D14 discharges\nC14 at shutdown
 Text GLabel 2700 5600 0    60   Input ~ 0
 SHUTDOWN
 $Comp
-L ulx3s-rescue:R R3
+L Device:R R3
 U 1 1 58E810CC
 P 3150 4400
 AR Path="/58E810CC" Ref="R3"  Part="1" 
@@ -887,7 +887,7 @@ F 4 "AC0603FR-104K7L" V 3150 4400 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D D16
+L Device:D D16
 U 1 1 58E813AE
 P 2900 3950
 F 0 "D16" H 2900 4050 50  0000 C CNN
@@ -909,7 +909,7 @@ F 3 "" H 3300 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D D17
+L Device:D D17
 U 1 1 58E82B1D
 P 3150 4150
 F 0 "D17" H 3150 4050 50  0000 C CNN
@@ -1538,7 +1538,7 @@ 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 ulx3s-rescue:R R10
+L Device:R R10
 U 1 1 591E4865
 P 2700 4950
 AR Path="/591E4865" Ref="R10"  Part="1" 
@@ -1556,7 +1556,7 @@ Wire Wire Line
 Text Label 2900 4950 0    60   ~ 0
 FTDI_nSUSPEND
 $Comp
-L ulx3s-rescue:C C17
+L Device:C C17
 U 1 1 592462C1
 P 10850 3300
 AR Path="/592462C1" Ref="C17"  Part="1" 
@@ -1570,7 +1570,7 @@ F 4 "CC0805MRX5R6BB225" H 10850 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C19
+L Device:C C19
 U 1 1 59246A2A
 P 10850 4500
 AR Path="/59246A2A" Ref="C19"  Part="1" 
@@ -1584,7 +1584,7 @@ F 4 "CC0805MRX5R6BB225" H 10850 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C20
+L Device:C C20
 U 1 1 59246E14
 P 10850 5700
 AR Path="/59246E14" Ref="C20"  Part="1" 
@@ -1633,7 +1633,7 @@ Wire Wire Line
 Text Label 2450 4600 0    60   ~ 0
 PWRBTn
 $Comp
-L ulx3s-rescue:C C22
+L Device:C C22
 U 1 1 59D56B84
 P 10500 3300
 AR Path="/59D56B84" Ref="C22"  Part="1" 
@@ -1647,7 +1647,7 @@ F 4 "CC0805MRX5R6BB225" H 10500 3300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C23
+L Device:C C23
 U 1 1 59D56D50
 P 10500 4500
 AR Path="/59D56D50" Ref="C23"  Part="1" 
@@ -1661,7 +1661,7 @@ F 4 "CC0805MRX5R6BB225" H 10500 4500 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C24
+L Device:C C24
 U 1 1 59D56EAA
 P 10500 5700
 AR Path="/59D56EAA" Ref="C24"  Part="1" 
@@ -1693,7 +1693,7 @@ Wire Wire Line
 	10850 4700 10850 4650
 Connection ~ 10500 4700
 $Comp
-L ulx3s-rescue:Jumper_NC_Small RP1
+L Device:Jumper_NC_Small RP1
 U 1 1 59DFB08A
 P 10700 3100
 F 0 "RP1" H 10700 3180 50  0000 C CNN
@@ -1706,7 +1706,7 @@ F 5 "RC0603JR-070RL" H 10700 3100 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Jumper_NC_Small RP2
+L Device:Jumper_NC_Small RP2
 U 1 1 59DFB617
 P 10700 4300
 F 0 "RP2" H 10700 4380 50  0000 C CNN
@@ -1719,7 +1719,7 @@ F 5 "RC0603JR-070RL" H 10700 4300 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Jumper_NC_Small RP3
+L Device:Jumper_NC_Small RP3
 U 1 1 59DFBF34
 P 10700 5500
 F 0 "RP3" H 10700 5580 50  0000 C CNN
@@ -1957,7 +1957,7 @@ $EndComp
 Text Notes 7900 1200 0    60   ~ 0
 Decoupling capacitors: see Lattice\nPower Decoupling and Bypass Filtering for Programmable Devices
 $Comp
-L ulx3s-rescue:C C25
+L Device:C C25
 U 1 1 5A5F6DD9
 P 5500 4750
 AR Path="/5A5F6DD9" Ref="C25"  Part="1" 
@@ -1993,7 +1993,7 @@ F 3 "" H 5500 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C27
+L Device:C C27
 U 1 1 5A5FA778
 P 5450 3250
 AR Path="/5A5FA778" Ref="C27"  Part="1" 
@@ -2018,7 +2018,7 @@ F 3 "" H 5450 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C28
+L Device:C C28
 U 1 1 5A5FA78A
 P 5750 3250
 AR Path="/5A5FA78A" Ref="C28"  Part="1" 
@@ -2065,7 +2065,7 @@ F 3 "" H 5750 3100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C29
+L Device:C C29
 U 1 1 5A5FC3F6
 P 5450 4000
 AR Path="/5A5FC3F6" Ref="C29"  Part="1" 
@@ -2090,7 +2090,7 @@ F 3 "" H 5450 4150 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C30
+L Device:C C30
 U 1 1 5A5FC402
 P 5750 4000
 AR Path="/5A5FC402" Ref="C30"  Part="1" 
@@ -2148,7 +2148,7 @@ F 3 "" H 6050 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C26
+L Device:C C26
 U 1 1 5A5F91FE
 P 6050 4750
 AR Path="/5A5F91FE" Ref="C26"  Part="1" 
@@ -2184,7 +2184,7 @@ F 3 "" H 5750 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C31
+L Device:C C31
 U 1 1 5A5FEEA6
 P 5750 4750
 AR Path="/5A5FEEA6" Ref="C31"  Part="1" 
@@ -2198,7 +2198,7 @@ F 4 "CX0603MRX7R8BB223" H 5750 4750 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C32
+L Device:C C32
 U 1 1 5A6007F1
 P 5250 4750
 AR Path="/5A6007F1" Ref="C32"  Part="1" 
@@ -2234,7 +2234,7 @@ F 3 "" H 5250 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:L L1
+L Device:L L1
 U 1 1 5A73C9EB
 P 8900 3100
 F 0 "L1" V 8850 3100 50  0000 C CNN
@@ -2249,7 +2249,7 @@ F 7 "652-SRP2512A-2R2M" H 8900 3100 60  0001 C CNN "Distributor1_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:L L3
+L Device:L L3
 U 1 1 5A73CDB3
 P 8900 5500
 F 0 "L3" V 8850 5500 50  0000 C CNN
@@ -2334,7 +2334,7 @@ Wire Wire Line
 Text GLabel 6050 4600 1    60   Input ~ 0
 2V5_3V3
 $Comp
-L ulx3s-rescue:C C47
+L Device:C C47
 U 1 1 5AB6B7B8
 P 950 2650
 AR Path="/5AB6B7B8" Ref="C47"  Part="1" 
@@ -2361,7 +2361,7 @@ F 3 "" H 950 2800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C50
+L Device:C C50
 U 1 1 5ABCEAC4
 P 3750 7100
 AR Path="/5ABCEAC4" Ref="C50"  Part="1" 
@@ -2408,7 +2408,7 @@ F 3 "" H 3250 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C48
+L Device:C C48
 U 1 1 5ABCEADC
 P 3250 7100
 AR Path="/5ABCEADC" Ref="C48"  Part="1" 
@@ -2444,7 +2444,7 @@ F 3 "" H 4000 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C51
+L Device:C C51
 U 1 1 5ABCEAEE
 P 4000 7100
 AR Path="/5ABCEAEE" Ref="C51"  Part="1" 
@@ -2471,7 +2471,7 @@ F 3 "" H 3500 7250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C49
+L Device:C C49
 U 1 1 5ABCECF1
 P 3500 7100
 AR Path="/5ABCECF1" Ref="C49"  Part="1" 
@@ -2500,7 +2500,7 @@ F 3 "" H 6300 4900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C53
+L Device:C C53
 U 1 1 5AC310F3
 P 6300 4750
 AR Path="/5AC310F3" Ref="C53"  Part="1" 
@@ -2918,7 +2918,7 @@ Wire Wire Line
 Wire Wire Line
 	6650 7350 6650 7450
 $Comp
-L ulx3s-rescue:C C54
+L Device:C C54
 U 1 1 5AEDFB32
 P 2400 4050
 F 0 "C54" H 2150 4050 50  0000 L CNN
@@ -3056,7 +3056,7 @@ F 7 "595-TLV62569DBVR" H 8050 5800 50  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky D15
+L Device:D_Schottky D15
 U 1 1 5AF673FF
 P 3100 5600
 F 0 "D15" H 3100 5700 50  0000 C CNN
diff --git a/ram.bak b/ram.bak
index 79903da..a745e76 100644
--- a/ram.bak
+++ b/ram.bak
@@ -285,7 +285,7 @@ GN17
 Text GLabel 8550 5850 0    60   Input ~ 0
 GP17
 $Comp
-L ulx3s-rescue:C C16
+L Device:C C16
 U 1 1 59131F17
 P 5350 5900
 F 0 "C16" H 5375 6000 50  0000 L CNN
@@ -389,7 +389,7 @@ BTN_U
 Text GLabel 10050 3450 2    60   Input ~ 0
 BTN_R
 $Comp
-L ulx3s-rescue:C C33
+L Device:C C33
 U 1 1 5A5FD142
 P 5900 5900
 F 0 "C33" H 5925 6000 50  0000 L CNN
@@ -423,7 +423,7 @@ F 3 "" H 5900 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C34
+L Device:C C34
 U 1 1 5A5FD1C1
 P 6200 5900
 F 0 "C34" H 6225 6000 50  0000 L CNN
@@ -457,7 +457,7 @@ F 3 "" H 6200 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C35
+L Device:C C35
 U 1 1 5A5FD26F
 P 6500 5900
 F 0 "C35" H 6525 6000 50  0000 L CNN
@@ -491,7 +491,7 @@ F 3 "" H 6500 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C52
+L Device:C C52
 U 1 1 5AC202C5
 P 6800 5900
 F 0 "C52" H 6825 6000 50  0000 L CNN
diff --git a/ram.sch b/ram.sch
index 79903da..a745e76 100644
--- a/ram.sch
+++ b/ram.sch
@@ -285,7 +285,7 @@ GN17
 Text GLabel 8550 5850 0    60   Input ~ 0
 GP17
 $Comp
-L ulx3s-rescue:C C16
+L Device:C C16
 U 1 1 59131F17
 P 5350 5900
 F 0 "C16" H 5375 6000 50  0000 L CNN
@@ -389,7 +389,7 @@ BTN_U
 Text GLabel 10050 3450 2    60   Input ~ 0
 BTN_R
 $Comp
-L ulx3s-rescue:C C33
+L Device:C C33
 U 1 1 5A5FD142
 P 5900 5900
 F 0 "C33" H 5925 6000 50  0000 L CNN
@@ -423,7 +423,7 @@ F 3 "" H 5900 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C34
+L Device:C C34
 U 1 1 5A5FD1C1
 P 6200 5900
 F 0 "C34" H 6225 6000 50  0000 L CNN
@@ -457,7 +457,7 @@ F 3 "" H 6200 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C35
+L Device:C C35
 U 1 1 5A5FD26F
 P 6500 5900
 F 0 "C35" H 6525 6000 50  0000 L CNN
@@ -491,7 +491,7 @@ F 3 "" H 6500 5750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C52
+L Device:C C52
 U 1 1 5AC202C5
 P 6800 5900
 F 0 "C52" H 6825 6000 50  0000 L CNN
diff --git a/sdcard.bak b/sdcard.bak
index 7ef60a0..9344255 100644
--- a/sdcard.bak
+++ b/sdcard.bak
@@ -62,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 ulx3s-rescue:R R38
+L Device:R R38
 U 1 1 590C5D62
 P 3150 3100
 F 0 "R38" V 3230 3100 50  0000 C CNN
@@ -90,7 +90,7 @@ Connection ~ 3150 3300
 Text Label 3250 3300 0    60   ~ 0
 SD3V3
 $Comp
-L ulx3s-rescue:C C15
+L Device:C C15
 U 1 1 590C7447
 P 3150 3500
 F 0 "C15" H 3175 3600 50  0000 L CNN
diff --git a/sdcard.sch b/sdcard.sch
index 7ef60a0..9344255 100644
--- a/sdcard.sch
+++ b/sdcard.sch
@@ -62,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 ulx3s-rescue:R R38
+L Device:R R38
 U 1 1 590C5D62
 P 3150 3100
 F 0 "R38" V 3230 3100 50  0000 C CNN
@@ -90,7 +90,7 @@ Connection ~ 3150 3300
 Text Label 3250 3300 0    60   ~ 0
 SD3V3
 $Comp
-L ulx3s-rescue:C C15
+L Device:C C15
 U 1 1 590C7447
 P 3150 3500
 F 0 "C15" H 3175 3600 50  0000 L CNN
diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index fbc8913..d86c052 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -225,1265 +225,1267 @@ X A 1 0 -200 100 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ESP32_ESP-32S
+# Device_Battery_Cell
 #
-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
+DEF Device_Battery_Cell BT 0 0 N N 1 F N
+F0 "BT" 100 100 50 H V L CNN
+F1 "Device_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 -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
+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
 #
-# Jumper_Jumper_2_Open
+# Device_C
 #
-DEF Jumper_Jumper_2_Open JP 0 0 Y N 1 F N
-F0 "JP" 0 110 50 H V C CNN
-F1 "Jumper_Jumper_2_Open" 0 -90 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
+DEF Device_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_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
- Jumper*
+ *:C_*
 $ENDFPLIST
 DRAW
-A 0 -30 100 1269 531 0 1 0 N -60 50 60 50
-C -80 0 20 0 0 0 N
-C 80 0 20 0 0 0 N
-X A 1 -200 0 100 R 50 50 1 1 P
-X B 2 200 0 100 L 50 50 1 1 P
+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
 #
-# Switch_SW_Push
+# Device_Crystal_GND23
 #
-DEF Switch_SW_Push SW 0 40 N N 1 F N
-F0 "SW" 50 100 50 H V L CNN
-F1 "Switch_SW_Push" 0 -60 50 H V C CNN
-F2 "" 0 200 50 H I C CNN
-F3 "" 0 200 50 H I C CNN
+DEF Device_Crystal_GND23 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "Device_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
-C -80 0 20 0 1 0 N
-C 80 0 20 0 1 0 N
-P 2 0 1 0 0 50 0 120 N
-P 2 0 1 0 100 50 -100 50 N
-X 1 1 -200 0 100 R 50 50 0 1 P
-X 2 2 200 0 100 L 50 50 0 1 P
+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
 #
-# dcdc_DCDC
+# Device_Crystal_GND24
 #
-DEF dcdc_DCDC U 0 40 Y Y 1 F N
-F0 "U" 0 150 60 H V C CNN
-F1 "dcdc_DCDC" 0 50 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+DEF Device_Crystal_GND24 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "Device_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
- TSOT25
+ Crystal*
 $ENDFPLIST
 DRAW
-S -400 200 400 -200 0 1 0 N
-X EN 1 -600 -100 200 R 50 50 1 1 I
-X GND 2 0 -400 200 U 50 50 1 1 I
-X LX 3 600 100 200 L 50 50 1 1 I
-X VIN 4 -600 100 200 R 50 50 1 1 I
-X FB 5 600 -100 200 L 50 50 1 1 I
+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
 #
-# ftdi_FT231XS
+# Device_D
 #
-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
+DEF Device_D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_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
- SSOP*
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ *:D_*
 $ENDFPLIST
 DRAW
-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
+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
 #
-# hdmi-d_HDMI-D
+# Device_D_Schottky
 #
-DEF hdmi-d_HDMI-D P 0 40 Y N 1 F N
-F0 "P" 0 1050 50 H V C CNN
-F1 "hdmi-d_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 Device_D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_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
- hdmi-d
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ *: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
+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
 #
-# jack_trs_6pins_JACK_TRS_6PINS
+# Device_D_Schottky_Small
 #
-DEF jack_trs_6pins_JACK_TRS_6PINS J 0 30 Y Y 1 F N
-F0 "J" 0 400 50 H V C CNN
-F1 "jack_trs_6pins_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
+DEF Device_D_Schottky_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "Device_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
-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
+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
 #
-# lfe5bg381_LFE5U-85F-6BG381C
+# Device_D_Zener_Small_ALT
 #
-DEF lfe5bg381_LFE5U-85F-6BG381C U 0 40 Y Y 10 L N
-F0 "U" 0 950 60 H V C CNN
-F1 "lfe5bg381_LFE5U-85F-6BG381C" 0 850 60 H V C CNN
-F2 "" -1050 950 60 H V C CNN
-F3 "" -1050 950 60 H V C CNN
+DEF Device_D_Zener_Small_ALT D 0 10 N N 1 F N
+F0 "D" 0 90 50 H V C CNN
+F1 "Device_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
- BGA381
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ *:D_*
 $ENDFPLIST
 DRAW
-T 0 0 -1050 60 0 2 0 BANK1 Normal 0 C C
-T 0 0 -1050 60 0 3 0 BANK2 Normal 0 C C
-T 0 0 -1050 60 0 4 0 BANK3 Normal 0 C C
-T 0 0 -1050 60 0 5 0 BANK6 Normal 0 C C
-T 0 0 -950 60 0 6 0 BANK7 Normal 0 C C
-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 -1200 60 0 8 0 SERDES 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 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 -1000 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 PT18A A7 -750 200 200 R 50 50 1 1 I
-X PT18B A8 750 200 200 L 50 50 1 1 I
-X GR_PCLK0_1 A9 -750 500 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 PT58A B9 -750 400 200 R 50 50 1 1 I
-X PT58B 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 PT54A C9 -750 -600 200 R 50 50 1 1 I
-X PT56A 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 PT56B E10 750 -500 200 L 50 50 1 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 PT76A A12 -750 -500 200 R 50 50 2 1 I
-X PT76B A13 750 -500 200 L 50 50 2 1 I
-X PT83A A14 -750 -200 200 R 50 50 2 1 I
-X PT103A A15 -750 -900 200 R 50 50 2 1 I
-X PT110A A16 -750 200 200 R 50 50 2 1 I
-X PT116A A17 -750 500 200 R 50 50 2 1 I
-X PT119A A18 -750 600 200 R 50 50 2 1 I
-X PT121A A19 -750 700 200 R 50 50 2 1 I
-X PCLKT1_0 B12 -750 -700 200 R 50 50 2 1 I
-X PT78A B13 -750 -400 200 R 50 50 2 1 I
-X PT105A B15 -750 0 200 R 50 50 2 1 I
-X PT110B B16 750 200 200 L 50 50 2 1 I
-X PT114A B17 -750 400 200 R 50 50 2 1 I
-X PT116B B18 750 500 200 L 50 50 2 1 I
-X PT119B B19 750 600 200 L 50 50 2 1 I
-X PT121B B20 750 700 200 L 50 50 2 1 I
-X PCLKC1_0 C12 750 -700 200 L 50 50 2 1 I
-X PT78B C13 750 -400 200 L 50 50 2 1 I
-X PT83B C14 750 -200 200 L 50 50 2 1 I
-X PT105B C15 750 0 200 L 50 50 2 1 I
-X PT112A C16 -750 300 200 R 50 50 2 1 I
-X PT114B 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 PT80A D13 -750 -300 200 R 50 50 2 1 I
-X PT85A D14 -750 -100 200 R 50 50 2 1 I
-X PT107A D15 -750 100 200 R 50 50 2 1 I
-X PT112B 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 PT80B E13 750 -300 200 L 50 50 2 1 I
-X PT85B E14 750 -100 200 L 50 50 2 1 I
-X PT107B E15 750 100 200 L 50 50 2 1 I
-X PR11A C18 -750 -800 200 R 50 50 3 1 I
-X PR35A 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 PR35B D19 750 0 200 L 50 50 3 1 I
-X VREF1_2 D20 -750 100 200 R 50 50 3 1 I
-X PR11C E16 -750 -700 200 R 50 50 3 1 I
-X PR14B E17 750 -600 200 L 50 50 3 1 I
-X PR14C E18 -750 -500 200 R 50 50 3 1 I
-X PR35D E19 750 100 200 L 50 50 3 1 I
-X PR38A 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 PR38B F19 750 200 200 L 50 50 3 1 I
-X PR38C 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 PR38D 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 PR41B 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 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 PR29A K16 -750 -900 200 R 50 50 3 1 I
-X PR29B K17 750 -900 200 L 50 50 3 1 I
-X PR41D K18 750 500 200 L 50 50 3 1 I
-X PCLKC2_1 K19 750 600 200 L 50 50 3 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 PR50B 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 PR53B M17 750 -400 200 L 50 50 4 1 I
-X PR50D 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 PR53A N16 -750 -400 200 R 50 50 4 1 I
-X PR56A N17 -750 -200 200 R 50 50 4 1 I
-X PR53C N18 -750 -300 200 R 50 50 4 1 I
-X PR83A N19 -750 0 200 R 50 50 4 1 I
-X PR83B N20 750 0 200 L 50 50 4 1 I
-X VREF1_3 P16 750 -200 200 L 50 50 4 1 I
-X PR53D P17 750 -300 200 L 50 50 4 1 I
-X PR83D P18 750 100 200 L 50 50 4 1 I
-X PR83C P19 -750 100 200 R 50 50 4 1 I
-X PR86A P20 -750 200 200 R 50 50 4 1 I
-X PR56C R16 -750 -100 200 R 50 50 4 1 I
-X PR56D R17 750 -100 200 L 50 50 4 1 I
-X PR89B R18 750 400 200 L 50 50 4 1 I
-X PR86B R20 750 200 200 L 50 50 4 1 I
-X PR77A T16 -750 -900 200 R 50 50 4 1 I
-X GPLL0C_IN T17 750 700 200 L 50 50 4 1 I
-X PR89D T18 750 500 200 L 50 50 4 1 I
-X PR89A T19 -750 400 200 R 50 50 4 1 I
-X PR86C T20 -750 300 200 R 50 50 4 1 I
-X GPLL0T_IN U16 -750 700 200 R 50 50 4 1 I
-X PR92B U17 750 600 200 L 50 50 4 1 I
-X PR92A U18 -750 600 200 R 50 50 4 1 I
-X PR89C U19 -750 500 200 R 50 50 4 1 I
-X PR86D 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 PL53C H1 -750 300 200 R 50 50 5 1 I
-X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
-X PL53B 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 PL50B J5 750 400 200 L 50 50 5 1 I
-X PL53D K1 750 300 200 L 50 50 5 1 I
-X PL53A K2 -750 200 200 R 50 50 5 1 I
-X PL50D K3 750 500 200 L 50 50 5 1 I
-X PL56A 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 PL86D L2 750 -300 200 L 50 50 5 1 I
-X PL86C L3 -750 -300 200 R 50 50 5 1 I
-X PL56C L4 -750 100 200 R 50 50 5 1 I
-X PL56D L5 750 100 200 L 50 50 5 1 I
-X PL89B M1 750 -600 200 L 50 50 5 1 I
-X PL86B M3 750 -400 200 L 50 50 5 1 I
-X PL83A M4 -750 -200 200 R 50 50 5 1 I
-X PL77A M5 -750 -900 200 R 50 50 5 1 I
-X PL89D N1 750 -500 200 L 50 50 5 1 I
-X PL65A N2 -750 -600 200 R 50 50 5 1 I
-X PL86A N3 -750 -400 200 R 50 50 5 1 I
-X PL83C N4 -750 -100 200 R 50 50 5 1 I
-X PL83B N5 750 -200 200 L 50 50 5 1 I
-X PL92A P1 -750 -800 200 R 50 50 5 1 I
-X PL92B 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 PL83D P5 750 -100 200 L 50 50 5 1 I
-X PL35A A2 -750 -200 200 R 50 50 6 1 I
-X PL14C A3 -750 500 200 R 50 50 6 1 I
-X PL11A A4 -750 600 200 R 50 50 6 1 I
-X PL11B A5 750 600 200 L 50 50 6 1 I
-X PL35B 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 PL38A C1 -750 -400 200 R 50 50 6 1 I
-X PL35D 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 PL38B D1 750 -400 200 L 50 50 6 1 I
-X PL38C 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 PL38D 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 PL41B G5 750 -600 200 L 50 50 6 1 I
-X PL41D 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
-X D7 R1 -750 700 200 R 50 50 7 1 I
-X CSSPIN R2 -750 200 200 R 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 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 T7 -850 350 200 R 50 50 8 1 I
-X GND T8 -850 250 200 R 50 50 8 1 I
-X GND T9 850 250 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 V11 850 50 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 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 Y15 850 -750 200 L 50 50 8 1 I
-X GND Y16 -850 -950 200 R 50 50 8 1 I
-X GND Y17 850 -950 200 L 50 50 8 1 I
-X GND Y19 -850 -550 200 R 50 50 8 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 GND V15 3250 -700 200 U 50 50 9 1 I
-X GND V16 3450 -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
-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
+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
+#
+# Device_Jumper_NC_Small
+#
+DEF Device_Jumper_NC_Small JP 0 30 N N 1 F N
+F0 "JP" 0 80 50 H V C CNN
+F1 "Device_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
 #
-# max1112x_MAX1112x
+# Device_L
 #
-DEF max1112x_MAX1112x U 0 40 Y Y 1 F N
-F0 "U" -50 900 50 H V L CNN
-F1 "max1112x_MAX1112x" -200 800 50 H V L CNN
-F2 "" 0 50 50 H V C CNN
-F3 "" 0 50 50 H V C CNN
+DEF Device_L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "Device_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
- TQFN28
- QFN28
+ Choke_*
+ *Coil*
+ Inductor_*
+ *:L_*
 $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
+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
 #
-# micro_sd_card_cd_Micro_SD_Card_CD
+# Device_LED_ALT
 #
-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
+DEF Device_LED_ALT D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_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*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
 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
+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
 #
-# mt48lc16m16a2tg_MT48LC16M16A2TG
+# Device_Q_NMOS_GSD
 #
-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
+DEF Device_Q_NMOS_GSD Q 0 0 Y N 1 F N
+F0 "Q" 200 50 50 H V L CNN
+F1 "Device_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
-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
+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
 #
-# power_+1V1
+# Device_Q_PNP_BEC
 #
-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
+DEF Device_Q_PNP_BEC Q 0 0 Y N 1 F N
+F0 "Q" 200 50 50 H V L CNN
+F1 "Device_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
-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
+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
 #
-# power_+2V5
+# Device_R
 #
-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
+DEF Device_R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "Device_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_*
+$ENDFPLIST
 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
+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
+#
+# ESP32_ESP-32S
+#
+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
+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
 #
-# power_+3V3
+# Jumper_Jumper_2_Open
 #
-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
+DEF Jumper_Jumper_2_Open JP 0 0 Y N 1 F N
+F0 "JP" 0 110 50 H V C CNN
+F1 "Jumper_Jumper_2_Open" 0 -90 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
+$FPLIST
+ Jumper*
+$ENDFPLIST
 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
+A 0 -30 100 1269 531 0 1 0 N -60 50 60 50
+C -80 0 20 0 0 0 N
+C 80 0 20 0 0 0 N
+X A 1 -200 0 100 R 50 50 1 1 P
+X B 2 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# power_+5V
+# Memory_NVRAM_MB85RS16
 #
-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
+DEF Memory_NVRAM_MB85RS16 U 0 40 Y Y 1 F N
+F0 "U" -300 250 50 H V L CNN
+F1 "Memory_NVRAM_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
+$FPLIST
+ SOIC*3.9x5.05mm*P1.27mm*
+ *SON*2x3mm*P0.50mm*
+$ENDFPLIST
 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 -300 200 300 -200 0 1 10 f
+X ~CS 1 -400 -100 100 R 50 50 1 1 I
+X SO 2 400 -100 100 L 50 50 1 1 O
+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 SI 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 VDD 8 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# power_GND
+# Switch_SW_Push
 #
-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
+DEF Switch_SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "Switch_SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 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
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# ssd_13xx_SSD_13xx
+# Timer_RTC_PCF8563T
 #
-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
+DEF Timer_RTC_PCF8563T U 0 40 Y Y 1 F N
+F0 "U" -300 350 50 H V L CNN
+F1 "Timer_RTC_PCF8563T" 100 350 50 H V L CNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_1X07
- Pin_Header_Angled_1X07
- Socket_Strip_Straight_1X07
- Socket_Strip_Angled_1X07
+ SOIC*3.9x4.9mm*P1.27mm*
 $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_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
+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
 #
-# ulx3s-rescue_C
+# dcdc_DCDC
 #
-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
+DEF dcdc_DCDC U 0 40 Y Y 1 F N
+F0 "U" 0 150 60 H V C CNN
+F1 "dcdc_DCDC" 0 50 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 $FPLIST
- C_*
+ TSOT25
 $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
+S -400 200 400 -200 0 1 0 N
+X EN 1 -600 -100 200 R 50 50 1 1 I
+X GND 2 0 -400 200 U 50 50 1 1 I
+X LX 3 600 100 200 L 50 50 1 1 I
+X VIN 4 -600 100 200 R 50 50 1 1 I
+X FB 5 600 -100 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ulx3s-rescue_Crystal_GND23
+# ftdi_FT231XS
 #
-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
+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
- Crystal*
+ SSOP*
 $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
+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
 #
-# ulx3s-rescue_Crystal_GND24
+# hdmi-d_HDMI-D
 #
-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
+DEF hdmi-d_HDMI-D P 0 40 Y N 1 F N
+F0 "P" 0 1050 50 H V C CNN
+F1 "hdmi-d_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
- Crystal*
+ hdmi-d
 $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
+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
 #
-# ulx3s-rescue_D
+# jack_trs_6pins_JACK_TRS_6PINS
 #
-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
+DEF jack_trs_6pins_JACK_TRS_6PINS J 0 30 Y Y 1 F N
+F0 "J" 0 400 50 H V C CNN
+F1 "jack_trs_6pins_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
 #
-# ulx3s-rescue_D_Schottky
+# lfe5bg381_LFE5U-85F-6BG381C
 #
-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
+DEF lfe5bg381_LFE5U-85F-6BG381C U 0 40 Y Y 10 L N
+F0 "U" 0 950 60 H V C CNN
+F1 "lfe5bg381_LFE5U-85F-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
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
+ BGA381
 $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
+T 0 0 -1050 60 0 2 0 BANK1 Normal 0 C C
+T 0 0 -1050 60 0 3 0 BANK2 Normal 0 C C
+T 0 0 -1050 60 0 4 0 BANK3 Normal 0 C C
+T 0 0 -1050 60 0 5 0 BANK6 Normal 0 C C
+T 0 0 -950 60 0 6 0 BANK7 Normal 0 C C
+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 -1200 60 0 8 0 SERDES 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 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 -1000 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 PT18A A7 -750 200 200 R 50 50 1 1 I
+X PT18B A8 750 200 200 L 50 50 1 1 I
+X GR_PCLK0_1 A9 -750 500 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 PT58A B9 -750 400 200 R 50 50 1 1 I
+X PT58B 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 PT54A C9 -750 -600 200 R 50 50 1 1 I
+X PT56A 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 PT56B E10 750 -500 200 L 50 50 1 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 PT76A A12 -750 -500 200 R 50 50 2 1 I
+X PT76B A13 750 -500 200 L 50 50 2 1 I
+X PT83A A14 -750 -200 200 R 50 50 2 1 I
+X PT103A A15 -750 -900 200 R 50 50 2 1 I
+X PT110A A16 -750 200 200 R 50 50 2 1 I
+X PT116A A17 -750 500 200 R 50 50 2 1 I
+X PT119A A18 -750 600 200 R 50 50 2 1 I
+X PT121A A19 -750 700 200 R 50 50 2 1 I
+X PCLKT1_0 B12 -750 -700 200 R 50 50 2 1 I
+X PT78A B13 -750 -400 200 R 50 50 2 1 I
+X PT105A B15 -750 0 200 R 50 50 2 1 I
+X PT110B B16 750 200 200 L 50 50 2 1 I
+X PT114A B17 -750 400 200 R 50 50 2 1 I
+X PT116B B18 750 500 200 L 50 50 2 1 I
+X PT119B B19 750 600 200 L 50 50 2 1 I
+X PT121B B20 750 700 200 L 50 50 2 1 I
+X PCLKC1_0 C12 750 -700 200 L 50 50 2 1 I
+X PT78B C13 750 -400 200 L 50 50 2 1 I
+X PT83B C14 750 -200 200 L 50 50 2 1 I
+X PT105B C15 750 0 200 L 50 50 2 1 I
+X PT112A C16 -750 300 200 R 50 50 2 1 I
+X PT114B 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 PT80A D13 -750 -300 200 R 50 50 2 1 I
+X PT85A D14 -750 -100 200 R 50 50 2 1 I
+X PT107A D15 -750 100 200 R 50 50 2 1 I
+X PT112B 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 PT80B E13 750 -300 200 L 50 50 2 1 I
+X PT85B E14 750 -100 200 L 50 50 2 1 I
+X PT107B E15 750 100 200 L 50 50 2 1 I
+X PR11A C18 -750 -800 200 R 50 50 3 1 I
+X PR35A 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 PR35B D19 750 0 200 L 50 50 3 1 I
+X VREF1_2 D20 -750 100 200 R 50 50 3 1 I
+X PR11C E16 -750 -700 200 R 50 50 3 1 I
+X PR14B E17 750 -600 200 L 50 50 3 1 I
+X PR14C E18 -750 -500 200 R 50 50 3 1 I
+X PR35D E19 750 100 200 L 50 50 3 1 I
+X PR38A 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 PR38B F19 750 200 200 L 50 50 3 1 I
+X PR38C 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 PR38D 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 PR41B 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 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 PR29A K16 -750 -900 200 R 50 50 3 1 I
+X PR29B K17 750 -900 200 L 50 50 3 1 I
+X PR41D K18 750 500 200 L 50 50 3 1 I
+X PCLKC2_1 K19 750 600 200 L 50 50 3 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 PR50B 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 PR53B M17 750 -400 200 L 50 50 4 1 I
+X PR50D 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 PR53A N16 -750 -400 200 R 50 50 4 1 I
+X PR56A N17 -750 -200 200 R 50 50 4 1 I
+X PR53C N18 -750 -300 200 R 50 50 4 1 I
+X PR83A N19 -750 0 200 R 50 50 4 1 I
+X PR83B N20 750 0 200 L 50 50 4 1 I
+X VREF1_3 P16 750 -200 200 L 50 50 4 1 I
+X PR53D P17 750 -300 200 L 50 50 4 1 I
+X PR83D P18 750 100 200 L 50 50 4 1 I
+X PR83C P19 -750 100 200 R 50 50 4 1 I
+X PR86A P20 -750 200 200 R 50 50 4 1 I
+X PR56C R16 -750 -100 200 R 50 50 4 1 I
+X PR56D R17 750 -100 200 L 50 50 4 1 I
+X PR89B R18 750 400 200 L 50 50 4 1 I
+X PR86B R20 750 200 200 L 50 50 4 1 I
+X PR77A T16 -750 -900 200 R 50 50 4 1 I
+X GPLL0C_IN T17 750 700 200 L 50 50 4 1 I
+X PR89D T18 750 500 200 L 50 50 4 1 I
+X PR89A T19 -750 400 200 R 50 50 4 1 I
+X PR86C T20 -750 300 200 R 50 50 4 1 I
+X GPLL0T_IN U16 -750 700 200 R 50 50 4 1 I
+X PR92B U17 750 600 200 L 50 50 4 1 I
+X PR92A U18 -750 600 200 R 50 50 4 1 I
+X PR89C U19 -750 500 200 R 50 50 4 1 I
+X PR86D 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 PL53C H1 -750 300 200 R 50 50 5 1 I
+X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
+X PL53B 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 PL50B J5 750 400 200 L 50 50 5 1 I
+X PL53D K1 750 300 200 L 50 50 5 1 I
+X PL53A K2 -750 200 200 R 50 50 5 1 I
+X PL50D K3 750 500 200 L 50 50 5 1 I
+X PL56A 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 PL86D L2 750 -300 200 L 50 50 5 1 I
+X PL86C L3 -750 -300 200 R 50 50 5 1 I
+X PL56C L4 -750 100 200 R 50 50 5 1 I
+X PL56D L5 750 100 200 L 50 50 5 1 I
+X PL89B M1 750 -600 200 L 50 50 5 1 I
+X PL86B M3 750 -400 200 L 50 50 5 1 I
+X PL83A M4 -750 -200 200 R 50 50 5 1 I
+X PL77A M5 -750 -900 200 R 50 50 5 1 I
+X PL89D N1 750 -500 200 L 50 50 5 1 I
+X PL65A N2 -750 -600 200 R 50 50 5 1 I
+X PL86A N3 -750 -400 200 R 50 50 5 1 I
+X PL83C N4 -750 -100 200 R 50 50 5 1 I
+X PL83B N5 750 -200 200 L 50 50 5 1 I
+X PL92A P1 -750 -800 200 R 50 50 5 1 I
+X PL92B 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 PL83D P5 750 -100 200 L 50 50 5 1 I
+X PL35A A2 -750 -200 200 R 50 50 6 1 I
+X PL14C A3 -750 500 200 R 50 50 6 1 I
+X PL11A A4 -750 600 200 R 50 50 6 1 I
+X PL11B A5 750 600 200 L 50 50 6 1 I
+X PL35B 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 PL38A C1 -750 -400 200 R 50 50 6 1 I
+X PL35D 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 PL38B D1 750 -400 200 L 50 50 6 1 I
+X PL38C 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 PL38D 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 PL41B G5 750 -600 200 L 50 50 6 1 I
+X PL41D 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
+X D7 R1 -750 700 200 R 50 50 7 1 I
+X CSSPIN R2 -750 200 200 R 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 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 T7 -850 350 200 R 50 50 8 1 I
+X GND T8 -850 250 200 R 50 50 8 1 I
+X GND T9 850 250 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 V11 850 50 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 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 Y15 850 -750 200 L 50 50 8 1 I
+X GND Y16 -850 -950 200 R 50 50 8 1 I
+X GND Y17 850 -950 200 L 50 50 8 1 I
+X GND Y19 -850 -550 200 R 50 50 8 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 GND V15 3250 -700 200 U 50 50 9 1 I
+X GND V16 3450 -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
+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
 #
-# ulx3s-rescue_D_Schottky_Small
+# max1112x_MAX1112x
 #
-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
+DEF max1112x_MAX1112x U 0 40 Y Y 1 F N
+F0 "U" -50 900 50 H V L CNN
+F1 "max1112x_MAX1112x" -200 800 50 H V L CNN
+F2 "" 0 50 50 H V C CNN
+F3 "" 0 50 50 H V C CNN
 $FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
+ TQFN28
+ QFN28
 $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
+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
 #
-# ulx3s-rescue_D_Zener_Small_ALT
+# micro_sd_card_cd_Micro_SD_Card_CD
 #
-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
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+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
-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
+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
 #
-# ulx3s-rescue_Jumper_NC_Small
+# mt48lc16m16a2tg_MT48LC16M16A2TG
 #
-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
+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
-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
+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
 #
-# ulx3s-rescue_L
+# power_+1V1
 #
-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
+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
-$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
+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
 #
-# ulx3s-rescue_LED_ALT
+# power_+2V5
 #
-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
+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
-$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
-#
-# ulx3s-rescue_MB85RS16
-#
-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 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
+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
 #
-# ulx3s-rescue_PCF8563
+# power_+3V3
 #
-DEF ulx3s-rescue_PCF8563 U 0 40 Y Y 1 F N
-F0 "U" -300 350 50 H V L CNN
-F1 "ulx3s-rescue_PCF8563" 100 350 50 H V L CNN
+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
-$FPLIST
- DIP*
- PDIP*
- SOIC*
- SO*
- TSSOP*
-$ENDFPLIST
+ALIAS +3.3V
 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
+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
 #
-# ulx3s-rescue_Q_NMOS_GSD
+# power_+5V
 #
-DEF ulx3s-rescue_Q_NMOS_GSD Q 0 0 Y N 1 F N
-F0 "Q" 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
+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
-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
+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
 #
-# ulx3s-rescue_Q_PNP_BEC
+# power_GND
 #
-DEF ulx3s-rescue_Q_PNP_BEC Q 0 0 Y N 1 F N
-F0 "Q" 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
+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
-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
+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
 #
-# ulx3s-rescue_R
+# ssd_13xx_SSD_13xx
 #
-DEF ulx3s-rescue_R R 0 0 N Y 1 F N
-F0 "R" 80 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
+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
- R_*
- R_*
+ Pin_Header_Straight_1X07
+ Pin_Header_Angled_1X07
+ Socket_Strip_Straight_1X07
+ Socket_Strip_Angled_1X07
 $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
+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
 #
diff --git a/usb.bak b/usb.bak
index c7b35fa..43973f3 100644
--- a/usb.bak
+++ b/usb.bak
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ulx3s-rescue:D_Schottky_Small D8
+L Device:D_Schottky_Small D8
 U 1 1 58D6C83A
 P 2300 1700
 F 0 "D8" H 2350 1650 50  0000 L CNN
@@ -40,7 +40,7 @@ F 3 "" H 3050 1700 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky_Small D9
+L Device:D_Schottky_Small D9
 U 1 1 58D6C83C
 P 2600 2650
 F 0 "D9" H 2450 2700 50  0000 L CNN
@@ -271,7 +271,7 @@ nRESET
 Wire Wire Line
 	4850 3400 4950 3400
 $Comp
-L ulx3s-rescue:R R9
+L Device:R R9
 U 1 1 58EB9CB5
 P 4700 3600
 AR Path="/58EB9CB5" Ref="R9"  Part="1" 
@@ -358,7 +358,7 @@ 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 ulx3s-rescue:R R40
+L Device:R R40
 U 1 1 591C69FB
 P 2250 4850
 AR Path="/591C69FB" Ref="R40"  Part="1" 
@@ -422,7 +422,7 @@ Wire Wire Line
 Wire Wire Line
 	8700 4900 9150 4900
 $Comp
-L ulx3s-rescue:R R49
+L Device:R R49
 U 1 1 59274246
 P 2300 1800
 AR Path="/59274246" Ref="R49"  Part="1" 
@@ -436,7 +436,7 @@ F 4 "AC0603JR-0727RL" V 2300 1800 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R50
+L Device:R R50
 U 1 1 592743C8
 P 2300 1900
 AR Path="/592743C8" Ref="R50"  Part="1" 
@@ -460,7 +460,7 @@ FTD+
 Text Notes 2850 3250 0    60   ~ 0
 USB_FPGA connected to\nBANK1 on "gpdi" sheet and\nBANK2 on "ram" sheet
 $Comp
-L ulx3s-rescue:R R52
+L Device:R R52
 U 1 1 59C0F7B0
 P 2250 2750
 AR Path="/59C0F7B0" Ref="R52"  Part="1" 
@@ -474,7 +474,7 @@ F 4 "AC0603JR-0727RL" V 2250 2750 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R53
+L Device:R R53
 U 1 1 59C0F7B6
 P 2250 2850
 AR Path="/59C0F7B6" Ref="R53"  Part="1" 
@@ -496,7 +496,7 @@ FPD-
 Text Label 1850 2850 0    60   ~ 0
 FPD+
 $Comp
-L ulx3s-rescue:D_Zener_Small_ALT D20
+L Device:D_Zener_Small_ALT D20
 U 1 1 59C133D8
 P 2600 3000
 F 0 "D20" H 2800 2900 50  0000 C CNN
@@ -511,7 +511,7 @@ F 7 "821-BZT52C3V6S" H 2600 3000 60  0001 C CNN "Distributor1_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Zener_Small_ALT D21
+L Device:D_Zener_Small_ALT D21
 U 1 1 59C134C9
 P 2700 3000
 F 0 "D21" H 2900 3100 50  0000 C CNN
@@ -570,7 +570,7 @@ ANT_433MHz
 Text Notes 650  4100 0    60   ~ 0
 D8,D9: Schottky 2A/30V \nLow drop Vfmax=0.375V
 $Comp
-L ulx3s-rescue:R R54
+L Device:R R54
 U 1 1 59D562D0
 P 2250 5450
 AR Path="/59D562D0" Ref="R54"  Part="1" 
@@ -588,7 +588,7 @@ D- 1.5k pullp for \nlow speed device\nmode USB1.0
 Text GLabel 8650 2350 0    60   Input ~ 0
 FTDI_TXDEN
 $Comp
-L ulx3s-rescue:R R56
+L Device:R R56
 U 1 1 59DFFFBE
 P 6450 4250
 AR Path="/59DFFFBE" Ref="R56"  Part="1" 
@@ -649,7 +649,7 @@ F 6 "842-LFE5U85F6BG381C" H 8600 3950 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Crystal_GND24 Y1
+L Device:Crystal_GND24 Y1
 U 1 1 5A079883
 P 5450 1450
 F 0 "Y1" H 5575 1650 50  0000 L CNN
@@ -719,7 +719,7 @@ USB_FPGA_PULL_D+
 Text GLabel 1600 5250 0    60   Input ~ 0
 USB_FPGA_PULL_D-
 $Comp
-L ulx3s-rescue:R R63
+L Device:R R63
 U 1 1 5A71E38F
 P 2250 4650
 AR Path="/5A71E38F" Ref="R63"  Part="1" 
@@ -733,7 +733,7 @@ F 4 "AC0603FR-1015KL" V 2250 4650 50  0001 C CNN "MFG_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R64
+L Device:R R64
 U 1 1 5A71E566
 P 2250 5250
 AR Path="/5A71E566" Ref="R64"  Part="1" 
@@ -753,7 +753,7 @@ Wire Wire Line
 Text Notes 650  4450 0    60   ~ 0
 USB pull lines connected to\nBANK0 on "gpio" sheet
 $Comp
-L ulx3s-rescue:D_Schottky D23
+L Device:D_Schottky D23
 U 1 1 5A720D44
 P 1950 4650
 F 0 "D23" H 1650 4750 50  0000 C CNN
@@ -826,7 +826,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 5250 1800 5250
 $Comp
-L ulx3s-rescue:D_Schottky D25
+L Device:D_Schottky D25
 U 1 1 5AF760EE
 P 1950 5250
 F 0 "D25" H 1650 5350 50  0000 C CNN
@@ -841,7 +841,7 @@ F 7 "621-BAT54WSQ-7-F" H 1950 5250 50  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky D24
+L Device:D_Schottky D24
 U 1 1 5AF79ABE
 P 1950 4850
 F 0 "D24" H 2250 4950 50  0000 C CNN
@@ -856,7 +856,7 @@ F 7 "621-BAT54WSQ-7-F" H 1950 4850 50  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky D26
+L Device:D_Schottky D26
 U 1 1 5AF7B2B2
 P 1950 5450
 F 0 "D26" H 2250 5550 50  0000 C CNN
diff --git a/usb.sch b/usb.sch
index c7b35fa..43973f3 100644
--- a/usb.sch
+++ b/usb.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ulx3s-rescue:D_Schottky_Small D8
+L Device:D_Schottky_Small D8
 U 1 1 58D6C83A
 P 2300 1700
 F 0 "D8" H 2350 1650 50  0000 L CNN
@@ -40,7 +40,7 @@ F 3 "" H 3050 1700 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky_Small D9
+L Device:D_Schottky_Small D9
 U 1 1 58D6C83C
 P 2600 2650
 F 0 "D9" H 2450 2700 50  0000 L CNN
@@ -271,7 +271,7 @@ nRESET
 Wire Wire Line
 	4850 3400 4950 3400
 $Comp
-L ulx3s-rescue:R R9
+L Device:R R9
 U 1 1 58EB9CB5
 P 4700 3600
 AR Path="/58EB9CB5" Ref="R9"  Part="1" 
@@ -358,7 +358,7 @@ 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 ulx3s-rescue:R R40
+L Device:R R40
 U 1 1 591C69FB
 P 2250 4850
 AR Path="/591C69FB" Ref="R40"  Part="1" 
@@ -422,7 +422,7 @@ Wire Wire Line
 Wire Wire Line
 	8700 4900 9150 4900
 $Comp
-L ulx3s-rescue:R R49
+L Device:R R49
 U 1 1 59274246
 P 2300 1800
 AR Path="/59274246" Ref="R49"  Part="1" 
@@ -436,7 +436,7 @@ F 4 "AC0603JR-0727RL" V 2300 1800 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R50
+L Device:R R50
 U 1 1 592743C8
 P 2300 1900
 AR Path="/592743C8" Ref="R50"  Part="1" 
@@ -460,7 +460,7 @@ FTD+
 Text Notes 2850 3250 0    60   ~ 0
 USB_FPGA connected to\nBANK1 on "gpdi" sheet and\nBANK2 on "ram" sheet
 $Comp
-L ulx3s-rescue:R R52
+L Device:R R52
 U 1 1 59C0F7B0
 P 2250 2750
 AR Path="/59C0F7B0" Ref="R52"  Part="1" 
@@ -474,7 +474,7 @@ F 4 "AC0603JR-0727RL" V 2250 2750 50  0001 C CNN "MFG_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R53
+L Device:R R53
 U 1 1 59C0F7B6
 P 2250 2850
 AR Path="/59C0F7B6" Ref="R53"  Part="1" 
@@ -496,7 +496,7 @@ FPD-
 Text Label 1850 2850 0    60   ~ 0
 FPD+
 $Comp
-L ulx3s-rescue:D_Zener_Small_ALT D20
+L Device:D_Zener_Small_ALT D20
 U 1 1 59C133D8
 P 2600 3000
 F 0 "D20" H 2800 2900 50  0000 C CNN
@@ -511,7 +511,7 @@ F 7 "821-BZT52C3V6S" H 2600 3000 60  0001 C CNN "Distributor1_PN"
 	0    1    1    0   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Zener_Small_ALT D21
+L Device:D_Zener_Small_ALT D21
 U 1 1 59C134C9
 P 2700 3000
 F 0 "D21" H 2900 3100 50  0000 C CNN
@@ -570,7 +570,7 @@ ANT_433MHz
 Text Notes 650  4100 0    60   ~ 0
 D8,D9: Schottky 2A/30V \nLow drop Vfmax=0.375V
 $Comp
-L ulx3s-rescue:R R54
+L Device:R R54
 U 1 1 59D562D0
 P 2250 5450
 AR Path="/59D562D0" Ref="R54"  Part="1" 
@@ -588,7 +588,7 @@ D- 1.5k pullp for \nlow speed device\nmode USB1.0
 Text GLabel 8650 2350 0    60   Input ~ 0
 FTDI_TXDEN
 $Comp
-L ulx3s-rescue:R R56
+L Device:R R56
 U 1 1 59DFFFBE
 P 6450 4250
 AR Path="/59DFFFBE" Ref="R56"  Part="1" 
@@ -649,7 +649,7 @@ F 6 "842-LFE5U85F6BG381C" H 8600 3950 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:Crystal_GND24 Y1
+L Device:Crystal_GND24 Y1
 U 1 1 5A079883
 P 5450 1450
 F 0 "Y1" H 5575 1650 50  0000 L CNN
@@ -719,7 +719,7 @@ USB_FPGA_PULL_D+
 Text GLabel 1600 5250 0    60   Input ~ 0
 USB_FPGA_PULL_D-
 $Comp
-L ulx3s-rescue:R R63
+L Device:R R63
 U 1 1 5A71E38F
 P 2250 4650
 AR Path="/5A71E38F" Ref="R63"  Part="1" 
@@ -733,7 +733,7 @@ F 4 "AC0603FR-1015KL" V 2250 4650 50  0001 C CNN "MFG_PN"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L ulx3s-rescue:R R64
+L Device:R R64
 U 1 1 5A71E566
 P 2250 5250
 AR Path="/5A71E566" Ref="R64"  Part="1" 
@@ -753,7 +753,7 @@ Wire Wire Line
 Text Notes 650  4450 0    60   ~ 0
 USB pull lines connected to\nBANK0 on "gpio" sheet
 $Comp
-L ulx3s-rescue:D_Schottky D23
+L Device:D_Schottky D23
 U 1 1 5A720D44
 P 1950 4650
 F 0 "D23" H 1650 4750 50  0000 C CNN
@@ -826,7 +826,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 5250 1800 5250
 $Comp
-L ulx3s-rescue:D_Schottky D25
+L Device:D_Schottky D25
 U 1 1 5AF760EE
 P 1950 5250
 F 0 "D25" H 1650 5350 50  0000 C CNN
@@ -841,7 +841,7 @@ F 7 "621-BAT54WSQ-7-F" H 1950 5250 50  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky D24
+L Device:D_Schottky D24
 U 1 1 5AF79ABE
 P 1950 4850
 F 0 "D24" H 2250 4950 50  0000 C CNN
@@ -856,7 +856,7 @@ F 7 "621-BAT54WSQ-7-F" H 1950 4850 50  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L ulx3s-rescue:D_Schottky D26
+L Device:D_Schottky D26
 U 1 1 5AF7B2B2
 P 1950 5450
 F 0 "D26" H 2250 5550 50  0000 C CNN
diff --git a/wifi.bak b/wifi.bak
index 53ece09..458bb9c 100644
--- a/wifi.bak
+++ b/wifi.bak
@@ -92,7 +92,7 @@ F 3 "" H 4550 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R34
+L Device:R R34
 U 1 1 58ED6C6D
 P 4550 2350
 F 0 "R34" V 4630 2350 50  0000 C CNN
@@ -136,7 +136,7 @@ $EndComp
 Text Notes 8500 3300 0    60   ~ 0
 Programming pins:\nTXD RXD EN GPIO0
 $Comp
-L ulx3s-rescue:R R35
+L Device:R R35
 U 1 1 58FD4C5D
 P 4550 2750
 F 0 "R35" V 4630 2750 50  0000 C CNN
@@ -148,7 +148,7 @@ F 4 "RC0603FR-07470RL" V 4550 2750 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C21
+L Device:C C21
 U 1 1 5924A09B
 P 3650 3100
 F 0 "C21" H 3675 3200 50  0000 L CNN
diff --git a/wifi.sch b/wifi.sch
index 53ece09..458bb9c 100644
--- a/wifi.sch
+++ b/wifi.sch
@@ -92,7 +92,7 @@ F 3 "" H 4550 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:R R34
+L Device:R R34
 U 1 1 58ED6C6D
 P 4550 2350
 F 0 "R34" V 4630 2350 50  0000 C CNN
@@ -136,7 +136,7 @@ $EndComp
 Text Notes 8500 3300 0    60   ~ 0
 Programming pins:\nTXD RXD EN GPIO0
 $Comp
-L ulx3s-rescue:R R35
+L Device:R R35
 U 1 1 58FD4C5D
 P 4550 2750
 F 0 "R35" V 4630 2750 50  0000 C CNN
@@ -148,7 +148,7 @@ F 4 "RC0603FR-07470RL" V 4550 2750 50  0001 C CNN "MFG_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L ulx3s-rescue:C C21
+L Device:C C21
 U 1 1 5924A09B
 P 3650 3100
 F 0 "C21" H 3675 3200 50  0000 L CNN