part2/3 - .pro cleanup

31 files changed, 640 insertions, 497 deletions

diff --git a/Examples/FET_Characteristic/FET_Characteristic.pro b/Examples/FET_Characteristic/FET_Characteristic.pro
index d9048187..ad79dca1 100644
--- a/Examples/FET_Characteristic/FET_Characteristic.pro
+++ b/Examples/FET_Characteristic/FET_Characteristic.pro
@@ -1,4 +1,4 @@
-update=Thu Aug 29 10:54:41 2019
+update=Wed Mar 11 16:15:57 2020
 version=1
 last_client=eeschema
 [general]
@@ -63,10 +63,8 @@ LibName29=opto
 LibName30=atmel
 LibName31=contrib
 LibName32=power
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
+LibName33=transistors
+LibName34=conn
+LibName35=regul
+LibName36=74xx
+LibName37=cmos4000
diff --git a/Examples/FrequencyResponse_JFET/FrequencyResponse_JFET.pro b/Examples/FrequencyResponse_JFET/FrequencyResponse_JFET.pro
index 956e02cd..8816fa13 100644
--- a/Examples/FrequencyResponse_JFET/FrequencyResponse_JFET.pro
+++ b/Examples/FrequencyResponse_JFET/FrequencyResponse_JFET.pro
@@ -56,17 +56,17 @@ LibName9=eSim_Sources
 LibName10=eSim_Subckt
 LibName11=eSim_User
 LibName12=power
-LibName13=device
+LibName13=valves
 LibName14=transistors
 LibName15=conn
-LibName16=linear
+LibName16=contrib
 LibName17=regul
 LibName18=74xx
 LibName19=cmos4000
 LibName20=adc-dac
 LibName21=memory
 LibName22=xilinx
-LibName23=special
+LibName23=atmel
 LibName24=microcontrollers
 LibName25=dsp
 LibName26=microchip
@@ -82,6 +82,3 @@ LibName35=display
 LibName36=cypress
 LibName37=siliconi
 LibName38=opto
-LibName39=atmel
-LibName40=contrib
-LibName41=valves
diff --git a/Examples/FullAdder/FullAdder-cache.lib b/Examples/FullAdder/FullAdder-cache.lib
index 5669fdaf..581e1c29 100644
--- a/Examples/FullAdder/FullAdder-cache.lib
+++ b/Examples/FullAdder/FullAdder-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-FullAdder
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-FullAdder v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
+F1 "DC-RESCUE-FullAdder" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -23,10 +23,10 @@ ENDDEF
 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
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 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
diff --git a/Examples/FullAdder/FullAdder-rescue.lib b/Examples/FullAdder/FullAdder-rescue.lib
index a724787d..2ddb7bd6 100644
--- a/Examples/FullAdder/FullAdder-rescue.lib
+++ b/Examples/FullAdder/FullAdder-rescue.lib
@@ -1,21 +1,20 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# R-RESCUE-FullAdder
+# DC-RESCUE-FullAdder
 #
-DEF R-RESCUE-FullAdder R 0 0 N Y 1 F N
-F0 "R" 50 130 50 H V C CNN
-F1 "R-RESCUE-FullAdder" 50 50 50 H V C CNN
-F2 "" 50 -20 30 H V C CNN
-F3 "" 50 50 30 V V C CNN
+DEF DC-RESCUE-FullAdder v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC-RESCUE-FullAdder" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
- R_*
- Resistor_*
+ 1_pin
 $ENDFPLIST
 DRAW
-S 150 10 -50 90 0 1 10 N
-X ~ 1 -100 50 50 R 60 60 1 1 P
-X ~ 2 200 50 50 L 60 60 1 1 P
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/Examples/FullAdder/FullAdder.pro b/Examples/FullAdder/FullAdder.pro
index 3a4fb370..9e65fa13 100644
--- a/Examples/FullAdder/FullAdder.pro
+++ b/Examples/FullAdder/FullAdder.pro
@@ -1,4 +1,4 @@
-update=Mon Mar 11 11:26:25 2019
+update=Wed Mar 11 16:17:06 2020
 version=1
 last_client=eeschema
 [general]
@@ -63,10 +63,8 @@ LibName29=opto
 LibName30=atmel
 LibName31=contrib
 LibName32=power
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
+LibName33=transistors
+LibName34=conn
+LibName35=regul
+LibName36=74xx
+LibName37=cmos4000
diff --git a/Examples/FullAdder/FullAdder.sch b/Examples/FullAdder/FullAdder.sch
index 7e0995aa..10ab7c95 100644
--- a/Examples/FullAdder/FullAdder.sch
+++ b/Examples/FullAdder/FullAdder.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:FullAdder-rescue
 LIBS:eSim_Analog
 LIBS:eSim_Devices
 LIBS:eSim_Digital
@@ -30,13 +31,12 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:power
-LIBS:device
 LIBS:transistors
 LIBS:conn
-LIBS:linear
 LIBS:regul
 LIBS:74xx
 LIBS:cmos4000
+LIBS:FullAdder-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -63,7 +63,7 @@ F 3 "" H 4350 4050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v1
+L DC-RESCUE-FullAdder v1
 U 1 1 56D58CB2
 P 1300 3550
 F 0 "v1" H 1100 3650 60  0000 C CNN
@@ -74,7 +74,7 @@ F 3 "" H 1300 3550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v2
+L DC-RESCUE-FullAdder v2
 U 1 1 56D58D3D
 P 1950 3950
 F 0 "v2" H 1750 4050 60  0000 C CNN
@@ -85,7 +85,7 @@ F 3 "" H 1950 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v3
+L DC-RESCUE-FullAdder v3
 U 1 1 56D58D84
 P 2700 4350
 F 0 "v3" H 2500 4450 60  0000 C CNN
diff --git a/Examples/FullwaveRectifier_SCR/FullwaveRectifier_SCR.pro b/Examples/FullwaveRectifier_SCR/FullwaveRectifier_SCR.pro
index afdcf2d3..5b07f7ca 100644
--- a/Examples/FullwaveRectifier_SCR/FullwaveRectifier_SCR.pro
+++ b/Examples/FullwaveRectifier_SCR/FullwaveRectifier_SCR.pro
@@ -1,6 +1,6 @@
-update=22/05/2015 07:44:53
+update=Wed Mar 11 16:19:36 2020
 version=1
-last_client=kicad
+last_client=eeschema
 [general]
 version=1
 RootSch=
@@ -62,10 +62,8 @@ LibName28=opto
 LibName29=atmel
 LibName30=contrib
 LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000
diff --git a/Examples/Fullwavebridgerectifier/Fullwavebridgerectifier.pro b/Examples/Fullwavebridgerectifier/Fullwavebridgerectifier.pro
index 52ace132..a62372a5 100644
--- a/Examples/Fullwavebridgerectifier/Fullwavebridgerectifier.pro
+++ b/Examples/Fullwavebridgerectifier/Fullwavebridgerectifier.pro
@@ -1,4 +1,4 @@
-update=Fri Jun  7 10:11:34 2019
+update=Wed Mar 11 16:17:52 2020
 version=1
 last_client=eeschema
 [general]
