diff --git a/demos/ecc83/ecc83-pp.brd b/demos/ecc83/ecc83-pp.brd
index 060220ceac..4804196fc8 100644
--- a/demos/ecc83/ecc83-pp.brd
+++ b/demos/ecc83/ecc83-pp.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date 14/12/2006-16:15:11
+PCBNEW-BOARD Version 1 date 27/8/2008-06:26:52
 
 $GENERAL
 LayerCount 2
@@ -16,7 +16,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet A4 11700 8267
 Title ""
-Date "14 dec 2006"
+Date "27 aug 2008"
 Rev ""
 Comp ""
 Comment1 ""
@@ -27,10 +27,11 @@ $EndSHEETDESCR
 
 $SETUP
 InternalUnit 0.000100 INCH
-GridSize 250 250
 UserGridSize 0.010000 0.010000 mm
 ZoneGridSize 250
 Layers 2
+Layer[0] Cuivre signal
+Layer[15] Composant signal
 TrackWidth 340
 TrackWidthHistory 340
 TrackClearence 60
@@ -40,6 +41,9 @@ EdgeSegmWidth 150
 ViaSize 450
 ViaDrill 250
 ViaSizeHistory 450
+MicroViaSize 200
+MicroViaDrill 80
+MicroViasAllowed 0
 TextPcbWidth 120
 TextPcbSize 600 800
 EdgeModWidth 150
@@ -55,11 +59,11 @@ Na 0 ""
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 1 "N-000004"
+Na 1 "N-000001"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 2 "N-000007"
+Na 2 "N-000004"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -67,15 +71,15 @@ Na 3 "N-000005"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 4 "N-000001"
+Na 4 "N-000007"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 5 "N-000006"
+Na 5 "N-000008"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 6 "N-000008"
+Na 6 "N-000009"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -87,7 +91,7 @@ Na 8 "GND"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 9 "N-000003"
+Na 9 "N-000006"
 St ~
 $EndEQUIPOT
 $MODULE 1pin
@@ -96,6 +100,7 @@ Li 1pin
 Cd module 1 pin (ou trou mecanique de percage)
 Kw DEV
 Sc 454CC09B
+AR 
 Op 0 0 0
 T0 0 -1200 400 400 0 120 N V 21 "1PIN"
 T1 0 1100 400 400 0 120 N I 21 "P***"
@@ -114,6 +119,7 @@ Li 1pin
 Cd module 1 pin (ou trou mecanique de percage)
 Kw DEV
 Sc 454CC096
+AR 
 Op 0 0 0
 T0 0 -1200 400 400 0 120 N V 21 "1PIN"
 T1 0 1100 400 400 0 120 N I 21 "P***"
@@ -132,6 +138,7 @@ Li 1pin
 Cd module 1 pin (ou trou mecanique de percage)
 Kw DEV
 Sc 454CC090
+AR 
 Op 0 0 0
 T0 0 -1200 400 400 0 120 N V 21 "1PIN"
 T1 0 1100 400 400 0 120 N I 21 "P***"
@@ -150,6 +157,7 @@ Li 1pin
 Cd module 1 pin (ou trou mecanique de percage)
 Kw DEV
 Sc 454CC08A
+AR 
 Op 0 0 0
 T0 0 -1200 400 400 0 120 N V 21 "1PIN"
 T1 0 1100 400 400 0 120 N I 21 "P***"
@@ -163,25 +171,26 @@ Po 0 0
 $EndPAD
 $EndMODULE  1pin
 $MODULE ECC-83-1
-Po 58750 44750 0 15 454CBC05 454A08DD ~~
+Po 58750 44750 0 15 454CBC05 48B4F266 ~~
 Li ECC-83-1
-Sc 454A08DD
+Sc 48B4F266
+AR /48B4F266
 Op 0 0 0
 T0 500 -4500 600 600 0 120 N V 21 "U1"
-T1 0 4500 600 600 0 120 N V 21 "ECC83"
+T1 0 4500 600 600 0 120 N V 21 "ECC81_83"
 DC 0 0 4000 500 150 21
 $PAD
 Sh "1" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 1 "N-000004"
+Ne 1 "N-000001"
 Po 1360 1872
 $EndPAD
 $PAD
 Sh "2" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 2 "N-000007"
+Ne 2 "N-000004"
 Po 2208 720
 $EndPAD
 $PAD
@@ -195,35 +204,35 @@ $PAD
 Sh "4" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 4 "N-000001"
+Ne 4 "N-000007"
 Po 1360 -1872
 $EndPAD
 $PAD
 Sh "5" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 4 "N-000001"
+Ne 4 "N-000007"
 Po 0 -2320
 $EndPAD
 $PAD
 Sh "6" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 5 "N-000006"
+Ne 5 "N-000008"
 Po -1360 -1872
 $EndPAD
 $PAD
 Sh "7" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 1 "N-000004"
+Ne 1 "N-000001"
 Po -2208 -720
 $EndPAD
 $PAD
 Sh "8" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 6 "N-000008"
+Ne 6 "N-000009"
 Po -2208 704
 $EndPAD
 $PAD
@@ -246,6 +255,7 @@ Li R3
 Cd Resitance 3 pas
 Kw R
 Sc 4549F39D
+AR /4549F39D
 Op 0 A 0
 T0 0 0 550 500 1800 80 N V 21 "R2"
 T1 0 0 550 500 1800 80 N I 21 "1.5K"
@@ -284,6 +294,7 @@ Li R3
 Cd Resitance 3 pas
 Kw R
 Sc 4549F3A2
+AR /4549F3A2
 Op 0 A 0
 T0 0 0 550 500 2700 80 N V 21 "R4"
 T1 0 0 550 500 2700 80 N I 21 "47K"
@@ -299,7 +310,7 @@ $PAD
 Sh "1" C 550 550 0 0 2700
 Dr 320 0 0
 At STD N 00E0FFFF
-Ne 2 "N-000007"
+Ne 2 "N-000004"
 Po -1500 0
 $EndPAD
 $PAD
@@ -322,6 +333,7 @@ Li R3
 Cd Resitance 3 pas
 Kw R
 Sc 4549F3AD
+AR /4549F3AD
 Op 0 A 0
 T0 0 0 550 500 900 80 N V 21 "R3"
 T1 0 0 550 500 900 80 N I 21 "100K"
@@ -337,7 +349,7 @@ $PAD
 Sh "1" C 550 550 0 0 900
 Dr 320 0 0
 At STD N 00E0FFFF
