From 62f6d396b9baae05a43ffb2d03aff2e9a47aa25f Mon Sep 17 00:00:00 2001
From: Michael Ossmann <mike@ossmann.com>
Date: Mon, 27 Aug 2012 11:57:10 -0600
Subject: [PATCH] fixed balun shorts

---
 hardware/licorice/licorice-cache.lib |    2 +-
 hardware/licorice/licorice.brd       | 1168 ++++++++++++++------------
 hardware/licorice/licorice.cmp       |   16 +-
 hardware/licorice/licorice.net       |  238 +++---
 hardware/licorice/licorice.sch       |  464 +++++-----
 5 files changed, 1019 insertions(+), 869 deletions(-)

diff --git a/hardware/licorice/licorice-cache.lib b/hardware/licorice/licorice-cache.lib
index c3a1d412..e70185f4 100644
--- a/hardware/licorice/licorice-cache.lib
+++ b/hardware/licorice/licorice-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon Aug 20 16:01:29 2012
+EESchema-LIBRARY Version 2.3  Date: Mon Aug 27 11:49:57 2012
 #encoding utf-8
 #
 # BALUN-B0310J50100AHF
diff --git a/hardware/licorice/licorice.brd b/hardware/licorice/licorice.brd
index c3000abc..7eb7e393 100644
--- a/hardware/licorice/licorice.brd
+++ b/hardware/licorice/licorice.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Tue Aug 21 09:20:42 2012
+PCBNEW-BOARD Version 1 date Mon Aug 27 11:53:30 2012
 
 # Created by Pcbnew(2011-06-30 BZR 3033)-stable
 
@@ -7,21 +7,21 @@ encoding utf-8
 LayerCount 4
 Ly 1FFF8007
 EnabledLayers 1FFF8007
-Links 314
+Links 316
 NoConn 24
 Di 22440 9424 46060 27576
 Ndraw 12
-Ntrack 1291
+Ntrack 1297
 Nzone 0
 BoardThickness 630
-Nmodule 111
-Nnets 84
+Nmodule 113
+Nnets 86
 $EndGENERAL
 
 $SHEETDESCR
 Sheet User 6000 4000
 Title ""
-Date "21 aug 2012"
+Date "27 aug 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -37,7 +37,7 @@ Layer[0] Back signal
 Layer[1] Inner2 signal
 Layer[2] Inner3 signal
 Layer[15] Front signal
-TrackWidth 60
+TrackWidth 200
 TrackWidthList 90
 TrackWidthList 100
 TrackWidthList 120
@@ -215,7 +215,7 @@ Na 34 "N-000004"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 35 "N-000007"
+Na 35 "N-000006"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -227,7 +227,7 @@ Na 37 "N-000009"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 38 "N-000010"
+Na 38 "N-000011"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -235,55 +235,55 @@ Na 39 "N-000012"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 40 "N-000013"
+Na 40 "N-000014"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 41 "N-000014"
+Na 41 "N-000015"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 42 "N-000015"
+Na 42 "N-000017"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 43 "N-000017"
+Na 43 "N-000018"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 44 "N-000018"
+Na 44 "N-000019"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 45 "N-000019"
+Na 45 "N-000020"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 46 "N-000020"
+Na 46 "N-000030"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 47 "N-000021"
+Na 47 "N-000040"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 48 "N-000022"
+Na 48 "N-000041"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 49 "N-000039"
+Na 49 "N-000042"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 50 "N-000041"
+Na 50 "N-000043"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 51 "N-000043"
+Na 51 "N-000044"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 52 "N-000044"
+Na 52 "N-000045"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -295,43 +295,43 @@ Na 54 "N-000047"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 55 "N-000048"
+Na 55 "N-000050"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 56 "N-000049"
+Na 56 "N-000051"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 57 "N-000050"
+Na 57 "N-000052"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 58 "N-000051"
+Na 58 "N-000053"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 59 "N-000054"
+Na 59 "N-000055"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 60 "N-000055"
+Na 60 "N-000056"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 61 "N-000056"
+Na 61 "N-000063"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 62 "N-000057"
+Na 62 "N-000064"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 63 "N-000059"
+Na 63 "N-000065"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 64 "N-000060"
+Na 64 "N-000066"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -375,23 +375,23 @@ Na 74 "N-000086"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 75 "N-000087"
+Na 75 "N-000088"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 76 "N-000088"
+Na 76 "N-000089"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 77 "N-000089"
+Na 77 "N-000090"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 78 "N-000092"
+Na 78 "N-000091"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 79 "N-000094"
+Na 79 "N-000093"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -403,11 +403,19 @@ Na 81 "N-000096"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 82 "N-000102"
+Na 82 "N-000098"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 83 "VCC"
+Na 83 "N-000099"
+St ~
+$EndEQUIPOT
+$EQUIPOT
+Na 84 "N-000104"
+St ~
+$EndEQUIPOT
+$EQUIPOT
+Na 85 "VCC"
 St ~
 $EndEQUIPOT
 $NCLASS
@@ -454,36 +462,36 @@ AddNet "N-000001"
 AddNet "N-000002"
 AddNet "N-000003"
 AddNet "N-000004"
-AddNet "N-000007"
+AddNet "N-000006"
 AddNet "N-000008"
 AddNet "N-000009"
-AddNet "N-000010"
+AddNet "N-000011"
 AddNet "N-000012"
-AddNet "N-000013"
 AddNet "N-000014"
 AddNet "N-000015"
 AddNet "N-000017"
 AddNet "N-000018"
 AddNet "N-000019"
 AddNet "N-000020"
-AddNet "N-000021"
-AddNet "N-000022"
-AddNet "N-000039"
+AddNet "N-000030"
+AddNet "N-000040"
 AddNet "N-000041"
+AddNet "N-000042"
 AddNet "N-000043"
 AddNet "N-000044"
+AddNet "N-000045"
 AddNet "N-000046"
 AddNet "N-000047"
-AddNet "N-000048"
-AddNet "N-000049"
 AddNet "N-000050"
 AddNet "N-000051"
-AddNet "N-000054"
+AddNet "N-000052"
+AddNet "N-000053"
 AddNet "N-000055"
 AddNet "N-000056"
-AddNet "N-000057"
-AddNet "N-000059"
-AddNet "N-000060"
+AddNet "N-000063"
+AddNet "N-000064"
+AddNet "N-000065"
+AddNet "N-000066"
 AddNet "N-000067"
 AddNet "N-000068"
 AddNet "N-000069"
@@ -494,14 +502,16 @@ AddNet "N-000073"
 AddNet "N-000074"
 AddNet "N-000075"
 AddNet "N-000086"
-AddNet "N-000087"
 AddNet "N-000088"
 AddNet "N-000089"
-AddNet "N-000092"
-AddNet "N-000094"
+AddNet "N-000090"
+AddNet "N-000091"
+AddNet "N-000093"
 AddNet "N-000095"
 AddNet "N-000096"
-AddNet "N-000102"
+AddNet "N-000098"
+AddNet "N-000099"
+AddNet "N-000104"
 AddNet "VCC"
 $EndNCLASS
 $MODULE GSG-SKY13350-385LF
@@ -538,7 +548,7 @@ $PAD
 Sh "4" R 169 60 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 40 "N-000013"
+Ne 40 "N-000014"
 Po 211 98
 Le 20
 $EndPAD
@@ -562,7 +572,7 @@ $PAD
 Sh "2" R 169 60 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 68 "N-000070"
+Ne 64 "N-000066"
 Po -211 98
 Le 839724792
 $EndPAD
@@ -601,7 +611,7 @@ $PAD
 Sh "4" R 169 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 52 "N-000044"
+Ne 66 "N-000068"
 Po 211 98
 Le 20
 $EndPAD
@@ -617,7 +627,7 @@ $PAD
 Sh "6" R 79 240 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 35 "N-000007"
+Ne 35 "N-000006"
 Po 0 -177
 Le 41110432
 $EndPAD
@@ -625,7 +635,7 @@ $PAD
 Sh "2" R 169 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 42 "N-000015"
+Ne 41 "N-000015"
 Po -211 98
 Le 839724792
 $EndPAD
@@ -649,7 +659,7 @@ $PAD
 Sh "S" R 360 360 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -350 -400
 $EndPAD
 $PAD
@@ -663,7 +673,7 @@ $PAD
 Sh "D" R 360 360 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 78 "N-000092"
+Ne 79 "N-000093"
 Po 0 400
 $EndPAD
 $SHAPE3D
@@ -706,7 +716,7 @@ $PAD
 Sh "3" R 180 390 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 77 "N-000089"
+Ne 78 "N-000091"
 Po 260 395
 Le -1381633
 $EndPAD
@@ -730,7 +740,7 @@ $PAD
 Sh "6" R 180 390 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000102"
+Ne 84 "N-000104"
 Po -260 -395
 Le 65
 $EndPAD
@@ -747,7 +757,7 @@ $PAD
 Sh "1" R 1600 600 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 60 "N-000055"
+Ne 56 "N-000051"
 Po 800 0
 Le 1431655764
 $EndPAD
@@ -796,7 +806,7 @@ $PAD
 Sh "1" R 1600 600 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 59 "N-000054"
+Ne 55 "N-000050"
 Po 800 0
 Le 1431655764
 $EndPAD
@@ -845,7 +855,7 @@ $PAD
 Sh "1" R 1600 600 0 0 1800
 Dr 0 0 0
 At SMD N 00808000
-Ne 79 "N-000094"
+Ne 82 "N-000098"
 Po 800 0
 Le 1431655764
 $EndPAD
@@ -985,7 +995,7 @@ $PAD
 Sh "13" O 335 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 679 -394
 Le 2053185556
 $EndPAD
@@ -1069,7 +1079,7 @@ $PAD
 Sh "14" O 335 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 295 -679
 Le -1954803944
 $EndPAD
@@ -1077,7 +1087,7 @@ $PAD
 Sh "1" O 335 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -295 -679
 Le 45266704
 $EndPAD
@@ -1269,7 +1279,7 @@ $PAD
 Sh "14" O 335 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 295 -679
 Le -1954803944
 $EndPAD
@@ -1330,7 +1340,7 @@ $PAD
 Sh "4" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 54 "N-000047"
+Ne 51 "N-000044"
 Po -965 -98
 Le 65
 $EndPAD
@@ -1338,7 +1348,7 @@ $PAD
 Sh "5" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -965 98
 Le 49465328
 $EndPAD
@@ -1346,7 +1356,7 @@ $PAD
 Sh "6" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 58 "N-000051"
+Ne 74 "N-000086"
 Po -965 295
 Le 80
 $EndPAD
@@ -1354,7 +1364,7 @@ $PAD
 Sh "7" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 56 "N-000049"
+Ne 52 "N-000045"
 Po -965 492
 Le 286331153
 $EndPAD
@@ -1362,7 +1372,7 @@ $PAD
 Sh "8" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 63 "N-000059"
+Ne 59 "N-000055"
 Po -965 689
 Le 20
 $EndPAD
@@ -1612,7 +1622,7 @@ $PAD
 Sh "19" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 965 295
 Le 32
 $EndPAD
@@ -1636,7 +1646,7 @@ $PAD
 Sh "22" O 354 110 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 965 -295
 Le 49485824
 $EndPAD
@@ -1676,7 +1686,7 @@ $PAD
 Sh "27" O 354 110 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 33 "N-000003"
+Ne 31 "N-000001"
 Po 295 -965
 Le 32
 $EndPAD
@@ -1684,7 +1694,7 @@ $PAD
 Sh "28" O 354 110 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 65 "N-000067"
+Ne 61 "N-000063"
 Po 118 -965
 Le -451457960
 $EndPAD
@@ -1755,7 +1765,7 @@ $PAD
 Sh "4" R 197 157 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 61 "N-000056"
+Ne 57 "N-000052"
 Po 246 -138
 Le 1633902612
 $EndPAD
@@ -1763,7 +1773,7 @@ $PAD
 Sh "1" R 197 157 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 62 "N-000057"
+Ne 58 "N-000053"
 Po -246 -138
 Le -1954803976
 $EndPAD
@@ -1783,7 +1793,7 @@ $PAD
 Sh "1" R 197 276 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 73 "N-000075"
+Ne 71 "N-000073"
 Po -335 0
 Le 1341
 $EndPAD
@@ -1791,7 +1801,7 @@ $PAD
 Sh "3" R 197 276 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 64 "N-000060"
+Ne 60 "N-000056"
 Po 335 0
 Le -1983002225
 $EndPAD
@@ -1913,7 +1923,7 @@ $PAD
 Sh "2" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -3000 -500
 Le 34735648
 $EndPAD
@@ -1929,7 +1939,7 @@ $PAD
 Sh "4" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -2000 -500
 Le -1563238664
 $EndPAD
@@ -1945,7 +1955,7 @@ $PAD
 Sh "6" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -1000 -500
 Le 48
 $EndPAD
@@ -1961,7 +1971,7 @@ $PAD
 Sh "8" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 0 -500
 Le 33
 $EndPAD
@@ -1977,7 +1987,7 @@ $PAD
 Sh "10" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 1000 -500
 Le 97
 $EndPAD
@@ -1993,7 +2003,7 @@ $PAD
 Sh "12" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 2000 -500
 Le 35604240
 $EndPAD
@@ -2009,7 +2019,7 @@ $PAD
 Sh "14" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 3000 -500
 Le 17
 $EndPAD
@@ -2293,7 +2303,7 @@ $PAD
 Sh "1" R 161 130 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 66 "N-000068"
+Ne 62 "N-000064"
 Po 260 -195
 Le 33054512
 $EndPAD
@@ -2301,7 +2311,7 @@ $PAD
 Sh "2" R 161 130 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "GND"
+Ne 83 "N-000099"
 Po 0 -195
 Le 755437432
 $EndPAD
@@ -2309,7 +2319,7 @@ $PAD
 Sh "3" R 161 130 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 65 "N-000067"
+Ne 61 "N-000063"
 Po -260 -195
 Le 32750520
 $EndPAD
@@ -2317,7 +2327,7 @@ $PAD
 Sh "4" R 161 130 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 33 "N-000003"
+Ne 31 "N-000001"
 Po -260 195
 Le 6
 $EndPAD
@@ -2355,7 +2365,7 @@ $PAD
 Sh "1" R 161 130 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 67 "N-000069"
+Ne 73 "N-000075"
 Po 260 -195
 Le 33054512
 $EndPAD
@@ -2363,7 +2373,7 @@ $PAD
 Sh "2" R 161 130 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "GND"
+Ne 72 "N-000074"
 Po 0 -195
 Le 755437432
 $EndPAD
@@ -2417,7 +2427,7 @@ $PAD
 Sh "2" R 340 340 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 300 0
 Le 226
 .SolderMask 40
@@ -2427,7 +2437,7 @@ $PAD
 Sh "1" R 340 340 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 65 "N-000067"
+Ne 61 "N-000063"
 Po -300 0
 Le 46661520
 .SolderMask 40
@@ -2451,7 +2461,7 @@ $PAD
 Sh "2" R 340 340 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po 300 0
 Le 226
 .SolderMask 40
@@ -2461,7 +2471,7 @@ $PAD
 Sh "1" R 340 340 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 33 "N-000003"
+Ne 31 "N-000001"
 Po -300 0
 Le 46661520
 .SolderMask 40
@@ -2485,7 +2495,7 @@ $PAD
 Sh "2" R 340 340 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000102"
+Ne 84 "N-000104"
 Po 300 0
 Le 226
 .SolderMask 40
@@ -2495,7 +2505,7 @@ $PAD
 Sh "1" R 340 340 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 49 "N-000039"
+Ne 50 "N-000043"
 Po -300 0
 Le 46661520
 .SolderMask 40
