From e25ba1f51ef16b22d1f3ae3341512da3a1e223df Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Mon, 18 May 2015 09:15:25 +0200
Subject: [PATCH] Demos: make a private library for each demo, to avoid issues
 when using modified kicad new schematic libraries

---
 demos/complex_hierarchy/ampli_ht.sch          |  188 +-
 demos/complex_hierarchy/complex_hierarchy.pro |   28 +-
 demos/complex_hierarchy/complex_hierarchy.sch |   24 +-
 .../complex_hierarchy_schlib.lib              |  312 +++
 demos/ecc83/ecc83-pp-cache.lib                |   63 +-
 demos/ecc83/ecc83-pp.kicad_pcb                |  100 +-
 demos/ecc83/ecc83-pp.net                      |  176 +-
 demos/ecc83/ecc83-pp.pro                      |   19 +-
 demos/ecc83/ecc83-pp.sch                      |  163 +-
 demos/ecc83/ecc83-pp_v2-cache.lib             |   63 +-
 demos/ecc83/ecc83-pp_v2.net                   |  204 +-
 demos/ecc83/ecc83-pp_v2.pro                   |   10 +-
 demos/ecc83/ecc83-pp_v2.sch                   |  195 +-
 demos/ecc83/ecc83_schlib.dcm                  |    3 +
 demos/ecc83/ecc83_schlib.lib                  |  141 ++
 demos/flat_hierarchy/flat_hierarchy.pro       |    9 +-
 demos/flat_hierarchy/flat_hierarchy.sch       |   29 +-
 .../flat_hierarchy/flat_hierarchy_schlib.lib  |  592 ++++++
 demos/flat_hierarchy/pic_programmer.sch       |  259 +--
 demos/flat_hierarchy/pic_sockets.sch          |   29 +-
 demos/interf_u/interf_u.pro                   |   32 +-
 demos/interf_u/interf_u_schlib.lib            |  681 +++++++
 .../kit-dev-coldfire-xilinx_5213.pro          |   27 +-
 .../kit-dev-coldfire-xilinx_5213_schlib.lib   | 1055 ++++++++++
 .../libs/pic_programmer_schlib.lib            |  606 ++++++
 demos/pic_programmer/pic_programmer.pro       |   17 +-
 demos/pic_programmer/pic_programmer.sch       |    5 +-
 demos/pic_programmer/pic_sockets.sch          |   16 +-
 demos/sonde xilinx/sonde xilinx.pro           |   18 +-
 demos/sonde xilinx/sonde xilinx_schlib.lib    |  318 +++
 demos/test_xil_95108/carte_test.pro           |   53 +-
 demos/test_xil_95108/carte_test_schlib.lib    |  660 +++++++
 demos/video/libs/video_schlib.lib             | 1720 +++++++++++++++++
 demos/video/video.pro                         |   32 +-
 34 files changed, 6794 insertions(+), 1053 deletions(-)
 create mode 100644 demos/complex_hierarchy/complex_hierarchy_schlib.lib
 create mode 100644 demos/ecc83/ecc83_schlib.dcm
 create mode 100644 demos/ecc83/ecc83_schlib.lib
 create mode 100644 demos/flat_hierarchy/flat_hierarchy_schlib.lib
 create mode 100644 demos/interf_u/interf_u_schlib.lib
 create mode 100644 demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib
 create mode 100644 demos/pic_programmer/libs/pic_programmer_schlib.lib
 create mode 100644 demos/sonde xilinx/sonde xilinx_schlib.lib
 create mode 100644 demos/test_xil_95108/carte_test_schlib.lib
 create mode 100644 demos/video/libs/video_schlib.lib

diff --git a/demos/complex_hierarchy/ampli_ht.sch b/demos/complex_hierarchy/ampli_ht.sch
index 5b908728f2..cb57bef972 100644
--- a/demos/complex_hierarchy/ampli_ht.sch
+++ b/demos/complex_hierarchy/ampli_ht.sch
@@ -1,12 +1,6 @@
 EESchema Schematic File Version 2
+LIBS:complex_hierarchy_schlib
 LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:interface
-LIBS:special
 LIBS:complex_hierarchy-cache
 EELAYER 25 0
 EELAYER END
@@ -34,9 +28,7 @@ Wire Wire Line
 Wire Wire Line
 	9800 4450 9700 4450
 Wire Wire Line
-	9800 4150 9800 4300
-Wire Wire Line
-	9800 4300 9800 4450
+	9800 4150 9800 4450
 Wire Wire Line
 	9800 4150 9700 4150
 Wire Wire Line
@@ -46,29 +38,21 @@ Wire Wire Line
 Wire Wire Line
 	6900 5400 7150 5400
 Wire Wire Line
-	2700 2000 2850 2000
-Wire Wire Line
-	2850 2000 3000 2000
+	2700 2000 3000 2000
 Connection ~ 7300 3300
 Wire Wire Line
-	7300 3200 7300 3300
-Wire Wire Line
-	7300 3300 7300 3350
+	7300 3200 7300 3350
 Wire Wire Line
 	5400 6400 5600 6400
 Wire Wire Line
 	4350 2500 4350 3000
 Connection ~ 5450 2400
 Wire Wire Line
-	5450 3000 5450 2400
-Wire Wire Line
-	5450 2400 5450 1600
+	5450 3000 5450 1600
 Wire Wire Line
 	5450 1600 4550 1600
 Wire Wire Line
-	3500 2000 3600 2000
-Wire Wire Line
-	3600 2000 3700 2000
+	3500 2000 3700 2000
 Wire Wire Line
 	7000 5100 7000 5200
 Wire Wire Line
@@ -97,9 +81,7 @@ Wire Wire Line
 Wire Wire Line
 	5850 5500 5900 5500
 Wire Wire Line
-	4350 3000 5150 3000
-Wire Wire Line
-	5150 3000 5450 3000
+	4350 3000 5450 3000
 Wire Wire Line
 	4350 2000 4200 2000
 Wire Wire Line
@@ -129,13 +111,9 @@ Wire Wire Line
 	8100 4800 8100 5000
 Connection ~ 8100 4800
 Wire Wire Line
-	7900 3500 7900 3700
+	7900 3500 7900 3800
 Wire Wire Line
-	7900 3700 7900 3800
-Wire Wire Line
-	7900 4700 7900 4800
-Wire Wire Line
-	7900 4800 7900 4900
+	7900 4700 7900 4900
 Wire Wire Line
 	9800 4300 10400 4300
 Connection ~ 9800 4300
@@ -143,9 +121,7 @@ Wire Wire Line
 	8900 4450 8900 4850
 Connection ~ 8900 4450
 Wire Wire Line
-	8900 5350 8900 5400
-Wire Wire Line
-	8900 5400 8900 6400
+	8900 5350 8900 6400
 Connection ~ 8900 5400
 $Comp
 L R R26
@@ -187,12 +163,12 @@ F 3 "" H 7900 4000 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR019
 U 1 1 4B6168A3
 P 8100 6000
-AR Path="/4B3A13A4/4B6168A3" Ref="#PWR020"  Part="1" 
-AR Path="/4B3A1333/4B6168A3" Ref="#PWR036"  Part="1" 
-F 0 "#PWR020" H 8100 6000 30  0001 C CNN
+AR Path="/4B3A13A4/4B6168A3" Ref="#PWR019"  Part="1" 
+AR Path="/4B3A1333/4B6168A3" Ref="#PWR035"  Part="1" 
+F 0 "#PWR035" H 8100 6000 30  0001 C CNN
 F 1 "GND" H 8100 5930 30  0001 C CNN
 F 2 "" H 8100 6000 60  0001 C CNN
 F 3 "" H 8100 6000 60  0001 C CNN
@@ -213,12 +189,12 @@ F 3 "" H 8100 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR036
 U 1 1 4B4F364A
 P 2850 2550
-AR Path="/4B3A1333/4B4F364A" Ref="#PWR037"  Part="1" 
-AR Path="/4B3A13A4/4B4F364A" Ref="#PWR021"  Part="1" 
-F 0 "#PWR021" H 2850 2550 30  0001 C CNN
+AR Path="/4B3A1333/4B4F364A" Ref="#PWR036"  Part="1" 
+AR Path="/4B3A13A4/4B4F364A" Ref="#PWR020"  Part="1" 
+F 0 "#PWR036" H 2850 2550 30  0001 C CNN
 F 1 "GND" H 2850 2480 30  0001 C CNN
 F 2 "" H 2850 2550 60  0001 C CNN
 F 3 "" H 2850 2550 60  0001 C CNN
@@ -252,12 +228,12 @@ F 3 "" H 2450 2000 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L -VAA #PWR022
+L -VAA #PWR021
 U 1 1 4B4B1086
 P 6300 5850
-AR Path="/4B3A13A4/4B4B1086" Ref="#PWR022"  Part="1" 
-AR Path="/4B3A1333/4B4B1086" Ref="#PWR038"  Part="1" 
-F 0 "#PWR022" H 6300 5950 20  0001 C CNN
+AR Path="/4B3A13A4/4B4B1086" Ref="#PWR021"  Part="1" 
+AR Path="/4B3A1333/4B4B1086" Ref="#PWR037"  Part="1" 
+F 0 "#PWR037" H 6300 5950 20  0001 C CNN
 F 1 "-VAA" H 6300 5950 40  0000 C CNN
 F 2 "" H 6300 5850 60  0001 C CNN
 F 3 "" H 6300 5850 60  0001 C CNN
@@ -265,12 +241,12 @@ F 3 "" H 6300 5850 60  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L -VAA #PWR023
+L -VAA #PWR022
 U 1 1 4B4B1080
 P 4750 2850
-AR Path="/4B3A13A4/4B4B1080" Ref="#PWR023"  Part="1" 
-AR Path="/4B3A1333/4B4B1080" Ref="#PWR039"  Part="1" 
-F 0 "#PWR023" H 4750 2950 20  0001 C CNN
+AR Path="/4B3A13A4/4B4B1080" Ref="#PWR022"  Part="1" 
+AR Path="/4B3A1333/4B4B1080" Ref="#PWR038"  Part="1" 
+F 0 "#PWR038" H 4750 2950 20  0001 C CNN
 F 1 "-VAA" H 4750 2950 40  0000 C CNN
 F 2 "" H 4750 2850 60  0001 C CNN
 F 3 "" H 4750 2850 60  0001 C CNN
@@ -323,12 +299,12 @@ F 3 "" H 7900 4500 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR023
 U 1 1 4B3A137A
 P 8600 5300
-AR Path="/4B3A13A4/4B3A137A" Ref="#PWR024"  Part="1" 
-AR Path="/4B3A1333/4B3A137A" Ref="#PWR040"  Part="1" 
-F 0 "#PWR024" H 8600 5300 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A137A" Ref="#PWR023"  Part="1" 
+AR Path="/4B3A1333/4B3A137A" Ref="#PWR039"  Part="1" 
+F 0 "#PWR039" H 8600 5300 30  0001 C CNN
 F 1 "GND" H 8600 5230 30  0001 C CNN
 F 2 "" H 8600 5300 60  0001 C CNN
 F 3 "" H 8600 5300 60  0001 C CNN
@@ -349,12 +325,12 @@ F 3 "" H 7800 5100 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR024
 U 1 1 4B3A1378
 P 7000 5200
-AR Path="/4B3A13A4/4B3A1378" Ref="#PWR025"  Part="1" 
-AR Path="/4B3A1333/4B3A1378" Ref="#PWR041"  Part="1" 
-F 0 "#PWR025" H 7000 5200 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A1378" Ref="#PWR024"  Part="1" 
+AR Path="/4B3A1333/4B3A1378" Ref="#PWR040"  Part="1" 
+F 0 "#PWR040" H 7000 5200 30  0001 C CNN
 F 1 "GND" H 7000 5130 30  0001 C CNN
 F 2 "" H 7000 5200 60  0001 C CNN
 F 3 "" H 7000 5200 60  0001 C CNN
@@ -414,12 +390,12 @@ F 3 "" H 7300 3600 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR025
 U 1 1 4B3A1373
 P 7300 3950
-AR Path="/4B3A13A4/4B3A1373" Ref="#PWR026"  Part="1" 
-AR Path="/4B3A1333/4B3A1373" Ref="#PWR042"  Part="1" 
-F 0 "#PWR026" H 7300 3950 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A1373" Ref="#PWR025"  Part="1" 
+AR Path="/4B3A1333/4B3A1373" Ref="#PWR041"  Part="1" 
+F 0 "#PWR041" H 7300 3950 30  0001 C CNN
 F 1 "GND" H 7300 3880 30  0001 C CNN
 F 2 "" H 7300 3950 60  0001 C CNN
 F 3 "" H 7300 3950 60  0001 C CNN
@@ -453,12 +429,12 @@ F 3 "" H 8900 5100 60  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +12V #U027
+L +12V #U026
 U 1 1 4B3A136F
 P 6300 4950
-AR Path="/4B3A13A4/4B3A136F" Ref="#U027"  Part="1" 
-AR Path="/4B3A1333/4B3A136F" Ref="#U043"  Part="1" 
-F 0 "#U027" H 6300 4900 20  0001 C CNN
+AR Path="/4B3A13A4/4B3A136F" Ref="#U026"  Part="1" 
+AR Path="/4B3A1333/4B3A136F" Ref="#U042"  Part="1" 
+F 0 "#U042" H 6300 4900 20  0001 C CNN
 F 1 "+12V" H 6300 5050 40  0000 C CNN
 F 2 "" H 6300 4950 60  0001 C CNN
 F 3 "" H 6300 4950 60  0001 C CNN
@@ -507,12 +483,12 @@ F 3 "" H 3250 2000 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR027
 U 1 1 4B3A136A
 P 1800 2250
-AR Path="/4B3A13A4/4B3A136A" Ref="#PWR028"  Part="1" 
-AR Path="/4B3A1333/4B3A136A" Ref="#PWR044"  Part="1" 
-F 0 "#PWR028" H 1800 2250 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A136A" Ref="#PWR027"  Part="1" 
+AR Path="/4B3A1333/4B3A136A" Ref="#PWR043"  Part="1" 
+F 0 "#PWR043" H 1800 2250 30  0001 C CNN
 F 1 "GND" H 1800 2180 30  0001 C CNN
 F 2 "" H 1800 2250 60  0001 C CNN
 F 3 "" H 1800 2250 60  0001 C CNN
@@ -520,12 +496,12 @@ F 3 "" H 1800 2250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR028
 U 1 1 4B3A1369
 P 4000 2850
-AR Path="/4B3A13A4/4B3A1369" Ref="#PWR029"  Part="1" 
-AR Path="/4B3A1333/4B3A1369" Ref="#PWR045"  Part="1" 
-F 0 "#PWR029" H 4000 2850 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A1369" Ref="#PWR028"  Part="1" 
+AR Path="/4B3A1333/4B3A1369" Ref="#PWR044"  Part="1" 
+F 0 "#PWR044" H 4000 2850 30  0001 C CNN
 F 1 "GND" H 4000 2780 30  0001 C CNN
 F 2 "" H 4000 2850 60  0001 C CNN
 F 3 "" H 4000 2850 60  0001 C CNN
@@ -598,12 +574,12 @@ F 3 "" H 9450 4150 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR029
 U 1 1 4B3A1363
 P 10250 4550
-AR Path="/4B3A13A4/4B3A1363" Ref="#PWR030"  Part="1" 
-AR Path="/4B3A1333/4B3A1363" Ref="#PWR046"  Part="1" 
-F 0 "#PWR030" H 10250 4550 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A1363" Ref="#PWR029"  Part="1" 
+AR Path="/4B3A1333/4B3A1363" Ref="#PWR045"  Part="1" 
+F 0 "#PWR045" H 10250 4550 30  0001 C CNN
 F 1 "GND" H 10250 4480 30  0001 C CNN
 F 2 "" H 10250 4550 60  0001 C CNN
 F 3 "" H 10250 4550 60  0001 C CNN
@@ -624,12 +600,12 @@ F 3 "" H 5150 6400 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR031
+L GND #PWR030
 U 1 1 4B3A1361
 P 4850 6400
-AR Path="/4B3A13A4/4B3A1361" Ref="#PWR031"  Part="1" 
-AR Path="/4B3A1333/4B3A1361" Ref="#PWR047"  Part="1" 
-F 0 "#PWR031" H 4850 6400 30  0001 C CNN
+AR Path="/4B3A13A4/4B3A1361" Ref="#PWR030"  Part="1" 
+AR Path="/4B3A1333/4B3A1361" Ref="#PWR046"  Part="1" 
+F 0 "#PWR046" H 4850 6400 30  0001 C CNN
 F 1 "GND" H 4850 6330 30  0001 C CNN
 F 2 "" H 4850 6400 60  0001 C CNN
 F 3 "" H 4850 6400 60  0001 C CNN
@@ -650,12 +626,12 @@ F 3 "" H 7800 3300 60  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L HT #PWR032
+L HT #PWR031
 U 1 1 4B3A135F
 P 7300 2250
-AR Path="/4B3A13A4/4B3A135F" Ref="#PWR032"  Part="1" 
-AR Path="/4B3A1333/4B3A135F" Ref="#PWR048"  Part="1" 
-F 0 "#PWR032" H 7300 2370 20  0001 C CNN
+AR Path="/4B3A13A4/4B3A135F" Ref="#PWR031"  Part="1" 
+AR Path="/4B3A1333/4B3A135F" Ref="#PWR047"  Part="1" 
+F 0 "#PWR047" H 7300 2370 20  0001 C CNN
 F 1 "HT" H 7300 2340 40  0000 C CNN
 F 2 "" H 7300 2250 60  0001 C CNN
 F 3 "" H 7300 2250 60  0001 C CNN
@@ -663,12 +639,12 @@ F 3 "" H 7300 2250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L HT #PWR033
+L HT #PWR032
 U 1 1 4B3A135E
 P 7900 2450
-AR Path="/4B3A13A4/4B3A135E" Ref="#PWR033"  Part="1" 
-AR Path="/4B3A1333/4B3A135E" Ref="#PWR049"  Part="1" 
-F 0 "#PWR033" H 7900 2570 20  0001 C CNN
+AR Path="/4B3A13A4/4B3A135E" Ref="#PWR032"  Part="1" 
+AR Path="/4B3A1333/4B3A135E" Ref="#PWR048"  Part="1" 
+F 0 "#PWR048" H 7900 2570 20  0001 C CNN
 F 1 "HT" H 7900 2540 40  0000 C CNN
 F 2 "" H 7900 2450 60  0001 C CNN
 F 3 "" H 7900 2450 60  0001 C CNN
@@ -676,12 +652,12 @@ F 3 "" H 7900 2450 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L HT #PWR034
+L HT #PWR033
 U 1 1 4B3A135D
 P 8600 3300
-AR Path="/4B3A13A4/4B3A135D" Ref="#PWR034"  Part="1" 
-AR Path="/4B3A1333/4B3A135D" Ref="#PWR050"  Part="1" 
-F 0 "#PWR034" H 8600 3420 20  0001 C CNN
+AR Path="/4B3A13A4/4B3A135D" Ref="#PWR033"  Part="1" 
+AR Path="/4B3A1333/4B3A135D" Ref="#PWR049"  Part="1" 
+F 0 "#PWR049" H 8600 3420 20  0001 C CNN
 F 1 "HT" H 8600 3390 40  0000 C CNN
 F 2 "" H 8600 3300 60  0001 C CNN
 F 3 "" H 8600 3300 60  0001 C CNN
@@ -702,12 +678,12 @@ F 3 "" H 4850 2400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +12V #U035
+L +12V #U034
 U 1 1 4B3A135B
 P 4750 1950
-AR Path="/4B3A13A4/4B3A135B" Ref="#U035"  Part="1" 
-AR Path="/4B3A1333/4B3A135B" Ref="#U051"  Part="1" 
-F 0 "#U035" H 4750 1900 20  0001 C CNN
+AR Path="/4B3A13A4/4B3A135B" Ref="#U034"  Part="1" 
+AR Path="/4B3A1333/4B3A135B" Ref="#U050"  Part="1" 
+F 0 "#U050" H 4750 1900 20  0001 C CNN
 F 1 "+12V" H 4750 2050 40  0000 C CNN
 F 2 "" H 4750 1950 60  0001 C CNN
 F 3 "" H 4750 1950 60  0001 C CNN
@@ -758,23 +734,17 @@ $EndComp
 Wire Wire Line
 	7900 4200 7900 4300
 Wire Wire Line
-	8600 4450 8900 4450
-Wire Wire Line
-	8900 4450 9200 4450
+	8600 4450 9200 4450
 Wire Wire Line
 	8600 4450 8600 4600
 Wire Wire Line
-	8600 4150 9100 4150
-Wire Wire Line
-	9100 4150 9200 4150
+	8600 4150 9200 4150
 Wire Wire Line
 	8600 4150 8600 3900
 Wire Wire Line
 	2850 2550 2850 2500
 Wire Wire Line
-	4350 2000 4350 2200
-Wire Wire Line
-	4350 2200 4350 2300
+	4350 2000 4350 2300
 Wire Wire Line
 	4350 2200 4000 2200
 Wire Wire Line
@@ -791,9 +761,7 @@ Wire Wire Line
 Wire Wire Line
 	7900 2450 7900 2500
 Wire Wire Line
-	8300 4800 8100 4800
-Wire Wire Line
-	8100 4800 7900 4800
+	7900 4800 8300 4800
 Connection ~ 7900 4800
 Wire Wire Line
 	8100 5950 8100 6000
diff --git a/demos/complex_hierarchy/complex_hierarchy.pro b/demos/complex_hierarchy/complex_hierarchy.pro
index 54b6b1de9a..28f8a744a6 100644
--- a/demos/complex_hierarchy/complex_hierarchy.pro
+++ b/demos/complex_hierarchy/complex_hierarchy.pro
@@ -1,4 +1,4 @@
-update=25/01/2014 08:37:41
+update=18/05/2015 09:00:28
 version=1
 last_client=kicad
 [cvpcb]
@@ -6,26 +6,6 @@ version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[eeschema]
-version=1
-PageLayoutDescrFile=
-SubpartIdSeparator=0
-SubpartFirstId=65
-LibDir=F:/kicad/share/library
-NetFmtName=
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=interface
-LibName8=special
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -50,3 +30,9 @@ ModuleOutlineThickness=0.2
 LibDir=
 [general]
 version=1
+[eeschema]
+version=1
+LibDir=F:/kicad/share/library
+[eeschema/libraries]
+LibName1=complex_hierarchy_schlib
+LibName2=power
diff --git a/demos/complex_hierarchy/complex_hierarchy.sch b/demos/complex_hierarchy/complex_hierarchy.sch
index ebfc2a18f5..ab9e24e519 100644
--- a/demos/complex_hierarchy/complex_hierarchy.sch
+++ b/demos/complex_hierarchy/complex_hierarchy.sch
@@ -1,12 +1,6 @@
 EESchema Schematic File Version 2
+LIBS:complex_hierarchy_schlib
 LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:interface
-LIBS:special
 LIBS:complex_hierarchy-cache
 EELAYER 25 0
 EELAYER END
@@ -332,10 +326,10 @@ F 3 "" H 3800 2450 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #U016
+L PWR_FLAG #U015
 U 1 1 4AE17C31
 P 2200 1650
-F 0 "#U016" H 2200 1920 30  0001 C CNN
+F 0 "#U015" H 2200 1920 30  0001 C CNN
 F 1 "PWR_FLAG" H 2200 1880 30  0000 C CNN
 F 2 "" H 2200 1650 60  0001 C CNN
 F 3 "" H 2200 1650 60  0001 C CNN
@@ -343,10 +337,10 @@ F 3 "" H 2200 1650 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +12V #U017
+L +12V #U016
 U 1 1 4AE173EF
 P 3550 2450
-F 0 "#U017" H 3550 2400 20  0001 C CNN
+F 0 "#U016" H 3550 2400 20  0001 C CNN
 F 1 "+12V" H 3550 2550 40  0000 C CNN
 F 2 "" H 3550 2450 60  0001 C CNN
 F 3 "" H 3550 2450 60  0001 C CNN
@@ -354,10 +348,10 @@ F 3 "" H 3550 2450 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR017
 U 1 1 4AE173D0
 P 3200 3100
-F 0 "#PWR018" H 3200 3100 30  0001 C CNN
+F 0 "#PWR017" H 3200 3100 30  0001 C CNN
 F 1 "GND" H 3200 3030 30  0001 C CNN
 F 2 "" H 3200 3100 60  0001 C CNN
 F 3 "" H 3200 3100 60  0001 C CNN
@@ -387,10 +381,10 @@ F 3 "" H 2700 2500 60  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR018
 U 1 1 4AD71B8E
 P 2100 2800
-F 0 "#PWR019" H 2100 2800 30  0001 C CNN
+F 0 "#PWR018" H 2100 2800 30  0001 C CNN
 F 1 "GND" H 2100 2730 30  0001 C CNN
 F 2 "" H 2100 2800 60  0001 C CNN
 F 3 "" H 2100 2800 60  0001 C CNN
diff --git a/demos/complex_hierarchy/complex_hierarchy_schlib.lib b/demos/complex_hierarchy/complex_hierarchy_schlib.lib
new file mode 100644
index 0000000000..ecb4e7c5e7
--- /dev/null
+++ b/demos/complex_hierarchy/complex_hierarchy_schlib.lib
@@ -0,0 +1,312 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +12C
+#
+DEF +12C #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -30 30 H I C CNN
+F1 "+12C" 0 110 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +12C 1 0 0 0 U 30 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 4 0 1 0  0 0  0 40  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# +12V
+#
+DEF +12V #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C CNN
+F1 "+12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +12V 1 0 0 0 U 20 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# -VAA
+#
+DEF -VAA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 20 H I C CNN
+F1 "-VAA" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X -VAA 1 0 0 0 U 20 20 0 0 W N
+P 3 0 1 0  0 0  0 50  0 50 N
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+ENDDRAW
+ENDDEF
+#
+# 7805
+#
+DEF 7805 U 0 30 N Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7805 LM7812 78L05
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI VI -400 50 200 R 40 40 1 1 I
+X VO VO 400 50 200 L 40 40 1 1 w
+X GND GND 0 -250 100 U 40 40 1 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# HT
+#
+DEF HT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 120 20 H I C CNN
+F1 "HT" 0 90 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X HT 1 0 0 0 U 20 20 0 0 W N
+P 3 0 1 0  0 0  0 40  0 40 N
+P 6 0 1 0  0 40  20 20  0 70  -20 20  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# ICL7660
+#
+DEF ICL7660 U 0 40 Y Y 1 F N
+F0 "U" 200 400 70 H V L CNN
+F1 "ICL7660" 50 -450 70 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -550 -350 550 350 0 1 0 N
+X CAP+ 2 -850 250 300 R 60 60 1 1 I
+X GND 3 -50 -650 300 U 60 60 1 1 W
+X CAP- 4 -850 50 300 R 60 60 1 1 I
+X VOUT 5 850 150 300 L 60 60 1 1 w
+X LV 6 850 -150 300 L 60 60 1 1 I
+X OSC 7 -850 -150 300 R 60 60 1 1 I
+X V+ 8 -50 650 300 D 60 60 1 1 W
+ENDDRAW
+ENDDEF
+#
+# LM358
+#
+DEF LM358 U 0 20 Y Y 2 F N
+F0 "U" -50 200 60 H V L CNN
+F1 "LM358" -50 -250 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LMC6062 LMC6082 LM358N TL072 TL082
+DRAW
+P 4 0 1 6  -200 200  200 0  -200 -200  -200 200 f
+X V- 4 -100 -400 250 U 40 40 0 1 W
+X V+ 8 -100 400 250 D 40 40 0 1 W
+X ~ 1 500 0 300 L 40 40 1 1 O
+X - 2 -500 -100 300 R 40 40 1 1 I
+X + 3 -500 100 300 R 40 40 1 1 I
+X + 5 -500 100 300 R 40 40 2 1 I
+X - 6 -500 -100 300 R 40 40 2 1 I
+X ~ 7 500 0 300 L 40 40 2 1 O
+ENDDRAW
+ENDDEF
+#
+# MPSA42
+#
+DEF MPSA42 Q 0 40 Y N 1 F N
+F0 "Q" 150 -150 60 H V L CNN
+F1 "MPSA42" 150 150 60 H V L CNN
+F2 "TO92-CBE" 150 0 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ TO92-CBE
+$ENDFPLIST
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X B B -200 0 200 R 40 40 1 1 I
+X C C 100 200 100 D 40 40 1 1 P
+X E E 100 -200 100 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MPSA92
+#
+DEF MPSA92 Q 0 40 Y N 1 F N
+F0 "Q" 150 -150 60 H V L CNN
+F1 "MPSA92" 150 150 60 H V L CNN
+F2 "TO92-CBE" 150 0 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ TO92-CBE
+$ENDFPLIST
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 F
+P 3 0 1 0  25 -25  0 0  0 0 N
+P 3 0 1 0  100 -100  65 -65  65 -65 N
+P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+X B B -200 0 200 R 40 40 1 1 I
+X C C 100 200 100 D 40 40 1 1 P
+X E E 100 -200 100 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -100 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
+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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/ecc83/ecc83-pp-cache.lib b/demos/ecc83/ecc83-pp-cache.lib
index 150d1a1fff..f862be2468 100644
--- a/demos/ecc83/ecc83-pp-cache.lib
+++ b/demos/ecc83/ecc83-pp-cache.lib
@@ -4,20 +4,22 @@ EESchema-LIBRARY Version 2.3
 # 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
+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 100 30 H V C CNN
+F3 "" 0 0 60 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,7 +56,7 @@ ENDDEF
 DEF ECC81 U 0 0 Y Y 3 L N
 F0 "U" 130 310 50 H V C CNN
 F1 "ECC81" 350 -300 50 H V C CNN
-F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
+F2 "VALVE-NOVAL_P" 400 -350 30 H I C CNN
 F3 "" 0 0 60 H V C CNN
 ALIAS ECC83
 DRAW
@@ -72,44 +74,44 @@ P 2 1 1 6  -75 0  -125 0 N
 P 2 1 1 6  -25 0  25 0 N
 P 2 1 1 6  75 0  125 0 N
 P 3 1 1 10  -100 200  110 200  110 200 N
-X A 6 0 400 100 D 40 40 1 1 O
+X A 6 0 400 100 D 40 40 1 1 P
 X G 7 -300 0 100 R 40 40 1 1 I
-X K 8 -100 -400 100 U 40 40 1 1 B
+X K 8 -100 -400 100 U 40 40 1 1 P
 A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
 P 2 2 1 0  -200 0  -125 0 N
 P 2 2 1 6  -75 0  -125 0 N
 P 2 2 1 6  -25 0  25 0 N
 P 2 2 1 6  75 0  125 0 N
 P 3 2 1 10  -100 200  110 200  110 200 N
-X A 1 0 400 100 D 40 40 2 1 O
+X A 1 0 400 100 D 40 40 2 1 P
 X G 2 -300 0 100 R 40 40 2 1 I
-X K 3 -100 -400 100 U 40 40 2 1 B
+X K 3 -100 -400 100 U 40 40 2 1 P
 A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
 A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
-X F1 4 -100 -450 200 U 40 40 3 1 W
-X F1 5 100 -450 200 U 40 40 3 1 W
-X F2 9 0 -450 200 U 40 40 3 1 W
+X F1 4 -100 -450 200 U 40 40 3 1 I
+X F1 5 100 -450 200 U 40 40 3 1 I
+X F2 9 0 -450 200 U 40 40 3 1 I
 ENDDRAW
 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
+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 60 H V C CNN
 F3 "" 0 0 60 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
 #
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 95 30 H I C CNN
-F1 "PWR_FLAG" 0 180 30 H V C CNN
+F0 "#FLG" 0 95 50 H I C CNN
+F1 "PWR_FLAG" 0 180 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -121,21 +123,18 @@ 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
+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
 $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 60 60 1 1 P
+X ~ 2 0 -150 50 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/demos/ecc83/ecc83-pp.kicad_pcb b/demos/ecc83/ecc83-pp.kicad_pcb
index adb2b7bd79..52363f27a2 100644
--- a/demos/ecc83/ecc83-pp.kicad_pcb
+++ b/demos/ecc83/ecc83-pp.kicad_pcb
@@ -1,9 +1,9 @@
-(kicad_pcb (version 4) (host pcbnew "(2014-12-31 BZR 5344)-product")
+(kicad_pcb (version 4) (host pcbnew "(2015-05-13 BZR 5653)-product")
 
   (general
     (links 20)
     (no_connects 0)
-    (area 121.326286 89.674 171.408715 136.0628)
+    (area 123.761499 90.741499 168.338501 132.778501)
     (thickness 1.6002)
     (drawings 4)
     (tracks 57)
@@ -507,63 +507,63 @@
   (gr_line (start 168.275 90.805) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.127))
   (gr_line (start 123.825 90.805) (end 123.825 132.715) (angle 90) (layer Edge.Cuts) (width 0.127))
 
-  (segment (start 164.465 107.95) (end 165.735 107.95) (width 0.8636) (layer Cuivre) (net 1) (status 800))
-  (segment (start 138.43 95.885) (end 139.065 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 800))
-  (segment (start 139.065 95.25) (end 142.24 95.25) (width 0.8636) (layer Cuivre) (net 1))
-  (segment (start 146.05 97.79) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
-  (segment (start 164.465 125.095) (end 164.465 124.46) (width 0.8636) (layer Cuivre) (net 1) (status 800))
   (segment (start 142.24 95.25) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
-  (segment (start 128.27 105.41) (end 132.08 105.41) (width 0.8636) (layer Cuivre) (net 2) (status 800))
-  (segment (start 132.08 105.41) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
-  (segment (start 145.7706 108.91012) (end 145.7706 103.8606) (width 0.8636) (layer Cuivre) (net 2) (status 800))
-  (segment (start 142.875 100.965) (end 138.43 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 400))
-  (segment (start 145.7706 103.8606) (end 142.875 100.965) (width 0.8636) (layer Cuivre) (net 2))
-  (segment (start 138.43 100.965) (end 136.525 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 800))
+  (segment (start 164.465 125.095) (end 164.465 124.46) (width 0.8636) (layer Cuivre) (net 1) (status 800))
+  (segment (start 146.05 97.79) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
+  (segment (start 139.065 95.25) (end 142.24 95.25) (width 0.8636) (layer Cuivre) (net 1))
+  (segment (start 138.43 95.885) (end 139.065 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 800))
+  (segment (start 164.465 107.95) (end 165.735 107.95) (width 0.8636) (layer Cuivre) (net 1) (status 800))
   (segment (start 136.525 100.965) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
-  (segment (start 133.985 125.095) (end 128.27 119.38) (width 0.8636) (layer Cuivre) (net 3))
-  (segment (start 133.985 126.365) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
+  (segment (start 138.43 100.965) (end 136.525 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 800))
+  (segment (start 145.7706 103.8606) (end 142.875 100.965) (width 0.8636) (layer Cuivre) (net 2))
+  (segment (start 142.875 100.965) (end 138.43 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 400))
+  (segment (start 145.7706 108.91012) (end 145.7706 103.8606) (width 0.8636) (layer Cuivre) (net 2) (status 800))
+  (segment (start 132.08 105.41) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
+  (segment (start 128.27 105.41) (end 132.08 105.41) (width 0.8636) (layer Cuivre) (net 2) (status 800))
   (segment (start 137.16 125.095) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
-  (segment (start 143.49984 115.57) (end 143.61668 115.45316) (width 0.8636) (layer Cuivre) (net 4))
-  (segment (start 137.16 115.57) (end 143.49984 115.57) (width 0.8636) (layer Cuivre) (net 4))
-  (segment (start 135.89 115.57) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
+  (segment (start 133.985 126.365) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
+  (segment (start 133.985 125.095) (end 128.27 119.38) (width 0.8636) (layer Cuivre) (net 3))
   (segment (start 137.16 120.015) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
-  (segment (start 157.4038 115.4938) (end 159.385 117.475) (width 0.8636) (layer Cuivre) (net 5))
-  (segment (start 164.465 117.475) (end 164.465 113.03) (width 0.8636) (layer Cuivre) (net 5) (status C00))
-  (segment (start 154.83332 115.4938) (end 157.4038 115.4938) (width 0.8636) (layer Cuivre) (net 5) (status 800))
+  (segment (start 135.89 115.57) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
+  (segment (start 137.16 115.57) (end 143.49984 115.57) (width 0.8636) (layer Cuivre) (net 4))
+  (segment (start 143.49984 115.57) (end 143.61668 115.45316) (width 0.8636) (layer Cuivre) (net 4))
   (segment (start 159.385 117.475) (end 164.465 117.475) (width 0.8636) (layer Cuivre) (net 5) (status 400))
-  (segment (start 149.225 107.7722) (end 149.225 110.49) (width 0.8636) (layer Cuivre) (net 6) (status 800))
-  (segment (start 151.54148 107.7722) (end 152.6794 108.91012) (width 0.8636) (layer Cuivre) (net 6) (status 400))
-  (segment (start 149.225 107.7722) (end 151.54148 107.7722) (width 0.8636) (layer Cuivre) (net 6) (status 800))
-  (segment (start 149.225 110.49) (end 149.86 111.125) (width 0.8636) (layer Cuivre) (net 6))
-  (segment (start 149.86 111.125) (end 149.86 128.905) (width 0.8636) (layer Cuivre) (net 6))
+  (segment (start 154.83332 115.4938) (end 157.4038 115.4938) (width 0.8636) (layer Cuivre) (net 5) (status 800))
+  (segment (start 164.465 117.475) (end 164.465 113.03) (width 0.8636) (layer Cuivre) (net 5) (status C00))
+  (segment (start 157.4038 115.4938) (end 159.385 117.475) (width 0.8636) (layer Cuivre) (net 5))
   (segment (start 149.86 128.905) (end 150.495 129.54) (width 0.8636) (layer Cuivre) (net 6) (status 400))
-  (segment (start 145.7706 118.41988) (end 145.7706 129.1844) (width 0.8636) (layer Cuivre) (net 7) (status 800))
+  (segment (start 149.86 111.125) (end 149.86 128.905) (width 0.8636) (layer Cuivre) (net 6))
+  (segment (start 149.225 110.49) (end 149.86 111.125) (width 0.8636) (layer Cuivre) (net 6))
+  (segment (start 149.225 107.7722) (end 151.54148 107.7722) (width 0.8636) (layer Cuivre) (net 6) (status 800))
+  (segment (start 151.54148 107.7722) (end 152.6794 108.91012) (width 0.8636) (layer Cuivre) (net 6) (status 400))
+  (segment (start 149.225 107.7722) (end 149.225 110.49) (width 0.8636) (layer Cuivre) (net 6) (status 800))
   (segment (start 145.7706 129.1844) (end 145.415 129.54) (width 0.8636) (layer Cuivre) (net 7) (status 400))
-  (segment (start 154.94 130.175) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 154.94 121.31548) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 140.335 131.445) (end 140.716 131.826) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.89 107.95) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
-  (segment (start 135.255 107.95) (end 133.985 109.22) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 133.985 109.22) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.89 107.95) (end 135.255 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
-  (segment (start 139.065 130.175) (end 140.335 131.445) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 139.065 124.46) (end 139.065 130.175) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 136.525 121.92) (end 139.065 124.46) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 136.525 121.92) (end 136.398 121.92) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.509 117.729) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.509 121.031) (end 135.509 117.729) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 136.398 121.92) (end 135.509 121.031) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 154.94 120.68048) (end 152.6794 118.41988) (width 0.8636) (layer Cuivre) (net 8) (status 400))
-  (segment (start 154.94 121.31548) (end 154.94 120.68048) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 141.6812 111.8362) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 143.61668 111.8362) (end 141.6812 111.8362) (width 0.8636) (layer Cuivre) (net 8) (status 800))
-  (segment (start 140.716 131.826) (end 153.289 131.826) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 145.7706 118.41988) (end 145.7706 129.1844) (width 0.8636) (layer Cuivre) (net 7) (status 800))
   (segment (start 153.289 131.826) (end 154.94 130.175) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 153.67 97.79) (end 157.48 97.79) (width 0.8636) (layer Cuivre) (net 9) (status 800))
-  (segment (start 157.48 97.79) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
-  (segment (start 154.83332 111.23168) (end 159.385 106.68) (width 0.8636) (layer Cuivre) (net 9))
-  (segment (start 159.385 106.68) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 140.716 131.826) (end 153.289 131.826) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 143.61668 111.8362) (end 141.6812 111.8362) (width 0.8636) (layer Cuivre) (net 8) (status 800))
+  (segment (start 141.6812 111.8362) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 154.94 121.31548) (end 154.94 120.68048) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 154.94 120.68048) (end 152.6794 118.41988) (width 0.8636) (layer Cuivre) (net 8) (status 400))
+  (segment (start 136.398 121.92) (end 135.509 121.031) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.509 121.031) (end 135.509 117.729) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.509 117.729) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 136.525 121.92) (end 136.398 121.92) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 136.525 121.92) (end 139.065 124.46) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 139.065 124.46) (end 139.065 130.175) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 139.065 130.175) (end 140.335 131.445) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.89 107.95) (end 135.255 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
+  (segment (start 133.985 109.22) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.255 107.95) (end 133.985 109.22) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.89 107.95) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
+  (segment (start 140.335 131.445) (end 140.716 131.826) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 154.94 121.31548) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 154.94 130.175) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
   (segment (start 154.83332 111.8362) (end 154.83332 111.23168) (width 0.8636) (layer Cuivre) (net 9) (status 800))
+  (segment (start 159.385 106.68) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 154.83332 111.23168) (end 159.385 106.68) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 157.48 97.79) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 153.67 97.79) (end 157.48 97.79) (width 0.8636) (layer Cuivre) (net 9) (status 800))
 
   (zone (net 1) (net_name GND) (layer Cuivre) (tstamp 4EED97A2) (hatch edge 0.508)
     (connect_pads (clearance 0.635))
diff --git a/demos/ecc83/ecc83-pp.net b/demos/ecc83/ecc83-pp.net
index 3bd0bc76d1..06bed3ae22 100644
--- a/demos/ecc83/ecc83-pp.net
+++ b/demos/ecc83/ecc83-pp.net
@@ -1,138 +1,138 @@
 (export (version D)
   (design
     (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch)
-    (date "01/01/2015 18:01:45")
-    (tool "Eeschema (2014-12-31 BZR 5344)-product"))
+    (date "17/05/2015 17:07:31")
+    (tool "Eeschema (2015-05-13 BZR 5653)-product")
+    (sheet (number 1) (name /) (tstamps /)
+      (title_block
+        (title "ECC Push-Pull")
+        (company)
+        (rev 0.1)
+        (date "Sat 21 Mar 2015")
+        (source ecc83-pp.sch)
+        (comment (number 1) (value ""))
+        (comment (number 2) (value ""))
+        (comment (number 3) (value ""))
+        (comment (number 4) (value "")))))
   (components
     (comp (ref U1)
       (value ECC83)
       (footprint Valves:VALVE-ECC-83-1)
-      (libsource (lib valves) (part ECC83))
+      (libsource (lib ecc83_schlib) (part ECC83))
       (sheetpath (names /) (tstamps /))
       (tstamp 48B4F266))
     (comp (ref P4)
       (value CONN_2)
       (footprint connect:bornier2)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 456A8ACC))
     (comp (ref C1)
       (value 10uF)
       (footprint discret:C2V10)
-      (libsource (lib device) (part C))
+      (libsource (lib ecc83_schlib) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F4BE))
     (comp (ref P3)
       (value POWER)
       (footprint connect:bornier2)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F4A5))
     (comp (ref P2)
       (value OUT)
       (footprint connect:bornier2)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F46C))
     (comp (ref P1)
       (value IN)
       (footprint connect:bornier2)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F464))
     (comp (ref C2)
       (value 680nF)
       (footprint discret:C2)
-      (libsource (lib device) (part C))
+      (libsource (lib ecc83_schlib) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3BE))
     (comp (ref R3)
       (value 100K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3AD))
     (comp (ref R4)
       (value 47K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3A2))
     (comp (ref R2)
       (value 1.5K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F39D))
     (comp (ref R1)
       (value 1.5K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F38A))
     (comp (ref P5)
       (value CONN_1)
-      (libsource (lib conn) (part CONN_1))
+      (footprint connect:1pin)
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A5890A))
     (comp (ref P6)
       (value CONN_1)
-      (libsource (lib conn) (part CONN_1))
+      (footprint connect:1pin)
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A58C65))
     (comp (ref P7)
       (value CONN_1)
-      (libsource (lib conn) (part CONN_1))
+      (footprint connect:1pin)
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A58C8A))
     (comp (ref P8)
       (value CONN_1)
-      (libsource (lib conn) (part CONN_1))
+      (footprint connect:1pin)
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A58CA3)))
   (libparts
-    (libpart (lib device) (part C)
-      (description "Condensateur non polarise")
+    (libpart (lib ecc83_schlib) (part C)
       (footprints
-        (fp SM*)
         (fp C?)
-        (fp C1-1))
+        (fp C_????_*)
+        (fp C_????)
+        (fp SMD*_c)
+        (fp Capacitor*))
       (fields
         (field (name Reference) C)
         (field (name Value) C))
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part R)
-      (description Resistance)
-      (footprints
-        (fp R?)
-        (fp SM0603)
-        (fp SM0805)
-        (fp R?-*)
-        (fp SM1206))
-      (fields
-        (field (name Reference) R)
-        (field (name Value) R))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part CONN_1)
-      (description "1 pin")
+    (libpart (lib ecc83_schlib) (part CONN_1)
       (fields
         (field (name Reference) P)
         (field (name Value) CONN_1))
       (pins
         (pin (num 1) (name 1) (type passive))))
-    (libpart (lib conn) (part CONN_2)
-      (description "Symbole general de connecteur")
+    (libpart (lib ecc83_schlib) (part CONN_2)
       (fields
         (field (name Reference) P)
         (field (name Value) CONN_2))
       (pins
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name PM) (type passive))))
-    (libpart (lib valves) (part ECC81)
+    (libpart (lib ecc83_schlib) (part ECC81)
       (aliases
         (alias ECC83))
       (fields
@@ -140,66 +140,72 @@
         (field (name Value) ECC81)
         (field (name Footprint) VALVE-NOVAL_P))
       (pins
-        (pin (num 1) (name A) (type output))
+        (pin (num 1) (name A) (type passive))
         (pin (num 2) (name G) (type input))
-        (pin (num 3) (name K) (type BiDi))
-        (pin (num 4) (name F1) (type power_in))
-        (pin (num 5) (name F1) (type power_in))
-        (pin (num 6) (name A) (type output))
+        (pin (num 3) (name K) (type passive))
+        (pin (num 4) (name F1) (type input))
+        (pin (num 5) (name F1) (type input))
+        (pin (num 6) (name A) (type passive))
         (pin (num 7) (name G) (type input))
-        (pin (num 8) (name K) (type BiDi))
-        (pin (num 9) (name F2) (type power_in)))))
+        (pin (num 8) (name K) (type passive))
+        (pin (num 9) (name F2) (type input))))
+    (libpart (lib ecc83_schlib) (part R)
+      (footprints
+        (fp R_*)
+        (fp Resistor_*))
+      (fields
+        (field (name Reference) R)
+        (field (name Value) R))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive)))))
   (libraries
-    (library (logical device)
-      (uri f:\kicad\share\kicad\library\device.lib))
-    (library (logical conn)
-      (uri f:\kicad\share\kicad\library\conn.lib))
-    (library (logical valves)
-      (uri f:\kicad\share\kicad\library\valves.lib)))
+    (library (logical ecc83_schlib)
+      (uri ecc83_schlib.lib)))
   (nets
-    (net (code 1) (name GND)
-      (node (ref R4) (pin 2))
+    (net (code 1) (name "Net-(P1-Pad2)")
+      (node (ref U1) (pin 2))
+      (node (ref P1) (pin 2))
+      (node (ref R4) (pin 1)))
+    (net (code 2) (name GND)
+      (node (ref P2) (pin 2))
       (node (ref R2) (pin 2))
+      (node (ref R4) (pin 2))
       (node (ref R3) (pin 2))
       (node (ref P1) (pin 1))
-      (node (ref P2) (pin 2))
       (node (ref P3) (pin 2))
       (node (ref C1) (pin 2)))
-    (net (code 2) (name "Net-(C1-Pad1)")
-      (node (ref U1) (pin 6))
+    (net (code 3) (name "Net-(C1-Pad1)")
+      (node (ref C1) (pin 1))
       (node (ref P3) (pin 1))
-      (node (ref C1) (pin 1)))
-    (net (code 3) (name "Net-(R2-Pad1)")
+      (node (ref U1) (pin 6)))
+    (net (code 4) (name "Net-(C2-Pad2)")
+      (node (ref C2) (pin 2))
+      (node (ref U1) (pin 8))
+      (node (ref R1) (pin 2)))
+    (net (code 5) (name "Net-(C2-Pad1)")
+      (node (ref R3) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref P2) (pin 1)))
+    (net (code 6) (name "Net-(P8-Pad1)")
+      (node (ref P8) (pin 1)))
+    (net (code 7) (name "Net-(P7-Pad1)")
+      (node (ref P7) (pin 1)))
+    (net (code 8) (name "Net-(P6-Pad1)")
+      (node (ref P6) (pin 1)))
+    (net (code 9) (name "Net-(P5-Pad1)")
+      (node (ref P5) (pin 1)))
+    (net (code 10) (name "Net-(P4-Pad2)")
+      (node (ref P4) (pin 2))
+      (node (ref U1) (pin 9)))
+    (net (code 11) (name "Net-(R2-Pad1)")
       (node (ref U1) (pin 3))
       (node (ref R2) (pin 1)))
-    (net (code 4) (name "Net-(P8-Pad1)")
-      (node (ref P8) (pin 1)))
-    (net (code 5) (name "Net-(P7-Pad1)")
-      (node (ref P7) (pin 1)))
-    (net (code 6) (name "Net-(P6-Pad1)")
-      (node (ref P6) (pin 1)))
-    (net (code 7) (name "Net-(P5-Pad1)")
-      (node (ref P5) (pin 1)))
-    (net (code 8) (name "Net-(C2-Pad2)")
-      (node (ref U1) (pin 8))
-      (node (ref C2) (pin 2))
-      (node (ref R1) (pin 2)))
-    (net (code 9) (name "Net-(C2-Pad1)")
-      (node (ref C2) (pin 1))
-      (node (ref P2) (pin 1))
-      (node (ref R3) (pin 1)))
-    (net (code 10) (name "Net-(P4-Pad2)")
-      (node (ref U1) (pin 9))
-      (node (ref P4) (pin 2)))
-    (net (code 11) (name "Net-(P1-Pad2)")
-      (node (ref U1) (pin 2))
-      (node (ref R4) (pin 1))
-      (node (ref P1) (pin 2)))
     (net (code 12) (name "Net-(R1-Pad1)")
       (node (ref R1) (pin 1))
       (node (ref U1) (pin 1))
       (node (ref U1) (pin 7)))
     (net (code 13) (name "Net-(P4-Pad1)")
-      (node (ref U1) (pin 4))
+      (node (ref U1) (pin 5))
       (node (ref P4) (pin 1))
-      (node (ref U1) (pin 5)))))
\ No newline at end of file
+      (node (ref U1) (pin 4)))))
\ No newline at end of file
diff --git a/demos/ecc83/ecc83-pp.pro b/demos/ecc83/ecc83-pp.pro
index 4e5100249d..3ea4647823 100644
--- a/demos/ecc83/ecc83-pp.pro
+++ b/demos/ecc83/ecc83-pp.pro
@@ -1,4 +1,4 @@
-update=01/01/2015 18:35:22
+update=17/05/2015 17:04:51
 last_client=kicad
 [general]
 version=1
@@ -11,17 +11,6 @@ version=1
 NetIExt=.net
 [cvpcb/libraries]
 EquName1=devcms
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=conn
-LibName4=valves
-LibName5=linear
-LibName6=regul
-LibName7=special
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -42,3 +31,9 @@ SolderMaskMinWidth=0
 DrawSegmentWidth=0.381
 BoardOutlineThickness=0.381
 ModuleOutlineThickness=0.381
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=ecc83_schlib
+LibName2=power
diff --git a/demos/ecc83/ecc83-pp.sch b/demos/ecc83/ecc83-pp.sch
index 621825394e..41cf37017e 100644
--- a/demos/ecc83/ecc83-pp.sch
+++ b/demos/ecc83/ecc83-pp.sch
@@ -1,12 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:conn
-LIBS:valves
-LIBS:linear
-LIBS:regul
-LIBS:special
-LIBS:ecc83-pp-cache
+LIBS:ecc83_schlib
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -29,15 +22,15 @@ Wire Wire Line
 	2000 2000 6300 2000
 Connection ~ 3400 2000
 Wire Wire Line
-	7150 3000 7900 3000
+	7050 3000 7800 3000
 Wire Wire Line
-	7400 3000 7400 3200
+	7300 3000 7300 3200
 Wire Wire Line
 	2000 3500 2600 3500
 Wire Wire Line
 	2400 3500 2400 3400
 Wire Wire Line
-	6200 3600 6200 3850
+	6200 3500 6200 3850
 $Comp
 L ECC83 U1
 U 3 1 48B4F266
@@ -74,45 +67,45 @@ $EndComp
 $Comp
 L GND #PWR01
 U 1 1 457DBAF8
-P 7800 3300
-F 0 "#PWR01" H 7800 3300 30  0001 C CNN
-F 1 "GND" H 7800 3230 30  0001 C CNN
-F 2 "" H 7800 3300 60  0001 C CNN
-F 3 "" H 7800 3300 60  0001 C CNN
-	1    7800 3300
+P 7700 3300
+F 0 "#PWR01" H 7700 3300 30  0001 C CNN
+F 1 "GND" H 7700 3230 30  0001 C CNN
+F 2 "" H 7700 3300 60  0001 C CNN
+F 3 "" H 7700 3300 60  0001 C CNN
+	1    7700 3300
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR02
 U 1 1 457DBAF5
-P 7400 3750
-F 0 "#PWR02" H 7400 3750 30  0001 C CNN
-F 1 "GND" H 7400 3680 30  0001 C CNN
-F 2 "" H 7400 3750 60  0001 C CNN
-F 3 "" H 7400 3750 60  0001 C CNN
-	1    7400 3750
+P 7300 3550
+F 0 "#PWR02" H 7300 3550 30  0001 C CNN
+F 1 "GND" H 7300 3480 30  0001 C CNN
+F 2 "" H 7300 3550 60  0001 C CNN
+F 3 "" H 7300 3550 60  0001 C CNN
+	1    7300 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR03
 U 1 1 457DBAF1
-P 6100 5400
-F 0 "#PWR03" H 6100 5400 30  0001 C CNN
-F 1 "GND" H 6100 5330 30  0001 C CNN
-F 2 "" H 6100 5400 60  0001 C CNN
-F 3 "" H 6100 5400 60  0001 C CNN
-	1    6100 5400
+P 6100 5200
+F 0 "#PWR03" H 6100 5200 30  0001 C CNN
+F 1 "GND" H 6100 5130 30  0001 C CNN
+F 2 "" H 6100 5200 60  0001 C CNN
+F 3 "" H 6100 5200 60  0001 C CNN
+	1    6100 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR04
 U 1 1 457DBAEF
-P 5700 5400
-F 0 "#PWR04" H 5700 5400 30  0001 C CNN
-F 1 "GND" H 5700 5330 30  0001 C CNN
-F 2 "" H 5700 5400 60  0001 C CNN
-F 3 "" H 5700 5400 60  0001 C CNN
-	1    5700 5400
+P 5700 5200
+F 0 "#PWR04" H 5700 5200 30  0001 C CNN
+F 1 "GND" H 5700 5130 30  0001 C CNN
+F 2 "" H 5700 5200 60  0001 C CNN
+F 3 "" H 5700 5200 60  0001 C CNN
+	1    5700 5200
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -140,12 +133,12 @@ $EndComp
 $Comp
 L C C1
 U 1 1 4549F4BE
-P 3400 2300
-F 0 "C1" H 3450 2400 50  0000 L CNN
-F 1 "10uF" H 3150 2400 50  0000 L CNN
-F 2 "discret:C2V10" H 3400 2300 60  0001 C CNN
-F 3 "" H 3400 2300 60  0001 C CNN
-	1    3400 2300
+P 3400 2250
+F 0 "C1" H 3450 2350 50  0000 L CNN
+F 1 "10uF" H 3150 2350 50  0000 L CNN
+F 2 "discret:C2V10" H 3400 2250 60  0001 C CNN
+F 3 "" H 3400 2250 60  0001 C CNN
+	1    3400 2250
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -162,12 +155,12 @@ $EndComp
 $Comp
 L CONN_2 P2
 U 1 1 4549F46C
-P 8250 3100
-F 0 "P2" V 8200 3100 40  0000 C CNN
-F 1 "OUT" V 8300 3100 40  0000 C CNN
-F 2 "connect:bornier2" H 8250 3100 60  0001 C CNN
-F 3 "" H 8250 3100 60  0001 C CNN
-	1    8250 3100
+P 8150 3100
+F 0 "P2" V 8100 3100 40  0000 C CNN
+F 1 "OUT" V 8200 3100 40  0000 C CNN
+F 2 "connect:bornier2" H 8150 3100 60  0001 C CNN
+F 3 "" H 8150 3100 60  0001 C CNN
+	1    8150 3100
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -184,45 +177,45 @@ $EndComp
 $Comp
 L C C2
 U 1 1 4549F3BE
-P 6950 3000
-F 0 "C2" V 6800 3000 50  0000 C CNN
-F 1 "680nF" V 7100 3000 50  0000 C CNN
-F 2 "discret:C2" H 6950 3000 60  0001 C CNN
-F 3 "" H 6950 3000 60  0001 C CNN
-	1    6950 3000
+P 6900 3000
+F 0 "C2" V 6750 3000 50  0000 C CNN
+F 1 "680nF" V 7050 3000 50  0000 C CNN
+F 2 "discret:C2" H 6900 3000 60  0001 C CNN
+F 3 "" H 6900 3000 60  0001 C CNN
+	1    6900 3000
 	0    1    1    0   
 $EndComp
 $Comp
 L R R3
 U 1 1 4549F3AD
-P 7400 3450
-F 0 "R3" H 7300 3650 50  0000 C CNN
-F 1 "100K" V 7400 3450 50  0000 C CNN
-F 2 "discret:R3" H 7400 3450 60  0001 C CNN
-F 3 "" H 7400 3450 60  0001 C CNN
-	1    7400 3450
+P 7300 3350
+F 0 "R3" H 7200 3550 50  0000 C CNN
+F 1 "100K" V 7300 3350 50  0000 C CNN
+F 2 "discret:R3" H 7300 3350 60  0001 C CNN
+F 3 "" H 7300 3350 60  0001 C CNN
+	1    7300 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 5700 5100
-F 0 "R4" H 5600 5300 50  0000 C CNN
-F 1 "47K" V 5700 5100 50  0000 C CNN
-F 2 "discret:R3" H 5700 5100 60  0001 C CNN
-F 3 "" H 5700 5100 60  0001 C CNN
-	1    5700 5100
+P 5700 5000
+F 0 "R4" H 5600 5200 50  0000 C CNN
+F 1 "47K" V 5700 5000 50  0000 C CNN
+F 2 "discret:R3" H 5700 5000 60  0001 C CNN
+F 3 "" H 5700 5000 60  0001 C CNN
+	1    5700 5000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 6100 5100
-F 0 "R2" H 6000 5300 50  0000 C CNN
-F 1 "1.5K" V 6100 5100 50  0000 C CNN
-F 2 "discret:R3" H 6100 5100 60  0001 C CNN
-F 3 "" H 6100 5100 60  0001 C CNN
-	1    6100 5100
+P 6100 5000
+F 0 "R2" H 6000 5200 50  0000 C CNN
+F 1 "1.5K" V 6100 5000 50  0000 C CNN
+F 2 "discret:R3" H 6100 5000 60  0001 C CNN
+F 3 "" H 6100 5000 60  0001 C CNN
+	1    6100 5000
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -239,12 +232,12 @@ $EndComp
 $Comp
 L GND #PWR06
 U 1 1 53B6F370
-P 3400 2550
-F 0 "#PWR06" H 3400 2550 30  0001 C CNN
-F 1 "GND" H 3400 2480 30  0001 C CNN
-F 2 "" H 3400 2550 60  0001 C CNN
-F 3 "" H 3400 2550 60  0001 C CNN
-	1    3400 2550
+P 3400 2450
+F 0 "#PWR06" H 3400 2450 30  0001 C CNN
+F 1 "GND" H 3400 2380 30  0001 C CNN
+F 2 "" H 3400 2450 60  0001 C CNN
+F 3 "" H 3400 2450 60  0001 C CNN
+	1    3400 2450
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -302,7 +295,7 @@ Wire Wire Line
 	5700 4250 5700 4850
 Connection ~ 5700 4250
 Wire Wire Line
-	6200 2950 6200 3100
+	6200 2950 6200 3200
 Connection ~ 6200 3700
 Wire Wire Line
 	6000 2550 5900 2550
@@ -310,7 +303,7 @@ Wire Wire Line
 	5900 2550 5900 3700
 Wire Wire Line
 	5900 3700 6200 3700
-Connection ~ 7400 3000
+Connection ~ 7300 3000
 Wire Wire Line
 	6750 3000 6200 3000
 Connection ~ 6200 3000
@@ -319,7 +312,7 @@ Wire Wire Line
 Wire Wire Line
 	3400 2100 3400 2000
 Wire Wire Line
-	3400 2550 3400 2500
+	3400 2450 3400 2400
 $Comp
 L PWR_FLAG #FLG07
 U 1 1 550EA992
@@ -370,15 +363,15 @@ Wire Wire Line
 Wire Wire Line
 	5450 4450 5350 4450
 Wire Wire Line
-	6100 5350 6100 5400
+	6100 5150 6100 5200
 Wire Wire Line
-	5700 5350 5700 5400
+	5700 5150 5700 5200
 Wire Wire Line
-	7900 3200 7800 3200
+	7800 3200 7700 3200
 Wire Wire Line
-	7800 3200 7800 3300
+	7700 3200 7700 3300
 Wire Wire Line
-	7400 3750 7400 3700
+	7300 3550 7300 3500
 NoConn ~ 6100 7000
 NoConn ~ 6100 7100
 NoConn ~ 6100 7200
diff --git a/demos/ecc83/ecc83-pp_v2-cache.lib b/demos/ecc83/ecc83-pp_v2-cache.lib
index 150d1a1fff..f862be2468 100644
--- a/demos/ecc83/ecc83-pp_v2-cache.lib
+++ b/demos/ecc83/ecc83-pp_v2-cache.lib
@@ -4,20 +4,22 @@ EESchema-LIBRARY Version 2.3
 # 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
+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 100 30 H V C CNN
+F3 "" 0 0 60 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,7 +56,7 @@ ENDDEF
 DEF ECC81 U 0 0 Y Y 3 L N
 F0 "U" 130 310 50 H V C CNN
 F1 "ECC81" 350 -300 50 H V C CNN
-F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
+F2 "VALVE-NOVAL_P" 400 -350 30 H I C CNN
 F3 "" 0 0 60 H V C CNN
 ALIAS ECC83
 DRAW
@@ -72,44 +74,44 @@ P 2 1 1 6  -75 0  -125 0 N
 P 2 1 1 6  -25 0  25 0 N
 P 2 1 1 6  75 0  125 0 N
 P 3 1 1 10  -100 200  110 200  110 200 N
-X A 6 0 400 100 D 40 40 1 1 O
+X A 6 0 400 100 D 40 40 1 1 P
 X G 7 -300 0 100 R 40 40 1 1 I
-X K 8 -100 -400 100 U 40 40 1 1 B
+X K 8 -100 -400 100 U 40 40 1 1 P
 A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
 P 2 2 1 0  -200 0  -125 0 N
 P 2 2 1 6  -75 0  -125 0 N
 P 2 2 1 6  -25 0  25 0 N
 P 2 2 1 6  75 0  125 0 N
 P 3 2 1 10  -100 200  110 200  110 200 N
-X A 1 0 400 100 D 40 40 2 1 O
+X A 1 0 400 100 D 40 40 2 1 P
 X G 2 -300 0 100 R 40 40 2 1 I
-X K 3 -100 -400 100 U 40 40 2 1 B
+X K 3 -100 -400 100 U 40 40 2 1 P
 A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
 A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
-X F1 4 -100 -450 200 U 40 40 3 1 W
-X F1 5 100 -450 200 U 40 40 3 1 W
-X F2 9 0 -450 200 U 40 40 3 1 W
+X F1 4 -100 -450 200 U 40 40 3 1 I
+X F1 5 100 -450 200 U 40 40 3 1 I
+X F2 9 0 -450 200 U 40 40 3 1 I
 ENDDRAW
 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
+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 60 H V C CNN
 F3 "" 0 0 60 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
 #
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 95 30 H I C CNN
-F1 "PWR_FLAG" 0 180 30 H V C CNN
+F0 "#FLG" 0 95 50 H I C CNN
+F1 "PWR_FLAG" 0 180 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -121,21 +123,18 @@ 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
+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
 $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 60 60 1 1 P
+X ~ 2 0 -150 50 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/demos/ecc83/ecc83-pp_v2.net b/demos/ecc83/ecc83-pp_v2.net
index fcb3549515..ddd48a84ff 100644
--- a/demos/ecc83/ecc83-pp_v2.net
+++ b/demos/ecc83/ecc83-pp_v2.net
@@ -1,115 +1,122 @@
 (export (version D)
   (design
     (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch)
-    (date "01/01/2015 20:57:24")
-    (tool "Eeschema (2014-12-31 BZR 5344)-product"))
+    (date "17/05/2015 17:06:56")
+    (tool "Eeschema (2015-05-13 BZR 5653)-product")
+    (sheet (number 1) (name /) (tstamps /)
+      (title_block
+        (title "ECC Push-Pull")
+        (company)
+        (rev 0.1)
+        (date "Sat 21 Mar 2015")
+        (source ecc83-pp_v2.sch)
+        (comment (number 1) (value ""))
+        (comment (number 2) (value ""))
+        (comment (number 3) (value ""))
+        (comment (number 4) (value "")))))
   (components
     (comp (ref U1)
       (value ECC83)
       (footprint Valves:VALVE-ECC-83-2)
-      (libsource (lib valves) (part ECC83))
+      (libsource (lib ecc83_schlib) (part ECC83))
       (sheetpath (names /) (tstamps /))
       (tstamp 48B4F266))
     (comp (ref P4)
       (value CONN_2)
       (footprint pin_array:pin_array_1x02)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 456A8ACC))
     (comp (ref C1)
       (value 10uF)
       (footprint discret:C2V10)
-      (libsource (lib device) (part C))
+      (libsource (lib ecc83_schlib) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F4BE))
     (comp (ref P3)
       (value POWER)
       (footprint pin_array:pin_array_1x02)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F4A5))
     (comp (ref P2)
       (value OUT)
       (footprint pin_array:pin_array_1x02)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F46C))
     (comp (ref P1)
       (value IN)
       (footprint pin_array:pin_array_1x02)
-      (libsource (lib conn) (part CONN_2))
+      (libsource (lib ecc83_schlib) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F464))
     (comp (ref C2)
       (value 680nF)
       (footprint discret:CP8)
-      (libsource (lib device) (part C))
+      (libsource (lib ecc83_schlib) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3BE))
     (comp (ref R3)
       (value 100K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3AD))
     (comp (ref R4)
       (value 47K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3A2))
     (comp (ref R2)
       (value 1.5K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F39D))
     (comp (ref R1)
       (value 1.5K)
       (footprint discret:R3)
-      (libsource (lib device) (part R))
+      (libsource (lib ecc83_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F38A))
     (comp (ref P5)
       (value CONN_1)
       (footprint connect:1pin)
-      (libsource (lib conn) (part CONN_1))
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A5830A))
     (comp (ref P6)
       (value CONN_1)
       (footprint connect:1pin)
-      (libsource (lib conn) (part CONN_1))
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A58363))
     (comp (ref P7)
       (value CONN_1)
       (footprint connect:1pin)
-      (libsource (lib conn) (part CONN_1))
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A5837A))
     (comp (ref P8)
       (value CONN_1)
       (footprint connect:1pin)
-      (libsource (lib conn) (part CONN_1))
+      (libsource (lib ecc83_schlib) (part CONN_1))
       (sheetpath (names /) (tstamps /))
       (tstamp 54A58391)))
   (libparts
-    (libpart (lib device) (part R)
-      (description Resistance)
+    (libpart (lib ecc83_schlib) (part R)
       (footprints
-        (fp R?)
-        (fp SM0603)
-        (fp SM0805)
-        (fp R?-*)
-        (fp SM1206))
+        (fp R_*)
+        (fp Resistor_*))
       (fields
         (field (name Reference) R)
         (field (name Value) R))
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib valves) (part ECC81)
+    (libpart (lib ecc83_schlib) (part ECC81)
       (aliases
         (alias ECC83))
       (fields
@@ -117,93 +124,88 @@
         (field (name Value) ECC81)
         (field (name Footprint) VALVE-NOVAL_P))
       (pins
-        (pin (num 1) (name A) (type output))
+        (pin (num 1) (name A) (type passive))
         (pin (num 2) (name G) (type input))
-        (pin (num 3) (name K) (type BiDi))
-        (pin (num 4) (name F1) (type power_in))
-        (pin (num 5) (name F1) (type power_in))
-        (pin (num 6) (name A) (type output))
+        (pin (num 3) (name K) (type passive))
+        (pin (num 4) (name F1) (type input))
+        (pin (num 5) (name F1) (type input))
+        (pin (num 6) (name A) (type passive))
         (pin (num 7) (name G) (type input))
-        (pin (num 8) (name K) (type BiDi))
-        (pin (num 9) (name F2) (type power_in))))
-    (libpart (lib device) (part C)
-      (description "Condensateur non polarise")
-      (footprints
-        (fp SM*)
-        (fp C?)
-        (fp C1-1))
-      (fields
-        (field (name Reference) C)
-        (field (name Value) C))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part CONN_1)
-      (description "1 pin")
-      (fields
-        (field (name Reference) P)
-        (field (name Value) CONN_1))
-      (pins
-        (pin (num 1) (name 1) (type passive))))
-    (libpart (lib conn) (part CONN_2)
-      (description "Symbole general de connecteur")
+        (pin (num 8) (name K) (type passive))
+        (pin (num 9) (name F2) (type input))))
+    (libpart (lib ecc83_schlib) (part CONN_2)
       (fields
         (field (name Reference) P)
         (field (name Value) CONN_2))
       (pins
         (pin (num 1) (name P1) (type passive))
-        (pin (num 2) (name PM) (type passive)))))
+        (pin (num 2) (name PM) (type passive))))
+    (libpart (lib ecc83_schlib) (part CONN_1)
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_1))
+      (pins
+        (pin (num 1) (name 1) (type passive))))
+    (libpart (lib ecc83_schlib) (part C)
+      (footprints
+        (fp C?)
+        (fp C_????_*)
+        (fp C_????)
+        (fp SMD*_c)
+        (fp Capacitor*))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) C))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive)))))
   (libraries
-    (library (logical device)
-      (uri f:\kicad\share\kicad\library\device.lib))
-    (library (logical valves)
-      (uri f:\kicad\share\kicad\library\valves.lib))
-    (library (logical conn)
-      (uri f:\kicad\share\kicad\library\conn.lib)))
+    (library (logical ecc83_schlib)
+      (uri ecc83_schlib.lib)))
   (nets
-    (net (code 1) (name GND)
-      (node (ref R4) (pin 2))
-      (node (ref R3) (pin 2))
-      (node (ref P1) (pin 1))
-      (node (ref R2) (pin 2))
-      (node (ref P2) (pin 2))
-      (node (ref P3) (pin 2))
-      (node (ref C1) (pin 2)))
-    (net (code 2) (name "Net-(C1-Pad1)")
-      (node (ref P3) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref U1) (pin 6)))
-    (net (code 3) (name "Net-(P8-Pad1)")
-      (node (ref P8) (pin 1)))
-    (net (code 4) (name "Net-(P7-Pad1)")
-      (node (ref P7) (pin 1)))
-    (net (code 5) (name "Net-(P6-Pad1)")
-      (node (ref P6) (pin 1)))
-    (net (code 6) (name "Net-(P5-Pad1)")
-      (node (ref P5) (pin 1)))
-    (net (code 7) (name "Net-(R2-Pad1)")
-      (node (ref R2) (pin 1))
-      (node (ref U1) (pin 3)))
-    (net (code 8) (name "Net-(C2-Pad2)")
+    (net (code 1) (name "Net-(C2-Pad2)")
       (node (ref C2) (pin 2))
-      (node (ref R1) (pin 2))
-      (node (ref U1) (pin 8)))
-    (net (code 9) (name "Net-(C2-Pad1)")
-      (node (ref C2) (pin 1))
-      (node (ref R3) (pin 1))
-      (node (ref P2) (pin 1)))
-    (net (code 10) (name "Net-(P4-Pad2)")
-      (node (ref U1) (pin 9))
-      (node (ref P4) (pin 2)))
-    (net (code 11) (name "Net-(P1-Pad2)")
-      (node (ref U1) (pin 2))
-      (node (ref R4) (pin 1))
-      (node (ref P1) (pin 2)))
-    (net (code 12) (name "Net-(R1-Pad1)")
+      (node (ref U1) (pin 8))
+      (node (ref R1) (pin 2)))
+    (net (code 2) (name "Net-(R1-Pad1)")
       (node (ref R1) (pin 1))
       (node (ref U1) (pin 1))
       (node (ref U1) (pin 7)))
-    (net (code 13) (name "Net-(P4-Pad1)")
+    (net (code 3) (name "Net-(P4-Pad1)")
       (node (ref U1) (pin 4))
-      (node (ref U1) (pin 5))
-      (node (ref P4) (pin 1)))))
\ No newline at end of file
+      (node (ref P4) (pin 1))
+      (node (ref U1) (pin 5)))
+    (net (code 4) (name "Net-(R2-Pad1)")
+      (node (ref R2) (pin 1))
+      (node (ref U1) (pin 3)))
+    (net (code 5) (name "Net-(P4-Pad2)")
+      (node (ref P4) (pin 2))
+      (node (ref U1) (pin 9)))
+    (net (code 6) (name "Net-(C2-Pad1)")
+      (node (ref P2) (pin 1))
+      (node (ref R3) (pin 1))
+      (node (ref C2) (pin 1)))
+    (net (code 7) (name "Net-(P1-Pad2)")
+      (node (ref U1) (pin 2))
+      (node (ref P1) (pin 2))
+      (node (ref R4) (pin 1)))
+    (net (code 8) (name "Net-(C1-Pad1)")
+      (node (ref C1) (pin 1))
+      (node (ref P3) (pin 1))
+      (node (ref U1) (pin 6)))
+    (net (code 9) (name GND)
+      (node (ref R2) (pin 2))
+      (node (ref R4) (pin 2))
+      (node (ref R3) (pin 2))
+      (node (ref P1) (pin 1))
+      (node (ref P2) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref P3) (pin 2)))
+    (net (code 10) (name "Net-(P8-Pad1)")
+      (node (ref P8) (pin 1)))
+    (net (code 11) (name "Net-(P7-Pad1)")
+      (node (ref P7) (pin 1)))
+    (net (code 12) (name "Net-(P6-Pad1)")
+      (node (ref P6) (pin 1)))
+    (net (code 13) (name "Net-(P5-Pad1)")
+      (node (ref P5) (pin 1)))))
\ No newline at end of file
diff --git a/demos/ecc83/ecc83-pp_v2.pro b/demos/ecc83/ecc83-pp_v2.pro
index 97b9c16a06..cec6d57c4b 100644
--- a/demos/ecc83/ecc83-pp_v2.pro
+++ b/demos/ecc83/ecc83-pp_v2.pro
@@ -1,4 +1,4 @@
-update=01/01/2015 18:33:52
+update=17/05/2015 17:05:45
 last_client=kicad
 [general]
 version=1
@@ -28,9 +28,5 @@ ModuleOutlineThickness=0.381
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=valves
-LibName4=conn
-LibName5=linear
-LibName6=regul
+LibName1=ecc83_schlib
+LibName2=power
diff --git a/demos/ecc83/ecc83-pp_v2.sch b/demos/ecc83/ecc83-pp_v2.sch
index 4114c0a6b2..abc3352f2e 100644
--- a/demos/ecc83/ecc83-pp_v2.sch
+++ b/demos/ecc83/ecc83-pp_v2.sch
@@ -1,29 +1,6 @@
 EESchema Schematic File Version 2
+LIBS:ecc83_schlib
 LIBS:power
-LIBS:device
-LIBS:conn
-LIBS:valves
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:contrib
 LIBS:ecc83-pp_v2-cache
 EELAYER 25 0
 EELAYER END
@@ -75,45 +52,45 @@ $EndComp
 $Comp
 L GND #PWR01
 U 1 1 457DBAF8
-P 7950 3250
-F 0 "#PWR01" H 7950 3250 30  0001 C CNN
-F 1 "GND" H 7950 3180 30  0001 C CNN
-F 2 "" H 7950 3250 60  0001 C CNN
-F 3 "" H 7950 3250 60  0001 C CNN
-	1    7950 3250
+P 7850 3250
+F 0 "#PWR01" H 7850 3250 30  0001 C CNN
+F 1 "GND" H 7850 3180 30  0001 C CNN
+F 2 "" H 7850 3250 60  0001 C CNN
+F 3 "" H 7850 3250 60  0001 C CNN
+	1    7850 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR02
 U 1 1 457DBAF5
-P 7700 4000
-F 0 "#PWR02" H 7700 4000 30  0001 C CNN
-F 1 "GND" H 7700 3930 30  0001 C CNN
-F 2 "" H 7700 4000 60  0001 C CNN
-F 3 "" H 7700 4000 60  0001 C CNN
-	1    7700 4000
+P 7600 3800
+F 0 "#PWR02" H 7600 3800 30  0001 C CNN
+F 1 "GND" H 7600 3730 30  0001 C CNN
+F 2 "" H 7600 3800 60  0001 C CNN
+F 3 "" H 7600 3800 60  0001 C CNN
+	1    7600 3800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR03
 U 1 1 457DBAF1
-P 6400 5700
-F 0 "#PWR03" H 6400 5700 30  0001 C CNN
-F 1 "GND" H 6400 5630 30  0001 C CNN
-F 2 "" H 6400 5700 60  0001 C CNN
-F 3 "" H 6400 5700 60  0001 C CNN
-	1    6400 5700
+P 6400 5500
+F 0 "#PWR03" H 6400 5500 30  0001 C CNN
+F 1 "GND" H 6400 5430 30  0001 C CNN
+F 2 "" H 6400 5500 60  0001 C CNN
+F 3 "" H 6400 5500 60  0001 C CNN
+	1    6400 5500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR04
 U 1 1 457DBAEF
-P 6000 5700
-F 0 "#PWR04" H 6000 5700 30  0001 C CNN
-F 1 "GND" H 6000 5630 30  0001 C CNN
-F 2 "" H 6000 5700 60  0001 C CNN
-F 3 "" H 6000 5700 60  0001 C CNN
-	1    6000 5700
+P 6000 5500
+F 0 "#PWR04" H 6000 5500 30  0001 C CNN
+F 1 "GND" H 6000 5430 30  0001 C CNN
+F 2 "" H 6000 5500 60  0001 C CNN
+F 3 "" H 6000 5500 60  0001 C CNN
+	1    6000 5500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -163,12 +140,12 @@ $EndComp
 $Comp
 L CONN_2 P2
 U 1 1 4549F46C
-P 8450 3000
-F 0 "P2" V 8400 3000 40  0000 C CNN
-F 1 "OUT" V 8500 3000 40  0000 C CNN
-F 2 "pin_array:pin_array_1x02" H 8450 2800 30  0000 C CNN
-F 3 "" H 8450 3000 60  0001 C CNN
-	1    8450 3000
+P 8350 3000
+F 0 "P2" V 8300 3000 40  0000 C CNN
+F 1 "OUT" V 8400 3000 40  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 8350 2800 30  0000 C CNN
+F 3 "" H 8350 3000 60  0001 C CNN
+	1    8350 3000
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -185,45 +162,45 @@ $EndComp
 $Comp
 L C C2
 U 1 1 4549F3BE
-P 7350 2900
-F 0 "C2" V 7200 2900 50  0000 C CNN
-F 1 "680nF" V 7550 2900 50  0000 C CNN
-F 2 "discret:CP8" V 7650 2900 30  0000 C CNN
-F 3 "" H 7350 2900 60  0001 C CNN
-	1    7350 2900
+P 7300 2900
+F 0 "C2" V 7150 2900 50  0000 C CNN
+F 1 "680nF" V 7500 2900 50  0000 C CNN
+F 2 "discret:CP8" V 7600 2900 30  0000 C CNN
+F 3 "" H 7300 2900 60  0001 C CNN
+	1    7300 2900
 	0    1    1    0   
 $EndComp
 $Comp
 L R R3
 U 1 1 4549F3AD
-P 7700 3650
-F 0 "R3" H 7600 3850 50  0000 C CNN
-F 1 "100K" V 7700 3650 50  0000 C CNN
-F 2 "discret:R3" V 7800 3650 30  0000 C CNN
-F 3 "" H 7700 3650 60  0001 C CNN
-	1    7700 3650
+P 7600 3550
+F 0 "R3" H 7500 3750 50  0000 C CNN
+F 1 "100K" V 7600 3550 50  0000 C CNN
+F 2 "discret:R3" V 7700 3550 30  0000 C CNN
+F 3 "" H 7600 3550 60  0001 C CNN
+	1    7600 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 6000 5400
-F 0 "R4" H 5900 5600 50  0000 C CNN
-F 1 "47K" V 6000 5400 50  0000 C CNN
-F 2 "discret:R3" V 6100 5400 30  0000 C CNN
-F 3 "" H 6000 5400 60  0001 C CNN
-	1    6000 5400
+P 6000 5300
+F 0 "R4" H 5900 5500 50  0000 C CNN
+F 1 "47K" V 6000 5300 50  0000 C CNN
+F 2 "discret:R3" V 6100 5300 30  0000 C CNN
+F 3 "" H 6000 5300 60  0001 C CNN
+	1    6000 5300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 6400 5400
-F 0 "R2" H 6300 5600 50  0000 C CNN
-F 1 "1.5K" V 6400 5400 50  0000 C CNN
-F 2 "discret:R3" V 6500 5400 30  0000 C CNN
-F 3 "" H 6400 5400 60  0001 C CNN
-	1    6400 5400
+P 6400 5300
+F 0 "R2" H 6300 5500 50  0000 C CNN
+F 1 "1.5K" V 6400 5300 50  0000 C CNN
+F 2 "discret:R3" V 6500 5300 30  0000 C CNN
+F 3 "" H 6400 5300 60  0001 C CNN
+	1    6400 5300
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -286,10 +263,10 @@ NoConn ~ 6150 6700
 NoConn ~ 6150 6800
 NoConn ~ 6150 6900
 $Comp
-L PWR_FLAG #FLG?
+L PWR_FLAG #FLG06
 U 1 1 550E41D9
 P 3700 1700
-F 0 "#FLG?" H 3700 1970 30  0001 C CNN
+F 0 "#FLG06" H 3700 1970 30  0001 C CNN
 F 1 "PWR_FLAG" H 3700 1930 30  0000 C CNN
 F 2 "" H 3700 1700 60  0001 C CNN
 F 3 "" H 3700 1700 60  0001 C CNN
@@ -297,10 +274,10 @@ F 3 "" H 3700 1700 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR07
 U 1 1 550E42C4
 P 4100 2500
-F 0 "#PWR?" H 4100 2500 30  0001 C CNN
+F 0 "#PWR07" H 4100 2500 30  0001 C CNN
 F 1 "GND" H 4100 2430 30  0001 C CNN
 F 2 "" H 4100 2500 60  0000 C CNN
 F 3 "" H 4100 2500 60  0000 C CNN
@@ -314,27 +291,19 @@ Wire Wire Line
 Wire Wire Line
 	6400 4600 6400 5150
 Wire Wire Line
-	7550 2900 7700 2900
+	7450 2900 8000 2900
 Wire Wire Line
-	7700 2900 8100 2900
-Wire Wire Line
-	3400 3600 3800 3600
-Wire Wire Line
-	3800 3600 4000 3600
+	3400 3600 4000 3600
 Wire Wire Line
 	3800 3600 3800 3500
 Wire Wire Line
-	6500 3500 6500 3600
-Wire Wire Line
-	6500 3600 6500 3800
+	6500 3400 6500 3800
 Connection ~ 3800 3600
 Wire Wire Line
 	4000 3600 4000 3500
 Connection ~ 6500 3600
 Wire Wire Line
-	6500 2700 6500 2900
-Wire Wire Line
-	6500 2900 6500 3000
+	6500 2700 6500 3100
 Wire Wire Line
 	6500 3600 6100 3600
 Wire Wire Line
@@ -343,11 +312,7 @@ Wire Wire Line
 	6100 2300 6300 2300
 Connection ~ 6500 2900
 Wire Wire Line
-	3400 1800 3700 1800
-Wire Wire Line
-	3700 1800 4100 1800
-Wire Wire Line
-	4100 1800 6600 1800
+	3400 1800 6600 1800
 Wire Wire Line
 	6600 1800 6600 1900
 Wire Wire Line
@@ -358,43 +323,37 @@ Wire Wire Line
 Wire Wire Line
 	3500 2000 3500 2400
 Wire Wire Line
-	3500 2400 3700 2400
-Wire Wire Line
-	3700 2400 4100 2400
+	3500 2400 4100 2400
 Connection ~ 3700 2400
 Wire Wire Line
 	3700 2400 3700 2200
 Wire Wire Line
-	4100 2300 4100 2400
-Wire Wire Line
-	4100 2400 4100 2500
+	4100 2250 4100 2500
 Connection ~ 4100 2400
 Wire Wire Line
-	4100 1900 4100 1800
+	4100 1950 4100 1800
 Connection ~ 4100 1800
 Wire Wire Line
 	6500 2900 7150 2900
-Connection ~ 7700 2900
+Connection ~ 7600 2900
 Wire Wire Line
-	7700 3900 7700 4000
+	7600 3700 7600 3800
 Wire Wire Line
-	7700 3400 7700 2900
+	7600 3400 7600 2900
 Wire Wire Line
-	8100 3100 7950 3100
+	8000 3100 7850 3100
 Wire Wire Line
-	7950 3100 7950 3250
+	7850 3100 7850 3250
 Wire Wire Line
-	5700 4200 6000 4200
-Wire Wire Line
-	6000 4200 6200 4200
+	5700 4200 6200 4200
 Wire Wire Line
 	6000 5150 6000 4200
 Connection ~ 6000 4200
 $Comp
-L GND #PWR?
+L GND #PWR08
 U 1 1 550E4C85
 P 5800 4550
-F 0 "#PWR?" H 5800 4550 30  0001 C CNN
+F 0 "#PWR08" H 5800 4550 30  0001 C CNN
 F 1 "GND" H 5800 4480 30  0001 C CNN
 F 2 "" H 5800 4550 60  0000 C CNN
 F 3 "" H 5800 4550 60  0000 C CNN
@@ -406,7 +365,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 4400 5700 4400
 Wire Wire Line
-	6400 5650 6400 5700
+	6400 5450 6400 5500
 Wire Wire Line
-	6000 5650 6000 5700
+	6000 5450 6000 5500
 $EndSCHEMATC
diff --git a/demos/ecc83/ecc83_schlib.dcm b/demos/ecc83/ecc83_schlib.dcm
new file mode 100644
index 0000000000..5f3ed79b79
--- /dev/null
+++ b/demos/ecc83/ecc83_schlib.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/demos/ecc83/ecc83_schlib.lib b/demos/ecc83/ecc83_schlib.lib
new file mode 100644
index 0000000000..f862be2468
--- /dev/null
+++ b/demos/ecc83/ecc83_schlib.lib
@@ -0,0 +1,141 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# C
+#
+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
+$FPLIST
+ C?
+ 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 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# ECC81
+#
+DEF ECC81 U 0 0 Y Y 3 L N
+F0 "U" 130 310 50 H V C CNN
+F1 "ECC81" 350 -300 50 H V C CNN
+F2 "VALVE-NOVAL_P" 400 -350 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS ECC83
+DRAW
+P 2 1 0 0  -100 -200  -100 -300 N
+P 2 1 0 0  0 200  0 300 N
+P 2 2 0 0  -100 -200  -100 -300 N
+P 2 2 0 0  0 200  0 300 N
+A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
+A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
+P 2 0 1 0  200 100  200 -100 N
+P 3 0 1 0  -200 100  -200 -100  -200 -100 N
+A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
+P 2 1 1 0  -200 0  -125 0 N
+P 2 1 1 6  -75 0  -125 0 N
+P 2 1 1 6  -25 0  25 0 N
+P 2 1 1 6  75 0  125 0 N
+P 3 1 1 10  -100 200  110 200  110 200 N
+X A 6 0 400 100 D 40 40 1 1 P
+X G 7 -300 0 100 R 40 40 1 1 I
+X K 8 -100 -400 100 U 40 40 1 1 P
+A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
+P 2 2 1 0  -200 0  -125 0 N
+P 2 2 1 6  -75 0  -125 0 N
+P 2 2 1 6  -25 0  25 0 N
+P 2 2 1 6  75 0  125 0 N
+P 3 2 1 10  -100 200  110 200  110 200 N
+X A 1 0 400 100 D 40 40 2 1 P
+X G 2 -300 0 100 R 40 40 2 1 I
+X K 3 -100 -400 100 U 40 40 2 1 P
+A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
+A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
+X F1 4 -100 -450 200 U 40 40 3 1 I
+X F1 5 100 -450 200 U 40 40 3 1 I
+X F2 9 0 -450 200 U 40 40 3 1 I
+ENDDRAW
+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
+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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 50 H I C CNN
+F1 "PWR_FLAG" 0 180 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+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
+$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
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/flat_hierarchy/flat_hierarchy.pro b/demos/flat_hierarchy/flat_hierarchy.pro
index 2b80bf4578..74cd3fdd2b 100644
--- a/demos/flat_hierarchy/flat_hierarchy.pro
+++ b/demos/flat_hierarchy/flat_hierarchy.pro
@@ -1,5 +1,5 @@
-update=07/03/2011 07:10:44
-last_client=cvpcb
+update=18/05/2015 09:02:06
+last_client=kicad
 [general]
 version=1
 RootSch=pic_programmer.sch
@@ -74,3 +74,8 @@ version=1
 NetIExt=.net
 [cvpcb/libraries]
 EquName1=devcms
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=flat_hierarchy_schlib
diff --git a/demos/flat_hierarchy/flat_hierarchy.sch b/demos/flat_hierarchy/flat_hierarchy.sch
index c4f47bea5a..dcb831f6f0 100644
--- a/demos/flat_hierarchy/flat_hierarchy.sch
+++ b/demos/flat_hierarchy/flat_hierarchy.sch
@@ -1,32 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-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:flat_hierarchy_schlib
 LIBS:flat_hierarchy-cache
 EELAYER 25 0
 EELAYER END
diff --git a/demos/flat_hierarchy/flat_hierarchy_schlib.lib b/demos/flat_hierarchy/flat_hierarchy_schlib.lib
new file mode 100644
index 0000000000..fdac208bfb
--- /dev/null
+++ b/demos/flat_hierarchy/flat_hierarchy_schlib.lib
@@ -0,0 +1,592 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 24C16
+#
+DEF 24C16 U 0 30 Y Y 1 F N
+F0 "U" 150 350 60 H V C CNN
+F1 "24C16" 200 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS 24C512
+DRAW
+X GND 4 0 -500 200 U 60 60 0 0 W
+X VCC 8 0 500 200 D 60 60 0 0 W
+S -400 -300 400 300 1 1 0 N
+X A0 1 -700 200 300 R 60 60 1 1 I
+X A1 2 -700 100 300 R 60 60 1 1 I
+X A2 3 -700 0 300 R 60 60 1 1 I
+X SDA 5 700 -200 300 L 60 60 1 1 B
+X SCL 6 700 -100 300 L 60 60 1 1 I
+X WP 7 700 100 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# 74LS125
+#
+DEF 74LS125 U 0 30 Y Y 4 F N
+F0 "U" 0 100 50 H V L BNN
+F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 7 -150 -150 0 U 50 30 0 0 W N
+X VCC 14 -150 150 0 D 50 30 0 0 W N
+X E 1 0 -300 220 U 50 30 1 0 I I
+X E 4 0 -300 220 U 50 30 2 0 I I
+X E 10 0 -300 220 U 50 30 3 0 I I
+X E 13 0 -300 220 U 50 30 4 0 I I
+P 4 0 1 0  -150 150  -150 -150  150 0  -150 150 N
+X D 2 -450 0 300 R 50 30 1 1 I
+X O 3 450 0 300 L 50 30 1 1 T
+X D 5 -450 0 300 R 50 30 2 1 I
+X O 6 450 0 300 L 50 30 2 1 T
+X O 8 450 0 300 L 50 30 3 1 T
+X D 9 -450 0 300 R 50 30 3 1 I
+X O 11 450 0 300 L 50 30 4 1 T
+X D 12 -450 0 300 R 50 30 4 1 I
+ENDDRAW
+ENDDEF
+#
+# 7805
+#
+DEF 7805 U 0 30 N Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7805 LM7812 78L05
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI VI -400 50 200 R 40 40 1 1 I
+X VO VO 400 50 200 L 40 40 1 1 w
+X GND GND 0 -250 100 U 40 40 1 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB9*
+$ENDFPLIST
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODESCH
+#
+DEF DIODESCH D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 6 0 1 8  75 25  75 50  50 50  50 -50  25 -50  25 -25 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
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 40 N N 1 F N
+F0 "L" -50 0 40 V V C CNN
+F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+X 1 1 0 300 100 D 70 70 1 1 P
+X 2 2 0 -300 100 U 70 70 1 1 P
+ENDDRAW
+ENDDEF
+#
+# JUMPER
+#
+DEF JUMPER JP 0 30 Y N 1 F N
+F0 "JP" 0 150 60 H V C CNN
+F1 "JUMPER" 0 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 60 60 0 1 P
+X 2 2 300 0 165 L 60 60 0 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+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
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$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
+ENDDRAW
+ENDDEF
+#
+# LT1372
+#
+DEF LT1372 U 0 30 Y Y 1 F N
+F0 "U" 600 500 60 H V C CNN
+F1 "LT1372" -500 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LT1373
+DRAW
+S -700 -400 700 400 0 1 0 N
+X Vc 1 250 -700 300 U 60 60 1 1 I
+X FB+ 2 1000 -250 300 L 60 60 1 1 I
+X FB- 3 -1000 250 300 R 60 60 1 1 P
+X S/S 4 -1000 -250 300 R 60 60 1 1 P
+X Vin 5 0 700 300 D 60 60 1 1 W
+X GND_S 6 -150 -700 300 U 60 60 1 1 I
+X GND 7 -300 -700 300 U 60 60 1 1 I
+X Vsw 8 1000 250 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# NPN
+#
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PIC12C508A
+#
+DEF PIC12C508A U 0 40 Y Y 1 F N
+F0 "U" 0 700 60 H V C CNN
+F1 "PIC12C508A" 0 -650 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS PIC12C509A
+DRAW
+S 400 -600 -450 650 0 1 0 N
+X VDD 1 -750 500 300 R 50 50 1 1 W
+X GP5/OSC1 2 -750 200 300 R 50 50 1 1 I
+X GP4/OSC2 3 -750 -200 300 R 50 50 1 1 I
+X GP3/MCLR 4 -750 -500 300 R 50 50 1 1 I
+X GP2 5 700 -500 300 L 50 50 1 1 I
+X GP1 6 700 -200 300 L 50 50 1 1 I
+X GP0 7 700 200 300 L 50 50 1 1 I
+X VSS 8 700 500 300 L 50 50 1 1 W
+X VDD 1 -750 500 300 R 50 50 1 2 W
+X GP5/OSC1 2 -750 200 300 R 50 50 1 2 I
+X GP4/OSC2 3 -750 -200 300 R 50 50 1 2 I
+X GP3/MCLR 4 -750 -500 300 R 50 50 1 2 I
+X GP2 5 700 -500 300 L 50 50 1 2 I
+X GP1 6 700 -200 300 L 50 50 1 2 I
+X GP0 7 700 200 300 L 50 50 1 2 I
+X VSS 8 700 500 300 L 50 50 1 2 W
+ENDDRAW
+ENDDEF
+#
+# PIC16F54
+#
+DEF PIC16F54 U? 0 40 Y Y 1 F N
+F0 "U?" 0 -750 60 H V C CNN
+F1 "PIC16F54" 0 800 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -500 700 450 -700 0 1 0 N
+X RA2 1 -800 600 300 R 50 50 1 1 B
+X RA3 2 -800 450 300 R 50 50 1 1 B
+X T0ckl 3 -800 300 300 R 50 50 1 1 O
+X MCLR 4 -800 150 300 R 50 50 1 1 I
+X VSS 5 -800 0 300 R 50 50 1 1 W
+X RB0 6 -800 -150 300 R 50 50 1 1 B
+X RB1 7 -800 -300 300 R 50 50 1 1 B
+X RB2 8 -800 -450 300 R 50 50 1 1 B
+X RB3 9 -800 -600 300 R 50 50 1 1 B
+X RB4 10 750 -600 300 L 50 50 1 1 B
+X RB5 11 750 -450 300 L 50 50 1 1 B
+X ICSPC/RB6 12 750 -300 300 L 50 50 1 1 B
+X ICSPD/RB7 13 750 -150 300 L 50 50 1 1 B
+X VDD 14 750 0 300 L 50 50 1 1 W
+X OSC2/CLKO 15 750 150 300 L 50 50 1 1 O
+X OSC1/CLKI 16 750 300 300 L 50 50 1 1 I
+X RA0 17 750 450 300 L 50 50 1 1 B
+X RA1 18 750 600 300 L 50 50 1 1 B
+X RA2 1 -800 600 300 R 50 50 1 2 B
+X RA3 2 -800 450 300 R 50 50 1 2 B
+X T0ckl 3 -800 300 300 R 50 50 1 2 O
+X MCLR 4 -800 150 300 R 50 50 1 2 I
+X VSS 5 -800 0 300 R 50 50 1 2 W
+X RB0 6 -800 -150 300 R 50 50 1 2 B
+X RB1 7 -800 -300 300 R 50 50 1 2 B
+X RB2 8 -800 -450 300 R 50 50 1 2 B
+X RB3 9 -800 -600 300 R 50 50 1 2 B
+X RB4 10 750 -600 300 L 50 50 1 2 B
+X RB5 11 750 -450 300 L 50 50 1 2 B
+X ICSPC/RB6 12 750 -300 300 L 50 50 1 2 B
+X ICSPD/RB7 13 750 -150 300 L 50 50 1 2 B
+X VDD 14 750 0 300 L 50 50 1 2 W
+X OSC2/CLKO 15 750 150 300 L 50 50 1 2 O
+X OSC1/CLKI 16 750 300 300 L 50 50 1 2 I
+X RA0 17 750 450 300 L 50 50 1 2 B
+X RA1 18 750 600 300 L 50 50 1 2 B
+ENDDRAW
+ENDDEF
+#
+# PNP
+#
+DEF PNP Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 60 H V R CNN
+F1 "PNP" 0 150 60 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 F
+P 3 0 1 0  25 -25  0 0  0 0 N
+P 3 0 1 0  100 -100  65 -65  65 -65 N
+P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -100 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
+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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+ENDDRAW
+ENDDEF
+#
+# SUPP28
+#
+DEF SUPP28 J 0 40 Y Y 1 F N
+F0 "J" 0 100 70 H V C CNN
+F1 "SUPP28" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -300 -750 300 750 0 1 0 N
+X 1 1 -600 650 300 R 60 60 1 1 P
+X 2 2 -600 550 300 R 60 60 1 1 P
+X 3 3 -600 450 300 R 60 60 1 1 P
+X 4 4 -600 350 300 R 60 60 1 1 P
+X 5 5 -600 250 300 R 60 60 1 1 P
+X 6 6 -600 150 300 R 60 60 1 1 P
+X 7 7 -600 50 300 R 60 60 1 1 P
+X 8 8 -600 -50 300 R 60 60 1 1 P
+X 9 9 -600 -150 300 R 60 60 1 1 P
+X 10 10 -600 -250 300 R 60 60 1 1 P
+X 20 20 600 -150 300 L 60 60 1 1 P
+X 11 11 -600 -350 300 R 60 60 1 1 P
+X 21 21 600 -50 300 L 60 60 1 1 P
+X 12 12 -600 -450 300 R 60 60 1 1 P
+X 22 22 600 50 300 L 60 60 1 1 P
+X 13 13 -600 -550 300 R 60 60 1 1 P
+X 23 23 600 150 300 L 60 60 1 1 P
+X 14 14 -600 -650 300 R 60 60 1 1 P
+X 24 24 600 250 300 L 60 60 1 1 P
+X 15 15 600 -650 300 L 60 60 1 1 P
+X 25 25 600 350 300 L 60 60 1 1 P
+X 16 16 600 -550 300 L 60 60 1 1 P
+X 26 26 600 450 300 L 60 60 1 1 P
+X 17 17 600 -450 300 L 60 60 1 1 P
+X 27 27 600 550 300 L 60 60 1 1 P
+X 18 18 600 -350 300 L 60 60 1 1 P
+X 28 28 600 650 300 L 60 60 1 1 P
+X 19 19 600 -250 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SUPP40
+#
+DEF SUPP40 P 0 40 Y Y 1 F N
+F0 "P" 0 1100 70 H V C CNN
+F1 "SUPP40" 0 -1100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -300 -1050 300 1050 0 1 0 N
+X 1 1 -600 950 300 R 60 60 1 1 P
+X 2 2 -600 850 300 R 60 60 1 1 P
+X 3 3 -600 750 300 R 60 60 1 1 P
+X 4 4 -600 650 300 R 60 60 1 1 P
+X 5 5 -600 550 300 R 60 60 1 1 P
+X 6 6 -600 450 300 R 60 60 1 1 P
+X 7 7 -600 350 300 R 60 60 1 1 P
+X 8 8 -600 250 300 R 60 60 1 1 P
+X 9 9 -600 150 300 R 60 60 1 1 P
+X 10 10 -600 50 300 R 60 60 1 1 P
+X 20 20 -600 -950 300 R 60 60 1 1 P
+X 30 30 600 -50 300 L 60 60 1 1 P
+X 40 40 600 950 300 L 60 60 1 1 P
+X 11 11 -600 -50 300 R 60 60 1 1 P
+X 21 21 600 -950 300 L 60 60 1 1 P
+X 31 31 600 50 300 L 60 60 1 1 P
+X 12 12 -600 -150 300 R 60 60 1 1 P
+X 22 22 600 -850 300 L 60 60 1 1 P
+X 32 32 600 150 300 L 60 60 1 1 P
+X 13 13 -600 -250 300 R 60 60 1 1 P
+X 23 23 600 -750 300 L 60 60 1 1 P
+X 33 33 600 250 300 L 60 60 1 1 P
+X 14 14 -600 -350 300 R 60 60 1 1 P
+X 24 24 600 -650 300 L 60 60 1 1 P
+X 34 34 600 350 300 L 60 60 1 1 P
+X 15 15 -600 -450 300 R 60 60 1 1 P
+X 25 25 600 -550 300 L 60 60 1 1 P
+X 35 35 600 450 300 L 60 60 1 1 P
+X 16 16 -600 -550 300 R 60 60 1 1 P
+X 26 26 600 -450 300 L 60 60 1 1 P
+X 36 36 600 550 300 L 60 60 1 1 P
+X 17 17 -600 -650 300 R 60 60 1 1 P
+X 27 27 600 -350 300 L 60 60 1 1 P
+X 37 37 600 650 300 L 60 60 1 1 P
+X 18 18 -600 -750 300 R 60 60 1 1 P
+X 28 28 600 -250 300 L 60 60 1 1 P
+X 38 38 600 750 300 L 60 60 1 1 P
+X 19 19 -600 -850 300 R 60 60 1 1 P
+X 29 29 600 -150 300 L 60 60 1 1 P
+X 39 39 600 850 300 L 60 60 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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# VPP
+#
+DEF VPP #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C CNN
+F1 "VPP" 0 150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VPP 1 0 0 0 U 40 40 0 0 W N
+C 0 80 20 0 1 0 N
+P 2 0 1 0  0 60  0 0 N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/flat_hierarchy/pic_programmer.sch b/demos/flat_hierarchy/pic_programmer.sch
index 6d6b5c533f..8f9cdb32c7 100644
--- a/demos/flat_hierarchy/pic_programmer.sch
+++ b/demos/flat_hierarchy/pic_programmer.sch
@@ -1,32 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-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:flat_hierarchy_schlib
 LIBS:flat_hierarchy-cache
 EELAYER 25 0
 EELAYER END
@@ -57,20 +30,14 @@ Wire Wire Line
 Wire Wire Line
 	7600 3400 7400 3400
 Wire Wire Line
-	7900 3600 7900 3800
-Wire Wire Line
-	7900 3800 7900 3900
+	7900 3600 7900 3900
 Connection ~ 7900 5500
 Wire Wire Line
 	8100 5500 8100 5550
 Wire Wire Line
-	7800 5500 7900 5500
+	7800 5500 8100 5500
 Wire Wire Line
-	7900 5500 8100 5500
-Wire Wire Line
-	2900 5850 3000 5850
-Wire Wire Line
-	3000 5850 3100 5850
+	2900 5850 3100 5850
 Wire Notes Line
 	4600 5150 4600 7700
 Wire Notes Line
@@ -81,19 +48,13 @@ Wire Notes Line
 	600  7700 4600 7700
 Connection ~ 3600 5850
 Wire Wire Line
-	1900 5300 1900 5350
-Wire Wire Line
-	1900 5350 1900 5400
+	1900 5300 1900 5400
 Connection ~ 10200 5300
 Wire Wire Line
-	10200 5250 10200 5300
-Wire Wire Line
-	10200 5300 10200 5350
+	10200 5250 10200 5350
 Connection ~ 9650 5300
 Wire Wire Line
-	9550 5300 9650 5300
-Wire Wire Line
-	9650 5300 10200 5300
+	9550 5300 10200 5300
 Wire Wire Line
 	10200 5950 10200 5850
 Wire Wire Line
@@ -102,56 +63,38 @@ Connection ~ 8400 5300
 Wire Wire Line
 	8400 5350 8400 5300
 Wire Wire Line
-	8300 5300 8400 5300
-Wire Wire Line
-	8400 5300 8750 5300
+	8300 5300 8750 5300
 Wire Wire Line
 	7900 5600 7900 5500
 Wire Wire Line
 	7900 5300 7800 5300
 Wire Wire Line
-	8900 1500 9000 1500
-Wire Wire Line
-	9000 1500 9100 1500
+	8900 1500 9100 1500
 Wire Wire Line
 	5800 4500 5600 4500
 Wire Wire Line
-	5400 3150 5500 3150
-Wire Wire Line
-	5500 3150 5800 3150
+	5400 3150 5800 3150
 Connection ~ 6700 1400
 Wire Wire Line
-	6700 1300 6700 1400
-Wire Wire Line
-	6700 1400 6700 1500
-Wire Wire Line
-	6700 1500 6700 1700
+	6700 1300 6700 1700
 Wire Wire Line
 	7900 1000 7900 900 
 Wire Wire Line
-	7900 1400 7900 1500
-Wire Wire Line
-	7900 1500 7900 1600
+	7900 1400 7900 1600
 Wire Wire Line
 	7900 2550 7900 2600
 Wire Wire Line
 	7900 2100 7900 2150
 Wire Wire Line
-	2100 4400 3200 4400
-Wire Wire Line
-	3200 4400 3300 4400
+	2100 4400 3300 4400
 Wire Wire Line
 	2100 4400 2100 3500
 Wire Wire Line
 	2100 3500 1700 3500
 Wire Wire Line
-	2400 3250 3000 3250
+	2400 3250 3100 3250
 Wire Wire Line
-	3000 3250 3100 3250
-Wire Wire Line
-	2200 1300 2900 1300
-Wire Wire Line
-	2900 1300 3150 1300
+	2200 1300 3150 1300
 Wire Wire Line
 	2200 1300 2200 3600
 Wire Wire Line
@@ -171,21 +114,13 @@ Connection ~ 3200 4400
 Wire Wire Line
 	3200 4500 3200 4400
 Wire Wire Line
-	3900 4300 3900 4400
-Wire Wire Line
-	3900 4400 3900 4500
-Wire Wire Line
-	3900 4500 3900 4600
+	3900 4300 3900 4600
 Connection ~ 3900 4500
 Connection ~ 3000 3250
 Wire Wire Line
 	3000 3250 3000 3350
 Wire Wire Line
-	3700 3050 3700 3150
-Wire Wire Line
-	3700 3150 3700 3250
-Wire Wire Line
-	3700 3250 3700 3350
+	3700 3050 3700 3350
 Connection ~ 3700 3250
 Wire Wire Line
 	3600 3250 3700 3250
@@ -193,16 +128,10 @@ Connection ~ 2900 1300
 Wire Wire Line
 	2900 1400 2900 1300
 Wire Wire Line
-	3750 1100 3750 1200
-Wire Wire Line
-	3750 1200 3750 1300
-Wire Wire Line
-	3750 1300 3750 1400
+	3750 1100 3750 1400
 Connection ~ 3750 1300
 Wire Wire Line
-	7400 3300 7400 3400
-Wire Wire Line
-	7400 3400 7400 3550
+	7400 3300 7400 3550
 Connection ~ 7900 3800
 Wire Wire Line
 	8300 1700 8300 1500
@@ -210,9 +139,7 @@ Connection ~ 8300 1500
 Wire Wire Line
 	6200 950  6200 750 
 Wire Wire Line
-	6700 700  6700 750 
-Wire Wire Line
-	6700 750  6700 800 
+	6700 700  6700 800 
 Wire Wire Line
 	9000 1400 9000 1500
 Connection ~ 9000 1500
@@ -517,10 +444,10 @@ F 3 "" H 1650 7200 60  0001 C CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L PWR_FLAG #FLG025
+L PWR_FLAG #FLG023
 U 1 1 442A5893
 P 3700 5800
-F 0 "#FLG025" H 3700 6070 30  0001 C CNN
+F 0 "#FLG023" H 3700 6070 30  0001 C CNN
 F 1 "PWR_FLAG" H 3700 6030 30  0000 C CNN
 F 2 "" H 3700 5800 60  0001 C CNN
 F 3 "" H 3700 5800 60  0001 C CNN
@@ -550,10 +477,10 @@ F 3 "" H 3950 5800 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR029
+L VCC #PWR024
 U 1 1 442A57CB
 P 1900 5300
-F 0 "#PWR029" H 1900 5400 30  0001 C CNN
+F 0 "#PWR024" H 1900 5400 30  0001 C CNN
 F 1 "VCC" H 1900 5400 30  0000 C CNN
 F 2 "" H 1900 5300 60  0001 C CNN
 F 3 "" H 1900 5300 60  0001 C CNN
@@ -576,10 +503,10 @@ NoConn ~ 1700 3400
 NoConn ~ 1700 3300
 NoConn ~ 1700 3200
 $Comp
-L GND #PWR030
+L GND #PWR025
 U 1 1 442A50C2
 P 8300 2300
-F 0 "#PWR030" H 8300 2300 30  0001 C CNN
+F 0 "#PWR025" H 8300 2300 30  0001 C CNN
 F 1 "GND" H 8300 2230 30  0001 C CNN
 F 2 "" H 8300 2300 60  0001 C CNN
 F 3 "" H 8300 2300 60  0001 C CNN
@@ -598,10 +525,10 @@ F 3 "" H 8300 1950 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR031
+L VCC #PWR026
 U 1 1 442A50B3
 P 10200 5250
-F 0 "#PWR031" H 10200 5350 30  0001 C CNN
+F 0 "#PWR026" H 10200 5350 30  0001 C CNN
 F 1 "VCC" H 10200 5350 40  0000 C CNN
 F 2 "" H 10200 5250 60  0001 C CNN
 F 3 "" H 10200 5250 60  0001 C CNN
@@ -609,10 +536,10 @@ F 3 "" H 10200 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR027
 U 1 1 442A5095
 P 10200 6350
-F 0 "#PWR032" H 10200 6350 30  0001 C CNN
+F 0 "#PWR027" H 10200 6350 30  0001 C CNN
 F 1 "GND" H 10200 6280 30  0001 C CNN
 F 2 "" H 10200 6350 60  0001 C CNN
 F 3 "" H 10200 6350 60  0001 C CNN
@@ -643,10 +570,10 @@ F 3 "" H 10200 5600 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR028
 U 1 1 442A5057
 P 9650 5800
-F 0 "#PWR033" H 9650 5800 30  0001 C CNN
+F 0 "#PWR028" H 9650 5800 30  0001 C CNN
 F 1 "GND" H 9650 5730 30  0001 C CNN
 F 2 "" H 9650 5800 60  0001 C CNN
 F 3 "" H 9650 5800 60  0001 C CNN
@@ -665,10 +592,10 @@ F 3 "" H 9650 5550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR029
 U 1 1 442A5050
 P 9150 5650
-F 0 "#PWR034" H 9150 5650 30  0001 C CNN
+F 0 "#PWR029" H 9150 5650 30  0001 C CNN
 F 1 "GND" H 9150 5580 30  0001 C CNN
 F 2 "" H 9150 5650 60  0001 C CNN
 F 3 "" H 9150 5650 60  0001 C CNN
@@ -687,10 +614,10 @@ F 3 "" H 9150 5350 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR030
 U 1 1 442A5023
 P 8400 5800
-F 0 "#PWR035" H 8400 5800 30  0001 C CNN
+F 0 "#PWR030" H 8400 5800 30  0001 C CNN
 F 1 "GND" H 8400 5730 30  0001 C CNN
 F 2 "" H 8400 5800 60  0001 C CNN
 F 3 "" H 8400 5800 60  0001 C CNN
@@ -709,10 +636,10 @@ F 3 "" H 8400 5550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR031
 U 1 1 442A500F
 P 7900 5600
-F 0 "#PWR036" H 7900 5600 30  0001 C CNN
+F 0 "#PWR031" H 7900 5600 30  0001 C CNN
 F 1 "GND" H 7900 5530 30  0001 C CNN
 F 2 "" H 7900 5600 60  0001 C CNN
 F 3 "" H 7900 5600 60  0001 C CNN
@@ -821,10 +748,10 @@ F 3 "" H 6700 1950 60  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR032
 U 1 1 442A4F1C
 P 6700 2850
-F 0 "#PWR037" H 6700 2850 30  0001 C CNN
+F 0 "#PWR032" H 6700 2850 30  0001 C CNN
 F 1 "GND" H 6700 2780 30  0001 C CNN
 F 2 "" H 6700 2850 60  0001 C CNN
 F 3 "" H 6700 2850 60  0001 C CNN
@@ -847,10 +774,10 @@ $EndComp
 Text Label 2350 4400 0    60   ~ 0
 PC-CLOCK-OUT
 $Comp
-L GND #PWR038
+L GND #PWR033
 U 1 1 442A4E06
 P 1700 4050
-F 0 "#PWR038" H 1700 4050 30  0001 C CNN
+F 0 "#PWR033" H 1700 4050 30  0001 C CNN
 F 1 "GND" H 1700 3980 30  0001 C CNN
 F 2 "" H 1700 4050 60  0001 C CNN
 F 3 "" H 1700 4050 60  0001 C CNN
@@ -862,10 +789,10 @@ PC-DATA-IN
 Text Label 2400 3250 0    60   ~ 0
 PC-DATA-OUT
 $Comp
-L GND #PWR039
+L GND #PWR034
 U 1 1 442A4DB3
 P 2900 2000
-F 0 "#PWR039" H 2900 2000 30  0001 C CNN
+F 0 "#PWR034" H 2900 2000 30  0001 C CNN
 F 1 "GND" H 2900 1930 30  0001 C CNN
 F 2 "" H 2900 2000 60  0001 C CNN
 F 3 "" H 2900 2000 60  0001 C CNN
@@ -873,10 +800,10 @@ F 3 "" H 2900 2000 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR035
 U 1 1 442A4DAE
 P 3200 5050
-F 0 "#PWR040" H 3200 5050 30  0001 C CNN
+F 0 "#PWR035" H 3200 5050 30  0001 C CNN
 F 1 "GND" H 3200 4980 30  0001 C CNN
 F 2 "" H 3200 5050 60  0001 C CNN
 F 3 "" H 3200 5050 60  0001 C CNN
@@ -884,10 +811,10 @@ F 3 "" H 3200 5050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR036
 U 1 1 442A4DAB
 P 3000 3900
-F 0 "#PWR041" H 3000 3900 30  0001 C CNN
+F 0 "#PWR036" H 3000 3900 30  0001 C CNN
 F 1 "GND" H 3000 3830 30  0001 C CNN
 F 2 "" H 3000 3900 60  0001 C CNN
 F 3 "" H 3000 3900 60  0001 C CNN
@@ -928,10 +855,10 @@ F 3 "" H 5150 3150 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR037
 U 1 1 442A4D75
 P 4150 2550
-F 0 "#PWR042" H 4150 2550 30  0001 C CNN
+F 0 "#PWR037" H 4150 2550 30  0001 C CNN
 F 1 "GND" H 4150 2480 30  0001 C CNN
 F 2 "" H 4150 2550 60  0001 C CNN
 F 3 "" H 4150 2550 60  0001 C CNN
@@ -950,10 +877,10 @@ F 3 "" H 4150 2200 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR043
+L VCC #PWR038
 U 1 1 442A4D68
 P 3900 3900
-F 0 "#PWR043" H 3900 4000 30  0001 C CNN
+F 0 "#PWR038" H 3900 4000 30  0001 C CNN
 F 1 "VCC" H 3900 4000 40  0000 C CNN
 F 2 "" H 3900 3900 60  0001 C CNN
 F 3 "" H 3900 3900 60  0001 C CNN
@@ -961,10 +888,10 @@ F 3 "" H 3900 3900 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR039
 U 1 1 442A4D67
 P 3900 5050
-F 0 "#PWR044" H 3900 5050 30  0001 C CNN
+F 0 "#PWR039" H 3900 5050 30  0001 C CNN
 F 1 "GND" H 3900 4980 30  0001 C CNN
 F 2 "" H 3900 5050 60  0001 C CNN
 F 3 "" H 3900 5050 60  0001 C CNN
@@ -972,10 +899,10 @@ F 3 "" H 3900 5050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR040
 U 1 1 442A4D66
 P 4550 4850
-F 0 "#PWR045" H 4550 4850 30  0001 C CNN
+F 0 "#PWR040" H 4550 4850 30  0001 C CNN
 F 1 "GND" H 4550 4780 30  0001 C CNN
 F 2 "" H 4550 4850 60  0001 C CNN
 F 3 "" H 4550 4850 60  0001 C CNN
@@ -1038,10 +965,10 @@ F 3 "" H 4550 4500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR046
+L VCC #PWR041
 U 1 1 442A4D60
 P 3700 2600
-F 0 "#PWR046" H 3700 2700 30  0001 C CNN
+F 0 "#PWR041" H 3700 2700 30  0001 C CNN
 F 1 "VCC" H 3700 2700 40  0000 C CNN
 F 2 "" H 3700 2600 60  0001 C CNN
 F 3 "" H 3700 2600 60  0001 C CNN
@@ -1049,10 +976,10 @@ F 3 "" H 3700 2600 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR047
+L GND #PWR042
 U 1 1 442A4D5F
 P 3700 3800
-F 0 "#PWR047" H 3700 3800 30  0001 C CNN
+F 0 "#PWR042" H 3700 3800 30  0001 C CNN
 F 1 "GND" H 3700 3730 30  0001 C CNN
 F 2 "" H 3700 3800 60  0001 C CNN
 F 3 "" H 3700 3800 60  0001 C CNN
@@ -1060,10 +987,10 @@ F 3 "" H 3700 3800 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR043
 U 1 1 442A4D5E
 P 4350 3500
-F 0 "#PWR048" H 4350 3500 30  0001 C CNN
+F 0 "#PWR043" H 4350 3500 30  0001 C CNN
 F 1 "GND" H 4350 3430 30  0001 C CNN
 F 2 "" H 4350 3500 60  0001 C CNN
 F 3 "" H 4350 3500 60  0001 C CNN
@@ -1126,10 +1053,10 @@ F 3 "" H 4350 3150 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR049
+L VCC #PWR044
 U 1 1 442A4D41
 P 3750 700
-F 0 "#PWR049" H 3750 800 30  0001 C CNN
+F 0 "#PWR044" H 3750 800 30  0001 C CNN
 F 1 "VCC" H 3750 800 40  0000 C CNN
 F 2 "" H 3750 700 60  0001 C CNN
 F 3 "" H 3750 700 60  0001 C CNN
@@ -1137,10 +1064,10 @@ F 3 "" H 3750 700 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR045
 U 1 1 442A4D3B
 P 3750 1800
-F 0 "#PWR050" H 3750 1800 30  0001 C CNN
+F 0 "#PWR045" H 3750 1800 30  0001 C CNN
 F 1 "GND" H 3750 1730 30  0001 C CNN
 F 2 "" H 3750 1800 60  0001 C CNN
 F 3 "" H 3750 1800 60  0001 C CNN
@@ -1148,10 +1075,10 @@ F 3 "" H 3750 1800 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR046
 U 1 1 442A4D38
 P 4300 1550
-F 0 "#PWR051" H 4300 1550 30  0001 C CNN
+F 0 "#PWR046" H 4300 1550 30  0001 C CNN
 F 1 "GND" H 4300 1480 30  0001 C CNN
 F 2 "" H 4300 1550 60  0001 C CNN
 F 3 "" H 4300 1550 60  0001 C CNN
@@ -1249,9 +1176,7 @@ Wire Wire Line
 Wire Wire Line
 	4150 2550 4150 2500
 Wire Wire Line
-	6700 2200 6700 2300
-Wire Wire Line
-	6700 2300 6700 2400
+	6700 2200 6700 2400
 Wire Wire Line
 	6700 2300 7100 2300
 Connection ~ 6700 2300
@@ -1263,18 +1188,12 @@ Connection ~ 3750 1200
 Wire Wire Line
 	3750 1300 3650 1300
 Wire Wire Line
-	7900 1500 8300 1500
-Wire Wire Line
-	8300 1500 8400 1500
+	7900 1500 8400 1500
 Connection ~ 7900 1500
 Wire Wire Line
 	7400 2750 7400 2800
 Wire Wire Line
-	7900 3800 8300 3800
-Wire Wire Line
-	8300 3800 8700 3800
-Wire Wire Line
-	8700 3800 8900 3800
+	7900 3800 8900 3800
 Connection ~ 7400 3400
 Wire Wire Line
 	7400 4500 7400 4600
@@ -1305,19 +1224,13 @@ Wire Wire Line
 Wire Wire Line
 	2450 7450 2100 7450
 Wire Wire Line
-	2450 6800 2450 7200
-Wire Wire Line
-	2450 7200 2450 7450
+	2450 6800 2450 7450
 Wire Wire Line
 	2450 7200 2400 7200
 Wire Wire Line
 	1400 7450 1700 7450
 Wire Wire Line
-	1400 6950 1400 7200
-Wire Wire Line
-	1400 7200 1400 7450
-Wire Wire Line
-	1400 7450 1400 7500
+	1400 6950 1400 7500
 Wire Wire Line
 	1400 7200 1450 7200
 Wire Wire Line
@@ -1329,10 +1242,10 @@ Wire Wire Line
 	1750 6950 1400 6950
 Connection ~ 1400 7200
 $Comp
-L GND #PWR?
+L GND #PWR047
 U 1 1 5510C3A9
 P 1600 6850
-F 0 "#PWR?" H 1600 6850 30  0001 C CNN
+F 0 "#PWR047" H 1600 6850 30  0001 C CNN
 F 1 "GND" H 1600 6780 30  0001 C CNN
 F 2 "" H 1600 6850 60  0000 C CNN
 F 3 "" H 1600 6850 60  0000 C CNN
@@ -1342,10 +1255,10 @@ $EndComp
 Wire Wire Line
 	1600 6850 1600 6800
 $Comp
-L GND #PWR?
+L GND #PWR048
 U 1 1 5510C540
 P 1400 7500
-F 0 "#PWR?" H 1400 7500 30  0001 C CNN
+F 0 "#PWR048" H 1400 7500 30  0001 C CNN
 F 1 "GND" H 1400 7430 30  0001 C CNN
 F 2 "" H 1400 7500 60  0000 C CNN
 F 3 "" H 1400 7500 60  0000 C CNN
@@ -1374,10 +1287,10 @@ Wire Wire Line
 Wire Wire Line
 	3000 6750 3450 6750
 $Comp
-L GND #PWR?
+L GND #PWR049
 U 1 1 5510EE04
 P 3600 7600
-F 0 "#PWR?" H 3600 7600 30  0001 C CNN
+F 0 "#PWR049" H 3600 7600 30  0001 C CNN
 F 1 "GND" H 3600 7530 30  0001 C CNN
 F 2 "" H 3600 7600 60  0001 C CNN
 F 3 "" H 3600 7600 60  0001 C CNN
@@ -1387,24 +1300,18 @@ $EndComp
 Wire Wire Line
 	3600 7600 3600 7550
 Wire Wire Line
-	3950 5800 3950 5850
-Wire Wire Line
-	3950 5850 3950 6000
+	3950 5800 3950 6000
 Connection ~ 3950 5850
 Wire Wire Line
-	3500 5850 3600 5850
-Wire Wire Line
-	3600 5850 3700 5850
-Wire Wire Line
-	3700 5850 3950 5850
+	3500 5850 3950 5850
 Wire Wire Line
 	3700 5800 3700 5850
 Connection ~ 3700 5850
 $Comp
-L GND #PWR?
+L GND #PWR050
 U 1 1 5510F50D
 P 3950 6450
-F 0 "#PWR?" H 3950 6450 30  0001 C CNN
+F 0 "#PWR050" H 3950 6450 30  0001 C CNN
 F 1 "GND" H 3950 6380 30  0001 C CNN
 F 2 "" H 3950 6450 60  0000 C CNN
 F 3 "" H 3950 6450 60  0000 C CNN
diff --git a/demos/flat_hierarchy/pic_sockets.sch b/demos/flat_hierarchy/pic_sockets.sch
index 6d528f7411..b43bfecda8 100644
--- a/demos/flat_hierarchy/pic_sockets.sch
+++ b/demos/flat_hierarchy/pic_sockets.sch
@@ -1,32 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-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:flat_hierarchy_schlib
 LIBS:flat_hierarchy-cache
 EELAYER 25 0
 EELAYER END
diff --git a/demos/interf_u/interf_u.pro b/demos/interf_u/interf_u.pro
index 8dc965ee7e..973db3fd53 100644
--- a/demos/interf_u/interf_u.pro
+++ b/demos/interf_u/interf_u.pro
@@ -1,4 +1,4 @@
-update=20/09/2014 09:14:18
+update=18/05/2015 09:03:59
 version=1
 last_client=kicad
 [common]
@@ -12,30 +12,6 @@ version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[eeschema]
-version=1
-PageLayoutDescrFile=pagelayout_logo.kicad_wks
-SubpartIdSeparator=0
-SubpartFirstId=65
-LibDir=
-NetFmtName=
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=conn
-LibName4=linear
-LibName5=regul
-LibName6=74xx
-LibName7=cmos4000
-LibName8=adc-dac
-LibName9=memory
-LibName10=xilinx
-LibName11=special
-LibName12=image
 [pcbnew]
 version=1
 PageLayoutDescrFile=pagelayout_logo.kicad_wks
@@ -56,3 +32,9 @@ SolderMaskMinWidth=0
 DrawSegmentWidth=0.381
 BoardOutlineThickness=0.127
 ModuleOutlineThickness=0.381
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=interf_u_schlib
+LibName2=power
diff --git a/demos/interf_u/interf_u_schlib.lib b/demos/interf_u/interf_u_schlib.lib
new file mode 100644
index 0000000000..acfd150be0
--- /dev/null
+++ b/demos/interf_u/interf_u_schlib.lib
@@ -0,0 +1,681 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 4003APG120
+#
+DEF 4003APG120 U 0 40 Y Y 1 F N
+F0 "U" 400 2800 70 H V C CNN
+F1 "4003APG120" 0 -2850 70 H V C CNN
+F2 "PGA120" 0 -2950 40 H V C CNN
+F3 "" 400 2800 60 H V C CNN
+ALIAS 4003PG120
+DRAW
+S -800 -2700 800 2700 0 1 0 N
+X NC A1 -1100 -300 300 R 60 60 1 1 P
+X NC B1 -1100 200 300 R 60 60 1 1 P
+X P/A12 C1 -1100 500 300 R 60 60 1 1 P
+X P/A11 D1 -1100 700 300 R 60 60 1 1 P
+X P E1 -1100 1000 300 R 60 60 1 1 P
+X P/A9 F1 -1100 1100 300 R 60 60 1 1 P
+X P/A8 G1 -1100 1200 300 R 60 60 1 1 P
+X P/A7 H1 1100 2600 300 L 60 60 1 1 P
+X P J1 1100 2400 300 L 60 60 1 1 P
+X P/A5 K1 1100 2200 300 L 60 60 1 1 P
+X P/A3 L1 1100 2000 300 L 60 60 1 1 P
+X NC M1 1100 1700 300 L 60 60 1 1 P
+X PGCK4/A1 N1 1100 1600 300 L 60 60 1 1 P
+X NC A2 -1100 -400 300 R 60 60 1 1 P
+X PGCK1/A16 B2 -1100 -100 300 R 60 60 1 1 P
+X P/A14 C2 -1100 100 300 R 60 60 1 1 P
+X P/A13 D2 -1100 400 300 R 60 60 1 1 P
+X NC E2 -1100 600 300 R 60 60 1 1 P
+X P F2 -1100 900 300 R 60 60 1 1 P
+X GND G2 300 -2700 0 U 60 60 1 1 W N
+X P/A6 H2 1100 2500 300 L 60 60 1 1 P
+X P/A4 J2 1100 2100 300 L 60 60 1 1 P
+X P/CS1/A2 K2 1100 1900 300 L 60 60 1 1 P
+X P/A0/WS L2 1100 1500 300 L 60 60 1 1 P
+X TDO M2 1100 1400 300 L 60 60 1 1 P
+X DIN N2 -1100 2000 300 R 60 60 1 1 B
+X NC A3 -1100 -700 300 R 60 60 1 1 P
+X P/A17 B3 -1100 -200 300 R 60 60 1 1 P
+X VCC C3 -300 2700 0 D 60 60 1 1 W N
+X SGCK1 D3 -1100 0 300 R 60 60 1 1 P
+X NC E3 -1100 300 300 R 60 60 1 1 P
+X P/A10 F3 -1100 800 300 R 60 60 1 1 P
+X P H3 1100 2300 300 L 60 60 1 1 P
+X NC J3 1100 1800 300 L 60 60 1 1 P
+X GND K3 200 -2700 0 U 60 60 1 1 W N
+X VCC L3 100 2700 0 D 60 60 1 1 W N
+X DOUT-SGKC4 M3 -1100 1900 300 R 60 60 1 1 O
+X P/RCLK/BSY/RDY N3 1100 1100 300 L 60 60 1 1 P
+X P A4 -1100 -900 300 R 60 60 1 1 P
+X TCK B4 -1100 -600 300 R 60 60 1 1 P
+X GND C4 -400 -2700 0 U 60 60 1 1 W N
+X CCLK L4 -1100 1800 300 R 60 60 1 1 I C
+X NC M4 1100 1200 300 L 60 60 1 1 P
+X P N4 1100 900 300 L 60 60 1 1 P
+X P A5 -1100 -1100 300 R 60 60 1 1 P
+X TMS B5 -1100 -800 300 R 60 60 1 1 P
+X TDI C5 -1100 -500 300 R 60 60 1 1 P
+X NC L5 1100 1300 300 L 60 60 1 1 P
+X P/D1 M5 1100 1000 300 L 60 60 1 1 P
+X P N5 1100 600 300 L 60 60 1 1 P
+X P A6 -1100 -1300 300 R 60 60 1 1 P
+X P B6 -1100 -1200 300 R 60 60 1 1 P
+X P C6 -1100 -1000 300 R 60 60 1 1 P
+X P/D2 L6 1100 800 300 L 60 60 1 1 P
+X P M6 1100 700 300 L 60 60 1 1 P
+X P/RS N6 1100 500 300 L 60 60 1 1 P
+X P A7 -1100 -1400 300 R 60 60 1 1 P
+X GND B7 -300 -2700 0 U 60 60 1 1 W N
+X GND L7 100 -2700 0 U 60 60 1 1 W N
+X VCC M7 0 2700 0 D 60 60 1 1 W N
+X P/D3 N7 1100 400 300 L 60 60 1 1 P
+X P A8 -1100 -1500 300 R 60 60 1 1 P
+X P B8 -1100 -1700 300 R 60 60 1 1 P
+X P C8 -1100 -1800 300 R 60 60 1 1 P
+X P L8 1100 0 300 L 60 60 1 1 P
+X P/D4 M8 1100 200 300 L 60 60 1 1 P
+X P N8 1100 300 300 L 60 60 1 1 P
+X P A9 -1100 -1600 300 R 60 60 1 1 P
+X P B9 -1100 -2000 300 R 60 60 1 1 P
+X P C9 -1100 -2300 300 R 60 60 1 1 P
+X NC L9 1100 -500 300 L 60 60 1 1 P
+X P/D5 M9 1100 -200 300 L 60 60 1 1 P
+X P N9 1100 100 300 L 60 60 1 1 P
+X P A10 -1100 -1900 300 R 60 60 1 1 P
+X NC B10 -1100 -2200 300 R 60 60 1 1 P
+X GND C10 -200 -2700 0 U 60 60 1 1 W N
+X VCC L10 -100 2700 0 D 60 60 1 1 W N
+X P/D6 M10 1100 -400 300 L 60 60 1 1 P
+X P/CS0 N10 1100 -100 300 L 60 60 1 1 P
+X P A11 -1100 -2100 300 R 60 60 1 1 P
+X M1 B11 -1100 2500 300 R 60 60 1 1 I
+X M0 C11 -1100 2600 300 R 60 60 1 1 I
+X VCC D11 -400 2700 0 D 60 60 1 1 W N
+X NC E11 1100 -2600 300 L 60 60 1 1 P
+X P F11 1100 -2200 300 L 60 60 1 1 P
+X GND G11 -100 -2700 0 U 60 60 1 1 W N
+X P H11 1100 -1500 300 L 60 60 1 1 P
+X NC J11 1100 -1000 300 L 60 60 1 1 P
+X GND K11 0 -2700 0 U 60 60 1 1 W N
+X DONE L11 -1100 2100 300 R 60 60 1 1 O
+X P/D7 M11 1100 -800 300 L 60 60 1 1 P
+X P N11 1100 -300 300 L 60 60 1 1 P
+X SGCK2 A12 -1100 -2400 300 R 60 60 1 1 P
+X M2 B12 -1100 2400 300 R 60 60 1 1 B
+X PGCK2 C12 -1100 -2500 300 R 60 60 1 1 P
+X P D12 1100 -2500 300 L 60 60 1 1 P
+X P E12 1100 -2400 300 L 60 60 1 1 P
+X P F12 1100 -2000 300 L 60 60 1 1 B
+X VCC G12 -200 2700 0 D 60 60 1 1 W N
+X P H12 1100 -1600 300 L 60 60 1 1 P
+X P J12 1100 -1300 300 L 60 60 1 1 P
+X NC K12 1100 -1100 300 L 60 60 1 1 P
+X SGCK3 L12 1100 -900 300 L 60 60 1 1 P
+X PROG M12 -1100 2200 300 R 60 60 1 1 I I
+X NC N12 1100 -600 300 L 60 60 1 1 P
+X HDC A13 -1100 1600 300 R 60 60 1 1 O
+X NC B13 -1100 -2600 300 R 60 60 1 1 P
+X LDC C13 -1100 1500 300 R 60 60 1 1 O
+X P D13 1100 -2300 300 L 60 60 1 1 P
+X P E13 1100 -2100 300 L 60 60 1 1 P
+X INIT F13 -1100 1700 300 R 60 60 1 1 B
+X P G13 1100 -1900 300 L 60 60 1 1 P
+X P H13 1100 -1800 300 L 60 60 1 1 P
+X P J13 1100 -1700 300 L 60 60 1 1 P
+X P K13 1100 -1400 300 L 60 60 1 1 P
+X P L13 1100 -1200 300 L 60 60 1 1 P
+X PGCK3 N13 1100 -700 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# 628128
+#
+DEF 628128 U 0 40 Y Y 1 F N
+F0 "U" 50 0 70 H V C CNN
+F1 "628128" 300 -1200 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VCC 32 0 1100 0 D 60 60 0 0 W N
+X GND 16 0 -1100 0 U 60 60 0 0 W N
+S -400 1100 400 -1100 0 1 0 N
+X A16 2 -700 -550 300 R 60 60 1 1 I
+X A14 3 -700 -350 300 R 60 60 1 1 I
+X A12 4 -700 -150 300 R 60 60 1 1 I
+X A7 5 -700 350 300 R 60 60 1 1 I
+X A6 6 -700 450 300 R 60 60 1 1 I
+X A5 7 -700 550 300 R 60 60 1 1 I
+X A4 8 -700 650 300 R 60 60 1 1 I
+X A3 9 -700 750 300 R 60 60 1 1 I
+X A2 10 -700 850 300 R 60 60 1 1 I
+X Q6 20 700 450 300 L 60 60 1 1 T
+X CS2 30 -700 -850 300 R 60 60 1 1 I
+X A1 11 -700 950 300 R 60 60 1 1 I
+X Q7 21 700 350 300 L 60 60 1 1 T
+X A15 31 -700 -450 300 R 60 60 1 1 I
+X A0 12 -700 1050 300 R 60 60 1 1 I
+X CS1 22 -700 -750 300 R 60 60 1 1 I I
+X Q0 13 700 1050 300 L 60 60 1 1 T
+X A10 23 -700 50 300 R 60 60 1 1 I
+X Q1 14 700 950 300 L 60 60 1 1 T
+X OE 24 -700 -950 300 R 60 60 1 1 I I
+X Q2 15 700 850 300 L 60 60 1 1 T
+X A11 25 -700 -50 300 R 60 60 1 1 I
+X A9 26 -700 150 300 R 60 60 1 1 I
+X Q3 17 700 750 300 L 60 60 1 1 T
+X A8 27 -700 250 300 R 60 60 1 1 I
+X Q4 18 700 650 300 L 60 60 1 1 T
+X A13 28 -700 -250 300 R 60 60 1 1 I
+X Q5 19 700 550 300 L 60 60 1 1 T
+X WR 29 -700 -1050 300 R 60 60 1 1 I I
+ENDDRAW
+ENDDEF
+#
+# 74LS245
+#
+DEF 74LS245 U 0 10 Y Y 1 F N
+F0 "U" 100 575 50 H V L BNN
+F1 "74LS245" 50 -575 50 H V L TNN
+F2 "" 50 -650 30 H V L CNN
+F3 "" 100 575 30 H V C CNN
+ALIAS 74HC245
+DRAW
+X GND 10 0 -550 0 U 60 60 0 0 W N
+X VCC 20 0 550 0 D 60 60 0 0 W N
+S -400 550 400 -550 0 1 0 N
+P 3 0 1 0  50 100  0 -100  -100 -100 N
+P 4 0 1 0  100 100  -50 100  -100 -100  -150 -100 N
+X A->B 1 -700 -400 300 R 60 60 1 1 I
+X A0 2 -700 500 300 R 60 60 1 1 T
+X A1 3 -700 400 300 R 60 60 1 1 T
+X A2 4 -700 300 300 R 60 60 1 1 T
+X A3 5 -700 200 300 R 60 60 1 1 T
+X A4 6 -700 100 300 R 60 60 1 1 T
+X A5 7 -700 0 300 R 60 60 1 1 T
+X A6 8 -700 -100 300 R 60 60 1 1 T
+X A7 9 -700 -200 300 R 60 60 1 1 T
+X B7 11 700 -200 300 L 60 60 1 1 T
+X B6 12 700 -100 300 L 60 60 1 1 T
+X B5 13 700 0 300 L 60 60 1 1 T
+X B4 14 700 100 300 L 60 60 1 1 T
+X B3 15 700 200 300 L 60 60 1 1 T
+X B2 16 700 300 300 L 60 60 1 1 T
+X B1 17 700 400 300 L 60 60 1 1 T
+X B0 18 700 500 300 L 60 60 1 1 T
+X CE 19 -700 -500 300 R 60 60 1 1 I I
+ENDDRAW
+ENDDEF
+#
+# 74LS541
+#
+DEF 74LS541 U 0 30 Y Y 1 F N
+F0 "U" 0 575 60 H V C BNN
+F1 "74LS541" 0 -575 60 H V C TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 10 -200 -550 0 U 60 60 0 0 W N
+X VCC 20 -200 550 0 D 60 60 0 0 W N
+S -400 550 400 -550 0 1 0 N
+P 2 0 1 0  -100 300  -150 300 N
+P 2 0 1 0  100 300  150 300 N
+P 3 0 1 0  50 100  0 -100  -100 -100 N
+P 4 0 1 0  -100 400  -100 200  100 300  -100 400 N
+P 4 0 1 0  100 100  -50 100  -100 -100  -150 -100 N
+X G1 1 -700 -400 300 R 60 60 1 1 I I
+X A0 2 -700 500 300 R 60 60 1 1 I
+X A1 3 -700 400 300 R 60 60 1 1 I
+X A2 4 -700 300 300 R 60 60 1 1 I
+X A3 5 -700 200 300 R 60 60 1 1 I
+X A4 6 -700 100 300 R 60 60 1 1 I
+X A5 7 -700 0 300 R 60 60 1 1 I
+X A6 8 -700 -100 300 R 60 60 1 1 I
+X A7 9 -700 -200 300 R 60 60 1 1 I
+X Y7 11 700 -200 300 L 60 60 1 1 T
+X Y6 12 700 -100 300 L 60 60 1 1 T
+X Y5 13 700 0 300 L 60 60 1 1 T
+X Y4 14 700 100 300 L 60 60 1 1 T
+X Y3 15 700 200 300 L 60 60 1 1 T
+X Y2 16 700 300 300 L 60 60 1 1 T
+X Y1 17 700 400 300 L 60 60 1 1 T
+X Y0 18 700 500 300 L 60 60 1 1 T
+X G2 19 -700 -500 300 R 60 60 1 1 I I
+ENDDRAW
+ENDDEF
+#
+# 74LS688
+#
+DEF 74LS688 U 0 40 Y Y 1 F N
+F0 "U" 0 950 60 H V C CNN
+F1 "74LS688" 0 -950 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 10 -300 -900 0 R 60 60 0 0 W N
+X VCC 20 -300 900 0 R 60 60 0 0 W N
+S -400 900 400 -900 0 1 0 N
+X G 1 -700 -850 300 R 60 60 1 1 I I
+X P0 2 -700 850 300 R 60 60 1 1 I
+X R0 3 -700 0 300 R 60 60 1 1 I
+X P1 4 -700 750 300 R 60 60 1 1 I
+X R1 5 -700 -100 300 R 60 60 1 1 I
+X P2 6 -700 650 300 R 60 60 1 1 I
+X R2 7 -700 -200 300 R 60 60 1 1 I
+X P3 8 -700 550 300 R 60 60 1 1 I
+X R3 9 -700 -300 300 R 60 60 1 1 I
+X P4 11 -700 450 300 R 60 60 1 1 I
+X R4 12 -700 -400 300 R 60 60 1 1 I
+X P5 13 -700 350 300 R 60 60 1 1 I
+X R5 14 -700 -500 300 R 60 60 1 1 I
+X P6 15 -700 250 300 R 60 60 1 1 I
+X R6 16 -700 -600 300 R 60 60 1 1 I
+X P7 17 -700 150 300 R 60 60 1 1 I
+X R7 18 -700 -700 300 R 60 60 1 1 I
+X P=R 19 700 850 300 L 60 60 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# BUSPC
+#
+DEF BUSPC BUS 0 40 Y Y 1 F N
+F0 "BUS" 0 100 70 H V C CNN
+F1 "BUSPC" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -600 -1600 600 1600 0 1 0 N
+X GND 1 -900 1500 300 R 60 60 1 1 P
+X RESET 2 -900 1400 300 R 60 60 1 1 O
+X VCC 3 -900 1300 300 R 60 60 1 1 P
+X INQ2 4 -900 1200 300 R 60 60 1 1 P
+X -5V 5 -900 1100 300 R 60 60 1 1 P
+X DRQ2 6 -900 1000 300 R 60 60 1 1 P
+X -12V 7 -900 900 300 R 60 60 1 1 P
+X UNUSED 8 -900 800 300 R 60 60 1 1 P
+X +12V 9 -900 700 300 R 60 60 1 1 P
+X GND 10 -900 600 300 R 60 60 1 1 P
+X CLK 20 -900 -400 300 R 60 60 1 1 O
+X OSC 30 -900 -1400 300 R 60 60 1 1 O
+X DB0 40 900 700 300 L 60 60 1 1 T
+X BA12 50 900 -300 300 L 60 60 1 1 T
+X BA02 60 900 -1300 300 L 60 60 1 1 T
+X MEM 11 -900 500 300 R 60 60 1 1 O I
+X IRQ7 21 -900 -500 300 R 60 60 1 1 P
+X GND 31 -900 -1500 300 R 60 60 1 1 P
+X IO_READY 41 900 600 300 L 60 60 1 1 P
+X BA11 51 900 -400 300 L 60 60 1 1 T
+X BA01 61 900 -1400 300 L 60 60 1 1 T
+X MEM 12 -900 400 300 R 60 60 1 1 O I
+X IRQ6 22 -900 -600 300 R 60 60 1 1 P
+X IO 32 900 1500 300 L 60 60 1 1 P
+X AEN 42 900 500 300 L 60 60 1 1 O
+X BA10 52 900 -500 300 L 60 60 1 1 T
+X BA00 62 900 -1500 300 L 60 60 1 1 T
+X IOW 13 -900 300 300 R 60 60 1 1 O I
+X IRQ5 23 -900 -700 300 R 60 60 1 1 P
+X DB7 33 900 1400 300 L 60 60 1 1 T
+X BA19 43 900 400 300 L 60 60 1 1 T
+X BA09 53 900 -600 300 L 60 60 1 1 T
+X IOR 14 -900 200 300 R 60 60 1 1 O I
+X IRQ4 24 -900 -800 300 R 60 60 1 1 P
+X DB6 34 900 1300 300 L 60 60 1 1 T
+X BA18 44 900 300 300 L 60 60 1 1 T
+X BA08 54 900 -700 300 L 60 60 1 1 T
+X DACK3 15 -900 100 300 R 60 60 1 1 P I
+X IRQ3 25 -900 -900 300 R 60 60 1 1 P
+X DB5 35 900 1200 300 L 60 60 1 1 T
+X BA17 45 900 200 300 L 60 60 1 1 T
+X BA07 55 900 -800 300 L 60 60 1 1 T
+X DRQ3 16 -900 0 300 R 60 60 1 1 P
+X DACK2 26 -900 -1000 300 R 60 60 1 1 P I
+X DB4 36 900 1100 300 L 60 60 1 1 T
+X BA16 46 900 100 300 L 60 60 1 1 T
+X BA06 56 900 -900 300 L 60 60 1 1 T
+X DACK1 17 -900 -100 300 R 60 60 1 1 P I
+X TC 27 -900 -1100 300 R 60 60 1 1 P
+X DB3 37 900 1000 300 L 60 60 1 1 T
+X BA15 47 900 0 300 L 60 60 1 1 T
+X BA05 57 900 -1000 300 L 60 60 1 1 T
+X DRQ1 18 -900 -200 300 R 60 60 1 1 P
+X ALE 28 -900 -1200 300 R 60 60 1 1 O
+X DB2 38 900 900 300 L 60 60 1 1 T
+X BA14 48 900 -100 300 L 60 60 1 1 T
+X BA04 58 900 -1100 300 L 60 60 1 1 T
+X DACK0 19 -900 -300 300 R 60 60 1 1 P I
+X VCC 29 -900 -1300 300 R 60 60 1 1 P
+X DB1 39 900 800 300 L 60 60 1 1 T
+X BA13 49 900 -200 300 L 60 60 1 1 T
+X BA03 59 900 -1200 300 L 60 60 1 1 T
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_8X2
+#
+DEF CONN_8X2 P 0 40 Y Y 1 F N
+F0 "P" 0 450 60 H V C CNN
+F1 "CONN_8X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 400 100 -400 0 1 0 N
+X ~ 1 -400 350 300 R 60 60 1 1 P I
+X ~ 2 400 350 300 L 60 60 1 1 P I
+X ~ 3 -400 250 300 R 60 60 1 1 P I
+X ~ 4 400 250 300 L 60 60 1 1 P I
+X ~ 5 -400 150 300 R 60 60 1 1 P I
+X ~ 6 400 150 300 L 60 60 1 1 P I
+X ~ 7 -400 50 300 R 60 60 1 1 P I
+X ~ 8 400 50 300 L 60 60 1 1 P I
+X ~ 9 -400 -50 300 R 60 60 1 1 P I
+X ~ 10 400 -50 300 L 60 60 1 1 P I
+X ~ 11 -400 -150 300 R 60 60 1 1 P I
+X ~ 12 400 -150 300 L 60 60 1 1 P I
+X ~ 13 -400 -250 300 R 60 60 1 1 P I
+X ~ 14 400 -250 300 L 60 60 1 1 P I
+X ~ 15 -400 -350 300 R 60 60 1 1 P I
+X ~ 16 400 -350 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CRYSTAL
+#
+DEF CRYSTAL X 0 40 N N 1 F N
+F0 "X" 0 150 60 H V C CNN
+F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 16  -100 100  -100 -100 N
+P 2 0 1 16  100 100  100 -100 N
+P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 f
+X 1 1 -300 0 200 R 40 40 1 1 P
+X 2 2 300 0 200 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB25
+#
+DEF DB25 J 0 40 Y N 1 F N
+F0 "J" 50 1350 70 H V C CNN
+F1 "DB25" -50 -1350 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB25*
+$ENDFPLIST
+DRAW
+A -109 1270 41 1799 774 0 1 8 N -150 1270 -100 1310
+A -108 -1259 42 -1787 -788 0 1 8 N -150 -1260 -100 -1300
+A 116 -1169 34 -657 -15 0 1 8 N 130 -1200 150 -1170
+A 117 1170 32 664 1 0 1 8 N 130 1199 149 1170
+C -70 -1200 30 0 1 0 N
+C -70 -1000 30 0 1 0 N
+C -70 -800 30 0 1 0 N
+C -70 -600 30 0 1 0 N
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C -70 600 30 0 1 0 N
+C -70 800 30 0 1 0 N
+C -70 1000 30 0 1 0 N
+C -70 1200 30 0 1 0 N
+C 50 -1100 30 0 1 0 N
+C 50 -900 30 0 1 0 N
+C 50 -700 30 0 1 0 N
+C 50 -500 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+C 50 500 30 0 1 0 N
+C 50 700 30 0 1 0 N
+C 50 900 30 0 1 0 N
+C 50 1100 30 0 1 0 N
+P 2 0 1 8  -150 -1260  -150 1270 N
+P 2 0 1 0  -150 -1200  -100 -1200 N
+P 2 0 1 0  -150 -1100  20 -1100 N
+P 2 0 1 0  -150 -1000  -100 -1000 N
+P 2 0 1 0  -150 -900  20 -900 N
+P 2 0 1 0  -150 -800  -100 -800 N
+P 2 0 1 0  -150 -700  20 -700 N
+P 2 0 1 0  -150 -600  -100 -600 N
+P 2 0 1 0  -150 -500  20 -500 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 0  -150 500  20 500 N
+P 2 0 1 0  -150 600  -100 600 N
+P 2 0 1 0  -150 700  20 700 N
+P 2 0 1 0  -150 800  -100 800 N
+P 2 0 1 0  -150 900  20 900 N
+P 2 0 1 0  -150 1000  -100 1000 N
+P 2 0 1 0  -150 1100  20 1100 N
+P 2 0 1 0  -150 1200  -100 1200 N
+P 2 0 1 8  -100 -1300  130 -1200 N
+P 2 0 1 8  130 1200  -100 1310 N
+P 2 0 1 8  150 -1170  150 1170 N
+X 1 1 -450 -1200 300 R 60 60 1 1 P
+X 2 2 -450 -1000 300 R 60 60 1 1 P
+X 3 3 -450 -800 300 R 60 60 1 1 P
+X 4 4 -450 -600 300 R 60 60 1 1 P
+X 5 5 -450 -400 300 R 60 60 1 1 P
+X 6 6 -450 -200 300 R 60 60 1 1 P
+X 7 7 -450 0 300 R 60 60 1 1 P
+X 8 8 -450 200 300 R 60 60 1 1 P
+X 9 9 -450 400 300 R 60 60 1 1 P
+X 10 10 -450 600 300 R 60 60 1 1 P
+X P20 20 -450 100 300 R 60 60 1 1 P
+X 11 11 -450 800 300 R 60 60 1 1 P
+X P21 21 -450 300 300 R 60 60 1 1 P
+X 12 12 -450 1000 300 R 60 60 1 1 P
+X P22 22 -450 500 300 R 60 60 1 1 P
+X 13 13 -450 1200 300 R 60 60 1 1 P
+X P23 23 -450 700 300 R 60 60 1 1 P
+X P14 14 -450 -1100 300 R 60 60 1 1 P
+X P24 24 -450 900 300 R 60 60 1 1 P
+X P15 15 -450 -900 300 R 60 60 1 1 P
+X P25 25 -450 1100 300 R 60 60 1 1 P
+X P16 16 -450 -700 300 R 60 60 1 1 P
+X P17 17 -450 -500 300 R 60 60 1 1 P
+X P18 18 -450 -300 300 R 60 60 1 1 P
+X P19 19 -450 -100 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# EP600
+#
+DEF EP600 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "EP600" 0 -500 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -500 -850 500 850 0 1 0 N
+X CLK1 1 -800 750 300 R 60 60 1 1 I C
+X IN2 2 -800 550 300 R 60 60 1 1 I
+X I/O3 3 -800 350 300 R 60 60 1 1 P
+X I/O4 4 -800 250 300 R 60 60 1 1 P
+X I/O5 5 -800 150 300 R 60 60 1 1 P
+X I/O6 6 -800 50 300 R 60 60 1 1 P
+X I/O7 7 -800 -50 300 R 60 60 1 1 P
+X I/O8 8 -800 -150 300 R 60 60 1 1 P
+X I/O9 9 -800 -250 300 R 60 60 1 1 P
+X I/O10 10 -800 -350 300 R 60 60 1 1 P
+X I/O20 20 800 350 300 L 60 60 1 1 P
+X IN11 11 -800 -550 300 R 60 60 1 1 I
+X I/O21 21 800 450 300 L 60 60 1 1 P
+X GND 12 -800 -750 300 R 60 60 1 1 I
+X I/O22 22 800 550 300 L 60 60 1 1 P
+X CLK2 13 800 -550 300 L 60 60 1 1 I C
+X IN23 23 800 750 300 L 60 60 1 1 I
+X IN14 14 800 -350 300 L 60 60 1 1 I
+X VCC 24 800 -750 300 L 60 60 1 1 I
+X I/O15 15 800 -150 300 L 60 60 1 1 P
+X I/O16 16 800 -50 300 L 60 60 1 1 P
+X I/O17 17 800 50 300 L 60 60 1 1 P
+X I/O18 18 800 150 300 L 60 60 1 1 P
+X I/O19 19 800 250 300 L 60 60 1 1 P
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+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
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+ENDDRAW
+ENDDEF
+#
+# RR9
+#
+DEF RR9 RR 0 40 Y N 1 F N
+F0 "RR" 50 600 70 H V C CNN
+F1 "RR9" 30 0 70 V 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  -50 -450  -50 550  50 550  100 500  100 -450  -50 -450 N
+X COM 1 -350 500 300 R 60 60 1 1 P I
+X 2 2 -350 400 300 R 60 60 1 1 P I
+X 3 3 -350 300 300 R 60 60 1 1 P I
+X 4 4 -350 200 300 R 60 60 1 1 P I
+X 5 5 -350 100 300 R 60 60 1 1 P I
+X 6 6 -350 0 300 R 60 60 1 1 P I
+X 7 7 -350 -100 300 R 60 60 1 1 P I
+X 8 8 -350 -200 300 R 60 60 1 1 P I
+X 9 9 -350 -300 300 R 60 60 1 1 P I
+X 10 10 -350 -400 300 R 60 60 1 1 P I
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
index 25167a34f8..376475b58a 100644
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
@@ -1,5 +1,5 @@
-update=24/01/2014 13:22:43
-last_client=eeschema
+update=18/05/2015 09:05:34
+last_client=kicad
 [general]
 version=1
 [cvpcb]
@@ -31,26 +31,7 @@ ModuleOutlineThickness=0.1524
 LibDir=
 [eeschema]
 version=1
-PageLayoutDescrFile=
-SubpartIdSeparator=0
-SubpartFirstId=65
 LibDir=
-NetFmtName=
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=adc-dac
-LibName9=memory
-LibName10=xilinx
-LibName11=special
-LibName12=microcontrollers
-LibName13=motorola
+LibName1=kit-dev-coldfire-xilinx_5213_schlib
+LibName2=power
diff --git a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib
new file mode 100644
index 0000000000..1dcd3f6883
--- /dev/null
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib
@@ -0,0 +1,1055 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +3.3V
+#
+DEF +3.3V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -40 30 H I C CNN
+F1 "+3.3V" 0 110 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS +3,3V
+DRAW
+X +3.3V 1 0 0 0 U 30 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# 74AHC1G14
+#
+DEF 74AHC1G14 U 0 30 Y Y 1 F N
+F0 "U" 145 115 40 H V C CNN
+F1 "74AHC1G14" 200 -100 40 H V C CNN
+F2 "" 95 -135 30 H V C CNN
+F3 "" 145 115 60 H V C CNN
+DRAW
+P 4 0 0 0  -150 150  -150 -150  150 0  -150 150 N
+X GND 3 -50 -200 100 U 40 20 0 0 W
+X VCC 5 -50 200 100 D 40 20 0 0 W
+X ~ 2 -450 0 300 R 60 60 1 1 I
+X ~ 4 450 0 300 L 60 60 1 1 O I
+X ~ 2 -450 0 300 R 60 60 1 2 I I
+X ~ 4 450 0 300 L 60 60 1 2 O
+ENDDRAW
+ENDDEF
+#
+# 74LS125
+#
+DEF 74LS125 U 0 30 Y Y 4 F N
+F0 "U" 0 100 50 H V L BNN
+F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 7 -150 -150 0 U 50 30 0 0 W N
+X VCC 14 -150 150 0 D 50 30 0 0 W N
+X E 1 0 -300 220 U 50 30 1 0 I I
+X E 4 0 -300 220 U 50 30 2 0 I I
+X E 10 0 -300 220 U 50 30 3 0 I I
+X E 13 0 -300 220 U 50 30 4 0 I I
+P 4 0 1 0  -150 150  -150 -150  150 0  -150 150 N
+X D 2 -450 0 300 R 50 30 1 1 I
+X O 3 450 0 300 L 50 30 1 1 T
+X D 5 -450 0 300 R 50 30 2 1 I
+X O 6 450 0 300 L 50 30 2 1 T
+X O 8 450 0 300 L 50 30 3 1 T
+X D 9 -450 0 300 R 50 30 3 1 I
+X O 11 450 0 300 L 50 30 4 1 T
+X D 12 -450 0 300 R 50 30 4 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_13X2
+#
+DEF CONN_13X2 P 0 10 Y N 1 F N
+F0 "P" 0 700 60 H V C CNN
+F1 "CONN_13X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 650 100 -650 0 1 0 N
+X P1 1 -400 600 300 R 40 30 1 1 P I
+X P2 2 400 600 300 L 40 30 1 1 P I
+X P3 3 -400 500 300 R 40 30 1 1 P I
+X P4 4 400 500 300 L 40 30 1 1 P I
+X P5 5 -400 400 300 R 40 30 1 1 P I
+X P6 6 400 400 300 L 40 30 1 1 P I
+X P7 7 -400 300 300 R 40 30 1 1 P I
+X P8 8 400 300 300 L 40 30 1 1 P I
+X P9 9 -400 200 300 R 40 30 1 1 P I
+X P10 10 400 200 300 L 40 30 1 1 P I
+X P20 20 400 -300 300 L 40 30 1 1 P I
+X P11 11 -400 100 300 R 40 30 1 1 P I
+X P21 21 -400 -400 300 R 40 30 1 1 P I
+X P12 12 400 100 300 L 40 30 1 1 P I
+X P22 22 400 -400 300 L 40 30 1 1 P I
+X P13 13 -400 0 300 R 40 30 1 1 P I
+X P23 23 -400 -500 300 R 40 30 1 1 P I
+X P14 14 400 0 300 L 40 30 1 1 P I
+X P20 24 400 -500 300 L 40 30 1 1 P I
+X P15 15 -400 -100 300 R 40 30 1 1 P I
+X P24 25 -400 -600 300 R 40 30 1 1 P I
+X P16 16 400 -100 300 L 40 30 1 1 P I
+X P22 26 400 -600 300 L 40 30 1 1 P I
+X P17 17 -400 -200 300 R 40 30 1 1 P I
+X P18 18 400 -200 300 L 40 30 1 1 P I
+X P19 19 -400 -300 300 R 40 30 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_20X2
+#
+DEF CONN_20X2 P 0 10 Y N 1 F N
+F0 "P" 0 1050 60 H V C CNN
+F1 "CONN_20X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 1000 100 -1000 0 1 0 N
+X P1 1 -400 950 300 R 60 30 1 1 P I
+X P2 2 400 950 300 L 60 30 1 1 P I
+X P3 3 -400 850 300 R 60 30 1 1 P I
+X P4 4 400 850 300 L 60 30 1 1 P I
+X P5 5 -400 750 300 R 60 30 1 1 P I
+X P6 6 400 750 300 L 60 30 1 1 P I
+X P7 7 -400 650 300 R 60 30 1 1 P I
+X P8 8 400 650 300 L 60 30 1 1 P I
+X P9 9 -400 550 300 R 60 30 1 1 P I
+X P10 10 400 550 300 L 60 30 1 1 P I
+X P20 20 400 50 300 L 60 30 1 1 P I
+X P30 30 400 -450 300 L 60 30 1 1 P I
+X P40 40 400 -950 300 L 60 30 1 1 P I
+X P11 11 -400 450 300 R 60 30 1 1 P I
+X P21 21 -400 -50 300 R 60 30 1 1 P I
+X P31 31 -400 -550 300 R 60 30 1 1 P I
+X P12 12 400 450 300 L 60 30 1 1 P I
+X P22 22 400 -50 300 L 60 30 1 1 P I
+X P32 32 400 -550 300 L 60 30 1 1 P I
+X P13 13 -400 350 300 R 60 30 1 1 P I
+X P23 23 -400 -150 300 R 60 30 1 1 P I
+X P33 33 -400 -650 300 R 60 30 1 1 P I
+X P14 14 400 350 300 L 60 30 1 1 P I
+X P24 24 400 -150 300 L 60 30 1 1 P I
+X P34 34 400 -650 300 L 60 30 1 1 P I
+X P15 15 -400 250 300 R 60 30 1 1 P I
+X ~ 25 -400 -250 300 R 60 30 1 1 P I
+X P35 35 -400 -750 300 R 60 30 1 1 P I
+X P16 16 400 250 300 L 60 30 1 1 P I
+X P26 26 400 -250 300 L 60 30 1 1 P I
+X P36 36 400 -750 300 L 60 30 1 1 P I
+X P17 17 -400 150 300 R 60 30 1 1 P I
+X P27 27 -400 -350 300 R 60 30 1 1 P I
+X P37 37 -400 -850 300 R 60 30 1 1 P I
+X P18 18 400 150 300 L 60 30 1 1 P I
+X P28 28 400 -350 300 L 60 30 1 1 P I
+X P38 38 400 -850 300 L 60 30 1 1 P I
+X P19 19 -400 50 300 R 60 30 1 1 P I
+X P29 29 -400 -450 300 R 60 30 1 1 P I
+X P39 39 -400 -950 300 R 60 30 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_2X2
+#
+DEF CONN_2X2 P 0 40 Y N 1 F N
+F0 "P" 0 150 50 H V C CNN
+F1 "CONN_2X2" 10 -130 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 100 100 -100 0 1 0 N
+X 1 1 -400 50 300 R 60 60 1 1 P I
+X 2 2 400 50 300 L 60 60 1 1 P I
+X 3 3 -400 -50 300 R 60 60 1 1 P I
+X 4 4 400 -50 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_3
+#
+DEF CONN_3 K 0 40 Y N 1 F N
+F0 "K" -50 0 50 V V C CNN
+F1 "CONN_3" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 0 250 R 60 60 1 1 P I
+X P3 3 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_30X2
+#
+DEF CONN_30X2 P 0 10 Y N 1 F N
+F0 "P" 0 1550 60 H V C CNN
+F1 "CONN_30X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 1500 100 -1500 0 1 0 N
+X P1 1 -400 1450 300 R 60 30 1 1 P I
+X P2 2 400 1450 300 L 60 30 1 1 P I
+X P3 3 -400 1350 300 R 60 30 1 1 P I
+X P4 4 400 1350 300 L 60 30 1 1 P I
+X P5 5 -400 1250 300 R 60 30 1 1 P I
+X P6 6 400 1250 300 L 60 30 1 1 P I
+X P7 7 -400 1150 300 R 60 30 1 1 P I
+X P8 8 400 1150 300 L 60 30 1 1 P I
+X P9 9 -400 1050 300 R 60 30 1 1 P I
+X P10 10 400 1050 300 L 60 30 1 1 P I
+X P20 20 400 550 300 L 60 30 1 1 P I
+X P30 30 400 50 300 L 60 30 1 1 P I
+X P40 40 400 -450 300 L 60 30 1 1 P I
+X P50 50 400 -950 300 L 60 30 1 1 P I
+X P60 60 400 -1450 300 L 50 50 1 1 P I
+X P11 11 -400 950 300 R 60 30 1 1 P I
+X P21 21 -400 450 300 R 60 30 1 1 P I
+X P31 31 -400 -50 300 R 60 30 1 1 P I
+X P41 41 -400 -550 300 R 60 30 1 1 P I
+X P51 51 -400 -1050 300 R 50 50 1 1 P I
+X P12 12 400 950 300 L 60 30 1 1 P I
+X P22 22 400 450 300 L 60 30 1 1 P I
+X P32 32 400 -50 300 L 60 30 1 1 P I
+X P42 42 400 -550 300 L 60 30 1 1 P I
+X P52 52 400 -1050 300 L 50 50 1 1 P I
+X P13 13 -400 850 300 R 60 30 1 1 P I
+X P23 23 -400 350 300 R 60 30 1 1 P I
+X P23 23 -400 350 300 R 60 30 1 1 P I
+X P33 33 -400 -150 300 R 60 30 1 1 P I
+X P43 43 -400 -650 300 R 60 30 1 1 P I
+X P53 53 -400 -1150 300 R 50 50 1 1 P I
+X P14 14 400 850 300 L 60 30 1 1 P I
+X P24 24 400 350 300 L 60 30 1 1 P I
+X P34 34 400 -150 300 L 60 30 1 1 P I
+X P44 44 400 -650 300 L 60 30 1 1 P I
+X P54 54 400 -1150 300 L 50 50 1 1 P I
+X P15 15 -400 750 300 R 60 30 1 1 P I
+X ~ 25 -400 250 300 R 60 30 1 1 P I
+X P35 35 -400 -250 300 R 60 30 1 1 P I
+X P45 45 -400 -750 300 R 60 30 1 1 P I
+X P55 55 -400 -1250 300 R 50 50 1 1 P I
+X P16 16 400 750 300 L 60 30 1 1 P I
+X P26 26 400 250 300 L 60 30 1 1 P I
+X P36 36 400 -250 300 L 60 30 1 1 P I
+X P46 46 400 -750 300 L 60 30 1 1 P I
+X P56 56 400 -1250 300 L 50 50 1 1 P I
+X P17 17 -400 650 300 R 60 30 1 1 P I
+X P27 27 -400 150 300 R 60 30 1 1 P I
+X P37 37 -400 -350 300 R 60 30 1 1 P I
+X P47 47 -400 -850 300 R 60 30 1 1 P I
+X P57 57 -400 -1350 300 R 50 50 1 1 P I
+X P18 18 400 650 300 L 60 30 1 1 P I
+X P28 28 400 150 300 L 60 30 1 1 P I
+X P38 38 400 -350 300 L 60 30 1 1 P I
+X P48 48 400 -850 300 L 60 30 1 1 P I
+X P58 58 400 -1350 300 L 50 50 1 1 P I
+X P19 19 -400 550 300 R 60 30 1 1 P I
+X P29 29 -400 50 300 R 60 30 1 1 P I
+X P39 39 -400 -450 300 R 60 30 1 1 P I
+X P49 49 -400 -950 300 R 60 30 1 1 P I
+X P59 59 -400 -1450 300 R 50 50 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_4X2
+#
+DEF CONN_4X2 P 0 40 Y N 1 F N
+F0 "P" 0 250 50 H V C CNN
+F1 "CONN_4X2" 0 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 200 100 -200 0 1 0 N
+X 1 1 -400 150 300 R 60 60 1 1 P I
+X 2 2 400 150 300 L 60 60 1 1 P I
+X 3 3 -400 50 300 R 60 60 1 1 P I
+X 4 4 400 50 300 L 60 60 1 1 P I
+X 5 5 -400 -50 300 R 60 60 1 1 P I
+X 6 6 400 -50 300 L 60 60 1 1 P I
+X 7 7 -400 -150 300 R 60 60 1 1 P I
+X 8 8 400 -150 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_6
+#
+DEF CONN_6 P 0 30 Y N 1 F N
+F0 "P" -50 0 60 V V C CNN
+F1 "CONN_6" 50 0 60 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 300 100 -300 0 1 0 N
+X 1 1 -350 250 250 R 60 60 1 1 P I
+X 2 2 -350 150 250 R 60 60 1 1 P I
+X 3 3 -350 50 250 R 60 60 1 1 P I
+X 4 4 -350 -50 250 R 60 60 1 1 P I
+X 5 5 -350 -150 250 R 60 60 1 1 P I
+X 6 6 -350 -250 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CRYSTAL
+#
+DEF CRYSTAL X 0 40 N N 1 F N
+F0 "X" 0 150 60 H V C CNN
+F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 16  -100 100  -100 -100 N
+P 2 0 1 16  100 100  100 -100 N
+P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 f
+X 1 1 -300 0 200 R 40 40 1 1 P
+X 2 2 300 0 200 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB9*
+$ENDFPLIST
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FUSE
+#
+DEF FUSE F 0 10 Y Y 1 F N
+F0 "F" 100 50 40 H V C CNN
+F1 "FUSE" -100 -50 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -75 0 75 1 1799 0 1 0 N 0 0 -150 0
+A 75 0 75 -1799 -1 0 1 0 N 0 0 150 0
+X ~ 1 -250 0 100 R 40 40 1 1 I
+X ~ 2 250 0 100 L 40 40 1 1 I
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# GNDA
+#
+DEF GNDA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 40 H I C CNN
+F1 "GNDA" 0 -70 40 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  -50 0  0 -50  50 0  -50 0 N
+X GNDA 1 0 0 0 U 40 40 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 40 N N 1 F N
+F0 "L" -50 0 40 V V C CNN
+F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+X 1 1 0 300 100 D 70 70 1 1 P
+X 2 2 0 -300 100 U 70 70 1 1 P
+ENDDRAW
+ENDDEF
+#
+# JACK_2P
+#
+DEF JACK_2P J 0 40 Y Y 1 F N
+F0 "J" -350 -200 60 H V C CNN
+F1 "JACK_2P" -150 250 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -450 150 -400 -100 0 1 0 F
+S 300 -150 -400 200 0 1 0 N
+P 3 0 1 0  150 0  300 0  300 0 N
+P 4 0 1 0  0 -100  -50 -50  -100 -100  -100 -100 N
+P 4 0 1 0  0 -100  300 -100  300 -100  300 -100 N
+P 4 0 1 0  50 -50  100 -100  150 -50  150 -50 N
+P 4 0 1 0  150 0  100 0  100 -100  100 -100 N
+P 5 0 1 0  300 150  -250 150  -300 100  -350 150  -350 150 N
+X ~ 1 450 -100 150 L 50 50 1 1 P
+X ~ 2 450 0 150 L 50 50 1 1 P
+X ~ 3 450 150 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# JUMPER
+#
+DEF JUMPER JP 0 30 Y N 1 F N
+F0 "JP" 0 150 60 H V C CNN
+F1 "JUMPER" 0 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 60 60 0 1 P
+X 2 2 300 0 165 L 60 60 0 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+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
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$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
+ENDDRAW
+ENDDEF
+#
+# LT1129_QPACK
+#
+DEF LT1129_QPACK U 0 30 Y Y 1 F N
+F0 "U" 250 450 60 H V C CNN
+F1 "LT1129_QPACK" 500 -495 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LT_1129_QP
+DRAW
+S -500 -400 500 400 0 1 0 N
+X OUT 1 800 300 300 L 60 60 1 1 w
+X SENSE 2 800 100 300 L 60 60 1 1 I
+X GND 3 0 -700 300 U 60 60 1 1 W
+X SHDN 4 -800 100 300 R 60 60 1 1 I I
+X IN 5 -800 300 300 R 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# MAX232
+#
+DEF MAX232 U 0 40 Y Y 1 F N
+F0 "U" 0 850 70 H V C CNN
+F1 "MAX232" 0 -850 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS MAX202
+DRAW
+T 900 80 -530 40 0 0 0 RS232  Normal 0 C C
+T 900 -100 -530 40 0 0 0 TTL  Normal 0 C C
+S -500 -800 500 800 0 1 0 N
+P 3 0 1 0  -500 -300  500 -300  500 -300 N
+P 3 0 1 0  0 -300  0 -800  0 -800 N
+X C1+ 1 -800 700 300 R 60 50 1 1 I
+X V+ 2 800 300 300 L 60 50 1 1 w
+X C1- 3 -800 300 300 R 60 50 1 1 I
+X C2+ 4 -800 200 300 R 60 50 1 1 I
+X C2- 5 -800 -200 300 R 60 50 1 1 I
+X V- 6 800 -200 300 L 60 50 1 1 w
+X T2OUT 7 800 -500 300 L 60 50 1 1 O
+X R2IN 8 800 -700 300 L 60 50 1 1 I
+X R2OUT 9 -800 -700 300 R 60 50 1 1 O
+X T2IN 10 -800 -500 300 R 60 50 1 1 I
+X T1IN 11 -800 -400 300 R 60 50 1 1 I
+X R1OUT 12 -800 -600 300 R 60 50 1 1 O
+X R1IN 13 800 -600 300 L 60 50 1 1 I
+X T1OUT 14 800 -400 300 L 60 50 1 1 O
+X GND 15 800 100 300 L 60 50 1 1 W
+X VCC 16 800 700 300 L 60 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# MC34064P
+#
+DEF MC34064P U 0 20 Y Y 1 F N
+F0 "U" 50 200 60 H V C CNN
+F1 "MC34064P" 300 -190 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS MC33064P
+DRAW
+S -200 -150 200 150 0 1 0 N
+X Rst 1 350 50 150 L 60 40 1 1 C
+X In 2 -350 50 150 R 60 40 1 1 I
+X Gbd 3 0 -300 150 U 60 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# MCF5213-LQFP100
+#
+DEF MCF5213-LQFP100 U 0 40 Y Y 1 F N
+F0 "U" 1150 2700 60 H V L CNN
+F1 "MCF5213-LQFP100" 600 -2650 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -1700 2600 1700 -2600 0 1 0 N
+X VCC 1 -250 2850 250 D 30 30 1 1 W
+X VCC 2 -200 2850 250 D 30 30 1 1 W
+X GND 3 -250 -2850 250 U 30 30 1 1 W
+X ~URTS1~/SYNCB/UTXD2/PUB2 4 2000 -400 300 L 50 50 1 1 B
+X TEST 5 -2000 1450 300 R 50 50 1 1 I
+X ~UCTS0~/CANRX/PUA3 6 2000 -300 300 L 50 50 1 1 B
+X URXD0/PUA1 7 2000 400 300 L 50 50 1 1 B
+X UTXD0/PUA0 8 2000 500 300 L 50 50 1 1 B
+X ~URTS0~/CANTX/PUA2 9 2000 -200 300 L 50 50 1 1 B
+X SCL/CANTX/PAS0/UTXD2 10 2000 950 300 L 50 50 1 1 B
+X QSPI_CS0/SDA/CTS1/PQS3 20 2000 -1400 300 L 50 50 1 1 B
+X ~URTS2~/PUC2 30 2000 -600 300 L 50 50 1 1 B
+X CLKMOD0 40 -2000 1750 300 R 50 50 1 1 I
+X VCCA 50 -2000 -2350 300 R 50 50 1 1 I
+X PWM5/PTD2 60 2000 2300 300 L 50 60 1 1 B
+X PST3/PDD3 70 -2000 200 300 R 50 50 1 1 B
+X DSO/TDO 80 -2000 950 300 R 50 50 1 1 O
+X ~IRQ4~/PNQ4 90 -2000 -750 300 R 50 50 1 1 B
+X SDA/CANRX/PAS1/URXD2 11 2000 850 300 L 50 50 1 1 B
+X RCON/EZPCS 21 -2000 1550 300 R 50 50 1 1 I L
+X DTIN2/DTOUT2/PWM4/PTC2 31 2000 1400 300 L 50 50 1 1 B
+X VCC 41 50 2850 250 D 30 30 1 1 W
+X AN7/PAN7 51 -2000 -1950 300 R 50 50 1 1 B
+X GPT2PWM5//PTA2 61 2000 1850 300 L 50 50 1 1 B
+X GNDPLL 71 -2000 2400 300 R 50 50 1 1 P
+X VCC 81 200 2850 250 D 30 30 1 1 W
+X ~IRQ5~/PNQ5 91 -2000 -850 300 R 50 50 1 1 B
+X QSPI_CS3/SYNCA/SYNCB/PQS6 12 2000 -1700 300 L 50 50 1 1 B
+X VCC 22 -100 2850 250 D 30 30 1 1 W
+X DTIN3/DTOUT3/PWM6/PTC3 32 2000 1300 300 L 50 50 1 1 B
+X GND 42 0 -2850 250 U 30 30 1 1 W
+X AN6/PAN6 52 -2000 -1850 300 R 50 50 1 1 B
+X GPT3/PWM7/PTA3 62 2000 1750 300 L 50 50 1 1 B
+X XTAL 72 -2000 2150 300 R 50 50 1 1 O
+X GND 82 200 -2850 250 U 30 30 1 1 W
+X GND 92 250 -2850 250 U 30 30 1 1 W
+X QSPI_CS2/PQS5 13 2000 -1600 300 L 50 50 1 1 B
+X VCC 23 -50 2850 250 D 30 30 1 1 W
+X PWM3/PTD1 33 2000 2400 300 L 50 60 1 1 B
+X AN0/PAN0 43 -2000 -1250 300 R 50 50 1 1 B
+X AN5/PAN5 53 -2000 -1750 300 R 50 50 1 1 B
+X PWM7/PTD3 63 2000 2200 300 L 50 60 1 1 B
+X CLKIN/EXTAL 73 -2000 2250 300 R 50 50 1 1 I
+X DDATA2/PDD6 83 -2000 -100 300 R 50 50 1 1 B
+X VCC 93 250 2850 250 D 30 30 1 1 W
+X VCC 14 -150 2850 250 D 30 30 1 1 W
+X GND 24 -150 -2850 250 U 30 30 1 1 W
+X VCC 34 0 2850 250 D 30 30 1 1 W
+X AN1/PAN1 44 -2000 -1350 300 R 50 50 1 1 B
+X AN4/PAN4 54 -2000 -1650 300 R 50 50 1 1 B
+X TCLK/PSTCLK/CLKOUT 64 -2000 850 300 R 50 50 1 1 I
+X VCCPLL 74 -2000 2500 300 R 50 50 1 1 P
+X DDATA3/PDD7 84 -2000 -200 300 R 50 50 1 1 B
+X ~IRQ6~/PNQ6 94 -2000 -950 300 R 50 50 1 1 B
+X GND 15 -200 -2850 250 U 30 30 1 1 W
+X GND 25 -100 -2850 250 U 30 30 1 1 W
+X GND 35 -50 -2850 250 U 30 30 1 1 W
+X AN2/PAN2 45 -2000 -1450 300 R 50 50 1 1 B
+X VSTBY 55 350 2850 250 D 30 30 1 1 W
+X PST0/PDD0 65 -2000 500 300 R 50 50 1 1 B
+X GND 75 150 -2850 250 U 30 30 1 1 W
+X DSCLK/~TRST~ 85 -2000 1150 300 R 50 50 1 1 I
+X ~IRQ7~/PNQ7 95 -2000 -1050 300 R 50 50 1 1 B
+X QSPI_DIN/EZPD/CANRX/RXD1/PQS1 16 2000 -1200 300 L 50 50 1 1 B
+X JTAG_EN 26 -2000 1250 300 R 50 50 1 1 I
+X DTIN0/DTOUT0/PWM0/PTC0 36 2000 1600 300 L 50 50 1 1 B
+X AN3/PAN3 46 -2000 -1550 300 R 50 50 1 1 B
+X GND 56 50 -2850 250 U 30 30 1 1 W
+X PST1/PDD1 66 -2000 400 300 R 50 50 1 1 B
+X ~BKPT~/TMS 76 -2000 750 300 R 50 50 1 1 I
+X ALLPST 86 -2000 600 300 R 50 50 1 1 O
+X RSTI 96 -2000 1950 300 R 50 50 1 1 I L
+X QSPI_DOUT/EZPQ/CANTX/RXD0/PQS0 17 2000 -1100 300 L 50 50 1 1 B
+X ~UCTS2~/PUC3 27 2000 -700 300 L 50 50 1 1 B
+X DTIN1/DTOUT1/PWM2/PTC1 37 2000 1500 300 L 50 50 1 1 B
+X VSSA 47 -2000 -2450 300 R 50 50 1 1 I
+X VCC 57 100 2850 250 D 30 30 1 1 W
+X GND 67 100 -2850 250 U 30 30 1 1 W
+X DDATA0/PDD4 77 -2000 100 300 R 50 50 1 1 B
+X ~IRQ1~/PNQ1/SYNCA/PWM1 87 -2000 -450 300 R 50 50 1 1 B
+X RSTO 97 -2000 1850 300 R 50 50 1 1 O V
+X QSPI_CLK/EZPCK/SCL/RTS1/PQS2 18 2000 -1300 300 L 50 50 1 1 B
+X URXD2/PUC1 28 2000 0 300 L 50 50 1 1 B
+X PWM1/PTD0 38 2000 2500 300 L 50 60 1 1 B
+X VRL 48 -2000 -2200 300 R 50 50 1 1 I
+X GPT0/PWM1/PTA0 58 2000 2050 300 L 50 50 1 1 B
+X VCC 68 150 2850 250 D 30 30 1 1 W
+X DDATA1/PDD5 78 -2000 0 300 R 50 50 1 1 B
+X ~IRQ2~/PNQ2 88 -2000 -550 300 R 50 50 1 1 B
+X ~UCTS1~/SYNCA/URXD2/PUB3 98 2000 -500 300 L 50 50 1 1 B
+X QSPI_CS1/PQS4 19 2000 -1500 300 L 50 50 1 1 B
+X UTXD2/PUC0 29 2000 100 300 L 50 50 1 1 B
+X CLKMOD1 39 -2000 1650 300 R 50 50 1 1 I
+X VRH 49 -2000 -2100 300 R 50 50 1 1 I
+X GPT1/PWM3/PTA1 59 2000 1950 300 L 50 50 1 1 B
+X PST2/PDD2 69 -2000 300 300 R 50 50 1 1 B
+X DSI/TDI 79 -2000 1050 300 R 50 50 1 1 I
+X ~IRQ3~/PNQ3 89 -2000 -650 300 R 50 50 1 1 B
+X UTXD1/PUB0 99 2000 300 300 L 50 50 1 1 B
+X URXD1/PUB1 100 2000 200 300 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# PCA82C251
+#
+DEF PCA82C251 U 0 0 Y Y 1 F N
+F0 "U" 150 450 60 H V C CNN
+F1 "PCA82C251" 300 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+T 0 50 300 20 0 0 1 Volt  Normal 1 C C
+S -200 400 200 -300 0 1 0 N
+P 2 0 1 0  -150 -150  -200 -150 N
+P 2 0 1 0  -150 150  -200 150 N
+P 2 0 1 0  100 -50  200 -50 N
+P 2 0 1 0  150 50  200 50 N
+P 2 0 1 0  150 300  200 300 N
+P 3 0 1 0  -200 0  -100 0  -70 90 N
+P 4 0 1 0  -150 -150  50 -50  50 -250  -150 -150 N
+P 4 0 1 0  -50 100  100 100  100 -100  50 -100 N
+P 4 0 1 0  -50 200  150 200  150 -200  50 -200 N
+P 5 0 1 0  -150 200  -150 50  50 150  -150 250  -150 200 N
+P 5 0 1 0  -50 350  -50 250  150 250  150 350  -50 350 N
+X TxD 1 -450 150 300 R 50 40 1 1 I
+X GND 2 500 -200 300 L 50 40 1 1 W
+X VCC 3 -450 300 250 R 50 40 1 1 W
+X RxD 4 -450 -150 300 R 50 40 1 1 O
+X Vref 5 500 300 300 L 50 40 1 1 O
+X CAN- 6 500 -50 300 L 50 40 1 1 B
+X CAN+ 7 500 50 300 L 50 40 1 1 B
+X Rsl 8 -450 0 300 R 50 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# PNP
+#
+DEF PNP Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 60 H V R CNN
+F1 "PNP" 0 150 60 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 F
+P 3 0 1 0  25 -25  0 0  0 0 N
+P 3 0 1 0  100 -100  65 -65  65 -65 N
+P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+ENDDRAW
+ENDDEF
+#
+# SWITCH_INV
+#
+DEF SWITCH_INV SW 0 0 N Y 1 F N
+F0 "SW" -200 150 50 H V C CNN
+F1 "SWITCH_INV" -150 -150 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C -150 0 50 0 0 0 N
+C 150 -100 50 0 0 0 N
+C 150 100 50 0 1 0 N
+P 2 0 1 0  -100 0  150 50 N
+X 1 1 500 100 300 L 60 60 1 1 P
+X 2 2 -500 0 300 R 60 60 1 1 P
+X 3 3 500 -100 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SW_PUSH
+#
+DEF SW_PUSH SW 0 40 N N 1 F N
+F0 "SW" 150 110 50 H V C CNN
+F1 "SW_PUSH" 0 -80 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -170 50 170 60 0 1 0 N
+P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
+X 1 1 -300 0 200 R 60 60 0 1 P I
+X 2 2 300 0 200 L 60 60 0 1 P I
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# VDD
+#
+DEF VDD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 30 H I C CNN
+F1 "VDD" 0 110 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VDD 1 0 0 0 U 40 40 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# XCR3256-TQ144
+#
+DEF XCR3256-TQ144 U 0 20 Y Y 1 F N
+F0 "U" 0 3500 70 H V C CNN
+F1 "XCR3256-TQ144" 0 -3600 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -650 3400 650 -3500 0 1 0 N
+X I1 1 950 -2900 300 L 50 50 1 1 P
+X I0 2 950 -3000 300 L 50 50 1 1 P
+X GND 3 -50 -3500 0 U 30 30 1 1 W N
+X J0/TDI 4 -950 3100 300 R 50 50 1 1 P
+X J2 5 950 -2200 300 L 50 50 1 1 P
+X J3 6 950 -2100 300 L 50 50 1 1 P
+X J4 7 950 -2000 300 L 50 50 1 1 P
+X J11 8 950 -1900 300 L 50 50 1 1 P
+X J13 9 950 -1800 300 L 50 50 1 1 P
+X J14 10 950 -1700 300 L 50 50 1 1 P
+X N0/TMS 20 -950 3000 300 R 50 50 1 1 P
+X P3 30 950 2700 300 L 50 50 1 1 P
+X O4 40 950 2100 300 L 50 50 1 1 P
+X VCC 50 50 3400 0 D 30 30 1 1 W N
+X F4 60 -950 -1900 300 R 50 50 1 1 P
+X H11 70 950 -3400 300 L 50 50 1 1 P
+X G2 80 -950 -2500 300 R 50 50 1 1 P
+X C14 90 -950 500 300 R 50 50 1 1 P
+X J15 11 950 -1600 300 L 50 50 1 1 P
+X N2 21 950 900 300 L 50 50 1 1 P
+X P4 31 950 2800 300 L 50 50 1 1 P
+X O3 41 950 2000 300 L 50 50 1 1 P
+X VCC 51 -450 3400 0 D 30 30 1 1 W N
+X F11 61 -950 -2000 300 R 50 50 1 1 P
+X H13 71 950 -3300 300 L 50 50 1 1 P
+X G0 81 -950 -2400 300 R 50 50 1 1 I
+X C13 91 -950 600 300 R 50 50 1 1 P
+X L2 12 950 -600 300 L 50 50 1 1 P
+X N3 22 950 1000 300 L 50 50 1 1 P
+X P11 32 950 2900 300 L 50 50 1 1 P
+X O2 42 950 1900 300 L 50 50 1 1 P
+X GND 52 -350 -3500 0 U 30 30 1 1 W N
+X F12 62 -950 -2100 300 R 50 50 1 1 P
+X H15 72 950 -3200 300 L 50 50 1 1 P
+X E14 82 -950 -1500 300 R 50 50 1 1 P
+X C11 92 -950 700 300 R 50 50 1 1 P
+X PORT_EN 13 -950 2900 300 R 50 50 1 1 P
+X N4 23 950 1100 300 L 50 50 1 1 P
+X GND 33 150 -3500 0 U 30 30 1 1 W N
+X O1 43 950 1800 300 L 50 50 1 1 P
+X M2 53 950 200 300 L 50 50 1 1 P
+X F13 63 -950 -2200 300 R 50 50 1 1 P
+X VCC 73 150 3400 0 D 30 30 1 1 W N
+X E13 83 -950 -1400 300 R 50 50 1 1 P
+X C4 93 -950 800 300 R 50 50 1 1 P
+X L3 14 950 -500 300 L 50 50 1 1 P
+X VCC 24 -50 3400 0 D 30 30 1 1 W N
+X P13 34 950 3000 300 L 50 50 1 1 P
+X O0 44 950 1700 300 L 50 50 1 1 P
+X M1 54 950 100 300 L 50 50 1 1 P
+X GND 64 350 -3500 0 U 30 30 1 1 W N
+X G14 74 -950 -3000 300 R 50 50 1 1 P
+X E11 84 -950 -1600 300 R 50 50 1 1 P
+X C3 94 -950 900 300 R 50 50 1 1 P
+X L4 15 950 -400 300 L 50 50 1 1 P
+X N11 25 950 1200 300 L 50 50 1 1 P
+X P14 35 950 3100 300 L 50 50 1 1 P
+X M15 45 950 700 300 L 50 50 1 1 P
+X F1 55 -950 -1700 300 R 50 50 1 1 P
+X F15 65 -950 -2300 300 R 50 50 1 1 P
+X G13 75 -950 -2900 300 R 50 50 1 1 P
+X GND 85 450 -3500 0 U 30 30 1 1 W N
+X VCC 95 350 3400 0 D 30 30 1 1 W N
+X L11 16 950 -300 300 L 50 50 1 1 P
+X N13 26 950 1300 300 L 50 50 1 1 P
+X P15 36 950 3200 300 L 50 50 1 1 P
+X M13 46 950 600 300 L 50 50 1 1 P
+X F2 56 -950 -1800 300 R 50 50 1 1 P
+X H0 66 -950 -3100 300 R 50 50 1 1 P
+X VCC 76 250 3400 0 D 30 30 1 1 W N
+X E4 86 -950 -1300 300 R 50 50 1 1 P
+X C2 96 -950 1000 300 R 50 50 1 1 P
+X GND 17 50 -3500 0 U 30 30 1 1 W N
+X N14 27 950 1400 300 L 50 50 1 1 P
+X O15 37 950 2400 300 L 50 50 1 1 P
+X M12 47 950 500 300 L 50 50 1 1 P
+X GND 57 -450 -3500 0 U 30 30 1 1 W N
+X H1 67 -950 -3200 300 R 50 50 1 1 P
+X G11 77 -950 -2800 300 R 50 50 1 1 P
+X E3 87 -950 -1200 300 R 50 50 1 1 P
+X C1 97 -950 1100 300 R 50 50 1 1 P
+X L13 18 950 -200 300 L 50 50 1 1 P
+X N15 28 950 1500 300 L 50 50 1 1 P
+X O13 38 950 2300 300 L 50 50 1 1 P
+X M11 48 950 400 300 L 50 50 1 1 P
+X VCC 58 -350 3400 0 D 30 30 1 1 W N
+X H2 68 -950 -3300 300 R 50 50 1 1 P
+X G4 78 -950 -2700 300 R 50 50 1 1 P
+X E2 88 -950 -1100 300 R 50 50 1 1 P
+X C0 98 -950 1200 300 R 50 50 1 1 P
+X L14 19 950 -100 300 L 50 50 1 1 P
+X P2 29 950 2600 300 L 50 50 1 1 P
+X O12 39 950 2200 300 L 50 50 1 1 P
+X M4 49 950 300 300 L 50 50 1 1 P
+X GND 59 250 -3500 0 U 30 30 1 1 W N
+X H3 69 -950 -3400 300 R 50 50 1 1 P
+X G3 79 -950 -2600 300 R 50 50 1 1 P
+X E0/TCK 89 -950 3200 300 R 50 50 1 1 P
+X A13 99 -950 2200 300 R 50 50 1 1 P
+X A12 100 -950 2300 300 R 50 50 1 1 P
+X B11 110 -950 1700 300 R 50 50 1 1 P
+X D12 120 -950 -700 300 R 50 50 1 1 P
+X VCC 130 -150 3400 0 D 30 30 1 1 W N
+X I14 140 950 -2500 300 L 50 50 1 1 P
+X A11 101 -950 2400 300 R 50 50 1 1 P
+X B12 111 -950 1600 300 R 50 50 1 1 P
+X D13 121 -950 -800 300 R 50 50 1 1 P
+X K15 131 950 -800 300 L 50 50 1 1 P
+X I13 141 950 -2600 300 L 50 50 1 1 P
+X A4 102 -950 2500 300 R 50 50 1 1 P
+X B14 112 -950 1500 300 R 50 50 1 1 P
+X D15 122 -950 -900 300 R 50 50 1 1 P
+X K14 132 950 -900 300 L 50 50 1 1 P
+X I12 142 950 -2700 300 L 50 50 1 1 P
+X A3 103 -950 2600 300 R 50 50 1 1 P
+X B15 113 -950 1400 300 R 50 50 1 1 P
+X VCC 123 -250 3400 0 D 30 30 1 1 W N
+X K13 133 950 -1000 300 L 50 50 1 1 P
+X I4 143 950 -2800 300 L 50 50 1 1 P
+X A2/TDO 104 -950 3300 300 R 50 50 1 1 P
+X D0 114 -950 -200 300 R 50 50 1 1 P
+X GND 124 -250 -3500 0 U 30 30 1 1 W N
+X K12 134 950 -1100 300 L 50 50 1 1 P
+X VCC 144 550 3400 0 D 30 30 1 1 W N
+X GND 105 550 -3500 0 U 30 30 1 1 W N
+X VCC 115 450 3400 0 D 30 30 1 1 W N
+X CLK3/IN3 125 -950 0 300 R 50 50 1 1 I
+X GND 135 -550 -3500 0 U 30 30 1 1 W N
+X A0 106 -950 2700 300 R 50 50 1 1 P
+X D1 116 -950 -300 300 R 50 50 1 1 P
+X CLK2/IN2 126 -950 100 300 R 50 50 1 1 I
+X K11 136 950 -1200 300 L 50 50 1 1 P
+X B0 107 -950 2000 300 R 50 50 1 1 P
+X D2 117 -950 -400 300 R 50 50 1 1 P
+X CLK1/IN1 127 -950 200 300 R 50 50 1 1 I
+X K4 137 950 -1300 300 L 50 50 1 1 P
+X B1 108 -950 1900 300 R 50 50 1 1 P
+X D4 118 -950 -500 300 R 50 50 1 1 P
+X CLK0/IN0 128 -950 300 300 R 50 50 1 1 I
+X K2 138 950 -1400 300 L 50 50 1 1 P
+X B4 109 -950 1800 300 R 50 50 1 1 P
+X D11 119 -950 -600 300 R 50 50 1 1 P
+X GND 129 -150 -3500 0 U 30 30 1 1 W N
+X I15 139 950 -2400 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/pic_programmer/libs/pic_programmer_schlib.lib b/demos/pic_programmer/libs/pic_programmer_schlib.lib
new file mode 100644
index 0000000000..eaebddebdc
--- /dev/null
+++ b/demos/pic_programmer/libs/pic_programmer_schlib.lib
@@ -0,0 +1,606 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 24C16
+#
+DEF 24C16 U 0 30 Y Y 1 F N
+F0 "U" 150 350 60 H V C CNN
+F1 "24C16" 200 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS 24C512
+DRAW
+X GND 4 0 -500 200 U 60 60 0 0 W
+X VCC 8 0 500 200 D 60 60 0 0 W
+S -400 -300 400 300 1 1 0 N
+X A0 1 -700 200 300 R 60 60 1 1 I
+X A1 2 -700 100 300 R 60 60 1 1 I
+X A2 3 -700 0 300 R 60 60 1 1 I
+X SDA 5 700 -200 300 L 60 60 1 1 B
+X SCL 6 700 -100 300 L 60 60 1 1 I
+X WP 7 700 100 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# 74LS125
+#
+DEF 74LS125 U 0 30 Y Y 4 F N
+F0 "U" 0 100 50 H V L BNN
+F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 7 -150 -150 0 U 50 30 0 0 W N
+X VCC 14 -150 150 0 D 50 30 0 0 W N
+X E 1 0 -300 220 U 50 30 1 0 I I
+X E 4 0 -300 220 U 50 30 2 0 I I
+X E 10 0 -300 220 U 50 30 3 0 I I
+X E 13 0 -300 220 U 50 30 4 0 I I
+P 4 0 1 0  -150 150  -150 -150  150 0  -150 150 N
+X D 2 -450 0 300 R 50 30 1 1 I
+X O 3 450 0 300 L 50 30 1 1 T
+X D 5 -450 0 300 R 50 30 2 1 I
+X O 6 450 0 300 L 50 30 2 1 T
+X O 8 450 0 300 L 50 30 3 1 T
+X D 9 -450 0 300 R 50 30 3 1 I
+X O 11 450 0 300 L 50 30 4 1 T
+X D 12 -450 0 300 R 50 30 4 1 I
+ENDDRAW
+ENDDEF
+#
+# 7805
+#
+DEF 7805 U 0 30 N Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7805 LM7812 78L05
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI VI -400 50 200 R 40 40 1 1 I
+X VO VO 400 50 200 L 40 40 1 1 w
+X GND GND 0 -250 100 U 40 40 1 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB9*
+$ENDFPLIST
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODESCH
+#
+DEF DIODESCH D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 6 0 1 8  75 25  75 50  50 50  50 -50  25 -50  25 -25 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
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 40 N N 1 F N
+F0 "L" -50 0 40 V V C CNN
+F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+X 1 1 0 300 100 D 70 70 1 1 P
+X 2 2 0 -300 100 U 70 70 1 1 P
+ENDDRAW
+ENDDEF
+#
+# JUMPER
+#
+DEF JUMPER JP 0 30 Y N 1 F N
+F0 "JP" 0 150 60 H V C CNN
+F1 "JUMPER" 0 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 60 60 0 1 P
+X 2 2 300 0 165 L 60 60 0 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+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
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$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
+ENDDRAW
+ENDDEF
+#
+# LT1372
+#
+DEF LT1372 U 0 30 Y Y 1 F N
+F0 "U" 600 500 60 H V C CNN
+F1 "LT1372" -500 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LT1373
+DRAW
+S -700 -400 700 400 0 1 0 N
+X Vc 1 250 -700 300 U 60 60 1 1 I
+X FB+ 2 1000 -250 300 L 60 60 1 1 I
+X FB- 3 -1000 250 300 R 60 60 1 1 P
+X S/S 4 -1000 -250 300 R 60 60 1 1 P
+X Vin 5 0 700 300 D 60 60 1 1 W
+X GND_S 6 -150 -700 300 U 60 60 1 1 I
+X GND 7 -300 -700 300 U 60 60 1 1 I
+X Vsw 8 1000 250 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# NPN
+#
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PIC12C508A
+#
+DEF PIC12C508A U 0 40 Y Y 1 F N
+F0 "U" 0 700 60 H V C CNN
+F1 "PIC12C508A" 0 -650 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS PIC12C509A
+DRAW
+S 400 -600 -450 650 0 1 0 N
+X VDD 1 -750 500 300 R 50 50 1 1 W
+X GP5/OSC1 2 -750 200 300 R 50 50 1 1 I
+X GP4/OSC2 3 -750 -200 300 R 50 50 1 1 I
+X GP3/MCLR 4 -750 -500 300 R 50 50 1 1 I
+X GP2 5 700 -500 300 L 50 50 1 1 I
+X GP1 6 700 -200 300 L 50 50 1 1 I
+X GP0 7 700 200 300 L 50 50 1 1 I
+X VSS 8 700 500 300 L 50 50 1 1 W
+X VDD 1 -750 500 300 R 50 50 1 2 W
+X GP5/OSC1 2 -750 200 300 R 50 50 1 2 I
+X GP4/OSC2 3 -750 -200 300 R 50 50 1 2 I
+X GP3/MCLR 4 -750 -500 300 R 50 50 1 2 I
+X GP2 5 700 -500 300 L 50 50 1 2 I
+X GP1 6 700 -200 300 L 50 50 1 2 I
+X GP0 7 700 200 300 L 50 50 1 2 I
+X VSS 8 700 500 300 L 50 50 1 2 W
+ENDDRAW
+ENDDEF
+#
+# PIC16F54
+#
+DEF PIC16F54 U? 0 40 Y Y 1 F N
+F0 "U?" 0 -750 60 H V C CNN
+F1 "PIC16F54" 0 800 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -500 700 450 -700 0 1 0 N
+X RA2 1 -800 600 300 R 50 50 1 1 B
+X RA3 2 -800 450 300 R 50 50 1 1 B
+X T0ckl 3 -800 300 300 R 50 50 1 1 O
+X MCLR 4 -800 150 300 R 50 50 1 1 I
+X VSS 5 -800 0 300 R 50 50 1 1 W
+X RB0 6 -800 -150 300 R 50 50 1 1 B
+X RB1 7 -800 -300 300 R 50 50 1 1 B
+X RB2 8 -800 -450 300 R 50 50 1 1 B
+X RB3 9 -800 -600 300 R 50 50 1 1 B
+X RB4 10 750 -600 300 L 50 50 1 1 B
+X RB5 11 750 -450 300 L 50 50 1 1 B
+X ICSPC/RB6 12 750 -300 300 L 50 50 1 1 B
+X ICSPD/RB7 13 750 -150 300 L 50 50 1 1 B
+X VDD 14 750 0 300 L 50 50 1 1 W
+X OSC2/CLKO 15 750 150 300 L 50 50 1 1 O
+X OSC1/CLKI 16 750 300 300 L 50 50 1 1 I
+X RA0 17 750 450 300 L 50 50 1 1 B
+X RA1 18 750 600 300 L 50 50 1 1 B
+X RA2 1 -800 600 300 R 50 50 1 2 B
+X RA3 2 -800 450 300 R 50 50 1 2 B
+X T0ckl 3 -800 300 300 R 50 50 1 2 O
+X MCLR 4 -800 150 300 R 50 50 1 2 I
+X VSS 5 -800 0 300 R 50 50 1 2 W
+X RB0 6 -800 -150 300 R 50 50 1 2 B
+X RB1 7 -800 -300 300 R 50 50 1 2 B
+X RB2 8 -800 -450 300 R 50 50 1 2 B
+X RB3 9 -800 -600 300 R 50 50 1 2 B
+X RB4 10 750 -600 300 L 50 50 1 2 B
+X RB5 11 750 -450 300 L 50 50 1 2 B
+X ICSPC/RB6 12 750 -300 300 L 50 50 1 2 B
+X ICSPD/RB7 13 750 -150 300 L 50 50 1 2 B
+X VDD 14 750 0 300 L 50 50 1 2 W
+X OSC2/CLKO 15 750 150 300 L 50 50 1 2 O
+X OSC1/CLKI 16 750 300 300 L 50 50 1 2 I
+X RA0 17 750 450 300 L 50 50 1 2 B
+X RA1 18 750 600 300 L 50 50 1 2 B
+ENDDRAW
+ENDDEF
+#
+# PNP
+#
+DEF PNP Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 60 H V R CNN
+F1 "PNP" 0 150 60 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 F
+P 3 0 1 0  25 -25  0 0  0 0 N
+P 3 0 1 0  100 -100  65 -65  65 -65 N
+P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -100 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
+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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+ENDDRAW
+ENDDEF
+#
+# SUPP28
+#
+DEF SUPP28 J 0 40 Y Y 1 F N
+F0 "J" 0 100 70 H V C CNN
+F1 "SUPP28" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -300 -750 300 750 0 1 0 N
+X 1 1 -600 650 300 R 60 60 1 1 P
+X 2 2 -600 550 300 R 60 60 1 1 P
+X 3 3 -600 450 300 R 60 60 1 1 P
+X 4 4 -600 350 300 R 60 60 1 1 P
+X 5 5 -600 250 300 R 60 60 1 1 P
+X 6 6 -600 150 300 R 60 60 1 1 P
+X 7 7 -600 50 300 R 60 60 1 1 P
+X 8 8 -600 -50 300 R 60 60 1 1 P
+X 9 9 -600 -150 300 R 60 60 1 1 P
+X 10 10 -600 -250 300 R 60 60 1 1 P
+X 20 20 600 -150 300 L 60 60 1 1 P
+X 11 11 -600 -350 300 R 60 60 1 1 P
+X 21 21 600 -50 300 L 60 60 1 1 P
+X 12 12 -600 -450 300 R 60 60 1 1 P
+X 22 22 600 50 300 L 60 60 1 1 P
+X 13 13 -600 -550 300 R 60 60 1 1 P
+X 23 23 600 150 300 L 60 60 1 1 P
+X 14 14 -600 -650 300 R 60 60 1 1 P
+X 24 24 600 250 300 L 60 60 1 1 P
+X 15 15 600 -650 300 L 60 60 1 1 P
+X 25 25 600 350 300 L 60 60 1 1 P
+X 16 16 600 -550 300 L 60 60 1 1 P
+X 26 26 600 450 300 L 60 60 1 1 P
+X 17 17 600 -450 300 L 60 60 1 1 P
+X 27 27 600 550 300 L 60 60 1 1 P
+X 18 18 600 -350 300 L 60 60 1 1 P
+X 28 28 600 650 300 L 60 60 1 1 P
+X 19 19 600 -250 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SUPP40
+#
+DEF SUPP40 P 0 40 Y Y 1 F N
+F0 "P" 0 1100 70 H V C CNN
+F1 "SUPP40" 0 -1100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -300 -1050 300 1050 0 1 0 N
+X 1 1 -600 950 300 R 60 60 1 1 P
+X 2 2 -600 850 300 R 60 60 1 1 P
+X 3 3 -600 750 300 R 60 60 1 1 P
+X 4 4 -600 650 300 R 60 60 1 1 P
+X 5 5 -600 550 300 R 60 60 1 1 P
+X 6 6 -600 450 300 R 60 60 1 1 P
+X 7 7 -600 350 300 R 60 60 1 1 P
+X 8 8 -600 250 300 R 60 60 1 1 P
+X 9 9 -600 150 300 R 60 60 1 1 P
+X 10 10 -600 50 300 R 60 60 1 1 P
+X 20 20 -600 -950 300 R 60 60 1 1 P
+X 30 30 600 -50 300 L 60 60 1 1 P
+X 40 40 600 950 300 L 60 60 1 1 P
+X 11 11 -600 -50 300 R 60 60 1 1 P
+X 21 21 600 -950 300 L 60 60 1 1 P
+X 31 31 600 50 300 L 60 60 1 1 P
+X 12 12 -600 -150 300 R 60 60 1 1 P
+X 22 22 600 -850 300 L 60 60 1 1 P
+X 32 32 600 150 300 L 60 60 1 1 P
+X 13 13 -600 -250 300 R 60 60 1 1 P
+X 23 23 600 -750 300 L 60 60 1 1 P
+X 33 33 600 250 300 L 60 60 1 1 P
+X 14 14 -600 -350 300 R 60 60 1 1 P
+X 24 24 600 -650 300 L 60 60 1 1 P
+X 34 34 600 350 300 L 60 60 1 1 P
+X 15 15 -600 -450 300 R 60 60 1 1 P
+X 25 25 600 -550 300 L 60 60 1 1 P
+X 35 35 600 450 300 L 60 60 1 1 P
+X 16 16 -600 -550 300 R 60 60 1 1 P
+X 26 26 600 -450 300 L 60 60 1 1 P
+X 36 36 600 550 300 L 60 60 1 1 P
+X 17 17 -600 -650 300 R 60 60 1 1 P
+X 27 27 600 -350 300 L 60 60 1 1 P
+X 37 37 600 650 300 L 60 60 1 1 P
+X 18 18 -600 -750 300 R 60 60 1 1 P
+X 28 28 600 -250 300 L 60 60 1 1 P
+X 38 38 600 750 300 L 60 60 1 1 P
+X 19 19 -600 -850 300 R 60 60 1 1 P
+X 29 29 600 -150 300 L 60 60 1 1 P
+X 39 39 600 850 300 L 60 60 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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# VPP
+#
+DEF VPP #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C CNN
+F1 "VPP" 0 150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VPP 1 0 0 0 U 40 40 0 0 W N
+C 0 80 20 0 1 0 N
+P 2 0 1 0  0 60  0 0 N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/pic_programmer/pic_programmer.pro b/demos/pic_programmer/pic_programmer.pro
index ef413f2c7e..1c2d1ae2ae 100644
--- a/demos/pic_programmer/pic_programmer.pro
+++ b/demos/pic_programmer/pic_programmer.pro
@@ -1,4 +1,4 @@
-update=20/09/2014 09:29:07
+update=17/05/2015 17:14:38
 last_client=kicad
 [common]
 NetDir=
@@ -9,15 +9,6 @@ NetIExt=net
 EquName1=devcms
 [general]
 version=1
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=74xx
-LibName4=conn
-LibName5=xilinx
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -38,3 +29,9 @@ SolderMaskMinWidth=0
 DrawSegmentWidth=0.381
 BoardOutlineThickness=0.381
 ModuleOutlineThickness=0.381
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=libs/pic_programmer_schlib
+LibName2=power
diff --git a/demos/pic_programmer/pic_programmer.sch b/demos/pic_programmer/pic_programmer.sch
index 4b66670dfe..72ca4cc7e9 100644
--- a/demos/pic_programmer/pic_programmer.sch
+++ b/demos/pic_programmer/pic_programmer.sch
@@ -1,9 +1,6 @@
 EESchema Schematic File Version 2
+LIBS:pic_programmer_schlib
 LIBS:power
-LIBS:device
-LIBS:74xx
-LIBS:conn
-LIBS:xilinx
 LIBS:pic_programmer-cache
 EELAYER 25 0
 EELAYER END
diff --git a/demos/pic_programmer/pic_sockets.sch b/demos/pic_programmer/pic_sockets.sch
index fb70f70d0f..464526c226 100644
--- a/demos/pic_programmer/pic_sockets.sch
+++ b/demos/pic_programmer/pic_sockets.sch
@@ -1,9 +1,6 @@
 EESchema Schematic File Version 2
+LIBS:pic_programmer_schlib
 LIBS:power
-LIBS:device
-LIBS:74xx
-LIBS:conn
-LIBS:xilinx
 LIBS:pic_programmer-cache
 EELAYER 25 0
 EELAYER END
@@ -450,4 +447,15 @@ Wire Wire Line
 	2400 7000 2400 7050
 Wire Wire Line
 	3300 7000 3300 7050
+$Comp
+L PWR_FLAG #FLG047
+U 1 1 5558FA28
+P 3300 6500
+F 0 "#FLG047" H 3300 6595 30  0001 C CNN
+F 1 "PWR_FLAG" H 3300 6680 30  0000 C CNN
+F 2 "" H 3300 6500 60  0000 C CNN
+F 3 "" H 3300 6500 60  0000 C CNN
+	1    3300 6500
+	0    1    1    0   
+$EndComp
 $EndSCHEMATC
diff --git a/demos/sonde xilinx/sonde xilinx.pro b/demos/sonde xilinx/sonde xilinx.pro
index 0c3195daff..2670870086 100644
--- a/demos/sonde xilinx/sonde xilinx.pro	
+++ b/demos/sonde xilinx/sonde xilinx.pro	
@@ -1,6 +1,6 @@
-update=07/01/2014 20:13:17
+update=18/05/2015 09:07:49
 version=1
-last_client=eeschema
+last_client=kicad
 [cvpcb]
 NetITyp=0
 NetIExt=.net
@@ -39,17 +39,7 @@ LibName8=valves
 version=1
 [eeschema]
 version=1
-PageLayoutDescrFile=
-SubpartIdSeparator=0
-SubpartFirstId=65
 LibDir=
-NetFmtName=
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=conn
-LibName4=74xx
+LibName1=sonde xilinx_schlib
+LibName2=power
diff --git a/demos/sonde xilinx/sonde xilinx_schlib.lib b/demos/sonde xilinx/sonde xilinx_schlib.lib
new file mode 100644
index 0000000000..4415ec6aa6
--- /dev/null
+++ b/demos/sonde xilinx/sonde xilinx_schlib.lib	
@@ -0,0 +1,318 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 74LS125
+#
+DEF 74LS125 U 0 30 Y Y 4 F N
+F0 "U" 0 100 50 H V L BNN
+F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 7 -150 -150 0 U 50 30 0 0 W N
+X VCC 14 -150 150 0 D 50 30 0 0 W N
+X E 1 0 -300 220 U 50 30 1 0 I I
+X E 4 0 -300 220 U 50 30 2 0 I I
+X E 10 0 -300 220 U 50 30 3 0 I I
+X E 13 0 -300 220 U 50 30 4 0 I I
+P 4 0 1 0  -150 150  -150 -150  150 0  -150 150 N
+X D 2 -450 0 300 R 50 30 1 1 I
+X O 3 450 0 300 L 50 30 1 1 T
+X D 5 -450 0 300 R 50 30 2 1 I
+X O 6 450 0 300 L 50 30 2 1 T
+X O 8 450 0 300 L 50 30 3 1 T
+X D 9 -450 0 300 R 50 30 3 1 I
+X O 11 450 0 300 L 50 30 4 1 T
+X D 12 -450 0 300 R 50 30 4 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_6
+#
+DEF CONN_6 P 0 30 Y N 1 F N
+F0 "P" -50 0 60 V V C CNN
+F1 "CONN_6" 50 0 60 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 300 100 -300 0 1 0 N
+X 1 1 -350 250 250 R 60 60 1 1 P I
+X 2 2 -350 150 250 R 60 60 1 1 P I
+X 3 3 -350 50 250 R 60 60 1 1 P I
+X 4 4 -350 -50 250 R 60 60 1 1 P I
+X 5 5 -350 -150 250 R 60 60 1 1 P I
+X 6 6 -350 -250 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB25
+#
+DEF DB25 J 0 40 Y N 1 F N
+F0 "J" 50 1350 70 H V C CNN
+F1 "DB25" -50 -1350 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB25*
+$ENDFPLIST
+DRAW
+A -109 1270 41 1799 774 0 1 8 N -150 1270 -100 1310
+A -108 -1259 42 -1787 -788 0 1 8 N -150 -1260 -100 -1300
+A 116 -1169 34 -657 -15 0 1 8 N 130 -1200 150 -1170
+A 117 1170 32 664 1 0 1 8 N 130 1199 149 1170
+C -70 -1200 30 0 1 0 N
+C -70 -1000 30 0 1 0 N
+C -70 -800 30 0 1 0 N
+C -70 -600 30 0 1 0 N
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C -70 600 30 0 1 0 N
+C -70 800 30 0 1 0 N
+C -70 1000 30 0 1 0 N
+C -70 1200 30 0 1 0 N
+C 50 -1100 30 0 1 0 N
+C 50 -900 30 0 1 0 N
+C 50 -700 30 0 1 0 N
+C 50 -500 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+C 50 500 30 0 1 0 N
+C 50 700 30 0 1 0 N
+C 50 900 30 0 1 0 N
+C 50 1100 30 0 1 0 N
+P 2 0 1 8  -150 -1260  -150 1270 N
+P 2 0 1 0  -150 -1200  -100 -1200 N
+P 2 0 1 0  -150 -1100  20 -1100 N
+P 2 0 1 0  -150 -1000  -100 -1000 N
+P 2 0 1 0  -150 -900  20 -900 N
+P 2 0 1 0  -150 -800  -100 -800 N
+P 2 0 1 0  -150 -700  20 -700 N
+P 2 0 1 0  -150 -600  -100 -600 N
+P 2 0 1 0  -150 -500  20 -500 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 0  -150 500  20 500 N
+P 2 0 1 0  -150 600  -100 600 N
+P 2 0 1 0  -150 700  20 700 N
+P 2 0 1 0  -150 800  -100 800 N
+P 2 0 1 0  -150 900  20 900 N
+P 2 0 1 0  -150 1000  -100 1000 N
+P 2 0 1 0  -150 1100  20 1100 N
+P 2 0 1 0  -150 1200  -100 1200 N
+P 2 0 1 8  -100 -1300  130 -1200 N
+P 2 0 1 8  130 1200  -100 1310 N
+P 2 0 1 8  150 -1170  150 1170 N
+X 1 1 -450 -1200 300 R 60 60 1 1 P
+X 2 2 -450 -1000 300 R 60 60 1 1 P
+X 3 3 -450 -800 300 R 60 60 1 1 P
+X 4 4 -450 -600 300 R 60 60 1 1 P
+X 5 5 -450 -400 300 R 60 60 1 1 P
+X 6 6 -450 -200 300 R 60 60 1 1 P
+X 7 7 -450 0 300 R 60 60 1 1 P
+X 8 8 -450 200 300 R 60 60 1 1 P
+X 9 9 -450 400 300 R 60 60 1 1 P
+X 10 10 -450 600 300 R 60 60 1 1 P
+X P20 20 -450 100 300 R 60 60 1 1 P
+X 11 11 -450 800 300 R 60 60 1 1 P
+X P21 21 -450 300 300 R 60 60 1 1 P
+X 12 12 -450 1000 300 R 60 60 1 1 P
+X P22 22 -450 500 300 R 60 60 1 1 P
+X 13 13 -450 1200 300 R 60 60 1 1 P
+X P23 23 -450 700 300 R 60 60 1 1 P
+X P14 14 -450 -1100 300 R 60 60 1 1 P
+X P24 24 -450 900 300 R 60 60 1 1 P
+X P15 15 -450 -900 300 R 60 60 1 1 P
+X P25 25 -450 1100 300 R 60 60 1 1 P
+X P16 16 -450 -700 300 R 60 60 1 1 P
+X P17 17 -450 -500 300 R 60 60 1 1 P
+X P18 18 -450 -300 300 R 60 60 1 1 P
+X P19 19 -450 -100 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB9*
+$ENDFPLIST
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODESCH
+#
+DEF DIODESCH D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 6 0 1 8  75 25  75 50  50 50  50 -50  25 -50  25 -25 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
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/test_xil_95108/carte_test.pro b/demos/test_xil_95108/carte_test.pro
index df7bb92ef5..d093b56cfe 100644
--- a/demos/test_xil_95108/carte_test.pro
+++ b/demos/test_xil_95108/carte_test.pro
@@ -1,4 +1,4 @@
-update=09/01/2014 18:43:43
+update=18/05/2015 09:09:57
 version=1
 last_client=kicad
 [pcbnew]
@@ -73,51 +73,6 @@ LibName4=divers
 LibName5=libcms
 LibName6=dip_sockets
 LibDir=
-[eeschema]
-version=1
-LibDir=
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
-RptD_X=0
-RptD_Y=100
-RptLab=1
-PenMin=20
-SimCmd=
-UseNetN=0
-[eeschema/Libraries]
-LibName1=power
-LibName2=device
-LibName3=linear
-LibName4=regul
-LibName5=74xx
-LibName6=cmos4000
-LibName7=adc-dac
-LibName8=memory
-LibName9=xilinx
-LibName10=special
-LibName11=analog_switches
 [cvpcb]
 version=1
 NetIExt=.net
@@ -125,3 +80,9 @@ NetIExt=.net
 EquName1=devcms
 [general]
 version=1
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=carte_test_schlib
+LibName2=power
diff --git a/demos/test_xil_95108/carte_test_schlib.lib b/demos/test_xil_95108/carte_test_schlib.lib
new file mode 100644
index 0000000000..b97034c505
--- /dev/null
+++ b/demos/test_xil_95108/carte_test_schlib.lib
@@ -0,0 +1,660 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +12V
+#
+DEF +12V #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C CNN
+F1 "+12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +12V 1 0 0 0 U 20 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# -12V
+#
+DEF -12V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 130 20 H I C CNN
+F1 "-12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X -12V 1 0 0 0 U 20 20 0 0 W N
+P 3 0 1 0  0 0  0 50  0 50 N
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+ENDDRAW
+ENDDEF
+#
+# 74HCT04
+#
+DEF 74HCT04 U 0 30 Y Y 6 F N
+F0 "U" 150 100 40 H V C CNN
+F1 "74HCT04" 200 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS 74HC14 74HC04 74LS14
+DRAW
+P 4 0 0 0  -150 150  -150 -150  150 0  -150 150 N
+X GND 7 -50 -100 0 U 30 20 0 0 W N
+X VCC 14 -50 100 0 D 30 20 0 0 W N
+X ~ 1 -450 0 300 R 60 60 1 1 I
+X ~ 2 450 0 300 L 60 60 1 1 O I
+X ~ 3 -450 0 300 R 60 60 2 1 I
+X ~ 4 450 0 300 L 60 60 2 1 O I
+X ~ 5 -450 0 300 R 60 60 3 1 I
+X ~ 6 450 0 300 L 60 60 3 1 O I
+X ~ 8 450 0 300 L 60 60 4 1 O I
+X ~ 9 -450 0 300 R 60 60 4 1 I
+X ~ 10 450 0 300 L 60 60 5 1 O I
+X ~ 11 -450 0 300 R 60 60 5 1 I
+X ~ 12 450 0 300 L 60 60 6 1 O I
+X ~ 13 -450 0 300 R 60 60 6 1 I
+X ~ 1 -450 0 300 R 60 60 1 2 I I
+X ~ 2 450 0 300 L 60 60 1 2 O
+X ~ 3 -450 0 300 R 60 60 2 2 I I
+X ~ 4 450 0 300 L 60 60 2 2 O
+X ~ 5 -450 0 300 R 60 60 3 2 I I
+X ~ 6 450 0 300 L 60 60 3 2 O
+X ~ 8 450 0 300 L 60 60 4 2 O
+X ~ 9 -450 0 300 R 60 60 4 2 I I
+X ~ 10 450 0 300 L 60 60 5 2 O
+X ~ 11 -450 0 300 R 60 60 5 2 I I
+X ~ 12 450 0 300 L 60 60 6 2 O
+X ~ 13 -450 0 300 R 60 60 6 2 I I
+ENDDRAW
+ENDDEF
+#
+# 7805
+#
+DEF 7805 U 0 30 N Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7805 LM7812 78L05
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI VI -400 50 200 R 40 40 1 1 I
+X VO VO 400 50 200 L 40 40 1 1 w
+X GND GND 0 -250 100 U 40 40 1 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_2X2
+#
+DEF CONN_2X2 P 0 40 Y N 1 F N
+F0 "P" 0 150 50 H V C CNN
+F1 "CONN_2X2" 10 -130 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 100 100 -100 0 1 0 N
+X 1 1 -400 50 300 R 60 60 1 1 P I
+X 2 2 400 50 300 L 60 60 1 1 P I
+X 3 3 -400 -50 300 R 60 60 1 1 P I
+X 4 4 400 -50 300 L 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_3
+#
+DEF CONN_3 K 0 40 Y N 1 F N
+F0 "K" -50 0 50 V V C CNN
+F1 "CONN_3" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 0 250 R 60 60 1 1 P I
+X P3 3 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CRYSTAL
+#
+DEF CRYSTAL X 0 40 N N 1 F N
+F0 "X" 0 150 60 H V C CNN
+F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 16  -100 100  -100 -100 N
+P 2 0 1 16  100 100  100 -100 N
+P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 f
+X 1 1 -300 0 200 R 40 40 1 1 P
+X 2 2 300 0 200 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB25
+#
+DEF DB25 J 0 40 Y N 1 F N
+F0 "J" 50 1350 70 H V C CNN
+F1 "DB25" -50 -1350 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -109 1270 41 1799 774 0 1 0 N -150 1270 -100 1310
+A -108 -1259 42 -1787 -788 0 1 0 N -150 -1260 -100 -1300
+A 116 -1169 34 -657 -15 0 1 0 N 130 -1200 150 -1170
+A 117 1170 32 664 1 0 1 0 N 130 1199 149 1170
+C -70 -1200 30 0 1 0 N
+C -70 -1000 30 0 1 0 N
+C -70 -800 30 0 1 0 N
+C -70 -600 30 0 1 0 N
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C -70 600 30 0 1 0 N
+C -70 800 30 0 1 0 N
+C -70 1000 30 0 1 0 N
+C -70 1200 30 0 1 0 N
+C 50 -1100 30 0 1 0 N
+C 50 -900 30 0 1 0 N
+C 50 -700 30 0 1 0 N
+C 50 -500 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+C 50 500 30 0 1 0 N
+C 50 700 30 0 1 0 N
+C 50 900 30 0 1 0 N
+C 50 1100 30 0 1 0 N
+P 2 0 1 0  -150 -1260  -150 1270 N
+P 2 0 1 0  -150 -1200  -100 -1200 N
+P 2 0 1 0  -150 -1100  20 -1100 N
+P 2 0 1 0  -150 -1000  -100 -1000 N
+P 2 0 1 0  -150 -900  20 -900 N
+P 2 0 1 0  -150 -800  -100 -800 N
+P 2 0 1 0  -150 -700  20 -700 N
+P 2 0 1 0  -150 -600  -100 -600 N
+P 2 0 1 0  -150 -500  20 -500 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 0  -150 500  20 500 N
+P 2 0 1 0  -150 600  -100 600 N
+P 2 0 1 0  -150 700  20 700 N
+P 2 0 1 0  -150 800  -100 800 N
+P 2 0 1 0  -150 900  20 900 N
+P 2 0 1 0  -150 1000  -100 1000 N
+P 2 0 1 0  -150 1100  20 1100 N
+P 2 0 1 0  -150 1200  -100 1200 N
+P 2 0 1 0  -100 -1300  130 -1200 N
+P 2 0 1 0  130 1200  -100 1310 N
+P 2 0 1 0  150 -1170  150 1170 N
+X 1 1 -450 -1200 300 R 60 60 1 1 P
+X 2 2 -450 -1000 300 R 60 60 1 1 P
+X 3 3 -450 -800 300 R 60 60 1 1 P
+X 4 4 -450 -600 300 R 60 60 1 1 P
+X 5 5 -450 -400 300 R 60 60 1 1 P
+X 6 6 -450 -200 300 R 60 60 1 1 P
+X 7 7 -450 0 300 R 60 60 1 1 P
+X 8 8 -450 200 300 R 60 60 1 1 P
+X 9 9 -450 400 300 R 60 60 1 1 P
+X 10 10 -450 600 300 R 60 60 1 1 P
+X P20 20 -450 100 300 R 60 60 1 1 P
+X 11 11 -450 800 300 R 60 60 1 1 P
+X P21 21 -450 300 300 R 60 60 1 1 P
+X 12 12 -450 1000 300 R 60 60 1 1 P
+X P22 22 -450 500 300 R 60 60 1 1 P
+X 13 13 -450 1200 300 R 60 60 1 1 P
+X P23 23 -450 700 300 R 60 60 1 1 P
+X P14 14 -450 -1100 300 R 60 60 1 1 P
+X P24 24 -450 900 300 R 60 60 1 1 P
+X P15 15 -450 -900 300 R 60 60 1 1 P
+X P25 25 -450 1100 300 R 60 60 1 1 P
+X P16 16 -450 -700 300 R 60 60 1 1 P
+X P17 17 -450 -500 300 R 60 60 1 1 P
+X P18 18 -450 -300 300 R 60 60 1 1 P
+X P19 19 -450 -100 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 0  -150 -460  -150 460 N
+P 2 0 1 0  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 0  -140 -470  -110 -490 N
+P 2 0 1 0  -140 470  -150 460 N
+P 2 0 1 0  -140 470  -100 490 N
+P 2 0 1 0  -110 -490  -50 -490 N
+P 2 0 1 0  -100 490  -70 490 N
+P 2 0 1 0  129 390  -70 490 N
+P 2 0 1 0  129 390  150 370 N
+P 2 0 1 0  140 -409  -50 -490 N
+P 2 0 1 0  150 -390  140 -409 N
+P 2 0 1 0  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+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
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$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
+ENDDRAW
+ENDDEF
+#
+# LM318N
+#
+DEF LM318N U 0 30 Y Y 1 F N
+F0 "U" 100 300 60 H V C CNN
+F1 "LM318N" 210 -250 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 0  -200 -200  -200 200 N
+P 2 0 1 0  -200 200  200 0 N
+P 2 0 1 0  200 -100  100 -50 N
+P 2 0 1 0  200 0  -200 -200 N
+P 2 0 1 0  200 100  100 50 N
+P 2 0 1 0  200 200  0 100 N
+X FIN2 1 500 200 300 L 60 30 1 1 P
+X - 2 -500 -100 300 R 60 60 1 1 I
+X + 3 -500 100 300 R 60 60 1 1 I
+X V- 4 -100 -400 250 U 60 30 1 1 W
+X FOUT 5 500 -100 300 L 60 30 1 1 P
+X OUT 6 500 0 300 L 60 30 1 1 O
+X V+ 7 -100 400 250 D 60 30 1 1 W
+X FIN1 8 500 100 300 L 60 30 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+ENDDRAW
+ENDDEF
+#
+# RAM_32KO
+#
+DEF RAM_32KO U 0 40 Y Y 1 F N
+F0 "U" 150 900 70 H V C CNN
+F1 "RAM_32KO" 300 -1100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 14 0 -1050 0 U 60 60 0 0 W N
+X VCC 28 0 850 0 D 60 60 0 0 W N
+S -400 850 400 -1050 0 1 0 N
+X A14 1 -700 -600 300 R 60 60 1 1 I
+X A12 2 -700 -400 300 R 60 60 1 1 I
+X A7 3 -700 100 300 R 60 60 1 1 I
+X A6 4 -700 200 300 R 60 60 1 1 I
+X A5 5 -700 300 300 R 60 60 1 1 I
+X A4 6 -700 400 300 R 60 60 1 1 I
+X A3 7 -700 500 300 R 60 60 1 1 I
+X A2 8 -700 600 300 R 60 60 1 1 I
+X A1 9 -700 700 300 R 60 60 1 1 I
+X A0 10 -700 800 300 R 60 60 1 1 I
+X CS 20 -700 -800 300 R 60 60 1 1 I I
+X D0 11 700 800 300 L 60 60 1 1 T
+X A10 21 -700 -200 300 R 60 60 1 1 I
+X D1 12 700 700 300 L 60 60 1 1 T
+X OE 22 -700 -900 300 R 60 60 1 1 I I
+X D2 13 700 600 300 L 60 60 1 1 T
+X A11 23 -700 -300 300 R 60 60 1 1 I
+X A9 24 -700 -100 300 R 60 60 1 1 I
+X D3 15 700 500 300 L 60 60 1 1 T
+X A8 25 -700 0 300 R 60 60 1 1 I
+X D4 16 700 400 300 L 60 60 1 1 T
+X A13 26 -700 -500 300 R 60 60 1 1 I
+X D5 17 700 300 300 L 60 60 1 1 T
+X WE 27 -700 -1000 300 R 60 60 1 1 I I
+X D6 18 700 200 300 L 60 60 1 1 T
+X D7 19 700 100 300 L 60 60 1 1 T
+ENDDRAW
+ENDDEF
+#
+# SW_PUSH
+#
+DEF SW_PUSH SW 0 40 N N 1 F N
+F0 "SW" 150 110 50 H V C CNN
+F1 "SW_PUSH" 0 -80 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -170 50 170 60 0 1 0 N
+P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
+X 1 1 -300 0 200 R 60 60 0 1 P I
+X 2 2 300 0 200 L 60 60 0 1 P I
+ENDDRAW
+ENDDEF
+#
+# TDA8702
+#
+DEF TDA8702 U 0 40 Y Y 1 F N
+F0 "U" 200 800 60 H V L CNN
+F1 "TDA8702" 200 -800 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -500 700 500 -700 0 1 0 N
+X VREF 1 -800 -400 300 R 50 50 1 1 B
+X AGND 2 100 -900 200 U 50 50 1 1 W
+X DB2 3 -800 400 300 R 50 50 1 1 I
+X DB3 4 -800 300 300 R 50 50 1 1 I
+X Clock 5 -800 -600 300 R 50 50 1 1 I C
+X DGND 6 -100 -900 200 U 50 50 1 1 W
+X DB7 7 -800 -100 300 R 50 50 1 1 I
+X DB6 8 -800 0 300 R 50 50 1 1 I
+X DB6 8 -800 0 300 R 50 50 1 1 I
+X DB5 9 -800 100 300 R 50 50 1 1 I
+X DB4 10 -800 200 300 R 50 50 1 1 I
+X DB1 11 -800 500 300 R 50 50 1 1 I
+X DB0 12 -800 600 300 R 50 50 1 1 I
+X VCCD 13 -100 900 200 D 50 50 1 1 W
+X VOUT 14 800 -150 300 L 50 50 1 1 O
+X VOUT 15 800 200 300 L 50 50 1 1 O I
+X VCCA 16 100 900 200 D 50 50 1 1 W
+X VREF 1 -800 -400 300 R 50 50 1 2 B
+X AGND 2 100 -900 300 U 50 50 1 2 W
+X DB2 3 -800 400 300 R 50 50 1 2 I
+X DB3 4 -800 300 300 R 50 50 1 2 I
+X Clock 5 -800 -600 300 R 50 50 1 2 I C
+X DGND 6 -100 -900 300 U 50 50 1 2 W
+X DB7 7 -800 -100 300 R 50 50 1 2 I
+X DB6 8 -800 0 300 R 50 50 1 2 I
+X DB6 8 -800 0 300 R 50 50 1 2 I
+X DB5 9 -800 100 300 R 50 50 1 2 I
+X DB4 10 -800 200 300 R 50 50 1 2 I
+X DB1 11 -800 500 300 R 50 50 1 2 I
+X DB0 12 -800 600 300 R 50 50 1 2 I
+X VCCD 13 -100 900 300 D 50 50 1 2 W
+X VOUT 14 800 -150 300 L 50 50 1 2 O
+X VOUT 15 800 200 300 L 50 50 1 2 O
+X VCCA 16 100 900 300 D 50 50 1 2 W
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# XC95108PC84
+#
+DEF XC95108PC84 U 0 30 Y Y 1 F N
+F0 "U" 550 2550 60 H V L CNN
+F1 "XC95108PC84" 400 -1950 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -850 2450 850 -1850 0 1 0 N
+X P1 1 -1150 1850 300 R 60 60 1 1 B
+X P2 2 -1150 1750 300 R 60 60 1 1 B
+X P3 3 -1150 1650 300 R 60 60 1 1 B
+X P4 4 -1150 1550 300 R 60 60 1 1 B
+X P5 5 -1150 1450 300 R 60 60 1 1 B
+X P6 6 -1150 1350 300 R 60 60 1 1 B
+X P7 7 -1150 1250 300 R 60 60 1 1 B
+X GND 8 -250 -2150 300 U 60 60 1 1 W
+X I/O/GCK1 9 -1150 1150 300 R 60 60 1 1 B
+X I/O/GCK2 10 -1150 1050 300 R 60 60 1 1 B
+X P20 20 -1150 50 300 R 60 60 1 1 B
+X TCK 30 -1150 2150 300 R 60 60 1 1 I
+X P40 40 -1150 -1450 300 R 60 60 1 1 B
+X P50 50 1150 -1350 300 L 60 60 1 1 B
+X GND 60 250 -2150 300 U 60 60 1 1 W
+X P70 70 1150 550 300 L 60 60 1 1 B
+X P80 80 1150 1450 300 L 60 60 1 1 B
+X P11 11 -1150 950 300 R 60 60 1 1 B
+X P21 21 -1150 -50 300 R 60 60 1 1 B
+X P31 31 -1150 -550 300 R 60 60 1 1 B
+X P41 41 -1150 -1550 300 R 60 60 1 1 B
+X P51 51 1150 -1250 300 L 60 60 1 1 B
+X P61 61 1150 -250 300 L 60 60 1 1 B
+X P71 71 1150 750 300 L 60 60 1 1 B
+X P81 81 1150 1550 300 L 60 60 1 1 B
+X I/O/GCK3 12 -1150 850 300 R 60 60 1 1 B
+X VCCIO 22 100 2750 300 D 60 60 1 1 W
+X P32 32 -1150 -750 300 R 60 60 1 1 B
+X GND 42 50 -2150 300 U 60 60 1 1 W
+X P52 52 1150 -1150 300 L 60 60 1 1 B
+X P62 62 1150 -150 300 L 60 60 1 1 B
+X P72 72 1150 850 300 L 60 60 1 1 B
+X P82 82 1150 1650 300 L 60 60 1 1 B
+X P13 13 -1150 750 300 R 60 60 1 1 B
+X P23 23 -1150 -150 300 R 60 60 1 1 B
+X P33 33 -1150 -850 300 R 60 60 1 1 B
+X P43 43 -1150 -1650 300 R 60 60 1 1 B
+X P53 53 1150 -1050 300 L 60 60 1 1 B
+X P63 63 1150 -50 300 L 60 60 1 1 B
+X VCC 73 -200 2750 300 D 60 60 1 1 W
+X P83 83 1150 1750 300 L 60 60 1 1 B
+X P14 14 -1150 550 300 R 60 60 1 1 B
+X P24 24 -1150 -250 300 R 60 60 1 1 B
+X P34 34 -1150 -950 300 R 60 60 1 1 B
+X P44 44 -1150 -1750 300 R 60 60 1 1 B
+X P54 54 1150 -950 300 L 60 60 1 1 B
+X VCCIO 64 200 2750 300 D 60 60 1 1 W
+X I/O/GSR 74 1150 950 300 L 60 60 1 1 B
+X P84 84 1150 1850 300 L 60 60 1 1 B
+X P15 15 -1150 450 300 R 60 60 1 1 B
+X P25 25 -1150 -350 300 R 60 60 1 1 B
+X P35 35 -1150 -1050 300 R 60 60 1 1 B
+X P45 45 1150 -1750 300 L 60 60 1 1 B
+X P55 55 1150 -850 300 L 60 60 1 1 B
+X P65 65 1150 50 300 L 60 60 1 1 B
+X P75 75 1150 1050 300 L 60 60 1 1 B
+X GND 16 -150 -2150 300 U 60 60 1 1 W
+X P26 26 -1150 -450 300 R 60 60 1 1 B
+X P36 36 -1150 -1150 300 R 60 60 1 1 B
+X P46 46 1150 -1650 300 L 60 60 1 1 B
+X P56 56 1150 -750 300 L 60 60 1 1 B
+X P66 66 1150 150 300 L 60 60 1 1 B
+X I/O/GTS1 76 1150 1150 300 L 60 60 1 1 B
+X P17 17 -1150 350 300 R 60 60 1 1 B
+X GND 27 -50 -2150 300 U 60 60 1 1 W
+X P37 37 -1150 -1250 300 R 60 60 1 1 B
+X P47 47 1150 -1550 300 L 60 60 1 1 B
+X P57 57 1150 -450 300 L 60 60 1 1 B
+X P67 67 1150 250 300 L 60 60 1 1 B
+X I/O/GTS2 77 1150 1250 300 L 60 60 1 1 B
+X P18 18 -1150 250 300 R 60 60 1 1 B
+X TDI 28 -1150 2350 300 R 60 60 1 1 I
+X VCC 38 -300 2750 300 D 60 60 1 1 W
+X P48 48 1150 -1450 300 L 60 60 1 1 B
+X P58 58 1150 -350 300 L 60 60 1 1 B
+X P68 68 1150 350 300 L 60 60 1 1 B
+X VCC 78 -100 2750 300 D 60 60 1 1 W
+X P19 19 -1150 150 300 R 60 60 1 1 B
+X TMS 29 -1150 2250 300 R 60 60 1 1 I
+X P39 39 -1150 -1350 300 R 60 60 1 1 B
+X GND 49 150 -2150 300 U 60 60 1 1 W
+X TDO 59 -1150 2050 300 R 60 60 1 1 O
+X P69 69 1150 450 300 L 60 60 1 1 B
+X P79 79 1150 1350 300 L 60 60 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/video/libs/video_schlib.lib b/demos/video/libs/video_schlib.lib
new file mode 100644
index 0000000000..bee8d0b288
--- /dev/null
+++ b/demos/video/libs/video_schlib.lib
@@ -0,0 +1,1720 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +12V
+#
+DEF +12V #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C CNN
+F1 "+12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +12V 1 0 0 0 U 20 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# +3.3V
+#
+DEF +3.3V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -40 30 H I C CNN
+F1 "+3.3V" 0 110 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS +3,3V
+DRAW
+X +3.3V 1 0 0 0 U 30 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# +5F
+#
+DEF +5F #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -50 20 H I C CNN
+F1 "+5F" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +5F 1 0 0 0 U 20 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# +5V
+#
+DEF +5V #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 90 20 H I C CNN
+F1 "+5V" 0 90 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +5V 1 0 0 0 U 20 20 0 0 W N
+C 0 50 20 0 1 0 N
+P 4 0 1 0  0 0  0 30  0 30  0 30 N
+ENDDRAW
+ENDDEF
+#
+# 24C16
+#
+DEF 24C16 U 0 30 Y Y 1 F N
+F0 "U" 150 350 60 H V C CNN
+F1 "24C16" 200 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS 24C512
+DRAW
+X GND 4 0 -500 200 U 60 60 0 0 W
+X VCC 8 0 500 200 D 60 60 0 0 W
+S -400 -300 400 300 1 1 0 N
+X A0 1 -700 200 300 R 60 60 1 1 I
+X A1 2 -700 100 300 R 60 60 1 1 I
+X A2 3 -700 0 300 R 60 60 1 1 I
+X SDA 5 700 -200 300 L 60 60 1 1 B
+X SCL 6 700 -100 300 L 60 60 1 1 I
+X WP 7 700 100 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# 4C4001
+#
+DEF 4C4001 U 0 40 Y Y 1 F N
+F0 "U" 50 0 70 H V C CNN
+F1 "4C4001" 50 -300 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -350 750 350 -750 0 1 0 N
+X D0 1 650 700 300 L 60 60 1 1 T
+X D1 2 650 600 300 L 60 60 1 1 T
+X WR 3 -650 -600 300 R 60 60 1 1 I I
+X RAS 4 -650 -400 300 R 60 60 1 1 I I
+X A9 5 -650 -200 300 R 60 60 1 1 I
+X A0 6 -650 700 300 R 60 60 1 1 I
+X A1 7 -650 600 300 R 60 60 1 1 I
+X A2 8 -650 500 300 R 60 60 1 1 I
+X A3 9 -650 400 300 R 60 60 1 1 I
+X VCC 10 -250 750 0 U 60 60 1 1 W N
+X GND 20 -250 -750 0 U 60 60 1 1 W N
+X A4 11 -650 300 300 R 60 60 1 1 I
+X A5 12 -650 200 300 R 60 60 1 1 I
+X A6 13 -650 100 300 R 60 60 1 1 I
+X A7 14 -650 0 300 R 60 60 1 1 I
+X A8 15 -650 -100 300 R 60 60 1 1 I
+X OE 16 -650 -700 300 R 60 60 1 1 I I
+X CAS 17 -650 -500 300 R 60 60 1 1 I I
+X D2 18 650 500 300 L 60 60 1 1 T
+X D3 19 650 400 300 L 60 60 1 1 T
+ENDDRAW
+ENDDEF
+#
+# 74LS245
+#
+DEF 74LS245 U 0 10 Y Y 1 F N
+F0 "U" 100 575 50 H V L BNN
+F1 "74LS245" 50 -575 50 H V L TNN
+F2 "" 50 -650 30 H V L CNN
+F3 "" 100 575 30 H V C CNN
+ALIAS 74HC245
+DRAW
+X GND 10 0 -550 0 U 60 60 0 0 W N
+X VCC 20 0 550 0 D 60 60 0 0 W N
+S -400 550 400 -550 0 1 0 N
+P 3 0 1 0  50 100  0 -100  -100 -100 N
+P 4 0 1 0  100 100  -50 100  -100 -100  -150 -100 N
+X A->B 1 -700 -400 300 R 60 60 1 1 I
+X A0 2 -700 500 300 R 60 60 1 1 T
+X A1 3 -700 400 300 R 60 60 1 1 T
+X A2 4 -700 300 300 R 60 60 1 1 T
+X A3 5 -700 200 300 R 60 60 1 1 T
+X A4 6 -700 100 300 R 60 60 1 1 T
+X A5 7 -700 0 300 R 60 60 1 1 T
+X A6 8 -700 -100 300 R 60 60 1 1 T
+X A7 9 -700 -200 300 R 60 60 1 1 T
+X B7 11 700 -200 300 L 60 60 1 1 T
+X B6 12 700 -100 300 L 60 60 1 1 T
+X B5 13 700 0 300 L 60 60 1 1 T
+X B4 14 700 100 300 L 60 60 1 1 T
+X B3 15 700 200 300 L 60 60 1 1 T
+X B2 16 700 300 300 L 60 60 1 1 T
+X B1 17 700 400 300 L 60 60 1 1 T
+X B0 18 700 500 300 L 60 60 1 1 T
+X CE 19 -700 -500 300 R 60 60 1 1 I I
+ENDDRAW
+ENDDEF
+#
+# AV9173
+#
+DEF AV9173 U 0 30 Y Y 1 F N
+F0 "U" 170 450 60 H V C CNN
+F1 "AV9173" 260 -450 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -650 350 650 -350 0 1 0 N
+X FSIGIN 1 -950 100 300 R 60 60 1 1 I
+X FREFIN 2 -950 300 300 R 60 60 1 1 I
+X GND 3 -50 -500 150 U 60 60 1 1 I
+X FS0 4 -950 -100 300 R 60 60 1 1 I
+X OE 5 -950 -300 300 R 60 60 1 1 I
+X CKKOUT 6 950 100 300 L 60 60 1 1 T
+X VCC 7 -50 500 150 D 60 60 1 1 I
+X CLK/2 8 950 -100 300 L 60 60 1 1 T
+ENDDRAW
+ENDDEF
+#
+# BNC
+#
+DEF BNC P 0 40 Y N 1 F N
+F0 "P" 10 120 60 H V C CNN
+F1 "BNC" 110 -60 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 20 0 1 8 N
+C 0 0 70 0 1 12 N
+X In 1 -150 0 130 R 40 40 1 1 P
+X Ext 2 0 -200 130 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# BT253
+#
+DEF BT253 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "BT253" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS BT254
+DRAW
+S -750 -2600 750 2600 0 1 0 N
+X VAA 1 -50 2900 300 D 60 60 1 1 I
+X GND 2 -150 -2900 300 U 60 60 1 1 I
+X GND 3 -50 -2900 300 U 60 60 1 1 I
+X SYNC0 4 -1050 300 300 R 60 60 1 1 I I
+X SYNC1 5 -1050 -200 300 R 60 60 1 1 I I
+X CEXT1 6 -1050 2400 300 R 60 60 1 1 O
+X CEXT2 7 -1050 2500 300 R 60 60 1 1 I
+X CSYNC 8 1050 2500 300 L 60 60 1 1 O I
+X D7 9 -1050 -1300 300 R 60 60 1 1 T
+X D6 10 -1050 -1200 300 R 60 60 1 1 T
+X RD 20 -1050 -1500 300 R 60 60 1 1 I I
+X B2 30 1050 -1800 300 L 60 60 1 1 T
+X RCLOCK 40 1050 600 300 L 60 60 1 1 I C
+X R6 50 1050 -400 300 L 60 60 1 1 T
+X GIN 60 1050 1700 300 L 60 60 1 1 I
+X GOUT 70 1050 1800 300 L 60 60 1 1 O
+X IOUT1 80 -1050 2000 300 R 60 60 1 1 P
+X D5 11 -1050 -1100 300 R 60 60 1 1 T
+X RREF- 21 -1050 1000 300 R 60 60 1 1 I
+X B1 31 1050 -1700 300 L 60 60 1 1 T
+X GND 41 50 -2900 300 U 60 60 1 1 I
+X R5 51 1050 -300 300 L 60 60 1 1 T
+X BLEVEL 61 1050 800 300 L 60 60 1 1 I
+X IOUT5 71 -1050 1600 300 R 60 60 1 1 P
+X RVID1 81 -1050 100 300 R 60 60 1 1 I
+X D4 12 -1050 -1000 300 R 60 60 1 1 T
+X GREF- 22 -1050 900 300 R 60 60 1 1 I
+X B0 32 1050 -1600 300 L 60 60 1 1 T
+X GND 42 150 -2900 300 U 60 60 1 1 I
+X R4 52 1050 -200 300 L 60 60 1 1 T
+X RIN 62 1050 2000 300 L 60 60 1 1 I
+X ROUT 72 1050 2100 300 L 60 60 1 1 O
+X IOUT0 82 -1050 2100 300 R 60 60 1 1 P
+X D3 13 -1050 -900 300 R 60 60 1 1 T
+X BREF- 23 -1050 800 300 R 60 60 1 1 I
+X G7 33 1050 -1400 300 L 60 60 1 1 T
+X VAA 43 50 2900 300 D 60 60 1 1 I
+X R3 53 1050 -100 300 L 60 60 1 1 T
+X GLEVEL 63 1050 900 300 L 60 60 1 1 I
+X IOUT4 73 -1050 1700 300 R 60 60 1 1 P
+X RVID0 83 -1050 600 300 R 60 60 1 1 I
+X D2 14 -1050 -800 300 R 60 60 1 1 T
+X WR 24 -1050 -1600 300 R 60 60 1 1 I I
+X G6 34 1050 -1300 300 L 60 60 1 1 T
+X VAA 44 150 2900 300 D 60 60 1 1 I
+X R2 54 1050 0 300 L 60 60 1 1 T
+X BREF+ 64 -1050 1200 300 R 60 60 1 1 I
+X BVID1 74 -1050 -100 300 R 60 60 1 1 I
+X VAA 84 -150 2900 300 D 60 60 1 1 I
+X D1 15 -1050 -700 300 R 60 60 1 1 T
+X B7 25 1050 -2300 300 L 60 60 1 1 T
+X G5 35 1050 -1200 300 L 60 60 1 1 T
+X G3 45 1050 -1000 300 L 60 60 1 1 T
+X R1 55 1050 100 300 L 60 60 1 1 T
+X GREF+ 65 -1050 1300 300 R 60 60 1 1 I
+X BVID0 75 -1050 400 300 R 60 60 1 1 I
+X D0 16 -1050 -600 300 R 60 60 1 1 T
+X B6 26 1050 -2200 300 L 60 60 1 1 T
+X G4 36 1050 -1100 300 L 60 60 1 1 T
+X G2 46 1050 -900 300 L 60 60 1 1 T
+X R0 56 1050 200 300 L 60 60 1 1 T
+X RREF+ 66 -1050 1400 300 R 60 60 1 1 I
+X IOUT3 76 -1050 1800 300 R 60 60 1 1 P
+X A0 17 -1050 -1800 300 R 60 60 1 1 I
+X B5 27 1050 -2100 300 L 60 60 1 1 T
+X ZERO 37 1050 1100 300 L 60 60 1 1 I
+X G1 47 1050 -800 300 L 60 60 1 1 T
+X OE 57 1050 -2500 300 L 60 60 1 1 I I
+X RLEVEL 67 1050 1000 300 L 60 60 1 1 I
+X GVID1 77 -1050 0 300 R 60 60 1 1 I
+X A1 18 -1050 -1900 300 R 60 60 1 1 I
+X B4 28 1050 -2000 300 L 60 60 1 1 T
+X BCLOCK 38 1050 400 300 L 60 60 1 1 I C
+X G0 48 1050 -700 300 L 60 60 1 1 T
+X BIN 58 1050 1400 300 L 60 60 1 1 I
+X BOUT 68 1050 1500 300 L 60 60 1 1 O
+X IOUT2 78 -1050 1900 300 R 60 60 1 1 P
+X A2 19 -1050 -2000 300 R 60 60 1 1 I
+X B3 29 1050 -1900 300 L 60 60 1 1 T
+X GCLOCK 39 1050 500 300 L 60 60 1 1 I C
+X R7 49 1050 -500 300 L 60 60 1 1 T
+X CLAMP 59 1050 1200 300 L 60 60 1 1 I
+X RSET 69 -1050 2300 300 R 60 60 1 1 I
+X GVID0 79 -1050 500 300 R 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# BT473
+#
+DEF BT473 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "BT473" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -700 -2400 700 2400 0 1 0 N
+X VAA 1 -300 2700 300 D 60 60 1 1 I
+X VAA 2 -200 2700 300 D 60 60 1 1 I
+X GND 3 -200 -2700 300 U 60 60 1 1 I
+X GND 4 -100 -2700 300 U 60 60 1 1 I
+X S0 5 1000 -1500 300 L 60 60 1 1 I
+X S1 6 1000 -1600 300 L 60 60 1 1 I
+X BLANK 7 1000 -200 300 L 60 60 1 1 I I
+X SYNC 8 1000 0 300 L 60 60 1 1 I I
+X CLOCK 9 1000 -400 300 L 60 60 1 1 I C
+X OL0 10 -1000 -2000 300 R 60 60 1 1 I
+X D6 20 -1000 -1000 300 R 60 60 1 1 I
+X CR3 30 1000 -1100 300 L 60 60 1 1 O
+X IREF 40 1000 1200 300 L 60 60 1 1 I
+X R5 50 -1000 1800 300 R 60 60 1 1 I
+X G7 60 -1000 700 300 R 60 60 1 1 I
+X OL1 11 -1000 -2100 300 R 60 60 1 1 I
+X D7 21 -1000 -1100 300 R 60 60 1 1 I
+X GND 31 0 -2700 300 U 60 60 1 1 I
+X COMP 41 1000 800 300 L 60 60 1 1 I
+X R6 51 -1000 1700 300 R 60 60 1 1 I
+X B0 61 -1000 500 300 R 60 60 1 1 I
+X OL2 12 -1000 -2200 300 R 60 60 1 1 I
+X WR 22 -1000 -1700 300 R 60 60 1 1 I I
+X GND 32 100 -2700 300 U 60 60 1 1 I
+X OPA 42 1000 600 300 L 60 60 1 1 O
+X R7 52 -1000 1600 300 R 60 60 1 1 I
+X B1 62 -1000 400 300 R 60 60 1 1 I
+X OL3 13 -1000 -2300 300 R 60 60 1 1 I
+X RD 23 -1000 -1800 300 R 60 60 1 1 I I
+X VAA 33 -100 2700 300 D 60 60 1 1 I
+X VREF 43 1000 1000 300 L 60 60 1 1 I
+X G0 53 -1000 1400 300 R 60 60 1 1 I
+X B2 63 -1000 300 300 R 60 60 1 1 I
+X D0 14 -1000 -400 300 R 60 60 1 1 I
+X RS0 24 -1000 -1300 300 R 60 60 1 1 I
+X VAA 34 0 2700 300 D 60 60 1 1 I
+X VREFOUT 44 1000 400 300 L 60 60 1 1 O
+X G1 54 -1000 1300 300 R 60 60 1 1 I
+X B3 64 -1000 200 300 R 60 60 1 1 I
+X D1 15 -1000 -500 300 R 60 60 1 1 I
+X RS1 25 -1000 -1400 300 R 60 60 1 1 I
+X VAA 35 100 2700 300 D 60 60 1 1 I
+X R0 45 -1000 2300 300 R 60 60 1 1 I
+X G2 55 -1000 1200 300 R 60 60 1 1 I
+X B4 65 -1000 100 300 R 60 60 1 1 I
+X D2 16 -1000 -600 300 R 60 60 1 1 I
+X RS2 26 -1000 -1500 300 R 60 60 1 1 I
+X VAA 36 200 2700 300 D 60 60 1 1 I
+X R1 46 -1000 2200 300 R 60 60 1 1 I
+X G3 56 -1000 1100 300 R 60 60 1 1 I
+X B5 66 -1000 0 300 R 60 60 1 1 I
+X D3 17 -1000 -700 300 R 60 60 1 1 I
+X CR0 27 1000 -800 300 L 60 60 1 1 O
+X RED 37 1000 2000 300 L 60 60 1 1 O
+X R2 47 -1000 2100 300 R 60 60 1 1 I
+X G4 57 -1000 1000 300 R 60 60 1 1 I
+X B6 67 -1000 -100 300 R 60 60 1 1 I
+X D4 18 -1000 -800 300 R 60 60 1 1 I
+X CR1 28 1000 -900 300 L 60 60 1 1 O
+X GRE 38 1000 1800 300 L 60 60 1 1 O
+X R3 48 -1000 2000 300 R 60 60 1 1 I
+X G5 58 -1000 900 300 R 60 60 1 1 I
+X B7 68 -1000 -200 300 R 60 60 1 1 I
+X D5 19 -1000 -900 300 R 60 60 1 1 I
+X CR2 29 1000 -1000 300 L 60 60 1 1 O
+X BLU 39 1000 1600 300 L 60 60 1 1 O
+X R4 49 -1000 1900 300 R 60 60 1 1 I
+X G6 59 -1000 800 300 R 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# BT812
+#
+DEF BT812 U 0 30 Y Y 1 F N
+F0 "U" 1870 3350 60 H V C CNN
+F1 "BT812" 1230 -3350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -1750 -3300 1750 3300 0 1 0 N
+X VAA 1 -650 3600 300 D 60 60 1 1 I
+X VAA 2 -550 3600 300 D 60 60 1 1 I
+X YREF- 3 -2050 -100 300 R 60 60 1 1 I
+X VIN_Y/COMP. 4 2050 -300 300 L 60 60 1 1 I
+X GNDA 5 -650 -3600 300 U 60 60 1 1 I
+X OUT_Y 6 2050 0 300 L 60 60 1 1 O
+X YLEVEL 7 -2050 100 300 R 60 60 1 1 I
+X GND 30 -1550 -3600 300 U 60 60 1 1 I
+X VAA 40 -350 3600 300 D 60 60 1 1 I
+X B5 50 2050 600 300 L 60 60 1 1 T
+X R5 60 2050 2400 300 L 60 60 1 1 T
+X G4 70 2050 1600 300 L 60 60 1 1 T
+X VAA 80 250 3600 300 D 60 60 1 1 I
+X TCLK 90 -2050 2000 300 R 60 60 1 1 I
+X VCC 31 -1650 3600 300 D 60 60 1 1 I
+X VAA 41 -250 3600 300 D 60 60 1 1 I
+X B4 51 2050 700 300 L 60 60 1 1 T
+X R4 61 2050 2500 300 L 60 60 1 1 T
+X G3 71 2050 1700 300 L 60 60 1 1 T
+X VAA 81 350 3600 300 D 60 60 1 1 I
+X VCC 91 -1250 3600 300 D 60 60 1 1 P
+X ACTIVE 32 2050 -1800 300 L 60 60 1 1 O
+X VAA 42 -150 3600 300 D 60 60 1 1 I
+X B3 52 2050 800 300 L 60 60 1 1 T
+X R3 62 2050 2600 300 L 60 60 1 1 T
+X G2 72 2050 1800 300 L 60 60 1 1 T
+X VAA 82 450 3600 300 D 60 60 1 1 I
+X D0 92 -2050 -1200 300 R 60 60 1 1 T
+X VACTIVE 33 2050 -1700 300 L 60 60 1 1 O I
+X VAA 43 -50 3600 300 D 60 60 1 1 I
+X B2 53 2050 900 300 L 60 60 1 1 T
+X R2 63 2050 2700 300 L 60 60 1 1 T
+X G1 73 2050 1900 300 L 60 60 1 1 T
+X WR 83 -2050 -2500 300 R 60 60 1 1 I I
+X D1 93 -2050 -1300 300 R 60 60 1 1 T
+X VRESET 34 2050 -1500 300 L 60 60 1 1 O I
+X GND 44 -1450 -3600 300 U 60 60 1 1 I
+X B1 54 2050 1000 300 L 60 60 1 1 T
+X R1 64 2050 2800 300 L 60 60 1 1 T
+X G0 74 2050 2000 300 L 60 60 1 1 T
+X RS0 84 -2050 -2100 300 R 60 60 1 1 I
+X D2 94 -2050 -1400 300 R 60 60 1 1 T
+X FIELD_1 25 2050 -2100 300 L 60 60 1 1 B
+X HACTIVE 35 2050 -1600 300 L 60 60 1 1 O I
+X VCC 45 -1550 3600 300 D 60 60 1 1 I
+X B0 55 2050 1100 300 L 60 60 1 1 T
+X R0 65 2050 2900 300 L 60 60 1 1 T
+X GND 75 -1150 -3600 300 U 60 60 1 1 I
+X RS1 85 -2050 -2200 300 R 60 60 1 1 I
+X D3 95 -2050 -1500 300 R 60 60 1 1 T
+X GND 16 -1650 -3600 300 U 60 60 1 1 I
+X FIELD_0 26 2050 -2000 300 L 60 60 1 1 B
+X HRESET 36 2050 -1400 300 L 60 60 1 1 O I
+X VTU_EN 46 -2050 2300 300 R 60 60 1 1 I I
+X GND 56 -1350 -3600 300 U 60 60 1 1 I
+X GND 66 -1250 -3600 300 U 60 60 1 1 I
+X VCC 76 -1350 3600 300 D 60 60 1 1 I
+X RD 86 -2050 -2400 300 R 60 60 1 1 I I
+X D4 96 -2050 -1600 300 R 60 60 1 1 T
+X FIELD_2 27 2050 -2200 300 L 60 60 1 1 O
+X SERROR 37 2050 -1100 300 L 60 60 1 1 O
+X PIXEL_EN 47 -2050 2200 300 R 60 60 1 1 I I
+X VCC 57 -1450 3600 300 D 60 60 1 1 I
+X G7 67 2050 1300 300 L 60 60 1 1 T
+X RESET 87 -2050 -2700 300 R 60 60 1 1 I I
+X D5 97 -2050 -1700 300 R 60 60 1 1 T
+X CBFLAG 28 2050 -1000 300 L 60 60 1 1 O
+X CAPTURE 38 2050 -800 300 L 60 60 1 1 O
+X B7 48 2050 400 300 L 60 60 1 1 T
+X R7 58 2050 2200 300 L 60 60 1 1 T
+X G6 68 2050 1400 300 L 60 60 1 1 T
+X VAA 78 50 3600 300 D 60 60 1 1 I
+X TDI 88 -2050 1800 300 R 60 60 1 1 I
+X GND 98 -1050 -3600 300 U 60 60 1 1 I
+X VALID 29 2050 -900 300 L 60 60 1 1 O
+X VAA 39 -450 3600 300 D 60 60 1 1 I
+X B6 49 2050 500 300 L 60 60 1 1 T
+X R6 59 2050 2300 300 L 60 60 1 1 T
+X G5 69 2050 1500 300 L 60 60 1 1 T
+X VAA 79 150 3600 300 D 60 60 1 1 I
+X TMS 89 -2050 1900 300 R 60 60 1 1 I
+X D6 99 -2050 -1800 300 R 60 60 1 1 T
+X D7 100 -2050 -1900 300 R 60 60 1 1 T
+X N/C 110 2050 -2900 300 L 60 60 1 1 I
+X VAA 120 650 3600 300 D 60 60 1 1 I
+X GNDA 130 -150 -3600 300 U 60 60 1 1 I
+X SYNC_DET 140 -2050 300 300 R 60 60 1 1 I
+X VID3_Y 150 -2050 600 300 R 60 60 1 1 I
+X VAA 160 1650 3600 300 D 60 60 1 1 I
+X TDO 101 -2050 1700 300 R 60 60 1 1 O
+X GND 111 -850 -3600 300 U 60 60 1 1 I
+X VAA 121 750 3600 300 D 60 60 1 1 I
+X VID3_C 131 -2050 500 300 R 60 60 1 1 I
+X VAA 141 1150 3600 300 D 60 60 1 1 I
+X GNDA 151 650 -3600 300 U 60 60 1 1 I
+X VCC 102 -1150 3600 300 D 60 60 1 1 I
+X VCC 112 -1050 3600 300 D 60 60 1 1 I
+X VAA 122 850 3600 300 D 60 60 1 1 I
+X VAA 132 1050 3600 300 D 60 60 1 1 I
+X VAA 142 1250 3600 300 D 60 60 1 1 I
+X VID2_Y 152 -2050 900 300 R 60 60 1 1 I
+X GND 103 -950 -3600 300 U 60 60 1 1 I
+X REFOUT 113 -2050 -800 300 R 60 60 1 1 O
+X VAA 123 950 3600 300 D 60 60 1 1 P
+X GNDA 143 350 -3600 300 U 60 60 1 1 I
+X GNDA 153 750 -3600 300 U 60 60 1 1 I
+X CLKX1 104 2050 -2400 300 L 60 60 1 1 O
+X CLEVEL 114 -2050 -300 300 R 60 60 1 1 I
+X GNDA 124 -450 -3600 300 U 60 60 1 1 I
+X GNDA 134 -50 -3600 300 U 60 60 1 1 I
+X YREF+ 144 -2050 0 300 R 60 60 1 1 I
+X VID1_Y 154 -2050 1200 300 R 60 60 1 1 I
+X CLKX2 105 2050 -2500 300 L 60 60 1 1 O
+X OUT_C 115 2050 -100 300 L 60 60 1 1 O
+X VID0_C 125 -2050 1400 300 R 60 60 1 1 I
+X R/2 135 -2050 -700 300 R 60 60 1 1 I
+X GNDA 145 450 -3600 300 U 60 60 1 1 I
+X GNDA 155 850 -3600 300 U 60 60 1 1 I
+X XTAL2_IN 106 -2050 2600 300 R 60 60 1 1 I
+X GNDA 116 -550 -3600 300 U 60 60 1 1 I
+X GNDA 126 -350 -3600 300 U 60 60 1 1 I
+X GNDA 136 50 -3600 300 U 60 60 1 1 I
+X VID0_Y 156 -2050 1500 300 R 60 60 1 1 I
+X XTAL2_OUT 107 -2050 2500 300 R 60 60 1 1 O
+X VIN_C 117 2050 -400 300 L 60 60 1 1 I
+X VID1_C 127 -2050 1100 300 R 60 60 1 1 I
+X CREF+ 137 -2050 -400 300 R 60 60 1 1 I
+X GNDA 147 550 -3600 300 U 60 60 1 1 I
+X GNDA 157 950 -3600 300 U 60 60 1 1 I
+X XTAL1_IN 108 -2050 2900 300 R 60 60 1 1 I
+X CREF- 118 -2050 -500 300 R 60 60 1 1 I
+X GNDA 128 -250 -3600 300 U 60 60 1 1 I
+X GNDA 138 150 -3600 300 U 60 60 1 1 I
+X VAA 158 1450 3600 300 D 60 60 1 1 I
+X XTAL1_OUT 109 -2050 2800 300 R 60 60 1 1 O
+X VAA 119 550 3600 300 D 60 60 1 1 I
+X VID2_C 129 -2050 800 300 R 60 60 1 1 I
+X GNDA 139 250 -3600 300 U 60 60 1 1 I
+X VAA 149 1350 3600 300 D 60 60 1 1 I
+X VAA 159 1550 3600 300 D 60 60 1 1 I
+ENDDRAW
+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 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$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
+ENDDRAW
+ENDDEF
+#
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CONN_5
+#
+DEF CONN_5 P 0 40 Y Y 1 F N
+F0 "P" -50 0 50 V V C CNN
+F1 "CONN_5" 50 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 250 100 -250 0 1 0 f
+X ~ 1 -400 200 300 R 60 60 1 1 P I
+X ~ 2 -400 100 300 R 60 60 1 1 P I
+X ~ 3 -400 0 300 R 60 60 1 1 P I
+X ~ 4 -400 -100 300 R 60 60 1 1 P I
+X ~ 5 -400 -200 300 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CRYSTAL
+#
+DEF CRYSTAL X 0 40 N N 1 F N
+F0 "X" 0 150 60 H V C CNN
+F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 16  -100 100  -100 -100 N
+P 2 0 1 16  100 100  100 -100 N
+P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 f
+X 1 1 -300 0 200 R 40 40 1 1 P
+X 2 2 300 0 200 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CTRIM
+#
+DEF CTRIM C 0 10 Y Y 1 F N
+F0 "C" 130 -80 50 H V C CNN
+F1 "CTRIM" 150 -160 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 12  -100 -30  100 -30 N
+P 2 0 1 12  -100 30  100 30 N
+P 2 0 1 12  -90 -90  75 75 N
+P 3 0 1 0  50 100  100 100  100 50 F
+X ~ 1 0 200 170 D 40 40 1 1 P
+X ~ 2 0 -200 170 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB9*
+$ENDFPLIST
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODESCH
+#
+DEF DIODESCH D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 6 0 1 8  75 25  75 50  50 50  50 -50  25 -50  25 -25 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
+ENDDRAW
+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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 40 N N 1 F N
+F0 "L" -50 0 40 V V C CNN
+F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+X 1 1 0 300 100 D 70 70 1 1 P
+X 2 2 0 -300 100 U 70 70 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+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
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$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
+ENDDRAW
+ENDDEF
+#
+# LIGNE_A_RETARD
+#
+DEF LIGNE_A_RETARD L 0 40 Y N 1 F N
+F0 "L" 0 100 70 H V C CNN
+F1 "LIGNE_A_RETARD" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -150 50 899 1 0 1 0 N 0 -100 50 -150
+A 0 -150 50 -1 -899 0 1 0 N 50 -150 0 -199
+A 0 -50 50 899 1 0 1 0 N 0 0 50 -50
+A 0 -50 50 -1 -899 0 1 0 N 50 -50 0 -99
+A 0 50 50 899 1 0 1 0 N 0 100 50 50
+A 0 50 50 -1 -899 0 1 0 N 50 50 0 1
+A 0 150 50 899 1 0 1 0 N 0 200 50 150
+A 0 150 50 -1 -899 0 1 0 N 50 150 0 101
+P 2 0 1 0  -100 200  -100 -200 N
+X 1 1 0 300 100 D 60 60 1 1 P
+X 2 2 0 -300 100 U 60 60 1 1 P
+X COMMUN 3 -200 0 100 R 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# NPN
+#
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PCI_CONUNIV
+#
+DEF PCI_CONUNIV J 0 30 Y Y 1 F N
+F0 "J" 0 3200 60 H V C CNN
+F1 "PCI_CONUNIV" 0 -3200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS BUSPCI-5V
+DRAW
+S -750 3150 750 -3150 0 1 0 N
+X TRST# A1 1100 3050 350 L 60 60 1 1 O I
+X -12V B1 -1100 3050 350 R 60 60 1 1 W
+X +12V A2 1100 2950 350 L 60 60 1 1 W
+X TCK B2 -1100 2950 350 R 60 60 1 1 O
+X TMS A3 1100 2850 350 L 60 60 1 1 O
+X GND B3 -1100 2850 350 R 60 60 1 1 I
+X TDI A4 1100 2750 350 L 60 60 1 1 O
+X TDO B4 -1100 2750 350 R 60 60 1 1 I
+X +5V A5 1100 2650 350 L 60 60 1 1 W
+X +5V B5 -1100 2650 350 R 60 60 1 1 W
+X INTA# A6 1100 2550 350 L 60 60 1 1 I I
+X +5V B6 -1100 2550 350 R 60 60 1 1 W
+X INTC# A7 1100 2450 350 L 60 60 1 1 I I
+X INTB# B7 -1100 2450 350 R 60 60 1 1 I I
+X +5V A8 1100 2350 350 L 60 60 1 1 W
+X INTD# B8 -1100 2350 350 R 60 60 1 1 I I
+X RESERVED A9 1100 2250 350 L 60 60 1 1 P
+X PRSNT1# B9 -1100 2250 350 R 60 60 1 1 I I
+X VIO A10 1100 2150 350 L 60 60 1 1 W
+X RESERVED B10 -1100 2150 350 R 60 60 1 1 P
+X AD[30] A20 1100 1150 350 L 60 60 1 1 B
+X AD[31] B20 -1100 1150 350 R 60 60 1 1 B
+X GND A30 1100 150 350 L 60 60 1 1 W
+X AD[19] B30 -1100 150 350 R 60 60 1 1 B
+X RESERVED A40 1100 -850 350 L 60 60 1 1 B
+X PERR# B40 -1100 -850 350 R 60 60 1 1 B I
+X REQ64# A60 1100 -2850 350 L 60 60 1 1 B I
+X ACK64# B60 -1100 -2850 350 R 60 60 1 1 B I
+X RESERVED A11 1100 2050 350 L 60 60 1 1 P
+X PRSNT2# B11 -1100 2050 350 R 60 60 1 1 I I
+X +3.3V A21 1100 1050 350 L 60 60 1 1 W
+X AD[29] B21 -1100 1050 350 R 60 60 1 1 B
+X AD[18] A31 1100 50 350 L 60 60 1 1 B
+X +3.3V B31 -1100 50 350 R 60 60 1 1 W
+X RESERVED A41 1100 -950 350 L 60 60 1 1 B
+X +3.3V B41 -1100 -950 350 R 60 60 1 1 W
+X +5V A61 1100 -2950 350 L 60 60 1 1 W
+X +5V B61 -1100 -2950 350 R 60 60 1 1 W
+X AD[28] A22 1100 950 350 L 60 60 1 1 B
+X GND B22 -1100 950 350 R 60 60 1 1 W
+X AD[16] A32 1100 -50 350 L 60 60 1 1 B
+X AD[17] B32 -1100 -50 350 R 60 60 1 1 B
+X GND A42 1100 -1050 350 L 60 60 1 1 W
+X SERR# B42 -1100 -1050 350 R 60 60 1 1 I I
+X C/BE#[0] A52 1100 -2050 350 L 60 60 1 1 B I
+X AD[08] B52 -1100 -2050 350 R 60 60 1 1 B
+X +5V A62 1100 -3050 350 L 60 60 1 1 W
+X +5V B62 -1100 -3050 350 R 60 60 1 1 W
+X AD[26] A23 1100 850 350 L 60 60 1 1 B
+X AD[27] B23 -1100 850 350 R 60 60 1 1 B
+X +3.3V A33 1100 -150 350 L 60 60 1 1 W
+X C/BE#[2] B33 -1100 -150 350 R 60 60 1 1 B I
+X PAR A43 1100 -1150 350 L 60 60 1 1 B
+X +3.3V B43 -1100 -1150 350 R 60 60 1 1 W
+X +3.3V A53 1100 -2150 350 L 60 60 1 1 W
+X AD[07] B53 -1100 -2150 350 R 60 60 1 1 B
+X 3.3VAUX A14 1100 1750 350 L 60 60 1 1 P
+X RESERVED B14 -1100 1750 350 R 60 60 1 1 P
+X GND A24 1100 750 350 L 60 60 1 1 W
+X AD[25] B24 -1100 750 350 R 60 60 1 1 B
+X FRAME# A34 1100 -250 350 L 60 60 1 1 B I
+X GND B34 -1100 -250 350 R 60 60 1 1 W
+X AD[15] A44 1100 -1250 350 L 60 60 1 1 B
+X C/BE#[1] B44 -1100 -1250 350 R 60 60 1 1 B I
+X AD[06] A54 1100 -2250 350 L 60 60 1 1 B
+X +3.3V B54 -1100 -2250 350 R 60 60 1 1 I
+X RST# A15 1100 1650 350 L 60 60 1 1 O I
+X GND B15 -1100 1650 350 R 60 60 1 1 W
+X AD[24] A25 1100 650 350 L 60 60 1 1 B
+X +3.3V B25 -1100 650 350 R 60 60 1 1 W
+X GND A35 1100 -350 350 L 60 60 1 1 W
+X IRDY# B35 -1100 -350 350 R 60 60 1 1 B I
+X +3.3V A45 1100 -1350 350 L 60 60 1 1 W
+X AD[14] B45 -1100 -1350 350 R 60 60 1 1 B
+X AD[04] A55 1100 -2350 350 L 60 60 1 1 B
+X AD[05] B55 -1100 -2350 350 R 60 60 1 1 B
+X VIO A16 1100 1550 350 L 60 60 1 1 W
+X CLK B16 -1100 1550 350 R 60 60 1 1 O
+X IDSEL A26 1100 550 350 L 60 60 1 1 O
+X C/BE#[3] B26 -1100 550 350 R 60 60 1 1 B
+X TRDY# A36 1100 -450 350 L 60 60 1 1 B I
+X +3.3V B36 -1100 -450 350 R 60 60 1 1 W
+X AD[13] A46 1100 -1450 350 L 60 60 1 1 B
+X GND B46 -1100 -1450 350 R 60 60 1 1 W
+X GND A56 1100 -2450 350 L 60 60 1 1 W
+X AD[03] B56 -1100 -2450 350 R 60 60 1 1 B
+X GNT# A17 1100 1450 350 L 60 60 1 1 B I
+X GND B17 -1100 1450 350 R 60 60 1 1 W
+X +3.3V A27 1100 450 350 L 60 60 1 1 W
+X AD[23] B27 -1100 450 350 R 60 60 1 1 B
+X GND A37 1100 -550 350 L 60 60 1 1 W
+X DEVSEL# B37 -1100 -550 350 R 60 60 1 1 B I
+X AD[11] A47 1100 -1550 350 L 60 60 1 1 B
+X AD[12] B47 -1100 -1550 350 R 60 60 1 1 B
+X AD[02] A57 1100 -2550 350 L 60 60 1 1 B
+X GND B57 -1100 -2550 350 R 60 60 1 1 W
+X GND A18 1100 1350 350 L 60 60 1 1 W
+X REQ# B18 -1100 1350 350 R 60 60 1 1 B I
+X AD[22] A28 1100 350 350 L 60 60 1 1 B
+X GND B28 -1100 350 350 R 60 60 1 1 W
+X STOP# A38 1100 -650 350 L 60 60 1 1 B I
+X GND B38 -1100 -650 350 R 60 60 1 1 W
+X GND A48 1100 -1650 350 L 60 60 1 1 W
+X AD[10] B48 -1100 -1650 350 R 60 60 1 1 B
+X AD[00] A58 1100 -2650 350 L 60 60 1 1 B
+X AD[01] B58 -1100 -2650 350 R 60 60 1 1 B
+X PME# A19 1100 1250 350 L 60 60 1 1 P
+X VIO B19 -1100 1250 350 R 60 60 1 1 W
+X AD[20] A29 1100 250 350 L 60 60 1 1 B
+X AD[21] B29 -1100 250 350 R 60 60 1 1 B
+X +3.3V A39 1100 -750 350 L 60 60 1 1 W
+X LOCK# B39 -1100 -750 350 R 60 60 1 1 B I
+X AD[09] A49 1100 -1750 350 L 60 60 1 1 B
+X M66EN B49 -1100 -1750 350 R 60 60 1 1 W
+X VIO A59 1100 -2750 350 L 60 60 1 1 W
+X VIO B59 -1100 -2750 350 R 60 60 1 1 W
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -100 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
+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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+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
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$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
+ENDDRAW
+ENDDEF
+#
+# RR8
+#
+DEF RR8 RR 0 40 Y N 1 F N
+F0 "RR" 50 550 70 H V C CNN
+F1 "RR8" 30 0 70 V 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  -50 -400  -50 500  50 500  100 450  100 -400  -50 -400 N
+X COM 1 -350 450 300 R 60 60 1 1 P I
+X 2 2 -350 350 300 R 60 60 1 1 P I
+X 3 3 -350 250 300 R 60 60 1 1 P I
+X 4 4 -350 150 300 R 60 60 1 1 P I
+X 5 5 -350 50 300 R 60 60 1 1 P I
+X 6 6 -350 -50 300 R 60 60 1 1 P I
+X 7 7 -350 -150 300 R 60 60 1 1 P I
+X 8 8 -350 -250 300 R 60 60 1 1 P I
+X 9 9 -350 -350 300 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# S5933_PQ160
+#
+DEF S5933_PQ160 U 0 30 Y Y 1 F N
+F0 "U" 0 2250 60 H V C CNN
+F1 "S5933_PQ160" 450 -4150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VSS 10 -150 -4100 0 U 60 60 0 0 W N
+X VSS 30 -50 -4100 0 U 60 60 0 0 W N
+X VSS 50 150 -4100 0 U 60 60 0 0 W N
+X VSS 70 50 -4100 0 U 60 60 0 0 W N
+X VSS 90 250 -4100 0 U 60 60 0 0 W N
+X VCC 11 -300 4150 0 D 60 60 0 0 W N
+X VCC 31 -200 4150 0 D 60 60 0 0 W N
+X VCC 51 -100 4150 0 D 60 60 0 0 W N
+X VCC 71 0 4150 0 D 60 60 0 0 W N
+X VCC 91 100 4150 0 D 60 60 0 0 W N
+X VSS 110 350 -4100 0 U 60 60 0 0 W N
+X VSS 130 450 -4100 0 U 60 60 0 0 W N
+X VSS 150 -250 -4100 0 U 60 60 0 0 W N
+X VCC 111 200 4150 0 D 60 60 0 0 W N
+X VCC 131 300 4150 0 D 60 60 0 0 W N
+X VCC 151 400 4150 0 D 60 60 0 0 W N
+S -850 4100 850 -4100 0 1 0 N
+X EQ0 1 -1150 -3150 300 R 60 60 1 1 B
+X AD23 2 -1150 1750 300 R 60 60 1 1 B
+X AD22 3 -1150 1850 300 R 60 60 1 1 B
+X AD21 4 -1150 1950 300 R 60 60 1 1 B
+X DQ31 5 1150 950 300 L 60 60 1 1 B
+X AD20 6 -1150 2050 300 R 60 60 1 1 B
+X AD19 7 -1150 2150 300 R 60 60 1 1 B
+X AD18 8 -1150 2250 300 R 60 60 1 1 B
+X EQ1 9 -1150 -3250 300 R 60 60 1 1 B
+X DEVSEL# 20 -1150 -650 300 R 60 60 1 1 B
+X AD9 40 -1150 3150 300 R 60 60 1 1 B
+X BE3# 60 1150 -1150 300 L 60 60 1 1 I
+X DQ12 80 1150 2850 300 L 60 60 1 1 B
+X EQ3 21 -1150 -3450 300 R 60 60 1 1 B
+X EQ6/AMREN 41 -1150 -3750 300 R 60 60 1 1 B
+X EA1 61 -1150 -1650 300 R 60 60 1 1 B
+X EA4 81 -1150 -1950 300 R 60 60 1 1 B
+X AD17 12 -1150 2350 300 R 60 60 1 1 B
+X STOP# 22 -1150 -250 300 R 60 60 1 1 B
+X AD15 32 -1150 2550 300 R 60 60 1 1 B
+X AD8 42 -1150 3250 300 R 60 60 1 1 B
+X AD3 52 -1150 3750 300 R 60 60 1 1 B
+X BE2# 62 1150 -1050 300 L 60 60 1 1 I
+X RD# 72 1150 -1550 300 L 60 60 1 1 I
+X DQ11 82 1150 2950 300 L 60 60 1 1 B
+X DQ6 92 1150 3450 300 L 60 60 1 1 B
+X DQ30 13 1150 1050 300 L 60 60 1 1 B
+X LOCK# 23 -1150 -350 300 R 60 60 1 1 I
+X EQ5/FRC# 33 -1150 -3650 300 R 60 60 1 1 B
+X C/BE0# 43 -1150 850 300 R 60 60 1 1 B
+X DQ26 53 1150 1450 300 L 60 60 1 1 B
+X BE1# 63 1150 -950 300 L 60 60 1 1 I
+X EA3 73 -1150 -1850 300 R 60 60 1 1 B
+X DQ10 83 1150 3050 300 L 60 60 1 1 B
+X DQ22 93 1150 1850 300 L 60 60 1 1 B
+X AD16 14 -1150 2450 300 R 60 60 1 1 B
+X PERR# 24 -1150 -950 300 R 60 60 1 1 B
+X AD14 34 -1150 2650 300 R 60 60 1 1 B
+X AD7 44 -1150 3350 300 R 60 60 1 1 B
+X AD2 54 -1150 3850 300 R 60 60 1 1 B
+X ADR5 64 1150 -650 300 L 60 60 1 1 I
+X WR# 74 1150 -1450 300 L 60 60 1 1 I
+X DQ9 84 1150 3150 300 L 60 60 1 1 B
+X DQ5 94 1150 3550 300 L 60 60 1 1 B
+X C/BE2# 15 -1150 650 300 R 60 60 1 1 B
+X DQ29 25 1150 1150 300 L 60 60 1 1 B
+X AD13 35 -1150 2750 300 R 60 60 1 1 B
+X DQ27 45 1150 1350 300 L 60 60 1 1 B
+X AD1 55 -1150 3950 300 R 60 60 1 1 B
+X DQ25 65 1150 1550 300 L 60 60 1 1 B
+X SELECT# 75 1150 -1350 300 L 60 60 1 1 I
+X DQ23 85 1150 1750 300 L 60 60 1 1 B
+X DQ4 95 1150 3650 300 L 60 60 1 1 B
+X FRAME# 16 -1150 50 300 R 60 60 1 1 B
+X SERR# 26 -1150 -1050 300 R 60 60 1 1 O
+X AD12 36 -1150 2850 300 R 60 60 1 1 B
+X AD6 46 -1150 3450 300 R 60 60 1 1 B
+X AD0 56 -1150 4050 300 R 60 60 1 1 B
+X ADR4 66 1150 -550 300 L 60 60 1 1 I
+X DQ15 76 1150 2550 300 L 60 60 1 1 B
+X DQ8 86 1150 3250 300 L 60 60 1 1 B
+X DQ3 96 1150 3750 300 L 60 60 1 1 B
+X EQ2 17 -1150 -3350 300 R 60 60 1 1 B
+X PAR 27 -1150 450 300 R 60 60 1 1 B
+X DQ28 37 1150 1250 300 L 60 60 1 1 B
+X AD5 47 -1150 3550 300 R 60 60 1 1 B
+X EA0 57 -1150 -1550 300 R 60 60 1 1 B
+X ADR3 67 1150 -450 300 L 60 60 1 1 I
+X DQ24 77 1150 1650 300 L 60 60 1 1 B
+X BE0# 87 1150 -850 300 L 60 60 1 1 I
+X EA6 97 -1150 -2150 300 R 60 60 1 1 B
+X IRDY# 18 -1150 -50 300 R 60 60 1 1 B
+X C/BE1# 28 -1150 750 300 R 60 60 1 1 B
+X AD11 38 -1150 2950 300 R 60 60 1 1 B
+X AD4 48 -1150 3650 300 R 60 60 1 1 B
+X INTA# 58 -1150 -1250 300 R 60 60 1 1 O
+X ADR2 68 1150 -350 300 L 60 60 1 1 I
+X DQ14 78 1150 2650 300 L 60 60 1 1 B
+X DQ7 88 1150 3350 300 L 60 60 1 1 B
+X DQ2 98 1150 3850 300 L 60 60 1 1 B
+X TRDY# 19 -1150 -150 300 R 60 60 1 1 B
+X EQ4/FWC# 29 -1150 -3550 300 R 60 60 1 1 B
+X AD10 39 -1150 3050 300 R 60 60 1 1 B
+X EQ7/AMWEN 49 -1150 -3850 300 R 60 60 1 1 B
+X MODE_16/32 59 1150 -1250 300 L 60 60 1 1 I
+X EA2 69 -1150 -1750 300 R 60 60 1 1 B
+X DQ13 79 1150 2750 300 L 60 60 1 1 B
+X EA5 89 -1150 -2050 300 R 60 60 1 1 B
+X DQ1 99 1150 3950 300 L 60 60 1 1 B
+X DQ0 100 1150 4050 300 L 60 60 1 1 B
+X PTBE3# 120 1150 150 300 L 60 60 1 1 O
+X BPCLK 140 1150 -2550 300 L 60 60 1 1 O
+X IDSEL 160 -1150 -550 300 R 60 60 1 1 I
+X EA7 101 -1150 -2250 300 R 60 60 1 1 B
+X EA10 121 -1150 -2550 300 R 60 60 1 1 O
+X EA13 141 -1150 -2850 300 R 60 60 1 1 O
+X WRFIFO# 102 1150 -1750 300 L 60 60 1 1 I
+X PTBURST# 112 1150 -150 300 L 60 60 1 1 O
+X PTNUM1 122 1150 550 300 L 60 60 1 1 O
+X ADR6 132 1150 -750 300 L 60 60 1 1 I
+X CLK 142 -1150 350 300 R 60 60 1 1 I
+X AD28 152 -1150 1250 300 R 60 60 1 1 B
+X WRFULL 103 1150 -2050 300 L 60 60 1 1 O
+X EA9 113 -1150 -2450 300 R 60 60 1 1 O
+X PTNUM0 123 1150 650 300 L 60 60 1 1 O
+X DQ18 133 1150 2250 300 L 60 60 1 1 B
+X GNT# 143 -1150 -850 300 R 60 60 1 1 I
+X EA15/FRF 153 -1150 -3050 300 R 60 60 1 1 B
+X RDFIFO# 104 1150 -1850 300 L 60 60 1 1 I
+X PTATN# 114 1150 850 300 L 60 60 1 1 O
+X IRQ# 124 1150 -2450 300 L 60 60 1 1 O
+X REQ# 144 -1150 -750 300 R 60 60 1 1 O
+X AD27 154 -1150 1350 300 R 60 60 1 1 B
+X DQ21 105 1150 1950 300 L 60 60 1 1 B
+X PTRDY# 115 1150 750 300 L 60 60 1 1 I
+X DQ19 125 1150 2150 300 L 60 60 1 1 B
+X SNV 135 1150 -2350 300 L 60 60 1 1 I
+X DQ17 145 1150 2350 300 L 60 60 1 1 B
+X AD26 155 -1150 1450 300 R 60 60 1 1 B
+X RDEMPTY 106 1150 -2150 300 L 60 60 1 1 O
+X PTBE0# 116 1150 450 300 L 60 60 1 1 O
+X SYSRST# 126 1150 -2650 300 L 60 60 1 1 O
+X AD31 146 -1150 950 300 R 60 60 1 1 B
+X AD25 156 -1150 1550 300 R 60 60 1 1 B
+X PTADR# 107 1150 50 300 L 60 60 1 1 I
+X DQ20 117 1150 2050 300 L 60 60 1 1 B
+X EWR#/SDA 127 -1150 -4050 300 R 60 60 1 1 B
+X EA12 137 -1150 -2750 300 R 60 60 1 1 O
+X AD30 147 -1150 1050 300 R 60 60 1 1 B
+X DQ16 157 1150 2450 300 L 60 60 1 1 B
+X PTWR 108 1150 -50 300 L 60 60 1 1 O
+X PTBE1# 118 1150 350 300 L 60 60 1 1 O
+X ERD#/SCL 128 -1150 -3950 300 R 60 60 1 1 O
+X FLT# 138 1150 -2250 300 L 60 60 1 1 I
+X AD29 148 -1150 1150 300 R 60 60 1 1 B
+X AD24 158 -1150 1650 300 R 60 60 1 1 B
+X EA8 109 -1150 -2350 300 R 60 60 1 1 B
+X PTBE2# 119 1150 250 300 L 60 60 1 1 O
+X EA11 129 -1150 -2650 300 R 60 60 1 1 O
+X RST# 139 -1150 250 300 R 60 60 1 1 I
+X EA14/FWE 149 -1150 -2950 300 R 60 60 1 1 B
+X C/BE3# 159 -1150 550 300 R 60 60 1 1 B
+ENDDRAW
+ENDDEF
+#
+# SIM4X32
+#
+DEF SIM4X32 U 0 40 Y Y 1 F N
+F0 "U" 0 550 70 H V C CNN
+F1 "SIM4X32" 450 -2000 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -500 -1900 500 1900 0 1 0 N
+X GND 1 -100 -1900 0 U 60 60 1 1 W N
+X DQ0 2 800 1800 300 L 60 60 1 1 T
+X DQ16 3 800 0 300 L 60 60 1 1 T
+X DQ1 4 800 1700 300 L 60 60 1 1 T
+X DQ17 5 800 -100 300 L 60 60 1 1 T
+X DQ2 6 800 1600 300 L 60 60 1 1 T
+X DQ18 7 800 -200 300 L 60 60 1 1 T
+X DQ3 8 800 1500 300 L 60 60 1 1 T
+X DQ19 9 800 -300 300 L 60 60 1 1 T
+X VCC 10 -100 1900 0 D 60 60 1 1 W N
+X DQ4 20 800 1400 300 L 60 60 1 1 T
+X VCC 30 0 1900 0 D 60 60 1 1 W N
+X CAS0 40 -800 -200 300 R 60 60 1 1 I I
+X DQ24 50 800 -900 300 L 60 60 1 1 T
+X DQ29 60 800 -1400 300 L 60 60 1 1 T
+X PRD3 70 -800 -1200 300 R 60 60 1 1 I
+X DQ20 21 800 -400 300 L 60 60 1 1 T
+X A8 31 -800 1000 300 R 60 60 1 1 I
+X CAS1 41 -800 -300 300 R 60 60 1 1 I I
+X DQ9 51 800 800 300 L 60 60 1 1 T
+X DQ13 61 800 400 300 L 60 60 1 1 T
+X A0 12 -800 1800 300 R 60 60 1 1 I
+X DQ5 22 800 1300 300 L 60 60 1 1 T
+X A9 32 -800 900 300 R 60 60 1 1 I
+X CAS2 42 -800 -400 300 R 60 60 1 1 I I
+X DQ25 52 800 -1000 300 L 60 60 1 1 T
+X DQ30 62 800 -1500 300 L 60 60 1 1 T
+X GND 72 100 -1900 0 U 60 60 1 1 W N
+X A1 13 -800 1700 300 R 60 60 1 1 I
+X DQ21 23 800 -500 300 L 60 60 1 1 T
+X CAS3 43 -800 -500 300 R 60 60 1 1 I I
+X DQ10 53 800 700 300 L 60 60 1 1 T
+X DQ14 63 800 300 300 L 60 60 1 1 T
+X A2 14 -800 1600 300 R 60 60 1 1 I
+X DQ6 24 800 1200 300 L 60 60 1 1 T
+X RAS2 34 -800 100 300 R 60 60 1 1 I I
+X RAS0 44 -800 300 300 R 60 60 1 1 I I
+X DQ26 54 800 -1100 300 L 60 60 1 1 T
+X DQ31 64 800 -1600 300 L 60 60 1 1 T
+X A3 15 -800 1500 300 R 60 60 1 1 I
+X DQ22 25 800 -600 300 L 60 60 1 1 T
+X DQ11 55 800 600 300 L 60 60 1 1 T
+X DQ15 65 800 200 300 L 60 60 1 1 T
+X A4 16 -800 1400 300 R 60 60 1 1 I
+X DQ7 26 800 1100 300 L 60 60 1 1 T
+X DQ27 56 800 -1200 300 L 60 60 1 1 T
+X A5 17 -800 1300 300 R 60 60 1 1 I
+X DQ23 27 800 -700 300 L 60 60 1 1 T
+X R/W 47 -800 -700 300 R 60 60 1 1 I
+X DQ12 57 800 500 300 L 60 60 1 1 T
+X PRD0 67 -800 -900 300 R 60 60 1 1 I
+X A6 18 -800 1200 300 R 60 60 1 1 I
+X A7 28 -800 1100 300 R 60 60 1 1 I
+X DQ28 58 800 -1300 300 L 60 60 1 1 T
+X PRD1 68 -800 -1000 300 R 60 60 1 1 I
+X A10 19 -800 800 300 R 60 60 1 1 I
+X GND 39 0 -1950 0 U 60 60 1 1 W N
+X DQ8 49 800 900 300 L 60 60 1 1 T
+X VCC 59 100 1900 0 D 60 60 1 1 W N
+X PRD2 69 -800 -1100 300 R 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# TDA8501
+#
+DEF TDA8501 U 0 30 Y Y 1 F N
+F0 "U" 350 950 60 H V C CNN
+F1 "TDA8501" 350 -850 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -600 850 600 -750 0 1 0 N
+X -R.Y 1 -900 600 300 R 60 60 1 1 I
+X MCTR 2 -900 100 300 R 60 60 1 1 I
+X -B.Y 3 -900 500 300 R 60 60 1 1 I
+X H/2 4 -900 400 300 R 60 60 1 1 B
+X Y 5 -900 300 300 R 60 60 1 1 I
+X UOFF 6 -900 200 300 R 60 60 1 1 O
+X R 7 -900 -100 300 R 60 60 1 1 I
+X VCC 8 0 1150 300 D 60 60 1 1 I
+X G 9 -900 -200 300 R 60 60 1 1 I
+X VSS 10 0 -1050 300 U 60 60 1 1 I
+X Y+SIN 20 900 700 300 L 60 60 1 1 I
+X B 11 -900 -300 300 R 60 60 1 1 I
+X B/ADJ 21 900 -200 300 L 60 60 1 1 P
+X VOFF 12 -900 -500 300 R 60 60 1 1 O
+X Y+SOUT 22 900 800 300 L 60 60 1 1 O
+X VREF 13 900 400 300 L 60 60 1 1 O
+X OSC 23 -900 -700 300 R 60 60 1 1 O
+X C/OUT 14 900 0 300 L 60 60 1 1 O
+X CS 24 -900 800 300 R 60 60 1 1 I
+X FLT 15 900 -500 300 L 60 60 1 1 P
+X CVBS 16 900 100 300 L 60 60 1 1 O
+X NTSC/PAL 17 900 -400 300 L 60 60 1 1 I
+X NOTCH 18 900 -300 300 L 60 60 1 1 I
+X Y/OUT 19 900 200 300 L 60 60 1 1 O
+ENDDRAW
+ENDDEF
+#
+# TEST
+#
+DEF TEST W 0 30 N N 1 F N
+F0 "W" 0 60 40 H V C CNN
+F1 "TEST" 0 -70 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C -70 0 30 0 1 0 N
+C 70 0 30 0 1 0 N
+X 1 1 -200 0 100 R 60 60 0 1 P
+X 2 2 200 0 100 L 60 60 0 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 V C CNN
+F3 "" 0 0 60 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
+ENDDRAW
+ENDDEF
+#
+# VSS
+#
+DEF VSS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "VSS" 0 -70 30 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  -50 0  0 -50  50 0  -50 0 N
+X VSS 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# XC1736APD8
+#
+DEF XC1736APD8 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "XC1736APD8" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -450 -450 450 450 0 1 0 N
+X DATA 1 750 150 300 L 60 60 1 1 T
+X CLK 2 -750 150 300 R 60 60 1 1 I C
+X RAZ/OE 3 -750 -50 300 R 60 60 1 1 I I
+X CE 4 -750 -250 300 R 60 60 1 1 I I
+X GND 5 -450 -450 0 U 60 60 1 1 W N
+X CEO 6 750 -150 300 L 60 60 1 1 O I
+X VPP 7 -750 350 300 R 60 60 1 1 I
+X VCC 8 -450 450 0 D 60 60 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# XC4003-VQ100
+#
+DEF XC4003-VQ100 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "XC4003-VQ100" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -650 -2350 650 2350 0 1 0 N
+X GND 1 -550 -2350 0 U 60 60 1 1 W N
+X PGCK1 2 -950 1150 300 R 60 60 1 1 P
+X P/A17 3 -950 1050 300 R 60 60 1 1 P
+X P/TDI 4 -950 950 300 R 60 60 1 1 P
+X P/TCK 5 -950 850 300 R 60 60 1 1 P
+X P/A3 6 -950 750 300 R 60 60 1 1 P
+X P7 7 -950 650 300 R 60 60 1 1 P
+X P8 8 -950 550 300 R 60 60 1 1 P
+X P/A15 9 -950 450 300 R 60 60 1 1 P
+X P/A4 10 -950 350 300 R 60 60 1 1 P
+X P20 20 -950 -550 300 R 60 60 1 1 P
+X P/LDC 30 -950 1250 300 R 60 60 1 1 P
+X P40 40 -950 -2150 300 R 60 60 1 1 P
+X DONE 50 -950 1750 300 R 60 60 1 1 C
+X P60 60 950 -750 300 L 60 60 1 1 P
+X P70 70 950 50 300 L 60 60 1 1 P
+X P80 80 950 550 300 L 60 60 1 1 P
+X P90 90 950 1350 300 L 60 60 1 1 B
+X GND 11 -450 -2350 0 U 60 60 1 1 W N
+X SGCK2 21 -950 -650 300 R 60 60 1 1 P
+X P31 31 -950 -1350 300 R 60 60 1 1 P
+X P41 41 950 -2250 300 L 60 60 1 1 P
+X VCC 51 -250 2350 0 D 60 60 1 1 W N
+X P61 61 950 -650 300 L 60 60 1 1 P
+X P71/RDY 71 950 150 300 L 60 60 1 1 P
+X P81 81 950 650 300 L 60 60 1 1 P
+X P91 91 950 1450 300 L 60 60 1 1 P
+X VCC 12 -550 2350 0 D 60 60 1 1 W N
+X M1/RD 22 -950 2150 300 R 60 60 1 1 I
+X P32 32 -950 -1450 300 R 60 60 1 1 P
+X P42 42 950 -2150 300 L 60 60 1 1 P
+X PROG 52 -950 1850 300 R 60 60 1 1 I I
+X P62 62 950 -550 300 L 60 60 1 1 P
+X DIN 72 -950 1650 300 R 60 60 1 1 P
+X P82 82 950 750 300 L 60 60 1 1 P
+X P92 92 950 1550 300 L 60 60 1 1 P
+X P13 13 -950 150 300 R 60 60 1 1 B
+X GND 23 -350 -2350 0 U 60 60 1 1 W N
+X P33 33 -950 -1550 300 R 60 60 1 1 P
+X P43 43 950 -2050 300 L 60 60 1 1 P
+X P53 53 950 -1450 300 L 60 60 1 1 B
+X VCC 63 -150 2350 0 D 60 60 1 1 W N
+X DOUT/SGCK4 73 -950 1550 300 R 60 60 1 1 P
+X P83 83 950 850 300 L 60 60 1 1 P
+X P93 93 950 1650 300 L 60 60 1 1 P
+X P14 14 -950 50 300 R 60 60 1 1 P
+X M0/RT 24 -950 2250 300 R 60 60 1 1 I
+X P34 34 -950 -1650 300 R 60 60 1 1 P
+X P44 44 950 -1950 300 L 60 60 1 1 P
+X PGCK3 54 950 -1350 300 L 60 60 1 1 B
+X GND 64 -50 -2350 0 U 60 60 1 1 W N
+X CCLK 74 -950 1450 300 R 60 60 1 1 I C
+X P84 84 950 950 300 L 60 60 1 1 P
+X P94 94 950 1750 300 L 60 60 1 1 P
+X P15 15 -950 -50 300 R 60 60 1 1 P
+X VCC 25 -450 2350 0 D 60 60 1 1 W N
+X P35 35 -950 -1750 300 R 60 60 1 1 P
+X P45 45 950 -1850 300 L 60 60 1 1 P
+X P55 55 950 -1250 300 L 60 60 1 1 P
+X P65 65 950 -450 300 L 60 60 1 1 P
+X VCC 75 -50 2350 0 D 60 60 1 1 W N
+X P85 85 950 1050 300 L 60 60 1 1 P
+X P91 95 950 1850 300 L 60 60 1 1 P
+X P16 16 -950 -150 300 R 60 60 1 1 P
+X M2 26 -950 2050 300 R 60 60 1 1 P
+X P36/INIT 36 -950 -1850 300 R 60 60 1 1 P
+X P46 46 950 -1750 300 L 60 60 1 1 P
+X P56 56 950 -1150 300 L 60 60 1 1 B
+X P66 66 950 -350 300 L 60 60 1 1 P
+X TDO 76 950 250 300 L 60 60 1 1 O
+X P86 86 950 1150 300 L 60 60 1 1 P
+X P96 96 950 1950 300 L 60 60 1 1 P
+X P17 17 -950 -250 300 R 60 60 1 1 P
+X PGCK2 27 -950 -950 300 R 60 60 1 1 P
+X VCC 37 -350 2350 0 D 60 60 1 1 W N
+X P47 47 950 -1650 300 L 60 60 1 1 P
+X P57 57 950 -1050 300 L 60 60 1 1 P
+X P67 67 950 -250 300 L 60 60 1 1 P
+X GND 77 50 -2350 0 U 60 60 1 1 W N
+X P87 87 950 1250 300 L 60 60 1 1 P
+X P97 97 950 2050 300 L 60 60 1 1 P
+X P18 18 -950 -350 300 R 60 60 1 1 P
+X P/HDC 28 -950 1350 300 R 60 60 1 1 P
+X GND 38 -250 -2350 0 U 60 60 1 1 W N
+X SGCK3 48 950 -1550 300 L 60 60 1 1 P
+X P58 58 950 -950 300 L 60 60 1 1 P
+X P68 68 950 -150 300 L 60 60 1 1 P
+X P78 78 950 350 300 L 60 60 1 1 P
+X GND 88 150 -2350 0 U 60 60 1 1 W N
+X P98 98 950 2150 300 L 60 60 1 1 B
+X P19 19 -950 -450 300 R 60 60 1 1 P
+X P29 29 -950 -1150 300 R 60 60 1 1 P
+X P39 39 -950 -2050 300 R 60 60 1 1 P
+X GND 49 -150 -2350 0 U 60 60 1 1 W N
+X P59 59 950 -850 300 L 60 60 1 1 P
+X P69 69 950 -50 300 L 60 60 1 1 P
+X PGCK4 79 950 450 300 L 60 60 1 1 P
+X VCC 89 50 2350 0 D 60 60 1 1 W N
+X SGCK1 99 950 2250 300 L 60 60 1 1 B
+X VCC 100 150 2350 0 D 60 60 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# XC4005-PQ100
+#
+DEF XC4005-PQ100 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "XC4005-PQ100" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -750 -2300 750 2300 0 1 0 N
+X P1 1 1050 2100 300 L 60 60 1 1 P
+X SGCK1 2 1050 2200 300 L 60 60 1 1 P
+X VCC 3 -400 2300 0 D 60 60 1 1 W N
+X GND 4 -400 -2300 0 U 60 60 1 1 W N
+X PGCK1 5 -1050 1000 300 R 60 60 1 1 P
+X P6 6 -1050 900 300 R 60 60 1 1 P
+X P7/TDI 7 -1050 800 300 R 60 60 1 1 P
+X P8/TCK 8 -1050 700 300 R 60 60 1 1 P
+X P9/TMS 9 -1050 600 300 R 60 60 1 1 P
+X P20 20 -1050 -200 300 R 60 60 1 1 P
+X PGCK2 30 -1050 -800 300 R 60 60 1 1 P
+X VCC 40 -100 2300 0 D 60 60 1 1 W N
+X P50 50 1050 -2000 300 L 60 60 1 1 P
+X P60 60 1050 -1200 300 L 60 60 1 1 P
+X P70 70 1050 -400 300 L 60 60 1 1 P
+X GND 80 200 -2300 0 U 60 60 1 1 W N
+X P90 90 1050 1200 300 L 60 60 1 1 P
+X P11 11 -1050 500 300 R 60 60 1 1 P
+X P21 21 -1050 -300 300 R 60 60 1 1 P
+X P31/HDC 31 -1050 1300 300 R 60 60 1 1 P
+X GND 41 -100 -2300 0 U 60 60 1 1 W N
+X SGCK3 51 1050 -1800 300 L 60 60 1 1 P
+X P61 61 1050 -1100 300 L 60 60 1 1 P
+X P71 71 1050 -300 300 L 60 60 1 1 P
+X P81 81 1050 200 300 L 60 60 1 1 P
+X GND 91 300 -2300 0 U 60 60 1 1 W N
+X P12 12 -1050 400 300 R 60 60 1 1 P
+X P22 22 -1050 -400 300 R 60 60 1 1 P
+X P32 32 -1050 -1000 300 R 60 60 1 1 P
+X P42 42 -1050 -1700 300 R 60 60 1 1 P
+X GND 52 0 -2300 0 U 60 60 1 1 W N
+X P62 62 1050 -1000 300 L 60 60 1 1 P
+X P72 72 1050 -200 300 L 60 60 1 1 P
+X PGCK4 82 1050 300 300 L 60 60 1 1 P
+X VCC 92 300 2300 0 D 60 60 1 1 W N
+X P13 13 -1050 300 300 R 60 60 1 1 P
+X P23 23 -1050 -500 300 R 60 60 1 1 P
+X P33/LDC 33 -1050 1200 300 R 60 60 1 1 P
+X P43 43 -1050 -1800 300 R 60 60 1 1 P
+X DONE 53 -1050 1800 300 R 60 60 1 1 C
+X P63 63 1050 -900 300 L 60 60 1 1 P
+X P73 73 1050 -100 300 L 60 60 1 1 P
+X P83 83 1050 500 300 L 60 60 1 1 P
+X P93 93 1050 1300 300 L 60 60 1 1 P
+X GND 14 -300 -2300 0 U 60 60 1 1 W N
+X SGCK2 24 -1050 -700 300 R 60 60 1 1 P
+X P34 34 -1050 -1100 300 R 60 60 1 1 P
+X P44 44 -1050 -1900 300 R 60 60 1 1 P
+X VCC 54 0 2300 0 D 60 60 1 1 W N
+X P64 64 1050 -800 300 L 60 60 1 1 P
+X P74/BUSY 74 1050 0 300 L 60 60 1 1 P
+X P84 84 1050 600 300 L 60 60 1 1 P
+X P94 94 1050 1400 300 L 60 60 1 1 P
+X VCC 15 -300 2300 0 D 60 60 1 1 W N
+X M1 25 -1050 2100 300 R 60 60 1 1 P
+X P35 35 -1050 -1200 300 R 60 60 1 1 P
+X P45 45 -1050 -2000 300 R 60 60 1 1 P
+X PROG 55 -1050 1900 300 R 60 60 1 1 I I
+X P65 65 1050 -700 300 L 60 60 1 1 P
+X DIN/D0 75 -1050 1700 300 R 60 60 1 1 P
+X P85 85 1050 700 300 L 60 60 1 1 P
+X P95 95 1050 1500 300 L 60 60 1 1 P
+X P16 16 -1050 200 300 R 60 60 1 1 P
+X GND 26 -200 -2300 0 U 60 60 1 1 W N
+X P36 36 -1050 -1300 300 R 60 60 1 1 P
+X P46 46 -1050 -2100 300 R 60 60 1 1 P
+X P56 56 1050 -1700 300 L 60 60 1 1 P
+X VCC 66 100 2300 0 D 60 60 1 1 W N
+X DOUT/SGCK4 76 -1050 1600 300 R 60 60 1 1 P
+X P86 86 1050 800 300 L 60 60 1 1 P
+X P96 96 1050 1600 300 L 60 60 1 1 P
+X P17 17 -1050 100 300 R 60 60 1 1 P
+X M0 27 -1050 2200 300 R 60 60 1 1 I
+X P37 37 -1050 -1400 300 R 60 60 1 1 P
+X P47 47 -1050 -2200 300 R 60 60 1 1 P
+X PGCK3 57 1050 -1600 300 L 60 60 1 1 P
+X GND 67 100 -2300 0 U 60 60 1 1 W N
+X CCLK 77 -1050 1500 300 R 60 60 1 1 I C
+X P87 87 1050 900 300 L 60 60 1 1 P
+X P97 97 1050 1700 300 L 60 60 1 1 P
+X P18 18 -1050 0 300 R 60 60 1 1 P
+X VCC 28 -200 2300 0 D 60 60 1 1 W N
+X P38 38 -1050 -1500 300 R 60 60 1 1 P
+X P48 48 1050 -2200 300 L 60 60 1 1 P
+X P58 58 1050 -1400 300 L 60 60 1 1 P
+X P68 68 1050 -600 300 L 60 60 1 1 P
+X VCC 78 200 2300 0 D 60 60 1 1 W N
+X P88 88 1050 1000 300 L 60 60 1 1 P
+X P98 98 1050 1800 300 L 60 60 1 1 P
+X P19 19 -1050 -100 300 R 60 60 1 1 P
+X M2 29 -1050 2000 300 R 60 60 1 1 I
+X P39/INIT 39 -1050 -1600 300 R 60 60 1 1 P
+X P49 49 1050 -2100 300 L 60 60 1 1 P
+X P59 59 1050 -1300 300 L 60 60 1 1 P
+X P69 69 1050 -500 300 L 60 60 1 1 P
+X TDO 79 1050 100 300 L 60 60 1 1 O
+X P89 89 1050 1100 300 L 60 60 1 1 P
+X P99 99 1050 1900 300 L 60 60 1 1 P
+X P100 100 1050 2000 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# XC4005-PQ160
+#
+DEF XC4005-PQ160 U 0 40 Y Y 1 F N
+F0 "U" 0 100 70 H V C CNN
+F1 "XC4005-PQ160" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -800 -3100 800 3100 0 1 0 N
+X GND 1 -800 -3100 0 U 60 60 1 1 W N
+X PGCK1 2 -1100 1700 300 R 60 60 1 1 B
+X P3 3 -1100 1600 300 R 60 60 1 1 P
+X P4 4 -1100 1500 300 R 60 60 1 1 P
+X P5 5 -1100 1400 300 R 60 60 1 1 P
+X TDI 6 -1100 1300 300 R 60 60 1 1 P
+X TCK 7 -1100 1200 300 R 60 60 1 1 P
+X GND 10 -700 -3100 0 U 60 60 1 1 W N
+X VCC 20 -200 3100 0 D 60 60 1 1 W N
+X M0 40 -1100 3000 300 R 60 60 1 1 I
+X VCC 60 -300 3100 0 D 60 60 1 1 W N
+X GND 70 -100 -3100 0 U 60 60 1 1 W N
+X DONE 80 -1100 2500 300 R 60 60 1 1 B
+X P11 11 -1100 1100 300 R 60 60 1 1 P
+X P21 21 -1100 300 300 R 60 60 1 1 P
+X VCC 41 -400 3100 0 D 60 60 1 1 W N
+X GND 51 -300 -3100 0 U 60 60 1 1 W N
+X GND 61 -200 -3100 0 U 60 60 1 1 W N
+X VCC 81 -100 3100 0 D 60 60 1 1 W N
+X GND 91 100 -3100 0 U 60 60 1 1 W N
+X P12 12 -1100 1000 300 R 60 60 1 1 P
+X P22 22 -1100 200 300 R 60 60 1 1 P
+X P32 32 -1100 -500 300 R 60 60 1 1 P
+X M2 42 -1100 2800 300 R 60 60 1 1 I
+X P52 52 -1100 -1500 300 R 60 60 1 1 P
+X P62 62 -1100 -2300 300 R 60 60 1 1 P
+X PROG 82 -1100 2600 300 R 60 60 1 1 I I
+X P92 92 1100 -1800 300 L 60 60 1 1 P
+X TMS 13 -1100 900 300 R 60 60 1 1 P
+X P23 23 -1100 100 300 R 60 60 1 1 P
+X P33 33 -1100 -600 300 R 60 60 1 1 P
+X PGCK2 43 -1100 -1100 300 R 60 60 1 1 P
+X P53 53 -1100 -1600 300 R 60 60 1 1 P
+X P63 63 -1100 -2400 300 R 60 60 1 1 P
+X P73 73 1100 -3000 300 L 60 60 1 1 P
+X P83 83 1100 -2400 300 L 60 60 1 1 P
+X P93 93 1100 -1700 300 L 60 60 1 1 P
+X P14 14 -1100 800 300 R 60 60 1 1 P
+X P24 24 -1100 0 300 R 60 60 1 1 P
+X P34 34 -1100 -700 300 R 60 60 1 1 P
+X HDC 44 -1100 2000 300 R 60 60 1 1 P
+X P54 54 -1100 -1700 300 R 60 60 1 1 P
+X P64 64 -1100 -2500 300 R 60 60 1 1 P
+X P74 74 1100 -2900 300 L 60 60 1 1 P
+X PGCK3 84 1100 -2300 300 L 60 60 1 1 P
+X P93 94 1100 -1600 300 L 60 60 1 1 P
+X P15 15 -1100 700 300 R 60 60 1 1 P
+X P25 25 -1100 -100 300 R 60 60 1 1 P
+X P35 35 -1100 -800 300 R 60 60 1 1 P
+X P45 45 -1100 -1200 300 R 60 60 1 1 P
+X P55 55 -1100 -1800 300 R 60 60 1 1 P
+X P65 65 -1100 -2600 300 R 60 60 1 1 P
+X P75 75 1100 -2800 300 L 60 60 1 1 P
+X P85 85 1100 -2200 300 L 60 60 1 1 P
+X P95 95 1100 -1500 300 L 60 60 1 1 P
+X P16 16 -1100 600 300 R 60 60 1 1 P
+X P26 26 -1100 -200 300 R 60 60 1 1 P
+X P36 36 -1100 -900 300 R 60 60 1 1 P
+X P46 46 -1100 -1300 300 R 60 60 1 1 P
+X P56 56 -1100 -1900 300 R 60 60 1 1 P
+X P66 66 -1100 -2700 300 R 60 60 1 1 P
+X P76 76 1100 -2700 300 L 60 60 1 1 P
+X P86 86 1100 -2100 300 L 60 60 1 1 P
+X P96 96 1100 -1400 300 L 60 60 1 1 P
+X P17 17 -1100 500 300 R 60 60 1 1 P
+X P27 27 -1100 -300 300 R 60 60 1 1 P
+X SGCK2 37 -1100 -1000 300 R 60 60 1 1 P
+X P47 47 -1100 -1400 300 R 60 60 1 1 P
+X P57 57 -1100 -2000 300 R 60 60 1 1 P
+X P67 67 -1100 -2800 300 R 60 60 1 1 P
+X P77 77 1100 -2600 300 L 60 60 1 1 P
+X P87 87 1100 -2000 300 L 60 60 1 1 P
+X P97 97 1100 -1300 300 L 60 60 1 1 P
+X P18 18 -1100 400 300 R 60 60 1 1 P
+X P28 28 -1100 -400 300 R 60 60 1 1 P
+X M1 38 -1100 2900 300 R 60 60 1 1 I
+X LDC 48 -1100 1900 300 R 60 60 1 1 P
+X P58 58 -1100 -2100 300 R 60 60 1 1 P
+X P68 68 -1100 -2900 300 R 60 60 1 1 B
+X SGCK3 78 1100 -2500 300 L 60 60 1 1 P
+X P88 88 1100 -1900 300 L 60 60 1 1 P
+X P98 98 1100 -1200 300 L 60 60 1 1 P
+X GND 19 -600 -3100 0 U 60 60 1 1 W N
+X GND 29 -500 -3100 0 U 60 60 1 1 W N
+X GND 39 -400 -3100 0 U 60 60 1 1 W N
+X P59-INIT 59 -1100 -2200 300 R 60 60 1 1 P
+X P69 69 -1100 -3000 300 R 60 60 1 1 P
+X GND 79 0 -3100 0 U 60 60 1 1 W N
+X P90 99 1100 -1100 300 L 60 60 1 1 P
+X VCC 100 0 3100 0 D 60 60 1 1 W N
+X GND 110 300 -3100 0 U 60 60 1 1 W N
+X VCC 120 100 3100 0 D 60 60 1 1 W N
+X P140 140 1100 1600 300 L 60 60 1 1 P
+X P150 150 1100 2400 300 L 60 60 1 1 P
+X VCC 160 300 3100 0 D 60 60 1 1 W N
+X GND 101 200 -3100 0 U 60 60 1 1 W N
+X TDO 121 1100 200 300 L 60 60 1 1 O
+X GND 131 500 -3100 0 U 60 60 1 1 W N
+X GND 141 600 -3100 0 U 60 60 1 1 W N
+X GND 151 700 -3100 0 U 60 60 1 1 W N
+X P102 102 1100 -1000 300 L 60 60 1 1 P
+X GND 122 400 -3100 0 U 60 60 1 1 W N
+X P132 132 1100 900 300 L 60 60 1 1 P
+X VCC 142 200 3100 0 D 60 60 1 1 W N
+X P103 103 1100 -900 300 L 60 60 1 1 P
+X P113 113 1100 -200 300 L 60 60 1 1 P
+X P123 123 1100 300 300 L 60 60 1 1 P
+X P133 133 1100 1000 300 L 60 60 1 1 P
+X P143 143 1100 1700 300 L 60 60 1 1 P
+X P104 104 1100 -800 300 L 60 60 1 1 P
+X P114-RDY 114 1100 -100 300 L 60 60 1 1 P
+X P124 124 1100 400 300 L 60 60 1 1 P
+X P134 134 1100 1100 300 L 60 60 1 1 P
+X P144 144 1100 1800 300 L 60 60 1 1 P
+X P154 154 1100 2500 300 L 60 60 1 1 P
+X P105 105 1100 -700 300 L 60 60 1 1 P
+X P115 115 1100 0 300 L 60 60 1 1 P
+X P125 125 1100 500 300 L 60 60 1 1 P
+X P135 135 1100 1200 300 L 60 60 1 1 P
+X P145 145 1100 1900 300 L 60 60 1 1 P
+X P155 155 1100 2600 300 L 60 60 1 1 P
+X P106 106 1100 -600 300 L 60 60 1 1 P
+X P116 116 1100 100 300 L 60 60 1 1 P
+X P126 126 1100 600 300 L 60 60 1 1 P
+X P146 146 1100 2000 300 L 60 60 1 1 P
+X P156 156 1100 2700 300 L 60 60 1 1 P
+X P107 107 1100 -500 300 L 60 60 1 1 P
+X DIN 117 -1100 2400 300 R 60 60 1 1 I
+X P127 127 1100 700 300 L 60 60 1 1 P
+X P137 137 1100 1300 300 L 60 60 1 1 P
+X P147 147 1100 2100 300 L 60 60 1 1 P
+X P157 157 1100 2800 300 L 60 60 1 1 P
+X P108 108 1100 -400 300 L 60 60 1 1 P
+X DOUT-SGI4 118 -1100 2300 300 R 60 60 1 1 P
+X P128 128 1100 800 300 L 60 60 1 1 P
+X P138 138 1100 1400 300 L 60 60 1 1 P
+X P148 148 1100 2200 300 L 60 60 1 1 P
+X P158 158 1100 2900 300 L 60 60 1 1 P
+X P109 109 1100 -300 300 L 60 60 1 1 P
+X CCLK 119 -1100 2200 300 R 60 60 1 1 P C
+X P139 139 1100 1500 300 L 60 60 1 1 P
+X P149 149 1100 2300 300 L 60 60 1 1 P
+X SGCK1 159 1100 3000 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/video/video.pro b/demos/video/video.pro
index b64683a744..2ffe16702c 100644
--- a/demos/video/video.pro
+++ b/demos/video/video.pro
@@ -1,4 +1,4 @@
-update=30/08/2014 10:43:23
+update=18/05/2015 09:11:22
 version=1
 last_client=kicad
 [general]
@@ -10,30 +10,6 @@ version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[eeschema]
-version=1
-LibDir=
-[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=special
-LibName13=analog_switches
-LibName14=motorola
-LibName15=intel
-LibName16=audio
-LibName17=interface
-LibName18=philips
-LibName19=cypress
-LibName20=siliconi
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -54,3 +30,9 @@ SolderMaskMinWidth=0
 DrawSegmentWidth=0.3048
 BoardOutlineThickness=0.2032
 ModuleOutlineThickness=0.3048
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=libs/video_schlib
+LibName2=power