-Ne 9 "N-000003"
+Ne 9 "N-000006"
 Po -1500 0
 $EndPAD
 $PAD
@@ -360,6 +372,7 @@ Li R3
 Cd Resitance 3 pas
 Kw R
 Sc 4549F38A
+AR /4549F38A
 Op 0 A 0
 T0 0 0 550 500 2700 80 N V 21 "R1"
 T1 0 0 550 500 2700 80 N I 21 "1.5K"
@@ -375,14 +388,14 @@ $PAD
 Sh "1" C 550 550 0 0 2700
 Dr 320 0 0
 At STD N 00E0FFFF
-Ne 1 "N-000004"
+Ne 1 "N-000001"
 Po -1500 0
 $EndPAD
 $PAD
 Sh "2" C 550 550 0 0 2700
 Dr 320 0 0
 At STD N 00E0FFFF
-Ne 6 "N-000008"
+Ne 6 "N-000009"
 Po 1500 0
 $EndPAD
 $SHAPE3D
@@ -398,6 +411,7 @@ Li C2V10
 Cd Condensateur polarise
 Kw CP
 Sc 4549F4BE
+AR /4549F4BE
 Op 0 0 0
 T0 0 1000 500 500 900 100 N V 21 "C1"
 T1 0 -1000 500 500 900 100 N V 21 "10uF"
@@ -406,7 +420,7 @@ $PAD
 Sh "1" R 700 700 0 0 900
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 5 "N-000006"
+Ne 5 "N-000008"
 Po -1000 0
 $EndPAD
 $PAD
@@ -429,6 +443,7 @@ Li C2
 Cd Condensateur = 2 pas
 Kw C
 Sc 4549F3BE
+AR /4549F3BE
 Op 0 0 0
 T0 0 0 400 400 900 80 N V 21 "C2"
 T1 0 0 400 400 900 80 N I 21 "680nF"
@@ -441,14 +456,14 @@ $PAD
 Sh "1" C 550 550 0 0 900
 Dr 320 0 0
 At STD N 00E0FFFF
-Ne 9 "N-000003"
+Ne 9 "N-000006"
 Po -1000 0
 $EndPAD
 $PAD
 Sh "2" C 550 550 0 0 900
 Dr 320 0 0
 At STD N 00E0FFFF
-Ne 6 "N-000008"
+Ne 6 "N-000009"
 Po 1000 0
 $EndPAD
 $SHAPE3D
@@ -464,6 +479,7 @@ Li bornier2
 Cd Bornier d'alimentation 2 pins
 Kw DEV
 Sc 4549F4A5
+AR /4549F4A5
 Op 0 0 0
 T0 0 -2000 600 600 900 120 N V 21 "P3"
 T1 0 2000 600 600 900 120 N V 21 "POWER"
@@ -476,7 +492,7 @@ $PAD
 Sh "1" R 1000 1000 0 0 900
 Dr 600 0 0
 At STD N 00E0FFFF
-Ne 5 "N-000006"
+Ne 5 "N-000008"
 Po -1000 0
 $EndPAD
 $PAD
@@ -499,6 +515,7 @@ Li bornier2
 Cd Bornier d'alimentation 2 pins
 Kw DEV
 Sc 4549F464
+AR /4549F464
 Op 0 0 0
 T0 0 -2000 600 600 2700 120 N V 21 "P1"
 T1 0 2000 600 600 2700 120 N V 21 "IN"
@@ -518,7 +535,7 @@ $PAD
 Sh "2" C 1000 1000 0 0 2700
 Dr 600 0 0
 At STD N 00E0FFFF
-Ne 2 "N-000007"
+Ne 2 "N-000004"
 Po 1000 0
 $EndPAD
 $SHAPE3D
@@ -534,6 +551,7 @@ Li bornier2
 Cd Bornier d'alimentation 2 pins
 Kw DEV
 Sc 4549F46C
+AR /4549F46C
 Op 0 0 0
 T0 0 -2000 600 600 900 120 N V 21 "P2"
 T1 0 2000 600 600 900 120 N V 21 "OUT"
@@ -546,7 +564,7 @@ $PAD
 Sh "1" R 1000 1000 0 0 900
 Dr 600 0 0
 At STD N 00E0FFFF
-Ne 9 "N-000003"
+Ne 9 "N-000006"
 Po -1000 0
 $EndPAD
 $PAD
@@ -569,6 +587,7 @@ Li bornier2
 Cd Bornier d'alimentation 2 pins
 Kw DEV
 Sc 456A8ACC
+AR /456A8ACC
 Op 0 0 0
 T0 0 -2000 600 600 1800 120 N V 21 "P4"
 T1 0 2000 600 600 1800 120 N V 21 "CONN_2"
@@ -581,7 +600,7 @@ $PAD
 Sh "1" R 1000 1000 0 0 1800
 Dr 600 0 0
 At STD N 00E0FFFF
-Ne 4 "N-000001"
+Ne 4 "N-000007"
 Po -1000 0
 $EndPAD
 $PAD
@@ -651,14 +670,14 @@ Po 0 61000 47762 61000 47512 340 -1
 De 0 0 1 0 0
 Po 0 61000 47512 60110 46622 340 -1
 De 0 0 1 0 400
-Po 0 60958 45470 61970 45470 340 -1
-De 0 0 2 0 800
-Po 0 62750 46250 64750 46250 340 -1
-De 0 0 2 0 400
 Po 0 61970 45470 62750 46250 340 -1
 De 0 0 2 0 0
 Po 0 64750 46250 64750 44500 340 -1
 De 0 0 2 0 C00
+Po 0 60958 45470 61970 45470 340 -1
+De 0 0 2 0 800
+Po 0 62750 46250 64750 46250 340 -1
+De 0 0 2 0 400
 Po 0 60500 38500 62000 38500 340 -1
 De 0 0 3 0 800
 Po 0 62000 38500 62750 39250 340 -1
@@ -669,10 +688,6 @@ Po 0 62750 42000 62750 39250 340 -1
 De 0 0 3 0 0
 Po 0 60958 43792 62750 42000 340 -1
 De 0 0 3 0 0
-Po 0 59662 42430 60110 42878 340 -1
-De 0 0 4 0 400
-Po 0 58750 42430 58750 43500 340 -1
-De 0 0 4 0 800
 Po 0 59000 50750 59250 51000 340 -1
 De 0 0 4 0 400
 Po 0 59000 43750 59000 50750 340 -1