@@ -62,11 +62,9 @@ LibName28=opto
 LibName29=atmel
 LibName30=contrib
 LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
-LibName39=/home/fossee/library/eSim_Plot
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000
+LibName37=eSim_Plot
diff --git a/Examples/Half_Adder/Half_Adder-cache.lib b/Examples/Half_Adder/Half_Adder-cache.lib
index 92d3bca5..19869ff0 100644
--- a/Examples/Half_Adder/Half_Adder-cache.lib
+++ b/Examples/Half_Adder/Half_Adder-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-Half_Adder
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-Half_Adder v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
+F1 "DC-RESCUE-Half_Adder" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
diff --git a/Examples/Half_Adder/Half_Adder-rescue.lib b/Examples/Half_Adder/Half_Adder-rescue.lib
index 3d16d4cb..ac06182a 100644
--- a/Examples/Half_Adder/Half_Adder-rescue.lib
+++ b/Examples/Half_Adder/Half_Adder-rescue.lib
@@ -1,21 +1,20 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# R-RESCUE-Half_Adder
+# DC-RESCUE-Half_Adder
 #
-DEF R-RESCUE-Half_Adder R 0 0 N Y 1 F N
-F0 "R" 50 130 50 H V C CNN
-F1 "R-RESCUE-Half_Adder" 50 50 50 H V C CNN
-F2 "" 50 -20 30 H V C CNN
-F3 "" 50 50 30 V V C CNN
+DEF DC-RESCUE-Half_Adder v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC-RESCUE-Half_Adder" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
- R_*
- Resistor_*
+ 1_pin
 $ENDFPLIST
 DRAW
-S 150 10 -50 90 0 1 10 N
-X ~ 1 -100 50 50 R 60 60 1 1 P
-X ~ 2 200 50 50 L 60 60 1 1 P
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/Examples/Half_Adder/Half_Adder.pro b/Examples/Half_Adder/Half_Adder.pro
index 5316e430..ef46bd01 100644
--- a/Examples/Half_Adder/Half_Adder.pro
+++ b/Examples/Half_Adder/Half_Adder.pro
@@ -1,4 +1,4 @@
-update=Wed Jul 10 18:10:53 2019
+update=Wed Mar 11 16:20:37 2020
 version=1
 last_client=eeschema
 [general]
@@ -42,33 +42,30 @@ LibName8=eSim_Sources
 LibName9=eSim_Subckt
 LibName10=eSim_User
 LibName11=power
-LibName12=device
-LibName13=transistors
-LibName14=conn
-LibName15=linear
-LibName16=regul
-LibName17=74xx
-LibName18=cmos4000
-LibName19=adc-dac
-LibName20=memory
-LibName21=xilinx
-LibName22=special
-LibName23=microcontrollers
-LibName24=dsp
-LibName25=microchip
-LibName26=analog_switches
-LibName27=motorola
-LibName28=texas
-LibName29=intel
-LibName30=audio
-LibName31=interface
-LibName32=digital-audio
-LibName33=philips
-LibName34=display
-LibName35=cypress
-LibName36=siliconi
-LibName37=opto
-LibName38=atmel
-LibName39=contrib
-LibName40=valves
-LibName41=eSim_Power
+LibName12=transistors
+LibName13=conn
+LibName14=regul
+LibName15=74xx
+LibName16=cmos4000
+LibName17=adc-dac
+LibName18=memory
+LibName19=xilinx
+LibName20=microcontrollers
+LibName21=dsp
+LibName22=microchip
+LibName23=analog_switches
+LibName24=motorola
+LibName25=texas
+LibName26=intel
+LibName27=audio
+LibName28=interface
+LibName29=digital-audio
+LibName30=philips
+LibName31=display
+LibName32=cypress
+LibName33=siliconi
+LibName34=opto
+LibName35=atmel
+LibName36=contrib
+LibName37=valves
+LibName38=eSim_Power
diff --git a/Examples/Half_Adder/Half_Adder.sch b/Examples/Half_Adder/Half_Adder.sch
index 97cb4b04..99fc5144 100644
--- a/Examples/Half_Adder/Half_Adder.sch
+++ b/Examples/Half_Adder/Half_Adder.sch
@@ -10,10 +10,8 @@ LIBS:eSim_Sources
 LIBS:eSim_Subckt
 LIBS:eSim_User
 LIBS:power
-LIBS:device
 LIBS:transistors
 LIBS:conn
-LIBS:linear
 LIBS:regul
 LIBS:74xx
 LIBS:cmos4000
@@ -289,7 +287,7 @@ Connection ~ 3950 3150
 Wire Wire Line
 	3900 3950 3900 3800
 $Comp
-L DC v2
+L DC-RESCUE-Half_Adder v2
 U 1 1 558A937C
 P 3450 3800
 F 0 "v2" H 3250 3900 60  0000 C CNN
@@ -300,7 +298,7 @@ F 3 "" H 3450 3800 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L DC v1
+L DC-RESCUE-Half_Adder v1
 U 1 1 558A9345
 P 3450 3150
 F 0 "v1" H 3250 3250 60  0000 C CNN
diff --git a/Examples/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR.pro b/Examples/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR.pro
index afdcf2d3..eb9aee8e 100644
--- a/Examples/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR.pro
+++ b/Examples/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR.pro
@@ -1,6 +1,6 @@
-update=22/05/2015 07:44:53
+update=Wed Mar 11 16:21:19 2020
 version=1
-last_client=kicad
+last_client=eeschema
 [general]
 version=1
 RootSch=
@@ -62,10 +62,8 @@ LibName28=opto
 LibName29=atmel
 LibName30=contrib
 LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro
index 3c37a933..235a7d02 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro
@@ -1,4 +1,4 @@
-update=Fri Jun 14 11:53:53 2019
+update=Wed Mar 11 16:22:33 2020
 version=1
 last_client=eeschema
 [general]
@@ -43,41 +43,29 @@ LibName9=eSim_Sources
 LibName10=eSim_Subckt
 LibName11=eSim_User
 LibName12=power