@@ -2528,7 +2538,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -2647,7 +2657,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 77 "N-000089"
+Ne 78 "N-000091"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -2679,7 +2689,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 79 "N-000094"
+Ne 82 "N-000098"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -2688,7 +2698,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 53 "N-000046"
+Ne 49 "N-000042"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -2752,7 +2762,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 77 "N-000089"
+Ne 78 "N-000091"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -2775,7 +2785,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 50 "N-000041"
+Ne 46 "N-000030"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -2784,7 +2794,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 51 "N-000043"
+Ne 47 "N-000040"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -2839,7 +2849,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000102"
+Ne 84 "N-000104"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -2880,7 +2890,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -2935,7 +2945,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 79 "N-000094"
+Ne 82 "N-000098"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -2999,7 +3009,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 33 "N-000003"
+Ne 31 "N-000001"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3008,7 +3018,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 65 "N-000067"
+Ne 61 "N-000063"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3031,7 +3041,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 63 "N-000059"
+Ne 59 "N-000055"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3040,7 +3050,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 55 "N-000048"
+Ne 53 "N-000046"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3063,7 +3073,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 55 "N-000048"
+Ne 53 "N-000046"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3072,7 +3082,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 56 "N-000049"
+Ne 52 "N-000045"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3095,7 +3105,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 57 "N-000050"
+Ne 54 "N-000047"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3104,7 +3114,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 58 "N-000051"
+Ne 74 "N-000086"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3127,7 +3137,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 54 "N-000047"
+Ne 51 "N-000044"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3168,7 +3178,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3200,7 +3210,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3223,7 +3233,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 57 "N-000050"
+Ne 54 "N-000047"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3232,7 +3242,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 56 "N-000049"
+Ne 52 "N-000045"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3287,7 +3297,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 35 "N-000007"
+Ne 35 "N-000006"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3296,7 +3306,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 67 "N-000069"
+Ne 73 "N-000075"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3319,7 +3329,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 72 "N-000074"
+Ne 70 "N-000072"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3328,7 +3338,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 73 "N-000075"
+Ne 71 "N-000073"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3351,7 +3361,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 48 "N-000022"
+Ne 44 "N-000019"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3360,7 +3370,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 64 "N-000060"
+Ne 60 "N-000056"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3415,7 +3425,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 74 "N-000086"
+Ne 75 "N-000088"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3424,7 +3434,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 40 "N-000013"
+Ne 40 "N-000014"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3479,7 +3489,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 52 "N-000044"
+Ne 66 "N-000068"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3488,7 +3498,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000019"
+Ne 67 "N-000069"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3511,7 +3521,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 31 "N-000001"
+Ne 33 "N-000003"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3520,7 +3530,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000072"
+Ne 68 "N-000070"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3575,7 +3585,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 62 "N-000057"
+Ne 58 "N-000053"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3584,7 +3594,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 43 "N-000017"
+Ne 45 "N-000020"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3607,7 +3617,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 71 "N-000073"
+Ne 69 "N-000071"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3616,7 +3626,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 61 "N-000056"
+Ne 57 "N-000052"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3703,7 +3713,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 58 "N-000051"
+Ne 74 "N-000086"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3712,7 +3722,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 56 "N-000049"
+Ne 52 "N-000045"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3744,7 +3754,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 55 "N-000048"
+Ne 53 "N-000046"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3776,7 +3786,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 63 "N-000059"
+Ne 59 "N-000055"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3872,7 +3882,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 42 "N-000015"
+Ne 41 "N-000015"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3895,7 +3905,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 46 "N-000020"
+Ne 48 "N-000041"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -3904,7 +3914,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 59 "N-000054"
+Ne 55 "N-000050"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3968,7 +3978,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4000,7 +4010,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4032,7 +4042,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4064,7 +4074,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4096,7 +4106,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4119,7 +4129,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 75 "N-000087"
+Ne 76 "N-000089"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4288,7 +4298,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 49 "N-000039"
+Ne 50 "N-000043"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4320,7 +4330,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 49 "N-000039"
+Ne 50 "N-000043"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4343,7 +4353,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 68 "N-000070"
+Ne 64 "N-000066"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4352,7 +4362,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 69 "N-000071"
+Ne 65 "N-000067"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4384,7 +4394,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000102"
+Ne 84 "N-000104"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4407,7 +4417,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 60 "N-000055"
+Ne 56 "N-000051"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4416,7 +4426,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 41 "N-000014"
+Ne 63 "N-000065"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4471,7 +4481,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 66 "N-000068"
+Ne 62 "N-000064"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4535,7 +4545,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 36 "N-000008"
+Ne 38 "N-000011"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4544,7 +4554,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 76 "N-000088"
+Ne 77 "N-000090"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4576,7 +4586,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4608,7 +4618,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4640,7 +4650,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "VCC"
+Ne 85 "VCC"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4919,7 +4929,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 38 "N-000010"
+Ne 37 "N-000009"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4928,7 +4938,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 44 "N-000018"
+Ne 42 "N-000017"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4951,7 +4961,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 47 "N-000021"
+Ne 43 "N-000018"
 Po 210 0
 Le 24015744
 .SolderMask 40
@@ -4960,7 +4970,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000009"
+Ne 36 "N-000008"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4983,7 +4993,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 49 "N-000039"
+Ne 50 "N-000043"
 Po 210 0
 Le 51788536
 .SolderMask 40
@@ -4992,7 +5002,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 78 "N-000092"
+Ne 79 "N-000093"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5032,7 +5042,7 @@ $PAD
 Sh "4" R 169 60 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 69 "N-000071"
+Ne 65 "N-000067"
 Po 211 98
 Le 20
 $EndPAD
@@ -5048,7 +5058,7 @@ $PAD
 Sh "6" R 79 240 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 41 "N-000014"
+Ne 63 "N-000065"
 Po 0 -177
 Le 41110432
 $EndPAD
@@ -5056,7 +5066,7 @@ $PAD
 Sh "2" R 169 60 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 75 "N-000087"
+Ne 76 "N-000089"
 Po -211 98
 Le 839724792
 $EndPAD
@@ -5095,7 +5105,7 @@ $PAD
 Sh "4" R 169 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 74 "N-000086"
+Ne 75 "N-000088"
 Po 211 98
 Le 20
 $EndPAD
@@ -5111,7 +5121,7 @@ $PAD
 Sh "6" R 79 240 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 31 "N-000001"
+Ne 33 "N-000003"
 Po 0 -177
 Le 41110432
 $EndPAD
@@ -5158,7 +5168,7 @@ $PAD
 Sh "4" R 169 60 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 71 "N-000073"
+Ne 69 "N-000071"
 Po 211 98
 Le 20
 $EndPAD
@@ -5174,7 +5184,7 @@ $PAD
 Sh "6" R 79 240 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000072"
+Ne 68 "N-000070"
 Po 0 -177
 Le 41110432
 $EndPAD
@@ -5182,7 +5192,7 @@ $PAD
 Sh "2" R 169 60 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 72 "N-000074"
+Ne 70 "N-000072"
 Po -211 98
 Le 839724792
 $EndPAD
@@ -5221,7 +5231,7 @@ $PAD
 Sh "4" R 169 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 48 "N-000022"
+Ne 44 "N-000019"
 Po 211 98
 Le 20
 $EndPAD
@@ -5237,7 +5247,7 @@ $PAD
 Sh "6" R 79 240 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 47 "N-000021"
+Ne 43 "N-000018"
 Po 0 -177
 Le 41110432
 $EndPAD
@@ -5245,7 +5255,7 @@ $PAD
 Sh "2" R 169 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 43 "N-000017"
+Ne 45 "N-000020"
 Po -211 98
 Le 839724792
 $EndPAD
@@ -5284,7 +5294,7 @@ $PAD
 Sh "4" R 169 60 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 44 "N-000018"
+Ne 42 "N-000017"
 Po 211 98
 Le 20
 $EndPAD
@@ -5300,7 +5310,7 @@ $PAD
 Sh "6" R 79 240 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 46 "N-000020"
+Ne 48 "N-000041"
 Po 0 -177
 Le 41110432
 $EndPAD
@@ -5308,7 +5318,7 @@ $PAD
 Sh "2" R 169 60 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000019"
+Ne 67 "N-000069"
 Po -211 98
 Le 839724792
 $EndPAD
@@ -5334,7 +5344,7 @@ $PAD
 Sh "1" R 177 79 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 36 "N-000008"
+Ne 38 "N-000011"
 Po -305 -236
 Le 41110432
 $EndPAD
@@ -5358,7 +5368,7 @@ $PAD
 Sh "4" R 177 79 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 38 "N-000010"
+Ne 37 "N-000009"
 Po -305 236
 Le 20
 $EndPAD
@@ -5366,7 +5376,7 @@ $PAD
 Sh "5" R 177 79 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000009"
+Ne 36 "N-000008"
 Po 305 236
 Le 4149
 $EndPAD
@@ -5464,7 +5474,7 @@ $PAD
 Sh "1" R 177 79 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 76 "N-000088"
+Ne 77 "N-000090"
 Po -305 -236
 Le 41110432
 $EndPAD
@@ -5488,7 +5498,7 @@ $PAD
 Sh "4" R 177 79 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 50 "N-000041"
+Ne 46 "N-000030"
 Po -305 236
 Le 20
 $EndPAD
@@ -5594,7 +5604,7 @@ $PAD
 Sh "1" R 177 79 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 53 "N-000046"
+Ne 49 "N-000042"
 Po -305 -236
 Le 41110432
 $EndPAD
@@ -5650,7 +5660,7 @@ $PAD
 Sh "8" R 177 79 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 51 "N-000043"
+Ne 47 "N-000040"
 Po 305 -236
 Le 343506712
 $EndPAD
@@ -5703,6 +5713,70 @@ Po -98 -167
 Le 343506680
 $EndPAD
 $EndMODULE  GSG-SKY13317-373LF
+$MODULE GSG-0402
+Po 28800 14800 1800 15 4FB6CFE4 503BB356 ~~
+Li GSG-0402
+Sc 503BB356
+AR /503BB2BD
+Op 0 0 0
+.SolderMask 40
+T0 0 20 160 160 1800 40 N V 21 N "C69"
+T1 0 20 160 160 1800 40 N I 21 N "10nF"
+DS 350 -150 350 150 80 21
+DS 350 150 -350 150 80 21
+DS -350 150 -350 -150 80 21
+DS -350 -150 350 -150 80 21
+$PAD
+Sh "2" R 200 220 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 30 "GND"
+Po 210 0
+Le 1
+.SolderMask 40
+$EndPAD
+$PAD
+Sh "1" R 200 220 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 72 "N-000074"
+Po -210 0
+Le 24791752
+.SolderMask 40
+$EndPAD
+$EndMODULE  GSG-0402
+$MODULE GSG-0402
+Po 27600 17800 900 15 4FB6CFE4 503BB358 ~~
+Li GSG-0402
+Sc 503BB358
+AR /503BB2CE
+Op 0 0 0
+.SolderMask 40
+T0 0 20 160 160 900 40 N V 21 N "C70"
+T1 0 20 160 160 900 40 N I 21 N "10nF"
+DS 350 -150 350 150 80 21
+DS 350 150 -350 150 80 21
+DS -350 150 -350 -150 80 21
+DS -350 -150 350 -150 80 21
+$PAD
+Sh "2" R 200 220 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 83 "N-000099"
+Po 210 0
+Le 1
+.SolderMask 40
+$EndPAD
+$PAD
+Sh "1" R 200 220 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 30 "GND"
+Po -210 0
+Le 24791752
+.SolderMask 40
+$EndPAD
+$EndMODULE  GSG-0402
 $TEXTPCB
 Te "P6 SWITCH_CTRL"
 Po 38550 24250 400 600 100 0
@@ -7054,6 +7128,14 @@ Po 0 41950 22620 41950 23040 100 -1
 De 0 0 29 0 0
 Po 0 40240 20910 41950 22620 100 -1
 De 0 0 29 0 0
+Po 0 28590 14800 28590 15050 200 -1
+De 15 0 30 0 400000
+Po 3 28590 15050 28590 15050 420 250
+De 15 1 30 0 0
+Po 0 27600 18010 27600 18220 200 -1
+De 15 0 30 0 400000
+Po 3 27600 18220 27600 18220 370 200
+De 15 1 30 0 0
 Po 3 35750 18500 35750 18500 420 250
 De 15 1 30 0 0
 Po 0 36023 18500 35750 18500 60 -1
@@ -7650,18 +7732,6 @@ Po 3 35400 19800 35400 19800 310 160
 De 15 1 30 0 0
 Po 0 35400 19800 35400 19623 100 -1
 De 15 0 30 0 800000
-Po 0 29405 14700 29140 14700 180 -1
-De 15 0 30 0 400000
-Po 3 29050 14790 29050 14790 420 250
-De 15 1 30 0 0
-Po 0 29140 14700 29050 14790 180 -1
-De 15 0 30 0 0
-Po 0 27500 17195 27500 17430 180 -1
-De 15 0 30 0 400000
-Po 0 27500 17430 27600 17530 180 -1
-De 15 0 30 0 0
-Po 3 27600 17530 27600 17530 420 250
-De 15 1 30 0 0
 Po 0 27890 15600 27620 15600 200 -1
 De 15 0 30 0 400000
 Po 3 27620 15600 27620 15600 420 250
@@ -7734,14 +7804,22 @@ Po 3 29080 18880 29080 18880 420 250
 De 15 1 30 0 0
 Po 0 29000 18800 29080 18880 200 -1
 De 15 0 30 0 0
-Po 0 33577 17300 33650 17300 60 -1
+Po 0 29635 16905 29255 16905 100 -1
 De 15 0 31 0 400000
-Po 0 34000 17650 34000 17690 200 -1
+Po 0 29140 16790 29210 16860 180 -1
+De 15 0 31 0 0
+Po 0 29140 16790 28800 16790 180 -1
 De 15 0 31 0 800000
-Po 0 34000 17650 33700 17350 200 -1
-De 15 0 31 0 0
-Po 0 33650 17300 33700 17350 60 -1
+Po 0 29255 16905 29210 16860 100 -1
 De 15 0 31 0 0
+Po 0 28800 16790 28390 16790 180 -1
+De 15 0 31 0 400000
+Po 0 28390 16790 28300 16700 180 -1
+De 15 0 31 0 800000
+Po 0 27760 16805 28195 16805 180 -1
+De 15 0 31 0 400000
+Po 0 28195 16805 28300 16700 180 -1
+De 15 0 31 0 800000
 Po 0 33302 17089 33302 17072 60 -1
 De 15 0 32 0 400000
 Po 0 31650 13500 33240 15090 200 -1
@@ -7752,22 +7830,14 @@ Po 0 33240 15090 33240 17010 200 -1
 De 15 0 32 0 0
 Po 0 33302 17072 33240 17010 60 -1
 De 15 0 32 0 0
-Po 0 29635 16905 29255 16905 100 -1
+Po 0 33577 17300 33650 17300 60 -1
 De 15 0 33 0 400000
-Po 0 29140 16790 29210 16860 180 -1
+Po 0 34000 17650 34000 17690 200 -1
+De 15 0 33 0 800000
+Po 0 34000 17650 33700 17350 200 -1
 De 15 0 33 0 0
-Po 0 29140 16790 28800 16790 180 -1
-De 15 0 33 0 800000
-Po 0 29255 16905 29210 16860 100 -1
+Po 0 33650 17300 33700 17350 60 -1
 De 15 0 33 0 0
-Po 0 28800 16790 28390 16790 180 -1
-De 15 0 33 0 400000
-Po 0 28390 16790 28300 16700 180 -1
-De 15 0 33 0 800000
-Po 0 27760 16805 28195 16805 180 -1
-De 15 0 33 0 400000
-Po 0 28195 16805 28300 16700 180 -1
-De 15 0 33 0 800000
 Po 0 27200 18423 27200 18300 60 -1
 De 15 0 34 0 400000
 Po 0 27200 18260 27200 18300 200 -1
@@ -7784,34 +7854,34 @@ Po 0 28590 14360 28590 14400 200 -1
 De 15 0 35 0 800000
 Po 0 28300 14070 28340 14110 60 -1
 De 15 0 35 0 0
-Po 0 37436 16695 37525 16695 60 -1
-De 15 0 36 0 400000
-Po 0 37525 16695 37530 16700 60 -1
-De 15 0 36 0 0
-Po 0 37530 16700 37790 16700 200 -1
-De 15 0 36 0 800000
-Po 0 37515 16715 37530 16700 60 -1
-De 15 0 36 0 0
 Po 0 36964 17305 36945 17305 60 -1