@@ -681,6 +696,10 @@ Po 0 58750 43500 59000 43750 340 -1
 De 0 0 4 0 0
 Po 0 58750 42430 59662 42430 340 -1
 De 0 0 4 0 800
+Po 0 59662 42430 60110 42878 340 -1
+De 0 0 4 0 400
+Po 0 58750 42430 58750 43500 340 -1
+De 0 0 4 0 800
 Po 0 50000 41500 52000 41500 340 -1
 De 0 0 5 0 800
 Po 0 52000 41500 53250 40250 340 -1
@@ -695,14 +714,14 @@ Po 0 54500 39750 53750 39750 340 -1
 De 0 0 5 0 800
 Po 0 53750 39750 53250 40250 340 -1
 De 0 0 5 0 0
-Po 0 53500 47000 54750 47000 340 -1
-De 0 0 6 0 800
-Po 0 56542 45454 56296 45454 340 -1
-De 0 0 6 0 800
 Po 0 56296 45454 54750 47000 340 -1
 De 0 0 6 0 0
 Po 0 53500 47000 53500 45500 340 -1
 De 0 0 6 0 C00
+Po 0 53500 47000 54750 47000 340 -1
+De 0 0 6 0 800
+Po 0 56542 45454 56296 45454 340 -1
+De 0 0 6 0 800
 Po 0 57390 50860 57250 51000 340 -1
 De 0 0 7 0 400
 Po 0 57390 46622 57390 50860 340 -1
@@ -755,14 +774,14 @@ Po 0 51000 39500 52750 37750 340 -1
 De 0 0 8 0 0
 Po 0 52750 37750 54500 37750 340 -1
 De 0 0 8 0 400
-Po 0 51250 47000 50000 47000 340 -1
-De 0 0 9 0 400
-Po 0 52000 47750 51250 47000 340 -1
-De 0 0 9 0 0
 Po 0 52000 49000 53500 49000 340 -1
 De 0 0 9 0 C00
 Po 0 52000 49000 52000 47750 340 -1
 De 0 0 9 0 800
+Po 0 51250 47000 50000 47000 340 -1
+De 0 0 9 0 400
+Po 0 52000 47750 51250 47000 340 -1
+De 0 0 9 0 0
 $EndTRACK
 $ZONE
 $EndZONE
diff --git a/demos/ecc83/ecc83-pp.cache.lib b/demos/ecc83/ecc83-pp.cache.lib
index aaef32ed5c..2ca5474a09 100644
--- a/demos/ecc83/ecc83-pp.cache.lib
+++ b/demos/ecc83/ecc83-pp.cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version  11/12/2006-20:12:43
+EESchema-LIBRARY Version  27/8/2008-06:35:46
 #
 #
 # C
@@ -7,12 +7,13 @@ DEF C C 0 10 N Y 1 F N
 F0 "C" 50 100 50 H V L C
 F1 "C" 50 -100 50 H V L C
 $FPLIST
- C?
  SM*
+ C?
+ C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 0  -100 -30  100 -30 N
-P 2 0 1 0  -100 30  100 30 N
+P 2 0 1 8  -100 -30  100 -30 N
+P 2 0 1 8  -100 30  100 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
@@ -30,52 +31,45 @@ X P1 1 -350 100 250 R 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
-# ECC83_2
+# ECC81
 #
-DEF ECC83_2 U 0 40 Y N 1 F N
-F0 "U" 100 -500 60 H V C C
-F1 "ECC83_2" 150 700 60 H V C C
+DEF ECC81 U 0 0 Y Y 3 L N
+F0 "U" 130 310 50 H V C C
+F1 "ECC81" 350 -300 50 H V C C
+F2 "VALVE-NOVAL_P" 270 -400 50 H I C C
+ALIAS ECC83
 DRAW
-C 150 -125 25 0 1 0 F
-C -150 -125 25 0 1 0 F
-P 3 0 1 0  150 0  175 0  175 0 N
-P 3 0 1 0  275 -125  175 -125  175 -125 N
-A -200 -149 100 -1794 -900 0 1 0 N -300 -150 -200 -250
-P 3 0 1 0  -200 250  200 250  200 250 N
-A -150 -150 50 -1799 -1 0 1 0 N -200 -150 -100 -150
-A 200 -149 100 -5 -900 0 1 0 N 300 -150 200 -250
-P 4 0 1 0  -350 -150  -275 -125  -175 -125  -175 -125 N
-P 3 0 1 0  -300 -150  -300 150  -300 150 N
-P 3 0 1 0  -25 0  0 0  0 0 N
-P 3 0 1 0  200 -250  -200 -250  -200 -250 N
-S 50 200 250 175 0 1 0 N
-P 3 0 1 0  300 -150  300 -150  300 -150 N
-A 199 150 100 894 0 0 1 0 N 200 250 300 150
-P 3 0 1 0  -175 0  -150 0  -150 0 N
-P 3 0 1 0  300 150  300 -150  300 -150 N
-A 150 -150 50 -1799 -1 0 1 0 N 100 -150 200 -150
-P 3 0 1 0  350 -150  275 -125  275 -125 N
-P 3 0 1 0  100 0  125 0  125 0 N
-P 5 0 1 0  -225 0  -200 0  -200 0  -200 0  -200 0 N
-P 3 0 1 0  -100 -150  50 -150  50 -150 N
-A -199 150 100 905 1800 0 1 0 N -200 250 -300 150
-S -250 200 -50 175 0 1 0 N
-P 3 0 1 0  50 -150  100 -150  100 -150 N
-P 3 0 1 0  50 0  75 0  75 0 N
-P 3 0 1 0  200 0  225 0  225 0 N
-P 3 0 1 0  -125 0  -100 0  -100 0 N
-X Anod 1 -150 500 300 D 50 50 1 1 P
-X Anod 1 -150 500 300 D 50 50 1 1 P
-X Anod 6 150 500 300 D 50 50 0 0 P
-X GRID 7 550 0 300 L 50 50 0 0 I
-X GRID 2 -550 0 300 R 50 50 1 1 I
-X GRID 2 -550 0 300 R 50 50 1 1 I
-X K 3 -350 -350 200 U 50 50 1 1 I
-X K 3 -350 -350 200 U 50 50 1 1 I
-X Heather 5 -200 -450 300 U 50 50 1 1 I
-X Heather 9 0 -450 300 U 50 50 1 1 I
-X Heather 4 200 -450 300 U 50 50 1 1 I
-X K 8 350 -350 200 U 50 50 0 0 I
+A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
+P 3 0 1 0  -200 100  -200 -100  -200 -100 N
+A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
+P 2 2 1 6  -75 0  -125 0 N
+P 2 1 0 0  0 200  0 300 N
+A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
+P 2 2 1 0  -200 0  -125 0 N
+P 2 2 1 6  75 0  125 0 N
+A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
+P 2 0 1 0  200 100  200 -100 N
+P 2 1 1 6  -75 0  -125 0 N
+P 2 1 0 0  -100 -200  -100 -300 N
+P 3 1 1 10  -100 200  110 200  110 200 N
+P 2 2 0 0  -100 -200  -100 -300 N
+P 3 2 1 10  -100 200  110 200  110 200 N
+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 2 1 6  -25 0  25 0 N
+P 2 2 0 0  0 200  0 300 N
+A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
+A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
+X A 1 0 400 100 D 40 40 2 1 O
+X A 6 0 400 100 D 40 40 1 1 O
+X G 7 -300 0 100 R 40 40 1 1 I
+X G 2 -300 0 100 R 40 40 2 1 I
+X F1 4 -100 -450 200 U 40 40 3 1 W
+X K 3 -100 -400 100 U 40 40 2 1 B
+X K 8 -100 -400 100 U 40 40 1 1 B
+X F2 9 0 -450 200 U 40 40 3 1 W
+X F1 5 100 -450 200 U 40 40 3 1 W
 ENDDRAW
 ENDDEF
 #