-LibName13=device
-LibName14=transistors
-LibName15=conn
-LibName16=linear
-LibName17=regul
-LibName18=74xx
-LibName19=cmos4000
-LibName20=adc-dac
-LibName21=memory
-LibName22=xilinx
-LibName23=microcontrollers
-LibName24=dsp
-LibName25=microchip
-LibName26=analog_switches
-LibName27=motorola
-LibName28=texas
-LibName29=intel
-LibName30=audio
-LibName31=interface
-LibName32=digital-audio
-LibName33=philips
-LibName34=display
-LibName35=cypress
-LibName36=siliconi
-LibName37=opto
-LibName38=atmel
-LibName39=contrib
-LibName40=valves
-LibName41=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog
-LibName42=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices
-LibName43=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital
-LibName44=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid
-LibName45=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous
-LibName46=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot
-LibName47=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power
-LibName48=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources
-LibName49=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
-LibName50=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User
+LibName13=transistors
+LibName14=conn
+LibName15=regul
+LibName16=74xx
+LibName17=cmos4000
+LibName18=adc-dac
+LibName19=memory
+LibName20=xilinx
+LibName21=microcontrollers
+LibName22=dsp
+LibName23=microchip
+LibName24=analog_switches
+LibName25=motorola
+LibName26=texas
+LibName27=intel
+LibName28=audio
+LibName29=interface
+LibName30=digital-audio
+LibName31=philips
+LibName32=display
+LibName33=cypress
+LibName34=siliconi
+LibName35=opto
+LibName36=atmel
+LibName37=contrib
+LibName38=valves
diff --git a/Examples/High_Pass_Filter/High_Pass_Filter.pro b/Examples/High_Pass_Filter/High_Pass_Filter.pro
index 5dff956d..1334703a 100644
--- a/Examples/High_Pass_Filter/High_Pass_Filter.pro
+++ b/Examples/High_Pass_Filter/High_Pass_Filter.pro
@@ -1,4 +1,4 @@
-update=Mon Feb 29 21:45:27 2016
+update=Wed Mar 11 16:23:08 2020
 version=1
 last_client=eeschema
 [general]
@@ -62,10 +62,8 @@ LibName28=opto
 LibName29=atmel
 LibName30=contrib
 LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000
diff --git a/Examples/Integrator/Integrator-cache.lib b/Examples/Integrator/Integrator-cache.lib
new file mode 100644
index 00000000..259458aa
--- /dev/null
+++ b/Examples/Integrator/Integrator-cache.lib
@@ -0,0 +1,105 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 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
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I 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
+ENDDRAW
+ENDDEF
+#
+# UA741
+#
+DEF UA741 X 0 40 Y Y 1 F N
+F0 "X" 150 0 60 H V C CNN
+F1 "UA741" 250 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 4 0 1 0 0 150 0 -150 350 0 0 150 N
+X + 1 -200 100 200 R 50 50 1 1 I
+X - 2 -200 -100 200 R 50 50 1 1 I
+X ~ 3 550 0 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# eSim_C
+#
+DEF eSim_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "eSim_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS capacitor
+$FPLIST
+ C_*
+$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 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_R
+#
+DEF eSim_R R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "eSim_R" 50 -50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+ALIAS resistor
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# plot_v1
+#
+DEF plot_v1 U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_v1" 200 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# pwl
+#
+DEF pwl v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "pwl" -250 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+A -1144 -561 1253 291 240 0 1 0 N -50 50 0 -50
+A -765 421 941 -300 -232 0 1 0 N 50 -50 100 50
+A -75 -700 750 919 880 0 1 0 N -100 50 -50 50
+A 25 450 501 -928 -871 0 1 0 N 0 -50 50 -50
+A 1096 -609 1366 1511 1558 0 1 0 N -100 50 -150 -50
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 0 1 1 I
+X - 2 0 -450 300 U 50 0 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Integrator/Integrator.cir b/Examples/Integrator/Integrator.cir
index 50c30529..b7b0164b 100644
--- a/Examples/Integrator/Integrator.cir
+++ b/Examples/Integrator/Integrator.cir
@@ -1,19 +1,19 @@
-* /home/fossee/eSim-Workspace/Integrator/Integrator.cir
+* /home/saurabh/Desktop/eSim/Examples/Integrator/Integrator.cir
 
-* EESchema Netlist Version 1.1 (Spice format) creation date: Mon Feb 29 20:31:04 2016
+* EESchema Netlist Version 1.1 (Spice format) creation date: Wed Mar 11 16:27:08 2020
 
 * To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
 * To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
 
 * Sheet Name: /
 X1  Net-_R2-Pad1_ Net-_C1-Pad2_ out UA741		
-R1  in Net-_C1-Pad2_ 10k		
-R2  Net-_R2-Pad1_ GND 1k		
-R3  out GND 1k		
-C1  out Net-_C1-Pad2_ 100n		
-R4  Net-_C1-Pad2_ out 100k		
 v1  in GND pwl		
 U1  in plot_v1		
 U2  out plot_v1		
+R1  in Net-_C1-Pad2_ 10k		
+R2  Net-_R2-Pad1_ GND 1k		
+R3  out Net-_C1-Pad2_ 100k		
+C1  out Net-_C1-Pad2_ 100n		
+R4  GND out 1k		
 
 .end
diff --git a/Examples/Integrator/Integrator.cir.out b/Examples/Integrator/Integrator.cir.out
index 926b2749..9db03242 100644
--- a/Examples/Integrator/Integrator.cir.out
+++ b/Examples/Integrator/Integrator.cir.out
@@ -1,16 +1,16 @@
-* /home/fossee/esim-workspace/integrator/integrator.cir
+* /home/saurabh/desktop/esim/examples/integrator/integrator.cir
 
 .include ua741.sub
 x1 net-_r2-pad1_ net-_c1-pad2_ out ua741
-r1  in net-_c1-pad2_ 10k
-r2  net-_r2-pad1_ gnd 1k
-r3  out gnd 1k
-c1  out net-_c1-pad2_ 100n
-r4  net-_c1-pad2_ out 100k
 v1  in gnd pwl(0m 0 0.5m 5 25m 5 25.5m -5 50m -5 50.5m 5 75m 5 75.5m -5 100m -5)
 * u1  in plot_v1
 * u2  out plot_v1
-.tran 10e-03 100e-03 0e-00
+r1  in net-_c1-pad2_ 10k
+r2  net-_r2-pad1_ gnd 1k
+r3  out net-_c1-pad2_ 100k
+c1  out net-_c1-pad2_ 100n
+r4  gnd out 1k
+.tran 1e-03 100e-03 0e-00
 
 * Control Statements 
 .control
diff --git a/Examples/Integrator/Integrator.sch b/Examples/Integrator/Integrator.sch
index 843d52f8..d73bd6be 100644
--- a/Examples/Integrator/Integrator.sch
+++ b/Examples/Integrator/Integrator.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 2
-LIBS:Integrator-rescue
 LIBS:eSim_Analog
 LIBS:eSim_Devices
 LIBS:eSim_Digital
@@ -31,10 +30,8 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:power
-LIBS:device
 LIBS:transistors
 LIBS:conn
-LIBS:linear
 LIBS:regul
 LIBS:74xx
 LIBS:cmos4000
@@ -63,39 +60,6 @@ F 3 "" H 5950 3200 60  0000 C CNN
 	1    5950 3200
 	1    0    0    1   
 $EndComp