-De 15 0 37 0 400000
+De 15 0 36 0 400000
 Po 0 36700 17550 36700 17590 200 -1
-De 15 0 37 0 800000
+De 15 0 36 0 800000
 Po 0 36700 17550 36910 17340 200 -1
-De 15 0 37 0 0
+De 15 0 36 0 0
 Po 0 36945 17305 36910 17340 60 -1
-De 15 0 37 0 0
+De 15 0 36 0 0
 Po 0 36964 16695 36964 16674 60 -1
-De 15 0 38 0 400000
+De 15 0 37 0 400000
 Po 0 36900 16650 36900 16610 60 -1
-De 15 0 38 0 0
+De 15 0 37 0 0
 Po 0 36940 16650 36900 16650 60 -1
-De 15 0 38 0 0
+De 15 0 37 0 0
 Po 0 36964 16674 36940 16650 60 -1
-De 15 0 38 0 0
+De 15 0 37 0 0
 Po 0 36910 16620 36900 16610 200 -1
-De 15 0 38 0 0
+De 15 0 37 0 0
 Po 0 36900 16610 36500 16210 200 -1
+De 15 0 37 0 800000
+Po 0 37436 16695 37525 16695 60 -1
+De 15 0 38 0 400000
+Po 0 37525 16695 37530 16700 60 -1
+De 15 0 38 0 0
+Po 0 37530 16700 37790 16700 200 -1
 De 15 0 38 0 800000
+Po 0 37515 16715 37530 16700 60 -1
+De 15 0 38 0 0
 Po 0 37436 17305 37436 17306 60 -1
 De 15 0 39 0 400000
 Po 0 37600 17470 37490 17360 200 -1
@@ -7832,376 +7902,376 @@ Po 0 27900 19170 27900 19190 200 -1
 De 15 0 40 0 800000
 Po 0 27460 18760 27490 18760 60 -1
 De 15 0 40 0 0
-Po 0 26023 20000 25900 20000 60 -1
-De 15 0 41 0 400000
-Po 0 25860 20000 25900 20000 200 -1
-De 15 0 41 0 0
-Po 0 25900 20000 25510 20000 200 -1
-De 15 0 41 0 800000
 Po 0 28511 13702 28511 13639 60 -1
-De 15 0 42 0 400000
+De 15 0 41 0 400000
 Po 0 28512 13640 28590 13640 60 -1
-De 15 0 42 0 0
+De 15 0 41 0 0
 Po 0 28511 13639 28512 13640 60 -1
-De 15 0 42 0 0
+De 15 0 41 0 0
 Po 0 28730 13500 28590 13640 200 -1
-De 15 0 42 0 0
+De 15 0 41 0 0
 Po 0 28730 13500 30890 13500 200 -1
-De 15 0 42 0 800000
+De 15 0 41 0 800000
 Po 0 28550 13640 28590 13640 60 -1
-De 15 0 42 0 0
-Po 0 36102 18222 36060 18180 60 -1
-De 15 0 43 0 0
-Po 0 36102 18289 36102 18222 60 -1
-De 15 0 43 0 400000
-Po 0 35890 18010 35800 18010 200 -1
-De 15 0 43 0 800000
-Po 0 35890 18010 36060 18180 200 -1
-De 15 0 43 0 0
+De 15 0 41 0 0
 Po 0 26298 13089 26361 13089 60 -1
-De 15 0 44 0 400000
+De 15 0 42 0 400000
 Po 0 36500 15560 36500 15790 200 -1
-De 15 0 44 0 800000
+De 15 0 42 0 800000
 Po 0 26870 12510 26360 13020 200 -1
-De 15 0 44 0 0
+De 15 0 42 0 0
 Po 0 33450 12510 26870 12510 200 -1
-De 15 0 44 0 0
+De 15 0 42 0 0
 Po 0 36500 15560 33450 12510 200 -1
-De 15 0 44 0 0
+De 15 0 42 0 0
 Po 0 26360 13088 26360 13020 60 -1
-De 15 0 44 0 0
+De 15 0 42 0 0
 Po 0 26361 13089 26360 13088 60 -1
-De 15 0 44 0 0
-Po 0 26298 13511 26361 13511 60 -1
-De 15 0 45 0 400000
-Po 0 26360 13512 26360 13590 60 -1
-De 15 0 45 0 0
-Po 0 26361 13511 26360 13512 60 -1
-De 15 0 45 0 0
-Po 0 26470 13700 26360 13590 200 -1
-De 15 0 45 0 0
-Po 0 26470 13700 26890 13700 200 -1
-De 15 0 45 0 800000
-Po 0 26360 13540 26360 13590 60 -1
-De 15 0 45 0 0
-Po 0 26023 13300 25900 13300 60 -1
-De 15 0 46 0 400000
-Po 0 25410 13490 25600 13300 200 -1
-De 15 0 46 0 0
-Po 0 25600 13300 25900 13300 200 -1
-De 15 0 46 0 0
-Po 0 25900 13300 25860 13300 200 -1
-De 15 0 46 0 0
-Po 0 25410 13490 25400 13490 200 -1
-De 15 0 46 0 800000
+De 15 0 42 0 0
 Po 0 36430 18500 36480 18450 60 -1
-De 15 0 47 0 0
+De 15 0 43 0 0
 Po 0 36377 18500 36430 18500 60 -1
-De 15 0 47 0 400000
+De 15 0 43 0 400000
 Po 0 36700 18230 36700 18010 200 -1
-De 15 0 47 0 800000
+De 15 0 43 0 800000
 Po 0 36700 18230 36480 18450 200 -1
-De 15 0 47 0 0
+De 15 0 43 0 0
 Po 0 36100 18850 36100 18780 60 -1
-De 15 0 48 0 0
+De 15 0 44 0 0
 Po 0 36100 18780 36100 18850 60 -1
-De 15 0 48 0 0
+De 15 0 44 0 0
 Po 0 36102 18778 36100 18780 60 -1
-De 15 0 48 0 0
+De 15 0 44 0 0
 Po 0 36102 18711 36102 18778 60 -1
-De 15 0 48 0 400000
+De 15 0 44 0 400000
 Po 0 36100 18780 36060 18820 200 -1
-De 15 0 48 0 0
+De 15 0 44 0 0
 Po 0 35890 18990 36100 18780 200 -1
-De 15 0 48 0 0
+De 15 0 44 0 0
 Po 0 35890 18990 35800 18990 200 -1
-De 15 0 48 0 800000
-Po 0 40840 15400 40470 15400 200 -1
-De 15 0 49 0 400000
-Po 0 40470 15400 40350 15520 200 -1
-De 15 0 49 0 0
-Po 0 40350 15210 40350 15520 200 -1
-De 15 0 49 0 400000
-Po 0 40350 15520 40350 15800 200 -1
-De 15 0 49 0 800000
-Po 0 40350 15800 40840 15800 200 -1
-De 15 0 49 0 C00000
+De 15 0 44 0 800000
+Po 0 36102 18222 36060 18180 60 -1
+De 15 0 45 0 0
+Po 0 36102 18289 36102 18222 60 -1
+De 15 0 45 0 400000
+Po 0 35890 18010 35800 18010 200 -1
+De 15 0 45 0 800000
+Po 0 35890 18010 36060 18180 200 -1
+De 15 0 45 0 0
 Po 0 38495 17436 38495 17475 60 -1
-De 15 0 50 0 400000
+De 15 0 46 0 400000
 Po 0 39120 18400 38520 17800 200 -1
-De 15 0 50 0 0
+De 15 0 46 0 0
 Po 0 39120 18400 40390 18400 200 -1
-De 15 0 50 0 800000
+De 15 0 46 0 800000
 Po 0 38520 17800 38520 17500 200 -1
-De 15 0 50 0 0
+De 15 0 46 0 0
 Po 0 38495 17475 38520 17500 60 -1
-De 15 0 50 0 0
+De 15 0 46 0 0
 Po 0 42136 17505 42136 17516 60 -1
-De 15 0 51 0 400000
+De 15 0 47 0 400000
 Po 0 40840 18400 40810 18400 200 -1
-De 15 0 51 0 800000
+De 15 0 47 0 800000
 Po 0 42190 18000 42190 17570 200 -1
-De 15 0 51 0 0
+De 15 0 47 0 0
 Po 0 41760 18430 42190 18000 200 -1
-De 15 0 51 0 0
+De 15 0 47 0 0
 Po 0 40870 18430 41760 18430 200 -1
-De 15 0 51 0 0
+De 15 0 47 0 0
 Po 0 40840 18400 40870 18430 200 -1
-De 15 0 51 0 0
+De 15 0 47 0 0
 Po 0 42136 17516 42190 17570 60 -1
-De 15 0 51 0 0
-Po 0 28089 13702 28002 13702 60 -1
-De 15 0 52 0 400000
-Po 0 28000 13700 27960 13700 60 -1
-De 15 0 52 0 0
-Po 0 28002 13702 28000 13700 60 -1
-De 15 0 52 0 0
-Po 0 27960 13700 27310 13700 200 -1
-De 15 0 52 0 800000
-Po 0 27962 13702 27960 13700 60 -1
-De 15 0 52 0 0
+De 15 0 47 0 0
+Po 0 26023 13300 25900 13300 60 -1
+De 15 0 48 0 400000
+Po 0 25410 13490 25600 13300 200 -1
+De 15 0 48 0 0
+Po 0 25600 13300 25900 13300 200 -1
+De 15 0 48 0 0
+Po 0 25900 13300 25860 13300 200 -1
+De 15 0 48 0 0
+Po 0 25410 13490 25400 13490 200 -1
+De 15 0 48 0 800000
 Po 0 42136 16895 42215 16895 60 -1
-De 15 0 53 0 400000
+De 15 0 49 0 400000
 Po 0 42215 16895 42220 16900 60 -1
-De 15 0 53 0 0
+De 15 0 49 0 0
 Po 0 42220 16900 42490 16900 200 -1
-De 15 0 53 0 800000
+De 15 0 49 0 800000
 Po 0 42205 16915 42220 16900 60 -1
-De 15 0 53 0 0
+De 15 0 49 0 0
+Po 0 40840 15400 40470 15400 200 -1
+De 15 0 50 0 400000
+Po 0 40470 15400 40350 15520 200 -1
+De 15 0 50 0 0
+Po 0 40350 15210 40350 15520 200 -1
+De 15 0 50 0 400000
+Po 0 40350 15520 40350 15800 200 -1
+De 15 0 50 0 800000
+Po 0 40350 15800 40840 15800 200 -1
+De 15 0 50 0 C00000
 Po 0 30502 18165 30502 18348 100 -1
-De 15 0 54 0 400000
+De 15 0 51 0 400000
 Po 0 29900 18950 29900 18990 100 -1
-De 15 0 54 0 800000
+De 15 0 51 0 800000
 Po 0 30502 18348 29900 18950 100 -1
-De 15 0 54 0 0
-Po 0 32090 19900 32090 19420 100 -1
-De 15 0 55 0 400000
-Po 0 32090 19420 32100 19410 100 -1
-De 15 0 55 0 800000
-Po 0 32090 19900 32090 20320 100 -1
-De 15 0 55 0 400000
-Po 0 32090 20320 32010 20400 100 -1
-De 15 0 55 0 800000
+De 15 0 51 0 0
 Po 0 31510 19900 31510 20320 100 -1
-De 15 0 56 0 400000
+De 15 0 52 0 400000
 Po 0 31510 20320 31590 20400 100 -1
-De 15 0 56 0 800000
+De 15 0 52 0 800000
 Po 0 31500 18990 31500 19030 100 -1
-De 15 0 56 0 400000
+De 15 0 52 0 400000
 Po 0 31730 19680 31510 19900 100 -1
-De 15 0 56 0 800000
+De 15 0 52 0 800000
 Po 0 31730 19260 31730 19680 100 -1
-De 15 0 56 0 0
+De 15 0 52 0 0
 Po 0 31500 19030 31730 19260 100 -1
-De 15 0 56 0 0
+De 15 0 52 0 0
 Po 0 31092 18165 31092 18332 100 -1
-De 15 0 56 0 400000
+De 15 0 52 0 400000
 Po 0 31500 18740 31500 18990 100 -1
-De 15 0 56 0 800000
+De 15 0 52 0 800000
 Po 0 31092 18332 31500 18740 100 -1
-De 15 0 56 0 0
+De 15 0 52 0 0
+Po 0 32090 19900 32090 19420 100 -1
+De 15 0 53 0 400000
+Po 0 32090 19420 32100 19410 100 -1
+De 15 0 53 0 800000
+Po 0 32090 19900 32090 20320 100 -1
+De 15 0 53 0 400000
+Po 0 32090 20320 32010 20400 100 -1
+De 15 0 53 0 800000
 Po 0 31100 19410 31100 19890 100 -1
-De 15 0 57 0 400000
+De 15 0 54 0 400000
 Po 0 31100 19890 31090 19900 100 -1
-De 15 0 57 0 800000
-Po 0 31500 19410 31500 19390 100 -1
-De 15 0 58 0 400000
-Po 0 31500 19390 31100 18990 100 -1
-De 15 0 58 0 800000
-Po 0 30895 18165 30895 18415 100 -1
-De 15 0 58 0 400000
-Po 0 31100 18620 31100 18990 100 -1
-De 15 0 58 0 800000
-Po 0 30895 18415 31100 18620 100 -1
-De 15 0 58 0 0
+De 15 0 54 0 800000
 Po 0 23800 14000 25310 14000 200 -1
-De 15 0 59 0 400000
+De 15 0 55 0 400000
 Po 0 25310 14000 25400 13910 200 -1
-De 15 0 59 0 800000
+De 15 0 55 0 800000
 Po 0 23800 20000 25090 20000 200 -1
-De 15 0 60 0 C00000
+De 15 0 56 0 C00000
 Po 0 35000 17590 35000 17392 200 -1
-De 15 0 61 0 400000
+De 15 0 57 0 400000
 Po 0 35000 17392 35154 17238 200 -1
-De 15 0 61 0 800000
+De 15 0 57 0 800000
 Po 0 35800 17590 35800 17392 200 -1
-De 15 0 62 0 400000
+De 15 0 58 0 400000
 Po 0 35800 17392 35646 17238 200 -1
-De 15 0 62 0 800000
+De 15 0 58 0 800000
 Po 0 32100 18990 32580 18990 100 -1
-De 15 0 63 0 400000
+De 15 0 59 0 400000
 Po 0 32580 18990 32600 19010 100 -1
-De 15 0 63 0 800000
+De 15 0 59 0 800000
 Po 0 31289 18165 31289 18289 100 -1
-De 15 0 63 0 400000
+De 15 0 59 0 400000
 Po 0 31520 18410 32100 18990 100 -1
-De 15 0 63 0 800000
+De 15 0 59 0 800000
 Po 0 31410 18410 31520 18410 100 -1
-De 15 0 63 0 0
+De 15 0 59 0 0
 Po 0 31289 18289 31410 18410 100 -1
-De 15 0 63 0 0
+De 15 0 59 0 0
 Po 0 35800 19410 35800 19735 200 -1
-De 15 0 64 0 400000
+De 15 0 60 0 400000
 Po 0 35800 19735 35735 19800 200 -1
-De 15 0 64 0 800000
+De 15 0 60 0 800000
 Po 0 29635 17082 29268 17082 100 -1
-De 15 0 65 0 400000
+De 15 0 61 0 400000
 Po 0 29140 17210 29210 17140 180 -1
-De 15 0 65 0 0
+De 15 0 61 0 0
 Po 0 29140 17210 28800 17210 180 -1
-De 15 0 65 0 800000
+De 15 0 61 0 800000
 Po 0 29268 17082 29210 17140 100 -1
-De 15 0 65 0 0
+De 15 0 61 0 0
 Po 0 28800 17210 28390 17210 180 -1
