diff --git a/hardware/kicad/hackrf.mod b/hardware/kicad/hackrf.mod
index 904a23cf..345c19cc 100644
--- a/hardware/kicad/hackrf.mod
+++ b/hardware/kicad/hackrf.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Mon Aug 20 16:39:01 2012
+PCBNEW-LibModule-V1  Mon Aug 20 17:20:31 2012
 # encoding utf-8
 $INDEX
 GSG-HEADER-1x3
@@ -8081,10 +8081,10 @@ Le 65
 $EndPAD
 $EndMODULE  GSG-SOT363
 $MODULE GSG-SKY13350-385LF
-Po 0 0 0 15 5032BC14 00000000 ~~
+Po 0 0 0 15 5032C4C2 00000000 ~~
 Li GSG-SKY13350-385LF
 Sc 00000000
-AR
+AR GSG-SKY13350-385LF
 Op 0 0 0
 T0 0 0 197 118 0 30 N V 21 N "GSG-SKY13350-385LF"
 T1 0 0 197 118 0 30 N I 21 N "VAL**"
@@ -8132,6 +8132,7 @@ At SMD N 00888000
 Ne 0 ""
 Po 0 -177
 Le 41110432
+.SolderPasteRatio -0.04
 $EndPAD
 $PAD
 Sh "2" R 169 60 0 0 0
@@ -8143,7 +8144,7 @@ Le 839724792
 $EndPAD
 $EndMODULE  GSG-SKY13350-385LF
 $MODULE GSG-SKY13317-373LF
-Po 0 0 0 15 5032BC7D 00000000 ~~
+Po 0 0 0 15 5032C63B 00000000 ~~
 Li GSG-SKY13317-373LF
 Sc 00000000
 AR 
@@ -8258,7 +8259,7 @@ $EndPAD
 $PAD
 Sh "0" R 28 56 0 0 -450
 Dr 0 0 0
-At SMD N 00888000
+At SMD N 00808000
 Ne 0 ""
 Po -108 -207
 Le 343506792
diff --git a/hardware/licorice/licorice.brd b/hardware/licorice/licorice.brd
index 4c623ed7..59723cd8 100644
--- a/hardware/licorice/licorice.brd
+++ b/hardware/licorice/licorice.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Mon Aug 20 17:04:16 2012
+PCBNEW-BOARD Version 1 date Mon Aug 20 17:20:46 2012
 
 # Created by Pcbnew(2011-06-30 BZR 3033)-stable
 
@@ -66,9 +66,9 @@ TextPcbSize 600 800
 EdgeModWidth 150
 TextModSize 600 600
 TextModWidth 120
-PadSize 177 79
+PadSize 28 56
 PadDrill 0
-Pad2MaskClearance 100
+Pad2MaskClearance 60
 Pad2PasteClearanceRatio -0.12
 AuxiliaryAxisOrg 0 0
 PcbPlotParams (pcbplotparams (layerselection 283672583) (usegerberextensions true) (excludeedgelayer true) (linewidth 60) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 0) (pscolor true) (psnegative false) (psa4output false) (plotreference false) (plotvalue false) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory ""))
@@ -510,6 +510,7 @@ Li GSG-SKY13350-385LF
 Sc 502E9718
 AR /502B4C1C
 Op 0 0 0
+.SolderPasteRatio -0.04
 T0 0 0 197 118 0 30 N V 21 N "U10"
 T1 0 0 197 118 0 30 N I 21 N "SKY13350"
 DC -236 -236 -197 -197 70 21
@@ -572,6 +573,7 @@ Li GSG-SKY13350-385LF
 Sc 502E9716
 AR /502B477E
 Op 0 0 0
+.SolderPasteRatio -0.04
 T0 0 0 197 118 1800 30 N V 21 N "U7"
 T1 0 0 197 118 1800 30 N I 21 N "SKY13350"
 DC -236 -236 -197 -197 70 21
@@ -628,68 +630,6 @@ Po -211 98
 Le 839724792
 $EndPAD
 $EndMODULE  GSG-SKY13350-385LF
-$MODULE GSG-SKY13350-385LF
-Po 26200 13300 900 15 5032BC14 502E9710 ~~
-Li GSG-SKY13350-385LF
-Sc 502E9710
-AR /501EF778
-Op 0 0 0
-T0 0 0 197 118 900 30 N V 21 N "U1"
-T1 0 0 197 118 900 30 N I 21 N "SKY13350"
-DC -236 -236 -197 -197 70 21
-DS 197 197 -197 197 70 21
-DS -197 197 -197 -197 70 21
-DS -197 -197 197 -197 70 21
-DS 197 -197 197 197 70 21
-$PAD
-Sh "1" R 169 60 0 0 900
-Dr 0 0 0
-At SMD N 00888000
-Ne 3 "/!MIX_BYPASS"
-Po -211 -98
-Le 41110432
-$EndPAD
-$PAD
-Sh "3" R 79 240 0 0 900
-Dr 0 0 0
-At SMD N 00888000
-Ne 30 "GND"
-Po 0 177
-Le 41110432
-$EndPAD
-$PAD
-Sh "4" R 169 60 0 0 900
-Dr 0 0 0
-At SMD N 00888000
-Ne 44 "N-000018"
-Po 211 98
-Le 20
-$EndPAD
-$PAD
-Sh "5" R 169 60 0 0 900
-Dr 0 0 0
-At SMD N 00888000
-Ne 15 "/MIX_BYPASS"
-Po 211 -98
-Le 4149
-$EndPAD
-$PAD
-Sh "6" R 79 240 0 0 900
-Dr 0 0 0
-At SMD N 00888000
-Ne 46 "N-000020"
-Po 0 -177
-Le 41110432
-$EndPAD
-$PAD
-Sh "2" R 169 60 0 0 900
-Dr 0 0 0
-At SMD N 00888000
-Ne 45 "N-000019"
-Po -211 98
-Le 839724792
-$EndPAD
-$EndMODULE  GSG-SKY13350-385LF
 $MODULE SOT23GDS
 Po 40350 13850 0 15 451262E6 502E9707 ~P
 Li SOT23GDS
