summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-12-29 00:01:23 -0300
committerGenerated from internal repo <nobody@neo900.org>2016-12-29 00:01:23 -0300
commitf24b65a03b230c87c94af74c2b894dd5c8606c9a (patch)
tree5ff3a66069db063a1fae40a1001bb48d336ee5a3
parentd8446b18e3ae1675572575606d362860663773e7 (diff)
downloadee-f24b65a03b230c87c94af74c2b894dd5c8606c9a.tar.gz
ee-f24b65a03b230c87c94af74c2b894dd5c8606c9a.tar.bz2
ee-f24b65a03b230c87c94af74c2b894dd5c8606c9a.zip
hw/: let cvpcb fix incomplete footprint associations
-rw-r--r--hw/ants.sch102
-rw-r--r--hw/b2b.sch94
-rw-r--r--hw/battery.sch92
-rw-r--r--hw/bbcam.sch4
-rw-r--r--hw/bbcpu.sch64
-rw-r--r--hw/bbdisp.sch24
-rw-r--r--hw/bob.sch92
-rw-r--r--hw/cams.sch36
-rw-r--r--hw/charger.sch112
-rw-r--r--hw/codec.sch100
-rw-r--r--hw/display.sch172
-rw-r--r--hw/hb.sch54
-rw-r--r--hw/ir.sch36
-rw-r--r--hw/jack.sch98
-rw-r--r--hw/keys.sch36
-rw-r--r--hw/leds.sch58
-rw-r--r--hw/misc.sch38
-rw-r--r--hw/modem.sch86
-rw-r--r--hw/modempwr.sch122
-rw-r--r--hw/nfc.sch128
-rw-r--r--hw/sensors.sch66
-rw-r--r--hw/sims.sch144
-rw-r--r--hw/v2.sch32
-rw-r--r--hw/wlan.sch108
24 files changed, 949 insertions, 949 deletions
diff --git a/hw/ants.sch b/hw/ants.sch
index 146ed60..0cb4772 100644
--- a/hw/ants.sch
+++ b/hw/ants.sch
@@ -266,10 +266,10 @@ F 3 "" H 6900 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$705
+L GND #U$0125
U 1 1 578BABEC
P 3600 6000
-F 0 "#U$705" H 3510 5900 70 0001 L BNN
+F 0 "#U$0125" H 3510 5900 70 0001 L BNN
F 1 "GND" H 3510 5900 70 0001 L BNN
F 2 "" H 3600 6000 60 0001 C CNN
F 3 "" H 3600 6000 60 0001 C CNN
@@ -277,10 +277,10 @@ F 3 "" H 3600 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$704
+L GND #U$0126
U 1 1 578BAC50
P 2800 6000
-F 0 "#U$704" H 2710 5900 70 0001 L BNN
+F 0 "#U$0126" H 2710 5900 70 0001 L BNN
F 1 "GND" H 2710 5900 70 0001 L BNN
F 2 "" H 2800 6000 60 0001 C CNN
F 3 "" H 2800 6000 60 0001 C CNN
@@ -288,10 +288,10 @@ F 3 "" H 2800 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$702
+L GND #U$0127
U 1 1 578BACB4
P 1900 6050
-F 0 "#U$702" H 1810 5950 70 0001 L BNN
+F 0 "#U$0127" H 1810 5950 70 0001 L BNN
F 1 "GND" H 1810 5950 70 0001 L BNN
F 2 "" H 1900 6050 60 0001 C CNN
F 3 "" H 1900 6050 60 0001 C CNN
@@ -299,10 +299,10 @@ F 3 "" H 1900 6050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$701
+L GND #U$0128
U 1 1 578BAF0C
P 1800 2750
-F 0 "#U$701" H 1710 2650 70 0001 L BNN
+F 0 "#U$0128" H 1710 2650 70 0001 L BNN
F 1 "GND" H 1710 2650 70 0001 L BNN
F 2 "" H 1800 2750 60 0001 C CNN
F 3 "" H 1800 2750 60 0001 C CNN
@@ -310,10 +310,10 @@ F 3 "" H 1800 2750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$703
+L GND #U$0129
U 1 1 578BAF70
P 2000 3850
-F 0 "#U$703" H 1910 3750 70 0001 L BNN
+F 0 "#U$0129" H 1910 3750 70 0001 L BNN
F 1 "GND" H 1910 3750 70 0001 L BNN
F 2 "" H 2000 3850 60 0001 C CNN
F 3 "" H 2000 3850 60 0001 C CNN
@@ -321,10 +321,10 @@ F 3 "" H 2000 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$715
+L GND #U$0130
U 1 1 578BB038
P 9300 3750
-F 0 "#U$715" H 9210 3650 70 0001 L BNN
+F 0 "#U$0130" H 9210 3650 70 0001 L BNN
F 1 "GND" H 9210 3650 70 0001 L BNN
F 2 "" H 9300 3750 60 0001 C CNN
F 3 "" H 9300 3750 60 0001 C CNN
@@ -332,10 +332,10 @@ F 3 "" H 9300 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$710
+L GND #U$0131
U 1 1 578BB484
P 6200 3750
-F 0 "#U$710" H 6110 3650 70 0001 L BNN
+F 0 "#U$0131" H 6110 3650 70 0001 L BNN
F 1 "GND" H 6110 3650 70 0001 L BNN
F 2 "" H 6200 3750 60 0001 C CNN
F 3 "" H 6200 3750 60 0001 C CNN
@@ -343,10 +343,10 @@ F 3 "" H 6200 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$718
+L GND #U$0132
U 1 1 578BB4E8
P 9700 3750
-F 0 "#U$718" H 9610 3650 70 0001 L BNN
+F 0 "#U$0132" H 9610 3650 70 0001 L BNN
F 1 "GND" H 9610 3650 70 0001 L BNN
F 2 "" H 9700 3750 60 0001 C CNN
F 3 "" H 9700 3750 60 0001 C CNN
@@ -354,10 +354,10 @@ F 3 "" H 9700 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$708
+L GND #U$0133
U 1 1 578BB5B0
P 5100 5900
-F 0 "#U$708" H 5010 5800 70 0001 L BNN
+F 0 "#U$0133" H 5010 5800 70 0001 L BNN
F 1 "GND" H 5010 5800 70 0001 L BNN
F 2 "" H 5100 5900 60 0001 C CNN
F 3 "" H 5100 5900 60 0001 C CNN
@@ -365,10 +365,10 @@ F 3 "" H 5100 5900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$709
+L GND #U$0134
U 1 1 578BB614
P 5600 6500
-F 0 "#U$709" H 5510 6400 70 0001 L BNN
+F 0 "#U$0134" H 5510 6400 70 0001 L BNN
F 1 "GND" H 5510 6400 70 0001 L BNN
F 2 "" H 5600 6500 60 0001 C CNN
F 3 "" H 5600 6500 60 0001 C CNN
@@ -376,10 +376,10 @@ F 3 "" H 5600 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$707
+L GND #U$0135
U 1 1 578BB678
P 4700 7850
-F 0 "#U$707" H 4610 7750 70 0001 L BNN
+F 0 "#U$0135" H 4610 7750 70 0001 L BNN
F 1 "GND" H 4610 7750 70 0001 L BNN
F 2 "" H 4700 7850 60 0001 C CNN
F 3 "" H 4700 7850 60 0001 C CNN
@@ -387,10 +387,10 @@ F 3 "" H 4700 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$713
+L GND #U$0136
U 1 1 578BB7A4
P 7200 7850
-F 0 "#U$713" H 7110 7750 70 0001 L BNN
+F 0 "#U$0136" H 7110 7750 70 0001 L BNN
F 1 "GND" H 7110 7750 70 0001 L BNN
F 2 "" H 7200 7850 60 0001 C CNN
F 3 "" H 7200 7850 60 0001 C CNN
@@ -398,10 +398,10 @@ F 3 "" H 7200 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$714
+L GND #U$0137
U 1 1 578BB808
P 7450 7000
-F 0 "#U$714" H 7360 6900 70 0001 L BNN
+F 0 "#U$0137" H 7360 6900 70 0001 L BNN
F 1 "GND" H 7360 6900 70 0001 L BNN
F 2 "" H 7450 7000 60 0001 C CNN
F 3 "" H 7450 7000 60 0001 C CNN
@@ -409,10 +409,10 @@ F 3 "" H 7450 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$712
+L GND #U$0138
U 1 1 578BB86C
P 7100 7000
-F 0 "#U$712" H 7010 6900 70 0001 L BNN
+F 0 "#U$0138" H 7010 6900 70 0001 L BNN
F 1 "GND" H 7010 6900 70 0001 L BNN
F 2 "" H 7100 7000 60 0001 C CNN
F 3 "" H 7100 7000 60 0001 C CNN
@@ -420,10 +420,10 @@ F 3 "" H 7100 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$711
+L GND #U$0139
U 1 1 578BB8D0
P 6400 8350
-F 0 "#U$711" H 6310 8250 70 0001 L BNN
+F 0 "#U$0139" H 6310 8250 70 0001 L BNN
F 1 "GND" H 6310 8250 70 0001 L BNN
F 2 "" H 6400 8350 60 0001 C CNN
F 3 "" H 6400 8350 60 0001 C CNN
@@ -538,10 +538,10 @@ F 3 "" H 3300 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$706
+L GND #U$0140
U 1 1 57E5D83B
P 4100 3400
-F 0 "#U$706" H 4010 3300 70 0001 L BNN
+F 0 "#U$0140" H 4010 3300 70 0001 L BNN
F 1 "GND" H 4010 3300 70 0001 L BNN
F 2 "" H 4100 3400 60 0001 C CNN
F 3 "" H 4100 3400 60 0001 C CNN
@@ -567,7 +567,7 @@ U 1 1 57E5B979
P 5000 5300
F 0 "U702" H 4600 5550 50 0000 L CNN
F 1 "CPL-WBF-00D3" H 5000 5450 50 0000 C CNN
-F 2 "SOT23-6" H 5030 5450 20 0001 C CNN
+F 2 "neo900-legacy:SOT23-6" H 5030 5450 20 0001 C CNN
F 3 "" H 5000 5300 60 0001 C CNN
1 5000 5300
1 0 0 -1
@@ -599,10 +599,10 @@ F 3 "" H 11600 7800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$720
+L GND #U$0141
U 1 1 57E5A29A
P 11600 8200
-F 0 "#U$720" H 11510 8100 70 0001 L BNN
+F 0 "#U$0141" H 11510 8100 70 0001 L BNN
F 1 "GND" H 11510 8100 70 0001 L BNN
F 2 "" H 11600 8200 60 0001 C CNN
F 3 "" H 11600 8200 60 0001 C CNN
@@ -612,10 +612,10 @@ $EndComp
Text GLabel 11400 6950 0 60 Input ~ 0
1V8
$Comp
-L GND #U$722
+L GND #U$0142
U 1 1 57E5AE66
P 13200 8200
-F 0 "#U$722" H 13110 8100 70 0001 L BNN
+F 0 "#U$0142" H 13110 8100 70 0001 L BNN
F 1 "GND" H 13110 8100 70 0001 L BNN
F 2 "" H 13200 8200 60 0001 C CNN
F 3 "" H 13200 8200 60 0001 C CNN
@@ -660,10 +660,10 @@ F 3 "" H 11900 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$719
+L GND #U$0143
U 1 1 57E8AEF6
P 11300 2800
-F 0 "#U$719" H 11210 2700 70 0001 L BNN
+F 0 "#U$0143" H 11210 2700 70 0001 L BNN
F 1 "GND" H 11210 2700 70 0001 L BNN
F 2 "" H 11300 2800 60 0001 C CNN
F 3 "" H 11300 2800 60 0001 C CNN
@@ -671,10 +671,10 @@ F 3 "" H 11300 2800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$721
+L GND #U$0144
U 1 1 57E8B285
P 11900 2800
-F 0 "#U$721" H 11810 2700 70 0001 L BNN
+F 0 "#U$0144" H 11810 2700 70 0001 L BNN
F 1 "GND" H 11810 2700 70 0001 L BNN
F 2 "" H 11900 2800 60 0001 C CNN
F 3 "" H 11900 2800 60 0001 C CNN
@@ -713,10 +713,10 @@ NoConn ~ 11700 7150
NoConn ~ 11700 7050
NoConn ~ 12500 7950
$Comp
-L POWERED #FLG701
+L POWERED #FLG0145
U 1 1 580A096E
P 1800 1850
-F 0 "#FLG701" H 2000 1750 60 0001 C CNN
+F 0 "#FLG0145" H 2000 1750 60 0001 C CNN
F 1 "POWERED" H 1800 1900 60 0000 C CNN
F 2 "" H 1800 1850 60 0001 C CNN
F 3 "" H 1800 1850 60 0001 C CNN
@@ -750,10 +750,10 @@ F 3 "" H 14250 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$723
+L GND #U$0146
U 1 1 58193AB0
P 14250 9850
-F 0 "#U$723" H 14160 9750 70 0001 L BNN
+F 0 "#U$0146" H 14160 9750 70 0001 L BNN
F 1 "GND" H 14160 9750 70 0001 L BNN
F 2 "" H 14250 9850 60 0001 C CNN
F 3 "" H 14250 9850 60 0001 C CNN
@@ -761,10 +761,10 @@ F 3 "" H 14250 9850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$724
+L GND #U$0147
U 1 1 58193B74
P 14600 9850
-F 0 "#U$724" H 14510 9750 70 0001 L BNN
+F 0 "#U$0147" H 14510 9750 70 0001 L BNN
F 1 "GND" H 14510 9750 70 0001 L BNN
F 2 "" H 14600 9850 60 0001 C CNN
F 3 "" H 14600 9850 60 0001 C CNN
@@ -838,10 +838,10 @@ F 3 "" H 9500 7250 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$716
+L GND #U$0148
U 1 1 58195E05
P 9500 7650
-F 0 "#U$716" H 9410 7550 70 0001 L BNN
+F 0 "#U$0148" H 9410 7550 70 0001 L BNN
F 1 "GND" H 9410 7550 70 0001 L BNN
F 2 "" H 9500 7650 60 0001 C CNN
F 3 "" H 9500 7650 60 0001 C CNN
@@ -1233,10 +1233,10 @@ Connection ~ 9500 6200
Wire Wire Line
10000 6700 10000 7050
$Comp
-L GND #U$717
+L GND #U$0149
U 1 1 581B595A
P 9500 9300
-F 0 "#U$717" H 9410 9200 70 0001 L BNN
+F 0 "#U$0149" H 9410 9200 70 0001 L BNN
F 1 "GND" H 9410 9200 70 0001 L BNN
F 2 "" H 9500 9300 60 0001 C CNN
F 3 "" H 9500 9300 60 0001 C CNN
diff --git a/hw/b2b.sch b/hw/b2b.sch
index 7ec4e56..c1117a5 100644
--- a/hw/b2b.sch
+++ b/hw/b2b.sch
@@ -78,10 +78,10 @@ F 3 "" H 7100 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1508
+L GND #U$0278
U 1 1 57F439C6
P 7700 10000
-F 0 "#U$1508" H 7610 9900 70 0001 L BNN
+F 0 "#U$0278" H 7610 9900 70 0001 L BNN
F 1 "GND" H 7610 9900 70 0001 L BNN
F 2 "" H 7700 10000 60 0001 C CNN
F 3 "" H 7700 10000 60 0001 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 7700 10000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1506
+L GND #U$0279
U 1 1 57F439D7
P 6500 10000
-F 0 "#U$1506" H 6410 9900 70 0001 L BNN
+F 0 "#U$0279" H 6410 9900 70 0001 L BNN
F 1 "GND" H 6410 9900 70 0001 L BNN
F 2 "" H 6500 10000 60 0001 C CNN
F 3 "" H 6500 10000 60 0001 C CNN
@@ -108,10 +108,10 @@ VSYS
Text GLabel 6400 6900 0 60 Input ~ 0
VSYS
$Comp
-L GND #U$1504
+L GND #U$0280
U 1 1 57F43F89
P 3400 10000
-F 0 "#U$1504" H 3310 9900 70 0001 L BNN
+F 0 "#U$0280" H 3310 9900 70 0001 L BNN
F 1 "GND" H 3310 9900 70 0001 L BNN
F 2 "" H 3400 10000 60 0001 C CNN
F 3 "" H 3400 10000 60 0001 C CNN
@@ -119,10 +119,10 @@ F 3 "" H 3400 10000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1502
+L GND #U$0281
U 1 1 57F43F9A
P 2200 10000
-F 0 "#U$1502" H 2110 9900 70 0001 L BNN
+F 0 "#U$0281" H 2110 9900 70 0001 L BNN
F 1 "GND" H 2110 9900 70 0001 L BNN
F 2 "" H 2200 10000 60 0001 C CNN
F 3 "" H 2200 10000 60 0001 C CNN
@@ -422,10 +422,10 @@ IOX1_INT
Text GLabel 11250 3950 0 60 Input ~ 0
1V8
$Comp
-L GND #U$1513
+L GND #U$0282
U 1 1 57F469A2
P 11800 4550
-F 0 "#U$1513" H 11710 4450 70 0001 L BNN
+F 0 "#U$0282" H 11710 4450 70 0001 L BNN
F 1 "GND" H 11710 4450 70 0001 L BNN
F 2 "" H 11800 4550 60 0001 C CNN
F 3 "" H 11800 4550 60 0001 C CNN
@@ -438,16 +438,16 @@ U 1 1 57F46BCF
P 11400 4150
F 0 "C1501" H 11440 4190 50 0000 L CNN
F 1 "100n" H 11440 4020 50 0000 L CNN
-F 2 "SMD-0402" H 11430 4300 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11430 4300 20 0001 C CNN
F 3 "" H 11400 4150 60 0001 C CNN
1 11400 4150
1 0 0 -1
$EndComp
$Comp
-L GND #U$1509
+L GND #U$0283
U 1 1 57F46C80
P 11400 4550
-F 0 "#U$1509" H 11310 4450 70 0001 L BNN
+F 0 "#U$0283" H 11310 4450 70 0001 L BNN
F 1 "GND" H 11310 4450 70 0001 L BNN
F 2 "" H 11400 4550 60 0001 C CNN
F 3 "" H 11400 4550 60 0001 C CNN
@@ -463,10 +463,10 @@ IOX2_INT
Text GLabel 11250 6650 0 60 Input ~ 0
1V8
$Comp
-L GND #U$1515
+L GND #U$0284
U 1 1 57F46F2B
P 11800 7250
-F 0 "#U$1515" H 11710 7150 70 0001 L BNN
+F 0 "#U$0284" H 11710 7150 70 0001 L BNN
F 1 "GND" H 11710 7150 70 0001 L BNN
F 2 "" H 11800 7250 60 0001 C CNN
F 3 "" H 11800 7250 60 0001 C CNN
@@ -479,16 +479,16 @@ U 1 1 57F46F38
P 11400 6850
F 0 "C1502" H 11440 6890 50 0000 L CNN
F 1 "100n" H 11440 6720 50 0000 L CNN
-F 2 "SMD-0402" H 11430 7000 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11430 7000 20 0001 C CNN
F 3 "" H 11400 6850 60 0001 C CNN
1 11400 6850
1 0 0 -1
$EndComp
$Comp
-L GND #U$1510
+L GND #U$0285
U 1 1 57F46F3E
P 11400 7250
-F 0 "#U$1510" H 11310 7150 70 0001 L BNN
+F 0 "#U$0285" H 11310 7150 70 0001 L BNN
F 1 "GND" H 11310 7150 70 0001 L BNN
F 2 "" H 11400 7250 60 0001 C CNN
F 3 "" H 11400 7250 60 0001 C CNN
@@ -502,10 +502,10 @@ I2C2_SCL
Text GLabel 11250 9350 0 60 Input ~ 0
1V8
$Comp
-L GND #U$1517
+L GND #U$0286
U 1 1 57F4913B
P 11800 9950
-F 0 "#U$1517" H 11710 9850 70 0001 L BNN
+F 0 "#U$0286" H 11710 9850 70 0001 L BNN
F 1 "GND" H 11710 9850 70 0001 L BNN
F 2 "" H 11800 9950 60 0001 C CNN
F 3 "" H 11800 9950 60 0001 C CNN
@@ -518,16 +518,16 @@ U 1 1 57F49146
P 11400 9550
F 0 "C1503" H 11440 9590 50 0000 L CNN
F 1 "100n" H 11440 9420 50 0000 L CNN
-F 2 "SMD-0402" H 11430 9700 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11430 9700 20 0001 C CNN
F 3 "" H 11400 9550 60 0001 C CNN
1 11400 9550
1 0 0 -1
$EndComp
$Comp
-L GND #U$1511
+L GND #U$0287
U 1 1 57F4914C
P 11400 9950
-F 0 "#U$1511" H 11310 9850 70 0001 L BNN
+F 0 "#U$0287" H 11310 9850 70 0001 L BNN
F 1 "GND" H 11310 9850 70 0001 L BNN
F 2 "" H 11400 9950 60 0001 C CNN
F 3 "" H 11400 9950 60 0001 C CNN
@@ -539,10 +539,10 @@ NoConn ~ 12900 8700
NoConn ~ 12900 8600
NoConn ~ 12900 8500
$Comp
-L GND #U$1512
+L GND #U$0288
U 1 1 57F493AF
P 11800 3250
-F 0 "#U$1512" H 11710 3150 70 0001 L BNN
+F 0 "#U$0288" H 11710 3150 70 0001 L BNN
F 1 "GND" H 11710 3150 70 0001 L BNN
F 2 "" H 11800 3250 60 0001 C CNN
F 3 "" H 11800 3250 60 0001 C CNN
@@ -552,10 +552,10 @@ $EndComp
Text Notes 11650 3050 2 70 ~ 0
"0x40" = 0x20
$Comp
-L GND #U$1514
+L GND #U$0289
U 1 1 57F4992B
P 11800 5950
-F 0 "#U$1514" H 11710 5850 70 0001 L BNN
+F 0 "#U$0289" H 11710 5850 70 0001 L BNN
F 1 "GND" H 11710 5850 70 0001 L BNN
F 2 "" H 11800 5950 60 0001 C CNN
F 3 "" H 11800 5950 60 0001 C CNN
@@ -567,10 +567,10 @@ Text GLabel 11700 5600 0 60 Input ~ 0
Text Notes 11600 5850 2 70 ~ 0
"0x42" = 0x21
$Comp
-L GND #U$1516
+L GND #U$0290
U 1 1 57F49D8E
P 11800 8650
-F 0 "#U$1516" H 11710 8550 70 0001 L BNN
+F 0 "#U$0290" H 11710 8550 70 0001 L BNN
F 1 "GND" H 11710 8550 70 0001 L BNN
F 2 "" H 11800 8650 60 0001 C CNN
F 3 "" H 11800 8650 60 0001 C CNN
@@ -614,8 +614,8 @@ L GND-3 #U$?
U 1 1 57F744B5
P 2200 5300
AR Path="/578AFF1A/57F744B5" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744B5" Ref="#U$1501" Part="1"
-F 0 "#U$1501" H 2080 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744B5" Ref="#U$0291" Part="1"
+F 0 "#U$0291" H 2080 5201 70 0001 L BNN
F 1 "GND3" H 2080 5201 70 0001 L BNN
F 2 "" H 2200 5300 60 0001 C CNN
F 3 "" H 2200 5300 60 0001 C CNN
@@ -627,8 +627,8 @@ L GND-3 #U$?
U 1 1 57F744BB
P 3400 5300
AR Path="/578AFF1A/57F744BB" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744BB" Ref="#U$1503" Part="1"
-F 0 "#U$1503" H 3280 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744BB" Ref="#U$0292" Part="1"
+F 0 "#U$0292" H 3280 5201 70 0001 L BNN
F 1 "GND3" H 3280 5201 70 0001 L BNN
F 2 "" H 3400 5300 60 0001 C CNN
F 3 "" H 3400 5300 60 0001 C CNN
@@ -640,8 +640,8 @@ L GND-3 #U$?
U 1 1 57F744C1
P 6500 5300
AR Path="/578AFF1A/57F744C1" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744C1" Ref="#U$1505" Part="1"
-F 0 "#U$1505" H 6380 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744C1" Ref="#U$0293" Part="1"
+F 0 "#U$0293" H 6380 5201 70 0001 L BNN
F 1 "GND3" H 6380 5201 70 0001 L BNN
F 2 "" H 6500 5300 60 0001 C CNN
F 3 "" H 6500 5300 60 0001 C CNN
@@ -653,8 +653,8 @@ L GND-3 #U$?
U 1 1 57F744C7
P 7700 5300
AR Path="/578AFF1A/57F744C7" Ref="#U$?" Part="1"
-AR Path="/578AFF16/57F744C7" Ref="#U$1507" Part="1"
-F 0 "#U$1507" H 7580 5201 70 0001 L BNN
+AR Path="/578AFF16/57F744C7" Ref="#U$0294" Part="1"
+F 0 "#U$0294" H 7580 5201 70 0001 L BNN
F 1 "GND3" H 7580 5201 70 0001 L BNN
F 2 "" H 7700 5300 60 0001 C CNN
F 3 "" H 7700 5300 60 0001 C CNN
@@ -870,10 +870,10 @@ BATTEMP_COMPANION_U
Text GLabel 3500 4300 2 60 Input ~ 0
FLASH_STROBE_U
$Comp
-L POWERED #FLG1501
+L POWERED #FLG0295
U 1 1 580A5A5C
P 2200 1900
-F 0 "#FLG1501" H 2400 1800 60 0001 C CNN
+F 0 "#FLG0295" H 2400 1800 60 0001 C CNN
F 1 "POWERED" H 2200 1950 60 0000 C CNN
F 2 "" H 2200 1900 60 0001 C CNN
F 3 "" H 2200 1900 60 0001 C CNN
@@ -948,10 +948,10 @@ $EndComp
Text Notes 14850 7200 0 60 ~ 0
100k x 8
$Comp
-L GND #U$1518
+L GND #U$0296
U 1 1 5827C23E
P 14000 7550
-F 0 "#U$1518" H 13910 7450 70 0001 L BNN
+F 0 "#U$0296" H 13910 7450 70 0001 L BNN
F 1 "GND" H 13910 7450 70 0001 L BNN
F 2 "" H 14000 7550 60 0001 C CNN
F 3 "" H 14000 7550 60 0001 C CNN
@@ -959,10 +959,10 @@ F 3 "" H 14000 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1520
+L GND #U$0297
U 1 1 5827C26A
P 14700 7550
-F 0 "#U$1520" H 14610 7450 70 0001 L BNN
+F 0 "#U$0297" H 14610 7450 70 0001 L BNN
F 1 "GND" H 14610 7450 70 0001 L BNN
F 2 "" H 14700 7550 60 0001 C CNN
F 3 "" H 14700 7550 60 0001 C CNN
@@ -1669,10 +1669,10 @@ F 3 "" H 14400 8900 70 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1519
+L GND #U$0298
U 1 1 5827F2E1
P 14000 9400
-F 0 "#U$1519" H 13910 9300 70 0001 L BNN
+F 0 "#U$0298" H 13910 9300 70 0001 L BNN
F 1 "GND" H 13910 9300 70 0001 L BNN
F 2 "" H 14000 9400 60 0001 C CNN
F 3 "" H 14000 9400 60 0001 C CNN
@@ -1680,10 +1680,10 @@ F 3 "" H 14000 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1521
+L GND #U$0299
U 1 1 5827F310
P 14700 9400
-F 0 "#U$1521" H 14610 9300 70 0001 L BNN
+F 0 "#U$0299" H 14610 9300 70 0001 L BNN
F 1 "GND" H 14610 9300 70 0001 L BNN
F 2 "" H 14700 9400 60 0001 C CNN
F 3 "" H 14700 9400 60 0001 C CNN
diff --git a/hw/battery.sch b/hw/battery.sch
index bb36815..6da4c2a 100644
--- a/hw/battery.sch
+++ b/hw/battery.sch
@@ -287,10 +287,10 @@ F 3 "" H 4800 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$301
+L GND #U$029
U 1 1 578B3BD4
P 3750 4000
-F 0 "#U$301" H 3660 3900 70 0001 L BNN
+F 0 "#U$029" H 3660 3900 70 0001 L BNN
F 1 "GND" H 3660 3900 70 0001 L BNN
F 2 "" H 3750 4000 60 0001 C CNN
F 3 "" H 3750 4000 60 0001 C CNN
@@ -298,10 +298,10 @@ F 3 "" H 3750 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$314
+L GND #U$030
U 1 1 578B3C38
P 11500 3700
-F 0 "#U$314" H 11410 3600 70 0001 L BNN
+F 0 "#U$030" H 11410 3600 70 0001 L BNN
F 1 "GND" H 11410 3600 70 0001 L BNN
F 2 "" H 11500 3700 60 0001 C CNN
F 3 "" H 11500 3700 60 0001 C CNN
@@ -309,10 +309,10 @@ F 3 "" H 11500 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$302
+L GND #U$031
U 1 1 578B3C9C
P 4300 5400
-F 0 "#U$302" H 4210 5300 70 0001 L BNN
+F 0 "#U$031" H 4210 5300 70 0001 L BNN
F 1 "GND" H 4210 5300 70 0001 L BNN
F 2 "" H 4300 5400 60 0001 C CNN
F 3 "" H 4300 5400 60 0001 C CNN
@@ -320,10 +320,10 @@ F 3 "" H 4300 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$313
+L GND #U$032
U 1 1 578B3D00
P 10000 4300
-F 0 "#U$313" H 9910 4200 70 0001 L BNN
+F 0 "#U$032" H 9910 4200 70 0001 L BNN
F 1 "GND" H 9910 4200 70 0001 L BNN
F 2 "" H 10000 4300 60 0001 C CNN
F 3 "" H 10000 4300 60 0001 C CNN
@@ -331,10 +331,10 @@ F 3 "" H 10000 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$312
+L GND #U$033
U 1 1 578B3D64
P 9500 4300
-F 0 "#U$312" H 9410 4200 70 0001 L BNN
+F 0 "#U$033" H 9410 4200 70 0001 L BNN
F 1 "GND" H 9410 4200 70 0001 L BNN
F 2 "" H 9500 4300 60 0001 C CNN
F 3 "" H 9500 4300 60 0001 C CNN
@@ -342,10 +342,10 @@ F 3 "" H 9500 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$305
+L GND #U$034
U 1 1 578B3E2C
P 5500 6000
-F 0 "#U$305" H 5410 5900 70 0001 L BNN
+F 0 "#U$034" H 5410 5900 70 0001 L BNN
F 1 "GND" H 5410 5900 70 0001 L BNN
F 2 "" H 5500 6000 60 0001 C CNN
F 3 "" H 5500 6000 60 0001 C CNN
@@ -353,10 +353,10 @@ F 3 "" H 5500 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$310
+L GND #U$035
U 1 1 578B3E90
P 8500 5800
-F 0 "#U$310" H 8410 5700 70 0001 L BNN
+F 0 "#U$035" H 8410 5700 70 0001 L BNN
F 1 "GND" H 8410 5700 70 0001 L BNN
F 2 "" H 8500 5800 60 0001 C CNN
F 3 "" H 8500 5800 60 0001 C CNN
@@ -364,10 +364,10 @@ F 3 "" H 8500 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$311
+L GND #U$036
U 1 1 578B3EF4
P 9150 5800
-F 0 "#U$311" H 9060 5700 70 0001 L BNN
+F 0 "#U$036" H 9060 5700 70 0001 L BNN
F 1 "GND" H 9060 5700 70 0001 L BNN
F 2 "" H 9150 5800 60 0001 C CNN
F 3 "" H 9150 5800 60 0001 C CNN
@@ -375,10 +375,10 @@ F 3 "" H 9150 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$307
+L GND #U$037
U 1 1 578B3F58
P 6700 7800
-F 0 "#U$307" H 6610 7700 70 0001 L BNN
+F 0 "#U$037" H 6610 7700 70 0001 L BNN
F 1 "GND" H 6610 7700 70 0001 L BNN
F 2 "" H 6700 7800 60 0001 C CNN
F 3 "" H 6700 7800 60 0001 C CNN
@@ -386,10 +386,10 @@ F 3 "" H 6700 7800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$309
+L GND #U$038
U 1 1 578B3FBC
P 8400 7750
-F 0 "#U$309" H 8310 7650 70 0001 L BNN
+F 0 "#U$038" H 8310 7650 70 0001 L BNN
F 1 "GND" H 8310 7650 70 0001 L BNN
F 2 "" H 8400 7750 60 0001 C CNN
F 3 "" H 8400 7750 60 0001 C CNN
@@ -439,10 +439,10 @@ I2C3_SDA
Text Label 5850 3200 0 60 ~ 0
BGND
$Comp
-L GND #U$308
+L GND #U$039
U 1 1 57907684
P 7700 4450
-F 0 "#U$308" H 7610 4350 70 0001 L BNN
+F 0 "#U$039" H 7610 4350 70 0001 L BNN
F 1 "GND" H 7610 4350 70 0001 L BNN
F 2 "" H 7700 4450 60 0001 C CNN
F 3 "" H 7700 4450 60 0001 C CNN
@@ -450,10 +450,10 @@ F 3 "" H 7700 4450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG302
+L POWERED #FLG040
U 1 1 57908456
P 6600 5600
-F 0 "#FLG302" H 6800 5500 60 0001 C CNN
+F 0 "#FLG040" H 6800 5500 60 0001 C CNN
F 1 "POWERED" H 6600 5650 60 0000 C CNN
F 2 "" H 6600 5600 60 0001 C CNN
F 3 "" H 6600 5600 60 0001 C CNN
@@ -461,10 +461,10 @@ F 3 "" H 6600 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG301
+L POWERED #FLG041
U 1 1 5790A564
P 5050 2950
-F 0 "#FLG301" H 5250 2850 60 0001 C CNN
+F 0 "#FLG041" H 5250 2850 60 0001 C CNN
F 1 "POWERED" H 5050 3000 60 0000 C CNN
F 2 "" H 5050 2950 60 0001 C CNN
F 3 "" H 5050 2950 60 0001 C CNN
@@ -472,10 +472,10 @@ F 3 "" H 5050 2950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M301
+L GND #M042
U 1 1 5794DFFF
P 8700 8900
-F 0 "#M301" H 8700 8900 45 0001 C CNN
+F 0 "#M042" H 8700 8900 45 0001 C CNN
F 1 "GND" H 8700 8900 45 0001 C CNN
F 2 "" H 8700 8900 60 0001 C CNN
F 3 "" H 8700 8900 60 0001 C CNN
@@ -496,10 +496,10 @@ $EndComp
Text Notes 5300 3550 0 60 ~ 0
DNP
$Comp
-L POWERED #FLG303
+L POWERED #FLG043
U 1 1 5794EF24
P 6850 2900
-F 0 "#FLG303" H 7050 2800 60 0001 C CNN
+F 0 "#FLG043" H 7050 2800 60 0001 C CNN
F 1 "POWERED" H 6850 2950 60 0000 C CNN
F 2 "" H 6850 2900 60 0001 C CNN
F 3 "" H 6850 2900 60 0001 C CNN
@@ -738,10 +738,10 @@ F 3 "" H 11900 3200 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$315
+L GND #U$044
U 1 1 58085954
P 11900 3700
-F 0 "#U$315" H 11810 3600 70 0001 L BNN
+F 0 "#U$044" H 11810 3600 70 0001 L BNN
F 1 "GND" H 11810 3600 70 0001 L BNN
F 2 "" H 11900 3700 60 0001 C CNN
F 3 "" H 11900 3700 60 0001 C CNN
@@ -811,10 +811,10 @@ F 3 "" H 4450 1700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$304
+L GND #U$045
U 1 1 58086B09
P 5100 2300
-F 0 "#U$304" H 5010 2200 70 0001 L BNN
+F 0 "#U$045" H 5010 2200 70 0001 L BNN
F 1 "GND" H 5010 2200 70 0001 L BNN
F 2 "" H 5100 2300 60 0001 C CNN
F 3 "" H 5100 2300 60 0001 C CNN
@@ -822,10 +822,10 @@ F 3 "" H 5100 2300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$306
+L GND #U$046
U 1 1 58086B68
P 5550 2300
-F 0 "#U$306" H 5460 2200 70 0001 L BNN
+F 0 "#U$046" H 5460 2200 70 0001 L BNN
F 1 "GND" H 5460 2200 70 0001 L BNN
F 2 "" H 5550 2300 60 0001 C CNN
F 3 "" H 5550 2300 60 0001 C CNN
@@ -851,10 +851,10 @@ F 3 "" H 4800 1950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$303
+L GND #U$047
U 1 1 58087861
P 4800 2300
-F 0 "#U$303" H 4710 2200 70 0001 L BNN
+F 0 "#U$047" H 4710 2200 70 0001 L BNN
F 1 "GND" H 4710 2200 70 0001 L BNN
F 2 "" H 4800 2300 60 0001 C CNN
F 3 "" H 4800 2300 60 0001 C CNN
@@ -880,10 +880,10 @@ Wire Wire Line
5050 3150 5050 3400
Connection ~ 5050 3400
$Comp
-L POWERED #FLG305
+L POWERED #FLG048
U 1 1 5809DB74
P 8200 4350
-F 0 "#FLG305" H 8400 4250 60 0001 C CNN
+F 0 "#FLG048" H 8400 4250 60 0001 C CNN
F 1 "POWERED" H 8200 4400 60 0000 C CNN
F 2 "" H 8200 4350 60 0001 C CNN
F 3 "" H 8200 4350 60 0001 C CNN
@@ -894,10 +894,10 @@ Wire Wire Line
8200 4550 8200 4700
Connection ~ 8200 4700
$Comp
-L POWERED #FLG304
+L POWERED #FLG049
U 1 1 5809EE68
P 7500 2900
-F 0 "#FLG304" H 7700 2800 60 0001 C CNN
+F 0 "#FLG049" H 7700 2800 60 0001 C CNN
F 1 "POWERED" H 7500 2950 60 0000 C CNN
F 2 "" H 7500 2900 60 0001 C CNN
F 3 "" H 7500 2900 60 0001 C CNN
@@ -961,10 +961,10 @@ F 3 "" H 13300 3500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$316
+L GND #U$050
U 1 1 58120784
P 12900 3300
-F 0 "#U$316" H 12810 3200 70 0001 L BNN
+F 0 "#U$050" H 12810 3200 70 0001 L BNN
F 1 "GND" H 12810 3200 70 0001 L BNN
F 2 "" H 12900 3300 60 0001 C CNN
F 3 "" H 12900 3300 60 0001 C CNN
@@ -990,10 +990,10 @@ F 3 "" H 9100 7700 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #M302
+L GND #M051
U 1 1 583E3B58
P 9100 8100
-F 0 "#M302" H 9100 8100 45 0001 C CNN
+F 0 "#M051" H 9100 8100 45 0001 C CNN
F 1 "GND" H 9100 8100 45 0001 C CNN
F 2 "" H 9100 8100 60 0001 C CNN
F 3 "" H 9100 8100 60 0001 C CNN
diff --git a/hw/bbcam.sch b/hw/bbcam.sch
index 174c101..7baaf84 100644
--- a/hw/bbcam.sch
+++ b/hw/bbcam.sch
@@ -177,10 +177,10 @@ F 3 "" H 10100 4550 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #M2501
+L GND #M0425
U 1 1 580FA6DE
P 10600 6400
-F 0 "#M2501" H 10600 6400 45 0001 C CNN
+F 0 "#M0425" H 10600 6400 45 0001 C CNN
F 1 "GND" H 10600 6400 45 0001 C CNN
F 2 "" H 10600 6400 60 0001 C CNN
F 3 "" H 10600 6400 60 0001 C CNN
diff --git a/hw/bbcpu.sch b/hw/bbcpu.sch
index e3b8be7..b02d6b4 100644
--- a/hw/bbcpu.sch
+++ b/hw/bbcpu.sch
@@ -82,10 +82,10 @@ NoConn ~ 6150 2850
Text GLabel 10050 2850 2 65 Output ~ 0
nRESWARM_U
$Comp
-L GND #M2307
+L GND #M0407
U 1 1 57F71484
P 9750 2650
-F 0 "#M2307" H 9750 2650 45 0001 C CNN
+F 0 "#M0407" H 9750 2650 45 0001 C CNN
F 1 "GND" H 9750 2650 45 0001 C CNN
F 2 "" H 9750 2650 60 0001 C CNN
F 3 "" H 9750 2650 60 0001 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 9750 2650 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #M2304
+L GND #M0408
U 1 1 57F714BA
P 5950 2650
-F 0 "#M2304" H 5950 2650 45 0001 C CNN
+F 0 "#M0408" H 5950 2650 45 0001 C CNN
F 1 "GND" H 5950 2650 45 0001 C CNN
F 2 "" H 5950 2650 60 0001 C CNN
F 3 "" H 5950 2650 60 0001 C CNN
@@ -116,10 +116,10 @@ Wire Wire Line
Text Notes 5350 5300 2 60 ~ 0
(weak)
$Comp
-L GND #M2305
+L GND #M0409
U 1 1 57F72456
P 6800 9450
-F 0 "#M2305" H 6800 9450 45 0001 C CNN
+F 0 "#M0409" H 6800 9450 45 0001 C CNN
F 1 "GND" H 6800 9450 45 0001 C CNN
F 2 "" H 6800 9450 60 0001 C CNN
F 3 "" H 6800 9450 60 0001 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 6800 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M2306
+L GND #M0410
U 1 1 57F7248F
P 8800 9450
-F 0 "#M2306" H 8800 9450 45 0001 C CNN
+F 0 "#M0410" H 8800 9450 45 0001 C CNN
F 1 "GND" H 8800 9450 45 0001 C CNN
F 2 "" H 8800 9450 60 0001 C CNN
F 3 "" H 8800 9450 60 0001 C CNN
@@ -244,7 +244,7 @@ U 1 1 580785D7
P 12000 4700
F 0 "C2303" H 12040 4740 50 0000 L CNN
F 1 "100n" H 12050 4550 50 0000 L CNN
-F 2 "SMD-0402" H 12030 4850 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 12030 4850 20 0001 C CNN
F 3 "" H 12000 4700 60 0001 C CNN
1 12000 4700
1 0 0 -1
@@ -268,10 +268,10 @@ Text GLabel 11850 3750 0 60 Input ~ 0
Wire Wire Line
11850 3750 12100 3750
$Comp
-L GND #M2308
+L GND #M0411
U 1 1 5807890E
P 12000 5100
-F 0 "#M2308" H 12000 5100 45 0001 C CNN
+F 0 "#M0411" H 12000 5100 45 0001 C CNN
F 1 "GND" H 12000 5100 45 0001 C CNN
F 2 "" H 12000 5100 60 0001 C CNN
F 3 "" H 12000 5100 60 0001 C CNN
@@ -324,10 +324,10 @@ Wire Wire Line
Text GLabel 14250 4150 2 60 BiDi ~ 0
MCBSP4_CLKX_U
$Comp
-L GND #M2309
+L GND #M0412
U 1 1 58078EA2
P 13600 5100
-F 0 "#M2309" H 13600 5100 45 0001 C CNN
+F 0 "#M0412" H 13600 5100 45 0001 C CNN
F 1 "GND" H 13600 5100 45 0001 C CNN
F 2 "" H 13600 5100 60 0001 C CNN
F 3 "" H 13600 5100 60 0001 C CNN
@@ -362,10 +362,10 @@ F 3 "" H 2700 9600 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #M2301
+L GND #M0413
U 1 1 5807A6CC
P 2200 10800
-F 0 "#M2301" H 2200 10800 45 0001 C CNN
+F 0 "#M0413" H 2200 10800 45 0001 C CNN
F 1 "GND" H 2200 10800 45 0001 C CNN
F 2 "" H 2200 10800 60 0001 C CNN
F 3 "" H 2200 10800 60 0001 C CNN
@@ -378,16 +378,16 @@ U 1 1 5807A744
P 3250 10350
F 0 "C2302" H 3290 10390 50 0000 L CNN
F 1 "100n" H 3300 10200 50 0000 L CNN
-F 2 "SMD-0402" H 3280 10500 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 3280 10500 20 0001 C CNN
F 3 "" H 3250 10350 60 0001 C CNN
1 3250 10350
1 0 0 -1
$EndComp
$Comp
-L GND #M2302
+L GND #M0414
U 1 1 5807A7EC
P 3250 10800
-F 0 "#M2302" H 3250 10800 45 0001 C CNN
+F 0 "#M0414" H 3250 10800 45 0001 C CNN
F 1 "GND" H 3250 10800 45 0001 C CNN
F 2 "" H 3250 10800 60 0001 C CNN
F 3 "" H 3250 10800 60 0001 C CNN
@@ -424,10 +424,10 @@ Wire Wire Line
NoConn ~ 2300 9950
NoConn ~ 2300 10050
$Comp
-L GND #M2303
+L GND #M0415
U 1 1 5807AC70
P 3750 10250
-F 0 "#M2303" H 3750 10250 45 0001 C CNN
+F 0 "#M0415" H 3750 10250 45 0001 C CNN
F 1 "GND" H 3750 10250 45 0001 C CNN
F 2 "" H 3750 10250 60 0001 C CNN
F 3 "" H 3750 10250 60 0001 C CNN
@@ -532,8 +532,8 @@ L GND #U$?
U 1 1 580E02D5
P 1750 5450
AR Path="/578AFF16/580E02D5" Ref="#U$?" Part="1"
-AR Path="/578AFF32/580E02D5" Ref="#U$2303" Part="1"
-F 0 "#U$2303" H 1660 5350 70 0001 L BNN
+AR Path="/578AFF32/580E02D5" Ref="#U$0416" Part="1"
+F 0 "#U$0416" H 1660 5350 70 0001 L BNN
F 1 "GND" H 1660 5350 70 0001 L BNN
F 2 "" H 1750 5450 60 0001 C CNN
F 3 "" H 1750 5450 60 0001 C CNN
@@ -557,7 +557,7 @@ AR Path="/578AFF16/580E02E0" Ref="C?" Part="1"
AR Path="/578AFF32/580E02E0" Ref="C2301" Part="1"
F 0 "C2301" H 1390 5090 50 0000 L CNN
F 1 "100n" H 1390 4920 50 0000 L CNN
-F 2 "SMD-0402" H 1380 5200 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1380 5200 20 0001 C CNN
F 3 "" H 1350 5050 60 0001 C CNN
1 1350 5050
1 0 0 -1
@@ -567,8 +567,8 @@ L GND #U$?
U 1 1 580E02E7
P 1350 5450
AR Path="/578AFF16/580E02E7" Ref="#U$?" Part="1"
-AR Path="/578AFF32/580E02E7" Ref="#U$2301" Part="1"
-F 0 "#U$2301" H 1260 5350 70 0001 L BNN
+AR Path="/578AFF32/580E02E7" Ref="#U$0417" Part="1"
+F 0 "#U$0417" H 1260 5350 70 0001 L BNN
F 1 "GND" H 1260 5350 70 0001 L BNN
F 2 "" H 1350 5450 60 0001 C CNN
F 3 "" H 1350 5450 60 0001 C CNN
@@ -591,8 +591,8 @@ L GND #U$?
U 1 1 580E0300
P 1750 4150
AR Path="/578AFF16/580E0300" Ref="#U$?" Part="1"
-AR Path="/578AFF32/580E0300" Ref="#U$2302" Part="1"
-F 0 "#U$2302" H 1660 4050 70 0001 L BNN
+AR Path="/578AFF32/580E0300" Ref="#U$0418" Part="1"
+F 0 "#U$0418" H 1660 4050 70 0001 L BNN
F 1 "GND" H 1660 4050 70 0001 L BNN
F 2 "" H 1750 4150 60 0001 C CNN
F 3 "" H 1750 4150 60 0001 C CNN
@@ -760,8 +760,8 @@ L GND #U$?
U 1 1 582129E6
P 4050 4900
AR Path="/578AFF16/582129E6" Ref="#U$?" Part="1"
-AR Path="/578AFF32/582129E6" Ref="#U$2304" Part="1"
-F 0 "#U$2304" H 3960 4800 70 0001 L BNN
+AR Path="/578AFF32/582129E6" Ref="#U$0419" Part="1"
+F 0 "#U$0419" H 3960 4800 70 0001 L BNN
F 1 "GND" H 3960 4800 70 0001 L BNN
F 2 "" H 4050 4900 60 0001 C CNN
F 3 "" H 4050 4900 60 0001 C CNN
@@ -804,7 +804,7 @@ AR Path="/578AFF12/582ADBD4" Ref="R?" Part="1"
AR Path="/578AFF32/582ADBD4" Ref="R2301" Part="1"
F 0 "R2301" V 4000 3900 50 0000 L CNN
F 1 "47" H 4050 3800 50 0000 C CNN
-F 2 "SMD-0402" H 4080 3950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 4080 3950 20 0001 C CNN
F 3 "" H 4050 3800 60 0001 C CNN
1 4050 3800
0 1 1 0
@@ -830,7 +830,7 @@ AR Path="/578AFF12/583DF52A" Ref="R?" Part="1"
AR Path="/578AFF32/583DF52A" Ref="R2302" Part="1"
F 0 "R2302" V 5250 2800 50 0000 L CNN
F 1 "10k" H 5300 2700 50 0000 C CNN
-F 2 "SMD-0402" H 5330 2850 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5330 2850 20 0001 C CNN
F 3 "" H 5300 2700 60 0001 C CNN
1 5300 2700
0 1 1 0
@@ -853,7 +853,7 @@ AR Path="/578AFF12/583DF806" Ref="R?" Part="1"
AR Path="/578AFF32/583DF806" Ref="R2303" Part="1"
F 0 "R2303" V 10950 2800 50 0000 L CNN
F 1 "10k" H 11000 2700 50 0000 C CNN
-F 2 "SMD-0402" H 11030 2850 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11030 2850 20 0001 C CNN
F 3 "" H 11000 2700 60 0001 C CNN
1 11000 2700
0 1 1 0
diff --git a/hw/bbdisp.sch b/hw/bbdisp.sch
index 2e6fb82..8a6d048 100644
--- a/hw/bbdisp.sch
+++ b/hw/bbdisp.sch
@@ -82,10 +82,10 @@ F 3 "" H 9000 6700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-4 #U$2402
+L GND-4 #U$0420
U 1 1 578E4AEF
P 6700 5800
-F 0 "#U$2402" H 6581 5700 70 0001 L BNN
+F 0 "#U$0420" H 6581 5700 70 0001 L BNN
F 1 "GND4" H 6581 5700 70 0001 L BNN
F 2 "" H 6700 5800 60 0001 C CNN
F 3 "" H 6700 5800 60 0001 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 6700 5800 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND-4 #U$2405
+L GND-4 #U$0421
U 1 1 578E4B53
P 11300 5800
-F 0 "#U$2405" H 11180 5700 70 0001 L BNN
+F 0 "#U$0421" H 11180 5700 70 0001 L BNN
F 1 "GND4" H 11180 5700 70 0001 L BNN
F 2 "" H 11300 5800 60 0001 C CNN
F 3 "" H 11300 5800 60 0001 C CNN
@@ -104,10 +104,10 @@ F 3 "" H 11300 5800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-4 #U$2404
+L GND-4 #U$0422
U 1 1 578E4BB7
P 11300 2300
-F 0 "#U$2404" H 11180 2200 70 0001 L BNN
+F 0 "#U$0422" H 11180 2200 70 0001 L BNN
F 1 "GND4" H 11180 2200 70 0001 L BNN
F 2 "" H 11300 2300 60 0001 C CNN
F 3 "" H 11300 2300 60 0001 C CNN
@@ -115,10 +115,10 @@ F 3 "" H 11300 2300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-4 #U$2401
+L GND-4 #U$0423
U 1 1 578E4C1B
P 6650 2300
-F 0 "#U$2401" H 6531 2200 70 0001 L BNN
+F 0 "#U$0423" H 6531 2200 70 0001 L BNN
F 1 "GND4" H 6531 2200 70 0001 L BNN
F 2 "" H 6650 2300 60 0001 C CNN
F 3 "" H 6650 2300 60 0001 C CNN
@@ -294,10 +294,10 @@ F 3 "" H 7450 9250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-4 #U$2403
+L GND-4 #U$0424
U 1 1 582100EC
P 6950 9500
-F 0 "#U$2403" H 6831 9400 70 0001 L BNN
+F 0 "#U$0424" H 6831 9400 70 0001 L BNN
F 1 "GND4" H 6831 9400 70 0001 L BNN
F 2 "" H 6950 9500 60 0001 C CNN
F 3 "" H 6950 9500 60 0001 C CNN
@@ -331,7 +331,7 @@ AR Path="/578AFF32/583DFDD0" Ref="R?" Part="1"
AR Path="/578AFF34/583DFDD0" Ref="R2402" Part="1"
F 0 "R2402" V 13850 2500 50 0000 L CNN
F 1 "10k" H 13900 2400 50 0000 C CNN
-F 2 "SMD-0402" H 13930 2550 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 13930 2550 20 0001 C CNN
F 3 "" H 13900 2400 60 0001 C CNN
1 13900 2400
0 1 1 0
@@ -357,7 +357,7 @@ AR Path="/578AFF32/583E0062" Ref="R?" Part="1"
AR Path="/578AFF34/583E0062" Ref="R2401" Part="1"
F 0 "R2401" V 5550 6200 50 0000 L CNN
F 1 "10k" H 5600 6100 50 0000 C CNN
-F 2 "SMD-0402" H 5630 6250 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5630 6250 20 0001 C CNN
F 3 "" H 5600 6100 60 0001 C CNN
1 5600 6100
0 1 1 0
diff --git a/hw/bob.sch b/hw/bob.sch
index b2735f6..1efc90e 100644
--- a/hw/bob.sch
+++ b/hw/bob.sch
@@ -117,10 +117,10 @@ F 3 "" H 2350 2600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1711
+L GND-2 #U$0309
U 1 1 578D1817
P 6600 3800
-F 0 "#U$1711" H 6480 3701 70 0001 L BNN
+F 0 "#U$0309" H 6480 3701 70 0001 L BNN
F 1 "GND2" H 6480 3701 70 0001 L BNN
F 2 "" H 6600 3800 60 0001 C CNN
F 3 "" H 6600 3800 60 0001 C CNN
@@ -128,10 +128,10 @@ F 3 "" H 6600 3800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1715
+L GND-2 #U$0310
U 1 1 578D19A7
P 9500 4000
-F 0 "#U$1715" H 9380 3901 70 0001 L BNN
+F 0 "#U$0310" H 9380 3901 70 0001 L BNN
F 1 "GND2" H 9380 3901 70 0001 L BNN
F 2 "" H 9500 4000 60 0001 C CNN
F 3 "" H 9500 4000 60 0001 C CNN
@@ -139,10 +139,10 @@ F 3 "" H 9500 4000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1716
+L GND-2 #U$0311
U 1 1 578D1A0B
P 10050 4200
-F 0 "#U$1716" H 9930 4101 70 0001 L BNN
+F 0 "#U$0311" H 9930 4101 70 0001 L BNN
F 1 "GND2" H 9930 4101 70 0001 L BNN
F 2 "" H 10050 4200 60 0001 C CNN
F 3 "" H 10050 4200 60 0001 C CNN
@@ -150,10 +150,10 @@ F 3 "" H 10050 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1718
+L GND-2 #U$0312
U 1 1 578D1A6F
P 10800 4200
-F 0 "#U$1718" H 10680 4101 70 0001 L BNN
+F 0 "#U$0312" H 10680 4101 70 0001 L BNN
F 1 "GND2" H 10680 4101 70 0001 L BNN
F 2 "" H 10800 4200 60 0001 C CNN
F 3 "" H 10800 4200 60 0001 C CNN
@@ -161,10 +161,10 @@ F 3 "" H 10800 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1704
+L GND-2 #U$0313
U 1 1 578D1AD3
P 2650 3750
-F 0 "#U$1704" H 2530 3651 70 0001 L BNN
+F 0 "#U$0313" H 2530 3651 70 0001 L BNN
F 1 "GND2" H 2530 3651 70 0001 L BNN
F 2 "" H 2650 3750 60 0001 C CNN
F 3 "" H 2650 3750 60 0001 C CNN
@@ -172,10 +172,10 @@ F 3 "" H 2650 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1703
+L GND-2 #U$0314
U 1 1 578D1B37
P 2050 3750
-F 0 "#U$1703" H 1930 3651 70 0001 L BNN
+F 0 "#U$0314" H 1930 3651 70 0001 L BNN
F 1 "GND2" H 1930 3651 70 0001 L BNN
F 2 "" H 2050 3750 60 0001 C CNN
F 3 "" H 2050 3750 60 0001 C CNN
@@ -183,10 +183,10 @@ F 3 "" H 2050 3750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1706
+L GND-2 #U$0315
U 1 1 578D1B9B
P 3200 2900
-F 0 "#U$1706" H 3080 2801 70 0001 L BNN
+F 0 "#U$0315" H 3080 2801 70 0001 L BNN
F 1 "GND2" H 3080 2801 70 0001 L BNN
F 2 "" H 3200 2900 60 0001 C CNN
F 3 "" H 3200 2900 60 0001 C CNN
@@ -225,7 +225,7 @@ U 1 1 57D840BB
P 3800 3000
F 0 "U1702" H 3500 3550 50 0000 L CNN
F 1 "TMD26713" H 3800 2550 50 0000 C CNN
-F 2 "TMD2671" H 3800 2450 20 0001 C CNN
+F 2 "neo900:TMD2671" H 3800 2450 20 0001 C CNN
F 3 "" H 3050 3150 60 0001 C CNN
1 3800 3000
1 0 0 -1
@@ -248,10 +248,10 @@ F 3 "" H 8900 7850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1714
+L GND-2 #U$0316
U 1 1 57D87850
P 8900 8250
-F 0 "#U$1714" H 8780 8151 70 0001 L BNN
+F 0 "#U$0316" H 8780 8151 70 0001 L BNN
F 1 "GND2" H 8780 8151 70 0001 L BNN
F 2 "" H 8900 8250 60 0001 C CNN
F 3 "" H 8900 8250 60 0001 C CNN
@@ -311,10 +311,10 @@ FLASH_A
Text Label 13300 3700 0 60 ~ 0
FLASH_K
$Comp
-L GND-2 #U$1705
+L GND-2 #U$0317
U 1 1 57D8B64E
P 2800 7900
-F 0 "#U$1705" H 2680 7801 70 0001 L BNN
+F 0 "#U$0317" H 2680 7801 70 0001 L BNN
F 1 "GND2" H 2680 7801 70 0001 L BNN
F 2 "" H 2800 7900 60 0001 C CNN
F 3 "" H 2800 7900 60 0001 C CNN
@@ -322,10 +322,10 @@ F 3 "" H 2800 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1708
+L GND-2 #U$0318
U 1 1 57D8B862
P 3800 7900
-F 0 "#U$1708" H 3680 7801 70 0001 L BNN
+F 0 "#U$0318" H 3680 7801 70 0001 L BNN
F 1 "GND2" H 3680 7801 70 0001 L BNN
F 2 "" H 3800 7900 60 0001 C CNN
F 3 "" H 3800 7900 60 0001 C CNN
@@ -333,10 +333,10 @@ F 3 "" H 3800 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1712
+L GND-2 #U$0319
U 1 1 57D8B9FB
P 7900 7900
-F 0 "#U$1712" H 7780 7801 70 0001 L BNN
+F 0 "#U$0319" H 7780 7801 70 0001 L BNN
F 1 "GND2" H 7780 7801 70 0001 L BNN
F 2 "" H 7900 7900 60 0001 C CNN
F 3 "" H 7900 7900 60 0001 C CNN
@@ -439,10 +439,10 @@ F 3 "" H 5900 2500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1710
+L GND-2 #U$0320
U 1 1 57D92379
P 5900 2900
-F 0 "#U$1710" H 5780 2801 70 0001 L BNN
+F 0 "#U$0320" H 5780 2801 70 0001 L BNN
F 1 "GND2" H 5780 2801 70 0001 L BNN
F 2 "" H 5900 2900 60 0001 C CNN
F 3 "" H 5900 2900 60 0001 C CNN
@@ -457,7 +457,7 @@ U 1 1 57D8FE56
P 13800 5300
F 0 "LED1701" H 13600 5850 45 0000 L CNN
F 1 "LED-RGB-SMLP36" H 13800 4800 45 0000 C CNN
-F 2 "SMLP36RGB2W3" H 13800 4700 20 0001 C CNN
+F 2 "neo900-legacy:SMLP36RGB2W3" H 13800 4700 20 0001 C CNN
F 3 "" H 13800 5300 60 0001 C CNN
1 13800 5300
1 0 0 -1
@@ -482,10 +482,10 @@ F 3 "" H 13800 7950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1719
+L GND-2 #U$0321
U 1 1 57D9F5AB
P 13300 8600
-F 0 "#U$1719" H 13180 8501 70 0001 L BNN
+F 0 "#U$0321" H 13180 8501 70 0001 L BNN
F 1 "GND2" H 13180 8501 70 0001 L BNN
F 2 "" H 13300 8600 60 0001 C CNN
F 3 "" H 13300 8600 60 0001 C CNN
@@ -493,10 +493,10 @@ F 3 "" H 13300 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1720
+L GND-2 #U$0322
U 1 1 57D9F666
P 14300 8600
-F 0 "#U$1720" H 14180 8501 70 0001 L BNN
+F 0 "#U$0322" H 14180 8501 70 0001 L BNN
F 1 "GND2" H 14180 8501 70 0001 L BNN
F 2 "" H 14300 8600 60 0001 C CNN
F 3 "" H 14300 8600 60 0001 C CNN
@@ -542,10 +542,10 @@ NoConn ~ 3700 7750
NoConn ~ 8000 7750
NoConn ~ 8800 7750
$Comp
-L POWERED #FLG1701
+L POWERED #FLG0323
U 1 1 580A5551
P 2750 2200
-F 0 "#FLG1701" H 2950 2100 60 0001 C CNN
+F 0 "#FLG0323" H 2950 2100 60 0001 C CNN
F 1 "POWERED" H 2750 2250 60 0000 C CNN
F 2 "" H 2750 2200 60 0001 C CNN
F 3 "" H 2750 2200 60 0001 C CNN
@@ -553,10 +553,10 @@ F 3 "" H 2750 2200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1702
+L POWERED #FLG0324
U 1 1 580B14DA
P 9200 6350
-F 0 "#FLG1702" H 9400 6250 60 0001 C CNN
+F 0 "#FLG0324" H 9400 6250 60 0001 C CNN
F 1 "POWERED" H 9200 6400 60 0000 C CNN
F 2 "" H 9200 6350 60 0001 C CNN
F 3 "" H 9200 6350 60 0001 C CNN
@@ -607,10 +607,10 @@ F 3 "" H 7500 9025 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-2 #U$1707
+L GND-2 #U$0325
U 1 1 581D7187
P 3200 9300
-F 0 "#U$1707" H 3080 9201 70 0001 L BNN
+F 0 "#U$0325" H 3080 9201 70 0001 L BNN
F 1 "GND2" H 3080 9201 70 0001 L BNN
F 2 "" H 3200 9300 60 0001 C CNN
F 3 "" H 3200 9300 60 0001 C CNN
@@ -618,10 +618,10 @@ F 3 "" H 3200 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1709
+L GND-2 #U$0326
U 1 1 581D7324
P 5400 9300
-F 0 "#U$1709" H 5280 9201 70 0001 L BNN
+F 0 "#U$0326" H 5280 9201 70 0001 L BNN
F 1 "GND2" H 5280 9201 70 0001 L BNN
F 2 "" H 5400 9300 60 0001 C CNN
F 3 "" H 5400 9300 60 0001 C CNN
@@ -629,10 +629,10 @@ F 3 "" H 5400 9300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1713
+L GND-2 #U$0327
U 1 1 581D7534
P 8200 9300
-F 0 "#U$1713" H 8080 9201 70 0001 L BNN
+F 0 "#U$0327" H 8080 9201 70 0001 L BNN
F 1 "GND2" H 8080 9201 70 0001 L BNN
F 2 "" H 8200 9300 60 0001 C CNN
F 3 "" H 8200 9300 60 0001 C CNN
@@ -651,10 +651,10 @@ F 3 "" H 10000 9025 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-2 #U$1717
+L GND-2 #U$0328
U 1 1 581D9096
P 10700 9300
-F 0 "#U$1717" H 10580 9201 70 0001 L BNN
+F 0 "#U$0328" H 10580 9201 70 0001 L BNN
F 1 "GND2" H 10580 9201 70 0001 L BNN
F 2 "" H 10700 9300 60 0001 C CNN
F 3 "" H 10700 9300 60 0001 C CNN
@@ -1083,10 +1083,10 @@ F 3 "" H 1800 8100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-2 #U$1702
+L GND-2 #U$0329
U 1 1 581DCD70
P 1800 8500
-F 0 "#U$1702" H 1680 8401 70 0001 L BNN
+F 0 "#U$0329" H 1680 8401 70 0001 L BNN
F 1 "GND2" H 1680 8401 70 0001 L BNN
F 2 "" H 1800 8500 60 0001 C CNN
F 3 "" H 1800 8500 60 0001 C CNN
@@ -1114,10 +1114,10 @@ F 3 "" H 2000 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #U$1701
+L GND-2 #U$0330
U 1 1 5831D8EB
P 1800 5200
-F 0 "#U$1701" H 1680 5101 70 0001 L BNN
+F 0 "#U$0330" H 1680 5101 70 0001 L BNN
F 1 "GND2" H 1680 5101 70 0001 L BNN
F 2 "" H 1800 5200 60 0001 C CNN
F 3 "" H 1800 5200 60 0001 C CNN
diff --git a/hw/cams.sch b/hw/cams.sch
index 6678824..235586c 100644
--- a/hw/cams.sch
+++ b/hw/cams.sch
@@ -337,10 +337,10 @@ F 3 "" H 4950 7800 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-3 #U$2002
+L GND-3 #U$0376
U 1 1 578DB37D
P 5950 8650
-F 0 "#U$2002" H 5830 8551 70 0001 L BNN
+F 0 "#U$0376" H 5830 8551 70 0001 L BNN
F 1 "GND3" H 5830 8551 70 0001 L BNN
F 2 "" H 5950 8650 60 0001 C CNN
F 3 "" H 5950 8650 60 0001 C CNN
@@ -348,10 +348,10 @@ F 3 "" H 5950 8650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2001
+L GND-3 #U$0377
U 1 1 578DB3E1
P 5800 6450
-F 0 "#U$2001" H 5680 6351 70 0001 L BNN
+F 0 "#U$0377" H 5680 6351 70 0001 L BNN
F 1 "GND3" H 5680 6351 70 0001 L BNN
F 2 "" H 5800 6450 60 0001 C CNN
F 3 "" H 5800 6450 60 0001 C CNN
@@ -359,10 +359,10 @@ F 3 "" H 5800 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2003
+L GND-3 #U$0378
U 1 1 578DB445
P 6950 7100
-F 0 "#U$2003" H 6830 7001 70 0001 L BNN
+F 0 "#U$0378" H 6830 7001 70 0001 L BNN
F 1 "GND3" H 6830 7001 70 0001 L BNN
F 2 "" H 6950 7100 60 0001 C CNN
F 3 "" H 6950 7100 60 0001 C CNN
@@ -370,10 +370,10 @@ F 3 "" H 6950 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2008
+L GND-3 #U$0379
U 1 1 578DB4A9
P 12700 4550
-F 0 "#U$2008" H 12580 4451 70 0001 L BNN
+F 0 "#U$0379" H 12580 4451 70 0001 L BNN
F 1 "GND3" H 12580 4451 70 0001 L BNN
F 2 "" H 12700 4550 60 0001 C CNN
F 3 "" H 12700 4550 60 0001 C CNN
@@ -381,10 +381,10 @@ F 3 "" H 12700 4550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2007
+L GND-3 #U$0380
U 1 1 578DB50D
P 9750 5000
-F 0 "#U$2007" H 9630 4901 70 0001 L BNN
+F 0 "#U$0380" H 9630 4901 70 0001 L BNN
F 1 "GND3" H 9630 4901 70 0001 L BNN
F 2 "" H 9750 5000 60 0001 C CNN
F 3 "" H 9750 5000 60 0001 C CNN
@@ -392,10 +392,10 @@ F 3 "" H 9750 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2006
+L GND-3 #U$0381
U 1 1 578DB571
P 9750 4300
-F 0 "#U$2006" H 9630 4201 70 0001 L BNN
+F 0 "#U$0381" H 9630 4201 70 0001 L BNN
F 1 "GND3" H 9630 4201 70 0001 L BNN
F 2 "" H 9750 4300 60 0001 C CNN
F 3 "" H 9750 4300 60 0001 C CNN
@@ -403,10 +403,10 @@ F 3 "" H 9750 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2005
+L GND-3 #U$0382
U 1 1 578DB5D5
P 9750 3550
-F 0 "#U$2005" H 9630 3451 70 0001 L BNN
+F 0 "#U$0382" H 9630 3451 70 0001 L BNN
F 1 "GND3" H 9630 3451 70 0001 L BNN
F 2 "" H 9750 3550 60 0001 C CNN
F 3 "" H 9750 3550 60 0001 C CNN
@@ -628,10 +628,10 @@ Wire Wire Line
Wire Wire Line
10550 3000 10450 3000
$Comp
-L POWERED #FLG2001
+L POWERED #FLG0383
U 1 1 57908F1F
P 9850 2700
-F 0 "#FLG2001" H 10050 2600 60 0001 C CNN
+F 0 "#FLG0383" H 10050 2600 60 0001 C CNN
F 1 "POWERED" H 9850 2750 60 0000 C CNN
F 2 "" H 9850 2700 60 0001 C CNN
F 3 "" H 9850 2700 60 0001 C CNN
@@ -733,10 +733,10 @@ F 3 "" H 8900 8700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2004
+L GND-3 #U$0384
U 1 1 580906EA
P 8000 8900
-F 0 "#U$2004" H 7880 8801 70 0001 L BNN
+F 0 "#U$0384" H 7880 8801 70 0001 L BNN
F 1 "GND3" H 7880 8801 70 0001 L BNN
F 2 "" H 8000 8900 60 0001 C CNN
F 3 "" H 8000 8900 60 0001 C CNN
diff --git a/hw/charger.sch b/hw/charger.sch
index 3f64359..e7e672d 100644
--- a/hw/charger.sch
+++ b/hw/charger.sch
@@ -155,10 +155,10 @@ F 3 "" H 11500 5600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$208
+L GND #U$01
U 1 1 578B135A
P 8500 5800
-F 0 "#U$208" H 8410 5700 70 0001 L BNN
+F 0 "#U$01" H 8410 5700 70 0001 L BNN
F 1 "GND" H 8410 5700 70 0001 L BNN
F 2 "" H 8500 5800 60 0001 C CNN
F 3 "" H 8500 5800 60 0001 C CNN
@@ -166,10 +166,10 @@ F 3 "" H 8500 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$210
+L GND #U$02
U 1 1 578B13BE
P 9800 5800
-F 0 "#U$210" H 9710 5700 70 0001 L BNN
+F 0 "#U$02" H 9710 5700 70 0001 L BNN
F 1 "GND" H 9710 5700 70 0001 L BNN
F 2 "" H 9800 5800 60 0001 C CNN
F 3 "" H 9800 5800 60 0001 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 9800 5800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$211
+L GND #U$03
U 1 1 578B1422
P 10900 3700
-F 0 "#U$211" H 10810 3600 70 0001 L BNN
+F 0 "#U$03" H 10810 3600 70 0001 L BNN
F 1 "GND" H 10810 3600 70 0001 L BNN
F 2 "" H 10900 3700 60 0001 C CNN
F 3 "" H 10900 3700 60 0001 C CNN
@@ -188,10 +188,10 @@ F 3 "" H 10900 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$212
+L GND #U$04
U 1 1 578B1486
P 11000 5100
-F 0 "#U$212" H 10910 5000 70 0001 L BNN
+F 0 "#U$04" H 10910 5000 70 0001 L BNN
F 1 "GND" H 10910 5000 70 0001 L BNN
F 2 "" H 11000 5100 60 0001 C CNN
F 3 "" H 11000 5100 60 0001 C CNN
@@ -199,10 +199,10 @@ F 3 "" H 11000 5100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$213
+L GND #U$05
U 1 1 578B14EA
P 11500 5950
-F 0 "#U$213" H 11410 5850 70 0001 L BNN
+F 0 "#U$05" H 11410 5850 70 0001 L BNN
F 1 "GND" H 11410 5850 70 0001 L BNN
F 2 "" H 11500 5950 60 0001 C CNN
F 3 "" H 11500 5950 60 0001 C CNN
@@ -210,10 +210,10 @@ F 3 "" H 11500 5950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$214
+L GND #U$06
U 1 1 578B154E
P 11950 3700
-F 0 "#U$214" H 11860 3600 70 0001 L BNN
+F 0 "#U$06" H 11860 3600 70 0001 L BNN
F 1 "GND" H 11860 3600 70 0001 L BNN
F 2 "" H 11950 3700 60 0001 C CNN
F 3 "" H 11950 3700 60 0001 C CNN
@@ -328,10 +328,10 @@ CHG_INT
Text Notes 7350 5150 2 60 ~ 0
100/500 mA selection
$Comp
-L GND #U$209
+L GND #U$07
U 1 1 57E52FBC
P 8900 5800
-F 0 "#U$209" H 8810 5700 70 0001 L BNN
+F 0 "#U$07" H 8810 5700 70 0001 L BNN
F 1 "GND" H 8810 5700 70 0001 L BNN
F 2 "" H 8900 5800 60 0001 C CNN
F 3 "" H 8900 5800 60 0001 C CNN
@@ -375,8 +375,8 @@ L GND #U$?
U 1 1 57F9F504
P 7300 9750
AR Path="/578AFEF6/57F9F504" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/57F9F504" Ref="#U$206" Part="1"
-F 0 "#U$206" H 7210 9650 70 0001 L BNN
+AR Path="/578AFEF4/57F9F504" Ref="#U$08" Part="1"
+F 0 "#U$08" H 7210 9650 70 0001 L BNN
F 1 "GND" H 7210 9650 70 0001 L BNN
F 2 "" H 7300 9750 60 0001 C CNN
F 3 "" H 7300 9750 60 0001 C CNN
@@ -455,8 +455,8 @@ L GND #U$?
U 1 1 58083FF0
P 6100 9700
AR Path="/578AFEF6/58083FF0" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/58083FF0" Ref="#U$205" Part="1"
-F 0 "#U$205" H 6010 9600 70 0001 L BNN
+AR Path="/578AFEF4/58083FF0" Ref="#U$09" Part="1"
+F 0 "#U$09" H 6010 9600 70 0001 L BNN
F 1 "GND" H 6010 9600 70 0001 L BNN
F 2 "" H 6100 9700 60 0001 C CNN
F 3 "" H 6100 9700 60 0001 C CNN
@@ -468,8 +468,8 @@ L GND #U$?
U 1 1 58084025
P 7600 9750
AR Path="/578AFEF6/58084025" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/58084025" Ref="#U$207" Part="1"
-F 0 "#U$207" H 7510 9650 70 0001 L BNN
+AR Path="/578AFEF4/58084025" Ref="#U$010" Part="1"
+F 0 "#U$010" H 7510 9650 70 0001 L BNN
F 1 "GND" H 7510 9650 70 0001 L BNN
F 2 "" H 7600 9750 60 0001 C CNN
F 3 "" H 7600 9750 60 0001 C CNN
@@ -487,8 +487,8 @@ L GND #U$?
U 1 1 580AB1B1
P 12000 9400
AR Path="/578AFEF6/580AB1B1" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/580AB1B1" Ref="#U$215" Part="1"
-F 0 "#U$215" H 11910 9300 70 0001 L BNN
+AR Path="/578AFEF4/580AB1B1" Ref="#U$011" Part="1"
+F 0 "#U$011" H 11910 9300 70 0001 L BNN
F 1 "GND" H 11910 9300 70 0001 L BNN
F 2 "" H 12000 9400 60 0001 C CNN
F 3 "" H 12000 9400 60 0001 C CNN
@@ -496,10 +496,10 @@ F 3 "" H 12000 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG204
+L POWERED #FLG012
U 1 1 580AB2BA
P 12000 9000
-F 0 "#FLG204" H 12200 8900 60 0001 C CNN
+F 0 "#FLG012" H 12200 8900 60 0001 C CNN
F 1 "POWERED" H 12000 9050 60 0000 C CNN
F 2 "" H 12000 9000 60 0001 C CNN
F 3 "" H 12000 9000 60 0001 C CNN
@@ -509,10 +509,10 @@ $EndComp
Wire Wire Line
12000 9200 12000 9300
$Comp
-L POWERED #FLG203
+L POWERED #FLG013
U 1 1 580AD2FC
P 12000 8200
-F 0 "#FLG203" H 12200 8100 60 0001 C CNN
+F 0 "#FLG013" H 12200 8100 60 0001 C CNN
F 1 "POWERED" H 12000 8250 60 0000 C CNN
F 2 "" H 12000 8200 60 0001 C CNN
F 3 "" H 12000 8200 60 0001 C CNN
@@ -526,10 +526,10 @@ Wire Wire Line
Wire Wire Line
12000 8600 12150 8600
$Comp
-L POWERED #FLG207
+L POWERED #FLG014
U 1 1 580AE65E
P 12700 9000
-F 0 "#FLG207" H 12900 8900 60 0001 C CNN
+F 0 "#FLG014" H 12900 8900 60 0001 C CNN
F 1 "POWERED" H 12700 9050 60 0000 C CNN
F 2 "" H 12700 9000 60 0001 C CNN
F 3 "" H 12700 9000 60 0001 C CNN
@@ -539,10 +539,10 @@ $EndComp
Wire Wire Line
12700 9200 12700 9300
$Comp
-L POWERED #FLG206
+L POWERED #FLG015
U 1 1 580AF534
P 12700 8200
-F 0 "#FLG206" H 12900 8100 60 0001 C CNN
+F 0 "#FLG015" H 12900 8100 60 0001 C CNN
F 1 "POWERED" H 12700 8250 60 0000 C CNN
F 2 "" H 12700 8200 60 0001 C CNN
F 3 "" H 12700 8200 60 0001 C CNN
@@ -556,10 +556,10 @@ Wire Wire Line
Wire Wire Line
12700 8600 12850 8600
$Comp
-L POWERED #FLG202
+L POWERED #FLG016
U 1 1 580AF775
P 12000 7400
-F 0 "#FLG202" H 12200 7300 60 0001 C CNN
+F 0 "#FLG016" H 12200 7300 60 0001 C CNN
F 1 "POWERED" H 12000 7450 60 0000 C CNN
F 2 "" H 12000 7400 60 0001 C CNN
F 3 "" H 12000 7400 60 0001 C CNN
@@ -573,10 +573,10 @@ Wire Wire Line
Wire Wire Line
12000 7800 12150 7800
$Comp
-L POWERED #FLG205
+L POWERED #FLG017
U 1 1 580AF77E
P 12700 7400
-F 0 "#FLG205" H 12900 7300 60 0001 C CNN
+F 0 "#FLG017" H 12900 7300 60 0001 C CNN
F 1 "POWERED" H 12700 7450 60 0000 C CNN
F 2 "" H 12700 7400 60 0001 C CNN
F 3 "" H 12700 7400 60 0001 C CNN
@@ -590,10 +590,10 @@ Wire Wire Line
Wire Wire Line
12700 7800 12850 7800
$Comp
-L POWERED #FLG208
+L POWERED #FLG018
U 1 1 580B0C2C
P 13400 9000
-F 0 "#FLG208" H 13600 8900 60 0001 C CNN
+F 0 "#FLG018" H 13600 8900 60 0001 C CNN
F 1 "POWERED" H 13400 9050 60 0000 C CNN
F 2 "" H 13400 9000 60 0001 C CNN
F 3 "" H 13400 9000 60 0001 C CNN
@@ -603,10 +603,10 @@ $EndComp
Wire Wire Line
13400 9200 13400 9300
$Comp
-L GND-3 #M202
+L GND-3 #M019
U 1 1 580B0C33
P 13400 9400
-F 0 "#M202" H 13400 9400 45 0001 C CNN
+F 0 "#M019" H 13400 9400 45 0001 C CNN
F 1 "GND-3" H 13400 9400 45 0001 C CNN
F 2 "" H 13400 9400 60 0001 C CNN
F 3 "" H 13400 9400 60 0001 C CNN
@@ -614,10 +614,10 @@ F 3 "" H 13400 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-2 #M201
+L GND-2 #M020
U 1 1 580B0C66
P 12700 9400
-F 0 "#M201" H 12700 9400 45 0001 C CNN
+F 0 "#M020" H 12700 9400 45 0001 C CNN
F 1 "GND-2" H 12700 9400 45 0001 C CNN
F 2 "" H 12700 9400 60 0001 C CNN
F 3 "" H 12700 9400 60 0001 C CNN
@@ -625,10 +625,10 @@ F 3 "" H 12700 9400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG209
+L POWERED #FLG021
U 1 1 580B2986
P 13900 7400
-F 0 "#FLG209" H 14100 7300 60 0001 C CNN
+F 0 "#FLG021" H 14100 7300 60 0001 C CNN
F 1 "POWERED" H 13900 7450 60 0000 C CNN
F 2 "" H 13900 7400 60 0001 C CNN
F 3 "" H 13900 7400 60 0001 C CNN
@@ -642,10 +642,10 @@ Wire Wire Line
Text GLabel 14050 7800 2 60 Output ~ 0
VBAT_SWITCHED_U
$Comp
-L POWERED #FLG210
+L POWERED #FLG022
U 1 1 580B2C23
P 14100 9000
-F 0 "#FLG210" H 14300 8900 60 0001 C CNN
+F 0 "#FLG022" H 14300 8900 60 0001 C CNN
F 1 "POWERED" H 14100 9050 60 0000 C CNN
F 2 "" H 14100 9000 60 0001 C CNN
F 3 "" H 14100 9000 60 0001 C CNN
@@ -655,10 +655,10 @@ $EndComp
Wire Wire Line
14100 9200 14100 9300
$Comp
-L GND-4 #M203
+L GND-4 #M023
U 1 1 580B2C87
P 14100 9400
-F 0 "#M203" H 14100 9400 45 0001 C CNN
+F 0 "#M023" H 14100 9400 45 0001 C CNN
F 1 "GND-4" H 14100 9400 45 0001 C CNN
F 2 "" H 14100 9400 60 0001 C CNN
F 3 "" H 14100 9400 60 0001 C CNN
@@ -691,8 +691,8 @@ L GND #U$?
U 1 1 5828FC35
P 2300 4400
AR Path="/578AFEF2/5828FC35" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC35" Ref="#U$201" Part="1"
-F 0 "#U$201" H 2210 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC35" Ref="#U$024" Part="1"
+F 0 "#U$024" H 2210 4300 70 0001 L BNN
F 1 "GND" H 2210 4300 70 0001 L BNN
F 2 "" H 2300 4400 60 0001 C CNN
F 3 "" H 2300 4400 60 0001 C CNN
@@ -704,8 +704,8 @@ L GND #U$?
U 1 1 5828FC3B
P 3700 4400
AR Path="/578AFEF2/5828FC3B" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC3B" Ref="#U$202" Part="1"
-F 0 "#U$202" H 3610 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC3B" Ref="#U$025" Part="1"
+F 0 "#U$025" H 3610 4300 70 0001 L BNN
F 1 "GND" H 3610 4300 70 0001 L BNN
F 2 "" H 3700 4400 60 0001 C CNN
F 3 "" H 3700 4400 60 0001 C CNN
@@ -717,8 +717,8 @@ L GND #U$?
U 1 1 5828FC41
P 4000 4400
AR Path="/578AFEF2/5828FC41" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC41" Ref="#U$203" Part="1"
-F 0 "#U$203" H 3910 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC41" Ref="#U$026" Part="1"
+F 0 "#U$026" H 3910 4300 70 0001 L BNN
F 1 "GND" H 3910 4300 70 0001 L BNN
F 2 "" H 4000 4400 60 0001 C CNN
F 3 "" H 4000 4400 60 0001 C CNN
@@ -730,8 +730,8 @@ L GND #U$?
U 1 1 5828FC47
P 4400 4400
AR Path="/578AFEF2/5828FC47" Ref="#U$?" Part="1"
-AR Path="/578AFEF4/5828FC47" Ref="#U$204" Part="1"
-F 0 "#U$204" H 4310 4300 70 0001 L BNN
+AR Path="/578AFEF4/5828FC47" Ref="#U$027" Part="1"
+F 0 "#U$027" H 4310 4300 70 0001 L BNN
F 1 "GND" H 4310 4300 70 0001 L BNN
F 2 "" H 4400 4400 60 0001 C CNN
F 3 "" H 4400 4400 60 0001 C CNN
@@ -793,10 +793,10 @@ F 3 "" H 3000 2800 60 0001 C CNN
$EndComp
NoConn ~ 5800 3800
$Comp
-L POWERED #FLG201
+L POWERED #FLG028
U 1 1 5828FC75
P 5700 2100
-F 0 "#FLG201" H 5900 2000 60 0001 C CNN
+F 0 "#FLG028" H 5900 2000 60 0001 C CNN
F 1 "POWERED" H 5700 2150 60 0000 C CNN
F 2 "" H 5700 2100 60 0001 C CNN
F 3 "" H 5700 2100 60 0001 C CNN
diff --git a/hw/codec.sch b/hw/codec.sch
index 5b5190d..16f9e0e 100644
--- a/hw/codec.sch
+++ b/hw/codec.sch
@@ -337,10 +337,10 @@ F 3 "" H 5500 9550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1019
+L GND #U$0183
U 1 1 578C343A
P 14850 4700
-F 0 "#U$1019" H 14760 4600 70 0001 L BNN
+F 0 "#U$0183" H 14760 4600 70 0001 L BNN
F 1 "GND" H 14760 4600 70 0001 L BNN
F 2 "" H 14850 4700 60 0001 C CNN
F 3 "" H 14850 4700 60 0001 C CNN
@@ -348,10 +348,10 @@ F 3 "" H 14850 4700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1017
+L GND #U$0184
U 1 1 578C349E
P 12200 4600
-F 0 "#U$1017" H 12110 4500 70 0001 L BNN
+F 0 "#U$0184" H 12110 4500 70 0001 L BNN
F 1 "GND" H 12110 4500 70 0001 L BNN
F 2 "" H 12200 4600 60 0001 C CNN
F 3 "" H 12200 4600 60 0001 C CNN
@@ -359,10 +359,10 @@ F 3 "" H 12200 4600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1016
+L GND #U$0185
U 1 1 578C3502
P 12200 3900
-F 0 "#U$1016" H 12110 3800 70 0001 L BNN
+F 0 "#U$0185" H 12110 3800 70 0001 L BNN
F 1 "GND" H 12110 3800 70 0001 L BNN
F 2 "" H 12200 3900 60 0001 C CNN
F 3 "" H 12200 3900 60 0001 C CNN
@@ -370,10 +370,10 @@ F 3 "" H 12200 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1015
+L GND #U$0186
U 1 1 578C3566
P 12200 3200
-F 0 "#U$1015" H 12110 3100 70 0001 L BNN
+F 0 "#U$0186" H 12110 3100 70 0001 L BNN
F 1 "GND" H 12110 3100 70 0001 L BNN
F 2 "" H 12200 3200 60 0001 C CNN
F 3 "" H 12200 3200 60 0001 C CNN
@@ -815,10 +815,10 @@ NoConn ~ 8400 8950
NoConn ~ 8400 9350
NoConn ~ 8400 9550
$Comp
-L POWERED #FLG1003
+L POWERED #FLG0187
U 1 1 57916214
P 12800 2450
-F 0 "#FLG1003" H 13000 2350 60 0001 C CNN
+F 0 "#FLG0187" H 13000 2350 60 0001 C CNN
F 1 "POWERED" H 12800 2500 60 0000 C CNN
F 2 "" H 12800 2450 60 0001 C CNN
F 3 "" H 12800 2450 60 0001 C CNN
@@ -826,10 +826,10 @@ F 3 "" H 12800 2450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1004
+L POWERED #FLG0188
U 1 1 579165D6
P 12800 3150
-F 0 "#FLG1004" H 13000 3050 60 0001 C CNN
+F 0 "#FLG0188" H 13000 3050 60 0001 C CNN
F 1 "POWERED" H 12800 3200 60 0000 C CNN
F 2 "" H 12800 3150 60 0001 C CNN
F 3 "" H 12800 3150 60 0001 C CNN
@@ -837,10 +837,10 @@ F 3 "" H 12800 3150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1005
+L POWERED #FLG0189
U 1 1 57916695
P 12800 3850
-F 0 "#FLG1005" H 13000 3750 60 0001 C CNN
+F 0 "#FLG0189" H 13000 3750 60 0001 C CNN
F 1 "POWERED" H 12800 3900 60 0000 C CNN
F 2 "" H 12800 3850 60 0001 C CNN
F 3 "" H 12800 3850 60 0001 C CNN
@@ -887,10 +887,10 @@ Wire Wire Line
Wire Wire Line
4000 1300 4000 2850
$Comp
-L GND #U$1010
+L GND #U$0190
U 1 1 57E87A17
P 7100 3300
-F 0 "#U$1010" H 7010 3200 70 0001 L BNN
+F 0 "#U$0190" H 7010 3200 70 0001 L BNN
F 1 "GND" H 7010 3200 70 0001 L BNN
F 2 "" H 7100 3300 60 0001 C CNN
F 3 "" H 7100 3300 60 0001 C CNN
@@ -898,10 +898,10 @@ F 3 "" H 7100 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1008
+L GND #U$0191
U 1 1 57E87F68
P 3900 3300
-F 0 "#U$1008" H 3810 3200 70 0001 L BNN
+F 0 "#U$0191" H 3810 3200 70 0001 L BNN
F 1 "GND" H 3810 3200 70 0001 L BNN
F 2 "" H 3900 3300 60 0001 C CNN
F 3 "" H 3900 3300 60 0001 C CNN
@@ -1047,10 +1047,10 @@ Wire Wire Line
6700 1900 5800 1900
Connection ~ 2400 1900
$Comp
-L GND #U$1009
+L GND #U$0192
U 1 1 58146910
P 5300 5400
-F 0 "#U$1009" H 5210 5300 70 0001 L BNN
+F 0 "#U$0192" H 5210 5300 70 0001 L BNN
F 1 "GND" H 5210 5300 70 0001 L BNN
F 2 "" H 5300 5400 60 0001 C CNN
F 3 "" H 5300 5400 60 0001 C CNN
@@ -1107,10 +1107,10 @@ Wire Wire Line
Text GLabel 9400 9150 2 60 UnSpc ~ 0
HB_AUDIO_GND
$Comp
-L GND #U$1011
+L GND #U$0193
U 1 1 581671CE
P 9200 9400
-F 0 "#U$1011" H 9110 9300 70 0001 L BNN
+F 0 "#U$0193" H 9110 9300 70 0001 L BNN
F 1 "GND" H 9110 9300 70 0001 L BNN
F 2 "" H 9200 9400 60 0001 C CNN
F 3 "" H 9200 9400 60 0001 C CNN
@@ -1424,10 +1424,10 @@ F 3 "" H 14300 9300 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #U$1014
+L GND #U$0194
U 1 1 58293670
P 11650 7400
-F 0 "#U$1014" H 11560 7300 70 0001 L BNN
+F 0 "#U$0194" H 11560 7300 70 0001 L BNN
F 1 "GND" H 11560 7300 70 0001 L BNN
F 2 "" H 11650 7400 60 0001 C CNN
F 3 "" H 11650 7400 60 0001 C CNN
@@ -1435,10 +1435,10 @@ F 3 "" H 11650 7400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1013
+L GND #U$0195
U 1 1 58293676
P 11500 6550
-F 0 "#U$1013" H 11410 6450 70 0001 L BNN
+F 0 "#U$0195" H 11410 6450 70 0001 L BNN
F 1 "GND" H 11410 6450 70 0001 L BNN
F 2 "" H 11500 6550 60 0001 C CNN
F 3 "" H 11500 6550 60 0001 C CNN
@@ -1446,10 +1446,10 @@ F 3 "" H 11500 6550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1012
+L GND #U$0196
U 1 1 5829367C
P 10800 6450
-F 0 "#U$1012" H 10710 6350 70 0001 L BNN
+F 0 "#U$0196" H 10710 6350 70 0001 L BNN
F 1 "GND" H 10710 6350 70 0001 L BNN
F 2 "" H 10800 6450 60 0001 C CNN
F 3 "" H 10800 6450 60 0001 C CNN
@@ -1457,10 +1457,10 @@ F 3 "" H 10800 6450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1018
+L GND #U$0197
U 1 1 58293682
P 14500 10100
-F 0 "#U$1018" H 14410 10000 70 0001 L BNN
+F 0 "#U$0197" H 14410 10000 70 0001 L BNN
F 1 "GND" H 14410 10000 70 0001 L BNN
F 2 "" H 14500 10100 60 0001 C CNN
F 3 "" H 14500 10100 60 0001 C CNN
@@ -1468,10 +1468,10 @@ F 3 "" H 14500 10100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1020
+L GND #U$0198
U 1 1 58293688
P 15150 7550
-F 0 "#U$1020" H 15060 7450 70 0001 L BNN
+F 0 "#U$0198" H 15060 7450 70 0001 L BNN
F 1 "GND" H 15060 7450 70 0001 L BNN
F 2 "" H 15150 7550 60 0001 C CNN
F 3 "" H 15150 7550 60 0001 C CNN
@@ -1768,10 +1768,10 @@ F 3 "" H 2550 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1001
+L GND-3 #U$0199
U 1 1 58293743
P 1600 6500
-F 0 "#U$1001" H 1480 6401 70 0001 L BNN
+F 0 "#U$0199" H 1480 6401 70 0001 L BNN
F 1 "GND3" H 1480 6401 70 0001 L BNN
F 2 "" H 1600 6500 60 0001 C CNN
F 3 "" H 1600 6500 60 0001 C CNN
@@ -1779,10 +1779,10 @@ F 3 "" H 1600 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1006
+L GND-3 #U$0200
U 1 1 58293749
P 3450 6500
-F 0 "#U$1006" H 3330 6401 70 0001 L BNN
+F 0 "#U$0200" H 3330 6401 70 0001 L BNN
F 1 "GND3" H 3330 6401 70 0001 L BNN
F 2 "" H 3450 6500 60 0001 C CNN
F 3 "" H 3450 6500 60 0001 C CNN
@@ -1790,10 +1790,10 @@ F 3 "" H 3450 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1004
+L GND-3 #U$0201
U 1 1 5829374F
P 3150 6500
-F 0 "#U$1004" H 3030 6401 70 0001 L BNN
+F 0 "#U$0201" H 3030 6401 70 0001 L BNN
F 1 "GND3" H 3030 6401 70 0001 L BNN
F 2 "" H 3150 6500 60 0001 C CNN
F 3 "" H 3150 6500 60 0001 C CNN
@@ -1801,10 +1801,10 @@ F 3 "" H 3150 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1002
+L GND-3 #U$0202
U 1 1 58293755
P 1600 8100
-F 0 "#U$1002" H 1480 8001 70 0001 L BNN
+F 0 "#U$0202" H 1480 8001 70 0001 L BNN
F 1 "GND3" H 1480 8001 70 0001 L BNN
F 2 "" H 1600 8100 60 0001 C CNN
F 3 "" H 1600 8100 60 0001 C CNN
@@ -1812,10 +1812,10 @@ F 3 "" H 1600 8100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1007
+L GND-3 #U$0203
U 1 1 5829375B
P 3450 8100
-F 0 "#U$1007" H 3330 8001 70 0001 L BNN
+F 0 "#U$0203" H 3330 8001 70 0001 L BNN
F 1 "GND3" H 3330 8001 70 0001 L BNN
F 2 "" H 3450 8100 60 0001 C CNN
F 3 "" H 3450 8100 60 0001 C CNN
@@ -1823,10 +1823,10 @@ F 3 "" H 3450 8100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1003
+L GND-3 #U$0204
U 1 1 58293764
P 2000 6500
-F 0 "#U$1003" H 1880 6401 70 0001 L BNN
+F 0 "#U$0204" H 1880 6401 70 0001 L BNN
F 1 "GND3" H 1880 6401 70 0001 L BNN
F 2 "" H 2000 6500 60 0001 C CNN
F 3 "" H 2000 6500 60 0001 C CNN
@@ -1834,10 +1834,10 @@ F 3 "" H 2000 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1005
+L GND-3 #U$0205
U 1 1 5829376A
P 3150 8100
-F 0 "#U$1005" H 3030 8001 70 0001 L BNN
+F 0 "#U$0205" H 3030 8001 70 0001 L BNN
F 1 "GND3" H 3030 8001 70 0001 L BNN
F 2 "" H 3150 8100 60 0001 C CNN
F 3 "" H 3150 8100 60 0001 C CNN
@@ -1927,10 +1927,10 @@ Wire Wire Line
Wire Wire Line
1600 7650 1600 7600
$Comp
-L POWERED #FLG1001
+L POWERED #FLG0206
U 1 1 582937A1
P 3450 5300
-F 0 "#FLG1001" H 3650 5200 60 0001 C CNN
+F 0 "#FLG0206" H 3650 5200 60 0001 C CNN
F 1 "POWERED" H 3450 5350 60 0000 C CNN
F 2 "" H 3450 5300 60 0001 C CNN
F 3 "" H 3450 5300 60 0001 C CNN
@@ -1938,10 +1938,10 @@ F 3 "" H 3450 5300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1002
+L POWERED #FLG0207
U 1 1 582937A7
P 3450 6900
-F 0 "#FLG1002" H 3650 6800 60 0001 C CNN
+F 0 "#FLG0207" H 3650 6800 60 0001 C CNN
F 1 "POWERED" H 3450 6950 60 0000 C CNN
F 2 "" H 3450 6900 60 0001 C CNN
F 3 "" H 3450 6900 60 0001 C CNN
diff --git a/hw/display.sch b/hw/display.sch
index e292953..83be6bc 100644
--- a/hw/display.sch
+++ b/hw/display.sch
@@ -334,10 +334,10 @@ F 3 "" H 8150 3850 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND-3 #U$1925
+L GND-3 #U$0339
U 1 1 578D8B0E
P 12550 7950
-F 0 "#U$1925" H 12430 7851 70 0001 L BNN
+F 0 "#U$0339" H 12430 7851 70 0001 L BNN
F 1 "GND3" H 12430 7851 70 0001 L BNN
F 2 "" H 12550 7950 60 0001 C CNN
F 3 "" H 12550 7950 60 0001 C CNN
@@ -345,10 +345,10 @@ F 3 "" H 12550 7950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1903
+L GND-3 #U$0340
U 1 1 578D8B72
P 3650 2650
-F 0 "#U$1903" H 3530 2551 70 0001 L BNN
+F 0 "#U$0340" H 3530 2551 70 0001 L BNN
F 1 "GND3" H 3530 2551 70 0001 L BNN
F 2 "" H 3650 2650 60 0001 C CNN
F 3 "" H 3650 2650 60 0001 C CNN
@@ -356,10 +356,10 @@ F 3 "" H 3650 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1907
+L GND-3 #U$0341
U 1 1 578D8BD6
P 4850 2650
-F 0 "#U$1907" H 4730 2551 70 0001 L BNN
+F 0 "#U$0341" H 4730 2551 70 0001 L BNN
F 1 "GND3" H 4730 2551 70 0001 L BNN
F 2 "" H 4850 2650 60 0001 C CNN
F 3 "" H 4850 2650 60 0001 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 4850 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1917
+L GND-3 #U$0342
U 1 1 578D8C3A
P 8150 4250
-F 0 "#U$1917" H 8030 4151 70 0001 L BNN
+F 0 "#U$0342" H 8030 4151 70 0001 L BNN
F 1 "GND3" H 8030 4151 70 0001 L BNN
F 2 "" H 8150 4250 60 0001 C CNN
F 3 "" H 8150 4250 60 0001 C CNN
@@ -378,10 +378,10 @@ F 3 "" H 8150 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1918
+L GND-3 #U$0343
U 1 1 578D8C9E
P 8500 4250
-F 0 "#U$1918" H 8380 4151 70 0001 L BNN
+F 0 "#U$0343" H 8380 4151 70 0001 L BNN
F 1 "GND3" H 8380 4151 70 0001 L BNN
F 2 "" H 8500 4250 60 0001 C CNN
F 3 "" H 8500 4250 60 0001 C CNN
@@ -389,10 +389,10 @@ F 3 "" H 8500 4250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1908
+L GND-3 #U$0344
U 1 1 578D8D02
P 5450 1600
-F 0 "#U$1908" H 5330 1501 70 0001 L BNN
+F 0 "#U$0344" H 5330 1501 70 0001 L BNN
F 1 "GND3" H 5330 1501 70 0001 L BNN
F 2 "" H 5450 1600 60 0001 C CNN
F 3 "" H 5450 1600 60 0001 C CNN
@@ -400,10 +400,10 @@ F 3 "" H 5450 1600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1901
+L GND-3 #U$0345
U 1 1 578D8D66
P 2750 2650
-F 0 "#U$1901" H 2630 2551 70 0001 L BNN
+F 0 "#U$0345" H 2630 2551 70 0001 L BNN
F 1 "GND3" H 2630 2551 70 0001 L BNN
F 2 "" H 2750 2650 60 0001 C CNN
F 3 "" H 2750 2650 60 0001 C CNN
@@ -411,10 +411,10 @@ F 3 "" H 2750 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1922
+L GND-3 #U$0346
U 1 1 578D8DCA
P 11800 9100
-F 0 "#U$1922" H 11680 9001 70 0001 L BNN
+F 0 "#U$0346" H 11680 9001 70 0001 L BNN
F 1 "GND3" H 11680 9001 70 0001 L BNN
F 2 "" H 11800 9100 60 0001 C CNN
F 3 "" H 11800 9100 60 0001 C CNN
@@ -485,7 +485,7 @@ U 1 1 57EA0C38
P 4300 1800
F 0 "U1901" H 4000 2150 50 0000 L CNN
F 1 "TPS61160DRV" H 4300 1450 50 0000 C CNN
-F 2 "SOT23-5" H 4330 1950 20 0001 C CNN
+F 2 "neo900-legacy:SOT23-5" H 4330 1950 20 0001 C CNN
F 3 "" H 4300 1800 60 0001 C CNN
1 4300 1800
1 0 0 -1
@@ -502,10 +502,10 @@ F 3 "" H 3200 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1902
+L GND-3 #U$0347
U 1 1 57EA1082
P 3200 2650
-F 0 "#U$1902" H 3080 2551 70 0001 L BNN
+F 0 "#U$0347" H 3080 2551 70 0001 L BNN
F 1 "GND3" H 3080 2551 70 0001 L BNN
F 2 "" H 3200 2650 60 0001 C CNN
F 3 "" H 3200 2650 60 0001 C CNN
@@ -518,7 +518,7 @@ U 1 1 57EA005E
P 7000 2150
F 0 "Q1901" H 6950 2500 60 0000 C CNN
F 1 "PMBT3906VS" H 7000 1800 60 0000 C CNN
-F 2 "" H 7000 2150 60 0000 C CNN
+F 2 "" H 7000 2150 60 0001 C CNN
F 3 "" H 7000 2150 60 0000 C CNN
1 7000 2150
1 0 0 -1
@@ -545,10 +545,10 @@ F 3 "" H 5500 3450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1910
+L GND-3 #U$0348
U 1 1 57EAA1FC
P 5500 3850
-F 0 "#U$1910" H 5380 3751 70 0001 L BNN
+F 0 "#U$0348" H 5380 3751 70 0001 L BNN
F 1 "GND3" H 5380 3751 70 0001 L BNN
F 2 "" H 5500 3850 60 0001 C CNN
F 3 "" H 5500 3850 60 0001 C CNN
@@ -690,10 +690,10 @@ F 3 "" H 3950 3450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1904
+L GND-3 #U$0349
U 1 1 57EAC98D
P 3950 3850
-F 0 "#U$1904" H 3830 3751 70 0001 L BNN
+F 0 "#U$0349" H 3830 3751 70 0001 L BNN
F 1 "GND3" H 3830 3751 70 0001 L BNN
F 2 "" H 3950 3850 60 0001 C CNN
F 3 "" H 3950 3850 60 0001 C CNN
@@ -703,10 +703,10 @@ $EndComp
Text GLabel 3850 2900 0 60 Input ~ 0
1V8
$Comp
-L GND-3 #U$1906
+L GND-3 #U$0350
U 1 1 57EACF94
P 4400 3850
-F 0 "#U$1906" H 4280 3751 70 0001 L BNN
+F 0 "#U$0350" H 4280 3751 70 0001 L BNN
F 1 "GND3" H 4280 3751 70 0001 L BNN
F 2 "" H 4400 3850 60 0001 C CNN
F 3 "" H 4400 3850 60 0001 C CNN
@@ -739,16 +739,16 @@ U 1 1 5808428D
P 9700 2100
F 0 "U1906" H 10300 1750 50 0000 R CNN
F 1 "ESDA25-4BP6" H 9250 2100 50 0000 R CNN
-F 2 "SOT666IP" H 9730 2250 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 9730 2250 20 0001 C CNN
F 3 "" H 9700 2100 60 0001 C CNN
1 9700 2100
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$1921
+L GND-3 #U$0351
U 1 1 58084500
P 9950 1600
-F 0 "#U$1921" H 9830 1501 70 0001 L BNN
+F 0 "#U$0351" H 9830 1501 70 0001 L BNN
F 1 "GND3" H 9830 1501 70 0001 L BNN
F 2 "" H 9950 1600 60 0001 C CNN
F 3 "" H 9950 1600 60 0001 C CNN
@@ -812,10 +812,10 @@ F 3 "" H 13700 5600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1923
+L GND-3 #U$0352
U 1 1 58085F95
P 12100 6000
-F 0 "#U$1923" H 11980 5901 70 0001 L BNN
+F 0 "#U$0352" H 11980 5901 70 0001 L BNN
F 1 "GND3" H 11980 5901 70 0001 L BNN
F 2 "" H 12100 6000 60 0001 C CNN
F 3 "" H 12100 6000 60 0001 C CNN
@@ -823,10 +823,10 @@ F 3 "" H 12100 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1924
+L GND-3 #U$0353
U 1 1 58086059
P 12500 6000
-F 0 "#U$1924" H 12380 5901 70 0001 L BNN
+F 0 "#U$0353" H 12380 5901 70 0001 L BNN
F 1 "GND3" H 12380 5901 70 0001 L BNN
F 2 "" H 12500 6000 60 0001 C CNN
F 3 "" H 12500 6000 60 0001 C CNN
@@ -834,10 +834,10 @@ F 3 "" H 12500 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1927
+L GND-3 #U$0354
U 1 1 580860D3
P 12900 6000
-F 0 "#U$1927" H 12780 5901 70 0001 L BNN
+F 0 "#U$0354" H 12780 5901 70 0001 L BNN
F 1 "GND3" H 12780 5901 70 0001 L BNN
F 2 "" H 12900 6000 60 0001 C CNN
F 3 "" H 12900 6000 60 0001 C CNN
@@ -845,10 +845,10 @@ F 3 "" H 12900 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1928
+L GND-3 #U$0355
U 1 1 5808614D
P 13300 6000
-F 0 "#U$1928" H 13180 5901 70 0001 L BNN
+F 0 "#U$0355" H 13180 5901 70 0001 L BNN
F 1 "GND3" H 13180 5901 70 0001 L BNN
F 2 "" H 13300 6000 60 0001 C CNN
F 3 "" H 13300 6000 60 0001 C CNN
@@ -856,10 +856,10 @@ F 3 "" H 13300 6000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1929
+L GND-3 #U$0356
U 1 1 580861C7
P 13700 6000
-F 0 "#U$1929" H 13580 5901 70 0001 L BNN
+F 0 "#U$0356" H 13580 5901 70 0001 L BNN
F 1 "GND3" H 13580 5901 70 0001 L BNN
F 2 "" H 13700 6000 60 0001 C CNN
F 3 "" H 13700 6000 60 0001 C CNN
@@ -875,16 +875,16 @@ AR Path="/578AFEFC/5808B272" Ref="U?" Part="1"
AR Path="/578AFF20/5808B272" Ref="U1904" Part="1"
F 0 "U1904" H 5250 7550 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 5900 6900 50 0000 L CNN
-F 2 "SOT666IP" H 5730 7450 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 5730 7450 20 0001 C CNN
F 3 "" H 5700 7300 60 0001 C CNN
1 5700 7300
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1911
+L GND-3 #U$0357
U 1 1 5808B8B6
P 5800 8000
-F 0 "#U$1911" H 5680 7901 70 0001 L BNN
+F 0 "#U$0357" H 5680 7901 70 0001 L BNN
F 1 "GND3" H 5680 7901 70 0001 L BNN
F 2 "" H 5800 8000 60 0001 C CNN
F 3 "" H 5800 8000 60 0001 C CNN
@@ -900,16 +900,16 @@ AR Path="/578AFEFC/5808BAFF" Ref="U?" Part="1"
AR Path="/578AFF20/5808BAFF" Ref="U1905" Part="1"
F 0 "U1905" H 6750 7550 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 7400 6900 50 0000 L CNN
-F 2 "SOT666IP" H 7230 7450 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 7230 7450 20 0001 C CNN
F 3 "" H 7200 7300 60 0001 C CNN
1 7200 7300
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1915
+L GND-3 #U$0358
U 1 1 5808BB05
P 7300 8000
-F 0 "#U$1915" H 7180 7901 70 0001 L BNN
+F 0 "#U$0358" H 7180 7901 70 0001 L BNN
F 1 "GND3" H 7180 7901 70 0001 L BNN
F 2 "" H 7300 8000 60 0001 C CNN
F 3 "" H 7300 8000 60 0001 C CNN
@@ -922,16 +922,16 @@ U 1 1 5808D7DA
P 12400 2100
F 0 "U1908" H 13000 1750 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 11950 2100 50 0000 R CNN
-F 2 "SOT666IP" H 12430 2250 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 12430 2250 20 0001 C CNN
F 3 "" H 12400 2100 60 0001 C CNN
1 12400 2100
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$1926
+L GND-3 #U$0359
U 1 1 5808D7E0
P 12650 1600
-F 0 "#U$1926" H 12530 1501 70 0001 L BNN
+F 0 "#U$0359" H 12530 1501 70 0001 L BNN
F 1 "GND3" H 12530 1501 70 0001 L BNN
F 2 "" H 12650 1600 60 0001 C CNN
F 3 "" H 12650 1600 60 0001 C CNN
@@ -1348,7 +1348,7 @@ U 1 1 580922A0
P 14150 4600
F 0 "L1906" V 14066 4450 50 0000 L CNN
F 1 "120R/100MHz" V 14200 4800 50 0000 L CNN
-F 2 "SMD-0603" H 14180 4750 50 0001 C CNN
+F 2 "neo900-legacy:SMD-0603" H 14180 4750 50 0001 C CNN
F 3 "" H 14150 4600 60 0001 C CNN
1 14150 4600
0 1 1 0
@@ -1359,7 +1359,7 @@ U 1 1 5809262D
P 14150 4800
F 0 "L1907" V 14066 4650 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5000 50 0000 L CNN
-F 2 "SMD-0603" H 14180 4950 50 0001 C CNN
+F 2 "neo900-legacy:SMD-0603" H 14180 4950 50 0001 C CNN
F 3 "" H 14150 4800 60 0001 C CNN
1 14150 4800
0 1 1 0
@@ -1370,7 +1370,7 @@ U 1 1 580926BF
P 14150 5000
F 0 "L1908" V 14066 4850 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5200 50 0000 L CNN
-F 2 "SMD-0603" H 14180 5150 50 0001 C CNN
+F 2 "neo900-legacy:SMD-0603" H 14180 5150 50 0001 C CNN
F 3 "" H 14150 5000 60 0001 C CNN
1 14150 5000
0 1 1 0
@@ -1381,7 +1381,7 @@ U 1 1 58092754
P 14150 5200
F 0 "L1909" V 14066 5050 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5400 50 0000 L CNN
-F 2 "SMD-0603" H 14180 5350 50 0001 C CNN
+F 2 "neo900-legacy:SMD-0603" H 14180 5350 50 0001 C CNN
F 3 "" H 14150 5200 60 0001 C CNN
1 14150 5200
0 1 1 0
@@ -1392,7 +1392,7 @@ U 1 1 580927EE
P 14150 5400
F 0 "L1910" V 14066 5250 50 0000 L CNN
F 1 "120R/100MHz" V 14200 5600 50 0000 L CNN
-F 2 "SMD-0603" H 14180 5550 50 0001 C CNN
+F 2 "neo900-legacy:SMD-0603" H 14180 5550 50 0001 C CNN
F 3 "" H 14150 5400 60 0001 C CNN
1 14150 5400
0 1 1 0
@@ -1431,10 +1431,10 @@ F 3 "" H 14300 3300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1930
+L GND-3 #U$0360
U 1 1 58093A88
P 13900 3700
-F 0 "#U$1930" H 13780 3601 70 0001 L BNN
+F 0 "#U$0360" H 13780 3601 70 0001 L BNN
F 1 "GND3" H 13780 3601 70 0001 L BNN
F 2 "" H 13900 3700 60 0001 C CNN
F 3 "" H 13900 3700 60 0001 C CNN
@@ -1442,10 +1442,10 @@ F 3 "" H 13900 3700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1931
+L GND-3 #U$0361
U 1 1 58093B23
P 14300 3700
-F 0 "#U$1931" H 14180 3601 70 0001 L BNN
+F 0 "#U$0361" H 14180 3601 70 0001 L BNN
F 1 "GND3" H 14180 3601 70 0001 L BNN
F 2 "" H 14300 3700 60 0001 C CNN
F 3 "" H 14300 3700 60 0001 C CNN
@@ -1471,10 +1471,10 @@ TODO: check choke
Wire Wire Line
12550 7800 12550 7850
$Comp
-L POWERED #FLG1902
+L POWERED #FLG0362
U 1 1 580A5F1E
P 12200 4050
-F 0 "#FLG1902" H 12400 3950 60 0001 C CNN
+F 0 "#FLG0362" H 12400 3950 60 0001 C CNN
F 1 "POWERED" H 12200 4100 60 0000 C CNN
F 2 "" H 12200 4050 60 0001 C CNN
F 3 "" H 12200 4050 60 0001 C CNN
@@ -1482,10 +1482,10 @@ F 3 "" H 12200 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1903
+L POWERED #FLG0363
U 1 1 580A6140
P 12600 4300
-F 0 "#FLG1903" H 12800 4200 60 0001 C CNN
+F 0 "#FLG0363" H 12800 4200 60 0001 C CNN
F 1 "POWERED" H 12600 4350 60 0000 C CNN
F 2 "" H 12600 4300 60 0001 C CNN
F 3 "" H 12600 4300 60 0001 C CNN
@@ -1493,10 +1493,10 @@ F 3 "" H 12600 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1904
+L POWERED #FLG0364
U 1 1 580A630F
P 13000 4050
-F 0 "#FLG1904" H 13200 3950 60 0001 C CNN
+F 0 "#FLG0364" H 13200 3950 60 0001 C CNN
F 1 "POWERED" H 13000 4100 60 0000 C CNN
F 2 "" H 13000 4050 60 0001 C CNN
F 3 "" H 13000 4050 60 0001 C CNN
@@ -1504,10 +1504,10 @@ F 3 "" H 13000 4050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1905
+L POWERED #FLG0365
U 1 1 580A63AA
P 13400 4300
-F 0 "#FLG1905" H 13600 4200 60 0001 C CNN
+F 0 "#FLG0365" H 13600 4200 60 0001 C CNN
F 1 "POWERED" H 13400 4350 60 0000 C CNN
F 2 "" H 13400 4300 60 0001 C CNN
F 3 "" H 13400 4300 60 0001 C CNN
@@ -1515,10 +1515,10 @@ F 3 "" H 13400 4300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG1906
+L POWERED #FLG0366
U 1 1 580A6445
P 13800 4050
-F 0 "#FLG1906" H 14000 3950 60 0001 C CNN
+F 0 "#FLG0366" H 14000 3950 60 0001 C CNN
F 1 "POWERED" H 13800 4100 60 0000 C CNN
F 2 "" H 13800 4050 60 0001 C CNN
F 3 "" H 13800 4050 60 0001 C CNN
@@ -1700,10 +1700,10 @@ F 3 "" H 6550 9100 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1916
+L GND-3 #U$0367
U 1 1 582957EA
P 7750 10250
-F 0 "#U$1916" H 7630 10151 70 0001 L BNN
+F 0 "#U$0367" H 7630 10151 70 0001 L BNN
F 1 "GND3" H 7630 10151 70 0001 L BNN
F 2 "" H 7750 10250 60 0001 C CNN
F 3 "" H 7750 10250 60 0001 C CNN
@@ -1711,10 +1711,10 @@ F 3 "" H 7750 10250 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1919
+L GND-3 #U$0368
U 1 1 582957F0
P 8600 9550
-F 0 "#U$1919" H 8480 9451 70 0001 L BNN
+F 0 "#U$0368" H 8480 9451 70 0001 L BNN
F 1 "GND3" H 8480 9451 70 0001 L BNN
F 2 "" H 8600 9550 60 0001 C CNN
F 3 "" H 8600 9550 60 0001 C CNN
@@ -1722,10 +1722,10 @@ F 3 "" H 8600 9550 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1909
+L GND-3 #U$0369
U 1 1 582957F6
P 5450 10850
-F 0 "#U$1909" H 5330 10751 70 0001 L BNN
+F 0 "#U$0369" H 5330 10751 70 0001 L BNN
F 1 "GND3" H 5330 10751 70 0001 L BNN
F 2 "" H 5450 10850 60 0001 C CNN
F 3 "" H 5450 10850 60 0001 C CNN
@@ -1733,10 +1733,10 @@ F 3 "" H 5450 10850 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1912
+L GND-3 #U$0370
U 1 1 582957FC
P 6050 10850
-F 0 "#U$1912" H 5930 10751 70 0001 L BNN
+F 0 "#U$0370" H 5930 10751 70 0001 L BNN
F 1 "GND3" H 5930 10751 70 0001 L BNN
F 2 "" H 6050 10850 60 0001 C CNN
F 3 "" H 6050 10850 60 0001 C CNN
@@ -1744,10 +1744,10 @@ F 3 "" H 6050 10850 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1914
+L GND-3 #U$0371
U 1 1 58295802
P 6750 10850
-F 0 "#U$1914" H 6630 10751 70 0001 L BNN
+F 0 "#U$0371" H 6630 10751 70 0001 L BNN
F 1 "GND3" H 6630 10751 70 0001 L BNN
F 2 "" H 6750 10850 60 0001 C CNN
F 3 "" H 6750 10850 60 0001 C CNN
@@ -1755,10 +1755,10 @@ F 3 "" H 6750 10850 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1905
+L GND-3 #U$0372
U 1 1 58295808
P 3950 8800
-F 0 "#U$1905" H 3830 8701 70 0001 L BNN
+F 0 "#U$0372" H 3830 8701 70 0001 L BNN
F 1 "GND3" H 3830 8701 70 0001 L BNN
F 2 "" H 3950 8800 60 0001 C CNN
F 3 "" H 3950 8800 60 0001 C CNN
@@ -1889,10 +1889,10 @@ Wire Wire Line
8250 9300 8250 9400
Connection ~ 8250 9400
$Comp
-L GND-3 #U$1913
+L GND-3 #U$0373
U 1 1 5829585B
P 6400 10850
-F 0 "#U$1913" H 6280 10751 70 0001 L BNN
+F 0 "#U$0373" H 6280 10751 70 0001 L BNN
F 1 "GND3" H 6280 10751 70 0001 L BNN
F 2 "" H 6400 10850 60 0001 C CNN
F 3 "" H 6400 10850 60 0001 C CNN
@@ -1908,10 +1908,10 @@ Wire Wire Line
7750 9800 7750 9850
NoConn ~ 5950 8500
$Comp
-L POWERED #FLG1901
+L POWERED #FLG0374
U 1 1 58295866
P 6550 9500
-F 0 "#FLG1901" H 6750 9400 60 0001 C CNN
+F 0 "#FLG0374" H 6750 9400 60 0001 C CNN
F 1 "POWERED" H 6550 9550 60 0000 C CNN
F 2 "" H 6550 9500 60 0001 C CNN
F 3 "" H 6550 9500 60 0001 C CNN
@@ -1935,16 +1935,16 @@ AR Path="/578AFF20/58295871" Ref="U1907" Part="1"
AR Path="/578AFF1E/58295871" Ref="U?" Part="1"
F 0 "U1907" H 9250 9800 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 9700 9200 50 0000 R CNN
-F 2 "SOT666IP" H 9730 9750 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 9730 9750 20 0001 C CNN
F 3 "" H 9700 9600 60 0001 C CNN
1 9700 9600
-1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1920
+L GND-3 #U$0375
U 1 1 58295878
P 9600 10300
-F 0 "#U$1920" H 9480 10201 70 0001 L BNN
+F 0 "#U$0375" H 9480 10201 70 0001 L BNN
F 1 "GND3" H 9480 10201 70 0001 L BNN
F 2 "" H 9600 10300 60 0001 C CNN
F 3 "" H 9600 10300 60 0001 C CNN
diff --git a/hw/hb.sch b/hw/hb.sch
index e633d4b..57f7d28 100644
--- a/hw/hb.sch
+++ b/hw/hb.sch
@@ -196,8 +196,8 @@ L GND #U$?
U 1 1 57F474BB
P 2700 3650
AR Path="/578AFF0C/57F474BB" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F474BB" Ref="#U$1601" Part="1"
-F 0 "#U$1601" H 2610 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474BB" Ref="#U$0300" Part="1"
+F 0 "#U$0300" H 2610 3550 70 0001 L BNN
F 1 "GND" H 2610 3550 70 0001 L BNN
F 2 "" H 2700 3650 60 0001 C CNN
F 3 "" H 2700 3650 60 0001 C CNN
@@ -209,8 +209,8 @@ L GND #U$?
U 1 1 57F474C1
P 3700 3650
AR Path="/578AFF0C/57F474C1" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F474C1" Ref="#U$1602" Part="1"
-F 0 "#U$1602" H 3610 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474C1" Ref="#U$0301" Part="1"
+F 0 "#U$0301" H 3610 3550 70 0001 L BNN
F 1 "GND" H 3610 3550 70 0001 L BNN
F 2 "" H 3700 3650 60 0001 C CNN
F 3 "" H 3700 3650 60 0001 C CNN
@@ -222,8 +222,8 @@ L GND #U$?
U 1 1 57F474C7
P 7400 3650
AR Path="/578AFF0C/57F474C7" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F474C7" Ref="#U$1603" Part="1"
-F 0 "#U$1603" H 7310 3550 70 0001 L BNN
+AR Path="/578AFF12/57F474C7" Ref="#U$0302" Part="1"
+F 0 "#U$0302" H 7310 3550 70 0001 L BNN
F 1 "GND" H 7310 3550 70 0001 L BNN
F 2 "" H 7400 3650 60 0001 C CNN
F 3 "" H 7400 3650 60 0001 C CNN
@@ -306,7 +306,7 @@ AR Path="/578AFF0C/57F474F9" Ref="R?" Part="1"
AR Path="/578AFF12/57F474F9" Ref="R1609" Part="1"
F 0 "R1609" V 9850 2200 50 0000 L CNN
F 1 "100k" H 9900 2100 50 0000 C CNN
-F 2 "SMD-0402" H 9930 2250 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 9930 2250 20 0001 C CNN
F 3 "" H 9900 2100 60 0001 C CNN
1 9900 2100
0 1 1 0
@@ -322,8 +322,8 @@ L GND #U$?
U 1 1 57F47503
P 10000 3200
AR Path="/578AFF0C/57F47503" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F47503" Ref="#U$1604" Part="1"
-F 0 "#U$1604" H 9910 3100 70 0001 L BNN
+AR Path="/578AFF12/57F47503" Ref="#U$0303" Part="1"
+F 0 "#U$0303" H 9910 3100 70 0001 L BNN
F 1 "GND" H 9910 3100 70 0001 L BNN
F 2 "" H 10000 3200 60 0001 C CNN
F 3 "" H 10000 3200 60 0001 C CNN
@@ -380,10 +380,10 @@ Connection ~ 12400 1950
Wire Wire Line
12400 1950 12400 1850
$Comp
-L POWERED #FLG1601
+L POWERED #FLG0304
U 1 1 57F47944
P 12400 1650
-F 0 "#FLG1601" H 12600 1550 60 0001 C CNN
+F 0 "#FLG0304" H 12600 1550 60 0001 C CNN
F 1 "POWERED" H 12400 1700 60 0000 C CNN
F 2 "" H 12400 1650 60 0001 C CNN
F 3 "" H 12400 1650 60 0001 C CNN
@@ -583,8 +583,8 @@ L GND #U$?
U 1 1 57F479A9
P 12250 2550
AR Path="/578AFF0C/57F479A9" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479A9" Ref="#U$1605" Part="1"
-F 0 "#U$1605" H 12160 2450 70 0001 L BNN
+AR Path="/578AFF12/57F479A9" Ref="#U$0305" Part="1"
+F 0 "#U$0305" H 12160 2450 70 0001 L BNN
F 1 "GND" H 12160 2450 70 0001 L BNN
F 2 "" H 12250 2550 60 0001 C CNN
F 3 "" H 12250 2550 60 0001 C CNN
@@ -596,8 +596,8 @@ L GND #U$?
U 1 1 57F479AF
P 12800 4250
AR Path="/578AFF0C/57F479AF" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479AF" Ref="#U$1606" Part="1"
-F 0 "#U$1606" H 12710 4150 70 0001 L BNN
+AR Path="/578AFF12/57F479AF" Ref="#U$0306" Part="1"
+F 0 "#U$0306" H 12710 4150 70 0001 L BNN
F 1 "GND" H 12710 4150 70 0001 L BNN
F 2 "" H 12800 4250 60 0001 C CNN
F 3 "" H 12800 4250 60 0001 C CNN
@@ -609,8 +609,8 @@ L GND #U$?
U 1 1 57F479B5
P 13700 5150
AR Path="/578AFF0C/57F479B5" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479B5" Ref="#U$1607" Part="1"
-F 0 "#U$1607" H 13610 5050 70 0001 L BNN
+AR Path="/578AFF12/57F479B5" Ref="#U$0307" Part="1"
+F 0 "#U$0307" H 13610 5050 70 0001 L BNN
F 1 "GND" H 13610 5050 70 0001 L BNN
F 2 "" H 13700 5150 60 0001 C CNN
F 3 "" H 13700 5150 60 0001 C CNN
@@ -633,8 +633,8 @@ L GND #U$?
U 1 1 57F479C1
P 14600 1800
AR Path="/578AFF0C/57F479C1" Ref="#U$?" Part="1"
-AR Path="/578AFF12/57F479C1" Ref="#U$1608" Part="1"
-F 0 "#U$1608" H 14510 1700 70 0001 L BNN
+AR Path="/578AFF12/57F479C1" Ref="#U$0308" Part="1"
+F 0 "#U$0308" H 14510 1700 70 0001 L BNN
F 1 "GND" H 14510 1700 70 0001 L BNN
F 2 "" H 14600 1800 60 0001 C CNN
F 3 "" H 14600 1800 60 0001 C CNN
@@ -695,7 +695,7 @@ U 1 1 58051285
P 1900 5400
F 0 "R1601" H 1770 5480 50 0000 L CNN
F 1 "100" H 1900 5400 50 0000 C CNN
-F 2 "SMD-0402" H 1930 5550 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1930 5550 20 0001 C CNN
F 3 "" H 1900 5400 60 0001 C CNN
1 1900 5400
1 0 0 -1
@@ -706,7 +706,7 @@ U 1 1 580517AD
P 1900 5900
F 0 "R1602" H 1770 5980 50 0000 L CNN
F 1 "100" H 1900 5900 50 0000 C CNN
-F 2 "SMD-0402" H 1930 6050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1930 6050 20 0001 C CNN
F 3 "" H 1900 5900 60 0001 C CNN
1 1900 5900
1 0 0 -1
@@ -717,7 +717,7 @@ U 1 1 58051F4D
P 1900 6800
F 0 "R1603" H 1770 6880 50 0000 L CNN
F 1 "100" H 1900 6800 50 0000 C CNN
-F 2 "SMD-0402" H 1930 6950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1930 6950 20 0001 C CNN
F 3 "" H 1900 6800 60 0001 C CNN
1 1900 6800
1 0 0 -1
@@ -728,7 +728,7 @@ U 1 1 58052024
P 1900 7300
F 0 "R1604" H 1770 7380 50 0000 L CNN
F 1 "100" H 1900 7300 50 0000 C CNN
-F 2 "SMD-0402" H 1930 7450 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1930 7450 20 0001 C CNN
F 3 "" H 1900 7300 60 0001 C CNN
1 1900 7300
1 0 0 -1
@@ -800,7 +800,7 @@ U 1 1 5805546D
P 5800 5400
F 0 "R1605" H 5670 5480 50 0000 L CNN
F 1 "100" H 5800 5400 50 0000 C CNN
-F 2 "SMD-0402" H 5830 5550 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5830 5550 20 0001 C CNN
F 3 "" H 5800 5400 60 0001 C CNN
1 5800 5400
1 0 0 -1
@@ -811,7 +811,7 @@ U 1 1 58055473
P 5800 5900
F 0 "R1606" H 5670 5980 50 0000 L CNN
F 1 "100" H 5800 5900 50 0000 C CNN
-F 2 "SMD-0402" H 5830 6050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5830 6050 20 0001 C CNN
F 3 "" H 5800 5900 60 0001 C CNN
1 5800 5900
1 0 0 -1
@@ -822,7 +822,7 @@ U 1 1 58055479
P 5800 6800
F 0 "R1607" H 5670 6880 50 0000 L CNN
F 1 "100" H 5800 6800 50 0000 C CNN
-F 2 "SMD-0402" H 5830 6950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5830 6950 20 0001 C CNN
F 3 "" H 5800 6800 60 0001 C CNN
1 5800 6800
1 0 0 -1
@@ -833,7 +833,7 @@ U 1 1 5805547F
P 5800 7300
F 0 "R1608" H 5670 7380 50 0000 L CNN
F 1 "100" H 5800 7300 50 0000 C CNN
-F 2 "SMD-0402" H 5830 7450 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5830 7450 20 0001 C CNN
F 3 "" H 5800 7300 60 0001 C CNN
1 5800 7300
1 0 0 -1
diff --git a/hw/ir.sch b/hw/ir.sch
index 5ccd894..3b68409 100644
--- a/hw/ir.sch
+++ b/hw/ir.sch
@@ -192,10 +192,10 @@ F 3 "" H 7300 5500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1401
+L GND #U$0269
U 1 1 578CFC75
P 4750 4200
-F 0 "#U$1401" H 4660 4100 70 0001 L BNN
+F 0 "#U$0269" H 4660 4100 70 0001 L BNN
F 1 "GND" H 4660 4100 70 0001 L BNN
F 2 "" H 4750 4200 60 0001 C CNN
F 3 "" H 4750 4200 60 0001 C CNN
@@ -203,10 +203,10 @@ F 3 "" H 4750 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1404
+L GND #U$0270
U 1 1 578CFCD9
P 6700 4200
-F 0 "#U$1404" H 6610 4100 70 0001 L BNN
+F 0 "#U$0270" H 6610 4100 70 0001 L BNN
F 1 "GND" H 6610 4100 70 0001 L BNN
F 2 "" H 6700 4200 60 0001 C CNN
F 3 "" H 6700 4200 60 0001 C CNN
@@ -214,10 +214,10 @@ F 3 "" H 6700 4200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1409
+L GND #U$0271
U 1 1 578CFDA1
P 12300 5000
-F 0 "#U$1409" H 12210 4900 70 0001 L BNN
+F 0 "#U$0271" H 12210 4900 70 0001 L BNN
F 1 "GND" H 12210 4900 70 0001 L BNN
F 2 "" H 12300 5000 60 0001 C CNN
F 3 "" H 12300 5000 60 0001 C CNN
@@ -225,10 +225,10 @@ F 3 "" H 12300 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1405
+L GND #U$0272
U 1 1 578CFE05
P 7300 5900
-F 0 "#U$1405" H 7210 5800 70 0001 L BNN
+F 0 "#U$0272" H 7210 5800 70 0001 L BNN
F 1 "GND" H 7210 5800 70 0001 L BNN
F 2 "" H 7300 5900 60 0001 C CNN
F 3 "" H 7300 5900 60 0001 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 11300 4600 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1408
+L GND #U$0273
U 1 1 57DA047D
P 11300 5000
-F 0 "#U$1408" H 11210 4900 70 0001 L BNN
+F 0 "#U$0273" H 11210 4900 70 0001 L BNN
F 1 "GND" H 11210 4900 70 0001 L BNN
F 2 "" H 11300 5000 60 0001 C CNN
F 3 "" H 11300 5000 60 0001 C CNN
@@ -315,10 +315,10 @@ F 3 "" H 7850 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1406
+L GND #U$0274
U 1 1 57DA24DC
P 7850 8300
-F 0 "#U$1406" H 7760 8200 70 0001 L BNN
+F 0 "#U$0274" H 7760 8200 70 0001 L BNN
F 1 "GND" H 7760 8200 70 0001 L BNN
F 2 "" H 7850 8300 60 0001 C CNN
F 3 "" H 7850 8300 60 0001 C CNN
@@ -326,10 +326,10 @@ F 3 "" H 7850 8300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1407
+L GND #U$0275
U 1 1 57DA25C4
P 9550 8300
-F 0 "#U$1407" H 9460 8200 70 0001 L BNN
+F 0 "#U$0275" H 9460 8200 70 0001 L BNN
F 1 "GND" H 9460 8200 70 0001 L BNN
F 2 "" H 9550 8300 60 0001 C CNN
F 3 "" H 9550 8300 60 0001 C CNN
@@ -540,10 +540,10 @@ F 3 "" H 6650 5500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1403
+L GND #U$0276
U 1 1 58150FB7
P 6650 5900
-F 0 "#U$1403" H 6560 5800 70 0001 L BNN
+F 0 "#U$0276" H 6560 5800 70 0001 L BNN
F 1 "GND" H 6560 5800 70 0001 L BNN
F 2 "" H 6650 5900 60 0001 C CNN
F 3 "" H 6650 5900 60 0001 C CNN
@@ -558,10 +558,10 @@ Connection ~ 5800 4600
Wire Wire Line
6650 5700 6650 5800
$Comp
-L GND #U$1402
+L GND #U$0277
U 1 1 58151168
P 5800 5850
-F 0 "#U$1402" H 5710 5750 70 0001 L BNN
+F 0 "#U$0277" H 5710 5750 70 0001 L BNN
F 1 "GND" H 5710 5750 70 0001 L BNN
F 2 "" H 5800 5850 60 0001 C CNN
F 3 "" H 5800 5850 60 0001 C CNN
diff --git a/hw/jack.sch b/hw/jack.sch
index 96231a2..f67a645 100644
--- a/hw/jack.sch
+++ b/hw/jack.sch
@@ -473,10 +473,10 @@ F 3 "" H 9000 6950 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1108
+L GND #U$0208
U 1 1 578C6B0C
P 5100 6400
-F 0 "#U$1108" H 5010 6300 70 0001 L BNN
+F 0 "#U$0208" H 5010 6300 70 0001 L BNN
F 1 "GND" H 5010 6300 70 0001 L BNN
F 2 "" H 5100 6400 60 0001 C CNN
F 3 "" H 5100 6400 60 0001 C CNN
@@ -484,10 +484,10 @@ F 3 "" H 5100 6400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1105
+L GND-A #U$0209
U 1 1 578C6C9C
P 4700 3850
-F 0 "#U$1105" H 4580 3620 70 0001 L BNN
+F 0 "#U$0209" H 4580 3620 70 0001 L BNN
F 1 "GND-A" H 4580 3620 70 0001 L BNN
F 2 "" H 4700 3850 60 0001 C CNN
F 3 "" H 4700 3850 60 0001 C CNN
@@ -495,10 +495,10 @@ F 3 "" H 4700 3850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1116
+L GND-A #U$0210
U 1 1 578C6F58
P 9000 7200
-F 0 "#U$1116" H 8880 6970 70 0001 L BNN
+F 0 "#U$0210" H 8880 6970 70 0001 L BNN
F 1 "GND-A" H 8880 6970 70 0001 L BNN
F 2 "" H 9000 7200 60 0001 C CNN
F 3 "" H 9000 7200 60 0001 C CNN
@@ -506,10 +506,10 @@ F 3 "" H 9000 7200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-A #U$1101
+L GND-A #U$0211
U 1 1 578C6FBC
P 1950 6800
-F 0 "#U$1101" H 1830 6570 70 0001 L BNN
+F 0 "#U$0211" H 1830 6570 70 0001 L BNN
F 1 "GND-A" H 1830 6570 70 0001 L BNN
F 2 "" H 1950 6800 60 0001 C CNN
F 3 "" H 1950 6800 60 0001 C CNN
@@ -517,10 +517,10 @@ F 3 "" H 1950 6800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1102
+L GND #U$0212
U 1 1 578C7020
P 3100 5750
-F 0 "#U$1102" H 3010 5650 70 0001 L BNN
+F 0 "#U$0212" H 3010 5650 70 0001 L BNN
F 1 "GND" H 3010 5650 70 0001 L BNN
F 2 "" H 3100 5750 60 0001 C CNN
F 3 "" H 3100 5750 60 0001 C CNN
@@ -621,10 +621,10 @@ Text GLabel 12000 5200 0 60 Input ~ 0
Text GLabel 13000 5800 2 60 Output ~ 0
HEADPH_SENSE
$Comp
-L POWERED #FLG1101
+L POWERED #FLG0213
U 1 1 57918CB7
P 3500 900
-F 0 "#FLG1101" H 3700 800 60 0001 C CNN
+F 0 "#FLG0213" H 3700 800 60 0001 C CNN
F 1 "POWERED" H 3500 950 60 0000 C CNN
F 2 "" H 3500 900 60 0001 C CNN
F 3 "" H 3500 900 60 0001 C CNN
@@ -649,10 +649,10 @@ TVOUT
Text GLabel 5600 8250 2 60 Input ~ 0
TVOUT_EN
$Comp
-L GND #U$1109
+L GND #U$0214
U 1 1 57F40CD5
P 5300 9050
-F 0 "#U$1109" H 5210 8950 70 0001 L BNN
+F 0 "#U$0214" H 5210 8950 70 0001 L BNN
F 1 "GND" H 5210 8950 70 0001 L BNN
F 2 "" H 5300 9050 60 0001 C CNN
F 3 "" H 5300 9050 60 0001 C CNN
@@ -671,10 +671,10 @@ F 3 "" H 3850 8650 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #U$1103
+L GND #U$0215
U 1 1 57F40EF6
P 3850 9050
-F 0 "#U$1103" H 3760 8950 70 0001 L BNN
+F 0 "#U$0215" H 3760 8950 70 0001 L BNN
F 1 "GND" H 3760 8950 70 0001 L BNN
F 2 "" H 3850 9050 60 0001 C CNN
F 3 "" H 3850 9050 60 0001 C CNN
@@ -684,10 +684,10 @@ $EndComp
Text GLabel 3450 8450 0 60 Input ~ 0
2V7
$Comp
-L GND #U$1120
+L GND #U$0216
U 1 1 57F4857A
P 11450 3050
-F 0 "#U$1120" H 11360 2950 70 0001 L BNN
+F 0 "#U$0216" H 11360 2950 70 0001 L BNN
F 1 "GND" H 11360 2950 70 0001 L BNN
F 2 "" H 11450 3050 60 0001 C CNN
F 3 "" H 11450 3050 60 0001 C CNN
@@ -695,10 +695,10 @@ F 3 "" H 11450 3050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1118
+L GND #U$0217
U 1 1 57F48711
P 10950 5200
-F 0 "#U$1118" H 10860 5100 70 0001 L BNN
+F 0 "#U$0217" H 10860 5100 70 0001 L BNN
F 1 "GND" H 10860 5100 70 0001 L BNN
F 2 "" H 10950 5200 60 0001 C CNN
F 3 "" H 10950 5200 60 0001 C CNN
@@ -706,10 +706,10 @@ F 3 "" H 10950 5200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1110
+L GND #U$0218
U 1 1 57F6D837
P 5650 3850
-F 0 "#U$1110" H 5560 3750 70 0001 L BNN
+F 0 "#U$0218" H 5560 3750 70 0001 L BNN
F 1 "GND" H 5560 3750 70 0001 L BNN
F 2 "" H 5650 3850 60 0001 C CNN
F 3 "" H 5650 3850 60 0001 C CNN
@@ -719,10 +719,10 @@ $EndComp
Text Notes 5400 4150 0 60 ~ 0
Bypass to GND\nplane or pin 19
$Comp
-L GND #U$1104
+L GND #U$0219
U 1 1 57F6DF26
P 4250 3900
-F 0 "#U$1104" H 4160 3800 70 0001 L BNN
+F 0 "#U$0219" H 4160 3800 70 0001 L BNN
F 1 "GND" H 4160 3800 70 0001 L BNN
F 2 "" H 4250 3900 60 0001 C CNN
F 3 "" H 4250 3900 60 0001 C CNN
@@ -730,10 +730,10 @@ F 3 "" H 4250 3900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1107
+L GND #U$0220
U 1 1 57F6DFB5
P 4950 3950
-F 0 "#U$1107" H 4860 3850 70 0001 L BNN
+F 0 "#U$0220" H 4860 3850 70 0001 L BNN
F 1 "GND" H 4860 3850 70 0001 L BNN
F 2 "" H 4950 3950 60 0001 C CNN
F 3 "" H 4950 3950 60 0001 C CNN
@@ -1106,10 +1106,10 @@ F 3 "" H 12200 6100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1122
+L GND #U$0221
U 1 1 5808F6C7
P 12200 6500
-F 0 "#U$1122" H 12110 6400 70 0001 L BNN
+F 0 "#U$0221" H 12110 6400 70 0001 L BNN
F 1 "GND" H 12110 6400 70 0001 L BNN
F 2 "" H 12200 6500 60 0001 C CNN
F 3 "" H 12200 6500 60 0001 C CNN
@@ -1193,10 +1193,10 @@ Wire Wire Line
4800 6300 4600 6300
Connection ~ 4800 6100
$Comp
-L GND-A #U$1106
+L GND-A #U$0222
U 1 1 5814F420
P 4800 6450
-F 0 "#U$1106" H 4680 6220 70 0001 L BNN
+F 0 "#U$0222" H 4680 6220 70 0001 L BNN
F 1 "GND-A" H 4680 6220 70 0001 L BNN
F 2 "" H 4800 6450 60 0001 C CNN
F 3 "" H 4800 6450 60 0001 C CNN
@@ -1369,8 +1369,8 @@ L GND #U$?
U 1 1 58299A82
P 11000 10800
AR Path="/578AFF08/58299A82" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58299A82" Ref="#U$1119" Part="1"
-F 0 "#U$1119" H 10910 10700 70 0001 L BNN
+AR Path="/578AFF06/58299A82" Ref="#U$0223" Part="1"
+F 0 "#U$0223" H 10910 10700 70 0001 L BNN
F 1 "GND" H 10910 10700 70 0001 L BNN
F 2 "" H 11000 10800 60 0001 C CNN
F 3 "" H 11000 10800 60 0001 C CNN
@@ -1382,8 +1382,8 @@ L GND #U$?
U 1 1 58299A88
P 8100 9100
AR Path="/578AFF08/58299A88" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58299A88" Ref="#U$1114" Part="1"
-F 0 "#U$1114" H 8010 9000 70 0001 L BNN
+AR Path="/578AFF06/58299A88" Ref="#U$0224" Part="1"
+F 0 "#U$0224" H 8010 9000 70 0001 L BNN
F 1 "GND" H 8010 9000 70 0001 L BNN
F 2 "" H 8100 9100 60 0001 C CNN
F 3 "" H 8100 9100 60 0001 C CNN
@@ -1507,10 +1507,10 @@ Wire Wire Line
Wire Wire Line
11000 10300 11000 10700
$Comp
-L POWERED #FLG1102
+L POWERED #FLG0225
U 1 1 58299AD4
P 9000 8200
-F 0 "#FLG1102" H 9200 8100 60 0001 C CNN
+F 0 "#FLG0225" H 9200 8100 60 0001 C CNN
F 1 "POWERED" H 9000 8250 60 0000 C CNN
F 2 "" H 9000 8200 60 0001 C CNN
F 3 "" H 9000 8200 60 0001 C CNN
@@ -1556,7 +1556,7 @@ AR Path="/578AFF08/58299AED" Ref="C?" Part="1"
AR Path="/578AFF06/58299AED" Ref="C1119" Part="1"
F 0 "C1119" H 11540 8690 50 0000 L CNN
F 1 "100n" H 11540 8520 50 0000 L CNN
-F 2 "SMD-0402" H 11530 8800 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11530 8800 20 0001 C CNN
F 3 "" H 11500 8650 60 0001 C CNN
1 11500 8650
1 0 0 -1
@@ -1566,8 +1566,8 @@ L GND #U$?
U 1 1 58299AF4
P 11500 9050
AR Path="/578AFF08/58299AF4" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58299AF4" Ref="#U$1121" Part="1"
-F 0 "#U$1121" H 11410 8950 70 0001 L BNN
+AR Path="/578AFF06/58299AF4" Ref="#U$0226" Part="1"
+F 0 "#U$0226" H 11410 8950 70 0001 L BNN
F 1 "GND" H 11410 8950 70 0001 L BNN
F 2 "" H 11500 9050 60 0001 C CNN
F 3 "" H 11500 9050 60 0001 C CNN
@@ -1679,10 +1679,10 @@ F 3 "" H 9800 6900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1117
+L GND #U$0227
U 1 1 582972D1
P 9400 7400
-F 0 "#U$1117" H 9310 7300 70 0001 L BNN
+F 0 "#U$0227" H 9310 7300 70 0001 L BNN
F 1 "GND" H 9310 7300 70 0001 L BNN
F 2 "" H 9400 7400 60 0001 C CNN
F 3 "" H 9400 7400 60 0001 C CNN
@@ -1702,10 +1702,10 @@ Wire Wire Line
5100 6300 5100 6100
Connection ~ 5100 6100
$Comp
-L GND #U$1113
+L GND #U$0228
U 1 1 58297028
P 7750 7400
-F 0 "#U$1113" H 7660 7300 70 0001 L BNN
+F 0 "#U$0228" H 7660 7300 70 0001 L BNN
F 1 "GND" H 7660 7300 70 0001 L BNN
F 2 "" H 7750 7400 60 0001 C CNN
F 3 "" H 7750 7400 60 0001 C CNN
@@ -1723,10 +1723,10 @@ Wire Wire Line
7850 7200 7850 7250
Connection ~ 7850 7250
$Comp
-L GND #U$1111
+L GND #U$0229
U 1 1 582975FE
P 6800 7300
-F 0 "#U$1111" H 6710 7200 70 0001 L BNN
+F 0 "#U$0229" H 6710 7200 70 0001 L BNN
F 1 "GND" H 6710 7200 70 0001 L BNN
F 2 "" H 6800 7300 60 0001 C CNN
F 3 "" H 6800 7300 60 0001 C CNN
@@ -1779,8 +1779,8 @@ L GND #U$?
U 1 1 58473227
P 8850 9050
AR Path="/578AFF08/58473227" Ref="#U$?" Part="1"
-AR Path="/578AFF06/58473227" Ref="#U$1115" Part="1"
-F 0 "#U$1115" H 8760 8950 70 0001 L BNN
+AR Path="/578AFF06/58473227" Ref="#U$0230" Part="1"
+F 0 "#U$0230" H 8760 8950 70 0001 L BNN
F 1 "GND" H 8760 8950 70 0001 L BNN
F 2 "" H 8850 9050 60 0001 C CNN
F 3 "" H 8850 9050 60 0001 C CNN
@@ -1792,8 +1792,8 @@ L GND #U$?
U 1 1 584732FB
P 7250 9200
AR Path="/578AFF08/584732FB" Ref="#U$?" Part="1"
-AR Path="/578AFF06/584732FB" Ref="#U$1112" Part="1"
-F 0 "#U$1112" H 7160 9100 70 0001 L BNN
+AR Path="/578AFF06/584732FB" Ref="#U$0231" Part="1"
+F 0 "#U$0231" H 7160 9100 70 0001 L BNN
F 1 "GND" H 7160 9100 70 0001 L BNN
F 2 "" H 7250 9200 60 0001 C CNN
F 3 "" H 7250 9200 60 0001 C CNN
diff --git a/hw/keys.sch b/hw/keys.sch
index 98e5b15..983152d 100644
--- a/hw/keys.sch
+++ b/hw/keys.sch
@@ -465,10 +465,10 @@ F 3 "" H 8700 1500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$1806
+L GND-3 #U$0331
U 1 1 578D52F0
P 8700 1900
-F 0 "#U$1806" H 8580 1801 70 0001 L BNN
+F 0 "#U$0331" H 8580 1801 70 0001 L BNN
F 1 "GND3" H 8580 1801 70 0001 L BNN
F 2 "" H 8700 1900 60 0001 C CNN
F 3 "" H 8700 1900 60 0001 C CNN
@@ -700,7 +700,7 @@ U 1 1 57F46B3C
P 12700 4800
F 0 "R1801" V 12650 4900 50 0000 L CNN
F 1 "1M" V 12750 4900 50 0000 L CNN
-F 2 "SMD-0402" H 12730 4950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 12730 4950 20 0001 C CNN
F 3 "" H 12700 4800 60 0001 C CNN
1 12700 4800
0 1 1 0
@@ -713,7 +713,7 @@ U 1 1 57F46F6B
P 13200 4800
F 0 "R1802" V 13150 4900 50 0000 L CNN
F 1 "1M" V 13250 4900 50 0000 L CNN
-F 2 "SMD-0402" H 13230 4950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 13230 4950 20 0001 C CNN
F 3 "" H 13200 4800 60 0001 C CNN
1 13200 4800
0 1 1 0
@@ -1453,8 +1453,8 @@ P 13000 9850
AR Path="/578AFEF0/5829533E" Ref="#U$?" Part="1"
AR Path="/5829533E" Ref="#U$?" Part="1"
AR Path="/578AFEF2/5829533E" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/5829533E" Ref="#U$1808" Part="1"
-F 0 "#U$1808" H 12910 9750 70 0001 L BNN
+AR Path="/578AFF1C/5829533E" Ref="#U$0332" Part="1"
+F 0 "#U$0332" H 12910 9750 70 0001 L BNN
F 1 "GND" H 12910 9750 70 0001 L BNN
F 2 "" H 13000 9850 60 0001 C CNN
F 3 "" H 13000 9850 60 0001 C CNN
@@ -1468,8 +1468,8 @@ P 9500 9850
AR Path="/578AFEF0/58295344" Ref="#U$?" Part="1"
AR Path="/58295344" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295344" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295344" Ref="#U$1807" Part="1"
-F 0 "#U$1807" H 9410 9750 70 0001 L BNN
+AR Path="/578AFF1C/58295344" Ref="#U$0333" Part="1"
+F 0 "#U$0333" H 9410 9750 70 0001 L BNN
F 1 "GND" H 9410 9750 70 0001 L BNN
F 2 "" H 9500 9850 60 0001 C CNN
F 3 "" H 9500 9850 60 0001 C CNN
@@ -1483,8 +1483,8 @@ P 5000 9800
AR Path="/578AFEF0/5829534A" Ref="#U$?" Part="1"
AR Path="/5829534A" Ref="#U$?" Part="1"
AR Path="/578AFEF2/5829534A" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/5829534A" Ref="#U$1803" Part="1"
-F 0 "#U$1803" H 4910 9700 70 0001 L BNN
+AR Path="/578AFF1C/5829534A" Ref="#U$0334" Part="1"
+F 0 "#U$0334" H 4910 9700 70 0001 L BNN
F 1 "GND" H 4910 9700 70 0001 L BNN
F 2 "" H 5000 9800 60 0001 C CNN
F 3 "" H 5000 9800 60 0001 C CNN
@@ -1498,8 +1498,8 @@ P 1800 10800
AR Path="/578AFEF0/58295350" Ref="#U$?" Part="1"
AR Path="/58295350" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295350" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295350" Ref="#U$1802" Part="1"
-F 0 "#U$1802" H 1710 10700 70 0001 L BNN
+AR Path="/578AFF1C/58295350" Ref="#U$0335" Part="1"
+F 0 "#U$0335" H 1710 10700 70 0001 L BNN
F 1 "GND" H 1710 10700 70 0001 L BNN
F 2 "" H 1800 10800 60 0001 C CNN
F 3 "" H 1800 10800 60 0001 C CNN
@@ -1513,8 +1513,8 @@ P 1800 9650
AR Path="/578AFEF0/58295356" Ref="#U$?" Part="1"
AR Path="/58295356" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295356" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295356" Ref="#U$1801" Part="1"
-F 0 "#U$1801" H 1710 9550 70 0001 L BNN
+AR Path="/578AFF1C/58295356" Ref="#U$0336" Part="1"
+F 0 "#U$0336" H 1710 9550 70 0001 L BNN
F 1 "GND" H 1710 9550 70 0001 L BNN
F 2 "" H 1800 9650 60 0001 C CNN
F 3 "" H 1800 9650 60 0001 C CNN
@@ -1565,8 +1565,8 @@ P 5650 9800
AR Path="/578AFEF0/58295373" Ref="#U$?" Part="1"
AR Path="/58295373" Ref="#U$?" Part="1"
AR Path="/578AFEF2/58295373" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/58295373" Ref="#U$1804" Part="1"
-F 0 "#U$1804" H 5560 9700 70 0001 L BNN
+AR Path="/578AFF1C/58295373" Ref="#U$0337" Part="1"
+F 0 "#U$0337" H 5560 9700 70 0001 L BNN
F 1 "GND" H 5560 9700 70 0001 L BNN
F 2 "" H 5650 9800 60 0001 C CNN
F 3 "" H 5650 9800 60 0001 C CNN
@@ -1582,8 +1582,8 @@ P 6250 10200
AR Path="/578AFEF0/5829537A" Ref="#U$?" Part="1"
AR Path="/5829537A" Ref="#U$?" Part="1"
AR Path="/578AFEF2/5829537A" Ref="#U$?" Part="1"
-AR Path="/578AFF1C/5829537A" Ref="#U$1805" Part="1"
-F 0 "#U$1805" H 6160 10100 70 0001 L BNN
+AR Path="/578AFF1C/5829537A" Ref="#U$0338" Part="1"
+F 0 "#U$0338" H 6160 10100 70 0001 L BNN
F 1 "GND" H 6160 10100 70 0001 L BNN
F 2 "" H 6250 10200 60 0001 C CNN
F 3 "" H 6250 10200 60 0001 C CNN
diff --git a/hw/leds.sch b/hw/leds.sch
index 541a30e..850c2da 100644
--- a/hw/leds.sch
+++ b/hw/leds.sch
@@ -286,10 +286,10 @@ F 3 "" H 8200 3250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2103
+L GND-3 #U$0385
U 1 1 578DDA06
P 4400 5550
-F 0 "#U$2103" H 4280 5451 70 0001 L BNN
+F 0 "#U$0385" H 4280 5451 70 0001 L BNN
F 1 "GND3" H 4280 5451 70 0001 L BNN
F 2 "" H 4400 5550 60 0001 C CNN
F 3 "" H 4400 5550 60 0001 C CNN
@@ -297,10 +297,10 @@ F 3 "" H 4400 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2113
+L GND-3 #U$0386
U 1 1 578DDA6A
P 9500 5550
-F 0 "#U$2113" H 9380 5451 70 0001 L BNN
+F 0 "#U$0386" H 9380 5451 70 0001 L BNN
F 1 "GND3" H 9380 5451 70 0001 L BNN
F 2 "" H 9500 5550 60 0001 C CNN
F 3 "" H 9500 5550 60 0001 C CNN
@@ -308,10 +308,10 @@ F 3 "" H 9500 5550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2102
+L GND-3 #U$0387
U 1 1 578DDACE
P 3000 2000
-F 0 "#U$2102" H 2880 1901 70 0001 L BNN
+F 0 "#U$0387" H 2880 1901 70 0001 L BNN
F 1 "GND3" H 2880 1901 70 0001 L BNN
F 2 "" H 3000 2000 60 0001 C CNN
F 3 "" H 3000 2000 60 0001 C CNN
@@ -319,10 +319,10 @@ F 3 "" H 3000 2000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2111
+L GND-3 #U$0388
U 1 1 578DDB32
P 8100 1950
-F 0 "#U$2111" H 7980 1851 70 0001 L BNN
+F 0 "#U$0388" H 7980 1851 70 0001 L BNN
F 1 "GND3" H 7980 1851 70 0001 L BNN
F 2 "" H 8100 1950 60 0001 C CNN
F 3 "" H 8100 1950 60 0001 C CNN
@@ -330,10 +330,10 @@ F 3 "" H 8100 1950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2101
+L GND-3 #U$0389
U 1 1 578DDDEE
P 2700 4150
-F 0 "#U$2101" H 2580 4051 70 0001 L BNN
+F 0 "#U$0389" H 2580 4051 70 0001 L BNN
F 1 "GND3" H 2580 4051 70 0001 L BNN
F 2 "" H 2700 4150 60 0001 C CNN
F 3 "" H 2700 4150 60 0001 C CNN
@@ -341,10 +341,10 @@ F 3 "" H 2700 4150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2110
+L GND-3 #U$0390
U 1 1 578DDE52
P 7800 4150
-F 0 "#U$2110" H 7680 4051 70 0001 L BNN
+F 0 "#U$0390" H 7680 4051 70 0001 L BNN
F 1 "GND3" H 7680 4051 70 0001 L BNN
F 2 "" H 7800 4150 60 0001 C CNN
F 3 "" H 7800 4150 60 0001 C CNN
@@ -1032,10 +1032,10 @@ F 3 "" H 9700 8800 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$2106
+L GND-3 #U$0391
U 1 1 58290F9F
P 5500 10800
-F 0 "#U$2106" H 5380 10701 70 0001 L BNN
+F 0 "#U$0391" H 5380 10701 70 0001 L BNN
F 1 "GND3" H 5380 10701 70 0001 L BNN
F 2 "" H 5500 10800 60 0001 C CNN
F 3 "" H 5500 10800 60 0001 C CNN
@@ -1043,10 +1043,10 @@ F 3 "" H 5500 10800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2104
+L GND-3 #U$0392
U 1 1 58290FA5
P 4400 10800
-F 0 "#U$2104" H 4280 10701 70 0001 L BNN
+F 0 "#U$0392" H 4280 10701 70 0001 L BNN
F 1 "GND3" H 4280 10701 70 0001 L BNN
F 2 "" H 4400 10800 60 0001 C CNN
F 3 "" H 4400 10800 60 0001 C CNN
@@ -1054,10 +1054,10 @@ F 3 "" H 4400 10800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2107
+L GND-3 #U$0393
U 1 1 58290FAB
P 6000 10800
-F 0 "#U$2107" H 5880 10701 70 0001 L BNN
+F 0 "#U$0393" H 5880 10701 70 0001 L BNN
F 1 "GND3" H 5880 10701 70 0001 L BNN
F 2 "" H 6000 10800 60 0001 C CNN
F 3 "" H 6000 10800 60 0001 C CNN
@@ -1065,10 +1065,10 @@ F 3 "" H 6000 10800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2105
+L GND-3 #U$0394
U 1 1 58290FB1
P 4700 10800
-F 0 "#U$2105" H 4580 10701 70 0001 L BNN
+F 0 "#U$0394" H 4580 10701 70 0001 L BNN
F 1 "GND3" H 4580 10701 70 0001 L BNN
F 2 "" H 4700 10800 60 0001 C CNN
F 3 "" H 4700 10800 60 0001 C CNN
@@ -1076,10 +1076,10 @@ F 3 "" H 4700 10800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2114
+L GND-3 #U$0395
U 1 1 58290FB7
P 10300 9000
-F 0 "#U$2114" H 10180 8901 70 0001 L BNN
+F 0 "#U$0395" H 10180 8901 70 0001 L BNN
F 1 "GND3" H 10180 8901 70 0001 L BNN
F 2 "" H 10300 9000 60 0001 C CNN
F 3 "" H 10300 9000 60 0001 C CNN
@@ -1087,10 +1087,10 @@ F 3 "" H 10300 9000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND-3 #U$2108
+L GND-3 #U$0396
U 1 1 58290FBD
P 7500 8100
-F 0 "#U$2108" H 7380 8001 70 0001 L BNN
+F 0 "#U$0396" H 7380 8001 70 0001 L BNN
F 1 "GND3" H 7380 8001 70 0001 L BNN
F 2 "" H 7500 8100 60 0001 C CNN
F 3 "" H 7500 8100 60 0001 C CNN
@@ -1200,10 +1200,10 @@ Wire Wire Line
Wire Wire Line
6400 10200 6700 10200
$Comp
-L GND-3 #U$2109
+L GND-3 #U$0397
U 1 1 58290FFC
P 7600 10550
-F 0 "#U$2109" H 7480 10451 70 0001 L BNN
+F 0 "#U$0397" H 7480 10451 70 0001 L BNN
F 1 "GND3" H 7480 10451 70 0001 L BNN
F 2 "" H 7600 10550 60 0001 C CNN
F 3 "" H 7600 10550 60 0001 C CNN
@@ -1281,7 +1281,7 @@ AR Path="/578AFF2C/58291027" Ref="U?" Part="1"
AR Path="/578AFF2E/58291027" Ref="U2104" Part="1"
F 0 "U2104" H 9600 7350 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 8550 7700 50 0000 R CNN
-F 2 "SOT666IP" H 9030 7850 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 9030 7850 20 0001 C CNN
F 3 "" H 9000 7700 60 0001 C CNN
1 9000 7700
-1 0 0 1
@@ -1292,8 +1292,8 @@ U 1 1 5829102E
P 9250 7200
AR Path="/578AFF20/5829102E" Ref="#U$?" Part="1"
AR Path="/578AFF2C/5829102E" Ref="#U$?" Part="1"
-AR Path="/578AFF2E/5829102E" Ref="#U$2112" Part="1"
-F 0 "#U$2112" H 9130 7101 70 0001 L BNN
+AR Path="/578AFF2E/5829102E" Ref="#U$0398" Part="1"
+F 0 "#U$0398" H 9130 7101 70 0001 L BNN
F 1 "GND3" H 9130 7101 70 0001 L BNN
F 2 "" H 9250 7200 60 0001 C CNN
F 3 "" H 9250 7200 60 0001 C CNN
diff --git a/hw/misc.sch b/hw/misc.sch
index 5ff5eec..5ead9ca 100644
--- a/hw/misc.sch
+++ b/hw/misc.sch
@@ -58,10 +58,10 @@ $EndDescr
Text Notes 7950 4500 0 120 ~ 0
Vibramotor
$Comp
-L GND #U$1203
+L GND #U$0232
U 1 1 578CA477
P 8050 5600
-F 0 "#U$1203" H 7960 5500 70 0001 L BNN
+F 0 "#U$0232" H 7960 5500 70 0001 L BNN
F 1 "GND" H 7960 5500 70 0001 L BNN
F 2 "" H 8050 5600 60 0001 C CNN
F 3 "" H 8050 5600 60 0001 C CNN
@@ -262,8 +262,8 @@ U 1 1 58122EEF
P 8000 3300
AR Path="/578AFF1A/58122EEF" Ref="#U$?" Part="1"
AR Path="/578AFF16/58122EEF" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/58122EEF" Ref="#U$1202" Part="1"
-F 0 "#U$1202" H 7880 3201 70 0001 L BNN
+AR Path="/578AFF0C/58122EEF" Ref="#U$0233" Part="1"
+F 0 "#U$0233" H 7880 3201 70 0001 L BNN
F 1 "GND3" H 7880 3201 70 0001 L BNN
F 2 "" H 8000 3300 60 0001 C CNN
F 3 "" H 8000 3300 60 0001 C CNN
@@ -276,8 +276,8 @@ U 1 1 58122EF5
P 9300 3300
AR Path="/578AFF1A/58122EF5" Ref="#U$?" Part="1"
AR Path="/578AFF16/58122EF5" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/58122EF5" Ref="#U$1204" Part="1"
-F 0 "#U$1204" H 9180 3201 70 0001 L BNN
+AR Path="/578AFF0C/58122EF5" Ref="#U$0234" Part="1"
+F 0 "#U$0234" H 9180 3201 70 0001 L BNN
F 1 "GND3" H 9180 3201 70 0001 L BNN
F 2 "" H 9300 3300 60 0001 C CNN
F 3 "" H 9300 3300 60 0001 C CNN
@@ -290,8 +290,8 @@ U 1 1 58122EFB
P 10600 3250
AR Path="/578AFF1A/58122EFB" Ref="#U$?" Part="1"
AR Path="/578AFF16/58122EFB" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/58122EFB" Ref="#U$1205" Part="1"
-F 0 "#U$1205" H 10480 3151 70 0001 L BNN
+AR Path="/578AFF0C/58122EFB" Ref="#U$0235" Part="1"
+F 0 "#U$0235" H 10480 3151 70 0001 L BNN
F 1 "GND3" H 10480 3151 70 0001 L BNN
F 2 "" H 10600 3250 60 0001 C CNN
F 3 "" H 10600 3250 60 0001 C CNN
@@ -393,8 +393,8 @@ U 1 1 585A23A3
P 2400 10200
AR Path="/578AFF16/585A23A3" Ref="#U$?" Part="1"
AR Path="/578AFF32/585A23A3" Ref="#U$?" Part="1"
-AR Path="/578AFF0C/585A23A3" Ref="#U$1201" Part="1"
-F 0 "#U$1201" H 2310 10100 70 0001 L BNN
+AR Path="/578AFF0C/585A23A3" Ref="#U$0236" Part="1"
+F 0 "#U$0236" H 2310 10100 70 0001 L BNN
F 1 "GND" H 2310 10100 70 0001 L BNN
F 2 "" H 2400 10200 60 0001 C CNN
F 3 "" H 2400 10200 60 0001 C CNN
@@ -412,7 +412,7 @@ AR Path="/578AFF12/585A23AA" Ref="R?" Part="1"
AR Path="/578AFF32/585A23AA" Ref="R?" Part="1"
F 0 "R1201" V 2350 8000 50 0000 L CNN
F 1 "18k" H 2400 7900 50 0000 C CNN
-F 2 "SMD-0402" H 2430 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2430 8050 20 0001 C CNN
F 3 "" H 2400 7900 60 0001 C CNN
1 2400 7900
0 1 1 0
@@ -452,7 +452,7 @@ AR Path="/578AFF12/585A27CD" Ref="R?" Part="1"
AR Path="/578AFF32/585A27CD" Ref="R?" Part="1"
F 0 "R1202" V 3550 8000 50 0000 L CNN
F 1 "2k7" H 3600 7900 50 0000 C CNN
-F 2 "SMD-0402" H 3630 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 3630 8050 20 0001 C CNN
F 3 "" H 3600 7900 60 0001 C CNN
1 3600 7900
0 1 1 0
@@ -488,7 +488,7 @@ AR Path="/578AFF12/585A2932" Ref="R?" Part="1"
AR Path="/578AFF32/585A2932" Ref="R?" Part="1"
F 0 "R1203" V 4750 8000 50 0000 L CNN
F 1 "1k" H 4800 7900 50 0000 C CNN
-F 2 "SMD-0402" H 4830 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 4830 8050 20 0001 C CNN
F 3 "" H 4800 7900 60 0001 C CNN
1 4800 7900
0 1 1 0
@@ -526,7 +526,7 @@ AR Path="/578AFF12/585A2A2C" Ref="R?" Part="1"
AR Path="/578AFF32/585A2A2C" Ref="R?" Part="1"
F 0 "R1204" V 5950 8000 50 0000 L CNN
F 1 "1k" H 6000 7900 50 0000 C CNN
-F 2 "SMD-0402" H 6030 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 6030 8050 20 0001 C CNN
F 3 "" H 6000 7900 60 0001 C CNN
1 6000 7900
0 1 1 0
@@ -568,7 +568,7 @@ AR Path="/578AFF12/585A2EAA" Ref="R?" Part="1"
AR Path="/578AFF32/585A2EAA" Ref="R?" Part="1"
F 0 "R1205" V 7150 8000 50 0000 L CNN
F 1 "12k" H 7200 7900 50 0000 C CNN
-F 2 "SMD-0402" H 7230 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 7230 8050 20 0001 C CNN
F 3 "" H 7200 7900 60 0001 C CNN
1 7200 7900
0 1 1 0
@@ -606,7 +606,7 @@ AR Path="/578AFF12/585A368A" Ref="R?" Part="1"
AR Path="/578AFF32/585A368A" Ref="R?" Part="1"
F 0 "R1206" V 8350 8000 50 0000 L CNN
F 1 "DNP" H 8400 7900 50 0000 C CNN
-F 2 "SMD-0402" H 8430 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 8430 8050 20 0001 C CNN
F 3 "" H 8400 7900 60 0001 C CNN
1 8400 7900
0 1 1 0
@@ -636,7 +636,7 @@ AR Path="/578AFF12/585A3867" Ref="R?" Part="1"
AR Path="/578AFF32/585A3867" Ref="R?" Part="1"
F 0 "R1207" V 9550 8000 50 0000 L CNN
F 1 "DNP" H 9600 7900 50 0000 C CNN
-F 2 "SMD-0402" H 9630 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 9630 8050 20 0001 C CNN
F 3 "" H 9600 7900 60 0001 C CNN
1 9600 7900
0 1 1 0
@@ -666,7 +666,7 @@ AR Path="/578AFF12/585A3B6F" Ref="R?" Part="1"
AR Path="/578AFF32/585A3B6F" Ref="R?" Part="1"
F 0 "R1208" V 10750 8000 50 0000 L CNN
F 1 "DNP" H 10800 7900 50 0000 C CNN
-F 2 "SMD-0402" H 10830 8050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 10830 8050 20 0001 C CNN
F 3 "" H 10800 7900 60 0001 C CNN
1 10800 7900
0 1 1 0
@@ -772,7 +772,7 @@ AR Path="/578AFF12/585ACB8E" Ref="R?" Part="1"
AR Path="/578AFF32/585ACB8E" Ref="R?" Part="1"
F 0 "R1209" V 2350 9900 50 0000 L CNN
F 1 "0" H 2400 9800 50 0000 C CNN
-F 2 "SMD-0402" H 2430 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2430 9950 20 0001 C CNN
F 3 "" H 2400 9800 60 0001 C CNN
1 2400 9800
0 1 1 0
diff --git a/hw/modem.sch b/hw/modem.sch
index a4922c2..9b99877 100644
--- a/hw/modem.sch
+++ b/hw/modem.sch
@@ -507,10 +507,10 @@ F 3 "" H 6350 7250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$511
+L GND #U$082
U 1 1 578B8242
P 12800 7150
-F 0 "#U$511" H 12710 7050 70 0001 L BNN
+F 0 "#U$082" H 12710 7050 70 0001 L BNN
F 1 "GND" H 12710 7050 70 0001 L BNN
F 2 "" H 12800 7150 60 0001 C CNN
F 3 "" H 12800 7150 60 0001 C CNN
@@ -518,10 +518,10 @@ F 3 "" H 12800 7150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$512
+L GND #U$083
U 1 1 578B82A6
P 13500 7150
-F 0 "#U$512" H 13410 7050 70 0001 L BNN
+F 0 "#U$083" H 13410 7050 70 0001 L BNN
F 1 "GND" H 13410 7050 70 0001 L BNN
F 2 "" H 13500 7150 60 0001 C CNN
F 3 "" H 13500 7150 60 0001 C CNN
@@ -529,10 +529,10 @@ F 3 "" H 13500 7150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$506
+L GND #U$084
U 1 1 578B830A
P 10050 7100
-F 0 "#U$506" H 9960 7000 70 0001 L BNN
+F 0 "#U$084" H 9960 7000 70 0001 L BNN
F 1 "GND" H 9960 7000 70 0001 L BNN
F 2 "" H 10050 7100 60 0001 C CNN
F 3 "" H 10050 7100 60 0001 C CNN
@@ -540,10 +540,10 @@ F 3 "" H 10050 7100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$507
+L GND #U$085
U 1 1 578B836E
P 10050 7650
-F 0 "#U$507" H 9960 7550 70 0001 L BNN
+F 0 "#U$085" H 9960 7550 70 0001 L BNN
F 1 "GND" H 9960 7550 70 0001 L BNN
F 2 "" H 10050 7650 60 0001 C CNN
F 3 "" H 10050 7650 60 0001 C CNN
@@ -551,10 +551,10 @@ F 3 "" H 10050 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$509
+L GND #U$086
U 1 1 578B83D2
P 11100 7350
-F 0 "#U$509" H 11010 7250 70 0001 L BNN
+F 0 "#U$086" H 11010 7250 70 0001 L BNN
F 1 "GND" H 11010 7250 70 0001 L BNN
F 2 "" H 11100 7350 60 0001 C CNN
F 3 "" H 11100 7350 60 0001 C CNN
@@ -562,10 +562,10 @@ F 3 "" H 11100 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$508
+L GND #U$087
U 1 1 578B8436
P 10850 2950
-F 0 "#U$508" H 10760 2850 70 0001 L BNN
+F 0 "#U$087" H 10760 2850 70 0001 L BNN
F 1 "GND" H 10760 2850 70 0001 L BNN
F 2 "" H 10850 2950 60 0001 C CNN
F 3 "" H 10850 2950 60 0001 C CNN
@@ -573,10 +573,10 @@ F 3 "" H 10850 2950 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$513
+L GND #U$088
U 1 1 578B862A
P 13500 9500
-F 0 "#U$513" H 13410 9400 70 0001 L BNN
+F 0 "#U$088" H 13410 9400 70 0001 L BNN
F 1 "GND" H 13410 9400 70 0001 L BNN
F 2 "" H 13500 9500 60 0001 C CNN
F 3 "" H 13500 9500 60 0001 C CNN
@@ -584,10 +584,10 @@ F 3 "" H 13500 9500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$510
+L GND #U$089
U 1 1 578B868E
P 11150 6450
-F 0 "#U$510" H 11060 6350 70 0001 L BNN
+F 0 "#U$089" H 11060 6350 70 0001 L BNN
F 1 "GND" H 11060 6350 70 0001 L BNN
F 2 "" H 11150 6450 60 0001 C CNN
F 3 "" H 11150 6450 60 0001 C CNN
@@ -926,8 +926,8 @@ L GND #U$?
U 1 1 57F2BA38
P 8950 9450
AR Path="/578AFEFE/57F2BA38" Ref="#U$?" Part="1"
-AR Path="/578AFEFA/57F2BA38" Ref="#U$504" Part="1"
-F 0 "#U$504" H 8860 9350 70 0001 L BNN
+AR Path="/578AFEFA/57F2BA38" Ref="#U$090" Part="1"
+F 0 "#U$090" H 8860 9350 70 0001 L BNN
F 1 "GND" H 8860 9350 70 0001 L BNN
F 2 "" H 8950 9450 60 0001 C CNN
F 3 "" H 8950 9450 60 0001 C CNN
@@ -939,8 +939,8 @@ L GND #U$?
U 1 1 57F2BA3E
P 9350 9450
AR Path="/578AFEFE/57F2BA3E" Ref="#U$?" Part="1"
-AR Path="/578AFEFA/57F2BA3E" Ref="#U$505" Part="1"
-F 0 "#U$505" H 9260 9350 70 0001 L BNN
+AR Path="/578AFEFA/57F2BA3E" Ref="#U$091" Part="1"
+F 0 "#U$091" H 9260 9350 70 0001 L BNN
F 1 "GND" H 9260 9350 70 0001 L BNN
F 2 "" H 9350 9450 60 0001 C CNN
F 3 "" H 9350 9450 60 0001 C CNN
@@ -952,10 +952,10 @@ Wire Wire Line
Wire Wire Line
9350 9150 9500 9150
$Comp
-L GND #U$502
+L GND #U$092
U 1 1 57F2CBE7
P 6750 9450
-F 0 "#U$502" H 6660 9350 70 0001 L BNN
+F 0 "#U$092" H 6660 9350 70 0001 L BNN
F 1 "GND" H 6660 9350 70 0001 L BNN
F 2 "" H 6750 9450 60 0001 C CNN
F 3 "" H 6750 9450 60 0001 C CNN
@@ -963,10 +963,10 @@ F 3 "" H 6750 9450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$503
+L GND #U$093
U 1 1 57F2CBED
P 7150 9450
-F 0 "#U$503" H 7060 9350 70 0001 L BNN
+F 0 "#U$093" H 7060 9350 70 0001 L BNN
F 1 "GND" H 7060 9350 70 0001 L BNN
F 2 "" H 7150 9450 60 0001 C CNN
F 3 "" H 7150 9450 60 0001 C CNN
@@ -1336,7 +1336,7 @@ U 14 1 58173093
P 1200 5700
F 0 "M501" H 1000 6650 50 0000 L CNN
F 1 "PHS8" H 1200 4750 50 0000 C CNN
-F 2 "PHS8-CLEAN" H 1150 4800 20 0001 C CNN
+F 2 "neo900-legacy:P*S8" H 1150 4800 20 0001 C CNN
F 3 "" H 1150 6350 60 0001 C CNN
14 1200 5700
1 0 0 -1
@@ -1347,7 +1347,7 @@ U 15 1 58173167
P 1100 9000
F 0 "M501" H 800 9550 50 0000 L CNN
F 1 "PHS8" H 1100 8350 50 0000 C CNN
-F 2 "PHS8-CLEAN" H 1050 8100 20 0001 C CNN
+F 2 "neo900-legacy:P*S8" H 1050 8100 20 0001 C CNN
F 3 "" H 1050 9650 60 0001 C CNN
15 1100 9000
1 0 0 -1
@@ -1711,7 +1711,7 @@ AR Path="/578AFF1C/58180F1E" Ref="R?" Part="1"
AR Path="/578AFEFA/58180F1E" Ref="R501" Part="1"
F 0 "R501" H 1650 9700 50 0000 C CNN
F 1 "0" V 1650 9800 50 0000 C CNN
-F 2 "SMD-0402" H 1680 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1680 9950 20 0001 C CNN
F 3 "" H 1650 9800 60 0001 C CNN
1 1650 9800
0 1 1 0
@@ -1724,7 +1724,7 @@ AR Path="/578AFF1C/58173ADF" Ref="R?" Part="1"
AR Path="/578AFEFA/58173ADF" Ref="R502" Part="1"
F 0 "R502" H 1850 9700 50 0000 C CNN
F 1 "0" V 1850 9800 50 0000 C CNN
-F 2 "SMD-0402" H 1880 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 1880 9950 20 0001 C CNN
F 3 "" H 1850 9800 60 0001 C CNN
1 1850 9800
0 1 1 0
@@ -1737,7 +1737,7 @@ AR Path="/578AFF1C/58173BFE" Ref="R?" Part="1"
AR Path="/578AFEFA/58173BFE" Ref="R503" Part="1"
F 0 "R503" H 2050 9700 50 0000 C CNN
F 1 "0" V 2050 9800 50 0000 C CNN
-F 2 "SMD-0402" H 2080 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2080 9950 20 0001 C CNN
F 3 "" H 2050 9800 60 0001 C CNN
1 2050 9800
0 1 1 0
@@ -1750,7 +1750,7 @@ AR Path="/578AFF1C/58173D20" Ref="R?" Part="1"
AR Path="/578AFEFA/58173D20" Ref="R504" Part="1"
F 0 "R504" H 2250 9700 50 0000 C CNN
F 1 "0" V 2250 9800 50 0000 C CNN
-F 2 "SMD-0402" H 2280 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2280 9950 20 0001 C CNN
F 3 "" H 2250 9800 60 0001 C CNN
1 2250 9800
0 1 1 0
@@ -1763,7 +1763,7 @@ AR Path="/578AFF1C/58173E49" Ref="R?" Part="1"
AR Path="/578AFEFA/58173E49" Ref="R505" Part="1"
F 0 "R505" H 2450 9700 50 0000 C CNN
F 1 "0" V 2450 9800 50 0000 C CNN
-F 2 "SMD-0402" H 2480 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2480 9950 20 0001 C CNN
F 3 "" H 2450 9800 60 0001 C CNN
1 2450 9800
0 1 1 0
@@ -1776,7 +1776,7 @@ AR Path="/578AFF1C/58173F71" Ref="R?" Part="1"
AR Path="/578AFEFA/58173F71" Ref="R506" Part="1"
F 0 "R506" H 2650 9700 50 0000 C CNN
F 1 "0" V 2650 9800 50 0000 C CNN
-F 2 "SMD-0402" H 2680 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2680 9950 20 0001 C CNN
F 3 "" H 2650 9800 60 0001 C CNN
1 2650 9800
0 1 1 0
@@ -1789,7 +1789,7 @@ AR Path="/578AFF1C/581740A0" Ref="R?" Part="1"
AR Path="/578AFEFA/581740A0" Ref="R507" Part="1"
F 0 "R507" H 2850 9700 50 0000 C CNN
F 1 "0" V 2850 9800 50 0000 C CNN
-F 2 "SMD-0402" H 2880 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2880 9950 20 0001 C CNN
F 3 "" H 2850 9800 60 0001 C CNN
1 2850 9800
0 1 1 0
@@ -1802,7 +1802,7 @@ AR Path="/578AFF1C/581741CE" Ref="R?" Part="1"
AR Path="/578AFEFA/581741CE" Ref="R508" Part="1"
F 0 "R508" H 3050 9700 50 0000 C CNN
F 1 "0" V 3050 9800 50 0000 C CNN
-F 2 "SMD-0402" H 3080 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 3080 9950 20 0001 C CNN
F 3 "" H 3050 9800 60 0001 C CNN
1 3050 9800
0 1 1 0
@@ -1815,7 +1815,7 @@ AR Path="/578AFF1C/581742FF" Ref="R?" Part="1"
AR Path="/578AFEFA/581742FF" Ref="R509" Part="1"
F 0 "R509" H 3250 9700 50 0000 C CNN
F 1 "0" V 3250 9800 50 0000 C CNN
-F 2 "SMD-0402" H 3280 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 3280 9950 20 0001 C CNN
F 3 "" H 3250 9800 60 0001 C CNN
1 3250 9800
0 1 1 0
@@ -1828,7 +1828,7 @@ AR Path="/578AFF1C/58174493" Ref="R?" Part="1"
AR Path="/578AFEFA/58174493" Ref="R510" Part="1"
F 0 "R510" H 3450 9700 50 0000 C CNN
F 1 "0" V 3450 9800 50 0000 C CNN
-F 2 "SMD-0402" H 3480 9950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 3480 9950 20 0001 C CNN
F 3 "" H 3450 9800 60 0001 C CNN
1 3450 9800
0 1 1 0
@@ -1864,10 +1864,10 @@ Wire Wire Line
3450 9600 3450 9500
Connection ~ 3450 9500
$Comp
-L GND #U$501
+L GND #U$094
U 1 1 581758AC
P 1650 10300
-F 0 "#U$501" H 1560 10200 70 0001 L BNN
+F 0 "#U$094" H 1560 10200 70 0001 L BNN
F 1 "GND" H 1560 10200 70 0001 L BNN
F 2 "" H 1650 10300 60 0001 C CNN
F 3 "" H 1650 10300 60 0001 C CNN
@@ -1922,7 +1922,7 @@ U 16 1 5817321E
P 1100 7500
F 0 "M501" H 800 8050 50 0000 L CNN
F 1 "PHS8" H 1100 6850 50 0000 C CNN
-F 2 "PHS8-CLEAN" H 1050 6600 20 0001 C CNN
+F 2 "neo900-legacy:P*S8" H 1050 6600 20 0001 C CNN
F 3 "" H 1050 8150 60 0001 C CNN
16 1100 7500
1 0 0 -1
@@ -2082,7 +2082,7 @@ AR Path="/578AFF1C/5818A983" Ref="R?" Part="1"
AR Path="/578AFEFA/5818A983" Ref="R512" Part="1"
F 0 "R512" V 13950 9850 50 0000 L CNN
F 1 "100k" V 14050 9850 50 0000 L CNN
-F 2 "SMD-0402" H 14030 9900 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 14030 9900 20 0001 C CNN
F 3 "" H 14000 9750 60 0001 C CNN
1 14000 9750
0 1 1 0
@@ -2095,16 +2095,16 @@ AR Path="/578AFF1C/5818C472" Ref="R?" Part="1"
AR Path="/578AFEFA/5818C472" Ref="R511" Part="1"
F 0 "R511" V 13950 9350 50 0000 L CNN
F 1 "100k" V 14050 9350 50 0000 L CNN
-F 2 "SMD-0402" H 14030 9400 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 14030 9400 20 0001 C CNN
F 3 "" H 14000 9250 60 0001 C CNN
1 14000 9250
0 1 1 0
$EndComp
$Comp
-L GND #U$514
+L GND #U$095
U 1 1 5818CA66
P 14000 10150
-F 0 "#U$514" H 13910 10050 70 0001 L BNN
+F 0 "#U$095" H 13910 10050 70 0001 L BNN
F 1 "GND" H 13910 10050 70 0001 L BNN
F 2 "" H 14000 10150 60 0001 C CNN
F 3 "" H 14000 10150 60 0001 C CNN
diff --git a/hw/modempwr.sch b/hw/modempwr.sch
index b13c8f7..a3f9639 100644
--- a/hw/modempwr.sch
+++ b/hw/modempwr.sch
@@ -238,10 +238,10 @@ F 3 "" H 11900 3000 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$406
+L GND #U$052
U 1 1 578B2446
P 3900 5000
-F 0 "#U$406" H 3810 4900 70 0001 L BNN
+F 0 "#U$052" H 3810 4900 70 0001 L BNN
F 1 "GND" H 3810 4900 70 0001 L BNN
F 2 "" H 3900 5000 60 0001 C CNN
F 3 "" H 3900 5000 60 0001 C CNN
@@ -249,10 +249,10 @@ F 3 "" H 3900 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$403
+L GND #U$053
U 1 1 578B24AA
P 2950 3100
-F 0 "#U$403" H 2860 3000 70 0001 L BNN
+F 0 "#U$053" H 2860 3000 70 0001 L BNN
F 1 "GND" H 2860 3000 70 0001 L BNN
F 2 "" H 2950 3100 60 0001 C CNN
F 3 "" H 2950 3100 60 0001 C CNN
@@ -260,10 +260,10 @@ F 3 "" H 2950 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$408
+L GND #U$054
U 1 1 578B250E
P 5300 4900
-F 0 "#U$408" H 5210 4800 70 0001 L BNN
+F 0 "#U$054" H 5210 4800 70 0001 L BNN
F 1 "GND" H 5210 4800 70 0001 L BNN
F 2 "" H 5300 4900 60 0001 C CNN
F 3 "" H 5300 4900 60 0001 C CNN
@@ -271,10 +271,10 @@ F 3 "" H 5300 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$411
+L GND #U$055
U 1 1 578B2572
P 7600 5000
-F 0 "#U$411" H 7510 4900 70 0001 L BNN
+F 0 "#U$055" H 7510 4900 70 0001 L BNN
F 1 "GND" H 7510 4900 70 0001 L BNN
F 2 "" H 7600 5000 60 0001 C CNN
F 3 "" H 7600 5000 60 0001 C CNN
@@ -282,10 +282,10 @@ F 3 "" H 7600 5000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$418
+L GND #U$056
U 1 1 578B25D6
P 11400 4900
-F 0 "#U$418" H 11310 4800 70 0001 L BNN
+F 0 "#U$056" H 11310 4800 70 0001 L BNN
F 1 "GND" H 11310 4800 70 0001 L BNN
F 2 "" H 11400 4900 60 0001 C CNN
F 3 "" H 11400 4900 60 0001 C CNN
@@ -293,10 +293,10 @@ F 3 "" H 11400 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$415
+L GND #U$057
U 1 1 578B263A
P 9000 4900
-F 0 "#U$415" H 8910 4800 70 0001 L BNN
+F 0 "#U$057" H 8910 4800 70 0001 L BNN
F 1 "GND" H 8910 4800 70 0001 L BNN
F 2 "" H 9000 4900 60 0001 C CNN
F 3 "" H 9000 4900 60 0001 C CNN
@@ -304,10 +304,10 @@ F 3 "" H 9000 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$423
+L GND #U$058
U 1 1 578B269E
P 12800 4900
-F 0 "#U$423" H 12710 4800 70 0001 L BNN
+F 0 "#U$058" H 12710 4800 70 0001 L BNN
F 1 "GND" H 12710 4800 70 0001 L BNN
F 2 "" H 12800 4900 60 0001 C CNN
F 3 "" H 12800 4900 60 0001 C CNN
@@ -377,10 +377,10 @@ VMODEM3
Text Label 7950 1700 0 60 ~ 0
VMODEM
$Comp
-L POWERED #FLG401
+L POWERED #FLG059
U 1 1 579106AD
P 4750 2150
-F 0 "#FLG401" H 4950 2050 60 0001 C CNN
+F 0 "#FLG059" H 4950 2050 60 0001 C CNN
F 1 "POWERED" H 4750 2200 60 0000 C CNN
F 2 "" H 4750 2150 60 0001 C CNN
F 3 "" H 4750 2150 60 0001 C CNN
@@ -388,10 +388,10 @@ F 3 "" H 4750 2150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG402
+L POWERED #FLG060
U 1 1 5791070F
P 8450 2150
-F 0 "#FLG402" H 8650 2050 60 0001 C CNN
+F 0 "#FLG060" H 8650 2050 60 0001 C CNN
F 1 "POWERED" H 8450 2200 60 0000 C CNN
F 2 "" H 8450 2150 60 0001 C CNN
F 3 "" H 8450 2150 60 0001 C CNN
@@ -399,10 +399,10 @@ F 3 "" H 8450 2150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG404
+L POWERED #FLG061
U 1 1 5791076A
P 12250 2150
-F 0 "#FLG404" H 12450 2050 60 0001 C CNN
+F 0 "#FLG061" H 12450 2050 60 0001 C CNN
F 1 "POWERED" H 12250 2200 60 0000 C CNN
F 2 "" H 12250 2150 60 0001 C CNN
F 3 "" H 12250 2150 60 0001 C CNN
@@ -444,10 +444,10 @@ F 3 "" H 3900 7800 60 0001 C CNN
$EndComp
NoConn ~ 12400 7800
$Comp
-L GND #U$421
+L GND #U$062
U 1 1 57E27093
P 12250 8200
-F 0 "#U$421" H 12160 8100 70 0001 L BNN
+F 0 "#U$062" H 12160 8100 70 0001 L BNN
F 1 "GND" H 12160 8100 70 0001 L BNN
F 2 "" H 12250 8200 60 0001 C CNN
F 3 "" H 12250 8200 60 0001 C CNN
@@ -455,10 +455,10 @@ F 3 "" H 12250 8200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$424
+L GND #U$063
U 1 1 57E27281
P 13900 8200
-F 0 "#U$424" H 13810 8100 70 0001 L BNN
+F 0 "#U$063" H 13810 8100 70 0001 L BNN
F 1 "GND" H 13810 8100 70 0001 L BNN
F 2 "" H 13900 8200 60 0001 C CNN
F 3 "" H 13900 8200 60 0001 C CNN
@@ -472,10 +472,10 @@ NoConn ~ 13400 9100
NoConn ~ 13400 9000
NoConn ~ 13400 8900
$Comp
-L GND #U$422
+L GND #U$064
U 1 1 57E277C7
P 12300 9500
-F 0 "#U$422" H 12210 9400 70 0001 L BNN
+F 0 "#U$064" H 12210 9400 70 0001 L BNN
F 1 "GND" H 12210 9400 70 0001 L BNN
F 2 "" H 12300 9500 60 0001 C CNN
F 3 "" H 12300 9500 60 0001 C CNN
@@ -483,10 +483,10 @@ F 3 "" H 12300 9500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$425
+L GND #U$065
U 1 1 57E27817
P 13900 9500
-F 0 "#U$425" H 13810 9400 70 0001 L BNN
+F 0 "#U$065" H 13810 9400 70 0001 L BNN
F 1 "GND" H 13810 9400 70 0001 L BNN
F 2 "" H 13900 9500 60 0001 C CNN
F 3 "" H 13900 9500 60 0001 C CNN
@@ -508,10 +508,10 @@ F 3 "" H 11950 7600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$419
+L GND #U$066
U 1 1 57E27FC6
P 11950 8200
-F 0 "#U$419" H 11860 8100 70 0001 L BNN
+F 0 "#U$066" H 11860 8100 70 0001 L BNN
F 1 "GND" H 11860 8100 70 0001 L BNN
F 2 "" H 11950 8200 60 0001 C CNN
F 3 "" H 11950 8200 60 0001 C CNN
@@ -530,10 +530,10 @@ F 3 "" H 11950 8900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$420
+L GND #U$067
U 1 1 57E28982
P 11950 9500
-F 0 "#U$420" H 11860 9400 70 0001 L BNN
+F 0 "#U$067" H 11860 9400 70 0001 L BNN
F 1 "GND" H 11860 9400 70 0001 L BNN
F 2 "" H 11950 9500 60 0001 C CNN
F 3 "" H 11950 9500 60 0001 C CNN
@@ -648,10 +648,10 @@ F 3 "" H 7750 7500 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$414
+L GND #U$068
U 1 1 57E276E5
P 8350 8600
-F 0 "#U$414" H 8260 8500 70 0001 L BNN
+F 0 "#U$068" H 8260 8500 70 0001 L BNN
F 1 "GND" H 8260 8500 70 0001 L BNN
F 2 "" H 8350 8600 60 0001 C CNN
F 3 "" H 8350 8600 60 0001 C CNN
@@ -659,10 +659,10 @@ F 3 "" H 8350 8600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$413
+L GND #U$069
U 1 1 57E27756
P 7750 8600
-F 0 "#U$413" H 7660 8500 70 0001 L BNN
+F 0 "#U$069" H 7660 8500 70 0001 L BNN
F 1 "GND" H 7660 8500 70 0001 L BNN
F 2 "" H 7750 8600 60 0001 C CNN
F 3 "" H 7750 8600 60 0001 C CNN
@@ -681,10 +681,10 @@ F 3 "" H 8050 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$416
+L GND #U$070
U 1 1 57E28962
P 9200 8300
-F 0 "#U$416" H 9110 8200 70 0001 L BNN
+F 0 "#U$070" H 9110 8200 70 0001 L BNN
F 1 "GND" H 9110 8200 70 0001 L BNN
F 2 "" H 9200 8300 60 0001 C CNN
F 3 "" H 9200 8300 60 0001 C CNN
@@ -716,10 +716,10 @@ $EndComp
Text GLabel 10000 7850 2 60 Output ~ 0
VSIM_SENSE
$Comp
-L GND #U$417
+L GND #U$071
U 1 1 57E29C05
P 9600 8600
-F 0 "#U$417" H 9510 8500 70 0001 L BNN
+F 0 "#U$071" H 9510 8500 70 0001 L BNN
F 1 "GND" H 9510 8500 70 0001 L BNN
F 2 "" H 9600 8600 60 0001 C CNN
F 3 "" H 9600 8600 60 0001 C CNN
@@ -742,10 +742,10 @@ F 3 "" H 3100 8300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$404
+L GND #U$072
U 1 1 57E2B7C6
P 3100 8700
-F 0 "#U$404" H 3010 8600 70 0001 L BNN
+F 0 "#U$072" H 3010 8600 70 0001 L BNN
F 1 "GND" H 3010 8600 70 0001 L BNN
F 2 "" H 3100 8700 60 0001 C CNN
F 3 "" H 3100 8700 60 0001 C CNN
@@ -755,10 +755,10 @@ $EndComp
Text GLabel 2900 7500 0 60 Input ~ 0
1V8
$Comp
-L GND #U$407
+L GND #U$073
U 1 1 57E2C509
P 4700 8700
-F 0 "#U$407" H 4610 8600 70 0001 L BNN
+F 0 "#U$073" H 4610 8600 70 0001 L BNN
F 1 "GND" H 4610 8600 70 0001 L BNN
F 2 "" H 4700 8700 60 0001 C CNN
F 3 "" H 4700 8700 60 0001 C CNN
@@ -833,10 +833,10 @@ F 3 "" H 5850 7900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$409
+L GND #U$074
U 1 1 57E3133A
P 5550 8600
-F 0 "#U$409" H 5460 8500 70 0001 L BNN
+F 0 "#U$074" H 5460 8500 70 0001 L BNN
F 1 "GND" H 5460 8500 70 0001 L BNN
F 2 "" H 5550 8600 60 0001 C CNN
F 3 "" H 5550 8600 60 0001 C CNN
@@ -855,10 +855,10 @@ F 3 "" H 1800 8000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$402
+L GND #U$075
U 1 1 57E322BB
P 2100 8700
-F 0 "#U$402" H 2010 8600 70 0001 L BNN
+F 0 "#U$075" H 2010 8600 70 0001 L BNN
F 1 "GND" H 2010 8600 70 0001 L BNN
F 2 "" H 2100 8700 60 0001 C CNN
F 3 "" H 2100 8700 60 0001 C CNN
@@ -892,10 +892,10 @@ F 3 "" H 3250 2700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$401
+L GND #U$076
U 1 1 580848F7
P 1750 3100
-F 0 "#U$401" H 1660 3000 70 0001 L BNN
+F 0 "#U$076" H 1660 3000 70 0001 L BNN
F 1 "GND" H 1660 3000 70 0001 L BNN
F 2 "" H 1750 3100 60 0001 C CNN
F 3 "" H 1750 3100 60 0001 C CNN
@@ -903,10 +903,10 @@ F 3 "" H 1750 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$405
+L GND #U$077
U 1 1 58084986
P 3250 3100
-F 0 "#U$405" H 3160 3000 70 0001 L BNN
+F 0 "#U$077" H 3160 3000 70 0001 L BNN
F 1 "GND" H 3160 3000 70 0001 L BNN
F 2 "" H 3250 3100 60 0001 C CNN
F 3 "" H 3250 3100 60 0001 C CNN
@@ -914,10 +914,10 @@ F 3 "" H 3250 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG405
+L POWERED #FLG078
U 1 1 5809D214
P 13300 6700
-F 0 "#FLG405" H 13500 6600 60 0001 C CNN
+F 0 "#FLG078" H 13500 6600 60 0001 C CNN
F 1 "POWERED" H 13300 6750 60 0000 C CNN
F 2 "" H 13300 6700 60 0001 C CNN
F 3 "" H 13300 6700 60 0001 C CNN
@@ -925,10 +925,10 @@ F 3 "" H 13300 6700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L POWERED #FLG403
+L POWERED #FLG079
U 1 1 5809D7C2
P 10100 7250
-F 0 "#FLG403" H 10300 7150 60 0001 C CNN
+F 0 "#FLG079" H 10300 7150 60 0001 C CNN
F 1 "POWERED" H 10100 7300 60 0000 C CNN
F 2 "" H 10100 7250 60 0001 C CNN
F 3 "" H 10100 7250 60 0001 C CNN
@@ -1009,8 +1009,8 @@ L GND #U$?
U 1 1 58598130
P 6500 10800
AR Path="/578AFF0C/58598130" Ref="#U$?" Part="1"
-AR Path="/578AFEF6/58598130" Ref="#U$410" Part="1"
-F 0 "#U$410" H 6410 10700 70 0001 L BNN
+AR Path="/578AFEF6/58598130" Ref="#U$080" Part="1"
+F 0 "#U$080" H 6410 10700 70 0001 L BNN
F 1 "GND" H 6410 10700 70 0001 L BNN
F 2 "" H 6500 10800 60 0001 C CNN
F 3 "" H 6500 10800 60 0001 C CNN
@@ -1022,8 +1022,8 @@ L GND #U$?
U 1 1 58598136
P 7700 10800
AR Path="/578AFF0C/58598136" Ref="#U$?" Part="1"
-AR Path="/578AFEF6/58598136" Ref="#U$412" Part="1"
-F 0 "#U$412" H 7610 10700 70 0001 L BNN
+AR Path="/578AFEF6/58598136" Ref="#U$081" Part="1"
+F 0 "#U$081" H 7610 10700 70 0001 L BNN
F 1 "GND" H 7610 10700 70 0001 L BNN
F 2 "" H 7700 10800 60 0001 C CNN
F 3 "" H 7700 10800 60 0001 C CNN
@@ -1068,7 +1068,7 @@ Wire Wire Line
Wire Wire Line
6700 3900 7100 3900
Wire Wire Line
- 7100 5800 7100 3900
+ 7100 3900 7100 5800
Wire Wire Line
5200 5800 14600 5800
Wire Wire Line
diff --git a/hw/nfc.sch b/hw/nfc.sch
index 50f47bc..552de1d 100644
--- a/hw/nfc.sch
+++ b/hw/nfc.sch
@@ -401,10 +401,10 @@ F 3 "" H 14650 6100 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$1306
+L GND #U$0237
U 1 1 578CC054
P 7400 3100
-F 0 "#U$1306" H 7310 3000 70 0001 L BNN
+F 0 "#U$0237" H 7310 3000 70 0001 L BNN
F 1 "GND" H 7310 3000 70 0001 L BNN
F 2 "" H 7400 3100 60 0001 C CNN
F 3 "" H 7400 3100 60 0001 C CNN
@@ -412,10 +412,10 @@ F 3 "" H 7400 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1315
+L GND #U$0238
U 1 1 578CC0B8
P 9300 7650
-F 0 "#U$1315" H 9210 7550 70 0001 L BNN
+F 0 "#U$0238" H 9210 7550 70 0001 L BNN
F 1 "GND" H 9210 7550 70 0001 L BNN
F 2 "" H 9300 7650 60 0001 C CNN
F 3 "" H 9300 7650 60 0001 C CNN
@@ -423,10 +423,10 @@ F 3 "" H 9300 7650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1308
+L GND #U$0239
U 1 1 578CC11C
P 8100 7550
-F 0 "#U$1308" H 8010 7450 70 0001 L BNN
+F 0 "#U$0239" H 8010 7450 70 0001 L BNN
F 1 "GND" H 8010 7450 70 0001 L BNN
F 2 "" H 8100 7550 60 0001 C CNN
F 3 "" H 8100 7550 60 0001 C CNN
@@ -434,10 +434,10 @@ F 3 "" H 8100 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1324
+L GND #U$0240
U 1 1 578CC180
P 12200 6850
-F 0 "#U$1324" H 12110 6750 70 0001 L BNN
+F 0 "#U$0240" H 12110 6750 70 0001 L BNN
F 1 "GND" H 12110 6750 70 0001 L BNN
F 2 "" H 12200 6850 60 0001 C CNN
F 3 "" H 12200 6850 60 0001 C CNN
@@ -445,10 +445,10 @@ F 3 "" H 12200 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1325
+L GND #U$0241
U 1 1 578CC1E4
P 12500 6850
-F 0 "#U$1325" H 12410 6750 70 0001 L BNN
+F 0 "#U$0241" H 12410 6750 70 0001 L BNN
F 1 "GND" H 12410 6750 70 0001 L BNN
F 2 "" H 12500 6850 60 0001 C CNN
F 3 "" H 12500 6850 60 0001 C CNN
@@ -456,10 +456,10 @@ F 3 "" H 12500 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1326
+L GND #U$0242
U 1 1 578CC248
P 12800 6850
-F 0 "#U$1326" H 12710 6750 70 0001 L BNN
+F 0 "#U$0242" H 12710 6750 70 0001 L BNN
F 1 "GND" H 12710 6750 70 0001 L BNN
F 2 "" H 12800 6850 60 0001 C CNN
F 3 "" H 12800 6850 60 0001 C CNN
@@ -467,10 +467,10 @@ F 3 "" H 12800 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1327
+L GND #U$0243
U 1 1 578CC2AC
P 13550 6850
-F 0 "#U$1327" H 13460 6750 70 0001 L BNN
+F 0 "#U$0243" H 13460 6750 70 0001 L BNN
F 1 "GND" H 13460 6750 70 0001 L BNN
F 2 "" H 13550 6850 60 0001 C CNN
F 3 "" H 13550 6850 60 0001 C CNN
@@ -478,10 +478,10 @@ F 3 "" H 13550 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1328
+L GND #U$0244
U 1 1 578CC310
P 13850 6850
-F 0 "#U$1328" H 13760 6750 70 0001 L BNN
+F 0 "#U$0244" H 13760 6750 70 0001 L BNN
F 1 "GND" H 13760 6750 70 0001 L BNN
F 2 "" H 13850 6850 60 0001 C CNN
F 3 "" H 13850 6850 60 0001 C CNN
@@ -489,10 +489,10 @@ F 3 "" H 13850 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1329
+L GND #U$0245
U 1 1 578CC374
P 14150 6850
-F 0 "#U$1329" H 14060 6750 70 0001 L BNN
+F 0 "#U$0245" H 14060 6750 70 0001 L BNN
F 1 "GND" H 14060 6750 70 0001 L BNN
F 2 "" H 14150 6850 60 0001 C CNN
F 3 "" H 14150 6850 60 0001 C CNN
@@ -500,10 +500,10 @@ F 3 "" H 14150 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1330
+L GND #U$0246
U 1 1 578CC3D8
P 14650 6850
-F 0 "#U$1330" H 14560 6750 70 0001 L BNN
+F 0 "#U$0246" H 14560 6750 70 0001 L BNN
F 1 "GND" H 14560 6750 70 0001 L BNN
F 2 "" H 14650 6850 60 0001 C CNN
F 3 "" H 14650 6850 60 0001 C CNN
@@ -511,10 +511,10 @@ F 3 "" H 14650 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1331
+L GND #U$0247
U 1 1 578CC43C
P 14950 6850
-F 0 "#U$1331" H 14860 6750 70 0001 L BNN
+F 0 "#U$0247" H 14860 6750 70 0001 L BNN
F 1 "GND" H 14860 6750 70 0001 L BNN
F 2 "" H 14950 6850 60 0001 C CNN
F 3 "" H 14950 6850 60 0001 C CNN
@@ -522,10 +522,10 @@ F 3 "" H 14950 6850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1322
+L GND #U$0248
U 1 1 578CC4A0
P 10850 8550
-F 0 "#U$1322" H 10760 8450 70 0001 L BNN
+F 0 "#U$0248" H 10760 8450 70 0001 L BNN
F 1 "GND" H 10760 8450 70 0001 L BNN
F 2 "" H 10850 8550 60 0001 C CNN
F 3 "" H 10850 8550 60 0001 C CNN
@@ -533,10 +533,10 @@ F 3 "" H 10850 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1321
+L GND #U$0249
U 1 1 578CC504
P 10500 8550
-F 0 "#U$1321" H 10410 8450 70 0001 L BNN
+F 0 "#U$0249" H 10410 8450 70 0001 L BNN
F 1 "GND" H 10410 8450 70 0001 L BNN
F 2 "" H 10500 8550 60 0001 C CNN
F 3 "" H 10500 8550 60 0001 C CNN
@@ -544,10 +544,10 @@ F 3 "" H 10500 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1318
+L GND #U$0250
U 1 1 578CC568
P 10050 8550
-F 0 "#U$1318" H 9960 8450 70 0001 L BNN
+F 0 "#U$0250" H 9960 8450 70 0001 L BNN
F 1 "GND" H 9960 8450 70 0001 L BNN
F 2 "" H 10050 8550 60 0001 C CNN
F 3 "" H 10050 8550 60 0001 C CNN
@@ -555,10 +555,10 @@ F 3 "" H 10050 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1316
+L GND #U$0251
U 1 1 578CC5CC
P 9600 8550
-F 0 "#U$1316" H 9510 8450 70 0001 L BNN
+F 0 "#U$0251" H 9510 8450 70 0001 L BNN
F 1 "GND" H 9510 8450 70 0001 L BNN
F 2 "" H 9600 8550 60 0001 C CNN
F 3 "" H 9600 8550 60 0001 C CNN
@@ -566,10 +566,10 @@ F 3 "" H 9600 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1313
+L GND #U$0252
U 1 1 578CC630
P 9100 8550
-F 0 "#U$1313" H 9010 8450 70 0001 L BNN
+F 0 "#U$0252" H 9010 8450 70 0001 L BNN
F 1 "GND" H 9010 8450 70 0001 L BNN
F 2 "" H 9100 8550 60 0001 C CNN
F 3 "" H 9100 8550 60 0001 C CNN
@@ -577,10 +577,10 @@ F 3 "" H 9100 8550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1311
+L GND #U$0253
U 1 1 578CC694
P 8900 7550
-F 0 "#U$1311" H 8810 7450 70 0001 L BNN
+F 0 "#U$0253" H 8810 7450 70 0001 L BNN
F 1 "GND" H 8810 7450 70 0001 L BNN
F 2 "" H 8900 7550 60 0001 C CNN
F 3 "" H 8900 7550 60 0001 C CNN
@@ -588,10 +588,10 @@ F 3 "" H 8900 7550 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1307
+L GND #U$0254
U 1 1 578CC6F8
P 7700 3100
-F 0 "#U$1307" H 7610 3000 70 0001 L BNN
+F 0 "#U$0254" H 7610 3000 70 0001 L BNN
F 1 "GND" H 7610 3000 70 0001 L BNN
F 2 "" H 7700 3100 60 0001 C CNN
F 3 "" H 7700 3100 60 0001 C CNN
@@ -599,10 +599,10 @@ F 3 "" H 7700 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1310
+L GND #U$0255
U 1 1 578CC75C
P 8600 3600
-F 0 "#U$1310" H 8510 3500 70 0001 L BNN
+F 0 "#U$0255" H 8510 3500 70 0001 L BNN
F 1 "GND" H 8510 3500 70 0001 L BNN
F 2 "" H 8600 3600 60 0001 C CNN
F 3 "" H 8600 3600 60 0001 C CNN
@@ -610,10 +610,10 @@ F 3 "" H 8600 3600 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$1312
+L GND #U$0256
U 1 1 578CC7C0
P 9100 3600
-F 0 "#U$1312" H 9010 3500 70 0001 L BNN
+F 0 "#U$0256" H 9010 3500 70 0001 L BNN
F 1 "GND" H 9010 3500 70 0001 L BNN
F 2 "" H 9100 3600 60 0001 C CNN
F 3 "" H 9100 3600 60 0001 C CNN
@@ -621,10 +621,10 @@ F 3 "" H 9100 3600 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$1314
+L GND #U$0257
U 1 1 578CC824
P 9300 4350
-F 0 "#U$1314" H 9210 4250 70 0001 L BNN
+F 0 "#U$0257" H 9210 4250 70 0001 L BNN
F 1 "GND" H 9210 4250 70 0001 L BNN
F 2 "" H 9300 4350 60 0001 C CNN
F 3 "" H 9300 4350 60 0001 C CNN
@@ -632,10 +632,10 @@ F 3 "" H 9300 4350 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$1317
+L GND #U$0258
U 1 1 578CC888
P 9800 3600
-F 0 "#U$1317" H 9710 3500 70 0001 L BNN
+F 0 "#U$0258" H 9710 3500 70 0001 L BNN
F 1 "GND" H 9710 3500 70 0001 L BNN
F 2 "" H 9800 3600 60 0001 C CNN
F 3 "" H 9800 3600 60 0001 C CNN
@@ -643,10 +643,10 @@ F 3 "" H 9800 3600 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$1309
+L GND #U$0259
U 1 1 578CC8EC
P 8300 3600
-F 0 "#U$1309" H 8210 3500 70 0001 L BNN
+F 0 "#U$0259" H 8210 3500 70 0001 L BNN
F 1 "GND" H 8210 3500 70 0001 L BNN
F 2 "" H 8300 3600 60 0001 C CNN
F 3 "" H 8300 3600 60 0001 C CNN
@@ -654,10 +654,10 @@ F 3 "" H 8300 3600 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$1305
+L GND #U$0260
U 1 1 578CC950
P 7300 5250
-F 0 "#U$1305" H 7210 5150 70 0001 L BNN
+F 0 "#U$0260" H 7210 5150 70 0001 L BNN
F 1 "GND" H 7210 5150 70 0001 L BNN
F 2 "" H 7300 5250 60 0001 C CNN
F 3 "" H 7300 5250 60 0001 C CNN
@@ -665,10 +665,10 @@ F 3 "" H 7300 5250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1323
+L GND #U$0261
U 1 1 578CCBA8
P 10900 7150
-F 0 "#U$1323" H 10810 7050 70 0001 L BNN
+F 0 "#U$0261" H 10810 7050 70 0001 L BNN
F 1 "GND" H 10810 7050 70 0001 L BNN
F 2 "" H 10900 7150 60 0001 C CNN
F 3 "" H 10900 7150 60 0001 C CNN
@@ -676,10 +676,10 @@ F 3 "" H 10900 7150 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1320
+L GND #U$0262
U 1 1 578CCC0C
P 10500 5650
-F 0 "#U$1320" H 10410 5550 70 0001 L BNN
+F 0 "#U$0262" H 10410 5550 70 0001 L BNN
F 1 "GND" H 10410 5550 70 0001 L BNN
F 2 "" H 10500 5650 60 0001 C CNN
F 3 "" H 10500 5650 60 0001 C CNN
@@ -687,10 +687,10 @@ F 3 "" H 10500 5650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$1319
+L GND #U$0263
U 1 1 578CCC70
P 10500 5450
-F 0 "#U$1319" H 10410 5350 70 0001 L BNN
+F 0 "#U$0263" H 10410 5350 70 0001 L BNN
F 1 "GND" H 10410 5350 70 0001 L BNN
F 2 "" H 10500 5450 60 0001 C CNN
F 3 "" H 10500 5450 60 0001 C CNN
@@ -730,10 +730,10 @@ Some choices, 3.2 x 2.6 mm, 8-10 pF:\nNDK NX3225GA-27.12M-STD-CRG-2\nNDK NX3225S
Text GLabel 15250 7600 2 60 Output ~ 0
NFC_GND
$Comp
-L GND #U$1332
+L GND #U$0264
U 1 1 58090761
P 15100 7800
-F 0 "#U$1332" H 15010 7700 70 0001 L BNN
+F 0 "#U$0264" H 15010 7700 70 0001 L BNN
F 1 "GND" H 15010 7700 70 0001 L BNN
F 2 "" H 15100 7800 60 0001 C CNN
F 3 "" H 15100 7800 60 0001 C CNN
@@ -793,10 +793,10 @@ F 3 "" H 3400 8200 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND #U$1304
+L GND #U$0265
U 1 1 582920B1
P 3800 4000
-F 0 "#U$1304" H 3710 3900 70 0001 L BNN
+F 0 "#U$0265" H 3710 3900 70 0001 L BNN
F 1 "GND" H 3710 3900 70 0001 L BNN
F 2 "" H 3800 4000 60 0001 C CNN
F 3 "" H 3800 4000 60 0001 C CNN
@@ -1303,8 +1303,8 @@ L GND #U$?
U 1 1 5829818B
P 3150 10350
AR Path="/578AFF0E/58297C9F/5829818B" Ref="#U$?" Part="1"
-AR Path="/578AFF0E/5829818B" Ref="#U$1303" Part="1"
-F 0 "#U$1303" H 3060 10250 70 0001 L BNN
+AR Path="/578AFF0E/5829818B" Ref="#U$0266" Part="1"
+F 0 "#U$0266" H 3060 10250 70 0001 L BNN
F 1 "GND" H 3060 10250 70 0001 L BNN
F 2 "" H 3150 10350 60 0001 C CNN
F 3 "" H 3150 10350 60 0001 C CNN
@@ -1316,8 +1316,8 @@ L GND #U$?
U 1 1 58298191
P 2000 10300
AR Path="/578AFF0E/58297C9F/58298191" Ref="#U$?" Part="1"
-AR Path="/578AFF0E/58298191" Ref="#U$1301" Part="1"
-F 0 "#U$1301" H 1910 10200 70 0001 L BNN
+AR Path="/578AFF0E/58298191" Ref="#U$0267" Part="1"
+F 0 "#U$0267" H 1910 10200 70 0001 L BNN
F 1 "GND" H 1910 10200 70 0001 L BNN
F 2 "" H 2000 10300 60 0001 C CNN
F 3 "" H 2000 10300 60 0001 C CNN
@@ -1329,8 +1329,8 @@ L GND #U$?
U 1 1 58298197
P 2000 10900
AR Path="/578AFF0E/58297C9F/58298197" Ref="#U$?" Part="1"
-AR Path="/578AFF0E/58298197" Ref="#U$1302" Part="1"
-F 0 "#U$1302" H 1910 10800 70 0001 L BNN
+AR Path="/578AFF0E/58298197" Ref="#U$0268" Part="1"
+F 0 "#U$0268" H 1910 10800 70 0001 L BNN
F 1 "GND" H 1910 10800 70 0001 L BNN
F 2 "" H 2000 10900 60 0001 C CNN
F 3 "" H 2000 10900 60 0001 C CNN
diff --git a/hw/sensors.sch b/hw/sensors.sch
index f770e19..d3b5288 100644
--- a/hw/sensors.sch
+++ b/hw/sensors.sch
@@ -132,10 +132,10 @@ F 3 "" H 4000 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$908
+L GND #U$0167
U 1 1 578C19EE
P 7400 3200
-F 0 "#U$908" H 7310 3100 70 0001 L BNN
+F 0 "#U$0167" H 7310 3100 70 0001 L BNN
F 1 "GND" H 7310 3100 70 0001 L BNN
F 2 "" H 7400 3200 60 0001 C CNN
F 3 "" H 7400 3200 60 0001 C CNN
@@ -143,10 +143,10 @@ F 3 "" H 7400 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$905
+L GND #U$0168
U 1 1 578C1BE2
P 3300 3800
-F 0 "#U$905" H 3210 3700 70 0001 L BNN
+F 0 "#U$0168" H 3210 3700 70 0001 L BNN
F 1 "GND" H 3210 3700 70 0001 L BNN
F 2 "" H 3300 3800 60 0001 C CNN
F 3 "" H 3300 3800 60 0001 C CNN
@@ -154,10 +154,10 @@ F 3 "" H 3300 3800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$902
+L GND #U$0169
U 1 1 578C1C46
P 2400 2900
-F 0 "#U$902" H 2310 2800 70 0001 L BNN
+F 0 "#U$0169" H 2310 2800 70 0001 L BNN
F 1 "GND" H 2310 2800 70 0001 L BNN
F 2 "" H 2400 2900 60 0001 C CNN
F 3 "" H 2400 2900 60 0001 C CNN
@@ -165,10 +165,10 @@ F 3 "" H 2400 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$904
+L GND #U$0170
U 1 1 578C1CAA
P 2800 2900
-F 0 "#U$904" H 2710 2800 70 0001 L BNN
+F 0 "#U$0170" H 2710 2800 70 0001 L BNN
F 1 "GND" H 2710 2800 70 0001 L BNN
F 2 "" H 2800 2900 60 0001 C CNN
F 3 "" H 2800 2900 60 0001 C CNN
@@ -176,10 +176,10 @@ F 3 "" H 2800 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$901
+L GND #U$0171
U 1 1 578C1E9E
P 2150 7700
-F 0 "#U$901" H 2060 7600 70 0001 L BNN
+F 0 "#U$0171" H 2060 7600 70 0001 L BNN
F 1 "GND" H 2060 7600 70 0001 L BNN
F 2 "" H 2150 7700 60 0001 C CNN
F 3 "" H 2150 7700 60 0001 C CNN
@@ -271,10 +271,10 @@ Wire Wire Line
9200 2900 9100 2900
Connection ~ 9200 2600
$Comp
-L GND #U$909
+L GND #U$0172
U 1 1 57D709C4
P 9200 3150
-F 0 "#U$909" H 9110 3050 70 0001 L BNN
+F 0 "#U$0172" H 9110 3050 70 0001 L BNN
F 1 "GND" H 9110 3050 70 0001 L BNN
F 2 "" H 9200 3150 60 0001 C CNN
F 3 "" H 9200 3150 60 0001 C CNN
@@ -402,10 +402,10 @@ Wire Wire Line
2550 6900 3500 6900
Connection ~ 2150 7250
$Comp
-L GND #U$903
+L GND #U$0173
U 1 1 57D7B552
P 2750 7700
-F 0 "#U$903" H 2660 7600 70 0001 L BNN
+F 0 "#U$0173" H 2660 7600 70 0001 L BNN
F 1 "GND" H 2660 7600 70 0001 L BNN
F 2 "" H 2750 7700 60 0001 C CNN
F 3 "" H 2750 7700 60 0001 C CNN
@@ -442,10 +442,10 @@ Wire Wire Line
5200 6250 5200 6100
Connection ~ 5200 6100
$Comp
-L GND #U$906
+L GND #U$0174
U 1 1 57D7C475
P 3400 8200
-F 0 "#U$906" H 3310 8100 70 0001 L BNN
+F 0 "#U$0174" H 3310 8100 70 0001 L BNN
F 1 "GND" H 3310 8100 70 0001 L BNN
F 2 "" H 3400 8200 60 0001 C CNN
F 3 "" H 3400 8200 60 0001 C CNN
@@ -455,10 +455,10 @@ $EndComp
NoConn ~ 3500 7900
NoConn ~ 3500 7800
$Comp
-L GND #U$907
+L GND #U$0175
U 1 1 57D7C52C
P 5000 7350
-F 0 "#U$907" H 4910 7250 70 0001 L BNN
+F 0 "#U$0175" H 4910 7250 70 0001 L BNN
F 1 "GND" H 4910 7250 70 0001 L BNN
F 2 "" H 5000 7350 60 0001 C CNN
F 3 "" H 5000 7350 60 0001 C CNN
@@ -554,8 +554,8 @@ L GND-2 #U$?
U 1 1 58290E49
P 10650 6750
AR Path="/578AFF0C/58290E49" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E49" Ref="#U$911" Part="1"
-F 0 "#U$911" H 10530 6651 70 0001 L BNN
+AR Path="/578AFF02/58290E49" Ref="#U$0176" Part="1"
+F 0 "#U$0176" H 10530 6651 70 0001 L BNN
F 1 "GND2" H 10530 6651 70 0001 L BNN
F 2 "" H 10650 6750 60 0001 C CNN
F 3 "" H 10650 6750 60 0001 C CNN
@@ -567,8 +567,8 @@ L GND-2 #U$?
U 1 1 58290E4F
P 10050 6750
AR Path="/578AFF0C/58290E4F" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E4F" Ref="#U$910" Part="1"
-F 0 "#U$910" H 9930 6651 70 0001 L BNN
+AR Path="/578AFF02/58290E4F" Ref="#U$0177" Part="1"
+F 0 "#U$0177" H 9930 6651 70 0001 L BNN
F 1 "GND2" H 9930 6651 70 0001 L BNN
F 2 "" H 10050 6750 60 0001 C CNN
F 3 "" H 10050 6750 60 0001 C CNN
@@ -580,8 +580,8 @@ L GND-2 #U$?
U 1 1 58290E55
P 11000 5900
AR Path="/578AFF0C/58290E55" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E55" Ref="#U$913" Part="1"
-F 0 "#U$913" H 10880 5801 70 0001 L BNN
+AR Path="/578AFF02/58290E55" Ref="#U$0178" Part="1"
+F 0 "#U$0178" H 10880 5801 70 0001 L BNN
F 1 "GND2" H 10880 5801 70 0001 L BNN
F 2 "" H 11000 5900 60 0001 C CNN
F 3 "" H 11000 5900 60 0001 C CNN
@@ -596,7 +596,7 @@ AR Path="/578AFF0C/58290E5B" Ref="U?" Part="1"
AR Path="/578AFF02/58290E5B" Ref="U902" Part="1"
F 0 "U902" H 11300 6550 50 0000 L CNN
F 1 "TMD26713" H 11600 5550 50 0000 C CNN
-F 2 "TMD2671" H 11600 5450 20 0001 C CNN
+F 2 "neo900:TMD2671" H 11600 5450 20 0001 C CNN
F 3 "" H 10850 6150 60 0001 C CNN
1 11600 6000
1 0 0 -1
@@ -652,8 +652,8 @@ U 1 1 58290E7A
P 11400 9400
AR Path="/578AFF18/58290E7A" Ref="#U$?" Part="1"
AR Path="/578AFF0C/58290E7A" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E7A" Ref="#U$914" Part="1"
-F 0 "#U$914" H 11280 9301 70 0001 L BNN
+AR Path="/578AFF02/58290E7A" Ref="#U$0179" Part="1"
+F 0 "#U$0179" H 11280 9301 70 0001 L BNN
F 1 "GND2" H 11280 9301 70 0001 L BNN
F 2 "" H 11400 9400 60 0001 C CNN
F 3 "" H 11400 9400 60 0001 C CNN
@@ -699,8 +699,8 @@ L GND-2 #U$?
U 1 1 58290E92
P 10700 8500
AR Path="/578AFF0C/58290E92" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290E92" Ref="#U$912" Part="1"
-F 0 "#U$912" H 10580 8401 70 0001 L BNN
+AR Path="/578AFF02/58290E92" Ref="#U$0180" Part="1"
+F 0 "#U$0180" H 10580 8401 70 0001 L BNN
F 1 "GND2" H 10580 8401 70 0001 L BNN
F 2 "" H 10700 8500 60 0001 C CNN
F 3 "" H 10700 8500 60 0001 C CNN
@@ -735,8 +735,8 @@ U 1 1 58290EA4
P 12500 9200
AR Path="/578AFF18/58290EA4" Ref="#U$?" Part="1"
AR Path="/578AFF0C/58290EA4" Ref="#U$?" Part="1"
-AR Path="/578AFF02/58290EA4" Ref="#U$915" Part="1"
-F 0 "#U$915" H 12380 9101 70 0001 L BNN
+AR Path="/578AFF02/58290EA4" Ref="#U$0181" Part="1"
+F 0 "#U$0181" H 12380 9101 70 0001 L BNN
F 1 "GND2" H 12380 9101 70 0001 L BNN
F 2 "" H 12500 9200 60 0001 C CNN
F 3 "" H 12500 9200 60 0001 C CNN
@@ -771,10 +771,10 @@ Wire Wire Line
12400 8500 12400 8600
Connection ~ 12400 8600
$Comp
-L POWERED #FLG901
+L POWERED #FLG0182
U 1 1 58290EB9
P 10750 5300
-F 0 "#FLG901" H 10950 5200 60 0001 C CNN
+F 0 "#FLG0182" H 10950 5200 60 0001 C CNN
F 1 "POWERED" H 10750 5350 60 0000 C CNN
F 2 "" H 10750 5300 60 0001 C CNN
F 3 "" H 10750 5300 60 0001 C CNN
diff --git a/hw/sims.sch b/hw/sims.sch
index 3d38368..24a94d2 100644
--- a/hw/sims.sch
+++ b/hw/sims.sch
@@ -67,10 +67,10 @@ F 3 "" H 13200 1900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$612
+L GND #U$096
U 1 1 578B8E7F
P 6200 4800
-F 0 "#U$612" H 6110 4700 70 0001 L BNN
+F 0 "#U$096" H 6110 4700 70 0001 L BNN
F 1 "GND" H 6110 4700 70 0001 L BNN
F 2 "" H 6200 4800 60 0001 C CNN
F 3 "" H 6200 4800 60 0001 C CNN
@@ -171,17 +171,17 @@ U 1 1 57E1C7D6
P 5900 4400
F 0 "C604" H 5940 4440 50 0000 L CNN
F 1 "100n" H 5940 4270 50 0000 L CNN
-F 2 "SMD-0402" H 5930 4550 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5930 4550 20 0001 C CNN
F 3 "" H 5900 4400 60 0001 C CNN
1 5900 4400
1 0 0 -1
$EndComp
NoConn ~ 6900 4600
$Comp
-L GND #U$610
+L GND #U$097
U 1 1 57E1D0F5
P 5900 4800
-F 0 "#U$610" H 5810 4700 70 0001 L BNN
+F 0 "#U$097" H 5810 4700 70 0001 L BNN
F 1 "GND" H 5810 4700 70 0001 L BNN
F 2 "" H 5900 4800 60 0001 C CNN
F 3 "" H 5900 4800 60 0001 C CNN
@@ -191,10 +191,10 @@ $EndComp
Text GLabel 2400 700 0 60 Input ~ 0
1V8
$Comp
-L GND #U$605
+L GND #U$098
U 1 1 57E1E0AF
P 4100 2800
-F 0 "#U$605" H 4010 2700 70 0001 L BNN
+F 0 "#U$098" H 4010 2700 70 0001 L BNN
F 1 "GND" H 4010 2700 70 0001 L BNN
F 2 "" H 4100 2800 60 0001 C CNN
F 3 "" H 4100 2800 60 0001 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 4100 2800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$609
+L GND #U$099
U 1 1 57E1E0FC
P 5100 2050
-F 0 "#U$609" H 5010 1950 70 0001 L BNN
+F 0 "#U$099" H 5010 1950 70 0001 L BNN
F 1 "GND" H 5010 1950 70 0001 L BNN
F 2 "" H 5100 2050 60 0001 C CNN
F 3 "" H 5100 2050 60 0001 C CNN
@@ -222,16 +222,16 @@ U 1 1 57E1EA16
P 4450 900
F 0 "C603" H 4490 940 50 0000 L CNN
F 1 "1u" H 4490 770 50 0000 L CNN
-F 2 "SMD-0402" H 4480 1050 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 4480 1050 20 0001 C CNN
F 3 "" H 4450 900 60 0001 C CNN
1 4450 900
1 0 0 -1
$EndComp
$Comp
-L GND #U$606
+L GND #U$0100
U 1 1 57E1EB15
P 4450 1300
-F 0 "#U$606" H 4360 1200 70 0001 L BNN
+F 0 "#U$0100" H 4360 1200 70 0001 L BNN
F 1 "GND" H 4360 1200 70 0001 L BNN
F 2 "" H 4450 1300 60 0001 C CNN
F 3 "" H 4450 1300 60 0001 C CNN
@@ -250,7 +250,7 @@ U 1 1 57E204A1
P 3150 5800
F 0 "C602" H 3190 5840 50 0000 L CNN
F 1 "1u" H 3190 5670 50 0000 L CNN
-F 2 "SMD-0402" H 3180 5950 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 3180 5950 20 0001 C CNN
F 3 "" H 3150 5800 60 0001 C CNN
1 3150 5800
1 0 0 -1
@@ -272,16 +272,16 @@ U 1 1 57E21B68
P 2500 5300
F 0 "C601" H 2540 5340 50 0000 L CNN
F 1 "100n" H 2540 5170 50 0000 L CNN
-F 2 "SMD-0402" H 2530 5450 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 2530 5450 20 0001 C CNN
F 3 "" H 2500 5300 60 0001 C CNN
1 2500 5300
1 0 0 -1
$EndComp
$Comp
-L GND #U$601
+L GND #U$0101
U 1 1 57E21C1E
P 2300 6950
-F 0 "#U$601" H 2210 6850 70 0001 L BNN
+F 0 "#U$0101" H 2210 6850 70 0001 L BNN
F 1 "GND" H 2210 6850 70 0001 L BNN
F 2 "" H 2300 6950 60 0001 C CNN
F 3 "" H 2300 6950 60 0001 C CNN
@@ -289,10 +289,10 @@ F 3 "" H 2300 6950 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$608
+L GND #U$0102
U 1 1 57E21C7D
P 4650 5350
-F 0 "#U$608" H 4560 5250 70 0001 L BNN
+F 0 "#U$0102" H 4560 5250 70 0001 L BNN
F 1 "GND" H 4560 5250 70 0001 L BNN
F 2 "" H 4650 5350 60 0001 C CNN
F 3 "" H 4650 5350 60 0001 C CNN
@@ -346,10 +346,10 @@ Text GLabel 7100 5750 2 60 Input ~ 0
Text GLabel 7100 7450 2 60 Input ~ 0
1V8
$Comp
-L GND #U$615
+L GND #U$0103
U 1 1 57E26D60
P 6350 8650
-F 0 "#U$615" H 6260 8550 70 0001 L BNN
+F 0 "#U$0103" H 6260 8550 70 0001 L BNN
F 1 "GND" H 6260 8550 70 0001 L BNN
F 2 "" H 6350 8650 60 0001 C CNN
F 3 "" H 6350 8650 60 0001 C CNN
@@ -357,10 +357,10 @@ F 3 "" H 6350 8650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$614
+L GND #U$0104
U 1 1 57E26E89
P 6350 6950
-F 0 "#U$614" H 6260 6850 70 0001 L BNN
+F 0 "#U$0104" H 6260 6850 70 0001 L BNN
F 1 "GND" H 6260 6850 70 0001 L BNN
F 2 "" H 6350 6950 60 0001 C CNN
F 3 "" H 6350 6950 60 0001 C CNN
@@ -373,7 +373,7 @@ U 1 1 57E275D0
P 6900 6550
F 0 "C606" H 6940 6590 50 0000 L CNN
F 1 "100n" H 6940 6420 50 0000 L CNN
-F 2 "SMD-0402" H 6930 6700 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 6930 6700 20 0001 C CNN
F 3 "" H 6900 6550 60 0001 C CNN
1 6900 6550
1 0 0 -1
@@ -384,16 +384,16 @@ U 1 1 57E27719
P 6900 8250
F 0 "C607" H 6940 8290 50 0000 L CNN
F 1 "100n" H 6940 8120 50 0000 L CNN
-F 2 "SMD-0402" H 6930 8400 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 6930 8400 20 0001 C CNN
F 3 "" H 6900 8250 60 0001 C CNN
1 6900 8250
1 0 0 -1
$EndComp
$Comp
-L GND #U$617
+L GND #U$0105
U 1 1 57E27ECF
P 6900 8650
-F 0 "#U$617" H 6810 8550 70 0001 L BNN
+F 0 "#U$0105" H 6810 8550 70 0001 L BNN
F 1 "GND" H 6810 8550 70 0001 L BNN
F 2 "" H 6900 8650 60 0001 C CNN
F 3 "" H 6900 8650 60 0001 C CNN
@@ -401,10 +401,10 @@ F 3 "" H 6900 8650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$616
+L GND #U$0106
U 1 1 57E2845B
P 6900 6950
-F 0 "#U$616" H 6810 6850 70 0001 L BNN
+F 0 "#U$0106" H 6810 6850 70 0001 L BNN
F 1 "GND" H 6810 6850 70 0001 L BNN
F 2 "" H 6900 6950 60 0001 C CNN
F 3 "" H 6900 6950 60 0001 C CNN
@@ -413,10 +413,10 @@ F 3 "" H 6900 6950 60 0001 C CNN
$EndComp
NoConn ~ 6800 6250
$Comp
-L GND #U$602
+L GND #U$0107
U 1 1 57E292D3
P 2500 5700
-F 0 "#U$602" H 2410 5600 70 0001 L BNN
+F 0 "#U$0107" H 2410 5600 70 0001 L BNN
F 1 "GND" H 2410 5600 70 0001 L BNN
F 2 "" H 2500 5700 60 0001 C CNN
F 3 "" H 2500 5700 60 0001 C CNN
@@ -446,10 +446,10 @@ F 3 "" H 3400 1775 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L GND #U$604
+L GND #U$0108
U 1 1 57E226F8
P 3550 2000
-F 0 "#U$604" H 3460 1900 70 0001 L BNN
+F 0 "#U$0108" H 3460 1900 70 0001 L BNN
F 1 "GND" H 3460 1900 70 0001 L BNN
F 2 "" H 3550 2000 60 0001 C CNN
F 3 "" H 3550 2000 60 0001 C CNN
@@ -458,10 +458,10 @@ F 3 "" H 3550 2000 60 0001 C CNN
$EndComp
NoConn ~ 6900 10500
$Comp
-L GND #U$613
+L GND #U$0109
U 1 1 57E264F5
P 6200 10700
-F 0 "#U$613" H 6110 10600 70 0001 L BNN
+F 0 "#U$0109" H 6110 10600 70 0001 L BNN
F 1 "GND" H 6110 10600 70 0001 L BNN
F 2 "" H 6200 10700 60 0001 C CNN
F 3 "" H 6200 10700 60 0001 C CNN
@@ -474,16 +474,16 @@ U 1 1 57E264FB
P 5900 10300
F 0 "C605" H 5940 10340 50 0000 L CNN
F 1 "100n" H 5940 10170 50 0000 L CNN
-F 2 "SMD-0402" H 5930 10450 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 5930 10450 20 0001 C CNN
F 3 "" H 5900 10300 60 0001 C CNN
1 5900 10300
1 0 0 -1
$EndComp
$Comp
-L GND #U$611
+L GND #U$0110
U 1 1 57E26501
P 5900 10700
-F 0 "#U$611" H 5810 10600 70 0001 L BNN
+F 0 "#U$0110" H 5810 10600 70 0001 L BNN
F 1 "GND" H 5810 10600 70 0001 L BNN
F 2 "" H 5900 10700 60 0001 C CNN
F 3 "" H 5900 10700 60 0001 C CNN
@@ -565,10 +565,10 @@ F 3 "" H 4350 6425 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$607
+L GND #U$0111
U 1 1 57E2388F
P 4500 6950
-F 0 "#U$607" H 4410 6850 70 0001 L BNN
+F 0 "#U$0111" H 4410 6850 70 0001 L BNN
F 1 "GND" H 4410 6850 70 0001 L BNN
F 2 "" H 4500 6950 60 0001 C CNN
F 3 "" H 4500 6950 60 0001 C CNN
@@ -594,10 +594,10 @@ Diodes 74AUP1G32FW4
Text Notes 3700 5250 0 40 ~ 0
Diodes 74AUP1G32FW4
$Comp
-L GND #U$625
+L GND #U$0112
U 1 1 57E2D768
P 12200 2900
-F 0 "#U$625" H 12110 2800 70 0001 L BNN
+F 0 "#U$0112" H 12110 2800 70 0001 L BNN
F 1 "GND" H 12110 2800 70 0001 L BNN
F 2 "" H 12200 2900 60 0001 C CNN
F 3 "" H 12200 2900 60 0001 C CNN
@@ -605,10 +605,10 @@ F 3 "" H 12200 2900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$627
+L GND #U$0113
U 1 1 57E2DAE2
P 14400 2900
-F 0 "#U$627" H 14310 2800 70 0001 L BNN
+F 0 "#U$0113" H 14310 2800 70 0001 L BNN
F 1 "GND" H 14310 2800 70 0001 L BNN
F 2 "" H 14400 2900 60 0001 C CNN
F 3 "" H 14400 2900 60 0001 C CNN
@@ -656,16 +656,16 @@ U 1 1 57E31297
P 11800 2500
F 0 "C610" H 11840 2540 50 0000 L CNN
F 1 "220n" H 11840 2370 50 0000 L CNN
-F 2 "SMD-0402" H 11830 2650 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11830 2650 20 0001 C CNN
F 3 "" H 11800 2500 60 0001 C CNN
1 11800 2500
1 0 0 -1
$EndComp
$Comp
-L GND #U$623
+L GND #U$0114
U 1 1 57E316A2
P 11800 2900
-F 0 "#U$623" H 11710 2800 70 0001 L BNN
+F 0 "#U$0114" H 11710 2800 70 0001 L BNN
F 1 "GND" H 11710 2800 70 0001 L BNN
F 2 "" H 11800 2900 60 0001 C CNN
F 3 "" H 11800 2900 60 0001 C CNN
@@ -678,16 +678,16 @@ U 1 1 57E31A8A
P 11450 2500
F 0 "C608" H 11490 2540 50 0000 L CNN
F 1 "1n" H 11490 2370 50 0000 L CNN
-F 2 "SMD-0402" H 11480 2650 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11480 2650 20 0001 C CNN
F 3 "" H 11450 2500 60 0001 C CNN
1 11450 2500
1 0 0 -1
$EndComp
$Comp
-L GND #U$621
+L GND #U$0115
U 1 1 57E31B3A
P 11450 2900
-F 0 "#U$621" H 11360 2800 70 0001 L BNN
+F 0 "#U$0115" H 11360 2800 70 0001 L BNN
F 1 "GND" H 11360 2800 70 0001 L BNN
F 2 "" H 11450 2900 60 0001 C CNN
F 3 "" H 11450 2900 60 0001 C CNN
@@ -702,16 +702,16 @@ AR Path="/57E31E60" Ref="U?" Part="1"
AR Path="/578AFEFC/57E31E60" Ref="U612" Part="1"
F 0 "U612" V 9550 800 50 0000 L CNN
F 1 "ESDA6V1-5P6" V 10650 1100 50 0000 C CNN
-F 2 "SOT666IP" H 10030 1250 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 10030 1250 20 0001 C CNN
F 3 "" H 10000 1100 60 0001 C CNN
1 10000 1100
0 1 1 0
$EndComp
$Comp
-L GND #U$618
+L GND #U$0116
U 1 1 57E34172
P 9400 1400
-F 0 "#U$618" H 9310 1300 70 0001 L BNN
+F 0 "#U$0116" H 9310 1300 70 0001 L BNN
F 1 "GND" H 9310 1300 70 0001 L BNN
F 2 "" H 9400 1400 60 0001 C CNN
F 3 "" H 9400 1400 60 0001 C CNN
@@ -728,16 +728,16 @@ U 1 1 57E24C88
P 13200 6000
F 0 "P602" H 12500 6750 50 0000 L CNN
F 1 "101-00271-82" H 13200 5150 50 0000 C CNN
-F 2 "SJ106220" H 13230 6150 20 0001 C CNN
+F 2 "neo900-legacy:SJ106220" H 13230 6150 20 0001 C CNN
F 3 "" H 13200 6000 60 0001 C CNN
1 13200 6000
1 0 0 -1
$EndComp
$Comp
-L GND #U$626
+L GND #U$0117
U 1 1 57E25FE7
P 12200 7350
-F 0 "#U$626" H 12110 7250 70 0001 L BNN
+F 0 "#U$0117" H 12110 7250 70 0001 L BNN
F 1 "GND" H 12110 7250 70 0001 L BNN
F 2 "" H 12200 7350 60 0001 C CNN
F 3 "" H 12200 7350 60 0001 C CNN
@@ -745,10 +745,10 @@ F 3 "" H 12200 7350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$628
+L GND #U$0118
U 1 1 57E2622B
P 14400 6950
-F 0 "#U$628" H 14310 6850 70 0001 L BNN
+F 0 "#U$0118" H 14310 6850 70 0001 L BNN
F 1 "GND" H 14310 6850 70 0001 L BNN
F 2 "" H 14400 6950 60 0001 C CNN
F 3 "" H 14400 6950 60 0001 C CNN
@@ -765,16 +765,16 @@ U 1 1 57E26CBB
P 11800 6950
F 0 "C611" H 11840 6990 50 0000 L CNN
F 1 "220n" H 11840 6820 50 0000 L CNN
-F 2 "SMD-0402" H 11830 7100 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11830 7100 20 0001 C CNN
F 3 "" H 11800 6950 60 0001 C CNN
1 11800 6950
1 0 0 -1
$EndComp
$Comp
-L GND #U$624
+L GND #U$0119
U 1 1 57E26CC1
P 11800 7350
-F 0 "#U$624" H 11710 7250 70 0001 L BNN
+F 0 "#U$0119" H 11710 7250 70 0001 L BNN
F 1 "GND" H 11710 7250 70 0001 L BNN
F 2 "" H 11800 7350 60 0001 C CNN
F 3 "" H 11800 7350 60 0001 C CNN
@@ -787,16 +787,16 @@ U 1 1 57E26CC8
P 11450 6950
F 0 "C609" H 11490 6990 50 0000 L CNN
F 1 "1n" H 11490 6820 50 0000 L CNN
-F 2 "SMD-0402" H 11480 7100 20 0001 C CNN
+F 2 "neo900-legacy:SMD-0402" H 11480 7100 20 0001 C CNN
F 3 "" H 11450 6950 60 0001 C CNN
1 11450 6950
1 0 0 -1
$EndComp
$Comp
-L GND #U$622
+L GND #U$0120
U 1 1 57E26CCE
P 11450 7350
-F 0 "#U$622" H 11360 7250 70 0001 L BNN
+F 0 "#U$0120" H 11360 7250 70 0001 L BNN
F 1 "GND" H 11360 7250 70 0001 L BNN
F 2 "" H 11450 7350 60 0001 C CNN
F 3 "" H 11450 7350 60 0001 C CNN
@@ -846,16 +846,16 @@ AR Path="/57E2DD36" Ref="U?" Part="1"
AR Path="/578AFEFC/57E2DD36" Ref="U613" Part="1"
F 0 "U613" H 11850 4050 50 0000 R CNN
F 1 "ESDA6V1-5P6" H 10800 4500 50 0000 R CNN
-F 2 "SOT666IP" H 11280 4550 20 0001 C CNN
+F 2 "neo900-legacy:SOT666IP" H 11280 4550 20 0001 C CNN
F 3 "" H 11250 4400 60 0001 C CNN
1 11250 4400
-1 0 0 1
$EndComp
$Comp
-L GND #U$620
+L GND #U$0121
U 1 1 57E2E04D
P 11350 3900
-F 0 "#U$620" H 11260 3800 70 0001 L BNN
+F 0 "#U$0121" H 11260 3800 70 0001 L BNN
F 1 "GND" H 11260 3800 70 0001 L BNN
F 2 "" H 11350 3900 60 0001 C CNN
F 3 "" H 11350 3900 60 0001 C CNN
@@ -920,10 +920,10 @@ F 3 "" H 4700 8900 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$603
+L GND #U$0122
U 1 1 57E2B73C
P 2800 9950
-F 0 "#U$603" H 2710 9850 70 0001 L BNN
+F 0 "#U$0122" H 2710 9850 70 0001 L BNN
F 1 "GND" H 2710 9850 70 0001 L BNN
F 2 "" H 2800 9950 60 0001 C CNN
F 3 "" H 2800 9950 60 0001 C CNN
@@ -1454,10 +1454,10 @@ F 3 "" H 10150 7050 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #U$619
+L GND #U$0123
U 1 1 57E47140
P 10150 7450
-F 0 "#U$619" H 10060 7350 70 0001 L BNN
+F 0 "#U$0123" H 10060 7350 70 0001 L BNN
F 1 "GND" H 10060 7350 70 0001 L BNN
F 2 "" H 10150 7450 60 0001 C CNN
F 3 "" H 10150 7450 60 0001 C CNN
@@ -1473,10 +1473,10 @@ NoConn ~ 14300 2700
NoConn ~ 12300 2600
NoConn ~ 12300 2700
$Comp
-L POWERED #FLG601
+L POWERED #FLG0124
U 1 1 580A20DE
P 4100 8300
-F 0 "#FLG601" H 4300 8200 60 0001 C CNN
+F 0 "#FLG0124" H 4300 8200 60 0001 C CNN
F 1 "POWERED" H 4100 8350 60 0000 C CNN
F 2 "" H 4100 8300 60 0001 C CNN
F 3 "" H 4100 8300 60 0001 C CNN
diff --git a/hw/v2.sch b/hw/v2.sch
index b139c05..e411a8d 100644
--- a/hw/v2.sch
+++ b/hw/v2.sch
@@ -71,10 +71,10 @@ F 3 "" H 6600 7850 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND-3 #U$2204
+L GND-3 #U$0399
U 1 1 578E2140
P 7700 7550
-F 0 "#U$2204" H 7580 7451 70 0001 L BNN
+F 0 "#U$0399" H 7580 7451 70 0001 L BNN
F 1 "GND3" H 7580 7451 70 0001 L BNN
F 2 "" H 7700 7550 60 0001 C CNN
F 3 "" H 7700 7550 60 0001 C CNN
@@ -118,10 +118,10 @@ F 3 "" H 6400 10050 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M2202
+L GND #M0400
U 1 1 58079E6A
P 6400 10450
-F 0 "#M2202" H 6400 10450 45 0001 C CNN
+F 0 "#M0400" H 6400 10450 45 0001 C CNN
F 1 "GND" H 6400 10450 45 0001 C CNN
F 2 "" H 6400 10450 60 0001 C CNN
F 3 "" H 6400 10450 60 0001 C CNN
@@ -129,10 +129,10 @@ F 3 "" H 6400 10450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M2201
+L GND #M0401
U 1 1 58079EB4
P 5200 10450
-F 0 "#M2201" H 5200 10450 45 0001 C CNN
+F 0 "#M0401" H 5200 10450 45 0001 C CNN
F 1 "GND" H 5200 10450 45 0001 C CNN
F 2 "" H 5200 10450 60 0001 C CNN
F 3 "" H 5200 10450 60 0001 C CNN
@@ -173,10 +173,10 @@ F 3 "" H 9200 9700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M2203
+L GND #M0402
U 1 1 5820D911
P 8600 10450
-F 0 "#M2203" H 8600 10450 45 0001 C CNN
+F 0 "#M0402" H 8600 10450 45 0001 C CNN
F 1 "GND" H 8600 10450 45 0001 C CNN
F 2 "" H 8600 10450 60 0001 C CNN
F 3 "" H 8600 10450 60 0001 C CNN
@@ -184,10 +184,10 @@ F 3 "" H 8600 10450 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #M2204
+L GND #M0403
U 1 1 5820D928
P 9800 10450
-F 0 "#M2204" H 9800 10450 45 0001 C CNN
+F 0 "#M0403" H 9800 10450 45 0001 C CNN
F 1 "GND" H 9800 10450 45 0001 C CNN
F 2 "" H 9800 10450 60 0001 C CNN
F 3 "" H 9800 10450 60 0001 C CNN
@@ -239,8 +239,8 @@ L GND-3 #U$?
U 1 1 5828F4B4
P 4600 4400
AR Path="/578AFF28/5828F4B4" Ref="#U$?" Part="1"
-AR Path="/578AFF30/5828F4B4" Ref="#U$2201" Part="1"
-F 0 "#U$2201" H 4480 4301 70 0001 L BNN
+AR Path="/578AFF30/5828F4B4" Ref="#U$0404" Part="1"
+F 0 "#U$0404" H 4480 4301 70 0001 L BNN
F 1 "GND3" H 4480 4301 70 0001 L BNN
F 2 "" H 4600 4400 60 0001 C CNN
F 3 "" H 4600 4400 60 0001 C CNN
@@ -303,8 +303,8 @@ L GND-3 #U$?
U 1 1 5828F4D4
P 5500 5000
AR Path="/578AFF28/5828F4D4" Ref="#U$?" Part="1"
-AR Path="/578AFF30/5828F4D4" Ref="#U$2203" Part="1"
-F 0 "#U$2203" H 5380 4901 70 0001 L BNN
+AR Path="/578AFF30/5828F4D4" Ref="#U$0405" Part="1"
+F 0 "#U$0405" H 5380 4901 70 0001 L BNN
F 1 "GND3" H 5380 4901 70 0001 L BNN
F 2 "" H 5500 5000 60 0001 C CNN
F 3 "" H 5500 5000 60 0001 C CNN
@@ -362,8 +362,8 @@ L GND-3 #U$?
U 1 1 5828F4F4
P 4650 6200
AR Path="/578AFF28/5828F4F4" Ref="#U$?" Part="1"
-AR Path="/578AFF30/5828F4F4" Ref="#U$2202" Part="1"
-F 0 "#U$2202" H 4530 6101 70 0001 L BNN
+AR Path="/578AFF30/5828F4F4" Ref="#U$0406" Part="1"
+F 0 "#U$0406" H 4530 6101 70 0001 L BNN
F 1 "GND3" H 4530 6101 70 0001 L BNN
F 2 "" H 4650 6200 60 0001 C CNN
F 3 "" H 4650 6200 60 0001 C CNN
diff --git a/hw/wlan.sch b/hw/wlan.sch
index 61b2f3d..eb8a6f6 100644
--- a/hw/wlan.sch
+++ b/hw/wlan.sch
@@ -163,10 +163,10 @@ F 3 "" H 2600 9150 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L GND #U$809
+L GND #U$0150
U 1 1 578BFB5B
P 5950 9900
-F 0 "#U$809" H 5860 9800 70 0001 L BNN
+F 0 "#U$0150" H 5860 9800 70 0001 L BNN
F 1 "GND" H 5860 9800 70 0001 L BNN
F 2 "" H 5950 9900 60 0001 C CNN
F 3 "" H 5950 9900 60 0001 C CNN
@@ -264,10 +264,10 @@ Text GLabel 6550 8150 0 60 Input ~ 0
FM_RX
NoConn ~ 8450 9150
$Comp
-L GND #U$814
+L GND #U$0151
U 1 1 57E8AAF6
P 8550 10350
-F 0 "#U$814" H 8460 10250 70 0001 L BNN
+F 0 "#U$0151" H 8460 10250 70 0001 L BNN
F 1 "GND" H 8460 10250 70 0001 L BNN
F 2 "" H 8550 10350 60 0001 C CNN
F 3 "" H 8550 10350 60 0001 C CNN
@@ -283,10 +283,10 @@ Wire Wire Line
Wire Wire Line
6450 9700 6450 9750
$Comp
-L GND #U$806
+L GND #U$0152
U 1 1 57E8CB65
P 5150 9350
-F 0 "#U$806" H 5060 9250 70 0001 L BNN
+F 0 "#U$0152" H 5060 9250 70 0001 L BNN
F 1 "GND" H 5060 9250 70 0001 L BNN
F 2 "" H 5150 9350 60 0001 C CNN
F 3 "" H 5150 9350 60 0001 C CNN
@@ -314,7 +314,7 @@ U 5 1 57F02A53
P 14300 3000
F 0 "U801" H 14300 4450 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 14500 1400 50 0000 C CNN
-F 2 "WL1837MOD" H 14250 2100 20 0001 C CNN
+F 2 "neo900-legacy:WL18XXMOD" H 14250 2100 20 0001 C CNN
F 3 "" H 13550 3250 60 0001 C CNN
5 14300 3000
1 0 0 -1
@@ -325,7 +325,7 @@ U 6 1 57F02B1C
P 15300 3400
F 0 "U801" H 15300 5250 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 15550 1400 50 0000 C CNN
-F 2 "WL1837MOD" H 15250 2500 20 0001 C CNN
+F 2 "neo900-legacy:WL18XXMOD" H 15250 2500 20 0001 C CNN
F 3 "" H 14550 3650 60 0001 C CNN
6 15300 3400
1 0 0 -1
@@ -523,10 +523,10 @@ Wire Wire Line
14100 4300 14000 4300
Connection ~ 14000 4300
$Comp
-L GND #U$816
+L GND #U$0153
U 1 1 57F06499
P 14000 4700
-F 0 "#U$816" H 13910 4600 70 0001 L BNN
+F 0 "#U$0153" H 13910 4600 70 0001 L BNN
F 1 "GND" H 13910 4600 70 0001 L BNN
F 2 "" H 14000 4700 60 0001 C CNN
F 3 "" H 14000 4700 60 0001 C CNN
@@ -534,10 +534,10 @@ F 3 "" H 14000 4700 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$817
+L GND #U$0154
U 1 1 57F066C0
P 15000 5400
-F 0 "#U$817" H 14910 5300 70 0001 L BNN
+F 0 "#U$0154" H 14910 5300 70 0001 L BNN
F 1 "GND" H 14910 5300 70 0001 L BNN
F 2 "" H 15000 5400 60 0001 C CNN
F 3 "" H 15000 5400 60 0001 C CNN
@@ -552,7 +552,7 @@ U 2 1 57F06E55
P 9700 5300
F 0 "U801" H 9200 5850 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 9450 4750 50 0000 C CNN
-F 2 "WL1837MOD" H 9650 4400 20 0001 C CNN
+F 2 "neo900-legacy:WL18XXMOD" H 9650 4400 20 0001 C CNN
F 3 "" H 8950 5550 60 0001 C CNN
2 9700 5300
1 0 0 -1
@@ -563,7 +563,7 @@ U 3 1 57F06F41
P 2100 5300
F 0 "U801" H 1600 5850 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 1850 4650 50 0000 C CNN
-F 2 "WL1837MOD" H 2050 4400 20 0001 C CNN
+F 2 "neo900-legacy:WL18XXMOD" H 2050 4400 20 0001 C CNN
F 3 "" H 1350 5550 60 0001 C CNN
3 2100 5300
1 0 0 -1
@@ -574,7 +574,7 @@ U 4 1 57F07025
P 6000 5500
F 0 "U801" H 5500 6250 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 5750 4850 50 0000 C CNN
-F 2 "WL1837MOD" H 5950 4600 20 0001 C CNN
+F 2 "neo900-legacy:WL18XXMOD" H 5950 4600 20 0001 C CNN
F 3 "" H 5250 5750 60 0001 C CNN
4 6000 5500
1 0 0 -1
@@ -613,10 +613,10 @@ F 3 "" H 2850 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$803
+L GND #U$0155
U 1 1 57F096F9
P 3250 3600
-F 0 "#U$803" H 3160 3500 70 0001 L BNN
+F 0 "#U$0155" H 3160 3500 70 0001 L BNN
F 1 "GND" H 3160 3500 70 0001 L BNN
F 2 "" H 3250 3600 60 0001 C CNN
F 3 "" H 3250 3600 60 0001 C CNN
@@ -628,10 +628,10 @@ Wire Wire Line
Wire Wire Line
2850 2900 2850 3100
$Comp
-L GND #U$801
+L GND #U$0156
U 1 1 57F09FF9
P 2500 3600
-F 0 "#U$801" H 2410 3500 70 0001 L BNN
+F 0 "#U$0156" H 2410 3500 70 0001 L BNN
F 1 "GND" H 2410 3500 70 0001 L BNN
F 2 "" H 2500 3600 60 0001 C CNN
F 3 "" H 2500 3600 60 0001 C CNN
@@ -639,10 +639,10 @@ F 3 "" H 2500 3600 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$802
+L GND #U$0157
U 1 1 57F0A052
P 2850 3600
-F 0 "#U$802" H 2760 3500 70 0001 L BNN
+F 0 "#U$0157" H 2760 3500 70 0001 L BNN
F 1 "GND" H 2760 3500 70 0001 L BNN
F 2 "" H 2850 3600 60 0001 C CNN
F 3 "" H 2850 3600 60 0001 C CNN
@@ -672,10 +672,10 @@ Wire Wire Line
Connection ~ 2400 2900
Connection ~ 2850 2900
$Comp
-L GND #U$815
+L GND #U$0158
U 1 1 57F0DA62
P 10900 6400
-F 0 "#U$815" H 10810 6300 70 0001 L BNN
+F 0 "#U$0158" H 10810 6300 70 0001 L BNN
F 1 "GND" H 10810 6300 70 0001 L BNN
F 2 "" H 10900 6400 60 0001 C CNN
F 3 "" H 10900 6400 60 0001 C CNN
@@ -706,7 +706,7 @@ U 1 1 57F06D3A
P 1800 2450
F 0 "U801" H 1300 3100 50 0000 L CNN
F 1 "WL1837MODGIMOC" H 1550 1850 50 0000 C CNN
-F 2 "WL1837MOD" H 1750 1550 20 0001 C CNN
+F 2 "neo900-legacy:WL18XXMOD" H 1750 1550 20 0001 C CNN
F 3 "" H 1050 2700 60 0001 C CNN
1 1800 2450
1 0 0 -1
@@ -783,7 +783,7 @@ U 1 1 57F10D1B
P 2400 2400
F 0 "TP801" H 2350 2450 50 0000 R CNN
F 1 "WL_TX" H 2460 2375 50 0000 L BNN
-F 2 "TP-0.75" H 2430 2550 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 2430 2550 20 0001 C CNN
F 3 "" H 2400 2400 60 0001 C CNN
1 2400 2400
1 0 0 -1
@@ -794,7 +794,7 @@ U 1 1 57F10D81
P 2400 2500
F 0 "TP802" H 2350 2550 50 0000 R CNN
F 1 "WL_RX" H 2460 2475 50 0000 L BNN
-F 2 "TP-0.75" H 2430 2650 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 2430 2650 20 0001 C CNN
F 3 "" H 2400 2500 60 0001 C CNN
1 2400 2500
1 0 0 -1
@@ -804,10 +804,10 @@ Wire Wire Line
Wire Wire Line
2000 2500 2400 2500
$Comp
-L GND #U$810
+L GND #U$0159
U 1 1 57F12BD0
P 6150 3100
-F 0 "#U$810" H 6060 3000 70 0001 L BNN
+F 0 "#U$0159" H 6060 3000 70 0001 L BNN
F 1 "GND" H 6060 3000 70 0001 L BNN
F 2 "" H 6150 3100 60 0001 C CNN
F 3 "" H 6150 3100 60 0001 C CNN
@@ -826,10 +826,10 @@ Wire Wire Line
6800 2050 6800 1950
Connection ~ 6800 1950
$Comp
-L GND #U$811
+L GND #U$0160
U 1 1 57F13141
P 6800 2650
-F 0 "#U$811" H 6710 2550 70 0001 L BNN
+F 0 "#U$0160" H 6710 2550 70 0001 L BNN
F 1 "GND" H 6710 2550 70 0001 L BNN
F 2 "" H 6800 2650 60 0001 C CNN
F 3 "" H 6800 2650 60 0001 C CNN
@@ -837,10 +837,10 @@ F 3 "" H 6800 2650 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$812
+L GND #U$0161
U 1 1 57F131E2
P 7300 2650
-F 0 "#U$812" H 7210 2550 70 0001 L BNN
+F 0 "#U$0161" H 7210 2550 70 0001 L BNN
F 1 "GND" H 7210 2550 70 0001 L BNN
F 2 "" H 7300 2650 60 0001 C CNN
F 3 "" H 7300 2650 60 0001 C CNN
@@ -860,10 +860,10 @@ Wire Wire Line
Wire Wire Line
4600 2900 5050 2900
$Comp
-L GND #U$804
+L GND #U$0162
U 1 1 57F13B57
P 5050 2250
-F 0 "#U$804" H 4960 2150 70 0001 L BNN
+F 0 "#U$0162" H 4960 2150 70 0001 L BNN
F 1 "GND" H 4960 2150 70 0001 L BNN
F 2 "" H 5050 2250 60 0001 C CNN
F 3 "" H 5050 2250 60 0001 C CNN
@@ -871,10 +871,10 @@ F 3 "" H 5050 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$807
+L GND #U$0163
U 1 1 57F13BBC
P 5450 2250
-F 0 "#U$807" H 5360 2150 70 0001 L BNN
+F 0 "#U$0163" H 5360 2150 70 0001 L BNN
F 1 "GND" H 5360 2150 70 0001 L BNN
F 2 "" H 5450 2250 60 0001 C CNN
F 3 "" H 5450 2250 60 0001 C CNN
@@ -882,10 +882,10 @@ F 3 "" H 5450 2250 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$805
+L GND #U$0164
U 1 1 57F13C21
P 5050 3200
-F 0 "#U$805" H 4960 3100 70 0001 L BNN
+F 0 "#U$0164" H 4960 3100 70 0001 L BNN
F 1 "GND" H 4960 3100 70 0001 L BNN
F 2 "" H 5050 3200 60 0001 C CNN
F 3 "" H 5050 3200 60 0001 C CNN
@@ -893,10 +893,10 @@ F 3 "" H 5050 3200 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #U$808
+L GND #U$0165
U 1 1 57F13C86
P 5450 3200
-F 0 "#U$808" H 5360 3100 70 0001 L BNN
+F 0 "#U$0165" H 5360 3100 70 0001 L BNN
F 1 "GND" H 5360 3100 70 0001 L BNN
F 2 "" H 5450 3200 60 0001 C CNN
F 3 "" H 5450 3200 60 0001 C CNN
@@ -963,7 +963,7 @@ U 1 1 57F15735
P 7800 1950
F 0 "P801" H 7800 2050 50 0000 C CNN
F 1 "WLAN_RF" H 7860 1925 50 0000 L BNN
-F 2 "N900-SPRING-A" H 7830 2100 20 0001 C CNN
+F 2 "neo900-legacy:N900-SPRING-A" H 7830 2100 20 0001 C CNN
F 3 "" H 7800 1950 60 0001 C CNN
1 7800 1950
1 0 0 -1
@@ -981,16 +981,16 @@ U 1 1 57F177B6
P 7800 2250
F 0 "P802" H 7800 2350 50 0000 C CNN
F 1 "WLAN_GND" H 7860 2225 50 0000 L BNN
-F 2 "N900-SPRING-A" H 7830 2400 20 0001 C CNN
+F 2 "neo900-legacy:N900-SPRING-A" H 7830 2400 20 0001 C CNN
F 3 "" H 7800 2250 60 0001 C CNN
1 7800 2250
1 0 0 -1
$EndComp
$Comp
-L GND #U$813
+L GND #U$0166
U 1 1 57F1781B
P 7800 2650
-F 0 "#U$813" H 7710 2550 70 0001 L BNN
+F 0 "#U$0166" H 7710 2550 70 0001 L BNN
F 1 "GND" H 7710 2550 70 0001 L BNN
F 2 "" H 7800 2650 60 0001 C CNN
F 3 "" H 7800 2650 60 0001 C CNN
@@ -1007,7 +1007,7 @@ U 1 1 57F1A4A6
P 10900 5500
F 0 "TP813" H 10850 5550 50 0000 R CNN
F 1 "WL_GPIO4" H 10960 5475 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5650 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5650 20 0001 C CNN
F 3 "" H 10900 5500 60 0001 C CNN
1 10900 5500
1 0 0 -1
@@ -1031,7 +1031,7 @@ U 1 1 57F1BA94
P 10900 5400
F 0 "TP812" H 10850 5450 50 0000 R CNN
F 1 "WL_RSV2" H 10960 5375 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5550 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5550 20 0001 C CNN
F 3 "" H 10900 5400 60 0001 C CNN
1 10900 5400
1 0 0 -1
@@ -1042,7 +1042,7 @@ U 1 1 57F1BB11
P 10900 5300
F 0 "TP811" H 10850 5350 50 0000 R CNN
F 1 "WL_RSV1" H 10960 5275 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5450 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5450 20 0001 C CNN
F 3 "" H 10900 5300 60 0001 C CNN
1 10900 5300
1 0 0 -1
@@ -1053,7 +1053,7 @@ U 1 1 57F1BBB5
P 10900 5000
F 0 "TP808" H 10850 5050 50 0000 R CNN
F 1 "WL_GPIO9" H 10960 4975 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5150 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5150 20 0001 C CNN
F 3 "" H 10900 5000 60 0001 C CNN
1 10900 5000
1 0 0 -1
@@ -1064,7 +1064,7 @@ U 1 1 57F1BC42
P 10900 5100
F 0 "TP809" H 10850 5150 50 0000 R CNN
F 1 "WL_GPIO10" H 10960 5075 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5250 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5250 20 0001 C CNN
F 3 "" H 10900 5100 60 0001 C CNN
1 10900 5100
1 0 0 -1
@@ -1075,7 +1075,7 @@ U 1 1 57F1BCC8
P 10900 4900
F 0 "TP807" H 10850 4950 50 0000 R CNN
F 1 "WL_GPIO11" H 10960 4875 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5050 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5050 20 0001 C CNN
F 3 "" H 10900 4900 60 0001 C CNN
1 10900 4900
1 0 0 -1
@@ -1086,7 +1086,7 @@ U 1 1 57F1BE51
P 10900 5200
F 0 "TP810" H 10850 5250 50 0000 R CNN
F 1 "WL_GPIO12" H 10960 5175 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5350 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5350 20 0001 C CNN
F 3 "" H 10900 5200 60 0001 C CNN
1 10900 5200
1 0 0 -1
@@ -1097,7 +1097,7 @@ U 1 1 57F1BED9
P 10900 5600
F 0 "TP814" H 10850 5650 50 0000 R CNN
F 1 "WL_RSV3" H 10960 5575 50 0000 L BNN
-F 2 "TP-0.75" H 10930 5750 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 10930 5750 20 0001 C CNN
F 3 "" H 10900 5600 60 0001 C CNN
1 10900 5600
1 0 0 -1
@@ -1182,7 +1182,7 @@ U 1 1 57F225AF
P 2800 6000
F 0 "TP805" H 2750 6050 50 0000 R CNN
F 1 "WL_UART_DBG" H 2860 5975 50 0000 L BNN
-F 2 "TP-0.75" H 2830 6150 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 2830 6150 20 0001 C CNN
F 3 "" H 2800 6000 60 0001 C CNN
1 2800 6000
1 0 0 -1
@@ -1193,7 +1193,7 @@ U 1 1 57F229F1
P 6700 5350
F 0 "TP806" H 6650 5400 50 0000 R CNN
F 1 "BT_UART_DBG" H 6760 5325 50 0000 L BNN
-F 2 "TP-0.75" H 6730 5500 20 0001 C CNN
+F 2 "neo900-legacy:TP-0.75" H 6730 5500 20 0001 C CNN
F 3 "" H 6700 5350 60 0001 C CNN
1 6700 5350
1 0 0 -1