-De 15 0 65 0 400000
+De 15 0 61 0 400000
 Po 0 28390 17210 28300 17300 180 -1
-De 15 0 65 0 800000
+De 15 0 61 0 800000
 Po 0 27760 17195 28195 17195 180 -1
-De 15 0 65 0 400000
+De 15 0 61 0 400000
 Po 0 28195 17195 28300 17300 180 -1
-De 15 0 65 0 800000
+De 15 0 61 0 800000
 Po 0 27240 17195 27240 17250 60 -1
-De 15 0 66 0 400000
+De 15 0 62 0 400000
 Po 0 27240 17250 27200 17290 60 -1
-De 15 0 66 0 0
+De 15 0 62 0 0
 Po 0 27200 17590 27200 17290 200 -1
-De 15 0 66 0 400000
+De 15 0 62 0 400000
 Po 0 27200 17290 27220 17270 200 -1
-De 15 0 66 0 0
-Po 0 29405 14440 29350 14440 60 -1
-De 15 0 67 0 400000
-Po 0 29350 14440 29310 14400 60 -1
-De 15 0 67 0 0
-Po 0 29010 14400 29310 14400 200 -1
-De 15 0 67 0 400000
-Po 0 29310 14400 29330 14420 200 -1
-De 15 0 67 0 0
+De 15 0 62 0 0
+Po 0 26023 20000 25900 20000 60 -1
+De 15 0 63 0 400000
+Po 0 25860 20000 25900 20000 200 -1
+De 15 0 63 0 0
+Po 0 25900 20000 25510 20000 200 -1
+De 15 0 63 0 800000
 Po 0 26989 18698 26989 18761 60 -1
-De 15 0 68 0 400000
+De 15 0 64 0 400000
 Po 0 26700 18970 26700 19090 200 -1
-De 15 0 68 0 800000
+De 15 0 64 0 800000
 Po 0 26700 18970 26910 18760 200 -1
-De 15 0 68 0 0
+De 15 0 64 0 0
 Po 0 26988 18760 26910 18760 60 -1
-De 15 0 68 0 0
+De 15 0 64 0 0
 Po 0 26989 18761 26988 18760 60 -1
-De 15 0 68 0 0
+De 15 0 64 0 0
 Po 0 26298 19789 26361 19789 60 -1
-De 15 0 69 0 400000
+De 15 0 65 0 400000
 Po 0 26360 19788 26360 19710 60 -1
-De 15 0 69 0 0
+De 15 0 65 0 0
 Po 0 26361 19789 26360 19788 60 -1
-De 15 0 69 0 0
+De 15 0 65 0 0
 Po 0 26560 19510 26360 19710 200 -1
-De 15 0 69 0 0
+De 15 0 65 0 0
 Po 0 26560 19510 26700 19510 200 -1
-De 15 0 69 0 800000
+De 15 0 65 0 800000
 Po 0 26360 19760 26360 19710 60 -1
-De 15 0 69 0 0
+De 15 0 65 0 0
+Po 0 28089 13702 28002 13702 60 -1
+De 15 0 66 0 400000
+Po 0 28000 13700 27960 13700 60 -1
+De 15 0 66 0 0
+Po 0 28002 13702 28000 13700 60 -1
+De 15 0 66 0 0
+Po 0 27960 13700 27310 13700 200 -1
+De 15 0 66 0 800000
+Po 0 27962 13702 27960 13700 60 -1
+De 15 0 66 0 0
+Po 0 26298 13511 26361 13511 60 -1
+De 15 0 67 0 400000
+Po 0 26360 13512 26360 13590 60 -1
+De 15 0 67 0 0
+Po 0 26361 13511 26360 13512 60 -1
+De 15 0 67 0 0
+Po 0 26470 13700 26360 13590 200 -1
+De 15 0 67 0 0
+Po 0 26470 13700 26890 13700 200 -1
+De 15 0 67 0 800000
+Po 0 26360 13540 26360 13590 60 -1
+De 15 0 67 0 0
 Po 0 34423 18500 34310 18500 60 -1
-De 15 0 70 0 400000
+De 15 0 68 0 400000
 Po 0 34300 18500 34300 18490 60 -1
-De 15 0 70 0 0
+De 15 0 68 0 0
 Po 0 34310 18500 34300 18500 60 -1
-De 15 0 70 0 0
+De 15 0 68 0 0
 Po 0 34000 18190 34000 18110 200 -1
-De 15 0 70 0 800000
+De 15 0 68 0 800000
 Po 0 34000 18190 34300 18490 200 -1
-De 15 0 70 0 0
+De 15 0 68 0 0
 Po 0 34300 18490 34280 18470 200 -1
-De 15 0 70 0 0
+De 15 0 68 0 0
 Po 0 34698 18289 34698 18222 60 -1
-De 15 0 71 0 400000
+De 15 0 69 0 400000
 Po 0 34750 18250 34750 18170 60 -1
-De 15 0 71 0 0
+De 15 0 69 0 0
 Po 0 34726 18250 34750 18250 60 -1
-De 15 0 71 0 0
+De 15 0 69 0 0
 Po 0 34698 18222 34726 18250 60 -1
-De 15 0 71 0 0
+De 15 0 69 0 0
 Po 0 34910 18010 34750 18170 200 -1
-De 15 0 71 0 0
+De 15 0 69 0 0
 Po 0 34750 18170 34740 18180 200 -1
-De 15 0 71 0 0
+De 15 0 69 0 0
 Po 0 34910 18010 35000 18010 200 -1
-De 15 0 71 0 800000
+De 15 0 69 0 800000
 Po 0 34698 18711 34698 18758 60 -1
-De 15 0 72 0 400000
+De 15 0 70 0 400000
 Po 0 34930 18990 35000 18990 200 -1
-De 15 0 72 0 800000
+De 15 0 70 0 800000
 Po 0 34930 18990 34750 18810 200 -1
-De 15 0 72 0 0
+De 15 0 70 0 0
 Po 0 34698 18758 34750 18810 60 -1
-De 15 0 72 0 0
+De 15 0 70 0 0
 Po 0 35000 19410 35000 19735 200 -1
-De 15 0 73 0 400000
+De 15 0 71 0 400000
 Po 0 35000 19735 35065 19800 200 -1
-De 15 0 73 0 800000
-Po 0 33302 17511 33302 17528 60 -1
+De 15 0 71 0 800000
+Po 0 29405 14700 29300 14700 60 -1
+De 15 0 72 0 400000
+Po 0 29150 14800 29250 14700 200 -1
+De 15 0 72 0 0
+Po 0 29250 14700 29300 14700 200 -1
+De 15 0 72 0 0
+Po 0 29150 14800 29010 14800 200 -1
+De 15 0 72 0 800000
+Po 0 29405 14440 29350 14440 60 -1
+De 15 0 73 0 400000
+Po 0 29350 14440 29310 14400 60 -1
+De 15 0 73 0 0
+Po 0 29010 14400 29310 14400 200 -1
+De 15 0 73 0 400000
+Po 0 29310 14400 29330 14420 200 -1
+De 15 0 73 0 0
+Po 0 31500 19410 31500 19390 100 -1
 De 15 0 74 0 400000
-Po 0 33302 17528 33240 17590 60 -1
-De 15 0 74 0 0
-Po 0 33240 17590 33240 17540 60 -1
-De 15 0 74 0 0
-Po 0 27900 19830 27900 19610 200 -1
+Po 0 31500 19390 31100 18990 100 -1
 De 15 0 74 0 800000
-Po 0 33090 17740 33240 17590 200 -1
+Po 0 30895 18165 30895 18415 100 -1
+De 15 0 74 0 400000
+Po 0 31100 18620 31100 18990 100 -1
+De 15 0 74 0 800000
+Po 0 30895 18415 31100 18620 100 -1
 De 15 0 74 0 0
-Po 0 33090 20200 33090 17740 200 -1
-De 15 0 74 0 0
-Po 0 32420 20870 33090 20200 200 -1
-De 15 0 74 0 0
-Po 0 28940 20870 32420 20870 200 -1
-De 15 0 74 0 0
-Po 0 27900 19830 28940 20870 200 -1
-De 15 0 74 0 0
-Po 0 33240 17540 33240 17590 60 -1
-De 15 0 74 0 0
-Po 0 26298 20211 26298 20218 60 -1
+Po 0 33302 17511 33302 17528 60 -1
 De 15 0 75 0 400000
-Po 0 26298 20218 26360 20280 60 -1
+Po 0 33302 17528 33240 17590 60 -1
 De 15 0 75 0 0
-Po 0 26360 20280 26360 20232 60 -1
+Po 0 33240 17590 33240 17540 60 -1
 De 15 0 75 0 0
-Po 0 37600 19270 37600 18710 200 -1
+Po 0 27900 19830 27900 19610 200 -1
 De 15 0 75 0 800000
-Po 0 37600 19270 35060 21810 200 -1
+Po 0 33090 17740 33240 17590 200 -1
 De 15 0 75 0 0
-Po 0 26360 20232 26360 20280 60 -1
+Po 0 33090 20200 33090 17740 200 -1
 De 15 0 75 0 0
-Po 0 35060 21810 27890 21810 200 -1
+Po 0 32420 20870 33090 20200 200 -1
 De 15 0 75 0 0
-Po 0 27890 21810 26360 20280 200 -1
+Po 0 28940 20870 32420 20870 200 -1
 De 15 0 75 0 0
-Po 0 38495 16964 38495 16905 60 -1
+Po 0 27900 19830 28940 20870 200 -1
+De 15 0 75 0 0
+Po 0 33240 17540 33240 17590 60 -1
+De 15 0 75 0 0
+Po 0 26298 20211 26298 20218 60 -1
 De 15 0 76 0 400000
-Po 0 38290 16700 38210 16700 200 -1
+Po 0 26298 20218 26360 20280 60 -1
+De 15 0 76 0 0
+Po 0 26360 20280 26360 20232 60 -1
+De 15 0 76 0 0
+Po 0 37600 19270 37600 18710 200 -1
 De 15 0 76 0 800000
-Po 0 38290 16700 38490 16900 200 -1
+Po 0 37600 19270 35060 21810 200 -1
 De 15 0 76 0 0
-Po 0 38495 16905 38490 16900 60 -1
+Po 0 26360 20232 26360 20280 60 -1
 De 15 0 76 0 0
-Po 0 39955 17575 39955 17895 200 -1
-De 15 0 77 0 0
-Po 0 39955 17895 39950 17900 200 -1
-De 15 0 77 0 0
-Po 0 39955 17460 39955 17575 100 -1
+Po 0 35060 21810 27890 21810 200 -1
+De 15 0 76 0 0
+Po 0 27890 21810 26360 20280 200 -1
+De 15 0 76 0 0
+Po 0 38495 16964 38495 16905 60 -1
 De 15 0 77 0 400000
-Po 0 39955 17575 39960 17580 100 -1
-De 15 0 77 0 0
-Po 0 39760 17900 39950 17900 200 -1
-De 15 0 77 0 400000
-Po 0 39950 17900 40940 17900 200 -1
+Po 0 38290 16700 38210 16700 200 -1
 De 15 0 77 0 800000
+Po 0 38290 16700 38490 16900 200 -1
+De 15 0 77 0 0
+Po 0 38495 16905 38490 16900 60 -1
+De 15 0 77 0 0
+Po 0 39955 17575 39955 17895 200 -1
+De 15 0 78 0 0
+Po 0 39955 17895 39950 17900 200 -1
+De 15 0 78 0 0
+Po 0 39955 17460 39955 17575 100 -1
+De 15 0 78 0 400000
+Po 0 39955 17575 39960 17580 100 -1
+De 15 0 78 0 0
+Po 0 39760 17900 39950 17900 200 -1
+De 15 0 78 0 400000
+Po 0 39950 17900 40940 17900 200 -1
+De 15 0 78 0 800000
 Po 0 40350 14790 40350 14250 200 -1
-De 15 0 78 0 C00000
-Po 0 43300 16910 42920 16910 200 -1
-De 15 0 79 0 400000
-Po 0 42920 16910 42910 16900 200 -1
-De 15 0 79 0 800000
-Po 0 44700 17000 43390 17000 200 -1
-De 15 0 79 0 400000
-Po 0 43390 17000 43300 16910 200 -1
-De 15 0 79 0 800000
+De 15 0 79 0 C00000
 Po 0 30108 16235 30108 16018 120 -1
 De 15 0 80 0 400000
 Po 0 29810 15720 30100 16010 180 -1
@@ -8228,120 +8298,136 @@ Po 0 29390 15400 29390 14975 180 -1
 De 15 0 81 0 400000
 Po 0 29390 14975 29405 14960 180 -1
 De 15 0 81 0 800000
+Po 0 43300 16910 42920 16910 200 -1
+De 15 0 82 0 400000
+Po 0 42920 16910 42910 16900 200 -1
+De 15 0 82 0 800000
+Po 0 44700 17000 43390 17000 200 -1
+De 15 0 82 0 400000
+Po 0 43390 17000 43300 16910 200 -1
+De 15 0 82 0 800000
+Po 0 27500 17195 27500 17300 60 -1
+De 15 0 83 0 400000
+Po 0 27600 17450 27500 17350 200 -1
+De 15 0 83 0 0
+Po 0 27500 17350 27500 17300 200 -1
+De 15 0 83 0 0
+Po 0 27600 17450 27600 17590 200 -1
+De 15 0 83 0 800000
 Po 0 40745 16940 40745 16845 100 -1
-De 15 0 82 0 400000
+De 15 0 84 0 400000
 Po 0 40750 16840 40750 16500 200 -1
-De 15 0 82 0 0
+De 15 0 84 0 0
 Po 0 40745 16845 40750 16840 100 -1
-De 15 0 82 0 0
+De 15 0 84 0 0
 Po 0 39760 16500 40250 16500 200 -1
-De 15 0 82 0 400000
+De 15 0 84 0 400000
 Po 0 40250 16500 40350 16400 200 -1
-De 15 0 82 0 800000
+De 15 0 84 0 800000
 Po 0 40940 16500 40750 16500 200 -1
-De 15 0 82 0 400000
+De 15 0 84 0 400000
 Po 0 40750 16500 40730 16500 200 -1
-De 15 0 82 0 0
+De 15 0 84 0 0
 Po 0 40730 16500 40450 16500 200 -1
-De 15 0 82 0 0
+De 15 0 84 0 0
 Po 0 40450 16500 40350 16400 200 -1
-De 15 0 82 0 800000
+De 15 0 84 0 800000
 Po 0 40000 13450 40000 13070 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 3 40000 13070 40000 13070 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 29410 23100 29650 23100 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 3 29650 23100 29650 23100 370 200
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 27590 23100 27350 23100 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 3 27350 23100 27350 23100 370 200
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 40179 22106 40294 22106 100 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 3 39800 21400 39800 21400 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 40000 21400 39800 21400 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 40400 21800 40000 21400 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 40400 22000 40400 21800 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 40294 22106 40400 22000 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 39205 21821 39205 21595 100 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 39400 21400 39800 21400 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 39205 21595 39400 21400 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 43300 21400 43300 21390 120 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 43295 21405 43300 21400 120 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 3 43300 21400 43300 21400 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 43295 21821 43295 21405 120 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 43300 21390 43590 21100 120 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 39800 21400 39800 21390 120 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 39800 21390 40090 21100 120 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 39795 21821 39795 21405 120 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 39795 21405 39800 21400 120 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 28300 17900 28010 17900 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 3 28010 17900 28010 17900 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 28300 16100 28590 16100 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 3 28590 16100 28590 16100 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 28300 16100 28300 15610 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 28300 15610 28310 15600 200 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 28300 17900 28300 18390 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 28300 18390 28290 18400 200 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 30700 18990 30300 18990 200 -1
-De 15 0 83 0 C00000
+De 15 0 85 0 C00000
 Po 0 30700 18990 30700 18730 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 30698 18728 30700 18730 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 3 30700 18730 30700 18730 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 30698 18728 30698 18165 100 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 31100 15410 31500 15410 200 -1
