diff --git a/atusb/atrf.sch b/atusb/atrf.sch
index d24f481..1c4a449 100644
--- a/atusb/atrf.sch
+++ b/atusb/atrf.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
+LIBS:pwr
 LIBS:r
 LIBS:c
 LIBS:at86rf231
@@ -9,9 +9,10 @@ LIBS:xtal-4
 LIBS:antenna
 LIBS:balun-smt6
 LIBS:testpoint
-LIBS:pwr
+LIBS:varistor
+LIBS:powered
 LIBS:atusb-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -298,17 +299,6 @@ $EndComp
 Text Label 2850 3800 0    60   ~ 0
 FEED
 $Comp
-L PWR_FLAG #FLG022
-U 1 1 4CF4B348
-P 4350 3600
-F 0 "#FLG022" H 4350 3870 30  0001 C CNN
-F 1 "PWR_FLAG" H 4350 3830 30  0000 C CNN
-F 2 "" H 4350 3600 60  0001 C CNN
-F 3 "" H 4350 3600 60  0001 C CNN
-	1    4350 3600
-	1    0    0    -1  
-$EndComp
-$Comp
 L AGND #PWR023
 U 1 1 4CF4B229
 P 3150 5000
@@ -716,4 +706,15 @@ F 6 "ESR<=100R" V 9350 2500 60  0000 R CNN "Field3"
 	1    9700 1800
 	0    -1   -1   0   
 $EndComp
+$Comp
+L POWERED #FLG?
+U 1 1 58D30E3D
+P 4350 3400
+F 0 "#FLG?" H 4550 3300 60  0001 C CNN
+F 1 "POWERED" H 4350 3450 60  0000 C CNN
+F 2 "" H 4350 3400 60  0001 C CNN
+F 3 "" H 4350 3400 60  0001 C CNN
+	1    4350 3400
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/atusb/atusb.pro b/atusb/atusb.pro
index b4db902..e2bc1c6 100644
--- a/atusb/atusb.pro
+++ b/atusb/atusb.pro
@@ -49,6 +49,9 @@ LibName7=../components/xtal-4
 LibName8=../components/antenna
 LibName9=../components/balun-smt6
 LibName10=../../kicad-libs/components/testpoint
+LibName11=../../kicad-libs/components/varistor
+LibName12=../../kicad-libs/components/powered
+LibName13=../../kicad-libs/components/led
 [pcbnew]
 version=1
 PadDrlX=320
diff --git a/atusb/atusb.sch b/atusb/atusb.sch
index 7c4402c..23df831 100644
--- a/atusb/atusb.sch
+++ b/atusb/atusb.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
+LIBS:pwr
 LIBS:r
 LIBS:c
 LIBS:at86rf231
@@ -9,9 +9,10 @@ LIBS:xtal-4
 LIBS:antenna
 LIBS:balun-smt6
 LIBS:testpoint
-LIBS:pwr
+LIBS:varistor
+LIBS:powered
 LIBS:atusb-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -58,17 +59,6 @@ F8 "MISO" I R 4350 4000 60
 F9 "CLK" I R 4350 5050 60 
 $EndSheet
 $Comp
-L PWR_FLAG #FLG01
-U 1 1 4C641B9C
-P 10000 6100
-F 0 "#FLG01" H 10000 6370 30  0001 C CNN
-F 1 "PWR_FLAG" H 10000 6330 30  0000 C CNN
-F 2 "" H 10000 6100 60  0001 C CNN
-F 3 "" H 10000 6100 60  0001 C CNN
-	1    10000 6100
-	1    0    0    -1  
-$EndComp
-$Comp
 L GND #PWR02
 U 1 1 4C641B91
 P 10000 6300
@@ -95,4 +85,15 @@ F7 "nSS" I L 7350 4300 60
 F8 "IRQ_RF" O L 7350 4500 60 
 F9 "CLK" O L 7350 5050 60 
 $EndSheet
+$Comp
+L POWERED #FLG?
+U 1 1 58D3121F
+P 10000 5900
+F 0 "#FLG?" H 10200 5800 60  0001 C CNN
+F 1 "POWERED" H 10000 5950 60  0000 C CNN
+F 2 "" H 10000 5900 60  0001 C CNN
+F 3 "" H 10000 5900 60  0001 C CNN
+	1    10000 5900
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/atusb/usb.sch b/atusb/usb.sch
index 2fdab40..c27cb56 100644
--- a/atusb/usb.sch
+++ b/atusb/usb.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
+LIBS:pwr
 LIBS:r
 LIBS:c
 LIBS:at86rf231
@@ -9,9 +9,11 @@ LIBS:xtal-4
 LIBS:antenna
 LIBS:balun-smt6
 LIBS:testpoint
-LIBS:pwr
+LIBS:varistor
+LIBS:powered
+LIBS:led
 LIBS:atusb-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -31,7 +33,7 @@ Wire Wire Line
 	7800 2250 7800 2600
 Connection ~ 4000 4200
 Wire Wire Line
-	4000 5350 4000 4000
+	4000 4000 4000 5450
 Wire Wire Line
 	10400 6450 7500 6450
 Wire Wire Line
@@ -58,7 +60,7 @@ Wire Wire Line
 	6150 4200 6350 4200
 Connection ~ 4000 4650
 Wire Wire Line