@@ -85,7 +79,7 @@ DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C C
 F1 "GND" 0 -70 30 H I C C
 DRAW
-P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+P 4 0 1 4  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
 ENDDRAW
 ENDDEF
@@ -113,7 +107,7 @@ $FPLIST
  SM0805
 $ENDFPLIST
 DRAW
-S -40 150 40 -150 0 1 0 N
+S -40 150 40 -150 0 1 8 N
 X ~ 1 0 250 100 D 60 60 1 1 P
 X ~ 2 0 -250 100 U 60 60 1 1 P
 ENDDRAW
diff --git a/demos/ecc83/ecc83-pp.net b/demos/ecc83/ecc83-pp.net
index e84c97540d..bdb667a9a6 100644
--- a/demos/ecc83/ecc83-pp.net
+++ b/demos/ecc83/ecc83-pp.net
@@ -1,57 +1,129 @@
-*PADS-PCB*
-*PART*
-P4 unknown
-U1 unknown
-C1 unknown
-P3 unknown
-P2 unknown
-P1 unknown
-C2 unknown
-R3 unknown
-R4 unknown
-R2 unknown
-R1 unknown
-
-*NET*
-*SIGNAL* GND
- R2.2
- R4.2
- R3.2
- P1.1
- P2.2
- P3.2
- C1.2
-*SIGNAL* N-000002
- U1.5
- U1.4
- P4.1
-*SIGNAL* N-000003
- U1.9
- P4.2
-*SIGNAL* N-000004
- P2.1
- C2.1
- R3.1
-*SIGNAL* N-000005
- U1.1
- U1.1
- R1.1
- U1.7
-*SIGNAL* N-000006
- U1.3
- R2.1
- U1.3
-*SIGNAL* N-000007
- U1.2
- U1.2
- R4.1
- P1.2
-*SIGNAL* N-000008
- P3.1
- U1.6
- C1.1
-*SIGNAL* N-000009
- C2.2
- U1.8
- R1.2
-*END*
+# EESchema Netlist Version 1.1 created  27/8/2008-06:26:11
+(
+ ( /48B4F266 VALVE-NOVAL_P  U1 ECC81_83 {Lib=ECC81_83}
+  (    1 N-000001 )
+  (    2 N-000004 )
+  (    3 N-000005 )
+  (    4 N-000007 )
+  (    5 N-000007 )
+  (    6 N-000008 )
+  (    7 N-000001 )
+  (    8 N-000009 )
+  (    9 N-000002 )
+ )
+ ( /456A8ACC $noname  P4 CONN_2 {Lib=CONN_2}
+  (    1 N-000007 )
+  (    2 N-000002 )
+ )
+ ( /4549F4BE $noname  C1 10uF {Lib=C}
+  (    1 N-000008 )
+  (    2 GND )
+ )
+ ( /4549F4A5 $noname  P3 POWER {Lib=CONN_2}
+  (    1 N-000008 )
+  (    2 GND )
+ )
+ ( /4549F46C $noname  P2 OUT {Lib=CONN_2}
+  (    1 N-000006 )
+  (    2 GND )
+ )
+ ( /4549F464 $noname  P1 IN {Lib=CONN_2}
+  (    1 GND )
+  (    2 N-000004 )
+ )
+ ( /4549F3BE $noname  C2 680nF {Lib=C}
+  (    1 N-000006 )
+  (    2 N-000009 )
+ )
+ ( /4549F3AD $noname  R3 100K {Lib=R}
+  (    1 N-000006 )
+  (    2 GND )
+ )
+ ( /4549F3A2 $noname  R4 47K {Lib=R}
+  (    1 N-000004 )
+  (    2 GND )
+ )
+ ( /4549F39D $noname  R2 1.5K {Lib=R}
+  (    1 N-000005 )
+  (    2 GND )
+ )
+ ( /4549F38A $noname  R1 1.5K {Lib=R}
+  (    1 N-000001 )
+  (    2 N-000009 )
+ )
+)
+*
+{ Allowed footprints by component:
+$component C1
+ SM*
+ C?
+ C1-1
+$endlist
+$component C2
+ SM*
+ C?
+ C1-1
+$endlist
+$component R3
+ R?
+ SM0603
+ SM0805
+$endlist
+$component R4
+ R?
+ SM0603
+ SM0805
+$endlist
+$component R2
+ R?
+ SM0603
+ SM0805
+$endlist
+$component R1
+ R?
+ SM0603
+ SM0805
+$endlist
+$endfootprintlist
+}
+{ Pin List by Nets
+Net 1 ""
+ R1 1
+ U1 7
+ U1 1
+Net 2 ""
+ P4 2
+ U1 9
+Net 3 "GND"
+ R2 2
+ R4 2
+ R3 2
+ P1 1
+ P2 2
+ P3 2
+ C1 2
+Net 4 ""
+ P1 2
+ R4 1
+ U1 2
+Net 5 ""
+ R2 1
+ U1 3
+Net 6 ""
+ P2 1
+ R3 1
+ C2 1
+Net 7 ""
+ P4 1
+ U1 4
+ U1 5
+Net 8 ""
+ P3 1
+ U1 6
+ C1 1
+Net 9 ""
+ U1 8
+ C2 2
+ R1 2
+}
+#End
diff --git a/demos/ecc83/ecc83-pp.sch b/demos/ecc83/ecc83-pp.sch
index df43fbaa85..1edce60f10 100644
--- a/demos/ecc83/ecc83-pp.sch
+++ b/demos/ecc83/ecc83-pp.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 1
+EESchema Schematic File Version 2
 LIBS:power,device,conn,valves,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,.\ecc83-pp.cache
 EELAYER 23  0
 EELAYER END
