diff --git a/main/Qi_AVT2.pro b/main/Qi_AVT2.pro
index b448b20..0eb489c 100644
--- a/main/Qi_AVT2.pro
+++ b/main/Qi_AVT2.pro
@@ -1,9 +1,5 @@
-update=3/7/2009-08:01:45
-last_client=eeschema
-[general]
-version=1
-RootSch=
-BoardNm=
+update=3/7/2009-09:54:07
+last_client=KiCad
 [eeschema]
 version=1
 LibDir=
@@ -98,4 +94,8 @@ LibName57=../components/cpolarized
 LibName58=../components/bl8555-33pra
 LibName59=../components/bl8509-263dnrm
 LibName60=../components/bl8506-30nrm
+[general]
+version=1
+RootSch=
+BoardNm=
 
diff --git a/main/Qi_AVT2.sch b/main/Qi_AVT2.sch
index 6d00e6e..5b2e303 100644
--- a/main/Qi_AVT2.sch
+++ b/main/Qi_AVT2.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm,./Qi_AVT2.cache
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
@@ -13,7 +13,14 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Kmarq B 2200 2700 "Warning: Pin power_out connected to Pin BiDi (net 27)" F=1
+Wire Notes Line
+	1600 4200 1600 1250
+Wire Notes Line
+	1600 4200 6200 4200
+Wire Notes Line
+	6200 4200 6200 1250
+Wire Notes Line
+	6200 1250 1600 1250
 Wire Wire Line
 	6300 8500 4900 8500
 Wire Wire Line
@@ -21,7 +28,7 @@ Wire Wire Line
 Wire Wire Line
 	11500 8250 11500 7550
 Wire Wire Line
-	9600 9300 9600 10100
+	9600 9700 9600 10500
 Wire Wire Line
 	2600 2850 2600 2700
 Connection ~ 2750 3950
@@ -209,21 +216,21 @@ Wire Wire Line
 Wire Wire Line
 	9645 4350 9645 3675
 Wire Wire Line
-	9300 9300 9300 10100
+	9300 9700 9300 10500
 Wire Wire Line
-	9000 9300 9000 10100
+	9000 9700 9000 10500
 Wire Wire Line
-	8700 9300 8700 9800
+	8700 9700 8700 10200
 Wire Wire Line
-	8400 9300 8400 10100
+	8400 9700 8400 10500
 Wire Wire Line
-	8100 9300 8100 10100
+	8100 9700 8100 10500
 Wire Wire Line
-	7800 9300 7800 10100
+	7800 9700 7800 10500
 Wire Wire Line
-	7500 9300 7500 10100
+	7500 9700 7500 10500
 Wire Wire Line
-	7200 9300 7200 10100
+	7200 9700 7200 10500
 Wire Wire Line
 	2850 6950 3200 6950
 Connection ~ 5850 8500
@@ -592,7 +599,20 @@ Wire Wire Line
 Wire Wire Line
 	11100 3650 10800 3650
 Connection ~ 10800 3650
-Text GLabel 8700 9800 1    60   Input
+Wire Notes Line
+	9900 10650 9900 9300
+Wire Notes Line
+	9900 10650 6850 10650
+Wire Notes Line
+	6850 10650 6850 9300
+Wire Notes Line
+	6850 9300 9900 9300
+Text Notes 1800 1150 0    80   ~
+Charge Battery From USB
+Text Notes 7100 9200 0    80   ~
+Test Points For Power
+Kmarq B 2200 2700 "Warning: Pin power_out connected to Pin BiDi (net 27)" F=1
+Text GLabel 8700 10200 1    60   Input
 VBUS
 Text Label 5200 2250 0    30   ~
 VBAT
@@ -618,7 +638,7 @@ F 1 "PWR_FLAG" H 2200 2930 30  0000 C C
 	1    2200 2700
 	1    0    0    -1  
 $EndComp
-Text Label 9600 10100 1    60   ~
+Text Label 9600 10500 1    60   ~
 V18
 Text Notes 12500 1500 0    150  ~
 HIERARCHICAL SHEET
@@ -1316,96 +1336,96 @@ $EndComp
 $Comp
 L TESTPOINT TP10
 U 1 1 4A438B55
-P 9600 9250
-F 0 "TP10" H 9600 9450 60  0000 C C
-F 1 "TESTPOINT" V 9450 9050 60  0000 C C
-	1    9600 9250
+P 9600 9650
+F 0 "TP10" H 9600 9850 60  0000 C C
+F 1 "TESTPOINT" V 9450 9450 60  0000 C C
+	1    9600 9650
 	1    0    0    -1  
 $EndComp
-Text Label 9300 10100 1    60   ~
+Text Label 9300 10500 1    60   ~
 V33
 $Comp
 L TESTPOINT TP9
 U 1 1 4A438B47
-P 9300 9250
-F 0 "TP9" H 9300 9450 60  0000 C C
-F 1 "TESTPOINT" V 9150 9050 60  0000 C C
-	1    9300 9250
+P 9300 9650
+F 0 "TP9" H 9300 9850 60  0000 C C
+F 1 "TESTPOINT" V 9150 9450 60  0000 C C
+	1    9300 9650
 	1    0    0    -1  
 $EndComp
-Text Label 9000 10100 1    60   ~
+Text Label 9000 10500 1    60   ~
 VBAT
 $Comp
 L TESTPOINT TP8
 U 1 1 4A438B46
-P 9000 9250
-F 0 "TP8" H 9000 9450 60  0000 C C
-F 1 "TESTPOINT" V 8850 9050 60  0000 C C
-	1    9000 9250
+P 9000 9650
+F 0 "TP8" H 9000 9850 60  0000 C C
+F 1 "TESTPOINT" V 8850 9450 60  0000 C C
+	1    9000 9650
 	1    0    0    -1  
 $EndComp
 $Comp
 L TESTPOINT TP7
 U 1 1 4A438B45
-P 8700 9250
-F 0 "TP7" H 8700 9450 60  0000 C C
-F 1 "TESTPOINT" V 8550 9050 60  0000 C C
-	1    8700 9250
+P 8700 9650
+F 0 "TP7" H 8700 9850 60  0000 C C
+F 1 "TESTPOINT" V 8550 9450 60  0000 C C
+	1    8700 9650
 	1    0    0    -1  
 $EndComp
-Text Label 8400 10100 1    60   ~
+Text Label 8400 10500 1    60   ~
 RESETP_N
 $Comp
 L TESTPOINT TP6
 U 1 1 4A438B44
-P 8400 9250
-F 0 "TP6" H 8400 9450 60  0000 C C
-F 1 "TESTPOINT" V 8250 9050 60  0000 C C
-	1    8400 9250
+P 8400 9650
+F 0 "TP6" H 8400 9850 60  0000 C C
+F 1 "TESTPOINT" V 8250 9450 60  0000 C C
+	1    8400 9650
 	1    0    0    -1  
 $EndComp
-Text Label 8100 10100 1    60   ~
+Text Label 8100 10500 1    60   ~
 GND
 $Comp
 L TESTPOINT TP76
 U 1 1 4A438B3F
-P 8100 9250
-F 0 "TP76" H 8100 9450 60  0000 C C
-F 1 "TESTPOINT" V 7950 9050 60  0000 C C
-	1    8100 9250
+P 8100 9650
+F 0 "TP76" H 8100 9850 60  0000 C C
+F 1 "TESTPOINT" V 7950 9450 60  0000 C C
+	1    8100 9650
 	1    0    0    -1  
 $EndComp
-Text Label 7800 10100 1    60   ~
+Text Label 7800 10500 1    60   ~
 WAKEUP_N
 $Comp
 L TESTPOINT TP77
 U 1 1 4A438B3E
-P 7800 9250
-F 0 "TP77" H 7800 9450 60  0000 C C
-F 1 "TESTPOINT" V 7650 9050 60  0000 C C
-	1    7800 9250
+P 7800 9650
+F 0 "TP77" H 7800 9850 60  0000 C C
+F 1 "TESTPOINT" V 7650 9450 60  0000 C C
+	1    7800 9650
 	1    0    0    -1  
 $EndComp
-Text Label 7500 10100 1    60   ~
+Text Label 7500 10500 1    60   ~
 SHUTDOWN
 $Comp
 L TESTPOINT TP78
 U 1 1 4A438B33
-P 7500 9250
-F 0 "TP78" H 7500 9450 60  0000 C C
-F 1 "TESTPOINT" V 7350 9050 60  0000 C C
-	1    7500 9250
+P 7500 9650
+F 0 "TP78" H 7500 9850 60  0000 C C
+F 1 "TESTPOINT" V 7350 9450 60  0000 C C
+	1    7500 9650
 	1    0    0    -1  
 $EndComp
-Text Label 7200 10100 1    60   ~
+Text Label 7200 10500 1    60   ~
 CHARGE_N
 $Comp
 L TESTPOINT TP32
 U 1 1 4A438A93
-P 7200 9250
-F 0 "TP32" H 7200 9450 60  0000 C C
-F 1 "TESTPOINT" V 7050 9050 60  0000 C C
-	1    7200 9250
+P 7200 9650
+F 0 "TP32" H 7200 9850 60  0000 C C
+F 1 "TESTPOINT" V 7050 9450 60  0000 C C
+	1    7200 9650
 	1    0    0    -1  
 $EndComp
 $Comp
diff --git a/main/audio.sch b/main/audio.sch
index 7d04445..604a912 100644
--- a/main/audio.sch
+++ b/main/audio.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm,./Qi_AVT2.cache
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/key_matrix.sch b/main/key_matrix.sch
index d03d7e5..4309799 100644
--- a/main/key_matrix.sch
+++ b/main/key_matrix.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm,./Qi_AVT2.cache
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/lcd_usb.sch b/main/lcd_usb.sch
index 2d6b1e1..42eae47 100644
--- a/main/lcd_usb.sch
+++ b/main/lcd_usb.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm,./Qi_AVT2.cache
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/memory.sch b/main/memory.sch
index c0572d8..dc71c01 100644
--- a/main/memory.sch
+++ b/main/memory.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm,./Qi_AVT2.cache
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,../components/bat_con,../components/vrtc,../components/vddhp,../components/vbus,../components/vbato,../components/vbat,../components/v33sd,../components/v33,../components/v18,../components/usb_minib,../components/tm2302n,../components/tm2301n,../components/testpoint,../components/sw_metaldomn,../components/spy0030a,../components/speaker,../components/solderpaste,../components/se9016,../components/sdcw2012,../components/scic,../components/phonejack,../components/p3v56s40etp-g6,../components/ms_1d77,../components/microphone,../components/jz4720_186p,../components/inductorp,../components/hy27ug088g5m,../components/fpccon24,../components/eup3406,../components/cpolarized,../components/bl8555-33pra,../components/bl8509-263dnrm,../components/bl8506-30nrm
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267