-$Comp
-L R-RESCUE-Integrator R1
-U 1 1 56A9B635
-P 5100 3150
-F 0 "R1" H 5150 3280 50  0000 C CNN
-F 1 "10k" H 5150 3200 50  0000 C CNN
-F 2 "" H 5150 3130 30  0000 C CNN
-F 3 "" V 5150 3200 30  0000 C CNN
-	1    5100 3150
-	1    0    0    -1  
-$EndComp
-$Comp
-L R-RESCUE-Integrator R2
-U 1 1 56A9B674
-P 5400 3400
-F 0 "R2" H 5450 3530 50  0000 C CNN
-F 1 "1k" H 5450 3450 50  0000 C CNN
-F 2 "" H 5450 3380 30  0000 C CNN
-F 3 "" V 5450 3450 30  0000 C CNN
-	1    5400 3400
-	0    1    1    0   
-$EndComp
-$Comp
-L R-RESCUE-Integrator R3
-U 1 1 56A9B6AE
-P 6850 3300
-F 0 "R3" H 6900 3430 50  0000 C CNN
-F 1 "1k" H 6900 3350 50  0000 C CNN
-F 2 "" H 6900 3280 30  0000 C CNN
-F 3 "" V 6900 3350 30  0000 C CNN
-	1    6850 3300
-	0    1    1    0   
-$EndComp
 Wire Wire Line
 	5300 3100 5750 3100
 Wire Wire Line
@@ -103,21 +67,10 @@ Wire Wire Line
 Wire Wire Line
 	6500 3200 6900 3200
 $Comp
-L C C1
-U 1 1 56A9B72C
-P 6100 2700
-F 0 "C1" H 6125 2800 50  0000 L CNN
-F 1 "100n" H 6125 2600 50  0000 L CNN
-F 2 "" H 6138 2550 30  0000 C CNN
-F 3 "" H 6100 2700 60  0000 C CNN
-	1    6100 2700
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR01
+L GND #PWR2
 U 1 1 56A9B75D
 P 5450 3600
-F 0 "#PWR01" H 5450 3350 50  0001 C CNN
+F 0 "#PWR2" H 5450 3350 50  0001 C CNN
 F 1 "GND" H 5450 3450 50  0000 C CNN
 F 2 "" H 5450 3600 50  0000 C CNN
 F 3 "" H 5450 3600 50  0000 C CNN
@@ -125,10 +78,10 @@ F 3 "" H 5450 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR1
 U 1 1 56A9B7DC
 P 4800 4000
-F 0 "#PWR02" H 4800 3750 50  0001 C CNN
+F 0 "#PWR1" H 4800 3750 50  0001 C CNN
 F 1 "GND" H 4800 3850 50  0000 C CNN
 F 2 "" H 4800 4000 50  0000 C CNN
 F 3 "" H 4800 4000 50  0000 C CNN
@@ -136,10 +89,10 @@ F 3 "" H 4800 4000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR3
 U 1 1 56A9B7F9
 P 6900 3500
-F 0 "#PWR03" H 6900 3250 50  0001 C CNN
+F 0 "#PWR3" H 6900 3250 50  0001 C CNN
 F 1 "GND" H 6900 3350 50  0000 C CNN
 F 2 "" H 6900 3500 50  0000 C CNN
 F 3 "" H 6900 3500 50  0000 C CNN
@@ -172,17 +125,6 @@ Wire Wire Line
 	5600 2350 5600 3100
 Wire Wire Line
 	6650 2350 6650 3200
-$Comp
-L R-RESCUE-Integrator R4
-U 1 1 56B2EBCB
-P 6050 2400
-F 0 "R4" H 6100 2530 50  0000 C CNN
-F 1 "100k" H 6100 2450 50  0000 C CNN
-F 2 "" H 6100 2380 30  0000 C CNN
-F 3 "" V 6100 2450 30  0000 C CNN
-	1    6050 2400
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	5950 2350 5600 2350
 Connection ~ 5600 2700
@@ -224,4 +166,69 @@ F 3 "" H 6800 3200 60  0000 C CNN
 $EndComp
 Connection ~ 4850 2950
 Connection ~ 6800 3050
+Text Notes 5050 2900 0    60   ~ 0
+10k
+Text Notes 5250 3700 0    60   ~ 0
+1k\n
+Text Notes 6300 2600 0    60   ~ 0
+100n
+Text Notes 5950 2150 0    60   ~ 0
+100k\n
+Text Notes 7100 3350 0    60   ~ 0
+1k
+$Comp
+L resistor R1
+U 1 1 5E68C500
+P 5100 3150
+F 0 "R1" H 5150 3280 50  0000 C CNN
+F 1 "10k" H 5150 3100 50  0000 C CNN
+F 2 "" H 5150 3130 30  0000 C CNN
+F 3 "" V 5150 3200 30  0000 C CNN
+	1    5100 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L resistor R2
+U 1 1 5E68C560
+P 5400 3400
+F 0 "R2" H 5450 3530 50  0000 C CNN
+F 1 "1k" H 5450 3350 50  0000 C CNN
+F 2 "" H 5450 3380 30  0000 C CNN
+F 3 "" V 5450 3450 30  0000 C CNN
+	1    5400 3400
+	0    1    1    0   
+$EndComp
+$Comp
+L resistor R3
+U 1 1 5E68C5B3
+P 6150 2300
+F 0 "R3" H 6200 2430 50  0000 C CNN
+F 1 "100k" H 6200 2250 50  0000 C CNN
+F 2 "" H 6200 2280 30  0000 C CNN
+F 3 "" V 6200 2350 30  0000 C CNN
+	1    6150 2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L capacitor C1
+U 1 1 5E68C612
+P 6100 2700
+F 0 "C1" H 6125 2800 50  0000 L CNN
+F 1 "100n" H 6125 2600 50  0000 L CNN
+F 2 "" H 6138 2550 30  0000 C CNN
+F 3 "" H 6100 2700 60  0000 C CNN
+	1    6100 2700
+	0    1    1    0   
+$EndComp
+$Comp
+L resistor R4
+U 1 1 5E68C664
+P 6950 3400
+F 0 "R4" H 7000 3530 50  0000 C CNN
+F 1 "1k" H 7000 3350 50  0000 C CNN
+F 2 "" H 7000 3380 30  0000 C CNN
+F 3 "" V 7000 3450 30  0000 C CNN
+	1    6950 3400
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/Examples/Integrator/Integrator_Previous_Values.xml b/Examples/Integrator/Integrator_Previous_Values.xml
new file mode 100644
index 00000000..2079752b
--- /dev/null
+++ b/Examples/Integrator/Integrator_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5 25m 5 25.5m -5 50m -5 50.5m 5 75m 5 75.5m -5 100m -5</field1></v1></source><model /><devicemodel /><subcircuit><x1><field>/home/saurabh/Desktop/eSim-2.0/library/SubcircuitLibrary/ua741</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">1</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/Integrator/analysis b/Examples/Integrator/analysis
index d5e13546..f496aec4 100644
--- a/Examples/Integrator/analysis
+++ b/Examples/Integrator/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-00
\ No newline at end of file
+.tran 1e-03 100e-03 0e-00
\ No newline at end of file
diff --git a/Examples/Integrator_LM_741/Integrator_LM_741-cache.lib b/Examples/Integrator_LM_741/Integrator_LM_741-cache.lib
index 54534ade..2d53e667 100644
--- a/Examples/Integrator_LM_741/Integrator_LM_741-cache.lib
+++ b/Examples/Integrator_LM_741/Integrator_LM_741-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-Integrator_LM_741
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-Integrator_LM_741 v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
+F1 "DC-RESCUE-Integrator_LM_741" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -38,6 +38,7 @@ F0 "C" 25 100 50 H V L CNN
 F1 "eSim_C" 25 -100 50 H V L CNN
 F2 "" 38 -150 30 H V C CNN
 F3 "" 0 0 60 H V C CNN
