diff --git a/atusb/atrf.sch b/atusb/atrf.sch
index f3a6dac..e3757cd 100644
--- a/atusb/atrf.sch
+++ b/atusb/atrf.sch
@@ -1,13 +1,14 @@
 EESchema Schematic File Version 2
 LIBS:power
-LIBS:device
-LIBS:conn
+LIBS:r
+LIBS:c
 LIBS:at86rf231
 LIBS:atmega8u2
 LIBS:usb_a_plug
 LIBS:xtal-4
 LIBS:antenna
 LIBS:balun-smt6
+LIBS:conn
 LIBS:atusb-cache
 EELAYER 25 0
 EELAYER END
@@ -225,6 +226,8 @@ $Comp
 L C C17
 U 1 1 4D425FF1
 P 10200 6150
+AR Path="/4D425FF1" Ref="C17"  Part="1" 
+AR Path="/4C609C08/4D425FF1" Ref="C17"  Part="1" 
 F 0 "C17" H 10250 6250 50  0000 L CNN
 F 1 "2.2pF" H 10250 6050 50  0000 L CNN
 F 2 "0402" H 10200 6150 60  0001 C CNN
@@ -236,6 +239,8 @@ $Comp
 L R R6
 U 1 1 4D425FEE
 P 10200 5300
+AR Path="/4D425FEE" Ref="R6"  Part="1" 
+AR Path="/4C609C08/4D425FEE" Ref="R6"  Part="1" 
 F 0 "R6" V 10280 5300 50  0000 C CNN
 F 1 "180" V 10200 5300 50  0000 C CNN
 F 2 "0402" H 10200 5300 60  0001 C CNN
@@ -258,6 +263,8 @@ $Comp
 L C C16
 U 1 1 4D3B018B
 P 2500 4200
+AR Path="/4D3B018B" Ref="C16"  Part="1" 
+AR Path="/4C609C08/4D3B018B" Ref="C16"  Part="1" 
 F 0 "C16" H 2550 4300 50  0000 L CNN
 F 1 "NC" H 2550 4100 50  0000 L CNN
 F 2 "0402" H 2500 4200 60  0001 C CNN
@@ -326,6 +333,8 @@ $Comp
 L R R3
 U 1 1 4CF4B07E
 P 2050 3800
+AR Path="/4CF4B07E" Ref="R3"  Part="1" 
+AR Path="/4C609C08/4CF4B07E" Ref="R3"  Part="1" 
 F 0 "R3" V 2130 3800 50  0000 C CNN
 F 1 "0R" V 2050 3800 50  0000 C CNN
 F 2 "0402" H 2050 3800 60  0001 C CNN
@@ -398,6 +407,8 @@ $Comp
 L C C3
 U 1 1 4C641710
 P 4350 4600
+AR Path="/4C641710" Ref="C3"  Part="1" 
+AR Path="/4C609C08/4C641710" Ref="C3"  Part="1" 
 F 0 "C3" H 4400 4700 50  0000 L CNN
 F 1 "22pF/RF" H 4400 4500 50  0000 L CNN
 F 2 "0402" H 4350 4600 60  0001 C CNN
@@ -409,6 +420,8 @@ $Comp
 L C C9
 U 1 1 4C641509
 P 4750 4200
+AR Path="/4C641509" Ref="C9"  Part="1" 
+AR Path="/4C609C08/4C641509" Ref="C9"  Part="1" 
 F 0 "C9" H 4800 4300 50  0000 L CNN
 F 1 "22pF/RF" H 4800 4100 50  0000 L CNN
 F 2 "0402" H 4750 4200 60  0001 C CNN
@@ -420,6 +433,8 @@ $Comp
 L C C8
 U 1 1 4C641506
 P 4750 3800
