diff --git a/demos/simulation/laser_driver/laser_driver.pro b/demos/simulation/laser_driver/laser_driver.pro
index e42812d031..2ee1b82d90 100644
--- a/demos/simulation/laser_driver/laser_driver.pro
+++ b/demos/simulation/laser_driver/laser_driver.pro
@@ -31,31 +31,3 @@ NetIExt=net
 version=1
 [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
diff --git a/demos/simulation/rectifier/rectifier-cache.lib b/demos/simulation/rectifier/rectifier-cache.lib
index ecde26c816..085e80c560 100644
--- a/demos/simulation/rectifier/rectifier-cache.lib
+++ b/demos/simulation/rectifier/rectifier-cache.lib
@@ -6,14 +6,17 @@ EESchema-LIBRARY Version 2.3
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  C?
  C_????_*
  C_????
  SMD*_c
  Capacitor*
+ Capacitors_ThroughHole:C_Radial_D10_L13_P5
+ Capacitors_SMD:C_0805
+ Capacitors_SMD:C_1206
 $ENDFPLIST
 DRAW
 P 2 0 1 20 -80 -30 80 -30 N
@@ -28,8 +31,8 @@ ENDDEF
 DEF D D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "D" 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
  Diode_*
  D-Pak_TO252AA
@@ -48,13 +51,13 @@ ENDDEF
 # GND
 #
 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
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "GND" 0 -123 30 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 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
+X GND 1 0 0 0 D 20 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
@@ -63,24 +66,24 @@ ENDDEF
 DEF R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
 F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 30 V V C CNN
-F3 "" 0 0 30 H V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  R_*
  Resistor_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 60 60 1 1 P
-X ~ 2 0 -150 50 U 60 60 1 1 P
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VSOURCE-RESCUE-rectifier
+# VSOURCE
 #
-DEF ~VSOURCE-RESCUE-rectifier V 0 40 Y Y 1 F N
+DEF ~VSOURCE V 0 40 Y Y 1 F N
 F0 "V" 200 200 50 H V C CNN
-F1 "VSOURCE-RESCUE-rectifier" 250 100 50 H I C CNN
+F1 "VSOURCE" 250 100 50 H I C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 F4 "Value" 0 0 60 H I C CNN "Fieldname"
diff --git a/demos/simulation/rectifier/rectifier.pro b/demos/simulation/rectifier/rectifier.pro
index e1eba2d128..33afc2975f 100644
--- a/demos/simulation/rectifier/rectifier.pro
+++ b/demos/simulation/rectifier/rectifier.pro
@@ -1,6 +1,6 @@
-update=Fri 05 Aug 2016 05:56:48 PM CEST
+update=13/08/2016 16:32:14
 version=1
-last_client=eeschema
+last_client=kicad
 [general]
 version=1
 RootSch=
@@ -29,34 +29,4 @@ version=1
 NetIExt=net
 [eeschema]
 version=1
-[eeschema/libraries]
-LibName1=rectifier-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
+LibDir=
diff --git a/demos/simulation/rectifier/rectifier.sch b/demos/simulation/rectifier/rectifier.sch
index 8c69e5b5b6..29e32039a2 100644
--- a/demos/simulation/rectifier/rectifier.sch
+++ b/demos/simulation/rectifier/rectifier.sch
@@ -1,34 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:rectifier-rescue
 LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
 LIBS:rectifier-cache
 EELAYER 25 0
 EELAYER END
@@ -45,13 +16,16 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VSOURCE-RESCUE-rectifier V1
+L VSOURCE V1
 U 1 1 57336052
 P 4400 4050
 F 0 "V1" H 4528 4096 50  0000 L CNN
 F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
 F 2 "" H 4400 4050 50  0000 C CNN
 F 3 "" H 4400 4050 50  0000 C CNN
+F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
+F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
 	1    4400 4050
 	-1   0    0    1   
 $EndComp
@@ -74,6 +48,9 @@ F 0 "R1" V 4443 3700 50  0000 C CNN
 F 1 "1k" V 4534 3700 50  0000 C CNN
 F 2 "" V 4580 3700 50  0000 C CNN
 F 3 "" H 4650 3700 50  0000 C CNN
+F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
 	1    4650 3700
 	0    1    1    0   
 $EndComp
@@ -85,6 +62,9 @@ F 0 "D1" H 5100 3485 50  0000 C CNN
 F 1 "1N4148" H 5100 3576 50  0000 C CNN
 F 2 "" H 5100 3700 50  0000 C CNN
 F 3 "" H 5100 3700 50  0000 C CNN
+F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
+F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
+F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
 	1    5100 3700
 	-1   0    0    1   
 $EndComp
@@ -96,6 +76,9 @@ F 0 "C1" H 5515 4046 50  0000 L CNN
 F 1 "100n" H 5515 3955 50  0000 L CNN
 F 2 "" H 5438 3850 50  0000 C CNN
 F 3 "" H 5400 4000 50  0000 C CNN
+F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
 	1    5400 4000
 	1    0    0    -1  
 $EndComp
@@ -107,6 +90,9 @@ F 0 "R2" H 5680 3954 50  0000 R CNN
 F 1 "100k" H 5680 4045 50  0000 R CNN
 F 2 "" V 5680 4000 50  0000 C CNN
 F 3 "" H 5750 4000 50  0000 C CNN
+F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
 	1    5750 4000
 	-1   0    0    1   
 $EndComp
diff --git a/demos/simulation/sallen_key/sallen_key.pro b/demos/simulation/sallen_key/sallen_key.pro
index 367e9de187..4e4f13b03b 100644
--- a/demos/simulation/sallen_key/sallen_key.pro
+++ b/demos/simulation/sallen_key/sallen_key.pro
@@ -41,33 +41,4 @@ ERC_TestSimilarLabels=1
 [eeschema]
 version=1
 [eeschema/libraries]
-LibName1=sallen_key-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