@@ -5064,6 +5004,7 @@ Li GSG-SKY13350-385LF
 Sc 502E971A
 AR /501EF646
 Op 0 0 0
+.SolderPasteRatio -0.04
 T0 0 0 197 118 900 30 N V 21 N "U11"
 T1 0 0 197 118 900 30 N I 21 N "SKY13350"
 DC -236 -236 -197 -197 70 21
@@ -5126,6 +5067,7 @@ Li GSG-SKY13350-385LF
 Sc 502E9712
 AR /502B490F
 Op 0 0 0
+.SolderPasteRatio -0.04
 T0 0 0 197 118 2700 30 N V 21 N "U2"
 T1 0 0 197 118 2700 30 N I 21 N "SKY13350"
 DC -236 -236 -197 -197 70 21
@@ -5188,6 +5130,7 @@ Li GSG-SKY13350-385LF
 Sc 502E9FA9
 AR /501EF258
 Op 0 0 0
+.SolderPasteRatio -0.04
 T0 0 0 197 118 900 30 N V 21 N "U6"
 T1 0 0 197 118 900 30 N I 21 N "SKY13350"
 DC -236 -236 -197 -197 70 21
@@ -5250,6 +5193,7 @@ Li GSG-SKY13350-385LF
 Sc 502E9714
 AR /501F3B20
 Op 0 0 0
+.SolderPasteRatio -0.04
 T0 0 0 197 118 2700 30 N V 21 N "U5"
 T1 0 0 197 118 2700 30 N I 21 N "SKY13350"
 DC -236 -236 -197 -197 70 21
@@ -5306,8 +5250,71 @@ Po -211 98
 Le 839724792
 $EndPAD
 $EndMODULE  GSG-SKY13350-385LF
+$MODULE GSG-SKY13350-385LF
+Po 26200 13300 900 15 5032C4C2 502E9710 ~~
+Li GSG-SKY13350-385LF
+Sc 502E9710
+AR /501EF778
+Op 0 0 0
+.SolderPasteRatio -0.04
+T0 0 0 197 118 900 30 N V 21 N "U1"
+T1 0 0 197 118 900 30 N I 21 N "SKY13350"
+DC -236 -236 -197 -197 70 21
+DS 197 197 -197 197 70 21
+DS -197 197 -197 -197 70 21
+DS -197 -197 197 -197 70 21
+DS 197 -197 197 197 70 21
+$PAD
+Sh "1" R 169 60 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 3 "/!MIX_BYPASS"
+Po -211 -98
+Le 41110432
+$EndPAD
+$PAD
+Sh "3" R 79 240 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 30 "GND"
+Po 0 177
+Le 41110432
+$EndPAD
+$PAD
+Sh "4" R 169 60 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 44 "N-000018"
+Po 211 98
+Le 20
+$EndPAD
+$PAD
+Sh "5" R 169 60 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 15 "/MIX_BYPASS"
+Po 211 -98
+Le 4149
+$EndPAD
+$PAD
+Sh "6" R 79 240 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 46 "N-000020"
+Po 0 -177
+Le 41110432
+$EndPAD
+$PAD
+Sh "2" R 169 60 0 0 900
+Dr 0 0 0
+At SMD N 00888000
+Ne 45 "N-000019"
+Po -211 98
+Le 839724792
+$EndPAD
+$EndMODULE  GSG-SKY13350-385LF
 $MODULE GSG-SKY13317-373LF
-Po 37200 17000 2700 15 5032BC7D 502E971B ~~
+Po 37200 17000 2700 15 5032C63B 502E971B ~~
 Li GSG-SKY13317-373LF
 Sc 502E971B
 AR /502B5704
@@ -5422,7 +5429,7 @@ $EndPAD
 $PAD
 Sh "0" R 28 56 0 0 2250
 Dr 0 0 0
-At SMD N 00888000
+At SMD N 00808000
 Ne 30 "GND"
 Po -108 -207
 Le 343506792
@@ -5437,7 +5444,7 @@ Le 343506680
 $EndPAD
 $EndMODULE  GSG-SKY13317-373LF
 $MODULE GSG-SKY13317-373LF
-Po 38800 17200 0 15 5032BC7D 502E971D ~~
+Po 38800 17200 0 15 5032C63B 502E971D ~~
 Li GSG-SKY13317-373LF
 Sc 502E971D
 AR /502C6BDF
@@ -5552,7 +5559,7 @@ $EndPAD
 $PAD
 Sh "0" R 28 56 0 0 -450
 Dr 0 0 0
-At SMD N 00888000
+At SMD N 00808000
 Ne 30 "GND"
 Po -108 -207
 Le 343506792
@@ -5567,7 +5574,7 @@ Le 343506680
 $EndPAD
 $EndMODULE  GSG-SKY13317-373LF
 $MODULE GSG-SKY13317-373LF
-Po 41900 17200 2700 15 5032BC7D 502E971F ~~
+Po 41900 17200 2700 15 5032C63B 502E971F ~~
 Li GSG-SKY13317-373LF
 Sc 502E971F
 AR /502C6BE2
@@ -5682,7 +5689,7 @@ $EndPAD
 $PAD
 Sh "0" R 28 56 0 0 2250
 Dr 0 0 0
-At SMD N 00888000
+At SMD N 00808000
 Ne 30 "GND"
 Po -108 -207
 Le 343506792