@@ -13,125 +13,151 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L GND #PWR1
-U 1 1 457DBAF8
-P 6950 5150
-F 0 "#PWR1" H 6950 5150 30  0001 C C
-F 1 "GND" H 6950 5080 30  0001 C C
-	1    6950 5150
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR2
-U 1 1 457DBAF5
-P 6700 5900
-F 0 "#PWR2" H 6700 5900 30  0001 C C
-F 1 "GND" H 6700 5830 30  0001 C C
-	1    6700 5900
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR3
-U 1 1 457DBAF1
-P 5250 5900
-F 0 "#PWR3" H 5250 5900 30  0001 C C
-F 1 "GND" H 5250 5830 30  0001 C C
-	1    5250 5900
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR4
-U 1 1 457DBAEF
-P 4850 5900
-F 0 "#PWR4" H 4850 5900 30  0001 C C
-F 1 "GND" H 4850 5830 30  0001 C C
-	1    4850 5900
-	1    0    0    -1  
-$EndComp
-Connection ~ 4550 5250
 Wire Wire Line
-	4500 5250 4550 5250
-Connection ~ 5800 5050
+	6050 4450 6150 4450
 Wire Wire Line
-	5800 5050 5400 5050
+	5750 3850 5750 4050
+Connection ~ 4450 4500
 Wire Wire Line
-	5400 5050 5400 4950
+	4450 5400 4450 4450
 Wire Wire Line
-	5600 4950 5600 5150
+	4450 4450 4650 4450
 Wire Wire Line
-	5800 5150 5800 4950
+	9850 6350 9950 6350
 Wire Wire Line
-	6700 5400 6700 4800
+	9950 6350 9950 6150
 Wire Wire Line
-	6700 4800 6950 4800
-Connection ~ 6300 4800
+	4150 5300 4150 5000
 Wire Wire Line
-	6300 4500 6300 4900
-Connection ~ 6150 3900
+	6950 5150 6950 5000
 Wire Wire Line
-	6150 4500 6150 3900
+	4150 4800 4450 4800
+Connection ~ 4450 4800
 Wire Wire Line
-	6700 4250 6950 4250
-Connection ~ 6700 3850
+	6950 4350 6950 4050
+Connection ~ 6950 4250
+Wire Wire Line
+	4850 4850 4850 5400
+Wire Wire Line
+	6300 3900 6300 4000
 Wire Wire Line
 	6950 3850 5750 3850
+Connection ~ 6700 3850
 Wire Wire Line
-	5750 3850 5750 4000
+	6700 4250 6950 4250
 Wire Wire Line
-	6300 4900 5950 4900
+	6150 4450 6150 3900
+Connection ~ 6150 3900
 Wire Wire Line
-	5950 4900 5950 4850
+	6300 4500 6300 4900
+Connection ~ 6300 4800
 Wire Wire Line
-	6300 4000 6300 3900
+	6950 4800 6700 4800
 Wire Wire Line
-	6300 3900 5450 3900
+	6700 4800 6700 5400
 Wire Wire Line
-	5450 3900 5450 4000
+	10050 6150 10050 6350
 Wire Wire Line
-	5250 4850 5250 5400
+	10050 6250 9850 6250
+Connection ~ 10050 6250
 Wire Wire Line
-	5050 4500 4850 4500
+	4100 5250 4150 5250
+Connection ~ 4150 5250
 Wire Wire Line
-	4850 4500 4850 5400
-Connection ~ 6950 4250
+	9850 6250 9850 6150
 Wire Wire Line
-	6950 4050 6950 4350
-Connection ~ 4850 4800
+	6300 3900 4950 3900
 Wire Wire Line
-	4550 4800 4850 4800
+	4950 3900 4950 4050
 Wire Wire Line
-	6950 5150 6950 5000
+	5850 4850 5850 4900
 Wire Wire Line
-	4550 5000 4550 5300
+	5850 4900 6300 4900
 $Comp
-L PWR_FLAG #FLG5
+L ECC83 U1
+U 3 1 48B4F266
+P 9950 5700
+F 0 "U1" H 10080 6010 50  0000 C C
+F 1 "ECC81_83" H 10300 5400 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 10220 5300 50  0001 C C
+	3    9950 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L ECC83 U1
+U 2 1 48B4F263
+P 4950 4450
+F 0 "U1" H 5080 4760 50  0000 C C
+F 1 "ECC83" H 5150 4100 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 5220 4050 50  0001 C C
+	2    4950 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L ECC83 U1
+U 1 1 48B4F256
+P 5750 4450
+F 0 "U1" H 5880 4760 50  0000 C C
+F 1 "ECC83" H 5500 4150 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 6020 4050 50  0001 C C
+	1    5750 4450
+	-1   0    0    -1  
+$EndComp
+$Comp
+L GND #PWR01
+U 1 1 457DBAF8
+P 6950 5150
+F 0 "#PWR01" H 6950 5150 30  0001 C C
+F 1 "GND" H 6950 5080 30  0001 C C
+	1    6950 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 457DBAF5
+P 6700 5900
+F 0 "#PWR02" H 6700 5900 30  0001 C C
+F 1 "GND" H 6700 5830 30  0001 C C
+	1    6700 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR03
+U 1 1 457DBAF1
+P 4850 5900
+F 0 "#PWR03" H 4850 5900 30  0001 C C
+F 1 "GND" H 4850 5830 30  0001 C C
+	1    4850 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR04
+U 1 1 457DBAEF
+P 4450 5900
+F 0 "#PWR04" H 4450 5900 30  0001 C C
+F 1 "GND" H 4450 5830 30  0001 C C
+	1    4450 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG05
 U 1 1 457DBAC0