-	6350 4650 4000 4650
+	4000 4650 6350 4650
 Wire Wire Line
 	5150 4350 6350 4350
 Wire Wire Line
@@ -76,23 +78,23 @@ Wire Wire Line
 Wire Wire Line
 	4300 4350 4450 4500
 Wire Wire Line
-	3500 5850 3500 6050
+	3500 5750 3500 6050
 Wire Wire Line
 	4000 4200 2350 4200
 Connection ~ 3000 4500
 Wire Wire Line
-	3000 5350 3000 4500
+	3000 5450 3000 4500
 Wire Wire Line
 	5050 6200 5050 6400
 Connection ~ 5700 4800
 Wire Wire Line
 	5700 4800 6350 4800
 Wire Wire Line
-	4300 4350 2350 4350
+	2350 4350 4300 4350
 Wire Wire Line
 	2550 4650 2550 4850
 Wire Wire Line
-	1000 4850 1000 4200
+	1000 4200 1000 4850
 Connection ~ 1000 4650
 Wire Wire Line
 	1200 4650 1000 4650
@@ -101,12 +103,12 @@ Wire Wire Line
 Wire Wire Line
 	5700 6200 5700 6400
 Wire Wire Line
-	3500 5350 3500 4350
+	3500 5450 3500 4350
 Connection ~ 3500 4350
 Wire Wire Line
-	3000 5850 3000 6050
+	3000 5750 3000 6050
 Wire Wire Line
-	4000 5850 4000 6050
+	4000 5750 4000 6050
 Wire Wire Line
 	6150 2400 5950 2400
 Wire Wire Line
@@ -161,17 +163,6 @@ Text Label 5350 4350 0    60   ~ 0
 DP
 Text Label 2550 4200 0    60   ~ 0
 VBUS
-$Comp
-L PWR_FLAG #FLG03
-U 1 1 4D426152
-P 4000 4000
-F 0 "#FLG03" H 4000 4270 30  0001 C CNN
-F 1 "PWR_FLAG" H 4000 4230 30  0000 C CNN
-F 2 "" H 4000 4000 60  0001 C CNN
-F 3 "" H 4000 4000 60  0001 C CNN
-	1    4000 4000
-	1    0    0    -1  
-$EndComp
 Text Label 7500 1850 1    60   ~ 0
 nRESET
 Text Label 10100 1850 1    60   ~ 0
@@ -419,10 +410,10 @@ nRST_RF
 Text HLabel 10400 2400 2    60   Output ~ 0
 SLP_TR
 $Comp
-L VR VR3
+L VARISTOR VR3
 U 1 1 4C64034D
 P 4000 5600
-F 0 "VR3" V 4080 5600 50  0000 C CNN
+F 0 "VR3" H 4100 5700 50  0000 C CNN
 F 1 "5.5Vdc" H 3800 5650 50  0000 C CNN
 F 2 "stdpass:0402" H 4000 5600 60  0001 C CNN
 F 3 "" H 4000 5600 60  0001 C CNN
@@ -431,10 +422,10 @@ F 4 "33pF" H 3800 5550 50  0000 C CNN "Field4"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L VR VR2
+L VARISTOR VR2
 U 1 1 4C640343
 P 3500 5600
-F 0 "VR2" V 3580 5600 50  0000 C CNN
+F 0 "VR2" H 3600 5700 50  0000 C CNN
 F 1 "5.5Vdc" H 3300 5650 50  0000 C CNN
 F 2 "stdpass:0402" H 3500 5600 60  0001 C CNN
 F 3 "" H 3500 5600 60  0001 C CNN
@@ -443,10 +434,10 @@ F 4 "33pF" H 3300 5550 50  0000 C CNN "Field4"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L VR VR1
+L VARISTOR VR1
 U 1 1 4C6402FB
 P 3000 5600
-F 0 "VR1" V 3080 5600 50  0000 C CNN
+F 0 "VR1" H 3100 5700 50  0000 C CNN
 F 1 "5.5Vdc" H 2800 5650 50  0000 C CNN
 F 2 "stdpass:0402" H 3000 5600 60  0001 C CNN
 F 3 "" H 3000 5600 60  0001 C CNN
@@ -472,7 +463,7 @@ L LED D1
 U 1 1 4C6402EE
 P 5750 2400
 F 0 "D1" H 5750 2500 50  0000 C CNN
-F 1 "LTST-C190KRKT" H 5750 2300 50  0000 C CNN
+F 1 "LTST-C190KRKT" H 5750 2250 50  0000 C CNN
 F 2 "stdpass:0603" H 5750 2400 60  0001 C CNN
 F 3 "" H 5750 2400 60  0001 C CNN
 	1    5750 2400
@@ -580,4 +571,15 @@ F 3 "" H 7950 4200 60  0001 C CNN
 	1    7950 4200
 	0    -1   -1   0   
 $EndComp
+$Comp
+L POWERED #FLG?
+U 1 1 58D30BE8
+P 4000 3800
+F 0 "#FLG?" H 4200 3700 60  0001 C CNN
+F 1 "POWERED" H 4000 3850 60  0000 C CNN
+F 2 "" H 4000 3800 60  0001 C CNN
+F 3 "" H 4000 3800 60  0001 C CNN
+	1    4000 3800
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC