diff --git a/gerber/lipoguard-Edge.Cuts.gko b/gerber/lipoguard-Edge.Cuts.gko
deleted file mode 100644
index 32d25e4..0000000
--- a/gerber/lipoguard-Edge.Cuts.gko
+++ /dev/null
@@ -1,22 +0,0 @@
-G04 #@! TF.FileFunction,Profile,NP*
-%FSLAX46Y46*%
-G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.4-stable) date Thu Oct  6 13:32:55 2016*
-%MOMM*%
-%LPD*%
-G01*
-G04 APERTURE LIST*
-%ADD10C,0.100000*%
-%ADD11C,0.150000*%
-G04 APERTURE END LIST*
-D10*
-D11*
-X166370000Y-64770000D02*
-X127000000Y-64770000D01*
-X127000000Y-84455000D02*
-X166370000Y-84455000D01*
-X127000000Y-64770000D02*
-X127000000Y-84455000D01*
-X166370000Y-64770000D02*
-X166370000Y-84455000D01*
-M02*
diff --git a/lipoguard-cache.lib b/lipoguard-cache.lib
index 05e8bd7..369bf48 100644
--- a/lipoguard-cache.lib
+++ b/lipoguard-cache.lib
@@ -21,20 +21,22 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 0 100 40 H V L CNN
-F1 "C" 6 -85 40 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
- SM*
  C?
- C1-1
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
 $ENDFPLIST
 DRAW
 P 2 0 1 20 -80 -30 80 -30 N
 P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 200 170 D 40 40 1 1 P
-X ~ 2 0 -200 170 U 40 40 1 1 P
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -54,14 +56,14 @@ ENDDEF
 #
 # GND
 #
-DEF ~GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 0 30 H I C CNN
-F1 "GND" 0 -70 30 H I C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
-P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
-X GND 1 0 0 0 U 30 30 1 1 W N
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
@@ -70,24 +72,19 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
+ LED-*
+ LED_*
 $ENDFPLIST
 DRAW
-P 2 0 1 0 50 50 50 -50 N
-P 3 0 1 0 -50 50 50 0 -50 -50 F
-P 3 0 1 0 65 -40 110 -80 105 -55 N
-P 3 0 1 0 80 -25 125 -65 120 -40 N
-X A 1 -200 0 150 R 40 40 1 1 P
-X K 2 200 0 150 L 40 40 1 1 P
+P 2 0 1 0 -50 50 -50 -50 N
+P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
+P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+X K 1 -200 0 150 R 40 40 1 1 P
+X A 2 200 0 150 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -114,51 +111,48 @@ ENDDEF
 # POT
 #
 DEF POT RV 0 40 Y N 1 F N
-F0 "RV" 0 -100 50 H V C CNN
+F0 "RV" 0 -80 50 H V C CNN
 F1 "POT" 0 0 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
-S -150 50 150 -50 0 1 0 N
-P 3 0 1 0 0 50 -20 70 20 70 F
-X 1 1 -250 0 100 R 40 40 1 1 P
-X 2 2 0 150 80 D 40 40 1 1 P
-X 3 3 250 0 100 L 40 40 1 1 P
+S -100 40 100 -40 0 1 0 N
+P 3 0 1 0 0 40 -20 60 20 60 F
+X 1 1 -150 0 50 R 40 40 1 1 P
+X 2 2 0 150 100 D 40 40 1 1 P
+X 3 3 150 0 50 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 40 V V C CNN
-F1 "R" 7 1 40 V V C CNN
-F2 "" -70 0 30 V V C CNN
-F3 "" 0 0 30 H V C CNN
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
- R?
- SM0603
- SM0805
- R?-*
- SM1206
+ R_*
+ Resistor_*
 $ENDFPLIST
 DRAW
-S -40 150 40 -150 0 1 12 N
-X ~ 1 0 250 100 D 60 60 1 1 P
-X ~ 2 0 -250 100 U 60 60 1 1 P
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
 # VCC
 #
 DEF VCC #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 100 30 H I C CNN
-F1 "VCC" 0 100 30 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VCC" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
-X VCC 1 0 0 0 U 20 20 0 0 W N
-C 0 50 20 0 1 0 N
-P 3 0 1 0 0 0 0 30 0 30 N
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VCC 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
diff --git a/lipoguard.pro b/lipoguard.pro
index 615dc6a..5085378 100644
--- a/lipoguard.pro
+++ b/lipoguard.pro
@@ -1,4 +1,4 @@
-update=Mon 03 Oct 2016 04:08:44 PM CEST
+update=Mon 07 Nov 2016 01:30:33 PM CET
 version=1
 last_client=kicad
 [pcbnew]
@@ -25,40 +25,6 @@ version=1
 NetIExt=net
 [general]
 version=1
-[eeschema]
-version=1
-LibDir=lib
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=lib/bts6143
 [schematic_editor]
 version=1
 PageLayoutDescrFile=
@@ -70,3 +36,38 @@ SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
 ERC_TestSimilarLabels=1
+[eeschema]
+version=1
+LibDir=lib
+[eeschema/libraries]
+LibName1=lipoguard-rescue
+LibName2=power
+LibName3=device
+LibName4=transistors
+LibName5=conn
+LibName6=linear
+LibName7=regul
+LibName8=74xx
+LibName9=cmos4000
+LibName10=adc-dac
+LibName11=memory
+LibName12=xilinx
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
+LibName31=lib/bts6143
diff --git a/lipoguard.sch b/lipoguard.sch
index 3ecbb20..1f7d6a0 100644
--- a/lipoguard.sch
+++ b/lipoguard.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:lipoguard-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -71,20 +72,12 @@ L R R3
 U 1 1 57E2E0BA
 P 5900 4450
 F 0 "R3" H 5971 4489 40  0000 L CNN
-F 1 "R" H 5971 4411 40  0000 L CNN
+F 1 "1k" H 5971 4411 40  0000 L CNN
 F 2 "libcms:SM0603" V 5830 4450 30  0001 C CNN
 F 3 "" H 5900 4450 30  0000 C CNN
 	1    5900 4450
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5900 4050 5900 4200
-Wire Wire Line
-	5900 5350 5900 4700
-Wire Wire Line
-	4700 3650 4600 3650
-Wire Wire Line
-	4600 3650 4600 2450
 $Comp
 L VCC #PWR02
 U 1 1 57E2E14D
@@ -107,16 +100,6 @@ F 3 "" H 3250 4150 60  0000 C CNN
 	1    3250 4150
 	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	4700 3950 4600 3950
-Wire Wire Line
-	4600 3950 4600 4200
-Wire Wire Line
-	3600 4050 4700 4050
-Wire Wire Line
-	3600 4250 3850 4250
-Wire Wire Line
-	3850 4250 3850 5350
 $Comp
 L GND #PWR03
 U 1 1 57E2E353
@@ -128,13 +111,12 @@ F 3 "" H 3850 5350 60  0000 C CNN
 	1    3850 5350
 	1    0    0    -1  
 $EndComp
-Connection ~ 4600 4050
 $Comp
 L R R2
 U 1 1 57E2E5E3
 P 4600 4450
 F 0 "R2" H 4671 4489 40  0000 L CNN
-F 1 "R" H 4671 4411 40  0000 L CNN
+F 1 "1k" H 4671 4411 40  0000 L CNN
 F 2 "libcms:SM0603" V 4530 4450 30  0001 C CNN
 F 3 "" H 4600 4450 30  0000 C CNN
 	1    4600 4450
@@ -151,8 +133,6 @@ F 3 "" H 4600 5000 60  0000 C CNN
 	1    4600 5000
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	4600 4700 4600 4800
 $Comp
 L GND #PWR04
 U 1 1 57E2E82E
@@ -164,8 +144,6 @@ F 3 "" H 4600 5350 60  0000 C CNN
 	1    4600 5350
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4600 5350 4600 5200
 $Comp
 L VCC #PWR05
 U 1 1 57E2F4D3
@@ -182,7 +160,7 @@ L R R1
 U 1 1 57E2F4FB
 P 4050 2800
 F 0 "R1" H 4121 2839 40  0000 L CNN
-F 1 "R" H 4121 2761 40  0000 L CNN
+F 1 "1k" H 4121 2761 40  0000 L CNN
 F 2 "libcms:SM0603" V 3980 2800 30  0001 C CNN
 F 3 "" H 4050 2800 30  0000 C CNN
 	1    4050 2800