-P 4500 5250
-F 0 "#FLG5" H 4500 5520 30  0001 C C
-F 1 "PWR_FLAG" H 4500 5480 30  0000 C C
-	1    4500 5250
+P 4100 5250
+F 0 "#FLG05" H 4100 5520 30  0001 C C
+F 1 "PWR_FLAG" H 4100 5480 30  0000 C C
+	1    4100 5250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_2 P4
 U 1 1 456A8ACC
-P 5700 5500
-F 0 "P4" V 5650 5500 40  0000 C C
-F 1 "CONN_2" V 5750 5500 40  0000 C C
-	1    5700 5500
+P 9950 6700
+F 0 "P4" V 9900 6700 40  0000 C C
+F 1 "CONN_2" V 10000 6700 40  0000 C C
+	1    9950 6700
 	0    1    1    0   
 $EndComp
 $Comp
-L ECC83_2 U1
-U 1 1 454A08DD
-P 5600 4500
-F 0 "U1" H 5700 4000 60  0000 C C
-F 1 "ECC83" H 5200 4850 60  0000 C C
-	1    5600 4500
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C1
 U 1 1 4549F4BE
 P 6700 4050
@@ -141,19 +167,19 @@ F 1 "10uF" H 6450 4150 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR6
+L GND #PWR06
 U 1 1 4549F4B9
-P 4550 5300
-F 0 "#PWR6" H 4550 5300 30  0001 C C
-F 1 "GND" H 4550 5230 30  0001 C C
-	1    4550 5300
+P 4150 5300
+F 0 "#PWR06" H 4150 5300 30  0001 C C
+F 1 "GND" H 4150 5230 30  0001 C C
+	1    4150 5300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR07
 U 1 1 4549F4B3
 P 6950 4350
-F 0 "#PWR7" H 6950 4350 30  0001 C C
+F 0 "#PWR07" H 6950 4350 30  0001 C C
 F 1 "GND" H 6950 4280 30  0001 C C
 	1    6950 4350
 	1    0    0    -1  
@@ -179,10 +205,10 @@ $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 4549F464
-P 4200 4900
-F 0 "P1" V 4150 4900 40  0000 C C
-F 1 "IN" V 4250 4900 40  0000 C C
-	1    4200 4900
+P 3800 4900
+F 0 "P1" V 3750 4900 40  0000 C C
+F 1 "IN" V 3850 4900 40  0000 C C
+	1    3800 4900
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -206,19 +232,19 @@ $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 4850 5650
-F 0 "R4" V 4930 5650 50  0000 C C
-F 1 "47K" V 4850 5650 50  0000 C C
-	1    4850 5650
+P 4450 5650
+F 0 "R4" V 4530 5650 50  0000 C C
+F 1 "47K" V 4450 5650 50  0000 C C
+	1    4450 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 5250 5650
-F 0 "R2" V 5330 5650 50  0000 C C
-F 1 "1.5K" V 5250 5650 50  0000 C C
-	1    5250 5650
+P 4850 5650
+F 0 "R2" V 4930 5650 50  0000 C C
+F 1 "1.5K" V 4850 5650 50  0000 C C
+	1    4850 5650
 	1    0    0    -1  
 $EndComp
 $Comp
diff --git a/demos/ecc83/ecc83-pp_v2.sch b/demos/ecc83/ecc83-pp_v2.sch
index df43fbaa85..d6309b780d 100644
--- a/demos/ecc83/ecc83-pp_v2.sch
+++ b/demos/ecc83/ecc83-pp_v2.sch
@@ -1,5 +1,5 @@
-EESchema Schematic File Version 1
-LIBS:power,device,conn,valves,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,.\ecc83-pp.cache
+EESchema Schematic File Version 2
+LIBS:power,device,valves,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib
 EELAYER 23  0
 EELAYER END
 $Descr A4 11700 8267
@@ -13,125 +13,151 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L GND #PWR1
-U 1 1 457DBAF8
-P 6950 5150
-F 0 "#PWR1" H 6950 5150 30  0001 C C
-F 1 "GND" H 6950 5080 30  0001 C C
-	1    6950 5150
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR2
-U 1 1 457DBAF5
-P 6700 5900
-F 0 "#PWR2" H 6700 5900 30  0001 C C
-F 1 "GND" H 6700 5830 30  0001 C C
-	1    6700 5900
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR3
-U 1 1 457DBAF1
-P 5250 5900
-F 0 "#PWR3" H 5250 5900 30  0001 C C
-F 1 "GND" H 5250 5830 30  0001 C C
-	1    5250 5900
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR4
-U 1 1 457DBAEF
-P 4850 5900
-F 0 "#PWR4" H 4850 5900 30  0001 C C
-F 1 "GND" H 4850 5830 30  0001 C C
-	1    4850 5900
-	1    0    0    -1  
-$EndComp
-Connection ~ 4550 5250
 Wire Wire Line
-	4500 5250 4550 5250
-Connection ~ 5800 5050
+	6050 4450 6150 4450
 Wire Wire Line
-	5800 5050 5400 5050
+	5750 3850 5750 4050
+Connection ~ 4450 4500
 Wire Wire Line
-	5400 5050 5400 4950
+	4450 5400 4450 4450
 Wire Wire Line
-	5600 4950 5600 5150
+	4450 4450 4650 4450
 Wire Wire Line
-	5800 5150 5800 4950
+	9850 6350 9950 6350
 Wire Wire Line
-	6700 5400 6700 4800
+	9950 6350 9950 6150
 Wire Wire Line
-	6700 4800 6950 4800
-Connection ~ 6300 4800
+	4150 5300 4150 5000
 Wire Wire Line
-	6300 4500 6300 4900
-Connection ~ 6150 3900
+	6950 5150 6950 5000
 Wire Wire Line
-	6150 4500 6150 3900
+	4150 4800 4450 4800
+Connection ~ 4450 4800
 Wire Wire Line
-	6700 4250 6950 4250
-Connection ~ 6700 3850
+	6950 4350 6950 4050
+Connection ~ 6950 4250
+Wire Wire Line
+	4850 4850 4850 5400
+Wire Wire Line
+	6300 3900 6300 4000
 Wire Wire Line
 	6950 3850 5750 3850