+ALIAS capacitor
 $FPLIST
  C_*
 $ENDFPLIST
@@ -66,9 +67,10 @@ ENDDEF
 #
 DEF eSim_R R 0 0 N Y 1 F N
 F0 "R" 50 130 50 H V C CNN
-F1 "eSim_R" 50 50 50 H V C CNN
+F1 "eSim_R" 50 -50 50 H V C CNN
 F2 "" 50 -20 30 H V C CNN
 F3 "" 50 50 30 V V C CNN
+ALIAS resistor
 $FPLIST
  R_*
  Resistor_*
diff --git a/Examples/Integrator_LM_741/Integrator_LM_741-rescue.lib b/Examples/Integrator_LM_741/Integrator_LM_741-rescue.lib
new file mode 100644
index 00000000..1868df0a
--- /dev/null
+++ b/Examples/Integrator_LM_741/Integrator_LM_741-rescue.lib
@@ -0,0 +1,21 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# DC-RESCUE-Integrator_LM_741
+#
+DEF DC-RESCUE-Integrator_LM_741 v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC-RESCUE-Integrator_LM_741" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Integrator_LM_741/Integrator_LM_741.pro b/Examples/Integrator_LM_741/Integrator_LM_741.pro
index e50cb51d..9766be5c 100644
--- a/Examples/Integrator_LM_741/Integrator_LM_741.pro
+++ b/Examples/Integrator_LM_741/Integrator_LM_741.pro
@@ -1,4 +1,4 @@
-update=Wed Jun 26 10:41:17 2019
+update=Wed Mar 11 16:35:12 2020
 version=1
 last_client=eeschema
 [general]
@@ -31,15 +31,15 @@ NetIExt=net
 version=1
 LibDir=../../Downloads/eSim-1.1.2/kicadSchematicLibrary
 [eeschema/libraries]
-LibName1=power
-LibName2=eSim_Analog
-LibName3=eSim_Devices
-LibName4=eSim_Digital
-LibName5=eSim_Hybrid
-LibName6=eSim_Miscellaneous
-LibName7=eSim_Plot
-LibName8=eSim_Power
-LibName9=eSim_PSpice
+LibName1=Integrator_LM_741-rescue
+LibName2=power
+LibName3=eSim_Analog
+LibName4=eSim_Devices
+LibName5=eSim_Digital
+LibName6=eSim_Hybrid
+LibName7=eSim_Miscellaneous
+LibName8=eSim_Plot
+LibName9=eSim_Power
 LibName10=eSim_Sources
 LibName11=eSim_User
 LibName12=eSim_Subckt
@@ -60,62 +60,58 @@ LibName26=conn
 LibName27=contrib
 LibName28=cypress
 LibName29=dc-dc
-LibName30=device
-LibName31=digital-audio
-LibName32=diode
-LibName33=display
-LibName34=dsp
-LibName35=elec-unifil
-LibName36=ESD_Protection
-LibName37=ftdi
-LibName38=gennum
-LibName39=graphic
-LibName40=hc11
-LibName41=intel
-LibName42=interface
-LibName43=ir
-LibName44=Lattice
-LibName45=linear
-LibName46=logo
-LibName47=maxim
-LibName48=memory
-LibName49=microchip
-LibName50=microchip_dspic33dsc
-LibName51=microchip_pic10mcu
-LibName52=microchip_pic12mcu
-LibName53=microchip_pic16mcu
-LibName54=microchip_pic18mcu
-LibName55=microchip_pic32mcu
-LibName56=microcontrollers
-LibName57=motor_drivers
-LibName58=motorola
-LibName59=msp430
-LibName60=nordicsemi
-LibName61=nxp_armmcu
-LibName62=onsemi
-LibName63=opto
-LibName64=Oscillators
-LibName65=philips
-LibName66=Power_Management
-LibName67=powerint
-LibName68=pspice
-LibName69=references
-LibName70=regul
-LibName71=relays
-LibName72=rfcom
-LibName73=sensors
-LibName74=silabs
-LibName75=siliconi
-LibName76=stm8
-LibName77=stm32
-LibName78=supertex
-LibName79=switches
-LibName80=texas
-LibName81=transf
-LibName82=transistors
-LibName83=ttl_ieee
-LibName84=valves
-LibName85=video
-LibName86=Xicor
-LibName87=xilinx
-LibName88=Zilog
+LibName30=digital-audio
+LibName31=diode
+LibName32=display
+LibName33=dsp
+LibName34=elec-unifil
+LibName35=ESD_Protection
+LibName36=ftdi
+LibName37=gennum
+LibName38=hc11
+LibName39=intel
+LibName40=interface
+LibName41=ir
+LibName42=Lattice
+LibName43=maxim
+LibName44=memory
+LibName45=microchip
+LibName46=microchip_dspic33dsc
+LibName47=microchip_pic10mcu
+LibName48=microchip_pic12mcu
+LibName49=microchip_pic16mcu
+LibName50=microchip_pic18mcu
+LibName51=microchip_pic32mcu
+LibName52=microcontrollers
+LibName53=motor_drivers
+LibName54=motorola
+LibName55=msp430
+LibName56=nordicsemi
+LibName57=nxp_armmcu
+LibName58=onsemi
+LibName59=opto
+LibName60=Oscillators
+LibName61=philips
+LibName62=Power_Management
+LibName63=powerint
+LibName64=pspice
+LibName65=references
+LibName66=regul
+LibName67=relays
+LibName68=rfcom
+LibName69=sensors
+LibName70=silabs
+LibName71=siliconi
+LibName72=stm8
+LibName73=stm32
+LibName74=supertex
+LibName75=switches
+LibName76=texas
+LibName77=transf
+LibName78=transistors
+LibName79=ttl_ieee
+LibName80=valves
+LibName81=video
+LibName82=Xicor
+LibName83=xilinx
+LibName84=Zilog
diff --git a/Examples/Integrator_LM_741/Integrator_LM_741.sch b/Examples/Integrator_LM_741/Integrator_LM_741.sch
index b3ff20e4..8fd4a42c 100644
--- a/Examples/Integrator_LM_741/Integrator_LM_741.sch
+++ b/Examples/Integrator_LM_741/Integrator_LM_741.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:Integrator_LM_741-rescue
 LIBS:power
 LIBS:eSim_Analog
 LIBS:eSim_Devices
@@ -7,7 +8,6 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
 LIBS:eSim_Sources
 LIBS:eSim_User
 LIBS:eSim_Subckt
@@ -28,8 +28,62 @@ LIBS:conn
 LIBS:contrib
 LIBS:cypress
 LIBS:dc-dc
-LIBS:device
 LIBS:digital-audio