-De 15 0 83 0 C00000
+De 15 0 85 0 C00000
 Po 0 31100 15410 31100 15720 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 30895 15925 31030 15790 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 3 31030 15790 31030 15790 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 30895 15925 30895 16235 100 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 31100 15720 31030 15790 200 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 0 30300 15410 30300 15660 200 -1
-De 15 0 83 0 400000
+De 15 0 85 0 400000
 Po 0 30305 15665 30300 15660 100 -1
-De 15 0 83 0 0
+De 15 0 85 0 0
 Po 3 30300 15660 30300 15660 420 250
-De 15 1 83 0 0
+De 15 1 85 0 0
 Po 0 30305 15665 30305 16235 100 -1
-De 15 0 83 0 800000
+De 15 0 85 0 800000
 Po 0 30300 15410 30700 15410 200 -1
-De 15 0 83 0 C00000
+De 15 0 85 0 C00000
 $EndTRACK
 $ZONE
 $EndZONE
@@ -11570,7 +11656,7 @@ $POLYSCORNERS
 $endPOLYSCORNERS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 502FFCEC 83 "VCC"
+ZInfo 502FFCEC 85 "VCC"
 ZLayer 1
 ZAux 4 E
 ZClearance 125 T
diff --git a/hardware/licorice/licorice.cmp b/hardware/licorice/licorice.cmp
index 05c56ca4..6a81fc5d 100644
--- a/hardware/licorice/licorice.cmp
+++ b/hardware/licorice/licorice.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPCB (2011-06-30 BZR 3033)-stable date = Mon Aug 20 15:47:31 2012
+Cmp-Mod V01 Created by CvPCB (2011-06-30 BZR 3033)-stable date = Mon Aug 27 11:49:46 2012
 
 BeginCmp
 TimeStamp = /4FAECB99;
@@ -476,6 +476,20 @@ ValeurCmp = 47pF;
 IdModule  = GSG-0402;
 EndCmp
 
+BeginCmp
+TimeStamp = /503BB2BD;
+Reference = C69;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /503BB2CE;
+Reference = C70;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
 BeginCmp
 TimeStamp = /4FB3F9B0;
 Reference = D1;