+Connection ~ 6700 3850
 Wire Wire Line
-	5750 3850 5750 4000
+	6700 4250 6950 4250
 Wire Wire Line
-	6300 4900 5950 4900
+	6150 4450 6150 3900
+Connection ~ 6150 3900
 Wire Wire Line
-	5950 4900 5950 4850
+	6300 4500 6300 4900
+Connection ~ 6300 4800
 Wire Wire Line
-	6300 4000 6300 3900
+	6950 4800 6700 4800
 Wire Wire Line
-	6300 3900 5450 3900
+	6700 4800 6700 5400
 Wire Wire Line
-	5450 3900 5450 4000
+	10050 6150 10050 6350
 Wire Wire Line
-	5250 4850 5250 5400
+	10050 6250 9850 6250
+Connection ~ 10050 6250
 Wire Wire Line
-	5050 4500 4850 4500
+	4100 5250 4150 5250
+Connection ~ 4150 5250
 Wire Wire Line
-	4850 4500 4850 5400
-Connection ~ 6950 4250
+	9850 6250 9850 6150
 Wire Wire Line
-	6950 4050 6950 4350
-Connection ~ 4850 4800
+	6300 3900 4950 3900
 Wire Wire Line
-	4550 4800 4850 4800
+	4950 3900 4950 4050
 Wire Wire Line
-	6950 5150 6950 5000
+	5850 4850 5850 4900
 Wire Wire Line
-	4550 5000 4550 5300
+	5850 4900 6300 4900
 $Comp
-L PWR_FLAG #FLG5
+L ECC83 U1
+U 3 1 48B4F266
+P 9950 5700
+F 0 "U1" H 10080 6010 50  0000 C C
+F 1 "ECC81_83" H 10300 5400 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 10220 5300 50  0001 C C
+	3    9950 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L ECC83 U1
+U 2 1 48B4F263
+P 4950 4450
+F 0 "U1" H 5080 4760 50  0000 C C
+F 1 "ECC83" H 5150 4100 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 5220 4050 50  0001 C C
+	2    4950 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L ECC83 U1
+U 1 1 48B4F256
+P 5750 4450
+F 0 "U1" H 5880 4760 50  0000 C C
+F 1 "ECC83" H 5500 4150 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 6020 4050 50  0001 C C
+	1    5750 4450
+	-1   0    0    -1  
+$EndComp
+$Comp
+L GND #PWR01
+U 1 1 457DBAF8
+P 6950 5150
+F 0 "#PWR01" H 6950 5150 30  0001 C C
+F 1 "GND" H 6950 5080 30  0001 C C
+	1    6950 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 457DBAF5
+P 6700 5900
+F 0 "#PWR02" H 6700 5900 30  0001 C C
+F 1 "GND" H 6700 5830 30  0001 C C
+	1    6700 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR03
+U 1 1 457DBAF1
+P 4850 5900
+F 0 "#PWR03" H 4850 5900 30  0001 C C
+F 1 "GND" H 4850 5830 30  0001 C C
+	1    4850 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR04
+U 1 1 457DBAEF
+P 4450 5900
+F 0 "#PWR04" H 4450 5900 30  0001 C C
+F 1 "GND" H 4450 5830 30  0001 C C
+	1    4450 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG05
 U 1 1 457DBAC0
-P 4500 5250
-F 0 "#FLG5" H 4500 5520 30  0001 C C
-F 1 "PWR_FLAG" H 4500 5480 30  0000 C C
-	1    4500 5250
+P 4100 5250
+F 0 "#FLG05" H 4100 5520 30  0001 C C
+F 1 "PWR_FLAG" H 4100 5480 30  0000 C C
+	1    4100 5250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_2 P4
 U 1 1 456A8ACC
-P 5700 5500
-F 0 "P4" V 5650 5500 40  0000 C C
-F 1 "CONN_2" V 5750 5500 40  0000 C C
-	1    5700 5500
+P 9950 6700
+F 0 "P4" V 9900 6700 40  0000 C C
+F 1 "CONN_2" V 10000 6700 40  0000 C C
+	1    9950 6700
 	0    1    1    0   
 $EndComp
 $Comp
-L ECC83_2 U1
-U 1 1 454A08DD
-P 5600 4500
-F 0 "U1" H 5700 4000 60  0000 C C
-F 1 "ECC83" H 5200 4850 60  0000 C C
-	1    5600 4500
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C1
 U 1 1 4549F4BE
 P 6700 4050
@@ -141,19 +167,19 @@ F 1 "10uF" H 6450 4150 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR6
+L GND #PWR06
 U 1 1 4549F4B9
-P 4550 5300
-F 0 "#PWR6" H 4550 5300 30  0001 C C
-F 1 "GND" H 4550 5230 30  0001 C C
-	1    4550 5300
+P 4150 5300
+F 0 "#PWR06" H 4150 5300 30  0001 C C
+F 1 "GND" H 4150 5230 30  0001 C C
+	1    4150 5300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR07
 U 1 1 4549F4B3
 P 6950 4350
-F 0 "#PWR7" H 6950 4350 30  0001 C C
+F 0 "#PWR07" H 6950 4350 30  0001 C C
 F 1 "GND" H 6950 4280 30  0001 C C
 	1    6950 4350
 	1    0    0    -1  
@@ -179,10 +205,10 @@ $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 4549F464
-P 4200 4900
-F 0 "P1" V 4150 4900 40  0000 C C
-F 1 "IN" V 4250 4900 40  0000 C C
-	1    4200 4900
+P 3800 4900
+F 0 "P1" V 3750 4900 40  0000 C C
+F 1 "IN" V 3850 4900 40  0000 C C
+	1    3800 4900
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -206,19 +232,19 @@ $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 4850 5650
-F 0 "R4" V 4930 5650 50  0000 C C
-F 1 "47K" V 4850 5650 50  0000 C C
-	1    4850 5650
+P 4450 5650
+F 0 "R4" V 4530 5650 50  0000 C C
+F 1 "47K" V 4450 5650 50  0000 C C
+	1    4450 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 5250 5650
-F 0 "R2" V 5330 5650 50  0000 C C
-F 1 "1.5K" V 5250 5650 50  0000 C C
-	1    5250 5650
+P 4850 5650
+F 0 "R2" V 4930 5650 50  0000 C C
+F 1 "1.5K" V 4850 5650 50  0000 C C
+	1    4850 5650
 	1    0    0    -1  
 $EndComp
 $Comp