+AR Path="/4C641506" Ref="C8"  Part="1" 
+AR Path="/4C609C08/4C641506" Ref="C8"  Part="1" 
 F 0 "C8" H 4800 3900 50  0000 L CNN
 F 1 "22pF/RF" H 4800 3700 50  0000 L CNN
 F 2 "0402" H 4750 3800 60  0001 C CNN
@@ -502,6 +517,8 @@ $Comp
 L C C11
 U 1 1 4C641004
 P 7950 2250
+AR Path="/4C641004" Ref="C11"  Part="1" 
+AR Path="/4C609C08/4C641004" Ref="C11"  Part="1" 
 F 0 "C11" H 8000 2350 50  0000 L CNN
 F 1 "1uF" H 8000 2150 50  0000 L CNN
 F 2 "0402" H 7950 2250 60  0001 C CNN
@@ -612,6 +629,8 @@ $Comp
 L C C12
 U 1 1 4C640A84
 P 8100 6550
+AR Path="/4C640A84" Ref="C12"  Part="1" 
+AR Path="/4C609C08/4C640A84" Ref="C12"  Part="1" 
 F 0 "C12" H 8150 6650 50  0000 L CNN
 F 1 "1uF" H 8150 6450 50  0000 L CNN
 F 2 "0402" H 8100 6550 60  0001 C CNN
@@ -623,6 +642,8 @@ $Comp
 L C C10
 U 1 1 4C640A7E
 P 8400 6550
+AR Path="/4C640A7E" Ref="C10"  Part="1" 
+AR Path="/4C609C08/4C640A7E" Ref="C10"  Part="1" 
 F 0 "C10" H 8450 6650 50  0000 L CNN
 F 1 "1uF" H 8450 6450 50  0000 L CNN
 F 2 "0402" H 8400 6550 60  0001 C CNN
@@ -634,6 +655,8 @@ $Comp
 L C C15
 U 1 1 4C640A7B
 P 10100 2450
+AR Path="/4C640A7B" Ref="C15"  Part="1" 
+AR Path="/4C609C08/4C640A7B" Ref="C15"  Part="1" 
 F 0 "C15" H 10150 2550 50  0000 L CNN
 F 1 "12pF" H 10150 2350 50  0000 L CNN
 F 2 "0402" H 10100 2450 60  0001 C CNN
@@ -645,6 +668,8 @@ $Comp
 L C C13
 U 1 1 4C640A76
 P 7600 1650
+AR Path="/4C640A76" Ref="C13"  Part="1" 
+AR Path="/4C609C08/4C640A76" Ref="C13"  Part="1" 
 F 0 "C13" H 7650 1750 50  0000 L CNN
 F 1 "1uF" H 7650 1550 50  0000 L CNN
 F 2 "0402" H 7600 1650 60  0001 C CNN
@@ -656,6 +681,8 @@ $Comp
 L C C14
 U 1 1 4C640A73
 P 10100 1150
+AR Path="/4C640A73" Ref="C14"  Part="1" 
+AR Path="/4C609C08/4C640A73" Ref="C14"  Part="1" 
 F 0 "C14" H 10150 1250 50  0000 L CNN
 F 1 "12pF" H 10150 1050 50  0000 L CNN
 F 2 "0402" H 10100 1150 60  0001 C CNN
diff --git a/atusb/atusb.pro b/atusb/atusb.pro
index d9567f1..3ac6826 100644
--- a/atusb/atusb.pro
+++ b/atusb/atusb.pro
@@ -40,14 +40,15 @@ PrintMonochrome=1
 ShowSheetReferenceAndTitleBlock=1
 [eeschema/libraries]
 LibName1=power
-LibName2=device
-LibName3=conn
+LibName2=../../kicad-libs/components/r
+LibName3=../../kicad-libs/components/c
 LibName4=../components/at86rf231
 LibName5=../../kicad-libs/components/atmega8u2
 LibName6=../../kicad-libs/components/usb_a_plug
 LibName7=../components/xtal-4
 LibName8=../components/antenna
 LibName9=../components/balun-smt6