diff --git a/hardware/licorice/licorice.net b/hardware/licorice/licorice.net
index 761ae9a9..10f7b870 100644
--- a/hardware/licorice/licorice.net
+++ b/hardware/licorice/licorice.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Mon Aug 20 15:47:31 2012
+# EESchema Netlist Version 1.1 created  Mon Aug 27 11:49:46 2012
 (
  ( /4FAECB99 GSG-0402 C1 33pF
   ( 1 VCC )
@@ -29,8 +29,8 @@
   ( 2 /MIX_BYPASS )
  )
  ( /501EF782 GSG-0402 C8 47pF
-  ( 1 N-000054 )
-  ( 2 N-000020 )
+  ( 1 N-000050 )
+  ( 2 N-000041 )
  )
  ( /502B53A4 GSG-0402 C9 10nF
   ( 1 N-000015 )
@@ -45,68 +45,68 @@
   ( 2 /LP )
  )
  ( /4FAEC84D GSG-0402 C12 330pF
-  ( 1 N-000059 )
+  ( 1 N-000055 )
   ( 2 GND )
  )
  ( /4FAEC853 GSG-0402 C13 330pF
-  ( 1 N-000048 )
+  ( 1 N-000046 )
   ( 2 GND )
  )
  ( /4FAEC8AD GSG-0402 C14 8p2
-  ( 1 N-000049 )
-  ( 2 N-000051 )
+  ( 1 N-000045 )
+  ( 2 N-000086 )
  )
  ( /4FAEC8B0 GSG-0402 C15 180pF
-  ( 1 N-000049 )
-  ( 2 N-000050 )
+  ( 1 N-000045 )
+  ( 2 N-000047 )
  )
  ( /501F4793 GSG-0402 C16 33pF
   ( 1 /!MIX_BYPASS )
   ( 2 GND )
  )
  ( /501F41BB GSG-0402 C17 10nF
-  ( 1 N-000056 )
-  ( 2 N-000073 )
+  ( 1 N-000052 )
+  ( 2 N-000071 )
  )
  ( /501F41B9 GSG-0402 C18 10nF
-  ( 1 N-000017 )
-  ( 2 N-000057 )
+  ( 1 N-000020 )
+  ( 2 N-000053 )
  )
  ( /502E6F8B GSG-0402 C19 33pF
   ( 1 GND )
   ( 2 /LP )
  )
  ( /501F41BD GSG-0402 C20 10nF
-  ( 1 N-000072 )
-  ( 2 N-000001 )
+  ( 1 N-000070 )
+  ( 2 N-000003 )
  )
  ( /501EF768 GSG-0402 C21 47pF
-  ( 1 N-000019 )
-  ( 2 N-000044 )
+  ( 1 N-000069 )
+  ( 2 N-000068 )
  )
  ( /502B4779 GSG-0402 C22 33pF
   ( 1 GND )
   ( 2 /RX )
  )
  ( /502B4C6F GSG-0402 C23 10nF
-  ( 1 N-000013 )
-  ( 2 N-000086 )
+  ( 1 N-000014 )
+  ( 2 N-000088 )
  )
  ( /502E6F11 GSG-0402 C24 33pF
   ( 1 GND )
   ( 2 /TX )
  )
  ( /4FAA149B GSG-0402 C25 47pF
-  ( 1 N-000060 )
-  ( 2 N-000022 )
+  ( 1 N-000056 )
+  ( 2 N-000019 )
  )
  ( /501EF311 GSG-0402 C26 47pF
-  ( 1 N-000075 )
-  ( 2 N-000074 )
+  ( 1 N-000073 )
+  ( 2 N-000072 )
  )
  ( /502B477A GSG-0402 C27 10nF
-  ( 1 N-000069 )
-  ( 2 N-000007 )
+  ( 1 N-000075 )
+  ( 2 N-000006 )
  )
  ( /502E6FEE GSG-0402 C28 33pF
   ( 1 /HP )
@@ -117,12 +117,12 @@
   ( 2 GND )
  )
  ( /502B56C2 GSG-0402 C30 10nF
-  ( 1 N-000009 )
-  ( 2 N-000021 )
+  ( 1 N-000008 )
+  ( 2 N-000018 )
  )
  ( /502B571F GSG-0402 C31 47pF
-  ( 1 N-000018 )
-  ( 2 N-000010 )
+  ( 1 N-000017 )
+  ( 2 N-000009 )
  )
  ( /502B4780 GSG-0402 C32 33pF
   ( 1 /TX )
@@ -166,11 +166,11 @@
  )
  ( /502B5738 GSG-0402 C42 47pF
   ( 1 N-000012 )
-  ( 2 N-000087 )
+  ( 2 N-000089 )
  )
  ( /501F4169 GSG-0402 C43 10nF
-  ( 1 N-000088 )
-  ( 2 N-000008 )
+  ( 1 N-000090 )
+  ( 2 N-000011 )
  )
  ( /502E6ECB GSG-0402 C44 33pF
   ( 1 GND )
@@ -178,30 +178,30 @@
  )
  ( /502B4C15 GSG-0402 C45 10nF
   ( 1 N-000004 )
-  ( 2 N-000068 )
+  ( 2 N-000064 )
  )
  ( /501F477D GSG-0402 C46 33pF
   ( 1 GND )
   ( 2 /!MIX_BYPASS )
  )
  ( /501EF6BA GSG-0402 C47 47pF
-  ( 1 N-000014 )
-  ( 2 N-000055 )
+  ( 1 N-000065 )
+  ( 2 N-000051 )
  )
  ( /502E5F58 GSG-0402 C48 100pF
-  ( 1 N-000102 )
+  ( 1 N-000104 )
   ( 2 /RX_AMP_OUT )
  )
  ( /501EF6A1 GSG-0402 C49 47pF
-  ( 1 N-000071 )
-  ( 2 N-000070 )
+  ( 1 N-000067 )
+  ( 2 N-000066 )
  )
  ( /502C6D36 GSG-0402 C50 100pF
-  ( 1 N-000039 )
+  ( 1 N-000043 )
   ( 2 GND )
  )
  ( /502C6DB4 GSG-0402 C51 1uF
-  ( 1 N-000039 )
+  ( 1 N-000043 )
   ( 2 GND )
  )
  ( /502E6EB0 GSG-0402 C52 33pF
@@ -222,10 +222,10 @@
  )
  ( /502E5F55 GSG-0402 C56 100pF
   ( 1 /TX_AMP_OUT )
-  ( 2 N-000102 )
+  ( 2 N-000104 )
  )
  ( /502E665E GSG-0402 C57 100pF
-  ( 1 N-000089 )
+  ( 1 N-000091 )
   ( 2 /TX_AMP_IN )
  )
  ( /502E79FA GSG-0402 C58 33pF
@@ -233,20 +233,20 @@
   ( 2 /AMP_BYPASS )
  )
  ( /502E6909 GSG-0402 C59 10nF
-  ( 1 N-000043 )
-  ( 2 N-000041 )
+  ( 1 N-000040 )
+  ( 2 N-000030 )
  )
  ( /502E6667 GSG-0402 C60 100pF
   ( 1 /RX_AMP_IN )
-  ( 2 N-000089 )
+  ( 2 N-000091 )
  )
  ( /502E79CE GSG-0402 C61 33pF
   ( 1 /TX_AMP )
   ( 2 GND )
  )
  ( /502C6D4A GSG-0402 C62 10nF
-  ( 1 N-000046 )
-  ( 2 N-000094 )
+  ( 1 N-000042 )
+  ( 2 N-000098 )
  )
  ( /502E7989 GSG-0402 C63 33pF
   ( 1 GND )
@@ -272,32 +272,40 @@
   ( 1 /REF_IN )
   ( 2 GND )
  )
+ ( /503BB2BD GSG-0402 C69 10nF
+  ( 1 N-000074 )
+  ( 2 GND )
+ )
+ ( /503BB2CE GSG-0402 C70 10nF
+  ( 1 GND )
+  ( 2 N-000099 )
+ )
  ( /4FB3F9B0 GSG-0402 D1 GSG-DIODE-TVS-BI
   ( 1 GND )
-  ( 2 N-000094 )
+  ( 2 N-000098 )
  )
  ( /502AFA8C GSG-0402 L1 DNP
   ( 1 N-000095 )
   ( 2 N-000096 )
  )
  ( /502B4BB2 GSG-0603 L2 180nH
-  ( 1 N-000003 )
+  ( 1 N-000001 )
   ( 2 VCC )
  )
  ( /502B4BB6 GSG-0603 L3 180nH
-  ( 1 N-000067 )
+  ( 1 N-000063 )
   ( 2 VCC )
  )
  ( /4FB55E30 GSG-0402 L4 DNP
-  ( 1 N-000067 )
-  ( 2 N-000003 )
+  ( 1 N-000063 )
+  ( 2 N-000001 )
  )
  ( /502C6D12 GSG-0603 L5 180nH
-  ( 1 N-000039 )
-  ( 2 N-000102 )
+  ( 1 N-000043 )
+  ( 2 N-000104 )
  )
  ( /4FA9C5A4 GSG-SMA-EDGE P1 TX-IN
-  ( 1 N-000054 )
+  ( 1 N-000050 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
@@ -316,14 +324,14 @@
   ( 10 GND )
  )
  ( /4FA9C5BB GSG-SMA-EDGE P3 RX-OUT
-  ( 1 N-000055 )
+  ( 1 N-000051 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
   ( 5 GND )
  )
  ( /4F94D0F2 GSG-SMA-EDGE P4 ANTENNA
-  ( 1 N-000094 )
+  ( 1 N-000098 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
@@ -378,25 +386,25 @@
   ( 1 ? )
  )
  ( /502E69D1 SOT23GDS Q1 MOSFET_P
-  ( D N-000092 )
+  ( D N-000093 )
   ( G /!AMP_PWR )
   ( S VCC )
  )
  ( /4FAEC850 GSG-0402 R1 470
-  ( 1 N-000048 )
-  ( 2 N-000059 )
+  ( 1 N-000046 )
+  ( 2 N-000055 )
  )
  ( /4FAEC856 GSG-0402 R2 470
-  ( 1 N-000049 )
-  ( 2 N-000048 )
+  ( 1 N-000045 )
+  ( 2 N-000046 )
  )
  ( /4FAEC8B2 GSG-0402 R3 22k
-  ( 1 N-000051 )
-  ( 2 N-000050 )
+  ( 1 N-000086 )
+  ( 2 N-000047 )
  )
  ( /4FAECC79 GSG-0402 R4 51k
   ( 1 GND )
-  ( 2 N-000047 )
+  ( 2 N-000044 )
  )
  ( /4FAECE50 GSG-0402 R5 4k7
   ( 1 VCC )
@@ -407,53 +415,53 @@
   ( 2 /ENX )
  )
  ( /5032B025 GSG-0402 R7 33
-  ( 1 N-000092 )
-  ( 2 N-000039 )
+  ( 1 N-000093 )
+  ( 2 N-000043 )
  )
  ( /501EF483 GSG-B0310J50100AHF T1 MIX_IN_BALUN
-  ( 1 N-000069 )
-  ( 2 GND )
+  ( 1 N-000075 )
+  ( 2 N-000074 )
   ( 3 N-000096 )
   ( 4 N-000095 )
  )
  ( /501EF4A4 GSG-B0310J50100AHF T2 MIX_OUT_BALUN
-  ( 1 N-000068 )
-  ( 2 GND )
-  ( 3 N-000067 )
-  ( 4 N-000003 )
+  ( 1 N-000064 )
+  ( 2 N-000099 )
+  ( 3 N-000063 )
+  ( 4 N-000001 )
  )
  ( /501EF778 GSG-SKY13350-385LF U1 SKY13350
   ( 1 /!MIX_BYPASS )
-  ( 2 N-000019 )
+  ( 2 N-000069 )
   ( 3 GND )
-  ( 4 N-000018 )
+  ( 4 N-000017 )
   ( 5 /MIX_BYPASS )
-  ( 6 N-000020 )
+  ( 6 N-000041 )
  )
  ( /502B490F GSG-SKY13350-385LF U2 SKY13350
   ( 1 /RX )
   ( 2 N-000002 )
   ( 3 GND )
-  ( 4 N-000086 )
+  ( 4 N-000088 )
   ( 5 /TX )
-  ( 6 N-000001 )
+  ( 6 N-000003 )
  )
  ( /4F94D561 GSG-LP0603 U3 RX_LOWPASS_FILTER
-  ( 1 N-000057 )
+  ( 1 N-000053 )
   ( 2 GND )
   ( 3 GND )
-  ( 4 N-000056 )
+  ( 4 N-000052 )
  )
  ( /502BE21C GSG-QFN32 U4 RFFC5072
   ( 0 GND )
   ( 1 /GPO5 )
   ( 2 ? )
   ( 3 ? )
-  ( 4 N-000047 )
+  ( 4 N-000044 )
   ( 5 VCC )
-  ( 6 N-000051 )
-  ( 7 N-000049 )
-  ( 8 N-000059 )
+  ( 6 N-000086 )
+  ( 7 N-000045 )
+  ( 8 N-000055 )
   ( 9 /GPO6 )
   ( 10 /REF_IN )
   ( 11 ? )
@@ -472,8 +480,8 @@
   ( 24 N-000096 )
   ( 25 /GPO3 )
   ( 26 /GPO4 )
-  ( 27 N-000003 )
-  ( 28 N-000067 )
+  ( 27 N-000001 )
+  ( 28 N-000063 )
   ( 29 /RESETX )
   ( 30 /ENX )
   ( 31 /SCLK )
@@ -481,67 +489,67 @@
  )
  ( /501F3B20 GSG-SKY13350-385LF U5 SKY13350
   ( 1 /LP )
-  ( 2 N-000017 )
+  ( 2 N-000020 )
   ( 3 GND )
-  ( 4 N-000022 )
+  ( 4 N-000019 )
   ( 5 /HP )
-  ( 6 N-000021 )
+  ( 6 N-000018 )
  )
  ( /501EF258 GSG-SKY13350-385LF U6 SKY13350
   ( 1 /HP )
-  ( 2 N-000074 )
+  ( 2 N-000072 )
   ( 3 GND )
-  ( 4 N-000073 )
+  ( 4 N-000071 )
   ( 5 /LP )
-  ( 6 N-000072 )
+  ( 6 N-000070 )
  )
  ( /502B477E GSG-SKY13350-385LF U7 SKY13350
   ( 1 /RX )
   ( 2 N-000015 )
   ( 3 GND )
-  ( 4 N-000044 )
+  ( 4 N-000068 )
   ( 5 /TX )
-  ( 6 N-000007 )
+  ( 6 N-000006 )
  )
  ( /4F94D4F4 GSG-HP-DEA U8 RX_HIGHPASS_FILTER
-  ( 1 N-000075 )
+  ( 1 N-000073 )
   ( 2 GND )
-  ( 3 N-000060 )
+  ( 3 N-000056 )
   ( 4 GND )
  )
  ( /502B5704 GSG-SKY13317-373LF U9 SKY13317
   ( 0 GND )
-  ( 1 N-000008 )
+  ( 1 N-000011 )
   ( 2 ? )
   ( 3 /TX_MIX_BP )
-  ( 4 N-000010 )
-  ( 5 N-000009 )
+  ( 4 N-000009 )
+  ( 5 N-000008 )
   ( 6 /!MIX_BYPASS )
   ( 7 /RX_MIX_BP )
   ( 8 N-000012 )
  )
  ( /502B4C1C GSG-SKY13350-385LF U10 SKY13350
   ( 1 /RX )
-  ( 2 N-000070 )
+  ( 2 N-000066 )
   ( 3 GND )
-  ( 4 N-000013 )
+  ( 4 N-000014 )
   ( 5 /TX )
   ( 6 N-000004 )
  )
  ( /501EF646 GSG-SKY13350-385LF U11 SKY13350
   ( 1 /MIX_BYPASS )
-  ( 2 N-000087 )
+  ( 2 N-000089 )
   ( 3 GND )
-  ( 4 N-000071 )
+  ( 4 N-000067 )
   ( 5 /!MIX_BYPASS )
-  ( 6 N-000014 )
+  ( 6 N-000065 )
  )
  ( /502C6BDF GSG-SKY13317-373LF U12 SKY13317
   ( 0 GND )
-  ( 1 N-000088 )
+  ( 1 N-000090 )
   ( 2 ? )
   ( 3 /AMP_BYPASS )
-  ( 4 N-000041 )
+  ( 4 N-000030 )
   ( 5 /TX_AMP_IN )
   ( 6 /TX_AMP )
   ( 7 /RX_AMP )
@@ -550,21 +558,21 @@
  ( /502DE480 GSG-SOT363 U13 MGA-81563
   ( 1 GND )
   ( 2 GND )
-  ( 3 N-000089 )
+  ( 3 N-000091 )
   ( 4 GND )
   ( 5 GND )
-  ( 6 N-000102 )
+  ( 6 N-000104 )
  )
  ( /502C6BE2 GSG-SKY13317-373LF U14 SKY13317
   ( 0 GND )
-  ( 1 N-000046 )
+  ( 1 N-000042 )
   ( 2 ? )
   ( 3 /TX_AMP )
   ( 4 /TX_AMP_OUT )
   ( 5 /RX_AMP_IN )
   ( 6 /RX_AMP )
   ( 7 /AMP_BYPASS )
-  ( 8 N-000043 )
+  ( 8 N-000040 )
  )
  ( /4FB2F586 GSG-S-PVQFN-14 U15 GSG-74HC04
   ( 0 GND )
@@ -943,6 +951,16 @@ $component C68
  C?
  C1-1
 $endlist
+$component C69
+ SM*
+ C?
+ C1-1
+$endlist
+$component C70
+ SM*
+ C?
+ C1-1
+$endlist
 $component D1
  D?
  SO*
diff --git a/hardware/licorice/licorice.sch b/hardware/licorice/licorice.sch
index 03f597c0..89bff45d 100644
--- a/hardware/licorice/licorice.sch
+++ b/hardware/licorice/licorice.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Aug 20 16:01:29 2012
+EESchema Schematic File Version 2  date Mon Aug 27 11:49:57 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "20 aug 2012"
+Date "27 aug 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -45,12 +45,16 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+	6500 6450 6500 6350
+Wire Wire Line
+	3250 3800 3250 3900
 Wire Wire Line
 	15650 6750 15650 6850
 Wire Wire Line
 	15650 6850 15550 6850
 Wire Wire Line
-	14950 6850 14950 6950
+	14950 6950 14950 6850
 Wire Wire Line
 	7200 7300 7200 7200
 Wire Wire Line
@@ -58,7 +62,7 @@ Wire Wire Line
 Wire Wire Line
 	11850 7750 11700 7750
 Wire Wire Line
-	11400 8000 11700 8000
+	11700 8000 11400 8000
 Wire Wire Line
 	12350 7750 12250 7750
 Wire Wire Line
@@ -135,7 +139,7 @@ Wire Wire Line
 	6900 7300 7000 7300
 Connection ~ 14950 6850
 Wire Wire Line
-	14600 6950 14600 6850
+	14600 6850 14600 6950
 Wire Wire Line
 	15650 6250 15650 6350
 Wire Wire Line
@@ -259,18 +263,18 @@ Connection ~ 4150 4550
 Wire Wire Line
 	4450 3850 4350 3850
 Wire Wire Line
-	4350 3850 4350 4550
+	4350 4550 4350 3850
 Wire Wire Line
-	4350 4550 3950 4550
+	3950 4550 4350 4550
 Connection ~ 4150 3750
 Wire Wire Line
 	3950 4400 4050 4400
 Wire Wire Line
-	4050 4400 4050 3750
+	4050 3750 4050 4400
 Wire Wire Line
-	4050 3750 4450 3750
+	4450 3750 4050 3750
 Wire Wire Line
-	3250 4400 3350 4400
+	3350 4400 3250 4400
 Wire Wire Line
 	8100 9400 8100 9300
 Connection ~ 9850 9950
@@ -288,7 +292,7 @@ Wire Wire Line
 	9850 9450 9750 9450
 Connection ~ 8850 9650
 Wire Wire Line
-	8950 9550 8850 9550
+	8850 9550 8950 9550
 Connection ~ 8850 9850
 Wire Wire Line
 	8850 9750 8950 9750
@@ -326,15 +330,15 @@ Wire Wire Line
 	12250 4100 12350 4100
 Connection ~ 2200 9300
 Wire Wire Line
-	2100 9400 2200 9400
+	2200 9400 2100 9400
 Connection ~ 7650 5050
 Wire Wire Line
-	7650 5050 7650 4550
+	7650 4550 7650 5050
 Wire Wire Line
 	7650 4550 8950 4550
 Connection ~ 7850 4850
 Wire Wire Line
-	7850 4850 7850 4350
+	7850 4350 7850 4850
 Wire Wire Line
 	7850 4350 9150 4350
 Wire Wire Line
@@ -379,7 +383,7 @@ Wire Wire Line
 Wire Wire Line
 	5500 9550 5900 9550
 Wire Wire Line
-	2450 9300 2100 9300
+	2100 9300 2450 9300
 Wire Wire Line
 	2100 9600 2250 9600
 Wire Wire Line
@@ -422,20 +426,20 @@ Wire Wire Line
 Connection ~ 5750 800 
 Connection ~ 5200 800 
 Wire Wire Line
-	4800 700  4800 800 
+	4800 800  4800 700 
 Connection ~ 5750 1200
 Connection ~ 5200 1200
 Wire Wire Line
-	4800 1300 4800 1200
+	4800 1200 4800 1300
 Connection ~ 8650 2150
 Wire Wire Line
-	8650 2250 8650 2150
+	8650 2150 8650 2250
 Wire Wire Line
 	8950 2750 8950 2650
 Wire Wire Line
-	8950 3250 8950 3350
+	8950 3350 8950 3250
 Wire Wire Line
-	8950 3350 6750 3350
+	6750 3350 8950 3350
 Wire Wire Line
 	7750 2750 7750 2650
 Connection ~ 7750 2150
@@ -482,7 +486,7 @@ Wire Wire Line
 	650  2200 650  1800
 Connection ~ 650  1900
 Wire Wire Line
-	5800 6350 5450 6350
+	5450 6350 5800 6350
 Wire Wire Line
 	4350 3650 4450 3650
 Wire Wire Line
@@ -491,7 +495,7 @@ Connection ~ 16400 9400
 Wire Wire Line
 	4650 5050 4750 5050
 Wire Wire Line
-	5550 5350 5350 5350
+	5350 5350 5550 5350
 Connection ~ 5550 5350
 Wire Wire Line
 	5250 4650 5250 4850
@@ -506,9 +510,9 @@ Wire Wire Line
 Wire Wire Line
 	6750 3150 6850 3150
 Wire Wire Line
-	6850 3150 6850 2150
+	6850 2150 6850 3150
 Wire Wire Line
-	6850 2150 7150 2150
+	7150 2150 6850 2150
 Wire Wire Line
 	7850 2150 7650 2150
 Wire Wire Line
@@ -530,23 +534,23 @@ Wire Wire Line
 Connection ~ 4900 1200
 Connection ~ 5450 1200
 Wire Wire Line
-	4800 1200 6300 1200
+	6300 1200 4800 1200
 Connection ~ 6000 1200
 Connection ~ 4900 800 
 Connection ~ 5450 800 
 Wire Wire Line
-	4800 800  6300 800 
+	6300 800  4800 800 
 Connection ~ 6000 800 
 Wire Wire Line
 	7650 3550 7550 3550
 Wire Wire Line
-	5850 4650 5850 4950
+	5850 4950 5850 4650
 Wire Wire Line
-	5850 4950 7950 4950
+	7950 4950 5850 4950
 Wire Wire Line
-	5650 4650 5650 5150
+	5650 5150 5650 4650
 Wire Wire Line
-	5650 5150 7950 5150
+	7950 5150 5650 5150
 Wire Wire Line
 	7150 4150 7150 4250
 Wire Wire Line
@@ -635,7 +639,7 @@ Connection ~ 5550 5550
 Wire Wire Line
 	5550 4650 5550 5650
 Wire Wire Line
-	5450 6350 5450 4650
+	5450 4650 5450 6350
 Wire Wire Line
 	11050 2850 10950 2850
 Wire Wire Line
@@ -644,7 +648,7 @@ Wire Wire Line
 	10350 3250 10350 2250
 Connection ~ 10350 2400
 Wire Wire Line
-	8850 10050 8950 10050
+	8950 10050 8850 10050
 Wire Wire Line
 	8850 9850 8950 9850
 Connection ~ 8850 9950
@@ -760,7 +764,7 @@ Wire Wire Line
 Wire Wire Line
 	13700 7900 13900 7900
 Wire Wire Line
-	13800 6850 13800 7900
+	13800 7900 13800 6850
 Wire Wire Line
 	10200 8600 10200 9600
 Wire Wire Line
@@ -815,9 +819,9 @@ Wire Wire Line
 Wire Wire Line
 	800  9300 800  9100
 Wire Wire Line
-	800  9100 2200 9100
+	2200 9100 800  9100
 Wire Wire Line
-	2200 9100 2200 9400
+	2200 9400 2200 9100
 Wire Wire Line
 	3800 10350 3800 10250
 Wire Wire Line
@@ -861,7 +865,7 @@ Wire Wire Line
 Wire Wire Line
 	13700 9500 13700 9400
 Wire Wire Line
-	13700 8900 13700 9000
+	13700 9000 13700 8900
 Wire Wire Line
 	13150 8900 13150 8800
 Wire Wire Line
@@ -873,7 +877,7 @@ Wire Wire Line
 Wire Wire Line
 	11600 7900 11400 7900
 Wire Wire Line
-	11700 8000 11700 7500
+	11700 7500 11700 8000
 Connection ~ 11700 7750
 Wire Wire Line
 	4450 3350 4350 3350
@@ -881,6 +885,34 @@ Wire Wire Line
 	13300 8900 14000 8900
 Wire Wire Line
 	15050 6850 14500 6850
+Wire Wire Line
+	3250 4400 3250 4300
+Wire Wire Line
+	6500 6950 6500 6850
+$Comp
+L C C70
+U 1 1 503BB2CE
+P 6500 6650
+F 0 "C70" H 6550 6750 50  0000 L CNN
+F 1 "10nF" H 6550 6550 50  0000 L CNN
+F 4 "Murata" H 12900 5400 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 12900 5400 60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 12900 5400 60  0001 C CNN "Description"
+	1    6500 6650
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C69
+U 1 1 503BB2BD
+P 3250 4100
+F 0 "C69" H 3300 4200 50  0000 L CNN
+F 1 "10nF" H 3300 4000 50  0000 L CNN
+F 4 "Murata" H 9650 2850 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 9650 2850 60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 9650 2850 60  0001 C CNN "Description"
+	1    3250 4100
+	-1   0    0    1   
+$EndComp
 $Comp
 L R R7
 U 1 1 5032B025
@@ -891,10 +923,10 @@ F 1 "33" V 15300 6850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR53
+L GND #PWR01
 U 1 1 502E7B4C
 P 7200 7300
-F 0 "#PWR53" H 7200 7300 30  0001 C CNN
+F 0 "#PWR01" H 7200 7300 30  0001 C CNN
 F 1 "GND" H 7200 7230 30  0001 C CNN
 	1    7200 7300
 	1    0    0    -1  
@@ -902,10 +934,10 @@ $EndComp
 Text Label 11700 7500 3    40   ~ 0
 TX_AMP
 $Comp
-L GND #PWR59
+L GND #PWR02
 U 1 1 502E7A17
 P 12350 7750
-F 0 "#PWR59" H 12350 7750 30  0001 C CNN
+F 0 "#PWR02" H 12350 7750 30  0001 C CNN
 F 1 "GND" H 12350 7680 30  0001 C CNN
 	1    12350 7750
 	0    -1   -1   0   
@@ -935,10 +967,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 23250 9550 60  0001 C CNN "Description"
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR54
+L GND #PWR03
 U 1 1 502E7A0F
 P 12200 7300
-F 0 "#PWR54" H 12200 7300 30  0001 C CNN
+F 0 "#PWR03" H 12200 7300 30  0001 C CNN
 F 1 "GND" H 12200 7230 30  0001 C CNN
 	1    12200 7300
 	0    -1   -1   0   
@@ -948,10 +980,10 @@ RX_AMP
 Text Label 9500 8000 0    40   ~ 0
 AMP_BYPASS
 $Comp
-L GND #PWR65
+L GND #PWR04
 U 1 1 502E79FB
 P 9900 8600
-F 0 "#PWR65" H 9900 8600 30  0001 C CNN
+F 0 "#PWR04" H 9900 8600 30  0001 C CNN
 F 1 "GND" H 9900 8530 30  0001 C CNN
 	1    9900 8600
 	1    0    0    -1  
@@ -971,10 +1003,10 @@ $EndComp
 Text Label 15300 8400 3    40   ~ 0
 TX_AMP
 $Comp
-L GND #PWR67
+L GND #PWR05
 U 1 1 502E79D7
 P 15900 8650
-F 0 "#PWR67" H 15900 8650 30  0001 C CNN
+F 0 "#PWR05" H 15900 8650 30  0001 C CNN
 F 1 "GND" H 15900 8580 30  0001 C CNN
 	1    15900 8650
 	0    -1   -1   0   
@@ -1004,19 +1036,19 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 25050 11450 60  0001 C CNN "Description"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR73
+L GND #PWR06
 U 1 1 502E798B
 P 13700 9500
-F 0 "#PWR73" H 13700 9500 30  0001 C CNN
+F 0 "#PWR06" H 13700 9500 30  0001 C CNN
 F 1 "GND" H 13700 9430 30  0001 C CNN
 	1    13700 9500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR72
+L GND #PWR07
 U 1 1 502E798A
 P 13150 9400
-F 0 "#PWR72" H 13150 9400 30  0001 C CNN
+F 0 "#PWR07" H 13150 9400 30  0001 C CNN
 F 1 "GND" H 13150 9330 30  0001 C CNN
 	1    13150 9400
 	1    0    0    -1  
@@ -1054,19 +1086,19 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 23750 7700 60  0001 C CNN "Description"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR42
+L GND #PWR08
 U 1 1 502E792A
 P 12400 5750
-F 0 "#PWR42" H 12400 5750 30  0001 C CNN
+F 0 "#PWR08" H 12400 5750 30  0001 C CNN
 F 1 "GND" H 12400 5680 30  0001 C CNN
 	1    12400 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR44
+L GND #PWR09
 U 1 1 502E7923
 P 12950 5850
-F 0 "#PWR44" H 12950 5850 30  0001 C CNN
+F 0 "#PWR09" H 12950 5850 30  0001 C CNN
 F 1 "GND" H 12950 5780 30  0001 C CNN
 	1    12950 5850
 	1    0    0    -1  
@@ -1098,10 +1130,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 26200 7700 60  0001 C CNN "Description"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR43
+L GND #PWR010
 U 1 1 502E78E1
 P 14850 5750
-F 0 "#PWR43" H 14850 5750 30  0001 C CNN
+F 0 "#PWR010" H 14850 5750 30  0001 C CNN
 F 1 "GND" H 14850 5680 30  0001 C CNN
 	1    14850 5750
 	1    0    0    -1  
@@ -1119,19 +1151,19 @@ F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 5000 9600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR77
+L GND #PWR011
 U 1 1 502E780F
 P 5000 9900
-F 0 "#PWR77" H 5000 9900 30  0001 C CNN
+F 0 "#PWR011" H 5000 9900 30  0001 C CNN
 F 1 "GND" H 5000 9830 30  0001 C CNN
 	1    5000 9900
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR69
+L VCC #PWR012
 U 1 1 502E780E
 P 5000 9200
-F 0 "#PWR69" H 5000 9300 30  0001 C CNN
+F 0 "#PWR012" H 5000 9300 30  0001 C CNN
 F 1 "VCC" H 5000 9300 30  0000 C CNN
 	1    5000 9200
 	1    0    0    -1  
@@ -1161,19 +1193,19 @@ MIX_BYPASS
 Text Label 2800 9300 0    40   ~ 0
 MIX_BYPASS
 $Comp
-L GND #PWR85
+L GND #PWR013
 U 1 1 502E772E
 P 3800 10350
-F 0 "#PWR85" H 3800 10350 30  0001 C CNN
+F 0 "#PWR013" H 3800 10350 30  0001 C CNN
 F 1 "GND" H 3800 10280 30  0001 C CNN
 	1    3800 10350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR79
+L GND #PWR014
 U 1 1 502E772A
 P 3100 10000
-F 0 "#PWR79" H 3100 10000 30  0001 C CNN
+F 0 "#PWR014" H 3100 10000 30  0001 C CNN
 F 1 "GND" H 3100 9930 30  0001 C CNN
 	1    3100 10000
 	1    0    0    -1  
@@ -1201,10 +1233,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 16100 4350 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR32
+L GND #PWR015
 U 1 1 502E6FED
 P 12950 4850
-F 0 "#PWR32" H 12950 4850 30  0001 C CNN
+F 0 "#PWR015" H 12950 4850 30  0001 C CNN
 F 1 "GND" H 12950 4780 30  0001 C CNN
 	1    12950 4850
 	1    0    0    -1  
@@ -1214,10 +1246,10 @@ HP
 Text Label 13050 2850 3    40   ~ 0
 LP
 $Comp
-L GND #PWR16
+L GND #PWR016
 U 1 1 502E6F90
 P 13650 3000
-F 0 "#PWR16" H 13650 3000 30  0001 C CNN
+F 0 "#PWR016" H 13650 3000 30  0001 C CNN
 F 1 "GND" H 13650 2930 30  0001 C CNN
 	1    13650 3000
 	0    -1   -1   0   
@@ -1235,10 +1267,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 24700 5250 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR017
 U 1 1 502E6F53
 P 9550 3850
-F 0 "#PWR23" H 9550 3850 30  0001 C CNN
+F 0 "#PWR017" H 9550 3850 30  0001 C CNN
 F 1 "GND" H 9550 3780 30  0001 C CNN
 	1    9550 3850
 	1    0    0    -1  
@@ -1258,10 +1290,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 12700 3350 60  0001 C CNN "Description"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR5
+L GND #PWR018
 U 1 1 502E6F0C
 P 10250 2050
-F 0 "#PWR5" H 10250 2050 30  0001 C CNN
+F 0 "#PWR018" H 10250 2050 30  0001 C CNN
 F 1 "GND" H 10250 1980 30  0001 C CNN
 	1    10250 2050
 	0    -1   -1   0   
@@ -1281,10 +1313,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13100 1850 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR47
+L GND #PWR019
 U 1 1 502E6EDE
 P 7700 6000
-F 0 "#PWR47" H 7700 6000 30  0001 C CNN
+F 0 "#PWR019" H 7700 6000 30  0001 C CNN
 F 1 "GND" H 7700 5930 30  0001 C CNN
 	1    7700 6000
 	0    -1   -1   0   
@@ -1304,10 +1336,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 10550 5800 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR52
+L GND #PWR020
 U 1 1 502E6EC5
 P 6400 7300
-F 0 "#PWR52" H 6400 7300 30  0001 C CNN
+F 0 "#PWR020" H 6400 7300 30  0001 C CNN
 F 1 "GND" H 6400 7230 30  0001 C CNN
 	1    6400 7300
 	0    1    1    0   
@@ -1389,64 +1421,64 @@ F 6 "CAP CER 100PF 50V 5% NP0 0402" H 15400 9650 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR60
+L GND #PWR021
 U 1 1 502E65FF
 P 12700 7900
-F 0 "#PWR60" H 12700 7900 30  0001 C CNN
+F 0 "#PWR021" H 12700 7900 30  0001 C CNN
 F 1 "GND" H 12700 7830 30  0001 C CNN
 	1    12700 7900
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR61
+L GND #PWR022
 U 1 1 502E65FB
 P 12700 8000
-F 0 "#PWR61" H 12700 8000 30  0001 C CNN
+F 0 "#PWR022" H 12700 8000 30  0001 C CNN
 F 1 "GND" H 12700 7930 30  0001 C CNN
 	1    12700 8000
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR62
+L GND #PWR023
 U 1 1 502E65F6
 P 13800 8000
-F 0 "#PWR62" H 13800 8000 30  0001 C CNN
+F 0 "#PWR023" H 13800 8000 30  0001 C CNN
 F 1 "GND" H 13800 7930 30  0001 C CNN
 	1    13800 8000
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR64
+L GND #PWR024
 U 1 1 502E6209
 P 14550 8150
-F 0 "#PWR64" H 14550 8150 30  0001 C CNN
+F 0 "#PWR024" H 14550 8150 30  0001 C CNN
 F 1 "GND" H 14550 8080 30  0001 C CNN
 	1    14550 8150
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR31
+L GND #PWR025
 U 1 1 502E619A
 P 13900 4500
-F 0 "#PWR31" H 13900 4500 30  0001 C CNN
+F 0 "#PWR025" H 13900 4500 30  0001 C CNN
 F 1 "GND" H 13900 4430 30  0001 C CNN
 	1    13900 4500
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR66
+L GND #PWR026
 U 1 1 502E6129
 P 10850 8650
-F 0 "#PWR66" H 10850 8650 30  0001 C CNN
+F 0 "#PWR026" H 10850 8650 30  0001 C CNN
 F 1 "GND" H 10850 8580 30  0001 C CNN
 	1    10850 8650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR63
+L GND #PWR027
 U 1 1 502E601D
 P 13800 8100
-F 0 "#PWR63" H 13800 8100 30  0001 C CNN
+F 0 "#PWR027" H 13800 8100 30  0001 C CNN
 F 1 "GND" H 13800 8030 30  0001 C CNN
 	1    13800 8100
 	0    -1   -1   0   
@@ -1485,28 +1517,28 @@ F 1 "MGA-81563" H 13250 7950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR48
+L VCC #PWR028
 U 1 1 502C6DC8
 P 15650 6250
-F 0 "#PWR48" H 15650 6350 30  0001 C CNN
+F 0 "#PWR028" H 15650 6350 30  0001 C CNN
 F 1 "VCC" H 15650 6350 30  0000 C CNN
 	1    15650 6250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR56
+L GND #PWR029
 U 1 1 502C6DC4
 P 14950 7450
-F 0 "#PWR56" H 14950 7450 30  0001 C CNN
+F 0 "#PWR029" H 14950 7450 30  0001 C CNN
 F 1 "GND" H 14950 7380 30  0001 C CNN
 	1    14950 7450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR55
+L GND #PWR030
 U 1 1 502C6DC1
 P 14600 7450
-F 0 "#PWR55" H 14600 7450 30  0001 C CNN
+F 0 "#PWR030" H 14600 7450 30  0001 C CNN
 F 1 "GND" H 14600 7380 30  0001 C CNN
 	1    14600 7450
 	1    0    0    -1  
@@ -1629,28 +1661,28 @@ F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 19650 3500 60  0001 C CNN "Description"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR15
+L GND #PWR031
 U 1 1 502B5542
 P 12850 3000
-F 0 "#PWR15" H 12850 3000 30  0001 C CNN
+F 0 "#PWR031" H 12850 3000 30  0001 C CNN
 F 1 "GND" H 12850 2930 30  0001 C CNN
 	1    12850 3000
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR28
+L GND #PWR032
 U 1 1 502B54A4
 P 10450 4250
-F 0 "#PWR28" H 10450 4250 30  0001 C CNN
+F 0 "#PWR032" H 10450 4250 30  0001 C CNN
 F 1 "GND" H 10450 4180 30  0001 C CNN
 	1    10450 4250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR033
 U 1 1 502B5428
 P 9450 2050
-F 0 "#PWR4" H 9450 2050 30  0001 C CNN
+F 0 "#PWR033" H 9450 2050 30  0001 C CNN
 F 1 "GND" H 9450 1980 30  0001 C CNN
 	1    9450 2050
 	-1   0    0    1   
@@ -1767,10 +1799,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 5800 4750 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR35
+L GND #PWR034
 U 1 1 502B477F
 P 2650 5250
-F 0 "#PWR35" H 2650 5250 30  0001 C CNN
+F 0 "#PWR034" H 2650 5250 30  0001 C CNN
 F 1 "GND" H 2650 5180 30  0001 C CNN
 	1    2650 5250
 	1    0    0    -1  
@@ -1785,10 +1817,10 @@ F 1 "SKY13350" H 2650 3800 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR18
+L GND #PWR035
 U 1 1 502B477C
 P 2550 3450
-F 0 "#PWR18" H 2550 3450 30  0001 C CNN
+F 0 "#PWR035" H 2550 3450 30  0001 C CNN
 F 1 "GND" H 2550 3380 30  0001 C CNN
 	1    2550 3450
 	-1   0    0    1   
@@ -1818,10 +1850,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 14400 5700 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR19
+L GND #PWR036
 U 1 1 502B4778
 P 3350 3450
-F 0 "#PWR19" H 3350 3450 30  0001 C CNN
+F 0 "#PWR036" H 3350 3450 30  0001 C CNN
 F 1 "GND" H 3350 3380 30  0001 C CNN
 	1    3350 3450
 	0    -1   -1   0   
@@ -1866,10 +1898,10 @@ HP
 Text Label 10350 2250 3    40   ~ 0
 LP
 $Comp
-L GND #PWR11
+L GND #PWR037
 U 1 1 501F4794
 P 1250 2700
-F 0 "#PWR11" H 1250 2700 30  0001 C CNN
+F 0 "#PWR037" H 1250 2700 30  0001 C CNN
 F 1 "GND" H 1250 2630 30  0001 C CNN
 	1    1250 2700
 	0    1    1    0   
@@ -1887,10 +1919,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 4700 2500 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR3
+L GND #PWR038
 U 1 1 501F4789
 P 2550 1450
-F 0 "#PWR3" H 2550 1450 30  0001 C CNN
+F 0 "#PWR038" H 2550 1450 30  0001 C CNN
 F 1 "GND" H 2550 1380 30  0001 C CNN
 	1    2550 1450
 	0    -1   -1   0   
@@ -1920,10 +1952,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13600 8700 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR50
+L GND #PWR039
 U 1 1 501F477C
 P 2550 6450
-F 0 "#PWR50" H 2550 6450 30  0001 C CNN
+F 0 "#PWR039" H 2550 6450 30  0001 C CNN
 F 1 "GND" H 2550 6380 30  0001 C CNN
 	1    2550 6450
 	0    -1   -1   0   
@@ -1941,19 +1973,19 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 4700 7500 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR57
+L GND #PWR040
 U 1 1 501F4768
 P 1250 7700
-F 0 "#PWR57" H 1250 7700 30  0001 C CNN
+F 0 "#PWR040" H 1250 7700 30  0001 C CNN
 F 1 "GND" H 1250 7630 30  0001 C CNN
 	1    1250 7700
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR8
+L GND #PWR041
 U 1 1 501F46AE
 P 10950 2400
-F 0 "#PWR8" H 10950 2400 30  0001 C CNN
+F 0 "#PWR041" H 10950 2400 30  0001 C CNN
 F 1 "GND" H 10950 2330 30  0001 C CNN
 	1    10950 2400
 	0    -1   -1   0   
@@ -2030,10 +2062,10 @@ F 1 "SKY13350" H 12950 3350 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR042
 U 1 1 501EF7A8
 P 2050 2700
-F 0 "#PWR12" H 2050 2700 30  0001 C CNN
+F 0 "#PWR042" H 2050 2700 30  0001 C CNN
 F 1 "GND" H 2050 2630 30  0001 C CNN
 	1    2050 2700
 	1    0    0    -1  
@@ -2084,10 +2116,10 @@ F 6 "CAP CER 47PF 50V 5% NP0 0402" H 4050 8000 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR58
+L GND #PWR043
 U 1 1 501EF65B
 P 2050 7700
-F 0 "#PWR58" H 2050 7700 30  0001 C CNN
+F 0 "#PWR043" H 2050 7700 30  0001 C CNN
 F 1 "GND" H 2050 7630 30  0001 C CNN
 	1    2050 7700
 	1    0    0    -1  
@@ -2106,18 +2138,18 @@ L BALUN-B0310J50100AHF T2
 U 1 1 501EF4A4
 P 6100 6300
 F 0 "T2" H 6100 6500 70  0000 C CNN
-F 1 "MIX_OUT_BALUN" H 6100 6150 70  0000 C CNN
+F 1 "MIX_OUT_BALUN" H 6000 6150 70  0000 C CNN
 	1    6100 6300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR29
+L GND #PWR044
 U 1 1 501EF4A0
-P 3250 4400
-F 0 "#PWR29" H 3250 4400 30  0001 C CNN
-F 1 "GND" H 3250 4330 30  0001 C CNN
-	1    3250 4400
-	0    1    1    0   
+P 3250 3800
+F 0 "#PWR044" H 3250 3800 30  0001 C CNN
+F 1 "GND" H 3250 3730 30  0001 C CNN
+	1    3250 3800
+	-1   0    0    1   
 $EndComp
 $Comp
 L BALUN-B0310J50100AHF T1
@@ -2150,10 +2182,10 @@ F 1 "SKY13350" H 10350 3500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR84
+L GND #PWR045
 U 1 1 4FC68E81
 P 1500 10350
-F 0 "#PWR84" H 1500 10350 30  0001 C CNN
+F 0 "#PWR045" H 1500 10350 30  0001 C CNN
 F 1 "GND" H 1500 10280 30  0001 C CNN
 	1    1500 10350
 	1    0    0    -1  
@@ -2201,10 +2233,10 @@ F 1 "CONN_1" H 12000 10255 30  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR37
+L GND #PWR046
 U 1 1 4FB57576
 P 8850 5350
-F 0 "#PWR37" H 8850 5350 30  0001 C CNN
+F 0 "#PWR046" H 8850 5350 30  0001 C CNN
 F 1 "GND" H 8850 5280 30  0001 C CNN
 	1    8850 5350
 	1    0    0    -1  
@@ -2232,10 +2264,10 @@ F 6 "CAP CER 100PF 50V 5% NP0 0402" H 7650 7200 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR45
+L GND #PWR047
 U 1 1 4FB55FAC
 P 4350 5950
-F 0 "#PWR45" H 4350 5950 30  0001 C CNN
+F 0 "#PWR047" H 4350 5950 30  0001 C CNN
 F 1 "GND" H 4350 5880 30  0001 C CNN
 	1    4350 5950
 	1    0    0    -1  
@@ -2255,10 +2287,10 @@ F 6 "CAP CER 47PF 50V 5% NP0 0402" H 8350 9400 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR27
+L GND #PWR048
 U 1 1 4FB52F5A
 P 6850 4250
-F 0 "#PWR27" H 6850 4250 30  0001 C CNN
+F 0 "#PWR048" H 6850 4250 30  0001 C CNN
 F 1 "GND" H 6850 4180 30  0001 C CNN
 	1    6850 4250
 	1    0    0    -1  
@@ -2276,10 +2308,10 @@ F 6 "TVS DIODE ESD .05PF 15KV 0402" H 15700 9350 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR75
+L GND #PWR049
 U 1 1 4FB3F838
 P 15700 9700
-F 0 "#PWR75" H 15700 9700 30  0001 C CNN
+F 0 "#PWR049" H 15700 9700 30  0001 C CNN
 F 1 "GND" H 15700 9630 30  0001 C CNN
 	1    15700 9700
 	1    0    0    -1  
@@ -2289,19 +2321,19 @@ CLK
 Text Label 8600 9700 2    40   ~ 0
 REF_IN
 $Comp
-L GND #PWR83
+L GND #PWR050
 U 1 1 4FB3CC7B
 P 8350 10300
-F 0 "#PWR83" H 8350 10300 30  0001 C CNN
+F 0 "#PWR050" H 8350 10300 30  0001 C CNN
 F 1 "GND" H 8350 10230 30  0001 C CNN
 	1    8350 10300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR71
+L GND #PWR051
 U 1 1 4FB3CC5E
 P 8100 9400
-F 0 "#PWR71" H 8100 9400 30  0001 C CNN
+F 0 "#PWR051" H 8100 9400 30  0001 C CNN
 F 1 "GND" H 8100 9330 30  0001 C CNN
 	1    8100 9400
 	1    0    0    -1  
@@ -2309,19 +2341,19 @@ $EndComp
 Text Label 5850 2150 3    40   ~ 0
 REF_IN
 $Comp
-L VCC #PWR70
+L VCC #PWR052
 U 1 1 4FB3CBB2
 P 9850 9350
-F 0 "#PWR70" H 9850 9450 30  0001 C CNN
+F 0 "#PWR052" H 9850 9450 30  0001 C CNN
 F 1 "VCC" H 9850 9450 30  0000 C CNN
 	1    9850 9350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR82
+L GND #PWR053
 U 1 1 4FB3CBAC
 P 8850 10150
-F 0 "#PWR82" H 8850 10150 30  0001 C CNN
+F 0 "#PWR053" H 8850 10150 30  0001 C CNN
 F 1 "GND" H 8850 10080 30  0001 C CNN
 	1    8850 10150
 	1    0    0    -1  
@@ -2339,19 +2371,19 @@ GPO2
 Text Label 5350 2150 3    40   ~ 0
 GPO1
 $Comp
-L GND #PWR80
+L GND #PWR054
 U 1 1 4FB3CA7B
 P 5800 10150
-F 0 "#PWR80" H 5800 10150 30  0001 C CNN
+F 0 "#PWR054" H 5800 10150 30  0001 C CNN
 F 1 "GND" H 5800 10080 30  0001 C CNN
 	1    5800 10150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR81
+L GND #PWR055
 U 1 1 4FB3CA70
 P 6800 10150
-F 0 "#PWR81" H 6800 10150 30  0001 C CNN
+F 0 "#PWR055" H 6800 10150 30  0001 C CNN
 F 1 "GND" H 6800 10080 30  0001 C CNN
 	1    6800 10150
 	1    0    0    -1  
@@ -2396,19 +2428,19 @@ Text Label 500  9600 0    40   ~ 0
 Text Label 500  9500 0    40   ~ 0
 MIX_BYPASS
 $Comp
-L VCC #PWR68
+L VCC #PWR056
 U 1 1 4FB2FD2A
 P 2450 9200
-F 0 "#PWR68" H 2450 9300 30  0001 C CNN
+F 0 "#PWR056" H 2450 9300 30  0001 C CNN
 F 1 "VCC" H 2450 9300 30  0000 C CNN
 	1    2450 9200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR76
+L GND #PWR057
 U 1 1 4FB2FD23
 P 2450 9900
-F 0 "#PWR76" H 2450 9900 30  0001 C CNN
+F 0 "#PWR057" H 2450 9900 30  0001 C CNN
 F 1 "GND" H 2450 9830 30  0001 C CNN
 	1    2450 9900
 	1    0    0    -1  
@@ -2427,10 +2459,10 @@ F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 2450 9600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR78
+L GND #PWR058
 U 1 1 4FB2FD02
 P 800 10000
-F 0 "#PWR78" H 800 10000 30  0001 C CNN
+F 0 "#PWR058" H 800 10000 30  0001 C CNN
 F 1 "GND" H 800 9930 30  0001 C CNN
 	1    800  10000
 	1    0    0    -1  
@@ -2448,19 +2480,19 @@ F 6 "IC HEX INVERTERS 14-QFN" H 1500 9600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR36
+L GND #PWR059
 U 1 1 4FAECFE7
 P 7850 5350
-F 0 "#PWR36" H 7850 5350 30  0001 C CNN
+F 0 "#PWR059" H 7850 5350 30  0001 C CNN
 F 1 "GND" H 7850 5280 30  0001 C CNN
 	1    7850 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR26
+L VCC #PWR060
 U 1 1 4FAECFB5
 P 7350 4150
-F 0 "#PWR26" H 7350 4250 30  0001 C CNN
+F 0 "#PWR060" H 7350 4250 30  0001 C CNN
 F 1 "VCC" H 7350 4250 30  0000 C CNN
 	1    7350 4150
 	1    0    0    -1  
@@ -2478,37 +2510,37 @@ F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 7350 4500 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR41
+L GND #PWR061
 U 1 1 4FAECE90
 P 6950 5750
-F 0 "#PWR41" H 6950 5750 30  0001 C CNN
+F 0 "#PWR061" H 6950 5750 30  0001 C CNN
 F 1 "GND" H 6950 5680 30  0001 C CNN
 	1    6950 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR40
+L GND #PWR062
 U 1 1 4FAECE8F
 P 6650 5750
-F 0 "#PWR40" H 6650 5750 30  0001 C CNN
+F 0 "#PWR062" H 6650 5750 30  0001 C CNN
 F 1 "GND" H 6650 5680 30  0001 C CNN
 	1    6650 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR39
+L GND #PWR063
 U 1 1 4FAECE8E
 P 6350 5750
-F 0 "#PWR39" H 6350 5750 30  0001 C CNN
+F 0 "#PWR063" H 6350 5750 30  0001 C CNN
 F 1 "GND" H 6350 5680 30  0001 C CNN
 	1    6350 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR38
+L GND #PWR064
 U 1 1 4FAECE8C
 P 6050 5750
-F 0 "#PWR38" H 6050 5750 30  0001 C CNN
+F 0 "#PWR064" H 6050 5750 30  0001 C CNN
 F 1 "GND" H 6050 5680 30  0001 C CNN
 	1    6050 5750
 	1    0    0    -1  
@@ -2562,10 +2594,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 6950 5450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR25
+L VCC #PWR065
 U 1 1 4FAECE5B
 P 7150 4150
-F 0 "#PWR25" H 7150 4250 30  0001 C CNN
+F 0 "#PWR065" H 7150 4250 30  0001 C CNN
 F 1 "VCC" H 7150 4250 30  0000 C CNN
 	1    7150 4150
 	1    0    0    -1  
@@ -2585,10 +2617,10 @@ $EndComp
 Text Label 5650 4900 1    40   ~ 0
 RESETX
 $Comp
-L GND #PWR7
+L GND #PWR066
 U 1 1 4FAECD9D
 P 5650 2250
-F 0 "#PWR7" H 5650 2250 30  0001 C CNN
+F 0 "#PWR066" H 5650 2250 30  0001 C CNN
 F 1 "GND" H 5650 2180 30  0001 C CNN
 	1    5650 2250
 	-1   0    0    1   
@@ -2608,10 +2640,10 @@ $EndComp
 NoConn ~ 6750 3750
 NoConn ~ 6750 3650
 $Comp
-L GND #PWR21
+L GND #PWR067
 U 1 1 4FAECC8F
 P 7650 3550
-F 0 "#PWR21" H 7650 3550 30  0001 C CNN
+F 0 "#PWR067" H 7650 3550 30  0001 C CNN
 F 1 "GND" H 7650 3480 30  0001 C CNN
 	1    7650 3550
 	0    -1   -1   0   
@@ -2631,28 +2663,28 @@ F 6 "RES TF 51K OHM 1% 0.0625W 0402" H 7300 3550 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR068
 U 1 1 4FAECBE1
 P 4800 1300
-F 0 "#PWR2" H 4800 1300 30  0001 C CNN
+F 0 "#PWR068" H 4800 1300 30  0001 C CNN
 F 1 "GND" H 4800 1230 30  0001 C CNN
 	1    4800 1300
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR1
+L VCC #PWR069
 U 1 1 4FAECBD8
 P 4800 700
-F 0 "#PWR1" H 4800 800 30  0001 C CNN
+F 0 "#PWR069" H 4800 800 30  0001 C CNN
 F 1 "VCC" H 4800 800 30  0000 C CNN
 	1    4800 700 
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR20
+L VCC #PWR070
 U 1 1 4FAECBCE
 P 6850 3450
-F 0 "#PWR20" H 6850 3550 30  0001 C CNN
+F 0 "#PWR070" H 6850 3550 30  0001 C CNN
 F 1 "VCC" H 6850 3550 30  0000 C CNN
 	1    6850 3450
 	0    1    1    0   
@@ -2768,19 +2800,19 @@ F 6 "CAP CER 8.2PF 50V NP0 0402" H 8650 2450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR14
+L GND #PWR071
 U 1 1 4FAEC88E
 P 7750 2750
-F 0 "#PWR14" H 7750 2750 30  0001 C CNN
+F 0 "#PWR071" H 7750 2750 30  0001 C CNN
 F 1 "GND" H 7750 2680 30  0001 C CNN
 	1    7750 2750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR13
+L GND #PWR072
 U 1 1 4FAEC88B
 P 7050 2750
-F 0 "#PWR13" H 7050 2750 30  0001 C CNN
+F 0 "#PWR072" H 7050 2750 30  0001 C CNN
 F 1 "GND" H 7050 2680 30  0001 C CNN
 	1    7050 2750
 	1    0    0    -1  
@@ -2834,10 +2866,10 @@ F 6 "CAP CER 330PF 50V 10% X7R 0402" H 7050 2450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR46
+L GND #PWR073
 U 1 1 4FAEC785
 P 4650 5950
-F 0 "#PWR46" H 4650 5950 30  0001 C CNN
+F 0 "#PWR073" H 4650 5950 30  0001 C CNN
 F 1 "GND" H 4650 5880 30  0001 C CNN
 	1    4650 5950
 	1    0    0    -1  
@@ -2873,19 +2905,19 @@ HP
 Text Label 5500 9650 0    40   ~ 0
 TX
 $Comp
-L VCC #PWR33
+L VCC #PWR074
 U 1 1 4FAEC085
 P 4650 4950
-F 0 "#PWR33" H 4650 5050 30  0001 C CNN
+F 0 "#PWR074" H 4650 5050 30  0001 C CNN
 F 1 "VCC" H 4650 5050 30  0000 C CNN
 	1    4650 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR74
+L GND #PWR075
 U 1 1 4FAA165E
 P 16400 9600
-F 0 "#PWR74" H 16400 9600 30  0001 C CNN
+F 0 "#PWR075" H 16400 9600 30  0001 C CNN
 F 1 "GND" H 16400 9530 30  0001 C CNN
 	1    16400 9600
 	1    0    0    -1  
@@ -2903,46 +2935,46 @@ F 6 "CAP CER 47PF 50V 5% NP0 0402" H 12550 5800 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR24
+L GND #PWR076
 U 1 1 4FAA142A
 P 10950 4100
-F 0 "#PWR24" H 10950 4100 30  0001 C CNN
+F 0 "#PWR076" H 10950 4100 30  0001 C CNN
 F 1 "GND" H 10950 4030 30  0001 C CNN
 	1    10950 4100
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR9
+L GND #PWR077
 U 1 1 4FAA1424
 P 10950 2550
-F 0 "#PWR9" H 10950 2550 30  0001 C CNN
+F 0 "#PWR077" H 10950 2550 30  0001 C CNN
 F 1 "GND" H 10950 2480 30  0001 C CNN
 	1    10950 2550
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR10
+L GND #PWR078
 U 1 1 4FAA10AF
 P 12350 2550
-F 0 "#PWR10" H 12350 2550 30  0001 C CNN
+F 0 "#PWR078" H 12350 2550 30  0001 C CNN
 F 1 "GND" H 12350 2480 30  0001 C CNN
 	1    12350 2550
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR30
+L GND #PWR079
 U 1 1 4FAA1098
 P 12350 4400
-F 0 "#PWR30" H 12350 4400 30  0001 C CNN
+F 0 "#PWR079" H 12350 4400 30  0001 C CNN
 F 1 "GND" H 12350 4330 30  0001 C CNN
 	1    12350 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR34
+L GND #PWR080
 U 1 1 4FAA0C6C
 P 10250 5000
-F 0 "#PWR34" H 10250 5000 30  0001 C CNN
+F 0 "#PWR080" H 10250 5000 30  0001 C CNN
 F 1 "GND" H 10250 4930 30  0001 C CNN
 	1    10250 5000
 	1    0    0    -1  
@@ -2960,49 +2992,49 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13400 4500 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR22
+L VCC #PWR081
 U 1 1 4FAA0C25
 P 4350 3650
-F 0 "#PWR22" H 4350 3750 30  0001 C CNN
+F 0 "#PWR081" H 4350 3750 30  0001 C CNN
 F 1 "VCC" H 4350 3750 30  0000 C CNN
 	1    4350 3650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR17
+L VCC #PWR082
 U 1 1 4FAA0C0D
 P 4350 3350
-F 0 "#PWR17" H 4350 3450 30  0001 C CNN
+F 0 "#PWR082" H 4350 3450 30  0001 C CNN
 F 1 "VCC" H 4350 3450 30  0000 C CNN
 	1    4350 3350
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR6
+L GND #PWR083
 U 1 1 4FAA08FD
 P 650 2200
-F 0 "#PWR6" H 650 2200 30  0001 C CNN
+F 0 "#PWR083" H 650 2200 30  0001 C CNN
 F 1 "GND" H 650 2130 30  0001 C CNN
 	1    650  2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR51
+L GND #PWR084
 U 1 1 4FAA08F7
 P 650 7200
-F 0 "#PWR51" H 650 7200 30  0001 C CNN
+F 0 "#PWR084" H 650 7200 30  0001 C CNN
 F 1 "GND" H 650 7130 30  0001 C CNN
 	1    650  7200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR49
+L GND #PWR085
 U 1 1 4FAA08EA
-P 6500 6350
-F 0 "#PWR49" H 6500 6350 30  0001 C CNN
-F 1 "GND" H 6500 6280 30  0001 C CNN
-	1    6500 6350
-	0    -1   -1   0   
+P 6500 6950
+F 0 "#PWR085" H 6500 6950 30  0001 C CNN
+F 1 "GND" H 6500 6880 30  0001 C CNN
+	1    6500 6950
+	1    0    0    -1  
 $EndComp
 $Comp
 L GSG-SMA-CONN P3