+LIBS:diode
+LIBS:display
+LIBS:dsp
+LIBS:elec-unifil
+LIBS:ESD_Protection
+LIBS:ftdi
+LIBS:gennum
+LIBS:hc11
+LIBS:intel
+LIBS:interface
+LIBS:ir
+LIBS:Lattice
+LIBS:maxim
+LIBS:memory
+LIBS:microchip
+LIBS:microchip_dspic33dsc
+LIBS:microchip_pic10mcu
+LIBS:microchip_pic12mcu
+LIBS:microchip_pic16mcu
+LIBS:microchip_pic18mcu
+LIBS:microchip_pic32mcu
+LIBS:microcontrollers
+LIBS:motor_drivers
+LIBS:motorola
+LIBS:msp430
+LIBS:nordicsemi
+LIBS:nxp_armmcu
+LIBS:onsemi
+LIBS:opto
+LIBS:Oscillators
+LIBS:philips
+LIBS:Power_Management
+LIBS:powerint
+LIBS:pspice
+LIBS:references
+LIBS:regul
+LIBS:relays
+LIBS:rfcom
+LIBS:sensors
+LIBS:silabs
+LIBS:siliconi
+LIBS:stm8
+LIBS:stm32
+LIBS:supertex
+LIBS:switches
+LIBS:texas
+LIBS:transf
+LIBS:transistors
+LIBS:ttl_ieee
+LIBS:valves
+LIBS:video
+LIBS:Xicor
+LIBS:xilinx
+LIBS:Zilog
+LIBS:Integrator_LM_741-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -47,235 +101,235 @@ $EndDescr
 $Comp
 L eSim_R R1
 U 1 1 5CE9074D
-P 4150 4000
-F 0 "R1" H 4200 4130 50  0000 C CNN
-F 1 "10k" H 4200 4050 50  0000 C CNN
-F 2 "" H 4200 3980 30  0000 C CNN
-F 3 "" V 4200 4050 30  0000 C CNN
-	1    4150 4000
+P 5650 3100
+F 0 "R1" H 5700 3230 50  0000 C CNN
+F 1 "10k" H 5700 3150 50  0000 C CNN
+F 2 "" H 5700 3080 30  0000 C CNN
+F 3 "" V 5700 3150 30  0000 C CNN
+	1    5650 3100
 	1    0    0    -1  
 $EndComp
 $Comp
 L eSim_C C1
 U 1 1 5CE9074E
-P 5450 3200
-F 0 "C1" H 5475 3300 50  0000 L CNN
-F 1 "0.47u" H 5475 3100 50  0000 L CNN
-F 2 "" H 5488 3050 30  0000 C CNN
-F 3 "" H 5450 3200 60  0000 C CNN
-	1    5450 3200
+P 6950 2300
+F 0 "C1" H 6975 2400 50  0000 L CNN
+F 1 "0.47u" H 6975 2200 50  0000 L CNN
+F 2 "" H 6988 2150 30  0000 C CNN
+F 3 "" H 6950 2300 60  0000 C CNN
+	1    6950 2300
 	0    1    1    0   
 $EndComp
 $Comp
 L eSim_GND #PWR01
 U 1 1 5CE9074F
-P 3500 4850
-F 0 "#PWR01" H 3500 4600 50  0001 C CNN
-F 1 "eSim_GND" H 3500 4700 50  0000 C CNN
-F 2 "" H 3500 4850 50  0001 C CNN
-F 3 "" H 3500 4850 50  0001 C CNN
-	1    3500 4850
+P 5000 3950
+F 0 "#PWR01" H 5000 3700 50  0001 C CNN
+F 1 "eSim_GND" H 5000 3800 50  0000 C CNN
+F 2 "" H 5000 3950 50  0001 C CNN
+F 3 "" H 5000 3950 50  0001 C CNN
+	1    5000 3950
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v3
+L DC-RESCUE-Integrator_LM_741 v3
 U 1 1 5CE90750
-P 4550 5150
-F 0 "v3" H 4350 5250 60  0000 C CNN
-F 1 "-15" H 4350 5100 60  0000 C CNN
-F 2 "R1" H 4250 5150 60  0000 C CNN
-F 3 "" H 4550 5150 60  0000 C CNN
-	1    4550 5150
+P 6050 4250
+F 0 "v3" H 5850 4350 60  0000 C CNN
+F 1 "-15" H 5850 4200 60  0000 C CNN
+F 2 "R1" H 5750 4250 60  0000 C CNN
+F 3 "" H 6050 4250 60  0000 C CNN
+	1    6050 4250
 	0    1    1    0   
 $EndComp
 $Comp
-L DC v2
+L DC-RESCUE-Integrator_LM_741 v2
 U 1 1 5CE90751
-P 4550 2850
-F 0 "v2" H 4350 2950 60  0000 C CNN
-F 1 "+15" H 4350 2800 60  0000 C CNN
-F 2 "R1" H 4250 2850 60  0000 C CNN
-F 3 "" H 4550 2850 60  0000 C CNN
-	1    4550 2850
+P 6050 1950
+F 0 "v2" H 5850 2050 60  0000 C CNN
+F 1 "+15" H 5850 1900 60  0000 C CNN
+F 2 "R1" H 5750 1950 60  0000 C CNN
+F 3 "" H 6050 1950 60  0000 C CNN
+	1    6050 1950
 	0    1    1    0   
 $EndComp
 $Comp
 L PWR_FLAG #FLG02
 U 1 1 5CE90752
-P 2800 4550
-F 0 "#FLG02" H 2800 4645 50  0001 C CNN
-F 1 "PWR_FLAG" H 2800 4730 50  0000 C CNN
-F 2 "" H 2800 4550 50  0000 C CNN
-F 3 "" H 2800 4550 50  0000 C CNN
-	1    2800 4550
+P 4300 3650
+F 0 "#FLG02" H 4300 3745 50  0001 C CNN
+F 1 "PWR_FLAG" H 4300 3830 50  0000 C CNN
+F 2 "" H 4300 3650 50  0000 C CNN
+F 3 "" H 4300 3650 50  0000 C CNN
+	1    4300 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L plot_v1 U1
 U 1 1 5CE90753
-P 3750 3850
-F 0 "U1" H 3750 4350 60  0000 C CNN
-F 1 "plot_v1" H 3950 4200 60  0000 C CNN
-F 2 "" H 3750 3850 60  0000 C CNN
-F 3 "" H 3750 3850 60  0000 C CNN
-	1    3750 3850
+P 5250 2950
+F 0 "U1" H 5250 3450 60  0000 C CNN
+F 1 "plot_v1" H 5450 3300 60  0000 C CNN
+F 2 "" H 5250 2950 60  0000 C CNN
+F 3 "" H 5250 2950 60  0000 C CNN
+	1    5250 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L plot_v1 U2
 U 1 1 5CE90754