diff --git a/pcbnew/plot_rtn.cpp b/pcbnew/plot_rtn.cpp
index 6ab19668fa..91e75c64e3 100644
--- a/pcbnew/plot_rtn.cpp
+++ b/pcbnew/plot_rtn.cpp
@@ -837,7 +837,7 @@ void PlotArc( int format_plot, wxPoint centre, int start_angle, int end_angle,
 
     if( IsPostScript( format_plot ) )
     {
-        PlotArcPS( centre, start_angle, end_angle, radius, 0, thickness );
+        PlotArcPS( centre, start_angle, end_angle, radius, false, thickness );
         return;
     }
 
diff --git a/pcbnew/plotps.cpp b/pcbnew/plotps.cpp
index 7df7d98556..71df033760 100644
--- a/pcbnew/plotps.cpp
+++ b/pcbnew/plotps.cpp
@@ -511,7 +511,7 @@ void trace_1_pastille_OVALE_POST( wxPoint pos, wxSize size, int orient, int mode
  */
 {
     int x0, y0, x1, y1, delta;
-    int w, rayon;
+    int thickness, rayon;
 
     // la pastille est ramenee a une pastille ovale avec dy > dx
     if( size.x > size.y )
@@ -537,14 +537,14 @@ void trace_1_pastille_OVALE_POST( wxPoint pos, wxSize size, int orient, int mode
     }
     else
     {
-        w     = g_PlotLine_Width;
-        rayon = (size.x - w) / 2;
+        thickness     = g_PlotLine_Width;
+        rayon = (size.x - thickness) / 2;
         if( rayon < 1 )
             rayon = 1;
-        if( rayon < w )
-            w = rayon;
-        PlotArcPS( wxPoint( pos.x + x1, pos.y + y1 ), -orient, -orient + 1800, rayon, 0, w);
-        PlotArcPS( wxPoint( pos.x + x0, pos.y + y0 ), -orient + 1800, -orient, rayon, 0, w );
+        if( rayon < thickness )
+            thickness = rayon;
+        PlotArcPS( wxPoint( pos.x + x1, pos.y + y1 ), -orient, -orient + 1800, rayon, false, thickness);
+        PlotArcPS( wxPoint( pos.x + x0, pos.y + y0 ), -orient + 1800, -orient, rayon, false, thickness );
 
         x0 = -rayon;
         y0 = -delta / 2;
@@ -553,7 +553,7 @@ void trace_1_pastille_OVALE_POST( wxPoint pos, wxSize size, int orient, int mode
         RotatePoint( &x0, &y0, orient );
         RotatePoint( &x1, &y1, orient );
         PlotFilledSegmentPS( wxPoint( pos.x + x0, pos.y + y0 ),
-            wxPoint( pos.x + x1, pos.y + y1 ), w );
+            wxPoint( pos.x + x1, pos.y + y1 ), thickness );
 
         x0 = rayon;
         y0 = -delta / 2;
@@ -562,7 +562,7 @@ void trace_1_pastille_OVALE_POST( wxPoint pos, wxSize size, int orient, int mode
         RotatePoint( &x0, &y0, orient );
         RotatePoint( &x1, &y1, orient );
         PlotFilledSegmentPS( wxPoint( pos.x + x0, pos.y + y0 ),
-            wxPoint( pos.x + x1, pos.y + y1 ), w );
+            wxPoint( pos.x + x1, pos.y + y1 ), thickness );
     }
 }
 
diff --git a/share/svg_print.cpp b/share/svg_print.cpp
index 3910832cb9..957a7b37dd 100644
--- a/share/svg_print.cpp
+++ b/share/svg_print.cpp
@@ -192,7 +192,7 @@ void WinEDA_PrintSVGFrame::CreateControls()
     SetFont( *g_DialogFont );
 
 ////@begin WinEDA_PrintSVGFrame content construction
-    // Generated by DialogBlocks, 23/08/2008 08:56:55 (unregistered)
+    // Generated by DialogBlocks, 27/08/2008 08:07:11 (unregistered)
 
     WinEDA_PrintSVGFrame* itemDialog1 = this;
 
@@ -240,14 +240,22 @@ void WinEDA_PrintSVGFrame::CreateControls()
     itemButton12->SetForegroundColour(wxColour(0, 0, 198));
     itemBoxSizer9->Add(itemButton12, 0, wxGROW|wxALL, 5);
 
-    wxStaticText* itemStaticText13 = new wxStaticText( itemDialog1, wxID_STATIC, _("Filename:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer2->Add(itemStaticText13, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    wxGrid* itemGrid13 = new wxGrid( itemDialog1, ID_GRID1, wxDefaultPosition, wxSize(200, 150), wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL );
+    itemGrid13->SetDefaultColSize(50);
+    itemGrid13->SetDefaultRowSize(25);
+    itemGrid13->SetColLabelSize(25);
+    itemGrid13->SetRowLabelSize(50);
+    itemGrid13->CreateGrid(5, 5, wxGrid::wxGridSelectCells);
+    itemBoxSizer3->Add(itemGrid13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("Filename:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer2->Add(itemStaticText14, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     m_FileNameCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer2->Add(m_FileNameCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
-    wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer2->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    wxStaticText* itemStaticText16 = new wxStaticText( itemDialog1, wxID_STATIC, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer2->Add(itemStaticText16, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     m_MessagesBox = new wxTextCtrl( itemDialog1, ID_TEXTCTRL1, _T(""), wxDefaultPosition, wxSize(-1, 100), wxTE_MULTILINE|wxTE_READONLY );
     itemBoxSizer2->Add(m_MessagesBox, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
diff --git a/share/svg_print.h b/share/svg_print.h
index 14c67b9d9d..61d6d6f0d1 100644
--- a/share/svg_print.h
+++ b/share/svg_print.h
@@ -24,6 +24,7 @@
 
 ////@begin includes
 #include "wx/valgen.h"
+#include "wx/grid.h"
 ////@end includes
 
 /*!
@@ -44,6 +45,7 @@ class wxBoxSizer;
 #define ID_CHECKBOX 10004
 #define ID_RADIOBOX1 10008
 #define ID_PRINT_EXECUTE 10002
+#define ID_GRID1 10003
 #define ID_TEXTCTRL 10001
 #define ID_TEXTCTRL1 10006
 #define SYMBOL_WINEDA_PRINTSVGFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT|MAYBE_RESIZE_BORDER