@@ -210,12 +188,6 @@ F 3 "" H 4050 3650 60  0000 C CNN
 	1    4050 3650
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4050 2450 4050 2550
-Wire Wire Line
-	4050 3050 4050 3150
-Wire Wire Line
-	4050 3650 4050 3550
 $Comp
 L CONN_2 P1
 U 1 1 57E30469
@@ -227,14 +199,6 @@ F 3 "" H 3250 3050 60  0000 C CNN
 	1    3250 3050
 	-1   0    0    -1  
 $EndComp
-Wire Wire Line
-	3600 2950 3650 2950
-Wire Wire Line
-	3650 2950 3650 2450
-Wire Wire Line
-	3600 3150 3650 3150
-Wire Wire Line
-	3650 3150 3650 3650
 $Comp
 L GND #PWR07
 U 1 1 57E30655
@@ -268,12 +232,6 @@ F 3 "" H 6700 3900 60  0000 C CNN
 	1    6700 3900
 	-1   0    0    -1  
 $EndComp
-Wire Wire Line
-	6600 3650 6600 3700
-Wire Wire Line
-	5900 3650 6600 3650
-Wire Wire Line
-	6600 4100 6600 5350
 $Comp
 L GND #PWR09
 U 1 1 57F26963
@@ -296,12 +254,6 @@ F 3 "" H 7250 3900 30  0000 C CNN
 	1    7250 3900
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	6900 3900 7000 3900
-Wire Wire Line
-	7500 3900 8050 3900
-Wire Wire Line
-	8200 4150 8200 5350
 $Comp
 L GND #PWR010
 U 1 1 57F26B56
@@ -335,11 +287,6 @@ F 3 "" H 7750 4450 60  0000 C CNN
 	1    7750 4450
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7750 4250 7750 3900
-Connection ~ 7750 3900
-Wire Wire Line
-	7750 4650 7750 5350
 $Comp
 L GND #PWR012
 U 1 1 57F3D38A
@@ -373,10 +320,64 @@ F 3 "" H 8200 3100 30  0000 C CNN
 	1    8200 3100
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	8200 3650 8200 3350
-Wire Wire Line
-	8200 2850 8200 2450
 Text Notes 8400 3250 0    60   ~ 0
 Use:\n10k for LiPo/Li-Ion\n4.7K for Lead\n0 for Nimh
+Wire Wire Line
+	5900 4050 5900 4300
+Wire Wire Line
+	5900 4600 5900 5350
+Wire Wire Line
+	4700 3650 4600 3650
+Wire Wire Line
+	4600 3650 4600 2450
+Wire Wire Line
+	4700 3950 4600 3950
+Wire Wire Line
+	4600 3950 4600 4300
+Wire Wire Line
+	3600 4050 4700 4050
+Wire Wire Line
+	3600 4250 3850 4250
+Wire Wire Line
+	3850 4250 3850 5350
+Connection ~ 4600 4050
+Wire Wire Line
+	4600 4600 4600 4800
+Wire Wire Line
+	4600 5350 4600 5200
+Wire Wire Line
+	4050 2450 4050 2650
+Wire Wire Line
+	4050 2950 4050 3150
+Wire Wire Line
+	4050 3650 4050 3550
+Wire Wire Line
+	3600 2950 3650 2950
+Wire Wire Line
+	3650 2950 3650 2450
+Wire Wire Line
+	3600 3150 3650 3150
+Wire Wire Line
+	3650 3150 3650 3650
+Wire Wire Line
+	6600 3650 6600 3700
+Wire Wire Line
+	5900 3650 6600 3650
+Wire Wire Line
+	6600 4100 6600 5350
+Wire Wire Line
+	6900 3900 7100 3900
+Wire Wire Line
+	7400 3900 8050 3900
+Wire Wire Line
+	8200 4050 8200 5350
+Wire Wire Line
+	7750 3900 7750 4300
+Connection ~ 7750 3900
+Wire Wire Line
+	7750 4600 7750 5350
+Wire Wire Line
+	8200 3250 8200 3750
+Wire Wire Line
+	8200 2450 8200 2950
 $EndSCHEMATC
diff --git a/plot/lipoguard.pdf b/plot/lipoguard.pdf
index 08810cb..a2dbe26 100644
Binary files a/plot/lipoguard.pdf and b/plot/lipoguard.pdf differ