-P 6300 3800
-F 0 "U2" H 6300 4300 60  0000 C CNN
-F 1 "plot_v1" H 6500 4150 60  0000 C CNN
-F 2 "" H 6300 3800 60  0000 C CNN
-F 3 "" H 6300 3800 60  0000 C CNN
-	1    6300 3800
+P 7800 2900
+F 0 "U2" H 7800 3400 60  0000 C CNN
+F 1 "plot_v1" H 8000 3250 60  0000 C CNN
+F 2 "" H 7800 2900 60  0000 C CNN
+F 3 "" H 7800 2900 60  0000 C CNN
+	1    7800 2900
 	0    1    1    0   
 $EndComp
-Text GLabel 3600 3750 0    60   Input ~ 0
+Text GLabel 5100 2850 0    60   Input ~ 0
 in
-Text GLabel 6300 3600 1    60   Output ~ 0
+Text GLabel 7800 2700 1    60   Output ~ 0
 out
 $Comp
 L eSim_R R2
 U 1 1 5CE90755
-P 6300 4150
-F 0 "R2" H 6350 4280 50  0000 C CNN
-F 1 "100" H 6350 4200 50  0000 C CNN
-F 2 "" H 6350 4130 30  0000 C CNN
-F 3 "" V 6350 4200 30  0000 C CNN
-	1    6300 4150
+P 7800 3250
+F 0 "R2" H 7850 3380 50  0000 C CNN
+F 1 "100" H 7850 3300 50  0000 C CNN
+F 2 "" H 7850 3230 30  0000 C CNN
+F 3 "" V 7850 3300 30  0000 C CNN
+	1    7800 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L eSim_GND #PWR03
 U 1 1 5CE90756
-P 6600 5050
-F 0 "#PWR03" H 6600 4800 50  0001 C CNN
-F 1 "eSim_GND" H 6600 4900 50  0000 C CNN
-F 2 "" H 6600 5050 50  0001 C CNN
-F 3 "" H 6600 5050 50  0001 C CNN
-	1    6600 5050
+P 8100 4150
+F 0 "#PWR03" H 8100 3900 50  0001 C CNN
+F 1 "eSim_GND" H 8100 4000 50  0000 C CNN
+F 2 "" H 8100 4150 50  0001 C CNN
+F 3 "" H 8100 4150 50  0001 C CNN
+	1    8100 4150
 	1    0    0    -1  
 $EndComp
 $Comp
 L sine v1
 U 1 1 5CE93FC2
-P 3050 3950
-F 0 "v1" H 2850 4050 60  0000 C CNN
-F 1 "sine" H 2850 3900 60  0000 C CNN
-F 2 "R1" H 2750 3950 60  0000 C CNN
-F 3 "" H 3050 3950 60  0000 C CNN
-	1    3050 3950
+P 4550 3050
+F 0 "v1" H 4350 3150 60  0000 C CNN
+F 1 "sine" H 4350 3000 60  0000 C CNN
+F 2 "R1" H 4250 3050 60  0000 C CNN
+F 3 "" H 4550 3050 60  0000 C CNN
+	1    4550 3050
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4350 3950 4600 3950
+	5850 3050 6100 3050
 Wire Wire Line
-	3500 3950 4050 3950
+	5000 3050 5550 3050
 Wire Wire Line
-	4400 3200 4400 3950
+	5900 2300 5900 3050
 Wire Wire Line
-	4400 3200 5300 3200
-Connection ~ 4400 3950
+	5900 2300 6800 2300
+Connection ~ 5900 3050
 Wire Wire Line
-	5600 3200 6100 3200
+	7100 2300 7600 2300
 Wire Wire Line
-	6100 3200 6100 4100
+	7600 2300 7600 3200
 Wire Wire Line
-	5700 4100 6200 4100
+	7200 3200 7700 3200
 Wire Wire Line
-	5000 2850 5000 3650
+	6500 1950 6500 2750
 Wire Wire Line
-	5000 5150 5000 4550
+	6500 4250 6500 3650
 Wire Wire Line
-	4100 4700 4100 5150
+	5600 3800 5600 4250
 Wire Wire Line
-	1900 4700 4100 4700
+	3400 3800 5600 3800
 Wire Wire Line
-	3500 4700 3500 4850
+	5000 3800 5000 3950
 Wire Wire Line
-	4100 2850 1900 2850
+	5600 1950 3400 1950
 Wire Wire Line
-	1900 2850 1900 4700
-Connection ~ 3500 4700
+	3400 1950 3400 3800
+Connection ~ 5000 3800
 Wire Wire Line
-	2600 3950 1900 3950
-Connection ~ 1900 3950
+	4100 3050 3400 3050
+Connection ~ 3400 3050
 Wire Wire Line
-	2800 4550 2800 4700
-Connection ~ 2800 4700
+	4300 3650 4300 3800
+Connection ~ 4300 3800
 Wire Wire Line
-	3750 3650 3750 3950
-Connection ~ 3750 3950
+	5250 2750 5250 3050
+Connection ~ 5250 3050
 Wire Wire Line
-	6100 3800 6500 3800
-Connection ~ 6100 3800
+	7600 2900 8000 2900
+Connection ~ 7600 2900
 Wire Wire Line
-	6300 3800 6300 3600
-Connection ~ 6300 3800
+	7800 2900 7800 2700
+Connection ~ 7800 2900
 Wire Wire Line
-	3600 3750 3750 3750
-Connection ~ 3750 3750
+	5100 2850 5250 2850
+Connection ~ 5250 2850
 Wire Wire Line
-	4600 4200 3750 4200
-Connection ~ 6100 4100
+	6100 3300 5250 3300
+Connection ~ 7600 3200
 Wire Wire Line
-	6500 4100 6600 4100
+	8000 3200 8100 3200
 Wire Wire Line
-	6600 4100 6600 5050
-Connection ~ 3750 4700
+	8100 3200 8100 4150
+Connection ~ 5250 3800
 Wire Wire Line
-	3750 4200 3750 4700
+	5250 3300 5250 3800
 $Comp
 L eSim_R R3
 U 1 1 5CECFFC5
-P 5250 3600
-F 0 "R3" H 5300 3730 50  0000 C CNN
-F 1 "1k" H 5300 3650 50  0000 C CNN
-F 2 "" H 5300 3580 30  0000 C CNN
-F 3 "" V 5300 3650 30  0000 C CNN
-	1    5250 3600
+P 6750 2700
+F 0 "R3" H 6800 2830 50  0000 C CNN
+F 1 "1k" H 6800 2750 50  0000 C CNN
+F 2 "" H 6800 2680 30  0000 C CNN
+F 3 "" V 6800 2750 30  0000 C CNN
+	1    6750 2700
 	1    0    0    -1  
 $EndComp
 $Comp
 L eSim_R R4
 U 1 1 5CED0012
-P 5750 3600
-F 0 "R4" H 5800 3730 50  0000 C CNN
-F 1 "1.8533k" H 5800 3650 50  0000 C CNN
-F 2 "" H 5800 3580 30  0000 C CNN
-F 3 "" V 5800 3650 30  0000 C CNN
-	1    5750 3600
+P 7250 2700
+F 0 "R4" H 7300 2830 50  0000 C CNN
+F 1 "1.8533k" H 7300 2750 50  0000 C CNN
+F 2 "" H 7300 2680 30  0000 C CNN
+F 3 "" V 7300 2750 30  0000 C CNN
+	1    7250 2700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5950 3550 6050 3550
+	7450 2650 7550 2650
 Wire Wire Line