+LibName10=conn
 [pcbnew]
 version=1
 PadDrlX=320
diff --git a/atusb/atusb.sch b/atusb/atusb.sch
index e528d67..84125e1 100644
--- a/atusb/atusb.sch
+++ b/atusb/atusb.sch
@@ -1,13 +1,14 @@
 EESchema Schematic File Version 2
 LIBS:power
-LIBS:device
-LIBS:conn
+LIBS:r
+LIBS:c
 LIBS:at86rf231
 LIBS:atmega8u2
 LIBS:usb_a_plug
 LIBS:xtal-4
 LIBS:antenna
 LIBS:balun-smt6
+LIBS:conn
 LIBS:atusb-cache
 EELAYER 25 0
 EELAYER END
diff --git a/atusb/usb.sch b/atusb/usb.sch
index fea54db..db797df 100644
--- a/atusb/usb.sch
+++ b/atusb/usb.sch
@@ -1,13 +1,14 @@
 EESchema Schematic File Version 2
 LIBS:power
-LIBS:device
-LIBS:conn
+LIBS:r
+LIBS:c
 LIBS:at86rf231
 LIBS:atmega8u2
 LIBS:usb_a_plug
 LIBS:xtal-4
 LIBS:antenna
 LIBS:balun-smt6
+LIBS:conn
 LIBS:atusb-cache
 EELAYER 25 0
 EELAYER END
@@ -229,6 +230,8 @@ $Comp
 L R R5
 U 1 1 4D4258DC
 P 4900 4500
+AR Path="/4D4258DC" Ref="R5"  Part="1" 
+AR Path="/4C609BEF/4D4258DC" Ref="R5"  Part="1" 
 F 0 "R5" V 4980 4500 50  0000 C CNN
 F 1 "22" V 4900 4500 50  0000 C CNN
 F 2 "0402" H 4900 4500 60  0001 C CNN
@@ -240,6 +243,8 @@ $Comp
 L R R4
 U 1 1 4D4258D9
 P 4900 4350
+AR Path="/4D4258D9" Ref="R4"  Part="1" 
+AR Path="/4C609BEF/4D4258D9" Ref="R4"  Part="1" 
 F 0 "R4" V 4980 4350 50  0000 C CNN
 F 1 "22" V 4900 4350 50  0000 C CNN
 F 2 "0402" H 4900 4350 60  0001 C CNN
@@ -452,6 +457,8 @@ $Comp
 L R R1
 U 1 1 4C6402F2
 P 6400 2400
+AR Path="/4C6402F2" Ref="R1"  Part="1" 
+AR Path="/4C609BEF/4C6402F2" Ref="R1"  Part="1" 
 F 0 "R1" V 6480 2400 50  0000 C CNN
 F 1 "180" V 6400 2400 50  0000 C CNN
 F 2 "0402" H 6400 2400 60  0001 C CNN
@@ -528,6 +535,8 @@ $Comp
 L C C2
 U 1 1 4C6401B3
 P 5700 6000
+AR Path="/4C6401B3" Ref="C2"  Part="1" 
+AR Path="/4C609BEF/4C6401B3" Ref="C2"  Part="1" 
 F 0 "C2" H 5750 6100 50  0000 L CNN
 F 1 "1uF" H 5750 5900 50  0000 L CNN
 F 2 "0402" H 5700 6000 60  0001 C CNN
@@ -539,6 +548,8 @@ $Comp
 L C C1
 U 1 1 4C6401AA
 P 5050 6000
+AR Path="/4C6401AA" Ref="C1"  Part="1" 
+AR Path="/4C609BEF/4C6401AA" Ref="C1"  Part="1" 
 F 0 "C1" H 5100 6100 50  0000 L CNN
 F 1 "10uF" H 5100 5900 50  0000 L CNN
 F 2 "0603" H 5050 6000 60  0001 C CNN