-	6050 3550 6050 3750
+	7550 2650 7550 2850
 Wire Wire Line
-	6050 3750 5200 3750
+	7550 2850 6700 2850
 Wire Wire Line
-	5450 3550 5650 3550
+	6950 2650 7150 2650
 Wire Wire Line
-	5150 3550 5100 3550
+	6650 2650 6600 2650
 Wire Wire Line
-	5100 3550 5100 3700
+	6600 2650 6600 2800
 Wire Wire Line
-	5550 3550 5550 5050
+	7050 2650 7050 4150
 Wire Wire Line
-	5550 5050 5000 5050
-Connection ~ 5000 5050
-Connection ~ 5550 3550
+	7050 4150 6500 4150
+Connection ~ 6500 4150
+Connection ~ 7050 2650
 $Comp
 L lm_741 X1
 U 1 1 5CFB4761
-P 5150 4100
-F 0 "X1" H 4950 4100 60  0000 C CNN
-F 1 "lm_741" H 5050 3850 60  0000 C CNN
-F 2 "" H 5150 4100 60  0000 C CNN
-F 3 "" H 5150 4100 60  0000 C CNN
-	1    5150 4100
+P 6650 3200
+F 0 "X1" H 6450 3200 60  0000 C CNN
+F 1 "lm_741" H 6550 2950 60  0000 C CNN
+F 2 "" H 6650 3200 60  0000 C CNN
+F 3 "" H 6650 3200 60  0000 C CNN
+	1    6650 3200
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/Examples/InvertingAmplifier/InvertingAmplifier.pro b/Examples/InvertingAmplifier/InvertingAmplifier.pro
index 575fa783..55c43b89 100644
--- a/Examples/InvertingAmplifier/InvertingAmplifier.pro
+++ b/Examples/InvertingAmplifier/InvertingAmplifier.pro
@@ -1,4 +1,4 @@
-update=Mon Feb 29 20:28:17 2016
+update=Wed Mar 11 16:36:50 2020
 version=1
 last_client=eeschema
 [general]
@@ -62,10 +62,8 @@ LibName28=opto
 LibName29=atmel
 LibName30=contrib
 LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000
diff --git a/Examples/JK_Flipflop/JK_Flipflop-cache.lib b/Examples/JK_Flipflop/JK_Flipflop-cache.lib
index 3497c0e5..dccd0574 100644
--- a/Examples/JK_Flipflop/JK_Flipflop-cache.lib
+++ b/Examples/JK_Flipflop/JK_Flipflop-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-JK_Flipflop
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-JK_Flipflop v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
+F1 "DC-RESCUE-JK_Flipflop" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
diff --git a/Examples/JK_Flipflop/JK_Flipflop-rescue.lib b/Examples/JK_Flipflop/JK_Flipflop-rescue.lib
index 16527e96..c8aef2b0 100644
--- a/Examples/JK_Flipflop/JK_Flipflop-rescue.lib
+++ b/Examples/JK_Flipflop/JK_Flipflop-rescue.lib
@@ -1,21 +1,20 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# R-RESCUE-JK_Flipflop
+# DC-RESCUE-JK_Flipflop
 #
-DEF R-RESCUE-JK_Flipflop R 0 0 N Y 1 F N
-F0 "R" 50 130 50 H V C CNN
-F1 "R-RESCUE-JK_Flipflop" 50 50 50 H V C CNN
-F2 "" 50 -20 30 H V C CNN
-F3 "" 50 50 30 V V C CNN
+DEF DC-RESCUE-JK_Flipflop v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC-RESCUE-JK_Flipflop" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
- R_*
- Resistor_*
+ 1_pin
 $ENDFPLIST
 DRAW
-S 150 10 -50 90 0 1 10 N
-X ~ 1 -100 50 50 R 60 60 1 1 P
-X ~ 2 200 50 50 L 60 60 1 1 P
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/Examples/JK_Flipflop/JK_Flipflop.pro b/Examples/JK_Flipflop/JK_Flipflop.pro
index 820c4de1..e0c05a6f 100644
--- a/Examples/JK_Flipflop/JK_Flipflop.pro
+++ b/Examples/JK_Flipflop/JK_Flipflop.pro
@@ -1,4 +1,4 @@
-update=Fri May 17 12:31:29 2019
+update=Wed Mar 11 16:40:58 2020
 version=1
 last_client=eeschema
 [general]
@@ -63,10 +63,8 @@ LibName29=opto
 LibName30=atmel
 LibName31=contrib
 LibName32=power
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
+LibName33=transistors
+LibName34=conn
+LibName35=regul
+LibName36=74xx
+LibName37=cmos4000
diff --git a/Examples/JK_Flipflop/JK_Flipflop.sch b/Examples/JK_Flipflop/JK_Flipflop.sch
index 44719d06..43a6b5ef 100644
--- a/Examples/JK_Flipflop/JK_Flipflop.sch
+++ b/Examples/JK_Flipflop/JK_Flipflop.sch
@@ -31,10 +31,8 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:power
-LIBS:device
 LIBS:transistors
 LIBS:conn
-LIBS:linear
 LIBS:regul
 LIBS:74xx
 LIBS:cmos4000
@@ -54,7 +52,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L DC v1
+L DC-RESCUE-JK_Flipflop v1
 U 1 1 56D58CB2
 P 2400 3550
 F 0 "v1" H 2200 3650 60  0000 C CNN
@@ -65,7 +63,7 @@ F 3 "" H 2400 3550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v3
+L DC-RESCUE-JK_Flipflop v3
 U 1 1 56D58D84
 P 3800 4350
 F 0 "v3" H 3600 4450 60  0000 C CNN
@@ -341,7 +339,7 @@ F 3 "" H 6900 4850 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L DC v4
+L DC-RESCUE-JK_Flipflop v4
 U 1 1 56D5977A
 P 7300 1600
 F 0 "v4" H 7100 1700 60  0000 C CNN
@@ -352,7 +350,7 @@ F 3 "" H 7300 1600 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L DC v5
+L DC-RESCUE-JK_Flipflop v5
 U 1 1 56D59898
 P 7300 5450
 F 0 "v5" H 7100 5550 60  0000 C CNN
diff --git a/Examples/Low_Pass_Filter/Low_Pass_Filter.pro b/Examples/Low_Pass_Filter/Low_Pass_Filter.pro
index 0a768f19..b3b0a25d 100644
--- a/Examples/Low_Pass_Filter/Low_Pass_Filter.pro
+++ b/Examples/Low_Pass_Filter/Low_Pass_Filter.pro
@@ -1,4 +1,4 @@
-update=Mon Feb 29 21:41:09 2016
+update=Wed Mar 11 16:42:16 2020
 version=1
 last_client=eeschema
 [general]
@@ -62,10 +62,8 @@ LibName28=opto
 LibName29=atmel
 LibName30=contrib
 LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000