← Back to team overview

kicad-developers team mailing list archive

[patch] demos/ schematic tidying

 

Noticed recently that the schematics in the demos/ directory are... a little grim. We could use some tidier schematics for demos, it shows off the software better.

Here's a patch that cleans up these things:

- More consistent alignment of similar parts in a schematic - don't scatter them so much.

- More consistent placement of PWR_FLAGs - should be near power entry.

- No f-off tiny fonts in critical places where people really need to be able to read them. Refdes and values should be 50mil minimum, power labels should be 40mil minimum

- Bit of alignment in the placement of refdes/values.

- Consistently orient circuits according to positive->negative vertically and input->output horizontally

- Many of them have text in two languages. I replaced that with English

- Remove overlaps, especially between components and the recently upsized title block, and for some reason, reference designators of transistors.

- Avoid four-way junctions

- Align more consistently to a 100mil grid, not 50mil.

- Make connections with wires instead of just dropping pins on pins, as this makes it easier to drag parts.

- Added missing junction dots, removed a few extra ones.

Use it if you like.

Chris

diff --git a/demos/complex_hierarchy/ampli_ht.sch b/demos/complex_hierarchy/ampli_ht.sch
index 56b08a7..5b90872 100644
--- a/demos/complex_hierarchy/ampli_ht.sch
+++ b/demos/complex_hierarchy/ampli_ht.sch
@@ -7,13 +7,14 @@ LIBS:linear
 LIBS:regul
 LIBS:interface
 LIBS:special
-EELAYER 24 0
+LIBS:complex_hierarchy-cache
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 3
+Sheet 2 3
 Title ""
-Date "1 apr 2010"
+Date "21 mar 2015"
 Rev ""
 Comp ""
 Comment1 ""
@@ -22,28 +23,22 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	6100 6400 8900 6400
+	8900 6400 6100 6400
 Wire Wire Line
-	8900 5650 9150 5650
+	8900 5400 9100 5400
 Wire Wire Line
-	9150 5650 9150 5600
-Connection ~ 9150 4450
+	9100 5400 9100 5350
+Connection ~ 9100 4150
 Wire Wire Line
-	9150 5100 9150 4450
-Wire Wire Line
-	9700 4700 9800 4700
-Wire Wire Line
-	9800 4700 9800 4450
+	9100 4850 9100 4150
 Wire Wire Line
 	9800 4450 9700 4450
 Wire Wire Line
-	9200 4450 8600 4450
-Wire Wire Line
-	8200 4800 8050 4800
+	9800 4150 9800 4300
 Wire Wire Line
-	8050 4800 8050 4400
+	9800 4300 9800 4450
 Wire Wire Line
-	8050 4400 7900 4400
+	9800 4150 9700 4150
 Wire Wire Line
 	8100 5500 8100 5550
 Wire Wire Line
@@ -51,74 +46,77 @@ Wire Wire Line
 Wire Wire Line
 	6900 5400 7150 5400
 Wire Wire Line
-	3150 2000 2750 2000
-Connection ~ 7650 3850
+	2700 2000 2850 2000
 Wire Wire Line
-	7650 3800 7650 3900
+	2850 2000 3000 2000
+Connection ~ 7300 3300
+Wire Wire Line
+	7300 3200 7300 3300
+Wire Wire Line
+	7300 3300 7300 3350
 Wire Wire Line
 	5400 6400 5600 6400
 Wire Wire Line
 	4350 2500 4350 3000
 Connection ~ 5450 2400
 Wire Wire Line
-	5450 1600 5450 3000
+	5450 3000 5450 2400
+Wire Wire Line
+	5450 2400 5450 1600
 Wire Wire Line
 	5450 1600 4550 1600
 Wire Wire Line
-	3750 2000 3650 2000
+	3500 2000 3600 2000
 Wire Wire Line
-	7000 5100 7000 5200
+	3600 2000 3700 2000
 Wire Wire Line
-	7900 3850 7650 3850
+	7000 5100 7000 5200
 Wire Wire Line
-	8200 3550 8200 3650
-Connection ~ 8200 4250
+	7600 3300 7300 3300
 Wire Wire Line
-	8600 5100 8600 5300
+	7900 3000 7900 3100
+Connection ~ 7900 3700
 Wire Wire Line
-	8300 4250 8200 4250
+	8600 5000 8600 5300
 Wire Wire Line
-	8600 3850 8600 4050
+	8300 3700 7900 3700
 Wire Wire Line
-	8300 4900 7900 4900
+	8600 3300 8600 3500
 Wire Wire Line
-	7650 4400 7650 4450
+	7300 3850 7300 3950
 Wire Wire Line
 	7500 5100 7600 5100
 Wire Wire Line
-	1750 2200 1800 2200
+	1700 2200 1800 2200
 Wire Wire Line
 	1800 2200 1800 2250
 Wire Wire Line
-	10400 4800 10250 4800
+	10400 4500 10250 4500
 Wire Wire Line
-	10250 4800 10250 4850
+	10250 4500 10250 4550
 Wire Wire Line
 	5850 5500 5900 5500
 Wire Wire Line
-	5450 3000 4350 3000
-Wire Wire Line
-	4350 2300 4350 2000
+	4350 3000 5150 3000
 Wire Wire Line
-	4350 2000 4250 2000
+	5150 3000 5450 3000
 Wire Wire Line
-	4150 1600 3700 1600
+	4350 2000 4200 2000
 Wire Wire Line
-	3700 1600 3700 2000
-Connection ~ 3700 2000
+	4150 1600 3600 1600
 Wire Wire Line
-	4100 2250 4350 2250
-Connection ~ 4350 2250
+	3600 1600 3600 2000
+Connection ~ 3600 2000
 Wire Wire Line
-	7650 3350 7650 3400
+	7300 2700 7300 2800
 Wire Wire Line
-	2250 2000 1750 2000
+	2200 2000 1700 2000
 Wire Wire Line
 	5350 2400 5450 2400
 Wire Wire Line
 	5900 5300 5150 5300
 Wire Wire Line
-	2850 2050 2850 2000
+	2850 2100 2850 2000
 Connection ~ 2850 2000
 Wire Wire Line
 	5150 5300 5150 3000
@@ -128,97 +126,77 @@ Wire Wire Line
 Wire Wire Line
 	7900 5400 7650 5400
 Wire Wire Line
-	8100 4900 8100 5000
-Connection ~ 8100 4900
+	8100 4800 8100 5000
+Connection ~ 8100 4800
+Wire Wire Line
+	7900 3500 7900 3700
+Wire Wire Line
+	7900 3700 7900 3800
 Wire Wire Line
-	8200 4400 8200 4050
+	7900 4700 7900 4800
 Wire Wire Line
-	7900 4900 7900 4800
+	7900 4800 7900 4900
 Wire Wire Line
-	8600 4700 9200 4700
+	9800 4300 10400 4300
+Connection ~ 9800 4300
 Wire Wire Line
-	9800 4600 10400 4600
-Connection ~ 9800 4600
+	8900 4450 8900 4850
+Connection ~ 8900 4450
 Wire Wire Line
-	8900 4700 8900 5100
-Connection ~ 8900 4700
+	8900 5350 8900 5400
 Wire Wire Line
-	8900 6400 8900 5600
-Connection ~ 8900 5650
+	8900 5400 8900 6400
+Connection ~ 8900 5400
 $Comp
 L R R26
 U 1 1 4B617B88
-P 9150 5350
+P 9100 5100
 AR Path="/4B3A1333/4B617B88" Ref="R26"  Part="1" 
 AR Path="/4B3A13A4/4B617B88" Ref="R28"  Part="1" 
-F 0 "R26" V 9230 5350 50  0000 C CNN
-F 1 "220K" V 9150 5350 50  0000 C CNN
-F 2 "" H 9150 5350 60  0001 C CNN
-F 3 "" H 9150 5350 60  0001 C CNN
-F 4 "" H 9150 5350 60  0001 C CNN "Field1"
-F 5 "" H 9150 5350 60  0001 C CNN "Field2"
-F 6 "" H 9150 5350 60  0001 C CNN "Field3"
-F 7 "" H 9150 5350 60  0001 C CNN "Field4"
-F 8 "" H 9150 5350 60  0001 C CNN "Field5"
-F 9 "" H 9150 5350 60  0001 C CNN "Field6"
-F 10 "" H 9150 5350 60  0001 C CNN "Field7"
-F 11 "" H 9150 5350 60  0001 C CNN "Field8"
-	1    9150 5350
+F 0 "R28" H 9200 4850 50  0000 C CNN
+F 1 "220K" V 9100 5100 50  0000 C CNN
+F 2 "" H 9100 5100 60  0001 C CNN
+F 3 "" H 9100 5100 60  0001 C CNN
+	1    9100 5100
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R25
 U 1 1 4B616B96
-P 9450 4700
+P 9450 4450
 AR Path="/4B3A1333/4B616B96" Ref="R25"  Part="1" 
 AR Path="/4B3A13A4/4B616B96" Ref="R27"  Part="1" 
-F 0 "R25" V 9530 4700 50  0000 C CNN
-F 1 "47" V 9450 4700 50  0000 C CNN
-F 2 "" H 9450 4700 60  0001 C CNN
-F 3 "" H 9450 4700 60  0001 C CNN
-	1    9450 4700
+F 0 "R27" V 9530 4450 50  0000 C CNN
+F 1 "47" V 9450 4450 50  0000 C CNN
+F 2 "" H 9450 4450 60  0001 C CNN
+F 3 "" H 9450 4450 60  0001 C CNN
+	1    9450 4450
 	0    1    1    0   
 $EndComp
 $Comp
 L DIODE D8
 U 1 1 4B616AFA
-P 8200 4600
+P 7900 4000
 AR Path="/4B3A1333/4B616AFA" Ref="D8"  Part="1" 
 AR Path="/4B3A13A4/4B616AFA" Ref="D9"  Part="1" 
-F 0 "D8" H 8200 4700 40  0000 C CNN
-F 1 "1N4148" H 8200 4500 40  0000 C CNN
-F 2 "" H 8200 4600 60  0001 C CNN
-F 3 "" H 8200 4600 60  0001 C CNN
-F 4 "" H 8200 4600 60  0001 C CNN "Field1"
-F 5 "" H 8200 4600 60  0001 C CNN "Field2"
-F 6 "" H 8200 4600 60  0001 C CNN "Field3"
-F 7 "" H 8200 4600 60  0001 C CNN "Field4"
-F 8 "" H 8200 4600 60  0001 C CNN "Field5"
-F 9 "" H 8200 4600 60  0001 C CNN "Field6"
-F 10 "" H 8200 4600 60  0001 C CNN "Field7"
-F 11 "" H 8200 4600 60  0001 C CNN "Field8"
-	1    8200 4600
+F 0 "D9" V 7850 4200 50  0000 C CNN
+F 1 "1N4148" V 7950 4200 50  0000 C CNN
+F 2 "" H 7900 4000 60  0001 C CNN
+F 3 "" H 7900 4000 60  0001 C CNN
+	1    7900 4000
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR020
 U 1 1 4B6168A3
-P 8100 5950
+P 8100 6000
 AR Path="/4B3A13A4/4B6168A3" Ref="#PWR020"  Part="1" 
 AR Path="/4B3A1333/4B6168A3" Ref="#PWR036"  Part="1" 
-F 0 "#PWR036" H 8100 5950 30  0001 C CNN
-F 1 "GND" H 8100 5880 30  0001 C CNN
-F 2 "" H 8100 5950 60  0001 C CNN
-F 3 "" H 8100 5950 60  0001 C CNN
-F 4 "" H 8100 5950 60  0001 C CNN "Field1"
-F 5 "" H 8100 5950 60  0001 C CNN "Field2"
-F 6 "" H 8100 5950 60  0001 C CNN "Field3"
-F 7 "" H 8100 5950 60  0001 C CNN "Field4"
-F 8 "" H 8100 5950 60  0001 C CNN "Field5"
-F 9 "" H 8100 5950 60  0001 C CNN "Field6"
-F 10 "" H 8100 5950 60  0001 C CNN "Field7"
-F 11 "" H 8100 5950 60  0001 C CNN "Field8"
-	1    8100 5950
+F 0 "#PWR020" 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
+	1    8100 6000
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -227,169 +205,121 @@ U 1 1 4B61688C
 P 8100 5250
 AR Path="/4B3A1333/4B61688C" Ref="R10"  Part="1" 
 AR Path="/4B3A13A4/4B61688C" Ref="R20"  Part="1" 
-F 0 "R10" V 8180 5250 50  0000 C CNN
+F 0 "R20" V 8180 5250 50  0000 C CNN
 F 1 "5,6K" V 8100 5250 50  0000 C CNN
 F 2 "" H 8100 5250 60  0001 C CNN
 F 3 "" H 8100 5250 60  0001 C CNN
-F 4 "" H 8100 5250 60  0001 C CNN "Field1"
-F 5 "" H 8100 5250 60  0001 C CNN "Field2"
-F 6 "" H 8100 5250 60  0001 C CNN "Field3"
-F 7 "" H 8100 5250 60  0001 C CNN "Field4"
-F 8 "" H 8100 5250 60  0001 C CNN "Field5"
-F 9 "" H 8100 5250 60  0001 C CNN "Field6"
-F 10 "" H 8100 5250 60  0001 C CNN "Field7"
-F 11 "" H 8100 5250 60  0001 C CNN "Field8"
 	1    8100 5250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR037
 U 1 1 4B4F364A
-P 2850 2450
+P 2850 2550
 AR Path="/4B3A1333/4B4F364A" Ref="#PWR037"  Part="1" 
 AR Path="/4B3A13A4/4B4F364A" Ref="#PWR021"  Part="1" 
-F 0 "#PWR037" H 2850 2450 30  0001 C CNN
-F 1 "GND" H 2850 2380 30  0001 C CNN
-F 2 "" H 2850 2450 60  0001 C CNN
-F 3 "" H 2850 2450 60  0001 C CNN
-F 4 "" H 2850 2450 60  0001 C CNN "Field1"
-F 5 "" H 2850 2450 60  0001 C CNN "Field2"
-F 6 "" H 2850 2450 60  0001 C CNN "Field3"
-F 7 "" H 2850 2450 60  0001 C CNN "Field4"
-F 8 "" H 2850 2450 60  0001 C CNN "Field5"
-F 9 "" H 2850 2450 60  0001 C CNN "Field6"
-F 10 "" H 2850 2450 60  0001 C CNN "Field7"
-F 11 "" H 2850 2450 60  0001 C CNN "Field8"
-	1    2850 2450
+F 0 "#PWR021" 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
+	1    2850 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C12
 U 1 1 4B4F3641
-P 2850 2250
+P 2850 2300
 AR Path="/4B3A1333/4B4F3641" Ref="C12"  Part="1" 
 AR Path="/4B3A13A4/4B4F3641" Ref="C14"  Part="1" 
-F 0 "C12" H 2900 2350 50  0000 L CNN
-F 1 "150nF" H 2900 2150 50  0000 L CNN
-F 2 "" H 2850 2250 60  0001 C CNN
-F 3 "" H 2850 2250 60  0001 C CNN
-	1    2850 2250
+F 0 "C14" H 3000 2350 50  0000 L CNN
+F 1 "150nF" H 3000 2250 50  0000 L CNN
+F 2 "" H 2850 2300 60  0001 C CNN
+F 3 "" H 2850 2300 60  0001 C CNN
+	1    2850 2300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R23
 U 1 1 4B4F363E
-P 2500 2000
+P 2450 2000
 AR Path="/4B3A1333/4B4F363E" Ref="R23"  Part="1" 
 AR Path="/4B3A13A4/4B4F363E" Ref="R24"  Part="1" 
-F 0 "R23" V 2580 2000 50  0000 C CNN
-F 1 "1K" V 2500 2000 50  0000 C CNN
-F 2 "" H 2500 2000 60  0001 C CNN
-F 3 "" H 2500 2000 60  0001 C CNN
-F 4 "" H 2500 2000 60  0001 C CNN "Field1"
-F 5 "" H 2500 2000 60  0001 C CNN "Field2"
-F 6 "" H 2500 2000 60  0001 C CNN "Field3"
-F 7 "" H 2500 2000 60  0001 C CNN "Field4"
-F 8 "" H 2500 2000 60  0001 C CNN "Field5"
-F 9 "" H 2500 2000 60  0001 C CNN "Field6"
-F 10 "" H 2500 2000 60  0001 C CNN "Field7"
-F 11 "" H 2500 2000 60  0001 C CNN "Field8"
-	1    2500 2000
+F 0 "R24" V 2350 2000 50  0000 C CNN
+F 1 "1K" V 2450 2000 50  0000 C CNN
+F 2 "" H 2450 2000 60  0001 C CNN
+F 3 "" H 2450 2000 60  0001 C CNN
+	1    2450 2000
 	0    1    1    0   
 $EndComp
 $Comp
 L -VAA #PWR022
 U 1 1 4B4B1086
-P 6300 5800
+P 6300 5850
 AR Path="/4B3A13A4/4B4B1086" Ref="#PWR022"  Part="1" 
 AR Path="/4B3A1333/4B4B1086" Ref="#PWR038"  Part="1" 
-F 0 "#PWR038" H 6300 5900 20  0001 C CNN
-F 1 "-VAA" H 6300 5900 30  0000 C CNN
-F 2 "" H 6300 5800 60  0001 C CNN
-F 3 "" H 6300 5800 60  0001 C CNN
-	1    6300 5800
+F 0 "#PWR022" 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
+	1    6300 5850
 	-1   0    0    1   
 $EndComp
 $Comp
 L -VAA #PWR023
 U 1 1 4B4B1080
-P 4750 2800
+P 4750 2850
 AR Path="/4B3A13A4/4B4B1080" Ref="#PWR023"  Part="1" 
 AR Path="/4B3A1333/4B4B1080" Ref="#PWR039"  Part="1" 
-F 0 "#PWR039" H 4750 2900 20  0001 C CNN
-F 1 "-VAA" H 4750 2900 30  0000 C CNN
-F 2 "" H 4750 2800 60  0001 C CNN
-F 3 "" H 4750 2800 60  0001 C CNN
-	1    4750 2800
+F 0 "#PWR023" 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
+	1    4750 2850
 	-1   0    0    1   
 $EndComp
-Text Label 1800 2000 0    60   ~ 0
+Text Label 1750 2000 0    60   ~ 0
 PIEZO_IN
-Text Label 10000 4600 0    60   ~ 0
+Text Label 10000 4300 0    60   ~ 0
 PIEZO_OUT
 Text Label 5200 5300 0    60   ~ 0
 Vpil_0_3,3V
 $Comp
 L MPSA42 Q6
 U 1 1 4B3A137D
-P 8500 4250
+P 8500 3700
 AR Path="/4B3A13A4/4B3A137D" Ref="Q6"  Part="1" 
 AR Path="/4B3A1333/4B3A137D" Ref="Q2"  Part="1" 
-F 0 "Q2" H 8500 4100 50  0000 R CNN
-F 1 "MPAS42" H 8500 4400 50  0000 R CNN
-F 2 "" H 8500 4250 60  0001 C CNN
-F 3 "" H 8500 4250 60  0001 C CNN
-F 4 "" H 8500 4250 60  0001 C CNN "Field1"
-F 5 "" H 8500 4250 60  0001 C CNN "Field2"
-F 6 "" H 8500 4250 60  0001 C CNN "Field3"
-F 7 "" H 8500 4250 60  0001 C CNN "Field4"
-F 8 "" H 8500 4250 60  0001 C CNN "Field5"
-F 9 "" H 8500 4250 60  0001 C CNN "Field6"
-F 10 "" H 8500 4250 60  0001 C CNN "Field7"
-F 11 "" H 8500 4250 60  0001 C CNN "Field8"
-	1    8500 4250
+F 0 "Q6" H 8500 3950 50  0000 R CNN
+F 1 "MPAS42" H 8500 3850 50  0000 R CNN
+F 2 "" H 8500 3700 60  0001 C CNN
+F 3 "" H 8500 3700 60  0001 C CNN
+	1    8500 3700
 	1    0    0    -1  
 $EndComp
 $Comp
 L MPSA92 Q7
 U 1 1 4B3A137C
-P 8500 4900
+P 8500 4800
 AR Path="/4B3A13A4/4B3A137C" Ref="Q7"  Part="1" 
 AR Path="/4B3A1333/4B3A137C" Ref="Q3"  Part="1" 
-F 0 "Q3" H 8500 4750 60  0000 R CNN
-F 1 "MPAS92" H 8500 5050 60  0000 R CNN
-F 2 "" H 8500 4900 60  0001 C CNN
-F 3 "" H 8500 4900 60  0001 C CNN
-F 4 "" H 8500 4900 60  0001 C CNN "Field1"
-F 5 "" H 8500 4900 60  0001 C CNN "Field2"
-F 6 "" H 8500 4900 60  0001 C CNN "Field3"
-F 7 "" H 8500 4900 60  0001 C CNN "Field4"
-F 8 "" H 8500 4900 60  0001 C CNN "Field5"
-F 9 "" H 8500 4900 60  0001 C CNN "Field6"
-F 10 "" H 8500 4900 60  0001 C CNN "Field7"
-F 11 "" H 8500 4900 60  0001 C CNN "Field8"
-	1    8500 4900
+F 0 "Q7" H 8500 4650 60  0000 R CNN
+F 1 "MPAS92" H 8500 4950 60  0000 R CNN
+F 2 "" H 8500 4800 60  0001 C CNN
+F 3 "" H 8500 4800 60  0001 C CNN
+	1    8500 4800
 	1    0    0    1   
 $EndComp
 $Comp
 L DIODE D7
 U 1 1 4B3A137B
-P 7900 4600
+P 7900 4500
 AR Path="/4B3A13A4/4B3A137B" Ref="D7"  Part="1" 
 AR Path="/4B3A1333/4B3A137B" Ref="D4"  Part="1" 
-F 0 "D4" H 7900 4700 40  0000 C CNN
-F 1 "1N4148" H 7900 4500 40  0000 C CNN
-F 2 "" H 7900 4600 60  0001 C CNN
-F 3 "" H 7900 4600 60  0001 C CNN
-F 4 "" H 7900 4600 60  0001 C CNN "Field1"
-F 5 "" H 7900 4600 60  0001 C CNN "Field2"
-F 6 "" H 7900 4600 60  0001 C CNN "Field3"
-F 7 "" H 7900 4600 60  0001 C CNN "Field4"
-F 8 "" H 7900 4600 60  0001 C CNN "Field5"
-F 9 "" H 7900 4600 60  0001 C CNN "Field6"
-F 10 "" H 7900 4600 60  0001 C CNN "Field7"
-F 11 "" H 7900 4600 60  0001 C CNN "Field8"
-	1    7900 4600
+F 0 "D7" V 7850 4700 50  0000 C CNN
+F 1 "1N4148" V 7950 4700 50  0000 C CNN
+F 2 "" H 7900 4500 60  0001 C CNN
+F 3 "" H 7900 4500 60  0001 C CNN
+	1    7900 4500
 	0    1    1    0   
 $EndComp
 $Comp
@@ -398,18 +328,10 @@ 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 "#PWR040" H 8600 5300 30  0001 C CNN
+F 0 "#PWR024" 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
-F 4 "" H 8600 5300 60  0001 C CNN "Field1"
-F 5 "" H 8600 5300 60  0001 C CNN "Field2"
-F 6 "" H 8600 5300 60  0001 C CNN "Field3"
-F 7 "" H 8600 5300 60  0001 C CNN "Field4"
-F 8 "" H 8600 5300 60  0001 C CNN "Field5"
-F 9 "" H 8600 5300 60  0001 C CNN "Field6"
-F 10 "" H 8600 5300 60  0001 C CNN "Field7"
-F 11 "" H 8600 5300 60  0001 C CNN "Field8"
 	1    8600 5300
 	1    0    0    -1  
 $EndComp
@@ -419,18 +341,10 @@ U 1 1 4B3A1379
 P 7800 5100
 AR Path="/4B3A13A4/4B3A1379" Ref="Q8"  Part="1" 
 AR Path="/4B3A1333/4B3A1379" Ref="Q4"  Part="1" 
-F 0 "Q4" H 7800 4950 50  0000 R CNN
+F 0 "Q8" H 7800 4950 50  0000 R CNN
 F 1 "MPAS42" H 7800 5250 50  0000 R CNN
 F 2 "" H 7800 5100 60  0001 C CNN
 F 3 "" H 7800 5100 60  0001 C CNN
-F 4 "" H 7800 5100 60  0001 C CNN "Field1"
-F 5 "" H 7800 5100 60  0001 C CNN "Field2"
-F 6 "" H 7800 5100 60  0001 C CNN "Field3"
-F 7 "" H 7800 5100 60  0001 C CNN "Field4"
-F 8 "" H 7800 5100 60  0001 C CNN "Field5"
-F 9 "" H 7800 5100 60  0001 C CNN "Field6"
-F 10 "" H 7800 5100 60  0001 C CNN "Field7"
-F 11 "" H 7800 5100 60  0001 C CNN "Field8"
 	1    7800 5100
 	1    0    0    -1  
 $EndComp
@@ -440,124 +354,76 @@ 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 "#PWR041" H 7000 5200 30  0001 C CNN
+F 0 "#PWR025" 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
-F 4 "" H 7000 5200 60  0001 C CNN "Field1"
-F 5 "" H 7000 5200 60  0001 C CNN "Field2"
-F 6 "" H 7000 5200 60  0001 C CNN "Field3"
-F 7 "" H 7000 5200 60  0001 C CNN "Field4"
-F 8 "" H 7000 5200 60  0001 C CNN "Field5"
-F 9 "" H 7000 5200 60  0001 C CNN "Field6"
-F 10 "" H 7000 5200 60  0001 C CNN "Field7"
-F 11 "" H 7000 5200 60  0001 C CNN "Field8"
 	1    7000 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D6
 U 1 1 4B3A1377
-P 7650 3600
+P 7300 3000
 AR Path="/4B3A13A4/4B3A1377" Ref="D6"  Part="1" 
 AR Path="/4B3A1333/4B3A1377" Ref="D3"  Part="1" 
-F 0 "D3" H 7650 3700 40  0000 C CNN
-F 1 "1N4148" H 7650 3500 40  0000 C CNN
-F 2 "" H 7650 3600 60  0001 C CNN
-F 3 "" H 7650 3600 60  0001 C CNN
-F 4 "" H 7650 3600 60  0001 C CNN "Field1"
-F 5 "" H 7650 3600 60  0001 C CNN "Field2"
-F 6 "" H 7650 3600 60  0001 C CNN "Field3"
-F 7 "" H 7650 3600 60  0001 C CNN "Field4"
-F 8 "" H 7650 3600 60  0001 C CNN "Field5"
-F 9 "" H 7650 3600 60  0001 C CNN "Field6"
-F 10 "" H 7650 3600 60  0001 C CNN "Field7"
-F 11 "" H 7650 3600 60  0001 C CNN "Field8"
-	1    7650 3600
+F 0 "D6" V 7250 3200 50  0000 C CNN
+F 1 "1N4148" V 7350 3200 50  0000 C CNN
+F 2 "" H 7300 3000 60  0001 C CNN
+F 3 "" H 7300 3000 60  0001 C CNN
+	1    7300 3000
 	0    1    1    0   
 $EndComp
 $Comp
 L R R13
 U 1 1 4B3A1376
-P 8200 3300
+P 7900 2750
 AR Path="/4B3A13A4/4B3A1376" Ref="R13"  Part="1" 
 AR Path="/4B3A1333/4B3A1376" Ref="R3"  Part="1" 
-F 0 "R3" V 8280 3300 50  0000 C CNN
-F 1 "470" V 8200 3300 50  0000 C CNN
-F 2 "" H 8200 3300 60  0001 C CNN
-F 3 "" H 8200 3300 60  0001 C CNN
-F 4 "" H 8200 3300 60  0001 C CNN "Field1"
-F 5 "" H 8200 3300 60  0001 C CNN "Field2"
-F 6 "" H 8200 3300 60  0001 C CNN "Field3"
-F 7 "" H 8200 3300 60  0001 C CNN "Field4"
-F 8 "" H 8200 3300 60  0001 C CNN "Field5"
-F 9 "" H 8200 3300 60  0001 C CNN "Field6"
-F 10 "" H 8200 3300 60  0001 C CNN "Field7"
-F 11 "" H 8200 3300 60  0001 C CNN "Field8"
-	1    8200 3300
+F 0 "R13" V 7980 2750 50  0000 C CNN
+F 1 "470" V 7900 2750 50  0000 C CNN
+F 2 "" H 7900 2750 60  0001 C CNN
+F 3 "" H 7900 2750 60  0001 C CNN
+	1    7900 2750
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D5
 U 1 1 4B3A1375
-P 7650 3150
+P 7300 2500
 AR Path="/4B3A13A4/4B3A1375" Ref="D5"  Part="1" 
 AR Path="/4B3A1333/4B3A1375" Ref="D2"  Part="1" 
-F 0 "D2" H 7650 3250 40  0000 C CNN
-F 1 "1N4148" H 7650 3050 40  0000 C CNN
-F 2 "" H 7650 3150 60  0001 C CNN
-F 3 "" H 7650 3150 60  0001 C CNN
-F 4 "" H 7650 3150 60  0001 C CNN "Field1"
-F 5 "" H 7650 3150 60  0001 C CNN "Field2"
-F 6 "" H 7650 3150 60  0001 C CNN "Field3"
-F 7 "" H 7650 3150 60  0001 C CNN "Field4"
-F 8 "" H 7650 3150 60  0001 C CNN "Field5"
-F 9 "" H 7650 3150 60  0001 C CNN "Field6"
-F 10 "" H 7650 3150 60  0001 C CNN "Field7"
-F 11 "" H 7650 3150 60  0001 C CNN "Field8"
-	1    7650 3150
+F 0 "D5" V 7250 2700 50  0000 C CNN
+F 1 "1N4148" V 7350 2700 50  0000 C CNN
+F 2 "" H 7300 2500 60  0001 C CNN
+F 3 "" H 7300 2500 60  0001 C CNN
+	1    7300 2500
 	0    1    1    0   
 $EndComp
 $Comp
 L R R14
 U 1 1 4B3A1374
-P 7650 4150
+P 7300 3600
 AR Path="/4B3A13A4/4B3A1374" Ref="R14"  Part="1" 
 AR Path="/4B3A1333/4B3A1374" Ref="R4"  Part="1" 
-F 0 "R4" V 7730 4150 50  0000 C CNN
-F 1 "220K" V 7650 4150 50  0000 C CNN
-F 2 "" H 7650 4150 60  0001 C CNN
-F 3 "" H 7650 4150 60  0001 C CNN
-F 4 "" H 7650 4150 60  0001 C CNN "Field1"
-F 5 "" H 7650 4150 60  0001 C CNN "Field2"
-F 6 "" H 7650 4150 60  0001 C CNN "Field3"
-F 7 "" H 7650 4150 60  0001 C CNN "Field4"
-F 8 "" H 7650 4150 60  0001 C CNN "Field5"
-F 9 "" H 7650 4150 60  0001 C CNN "Field6"
-F 10 "" H 7650 4150 60  0001 C CNN "Field7"
-F 11 "" H 7650 4150 60  0001 C CNN "Field8"
-	1    7650 4150
+F 0 "R14" V 7380 3600 50  0000 C CNN
+F 1 "220K" V 7300 3600 50  0000 C CNN
+F 2 "" H 7300 3600 60  0001 C CNN
+F 3 "" H 7300 3600 60  0001 C CNN
+	1    7300 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR026
 U 1 1 4B3A1373
-P 7650 4450
+P 7300 3950
 AR Path="/4B3A13A4/4B3A1373" Ref="#PWR026"  Part="1" 
 AR Path="/4B3A1333/4B3A1373" Ref="#PWR042"  Part="1" 
-F 0 "#PWR042" H 7650 4450 30  0001 C CNN
-F 1 "GND" H 7650 4380 30  0001 C CNN
-F 2 "" H 7650 4450 60  0001 C CNN
-F 3 "" H 7650 4450 60  0001 C CNN
-F 4 "" H 7650 4450 60  0001 C CNN "Field1"
-F 5 "" H 7650 4450 60  0001 C CNN "Field2"
-F 6 "" H 7650 4450 60  0001 C CNN "Field3"
-F 7 "" H 7650 4450 60  0001 C CNN "Field4"
-F 8 "" H 7650 4450 60  0001 C CNN "Field5"
-F 9 "" H 7650 4450 60  0001 C CNN "Field6"
-F 10 "" H 7650 4450 60  0001 C CNN "Field7"
-F 11 "" H 7650 4450 60  0001 C CNN "Field8"
-	1    7650 4450
+F 0 "#PWR026" 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
+	1    7300 3950
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -566,61 +432,37 @@ U 1 1 4B3A1371
 P 7250 5100
 AR Path="/4B3A13A4/4B3A1371" Ref="R18"  Part="1" 
 AR Path="/4B3A1333/4B3A1371" Ref="R8"  Part="1" 
-F 0 "R8" V 7330 5100 50  0000 C CNN
+F 0 "R18" V 7150 5100 50  0000 C CNN
 F 1 "1K" V 7250 5100 50  0000 C CNN
 F 2 "" H 7250 5100 60  0001 C CNN
 F 3 "" H 7250 5100 60  0001 C CNN
-F 4 "" H 7250 5100 60  0001 C CNN "Field1"
-F 5 "" H 7250 5100 60  0001 C CNN "Field2"
-F 6 "" H 7250 5100 60  0001 C CNN "Field3"
-F 7 "" H 7250 5100 60  0001 C CNN "Field4"
-F 8 "" H 7250 5100 60  0001 C CNN "Field5"
-F 9 "" H 7250 5100 60  0001 C CNN "Field6"
-F 10 "" H 7250 5100 60  0001 C CNN "Field7"
-F 11 "" H 7250 5100 60  0001 C CNN "Field8"
 	1    7250 5100
 	0    1    1    0   
 $EndComp
 $Comp
 L R R22
 U 1 1 4B3A1370
-P 8900 5350
+P 8900 5100
 AR Path="/4B3A13A4/4B3A1370" Ref="R22"  Part="1" 
 AR Path="/4B3A1333/4B3A1370" Ref="R12"  Part="1" 
-F 0 "R12" V 8980 5350 50  0000 C CNN
-F 1 "220K" V 8900 5350 50  0000 C CNN
-F 2 "" H 8900 5350 60  0001 C CNN
-F 3 "" H 8900 5350 60  0001 C CNN
-F 4 "" H 8900 5350 60  0001 C CNN "Field1"
-F 5 "" H 8900 5350 60  0001 C CNN "Field2"
-F 6 "" H 8900 5350 60  0001 C CNN "Field3"
-F 7 "" H 8900 5350 60  0001 C CNN "Field4"
-F 8 "" H 8900 5350 60  0001 C CNN "Field5"
-F 9 "" H 8900 5350 60  0001 C CNN "Field6"
-F 10 "" H 8900 5350 60  0001 C CNN "Field7"
-F 11 "" H 8900 5350 60  0001 C CNN "Field8"
-	1    8900 5350
+F 0 "R22" H 9000 4850 50  0000 C CNN
+F 1 "220K" V 8900 5100 50  0000 C CNN
+F 2 "" H 8900 5100 60  0001 C CNN
+F 3 "" H 8900 5100 60  0001 C CNN
+	1    8900 5100
 	-1   0    0    1   
 $EndComp
 $Comp
 L +12V #U027
 U 1 1 4B3A136F
-P 6300 5000
+P 6300 4950
 AR Path="/4B3A13A4/4B3A136F" Ref="#U027"  Part="1" 
 AR Path="/4B3A1333/4B3A136F" Ref="#U043"  Part="1" 
-F 0 "#U043" H 6300 4950 20  0001 C CNN
-F 1 "+12V" H 6300 5100 30  0000 C CNN
-F 2 "" H 6300 5000 60  0001 C CNN
-F 3 "" H 6300 5000 60  0001 C CNN
-F 4 "" H 6300 5000 60  0001 C CNN "Field1"
-F 5 "" H 6300 5000 60  0001 C CNN "Field2"
-F 6 "" H 6300 5000 60  0001 C CNN "Field3"
-F 7 "" H 6300 5000 60  0001 C CNN "Field4"
-F 8 "" H 6300 5000 60  0001 C CNN "Field5"
-F 9 "" H 6300 5000 60  0001 C CNN "Field6"
-F 10 "" H 6300 5000 60  0001 C CNN "Field7"
-F 11 "" H 6300 5000 60  0001 C CNN "Field8"
-	1    6300 5000
+F 0 "#U027" 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
+	1    6300 4950
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -629,32 +471,24 @@ U 1 1 4B3A136D
 P 7400 5400
 AR Path="/4B3A13A4/4B3A136D" Ref="R19"  Part="1" 
 AR Path="/4B3A1333/4B3A136D" Ref="R9"  Part="1" 
-F 0 "R9" V 7480 5400 50  0000 C CNN
+F 0 "R19" V 7300 5400 50  0000 C CNN
 F 1 "1K" V 7400 5400 50  0000 C CNN
 F 2 "" H 7400 5400 60  0001 C CNN
 F 3 "" H 7400 5400 60  0001 C CNN
-F 4 "" H 7400 5400 60  0001 C CNN "Field1"
-F 5 "" H 7400 5400 60  0001 C CNN "Field2"
-F 6 "" H 7400 5400 60  0001 C CNN "Field3"
-F 7 "" H 7400 5400 60  0001 C CNN "Field4"
-F 8 "" H 7400 5400 60  0001 C CNN "Field5"
-F 9 "" H 7400 5400 60  0001 C CNN "Field6"
-F 10 "" H 7400 5400 60  0001 C CNN "Field7"
-F 11 "" H 7400 5400 60  0001 C CNN "Field8"
 	1    7400 5400
 	0    1    1    0   
 $EndComp
 $Comp
 L CONN_2 P5
 U 1 1 4B3A136C
-P 10750 4700
+P 10750 4400
 AR Path="/4B3A13A4/4B3A136C" Ref="P5"  Part="1" 
 AR Path="/4B3A1333/4B3A136C" Ref="P3"  Part="1" 
-F 0 "P3" V 10700 4700 40  0000 C CNN
-F 1 "CONN_2" V 10800 4700 40  0000 C CNN
-F 2 "" H 10750 4700 60  0001 C CNN
-F 3 "" H 10750 4700 60  0001 C CNN
-	1    10750 4700
+F 0 "P5" V 10700 4400 40  0000 C CNN
+F 1 "CONN_2" V 10800 4400 40  0000 C CNN
+F 2 "" H 10750 4400 60  0001 C CNN
+F 3 "" H 10750 4400 60  0001 C CNN
+	1    10750 4400
 	1    0    0    -1  
 $EndComp
 Text Label 7100 6400 0    60   ~ 0
@@ -662,22 +496,14 @@ S_OUT+
 $Comp
 L R R16
 U 1 1 4B3A136B
-P 3400 2000
+P 3250 2000
 AR Path="/4B3A13A4/4B3A136B" Ref="R16"  Part="1" 
 AR Path="/4B3A1333/4B3A136B" Ref="R6"  Part="1" 
-F 0 "R6" V 3480 2000 50  0000 C CNN
-F 1 "22K" V 3400 2000 50  0000 C CNN
-F 2 "" H 3400 2000 60  0001 C CNN
-F 3 "" H 3400 2000 60  0001 C CNN
-F 4 "" H 3400 2000 60  0001 C CNN "Field1"
-F 5 "" H 3400 2000 60  0001 C CNN "Field2"
-F 6 "" H 3400 2000 60  0001 C CNN "Field3"
-F 7 "" H 3400 2000 60  0001 C CNN "Field4"
-F 8 "" H 3400 2000 60  0001 C CNN "Field5"
-F 9 "" H 3400 2000 60  0001 C CNN "Field6"
-F 10 "" H 3400 2000 60  0001 C CNN "Field7"
-F 11 "" H 3400 2000 60  0001 C CNN "Field8"
-	1    3400 2000
+F 0 "R16" V 3150 2000 50  0000 C CNN
+F 1 "22K" V 3250 2000 50  0000 C CNN
+F 2 "" H 3250 2000 60  0001 C CNN
+F 3 "" H 3250 2000 60  0001 C CNN
+	1    3250 2000
 	0    1    1    0   
 $EndComp
 $Comp
@@ -686,40 +512,24 @@ 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 "#PWR044" H 1800 2250 30  0001 C CNN
+F 0 "#PWR028" 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
-F 4 "" H 1800 2250 60  0001 C CNN "Field1"
-F 5 "" H 1800 2250 60  0001 C CNN "Field2"
-F 6 "" H 1800 2250 60  0001 C CNN "Field3"
-F 7 "" H 1800 2250 60  0001 C CNN "Field4"
-F 8 "" H 1800 2250 60  0001 C CNN "Field5"
-F 9 "" H 1800 2250 60  0001 C CNN "Field6"
-F 10 "" H 1800 2250 60  0001 C CNN "Field7"
-F 11 "" H 1800 2250 60  0001 C CNN "Field8"
 	1    1800 2250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR029
 U 1 1 4B3A1369
-P 4100 2650
+P 4000 2850
 AR Path="/4B3A13A4/4B3A1369" Ref="#PWR029"  Part="1" 
 AR Path="/4B3A1333/4B3A1369" Ref="#PWR045"  Part="1" 
-F 0 "#PWR045" H 4100 2650 30  0001 C CNN
-F 1 "GND" H 4100 2580 30  0001 C CNN
-F 2 "" H 4100 2650 60  0001 C CNN
-F 3 "" H 4100 2650 60  0001 C CNN
-F 4 "" H 4100 2650 60  0001 C CNN "Field1"
-F 5 "" H 4100 2650 60  0001 C CNN "Field2"
-F 6 "" H 4100 2650 60  0001 C CNN "Field3"
-F 7 "" H 4100 2650 60  0001 C CNN "Field4"
-F 8 "" H 4100 2650 60  0001 C CNN "Field5"
-F 9 "" H 4100 2650 60  0001 C CNN "Field6"
-F 10 "" H 4100 2650 60  0001 C CNN "Field7"
-F 11 "" H 4100 2650 60  0001 C CNN "Field8"
-	1    4100 2650
+F 0 "#PWR029" 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
+	1    4000 2850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -728,7 +538,7 @@ U 1 1 4B3A1368
 P 6400 5400
 AR Path="/4B3A13A4/4B3A1368" Ref="U4"  Part="1" 
 AR Path="/4B3A1333/4B3A1368" Ref="U3"  Part="1" 
-F 0 "U3" H 6450 5600 60  0000 C CNN
+F 0 "U4" H 6450 5600 60  0000 C CNN
 F 1 "LM358N" H 6550 5200 50  0000 C CNN
 F 2 "" H 6400 5400 60  0001 C CNN
 F 3 "" H 6400 5400 60  0001 C CNN
@@ -738,35 +548,27 @@ $EndComp
 $Comp
 L CONN_2 P6
 U 1 1 4B3A1367
-P 1400 2100
+P 1350 2100
 AR Path="/4B3A13A4/4B3A1367" Ref="P6"  Part="1" 
 AR Path="/4B3A1333/4B3A1367" Ref="P4"  Part="1" 
-F 0 "P4" V 1350 2100 40  0000 C CNN
-F 1 "CONN_2" V 1450 2100 40  0000 C CNN
-F 2 "" H 1400 2100 60  0001 C CNN
-F 3 "" H 1400 2100 60  0001 C CNN
-F 4 "" H 1400 2100 60  0001 C CNN "Field1"
-F 5 "" H 1400 2100 60  0001 C CNN "Field2"
-F 6 "" H 1400 2100 60  0001 C CNN "Field3"
-F 7 "" H 1400 2100 60  0001 C CNN "Field4"
-F 8 "" H 1400 2100 60  0001 C CNN "Field5"
-F 9 "" H 1400 2100 60  0001 C CNN "Field6"
-F 10 "" H 1400 2100 60  0001 C CNN "Field7"
-F 11 "" H 1400 2100 60  0001 C CNN "Field8"
-	1    1400 2100
+F 0 "P6" V 1300 2100 40  0000 C CNN
+F 1 "CONN_2" V 1400 2100 40  0000 C CNN
+F 2 "" H 1350 2100 60  0001 C CNN
+F 3 "" H 1350 2100 60  0001 C CNN
+	1    1350 2100
 	-1   0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 4B3A1366
-P 4100 2450
+P 4000 2600
 AR Path="/4B3A13A4/4B3A1366" Ref="C7"  Part="1" 
 AR Path="/4B3A1333/4B3A1366" Ref="C4"  Part="1" 
-F 0 "C4" H 4150 2550 50  0000 L CNN
-F 1 "4,7nF" H 4150 2350 50  0000 L CNN
-F 2 "" H 4100 2450 60  0001 C CNN
-F 3 "" H 4100 2450 60  0001 C CNN
-	1    4100 2450
+F 0 "C7" H 4100 2700 50  0000 L CNN
+F 1 "4.7nF" H 4100 2500 50  0000 L CNN
+F 2 "" H 4000 2600 60  0001 C CNN
+F 3 "" H 4000 2600 60  0001 C CNN
+	1    4000 2600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -775,7 +577,7 @@ U 1 1 4B3A1365
 P 8100 5750
 AR Path="/4B3A13A4/4B3A1365" Ref="C8"  Part="1" 
 AR Path="/4B3A1333/4B3A1365" Ref="C5"  Part="1" 
-F 0 "C5" H 8150 5850 50  0000 L CNN
+F 0 "C8" H 8150 5850 50  0000 L CNN
 F 1 "820pF" H 8150 5650 50  0000 L CNN
 F 2 "" H 8100 5750 60  0001 C CNN
 F 3 "" H 8100 5750 60  0001 C CNN
@@ -785,27 +587,27 @@ $EndComp
 $Comp
 L R R15
 U 1 1 4B3A1364
-P 9450 4450
+P 9450 4150
 AR Path="/4B3A13A4/4B3A1364" Ref="R15"  Part="1" 
 AR Path="/4B3A1333/4B3A1364" Ref="R5"  Part="1" 
-F 0 "R5" V 9530 4450 50  0000 C CNN
-F 1 "47" V 9450 4450 50  0000 C CNN
-F 2 "" H 9450 4450 60  0001 C CNN
-F 3 "" H 9450 4450 60  0001 C CNN
-	1    9450 4450
+F 0 "R15" V 9530 4150 50  0000 C CNN
+F 1 "47" V 9450 4150 50  0000 C CNN
+F 2 "" H 9450 4150 60  0001 C CNN
+F 3 "" H 9450 4150 60  0001 C CNN
+	1    9450 4150
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR030
 U 1 1 4B3A1363
-P 10250 4850
+P 10250 4550
 AR Path="/4B3A13A4/4B3A1363" Ref="#PWR030"  Part="1" 
 AR Path="/4B3A1333/4B3A1363" Ref="#PWR046"  Part="1" 
-F 0 "#PWR046" H 10250 4850 30  0001 C CNN
-F 1 "GND" H 10250 4780 30  0001 C CNN
-F 2 "" H 10250 4850 60  0001 C CNN
-F 3 "" H 10250 4850 60  0001 C CNN
-	1    10250 4850
+F 0 "#PWR030" 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
+	1    10250 4550
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -814,100 +616,76 @@ U 1 1 4B3A1362
 P 5150 6400
 AR Path="/4B3A13A4/4B3A1362" Ref="R21"  Part="1" 
 AR Path="/4B3A1333/4B3A1362" Ref="R11"  Part="1" 
-F 0 "R11" V 5230 6400 50  0000 C CNN
+F 0 "R21" V 5050 6400 50  0000 C CNN
 F 1 "4,7K" V 5150 6400 50  0000 C CNN
 F 2 "" H 5150 6400 60  0001 C CNN
 F 3 "" H 5150 6400 60  0001 C CNN
-F 4 "" H 5150 6400 60  0001 C CNN "Field1"
-F 5 "" H 5150 6400 60  0001 C CNN "Field2"
-F 6 "" H 5150 6400 60  0001 C CNN "Field3"
-F 7 "" H 5150 6400 60  0001 C CNN "Field4"
-F 8 "" H 5150 6400 60  0001 C CNN "Field5"
-F 9 "" H 5150 6400 60  0001 C CNN "Field6"
-F 10 "" H 5150 6400 60  0001 C CNN "Field7"
-F 11 "" H 5150 6400 60  0001 C CNN "Field8"
 	1    5150 6400
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR031
 U 1 1 4B3A1361
-P 4900 6400
+P 4850 6400
 AR Path="/4B3A13A4/4B3A1361" Ref="#PWR031"  Part="1" 
 AR Path="/4B3A1333/4B3A1361" Ref="#PWR047"  Part="1" 
-F 0 "#PWR047" H 4900 6400 30  0001 C CNN
-F 1 "GND" H 4900 6330 30  0001 C CNN
-F 2 "" H 4900 6400 60  0001 C CNN
-F 3 "" H 4900 6400 60  0001 C CNN
-F 4 "" H 4900 6400 60  0001 C CNN "Field1"
-F 5 "" H 4900 6400 60  0001 C CNN "Field2"
-F 6 "" H 4900 6400 60  0001 C CNN "Field3"
-F 7 "" H 4900 6400 60  0001 C CNN "Field4"
-F 8 "" H 4900 6400 60  0001 C CNN "Field5"
-F 9 "" H 4900 6400 60  0001 C CNN "Field6"
-F 10 "" H 4900 6400 60  0001 C CNN "Field7"
-F 11 "" H 4900 6400 60  0001 C CNN "Field8"
-	1    4900 6400
+F 0 "#PWR031" 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
+	1    4850 6400
 	0    1    1    0   
 $EndComp
 $Comp
 L MPSA92 Q5
 U 1 1 4B3A1360
-P 8100 3850
+P 7800 3300
 AR Path="/4B3A13A4/4B3A1360" Ref="Q5"  Part="1" 
 AR Path="/4B3A1333/4B3A1360" Ref="Q1"  Part="1" 
-F 0 "Q1" H 8100 3700 60  0000 R CNN
-F 1 "MPAS92" H 8100 4000 60  0000 R CNN
-F 2 "" H 8100 3850 60  0001 C CNN
-F 3 "" H 8100 3850 60  0001 C CNN
-F 4 "" H 8100 3850 60  0001 C CNN "Field1"
-F 5 "" H 8100 3850 60  0001 C CNN "Field2"
-F 6 "" H 8100 3850 60  0001 C CNN "Field3"
-F 7 "" H 8100 3850 60  0001 C CNN "Field4"
-F 8 "" H 8100 3850 60  0001 C CNN "Field5"
-F 9 "" H 8100 3850 60  0001 C CNN "Field6"
-F 10 "" H 8100 3850 60  0001 C CNN "Field7"
-F 11 "" H 8100 3850 60  0001 C CNN "Field8"
-	1    8100 3850
+F 0 "Q5" H 7800 3150 60  0000 R CNN
+F 1 "MPAS92" H 7800 3450 60  0000 R CNN
+F 2 "" H 7800 3300 60  0001 C CNN
+F 3 "" H 7800 3300 60  0001 C CNN
+	1    7800 3300
 	1    0    0    1   
 $EndComp
 $Comp
 L HT #PWR032
 U 1 1 4B3A135F
-P 7650 2950
+P 7300 2250
 AR Path="/4B3A13A4/4B3A135F" Ref="#PWR032"  Part="1" 
 AR Path="/4B3A1333/4B3A135F" Ref="#PWR048"  Part="1" 
-F 0 "#PWR048" H 7650 3070 20  0001 C CNN
-F 1 "HT" H 7650 3040 30  0000 C CNN
-F 2 "" H 7650 2950 60  0001 C CNN
-F 3 "" H 7650 2950 60  0001 C CNN
-	1    7650 2950
+F 0 "#PWR032" 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
+	1    7300 2250
 	1    0    0    -1  
 $EndComp
 $Comp
 L HT #PWR033
 U 1 1 4B3A135E
-P 8200 3050
+P 7900 2450
 AR Path="/4B3A13A4/4B3A135E" Ref="#PWR033"  Part="1" 
 AR Path="/4B3A1333/4B3A135E" Ref="#PWR049"  Part="1" 
-F 0 "#PWR049" H 8200 3170 20  0001 C CNN
-F 1 "HT" H 8200 3140 30  0000 C CNN
-F 2 "" H 8200 3050 60  0001 C CNN
-F 3 "" H 8200 3050 60  0001 C CNN
-	1    8200 3050
+F 0 "#PWR033" 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
+	1    7900 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L HT #PWR034
 U 1 1 4B3A135D
-P 8600 3850
+P 8600 3300
 AR Path="/4B3A13A4/4B3A135D" Ref="#PWR034"  Part="1" 
 AR Path="/4B3A1333/4B3A135D" Ref="#PWR050"  Part="1" 
-F 0 "#PWR050" H 8600 3970 20  0001 C CNN
-F 1 "HT" H 8600 3940 30  0000 C CNN
-F 2 "" H 8600 3850 60  0001 C CNN
-F 3 "" H 8600 3850 60  0001 C CNN
-	1    8600 3850
+F 0 "#PWR034" 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
+	1    8600 3300
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -916,7 +694,7 @@ U 2 1 4B3A135C
 P 4850 2400
 AR Path="/4B3A13A4/4B3A135C" Ref="U4"  Part="2" 
 AR Path="/4B3A1333/4B3A135C" Ref="U3"  Part="2" 
-F 0 "U3" H 4900 2600 60  0000 C CNN
+F 0 "U4" H 4900 2600 60  0000 C CNN
 F 1 "LM358N" H 5000 2200 50  0000 C CNN
 F 2 "" H 4850 2400 60  0001 C CNN
 F 3 "" H 4850 2400 60  0001 C CNN
@@ -926,43 +704,27 @@ $EndComp
 $Comp
 L +12V #U035
 U 1 1 4B3A135B
-P 4750 2000
+P 4750 1950
 AR Path="/4B3A13A4/4B3A135B" Ref="#U035"  Part="1" 
 AR Path="/4B3A1333/4B3A135B" Ref="#U051"  Part="1" 
-F 0 "#U051" H 4750 1950 20  0001 C CNN
-F 1 "+12V" H 4750 2100 30  0000 C CNN
-F 2 "" H 4750 2000 60  0001 C CNN
-F 3 "" H 4750 2000 60  0001 C CNN
-F 4 "" H 4750 2000 60  0001 C CNN "Field1"
-F 5 "" H 4750 2000 60  0001 C CNN "Field2"
-F 6 "" H 4750 2000 60  0001 C CNN "Field3"
-F 7 "" H 4750 2000 60  0001 C CNN "Field4"
-F 8 "" H 4750 2000 60  0001 C CNN "Field5"
-F 9 "" H 4750 2000 60  0001 C CNN "Field6"
-F 10 "" H 4750 2000 60  0001 C CNN "Field7"
-F 11 "" H 4750 2000 60  0001 C CNN "Field8"
-	1    4750 2000
+F 0 "#U035" 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
+	1    4750 1950
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 4B3A1359
-P 4000 2000
+P 3950 2000
 AR Path="/4B3A13A4/4B3A1359" Ref="R17"  Part="1" 
 AR Path="/4B3A1333/4B3A1359" Ref="R7"  Part="1" 
-F 0 "R7" V 4080 2000 50  0000 C CNN
-F 1 "22K" V 4000 2000 50  0000 C CNN
-F 2 "" H 4000 2000 60  0001 C CNN
-F 3 "" H 4000 2000 60  0001 C CNN
-F 4 "" H 4000 2000 60  0001 C CNN "Field1"
-F 5 "" H 4000 2000 60  0001 C CNN "Field2"
-F 6 "" H 4000 2000 60  0001 C CNN "Field3"
-F 7 "" H 4000 2000 60  0001 C CNN "Field4"
-F 8 "" H 4000 2000 60  0001 C CNN "Field5"
-F 9 "" H 4000 2000 60  0001 C CNN "Field6"
-F 10 "" H 4000 2000 60  0001 C CNN "Field7"
-F 11 "" H 4000 2000 60  0001 C CNN "Field8"
-	1    4000 2000
+F 0 "R17" V 3850 2000 50  0000 C CNN
+F 1 "22K" V 3950 2000 50  0000 C CNN
+F 2 "" H 3950 2000 60  0001 C CNN
+F 3 "" H 3950 2000 60  0001 C CNN
+	1    3950 2000
 	0    1    1    0   
 $EndComp
 $Comp
@@ -971,26 +733,74 @@ U 1 1 4B3A1358
 P 4350 1600
 AR Path="/4B3A13A4/4B3A1358" Ref="C6"  Part="1" 
 AR Path="/4B3A1333/4B3A1358" Ref="C3"  Part="1" 
-F 0 "C3" H 4400 1700 50  0000 L CNN
-F 1 "15nF" H 4400 1500 50  0000 L CNN
+F 0 "C6" V 4200 1600 50  0000 C CNN
+F 1 "15nF" V 4500 1600 50  0000 C CNN
 F 2 "" H 4350 1600 60  0001 C CNN
 F 3 "" H 4350 1600 60  0001 C CNN
 	1    4350 1600
 	0    1    1    0   
 $EndComp
-Text Notes 3450 2300 0    60   ~ 0
-Filtre:\nFc =1000Hz
+Text Notes 3100 2900 0    60   ~ 0
+Filter:\nFc =1000Hz
 $Comp
 L POT RV2
 U 1 1 4B3A1357
 P 5850 6400
 AR Path="/4B3A13A4/4B3A1357" Ref="RV2"  Part="1" 
 AR Path="/4B3A1333/4B3A1357" Ref="RV1"  Part="1" 
-F 0 "RV1" H 5850 6300 50  0000 C CNN
+F 0 "RV2" H 5850 6300 50  0000 C CNN
 F 1 "4,7K" H 5850 6400 50  0000 C CNN
 F 2 "" H 5850 6400 60  0001 C CNN
 F 3 "" H 5850 6400 60  0001 C CNN
 	1    5850 6400
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	7900 4200 7900 4300
+Wire Wire Line
+	8600 4450 8900 4450
+Wire Wire Line
+	8900 4450 9200 4450
+Wire Wire Line
+	8600 4450 8600 4600
+Wire Wire Line
+	8600 4150 9100 4150
+Wire Wire Line
+	9100 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
+Wire Wire Line
+	4350 2200 4000 2200
+Wire Wire Line
+	4000 2200 4000 2400
+Connection ~ 4350 2200
+Wire Wire Line
+	4000 2850 4000 2800
+Wire Wire Line
+	4750 2850 4750 2800
+Wire Wire Line
+	4750 1950 4750 2000
+Wire Wire Line
+	7300 2300 7300 2250
+Wire Wire Line
+	7900 2450 7900 2500
+Wire Wire Line
+	8300 4800 8100 4800
+Wire Wire Line
+	8100 4800 7900 4800
+Connection ~ 7900 4800
+Wire Wire Line
+	8100 5950 8100 6000
+Wire Wire Line
+	6300 4950 6300 5000
+Wire Wire Line
+	6300 5850 6300 5800
+Wire Wire Line
+	4850 6400 4900 6400
 $EndSCHEMATC
diff --git a/demos/complex_hierarchy/complex_hierarchy.sch b/demos/complex_hierarchy/complex_hierarchy.sch
index 688a7ac..ebfc2a1 100644
--- a/demos/complex_hierarchy/complex_hierarchy.sch
+++ b/demos/complex_hierarchy/complex_hierarchy.sch
@@ -7,13 +7,14 @@ LIBS:linear
 LIBS:regul
 LIBS:interface
 LIBS:special
-EELAYER 24 0
+LIBS:complex_hierarchy-cache
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 3
 Title ""
-Date "1 apr 2010"
+Date "21 mar 2015"
 Rev ""
 Comp ""
 Comment1 ""
@@ -24,7 +25,7 @@ $EndDescr
 NoConn ~ 8800 3050
 Connection ~ 9200 2750
 Wire Wire Line
-	9200 2800 9200 2750
+	9200 2700 9200 2750
 Wire Wire Line
 	6650 2950 6650 3000
 Wire Wire Line
@@ -34,57 +35,46 @@ Wire Wire Line
 Wire Wire Line
 	7050 2850 7100 2850
 Wire Wire Line
-	9200 3200 9200 3250
-Connection ~ 2100 1100
+	9200 2300 9200 2250
+Connection ~ 2500 1300
 Wire Wire Line
-	2100 1150 2100 1050
+	8300 1300 9200 1300
 Wire Wire Line
-	7950 1200 8450 1200
-Connection ~ 1850 1100
+	2900 2500 3800 2500
 Wire Wire Line
-	2100 1100 1700 1100
+	2500 1250 2500 1350
 Wire Wire Line
-	2350 2300 3300 2300
+	3800 2500 3800 2450
 Wire Wire Line
-	1850 1050 1850 1100
+	2100 2800 2100 2700
 Wire Wire Line
-	3300 2300 3300 2250
+	2100 2700 2000 2700
 Wire Wire Line
-	2150 2700 2200 2700
+	2000 2500 2500 2500
 Wire Wire Line
-	1650 2600 1650 2500
+	3200 3000 3200 3100
 Wire Wire Line
-	1650 2500 1600 2500
+	3200 2500 3200 2600
+Connection ~ 3200 2500
 Wire Wire Line
-	1600 2300 1950 2300
+	3550 2450 3550 2500
+Connection ~ 3550 2500
 Wire Wire Line
-	2750 2750 2750 2800
+	3000 2500 3000 2450
+Connection ~ 3000 2500
 Wire Wire Line
-	2750 2300 2750 2350
-Connection ~ 2750 2300
+	7400 1250 7400 1300
 Wire Wire Line
-	2200 2700 2200 2750
+	7400 1300 7500 1300
 Wire Wire Line
-	3050 2250 3050 2300
-Connection ~ 3050 2300
+	9200 1800 9200 1850
 Wire Wire Line
-	2400 2300 2400 2250
-Connection ~ 2400 2300
+	9200 1250 9200 1400
+Connection ~ 9200 1300
 Wire Wire Line
-	7050 1150 7050 1200
+	2200 1650 2200 1750
 Wire Wire Line
-	7050 1200 7150 1200
-Wire Wire Line
-	8450 1700 8450 1750
-Wire Wire Line
-	8450 1150 8450 1300
-Connection ~ 8450 1200
-Wire Wire Line
-	1700 1300 1750 1300
-Wire Wire Line
-	1750 1300 1750 1400
-Wire Wire Line
-	2100 1550 2100 1600
+	2500 1750 2500 1800
 Wire Wire Line
 	6650 2550 6650 2500
 Wire Wire Line
@@ -99,58 +89,34 @@ $Comp
 L CP C10
 U 1 1 4B4B15E7
 P 6650 2750
-F 0 "C10" H 6700 2850 50  0000 L CNN
-F 1 "10uF" H 6750 2650 50  0000 L TNN
+F 0 "C10" H 6800 2800 50  0000 L CNN
+F 1 "10uF" H 6800 2750 50  0000 L TNN
 F 2 "" H 6650 2750 60  0001 C CNN
 F 3 "" H 6650 2750 60  0001 C CNN
-F 4 "" H 6650 2750 60  0001 C CNN "Field1"
-F 5 "" H 6650 2750 60  0001 C CNN "Field2"
-F 6 "" H 6650 2750 60  0001 C CNN "Field3"
-F 7 "" H 6650 2750 60  0001 C CNN "Field4"
-F 8 "" H 6650 2750 60  0001 C CNN "Field5"
-F 9 "" H 6650 2750 60  0001 C CNN "Field6"
-F 10 "" H 6650 2750 60  0001 C CNN "Field7"
-F 11 "" H 6650 2750 60  0001 C CNN "Field8"
 	1    6650 2750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR01
 U 1 1 4B4B15DA
-P 9200 3250
-F 0 "#PWR01" H 9200 3250 30  0001 C CNN
-F 1 "GND" H 9200 3180 30  0001 C CNN
-F 2 "" H 9200 3250 60  0001 C CNN
-F 3 "" H 9200 3250 60  0001 C CNN
-F 4 "" H 9200 3250 60  0001 C CNN "Field1"
-F 5 "" H 9200 3250 60  0001 C CNN "Field2"
-F 6 "" H 9200 3250 60  0001 C CNN "Field3"
-F 7 "" H 9200 3250 60  0001 C CNN "Field4"
-F 8 "" H 9200 3250 60  0001 C CNN "Field5"
-F 9 "" H 9200 3250 60  0001 C CNN "Field6"
-F 10 "" H 9200 3250 60  0001 C CNN "Field7"
-F 11 "" H 9200 3250 60  0001 C CNN "Field8"
-	1    9200 3250
+P 9050 2300
+F 0 "#PWR01" H 9050 2300 30  0001 C CNN
+F 1 "GND" H 9050 2230 30  0001 C CNN
+F 2 "" H 9050 2300 60  0001 C CNN
+F 3 "" H 9050 2300 60  0001 C CNN
+	1    9050 2300
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C11
 U 1 1 4B4B15D9
-P 9200 3000
-F 0 "C11" H 9250 3100 50  0000 L CNN
-F 1 "10uF" H 9300 2900 50  0000 L TNN
-F 2 "" H 9200 3000 60  0001 C CNN
-F 3 "" H 9200 3000 60  0001 C CNN
-F 4 "" H 9200 3000 60  0001 C CNN "Field1"
-F 5 "" H 9200 3000 60  0001 C CNN "Field2"
-F 6 "" H 9200 3000 60  0001 C CNN "Field3"
-F 7 "" H 9200 3000 60  0001 C CNN "Field4"
-F 8 "" H 9200 3000 60  0001 C CNN "Field5"
-F 9 "" H 9200 3000 60  0001 C CNN "Field6"
-F 10 "" H 9200 3000 60  0001 C CNN "Field7"
-F 11 "" H 9200 3000 60  0001 C CNN "Field8"
-	1    9200 3000
-	-1   0    0    1   
+P 9200 2500
+F 0 "C11" H 9350 2550 50  0000 L CNN
+F 1 "10uF" H 9350 2500 50  0000 L TNN
+F 2 "" H 9200 2500 60  0001 C CNN
+F 3 "" H 9200 2500 60  0001 C CNN
+	1    9200 2500
+	1    0    0    -1  
 $EndComp
 NoConn ~ 7100 3050
 $Comp
@@ -158,7 +124,7 @@ L -VAA #PWR02
 U 1 1 4B4B1578
 P 9350 2750
 F 0 "#PWR02" H 9350 2850 20  0001 C CNN
-F 1 "-VAA" H 9350 2850 30  0000 C CNN
+F 1 "-VAA" V 9350 2950 40  0000 C CNN
 F 2 "" H 9350 2750 60  0001 C CNN
 F 3 "" H 9350 2750 60  0001 C CNN
 	1    9350 2750
@@ -167,108 +133,84 @@ $EndComp
 $Comp
 L 7805 U2
 U 1 1 4B4B1532
-P 7550 1250
-F 0 "U2" H 7700 1054 60  0000 C CNN
-F 1 "78L05" H 7550 1450 60  0000 C CNN
-F 2 "" H 7550 1250 60  0001 C CNN
-F 3 "" H 7550 1250 60  0001 C CNN
-	1    7550 1250
+P 7900 1350
+F 0 "U2" H 7900 1650 60  0000 C CNN
+F 1 "78L05" H 7900 1550 60  0000 C CNN
+F 2 "" H 7900 1350 60  0001 C CNN
+F 3 "" H 7900 1350 60  0001 C CNN
+	1    7900 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR03
 U 1 1 4B4B1253
-P 7900 2250
-F 0 "#PWR03" H 7900 2350 30  0001 C CNN
-F 1 "VCC" H 7900 2350 30  0000 C CNN
-F 2 "" H 7900 2250 60  0001 C CNN
-F 3 "" H 7900 2250 60  0001 C CNN
-	1    7900 2250
+P 7900 2200
+F 0 "#PWR03" H 7900 2300 30  0001 C CNN
+F 1 "VCC" H 7900 2300 40  0000 C CNN
+F 2 "" H 7900 2200 60  0001 C CNN
+F 3 "" H 7900 2200 60  0001 C CNN
+	1    7900 2200
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR04
 U 1 1 4B4B124E
-P 8450 1150
-F 0 "#PWR04" H 8450 1250 30  0001 C CNN
-F 1 "VCC" H 8450 1250 30  0000 C CNN
-F 2 "" H 8450 1150 60  0001 C CNN
-F 3 "" H 8450 1150 60  0001 C CNN
-	1    8450 1150
+P 9200 1250
+F 0 "#PWR04" H 9200 1350 30  0001 C CNN
+F 1 "VCC" H 9200 1350 40  0000 C CNN
+F 2 "" H 9200 1250 60  0001 C CNN
+F 3 "" H 9200 1250 60  0001 C CNN
+	1    9200 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR05
 U 1 1 4B4B1237
-P 7900 3550
-F 0 "#PWR05" H 7900 3550 30  0001 C CNN
-F 1 "GND" H 7900 3480 30  0001 C CNN
-F 2 "" H 7900 3550 60  0001 C CNN
-F 3 "" H 7900 3550 60  0001 C CNN
-F 4 "" H 7900 3550 60  0001 C CNN "Field1"
-F 5 "" H 7900 3550 60  0001 C CNN "Field2"
-F 6 "" H 7900 3550 60  0001 C CNN "Field3"
-F 7 "" H 7900 3550 60  0001 C CNN "Field4"
-F 8 "" H 7900 3550 60  0001 C CNN "Field5"
-F 9 "" H 7900 3550 60  0001 C CNN "Field6"
-F 10 "" H 7900 3550 60  0001 C CNN "Field7"
-F 11 "" H 7900 3550 60  0001 C CNN "Field8"
-	1    7900 3550
+P 7900 3600
+F 0 "#PWR05" H 7900 3600 30  0001 C CNN
+F 1 "GND" H 7900 3530 30  0001 C CNN
+F 2 "" H 7900 3600 60  0001 C CNN
+F 3 "" H 7900 3600 60  0001 C CNN
+	1    7900 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L ICL7660 U1
 U 1 1 4B4B1230
 P 7950 2900
-F 0 "U1" H 8150 3300 70  0000 L CNN
-F 1 "ICL7660" H 8000 2450 70  0000 L CNN
+F 0 "U1" H 7400 3300 70  0000 L CNN
+F 1 "ICL7660" H 8500 2450 70  0000 R CNN
 F 2 "" H 7950 2900 60  0001 C CNN
 F 3 "" H 7950 2900 60  0001 C CNN
 	1    7950 2900
 	1    0    0    -1  
 $EndComp
-Text Label 1650 2300 0    60   ~ 0
+Text Label 2150 2500 0    60   ~ 0
 12Vext
 $Comp
 L CP C9
 U 1 1 4B3A1558
-P 2100 1350
-F 0 "C9" H 2150 1450 50  0000 L CNN
-F 1 "47uF/63V" H 2200 1250 50  0000 L TNN
-F 2 "" H 2100 1350 60  0001 C CNN
-F 3 "" H 2100 1350 60  0001 C CNN
-F 4 "" H 2100 1350 60  0001 C CNN "Field1"
-F 5 "" H 2100 1350 60  0001 C CNN "Field2"
-F 6 "" H 2100 1350 60  0001 C CNN "Field3"
-F 7 "" H 2100 1350 60  0001 C CNN "Field4"
-F 8 "" H 2100 1350 60  0001 C CNN "Field5"
-F 9 "" H 2100 1350 60  0001 C CNN "Field6"
-F 10 "" H 2100 1350 60  0001 C CNN "Field7"
-F 11 "" H 2100 1350 60  0001 C CNN "Field8"
-	1    2100 1350
+P 2500 1550
+F 0 "C9" H 2650 1600 50  0000 L CNN
+F 1 "47uF/63V" H 2650 1550 50  0000 L TNN
+F 2 "" H 2500 1550 60  0001 C CNN
+F 3 "" H 2500 1550 60  0001 C CNN
+	1    2500 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR06
 U 1 1 4B3A1557
-P 2100 1600
-F 0 "#PWR06" H 2100 1600 30  0001 C CNN
-F 1 "GND" H 2100 1530 30  0001 C CNN
-F 2 "" H 2100 1600 60  0001 C CNN
-F 3 "" H 2100 1600 60  0001 C CNN
-F 4 "" H 2100 1600 60  0001 C CNN "Field1"
-F 5 "" H 2100 1600 60  0001 C CNN "Field2"
-F 6 "" H 2100 1600 60  0001 C CNN "Field3"
-F 7 "" H 2100 1600 60  0001 C CNN "Field4"
-F 8 "" H 2100 1600 60  0001 C CNN "Field5"
-F 9 "" H 2100 1600 60  0001 C CNN "Field6"
-F 10 "" H 2100 1600 60  0001 C CNN "Field7"
-F 11 "" H 2100 1600 60  0001 C CNN "Field8"
-	1    2100 1600
+P 2500 1800
+F 0 "#PWR06" H 2500 1800 30  0001 C CNN
+F 1 "GND" H 2500 1730 30  0001 C CNN
+F 2 "" H 2500 1800 60  0001 C CNN
+F 3 "" H 2500 1800 60  0001 C CNN
+	1    2500 1800
 	1    0    0    -1  
 $EndComp
 $Sheet
-S 6150 4450 2000 1450
+S 6100 4400 2000 1450
 U 4B3A13A4
 F0 "ampli_ht_horizontal" 60
 F1 "ampli_ht.sch" 60
@@ -282,319 +224,210 @@ $EndSheet
 $Comp
 L GND #PWR07
 U 1 1 4B3A1302
-P 1750 1400
-F 0 "#PWR07" H 1750 1400 30  0001 C CNN
-F 1 "GND" H 1750 1330 30  0001 C CNN
-F 2 "" H 1750 1400 60  0001 C CNN
-F 3 "" H 1750 1400 60  0001 C CNN
-F 4 "" H 1750 1400 60  0001 C CNN "Field1"
-F 5 "" H 1750 1400 60  0001 C CNN "Field2"
-F 6 "" H 1750 1400 60  0001 C CNN "Field3"
-F 7 "" H 1750 1400 60  0001 C CNN "Field4"
-F 8 "" H 1750 1400 60  0001 C CNN "Field5"
-F 9 "" H 1750 1400 60  0001 C CNN "Field6"
-F 10 "" H 1750 1400 60  0001 C CNN "Field7"
-F 11 "" H 1750 1400 60  0001 C CNN "Field8"
-	1    1750 1400
+P 2200 1750
+F 0 "#PWR07" H 2200 1750 30  0001 C CNN
+F 1 "GND" H 2200 1680 30  0001 C CNN
+F 2 "" H 2200 1750 60  0001 C CNN
+F 3 "" H 2200 1750 60  0001 C CNN
+	1    2200 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 4B3A12F4
-P 1350 1200
-F 0 "P1" V 1300 1200 40  0000 C CNN
-F 1 "CONN_2" V 1400 1200 40  0000 C CNN
-F 2 "" H 1350 1200 60  0001 C CNN
-F 3 "" H 1350 1200 60  0001 C CNN
-F 4 "" H 1350 1200 60  0001 C CNN "Field1"
-F 5 "" H 1350 1200 60  0001 C CNN "Field2"
-F 6 "" H 1350 1200 60  0001 C CNN "Field3"
-F 7 "" H 1350 1200 60  0001 C CNN "Field4"
-F 8 "" H 1350 1200 60  0001 C CNN "Field5"
-F 9 "" H 1350 1200 60  0001 C CNN "Field6"
-F 10 "" H 1350 1200 60  0001 C CNN "Field7"
-F 11 "" H 1350 1200 60  0001 C CNN "Field8"
-	1    1350 1200
+P 1650 1400
+F 0 "P1" V 1600 1400 40  0000 C CNN
+F 1 "CONN_2" V 1700 1400 40  0000 C CNN
+F 2 "" H 1650 1400 60  0001 C CNN
+F 3 "" H 1650 1400 60  0001 C CNN
+	1    1650 1400
 	-1   0    0    -1  
 $EndComp
 $Comp
 L HT #PWR08
 U 1 1 4B0FA68B
-P 1850 1050
-F 0 "#PWR08" H 1850 1170 20  0001 C CNN
-F 1 "HT" H 1850 1140 30  0000 C CNN
-F 2 "" H 1850 1050 60  0001 C CNN
-F 3 "" H 1850 1050 60  0001 C CNN
-	1    1850 1050
+P 2500 1250
+F 0 "#PWR08" H 2500 1370 20  0001 C CNN
+F 1 "HT" H 2500 1340 30  0000 C CNN
+F 2 "" H 2500 1250 60  0001 C CNN
+F 3 "" H 2500 1250 60  0001 C CNN
+	1    2500 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C1
 U 1 1 4B03CEC2
-P 8450 1500
-F 0 "C1" H 8500 1600 50  0000 L CNN
-F 1 "47uF" H 8550 1400 50  0000 L TNN
-F 2 "" H 8450 1500 60  0001 C CNN
-F 3 "" H 8450 1500 60  0001 C CNN
-F 4 "" H 8450 1500 60  0001 C CNN "Field1"
-F 5 "" H 8450 1500 60  0001 C CNN "Field2"
-F 6 "" H 8450 1500 60  0001 C CNN "Field3"
-F 7 "" H 8450 1500 60  0001 C CNN "Field4"
-F 8 "" H 8450 1500 60  0001 C CNN "Field5"
-F 9 "" H 8450 1500 60  0001 C CNN "Field6"
-F 10 "" H 8450 1500 60  0001 C CNN "Field7"
-F 11 "" H 8450 1500 60  0001 C CNN "Field8"
-	1    8450 1500
+P 9200 1600
+F 0 "C1" H 9350 1650 50  0000 L CNN
+F 1 "47uF" H 9350 1600 50  0000 L TNN
+F 2 "" H 9200 1600 60  0001 C CNN
+F 3 "" H 9200 1600 60  0001 C CNN
+	1    9200 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR09
 U 1 1 4B03CEC1
-P 8450 1750
-F 0 "#PWR09" H 8450 1750 30  0001 C CNN
-F 1 "GND" H 8450 1680 30  0001 C CNN
-F 2 "" H 8450 1750 60  0001 C CNN
-F 3 "" H 8450 1750 60  0001 C CNN
-F 4 "" H 8450 1750 60  0001 C CNN "Field1"
-F 5 "" H 8450 1750 60  0001 C CNN "Field2"
-F 6 "" H 8450 1750 60  0001 C CNN "Field3"
-F 7 "" H 8450 1750 60  0001 C CNN "Field4"
-F 8 "" H 8450 1750 60  0001 C CNN "Field5"
-F 9 "" H 8450 1750 60  0001 C CNN "Field6"
-F 10 "" H 8450 1750 60  0001 C CNN "Field7"
-F 11 "" H 8450 1750 60  0001 C CNN "Field8"
-	1    8450 1750
+P 9200 1850
+F 0 "#PWR09" H 9200 1850 30  0001 C CNN
+F 1 "GND" H 9200 1780 30  0001 C CNN
+F 2 "" H 9200 1850 60  0001 C CNN
+F 3 "" H 9200 1850 60  0001 C CNN
+	1    9200 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR010
 U 1 1 4B03CE88
-P 7550 1500
-F 0 "#PWR010" H 7550 1500 30  0001 C CNN
-F 1 "GND" H 7550 1430 30  0001 C CNN
-F 2 "" H 7550 1500 60  0001 C CNN
-F 3 "" H 7550 1500 60  0001 C CNN
-F 4 "" H 7550 1500 60  0001 C CNN "Field1"
-F 5 "" H 7550 1500 60  0001 C CNN "Field2"
-F 6 "" H 7550 1500 60  0001 C CNN "Field3"
-F 7 "" H 7550 1500 60  0001 C CNN "Field4"
-F 8 "" H 7550 1500 60  0001 C CNN "Field5"
-F 9 "" H 7550 1500 60  0001 C CNN "Field6"
-F 10 "" H 7550 1500 60  0001 C CNN "Field7"
-F 11 "" H 7550 1500 60  0001 C CNN "Field8"
-	1    7550 1500
+P 7900 1650
+F 0 "#PWR010" H 7900 1650 30  0001 C CNN
+F 1 "GND" H 7900 1580 30  0001 C CNN
+F 2 "" H 7900 1650 60  0001 C CNN
+F 3 "" H 7900 1650 60  0001 C CNN
+	1    7900 1650
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12C #PWR011
 U 1 1 4B03CE6C
-P 7050 1150
-F 0 "#PWR011" H 7050 1120 30  0001 C CNN
-F 1 "+12C" H 7050 1260 40  0000 C CNN
-F 2 "" H 7050 1150 60  0001 C CNN
-F 3 "" H 7050 1150 60  0001 C CNN
-	1    7050 1150
+P 7400 1250
+F 0 "#PWR011" H 7400 1220 30  0001 C CNN
+F 1 "+12C" H 7400 1360 40  0000 C CNN
+F 2 "" H 7400 1250 60  0001 C CNN
+F 3 "" H 7400 1250 60  0001 C CNN
+	1    7400 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #U012
 U 1 1 4B03CAA3
-P 2100 1050
-F 0 "#U012" H 2100 1320 30  0001 C CNN
-F 1 "PWR_FLAG" H 2100 1280 30  0000 C CNN
-F 2 "" H 2100 1050 60  0001 C CNN
-F 3 "" H 2100 1050 60  0001 C CNN
-F 4 "" H 2100 1050 60  0001 C CNN "Field1"
-F 5 "" H 2100 1050 60  0001 C CNN "Field2"
-F 6 "" H 2100 1050 60  0001 C CNN "Field3"
-F 7 "" H 2100 1050 60  0001 C CNN "Field4"
-F 8 "" H 2100 1050 60  0001 C CNN "Field5"
-F 9 "" H 2100 1050 60  0001 C CNN "Field6"
-F 10 "" H 2100 1050 60  0001 C CNN "Field7"
-F 11 "" H 2100 1050 60  0001 C CNN "Field8"
-	1    2100 1050
+P 2200 1250
+F 0 "#U012" H 2200 1520 30  0001 C CNN
+F 1 "PWR_FLAG" H 2200 1480 30  0000 C CNN
+F 2 "" H 2200 1250 60  0001 C CNN
+F 3 "" H 2200 1250 60  0001 C CNN
+	1    2200 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #U013
 U 1 1 4B03C9F9
-P 2400 2250
-F 0 "#U013" H 2400 2520 30  0001 C CNN
-F 1 "PWR_FLAG" H 2400 2480 30  0000 C CNN
-F 2 "" H 2400 2250 60  0001 C CNN
-F 3 "" H 2400 2250 60  0001 C CNN
-F 4 "" H 2400 2250 60  0001 C CNN "Field1"
-F 5 "" H 2400 2250 60  0001 C CNN "Field2"
-F 6 "" H 2400 2250 60  0001 C CNN "Field3"
-F 7 "" H 2400 2250 60  0001 C CNN "Field4"
-F 8 "" H 2400 2250 60  0001 C CNN "Field5"
-F 9 "" H 2400 2250 60  0001 C CNN "Field6"
-F 10 "" H 2400 2250 60  0001 C CNN "Field7"
-F 11 "" H 2400 2250 60  0001 C CNN "Field8"
-	1    2400 2250
+P 3000 2450
+F 0 "#U013" H 3000 2720 30  0001 C CNN
+F 1 "PWR_FLAG" H 3000 2680 30  0000 C CNN
+F 2 "" H 3000 2450 60  0001 C CNN
+F 3 "" H 3000 2450 60  0001 C CNN
+	1    3000 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12C #PWR014
 U 1 1 4B03C68D
-P 3300 2250
-F 0 "#PWR014" H 3300 2220 30  0001 C CNN
-F 1 "+12C" H 3300 2360 40  0000 C CNN
-F 2 "" H 3300 2250 60  0001 C CNN
-F 3 "" H 3300 2250 60  0001 C CNN
-	1    3300 2250
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR015
-U 1 1 4AE17C45
-P 2200 2750
-F 0 "#PWR015" H 2200 2750 30  0001 C CNN
-F 1 "GND" H 2200 2680 30  0001 C CNN
-F 2 "" H 2200 2750 60  0001 C CNN
-F 3 "" H 2200 2750 60  0001 C CNN
-F 4 "" H 2200 2750 60  0001 C CNN "Field1"
-F 5 "" H 2200 2750 60  0001 C CNN "Field2"
-F 6 "" H 2200 2750 60  0001 C CNN "Field3"
-F 7 "" H 2200 2750 60  0001 C CNN "Field4"
-F 8 "" H 2200 2750 60  0001 C CNN "Field5"
-F 9 "" H 2200 2750 60  0001 C CNN "Field6"
-F 10 "" H 2200 2750 60  0001 C CNN "Field7"
-F 11 "" H 2200 2750 60  0001 C CNN "Field8"
-	1    2200 2750
+P 3800 2450
+F 0 "#PWR014" H 3800 2420 30  0001 C CNN
+F 1 "+12C" H 3800 2560 40  0000 C CNN
+F 2 "" H 3800 2450 60  0001 C CNN
+F 3 "" H 3800 2450 60  0001 C CNN
+	1    3800 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #U016
 U 1 1 4AE17C31
-P 2150 2700
-F 0 "#U016" H 2150 2970 30  0001 C CNN
-F 1 "PWR_FLAG" H 2150 2930 30  0000 C CNN
-F 2 "" H 2150 2700 60  0001 C CNN
-F 3 "" H 2150 2700 60  0001 C CNN
-F 4 "" H 2150 2700 60  0001 C CNN "Field1"
-F 5 "" H 2150 2700 60  0001 C CNN "Field2"
-F 6 "" H 2150 2700 60  0001 C CNN "Field3"
-F 7 "" H 2150 2700 60  0001 C CNN "Field4"
-F 8 "" H 2150 2700 60  0001 C CNN "Field5"
-F 9 "" H 2150 2700 60  0001 C CNN "Field6"
-F 10 "" H 2150 2700 60  0001 C CNN "Field7"
-F 11 "" H 2150 2700 60  0001 C CNN "Field8"
-	1    2150 2700
-	0    -1   -1   0   
+P 2200 1650
+F 0 "#U016" 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
+	1    2200 1650
+	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #U017
 U 1 1 4AE173EF
-P 3050 2250
-F 0 "#U017" H 3050 2200 20  0001 C CNN
-F 1 "+12V" H 3050 2350 30  0000 C CNN
-F 2 "" H 3050 2250 60  0001 C CNN
-F 3 "" H 3050 2250 60  0001 C CNN
-F 4 "" H 3050 2250 60  0001 C CNN "Field1"
-F 5 "" H 3050 2250 60  0001 C CNN "Field2"
-F 6 "" H 3050 2250 60  0001 C CNN "Field3"
-F 7 "" H 3050 2250 60  0001 C CNN "Field4"
-F 8 "" H 3050 2250 60  0001 C CNN "Field5"
-F 9 "" H 3050 2250 60  0001 C CNN "Field6"
-F 10 "" H 3050 2250 60  0001 C CNN "Field7"
-F 11 "" H 3050 2250 60  0001 C CNN "Field8"
-	1    3050 2250
+P 3550 2450
+F 0 "#U017" 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
+	1    3550 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR018
 U 1 1 4AE173D0
-P 2750 2800
-F 0 "#PWR018" H 2750 2800 30  0001 C CNN
-F 1 "GND" H 2750 2730 30  0001 C CNN
-F 2 "" H 2750 2800 60  0001 C CNN
-F 3 "" H 2750 2800 60  0001 C CNN
-F 4 "" H 2750 2800 60  0001 C CNN "Field1"
-F 5 "" H 2750 2800 60  0001 C CNN "Field2"
-F 6 "" H 2750 2800 60  0001 C CNN "Field3"
-F 7 "" H 2750 2800 60  0001 C CNN "Field4"
-F 8 "" H 2750 2800 60  0001 C CNN "Field5"
-F 9 "" H 2750 2800 60  0001 C CNN "Field6"
-F 10 "" H 2750 2800 60  0001 C CNN "Field7"
-F 11 "" H 2750 2800 60  0001 C CNN "Field8"
-	1    2750 2800
+P 3200 3100
+F 0 "#PWR018" 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
+	1    3200 3100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C2
 U 1 1 4AE173CF
-P 2750 2550
-F 0 "C2" H 2800 2650 50  0000 L CNN
-F 1 "47uF/20V" H 2850 2450 50  0000 L TNN
-F 2 "" H 2750 2550 60  0001 C CNN
-F 3 "" H 2750 2550 60  0001 C CNN
-F 4 "" H 2750 2550 60  0001 C CNN "Field1"
-F 5 "" H 2750 2550 60  0001 C CNN "Field2"
-F 6 "" H 2750 2550 60  0001 C CNN "Field3"
-F 7 "" H 2750 2550 60  0001 C CNN "Field4"
-F 8 "" H 2750 2550 60  0001 C CNN "Field5"
-F 9 "" H 2750 2550 60  0001 C CNN "Field6"
-F 10 "" H 2750 2550 60  0001 C CNN "Field7"
-F 11 "" H 2750 2550 60  0001 C CNN "Field8"
-	1    2750 2550
+P 3200 2800
+F 0 "C2" H 3350 2850 50  0000 L CNN
+F 1 "47uF/20V" H 3350 2750 50  0000 L TNN
+F 2 "" H 3200 2800 60  0001 C CNN
+F 3 "" H 3200 2800 60  0001 C CNN
+	1    3200 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D1
 U 1 1 4AE172F4
-P 2150 2300
-F 0 "D1" H 2150 2400 40  0000 C CNN
-F 1 "1N4007" H 2150 2200 40  0000 C CNN
-F 2 "" H 2150 2300 60  0001 C CNN
-F 3 "" H 2150 2300 60  0001 C CNN
-F 4 "" H 2150 2300 60  0001 C CNN "Field1"
-F 5 "" H 2150 2300 60  0001 C CNN "Field2"
-F 6 "" H 2150 2300 60  0001 C CNN "Field3"
-F 7 "" H 2150 2300 60  0001 C CNN "Field4"
-F 8 "" H 2150 2300 60  0001 C CNN "Field5"
-F 9 "" H 2150 2300 60  0001 C CNN "Field6"
-F 10 "" H 2150 2300 60  0001 C CNN "Field7"
-F 11 "" H 2150 2300 60  0001 C CNN "Field8"
-	1    2150 2300
+P 2700 2500
+F 0 "D1" H 2700 2400 40  0000 C CNN
+F 1 "1N4007" H 2700 2600 40  0000 C CNN
+F 2 "" H 2700 2500 60  0001 C CNN
+F 3 "" H 2700 2500 60  0001 C CNN
+	1    2700 2500
 	1    0    0    1   
 $EndComp
 $Comp
 L GND #PWR019
 U 1 1 4AD71B8E
-P 1650 2600
-F 0 "#PWR019" H 1650 2600 30  0001 C CNN
-F 1 "GND" H 1650 2530 30  0001 C CNN
-F 2 "" H 1650 2600 60  0001 C CNN
-F 3 "" H 1650 2600 60  0001 C CNN
-F 4 "" H 1650 2600 60  0001 C CNN "Field1"
-F 5 "" H 1650 2600 60  0001 C CNN "Field2"
-F 6 "" H 1650 2600 60  0001 C CNN "Field3"
-F 7 "" H 1650 2600 60  0001 C CNN "Field4"
-F 8 "" H 1650 2600 60  0001 C CNN "Field5"
-F 9 "" H 1650 2600 60  0001 C CNN "Field6"
-F 10 "" H 1650 2600 60  0001 C CNN "Field7"
-F 11 "" H 1650 2600 60  0001 C CNN "Field8"
-	1    1650 2600
+P 2100 2800
+F 0 "#PWR019" 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
+	1    2100 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P2
 U 1 1 4AD71B06
-P 1250 2400
-F 0 "P2" V 1200 2400 40  0000 C CNN
-F 1 "CONN_2" V 1300 2400 40  0000 C CNN
-F 2 "" H 1250 2400 60  0001 C CNN
-F 3 "" H 1250 2400 60  0001 C CNN
-F 4 "" H 1250 2400 60  0001 C CNN "Field1"
-F 5 "" H 1250 2400 60  0001 C CNN "Field2"
-F 6 "" H 1250 2400 60  0001 C CNN "Field3"
-F 7 "" H 1250 2400 60  0001 C CNN "Field4"
-F 8 "" H 1250 2400 60  0001 C CNN "Field5"
-F 9 "" H 1250 2400 60  0001 C CNN "Field6"
-F 10 "" H 1250 2400 60  0001 C CNN "Field7"
-F 11 "" H 1250 2400 60  0001 C CNN "Field8"
-	1    1250 2400
+P 1650 2600
+F 0 "P2" V 1600 2600 40  0000 C CNN
+F 1 "CONN_2" V 1700 2600 40  0000 C CNN
+F 2 "" H 1650 2600 60  0001 C CNN
+F 3 "" H 1650 2600 60  0001 C CNN
+	1    1650 2600
 	-1   0    0    -1  
 $EndComp
+Wire Wire Line
+	2200 1250 2200 1300
+Connection ~ 2200 1300
+Wire Wire Line
+	2000 1300 2500 1300
+Wire Wire Line
+	2000 1500 2100 1500
+Wire Wire Line
+	2100 1500 2100 1700
+Wire Wire Line
+	2100 1700 2200 1700
+Connection ~ 2200 1700
+Wire Wire Line
+	9050 2300 9050 2250
+Wire Wire Line
+	9050 2250 9200 2250
+Wire Wire Line
+	7900 2200 7900 2250
+Wire Wire Line
+	7900 1650 7900 1600
+Wire Wire Line
+	7900 3600 7900 3550
 $EndSCHEMATC
diff --git a/demos/ecc83/ecc83-pp.sch b/demos/ecc83/ecc83-pp.sch
index adc698e..b562435 100644
--- a/demos/ecc83/ecc83-pp.sch
+++ b/demos/ecc83/ecc83-pp.sch
@@ -31,7 +31,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "ECC Push-Pull"
-Date "vendredi 04 juillet 2014"
+Date "Sat 21 Mar 2015"
 Rev "0.1"
 Comp ""
 Comment1 ""
@@ -40,335 +40,361 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	6250 3900 6350 3900
+	2500 3400 2500 3700
 Wire Wire Line
-	5950 3300 5950 3500
-Connection ~ 4650 3950
+	6100 4650 6100 4850
 Wire Wire Line
-	4650 3900 4650 4850
+	2000 2000 6300 2000
+Connection ~ 3400 2000
 Wire Wire Line
-	4650 3900 4850 3900
+	7150 3000 7900 3000
 Wire Wire Line
-	1950 4950 2050 4950
+	7400 3000 7400 3200
 Wire Wire Line
-	2050 4950 2050 4750
+	2000 3500 2600 3500
 Wire Wire Line
-	4350 4450 4350 4750
+	2400 3500 2400 3400
 Wire Wire Line
-	7150 4600 7150 4450
-Wire Wire Line
-	4350 4250 4650 4250
-Connection ~ 4650 4250
-Wire Wire Line
-	7150 3600 7150 3500
-Wire Wire Line
-	5050 4300 5050 4850
-Wire Wire Line
-	6500 3350 6500 3450
-Wire Wire Line
-	5950 3300 7150 3300
-Connection ~ 6900 3300
-Wire Wire Line
-	6350 3900 6350 3350
-Connection ~ 6350 3350
-Wire Wire Line
-	6500 3950 6500 4350
-Connection ~ 6500 4250
-Wire Wire Line
-	7150 4250 6900 4250
-Wire Wire Line
-	6900 4250 6900 4850
-Wire Wire Line
-	2150 4750 2150 4950
-Wire Wire Line
-	2150 4850 1950 4850
-Connection ~ 2150 4850
-Wire Wire Line
-	4300 4700 4350 4700
-Connection ~ 4350 4700
-Wire Wire Line
-	1950 4850 1950 4750
-Wire Wire Line
-	5150 3350 6500 3350
-Wire Wire Line
-	5150 3350 5150 3500
-Wire Wire Line
-	6050 4300 6050 4350
-Wire Wire Line
-	6050 4350 6500 4350
+	6200 3600 6200 3850
 $Comp
 L ECC83 U1
 U 3 1 48B4F266
-P 2050 4300
-F 0 "U1" H 2180 4610 50  0000 C CNN
-F 1 "ECC83" H 2400 4000 50  0000 C CNN
-F 2 "Valves:VALVE-ECC-83-1" V 1800 4300 30  0000 C CNN
-F 3 "" H 2050 4300 60  0001 C CNN
-	3    2050 4300
+P 2500 2950
+F 0 "U1" H 2500 3400 50  0000 C CNN
+F 1 "ECC83" H 2500 3300 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" V 2250 2950 30  0000 C CNN
+F 3 "" H 2500 2950 60  0001 C CNN
+	3    2500 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L ECC83 U1
 U 2 1 48B4F263
-P 5150 3900
-F 0 "U1" H 5280 4210 50  0000 C CNN
-F 1 "ECC83" H 5350 3550 50  0000 C CNN
-F 2 "Valves:VALVE-ECC-83-1" H 5350 3500 30  0000 C CNN
-F 3 "" H 5150 3900 60  0001 C CNN
-	2    5150 3900
+P 6200 4250
+F 0 "U1" H 6350 4600 50  0000 C CNN
+F 1 "ECC83" H 6400 3900 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 6400 3850 30  0000 C CNN
+F 3 "" H 6200 4250 60  0001 C CNN
+	2    6200 4250
 	1    0    0    -1  
 $EndComp
 $Comp
 L ECC83 U1
 U 1 1 48B4F256
-P 5950 3900
-F 0 "U1" H 6080 4210 50  0000 C CNN
-F 1 "ECC83" H 5700 3600 50  0000 C CNN
-F 2 "Valves:VALVE-ECC-83-1" H 6220 3500 50  0001 C CNN
-F 3 "" H 5950 3900 60  0001 C CNN
-	1    5950 3900
-	-1   0    0    -1  
+P 6300 2550
+F 0 "U1" H 6450 2900 50  0000 C CNN
+F 1 "ECC83" H 6050 2250 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 6570 2150 50  0001 C CNN
+F 3 "" H 6300 2550 60  0001 C CNN
+	1    6300 2550
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR01
 U 1 1 457DBAF8
-P 7150 4600
-F 0 "#PWR01" H 7150 4600 30  0001 C CNN
-F 1 "GND" H 7150 4530 30  0001 C CNN
-F 2 "" H 7150 4600 60  0001 C CNN
-F 3 "" H 7150 4600 60  0001 C CNN
-	1    7150 4600
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR02
 U 1 1 457DBAF5
-P 6900 5350
-F 0 "#PWR02" H 6900 5350 30  0001 C CNN
-F 1 "GND" H 6900 5280 30  0001 C CNN
-F 2 "" H 6900 5350 60  0001 C CNN
-F 3 "" H 6900 5350 60  0001 C CNN
-	1    6900 5350
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR03
 U 1 1 457DBAF1
-P 5050 5350
-F 0 "#PWR03" H 5050 5350 30  0001 C CNN
-F 1 "GND" H 5050 5280 30  0001 C CNN
-F 2 "" H 5050 5350 60  0001 C CNN
-F 3 "" H 5050 5350 60  0001 C CNN
-	1    5050 5350
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR04
 U 1 1 457DBAEF
-P 4650 5350
-F 0 "#PWR04" H 4650 5350 30  0001 C CNN
-F 1 "GND" H 4650 5280 30  0001 C CNN
-F 2 "" H 4650 5350 60  0001 C CNN
-F 3 "" H 4650 5350 60  0001 C CNN
-	1    4650 5350
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG05
 U 1 1 457DBAC0
-P 4300 4700
-F 0 "#FLG05" H 4300 4970 30  0001 C CNN
-F 1 "PWR_FLAG" H 4300 4930 30  0000 C CNN
-F 2 "" H 4300 4700 60  0001 C CNN
-F 3 "" H 4300 4700 60  0001 C CNN
-	1    4300 4700
-	0    -1   -1   0   
+P 3000 2350
+F 0 "#FLG05" H 3000 2620 30  0001 C CNN
+F 1 "PWR_FLAG" H 3000 2580 30  0000 C CNN
+F 2 "" H 3000 2350 60  0001 C CNN
+F 3 "" H 3000 2350 60  0001 C CNN
+	1    3000 2350
+	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P4
 U 1 1 456A8ACC
-P 2050 5300
-F 0 "P4" V 2000 5300 40  0000 C CNN
-F 1 "CONN_2" V 2100 5300 40  0000 C CNN
-F 2 "connect:bornier2" H 2050 5300 60  0001 C CNN
-F 3 "" H 2050 5300 60  0001 C CNN
-	1    2050 5300
-	0    1    1    0   
+P 1650 3600
+F 0 "P4" V 1600 3600 40  0000 C CNN
+F 1 "CONN_2" V 1700 3600 40  0000 C CNN
+F 2 "connect:bornier2" H 1650 3600 60  0001 C CNN
+F 3 "" H 1650 3600 60  0001 C CNN
+	1    1650 3600
+	-1   0    0    -1  
 $EndComp
 $Comp
 L C C1
 U 1 1 4549F4BE
-P 6900 3500
-F 0 "C1" H 6950 3600 50  0000 L CNN
-F 1 "10uF" H 6650 3600 50  0000 L CNN
-F 2 "discret:C2V10" H 6900 3500 60  0001 C CNN
-F 3 "" H 6900 3500 60  0001 C CNN
-	1    6900 3500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR06
-U 1 1 4549F4B9
-P 4350 4750
-F 0 "#PWR06" H 4350 4750 30  0001 C CNN
-F 1 "GND" H 4350 4680 30  0001 C CNN
-F 2 "" H 4350 4750 60  0001 C CNN
-F 3 "" H 4350 4750 60  0001 C CNN
-	1    4350 4750
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR07
-U 1 1 4549F4B3
-P 7150 3600
-F 0 "#PWR07" H 7150 3600 30  0001 C CNN
-F 1 "GND" H 7150 3530 30  0001 C CNN
-F 2 "" H 7150 3600 60  0001 C CNN
-F 3 "" H 7150 3600 60  0001 C CNN
-	1    7150 3600
-	1    0    0    -1  
+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
+	-1   0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P3
 U 1 1 4549F4A5
-P 7500 3400
-F 0 "P3" V 7450 3400 40  0000 C CNN
-F 1 "POWER" V 7550 3400 40  0000 C CNN
-F 2 "connect:bornier2" H 7500 3400 60  0001 C CNN
-F 3 "" H 7500 3400 60  0001 C CNN
-	1    7500 3400
-	1    0    0    -1  
+P 1650 2100
+F 0 "P3" V 1600 2100 40  0000 C CNN
+F 1 "POWER" V 1700 2100 40  0000 C CNN
+F 2 "connect:bornier2" H 1650 2100 60  0001 C CNN
+F 3 "" H 1650 2100 60  0001 C CNN
+	1    1650 2100
+	-1   0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P2
 U 1 1 4549F46C
-P 7500 4350
-F 0 "P2" V 7450 4350 40  0000 C CNN
-F 1 "OUT" V 7550 4350 40  0000 C CNN
-F 2 "connect:bornier2" H 7500 4350 60  0001 C CNN
-F 3 "" H 7500 4350 60  0001 C CNN
-	1    7500 4350
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 4549F464
-P 4000 4350
-F 0 "P1" V 3950 4350 40  0000 C CNN
-F 1 "IN" V 4050 4350 40  0000 C CNN
-F 2 "connect:bornier2" V 4150 4350 60  0000 C CNN
-F 3 "" H 4000 4350 60  0001 C CNN
-	1    4000 4350
+P 5000 4350
+F 0 "P1" V 4950 4350 40  0000 C CNN
+F 1 "IN" V 5050 4350 40  0000 C CNN
+F 2 "connect:bornier2" H 5000 4600 50  0000 C CNN
+F 3 "" H 5000 4350 60  0001 C CNN
+	1    5000 4350
 	-1   0    0    1   
 $EndComp
 $Comp
 L C C2
 U 1 1 4549F3BE
-P 6700 4250
-F 0 "C2" H 6750 4350 50  0000 L CNN
-F 1 "680nF" H 6750 4150 50  0000 L CNN
-F 2 "discret:C2" H 6700 4250 60  0001 C CNN
-F 3 "" H 6700 4250 60  0001 C CNN
-	1    6700 4250
+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
 	0    1    1    0   
 $EndComp
 $Comp
 L R R3
 U 1 1 4549F3AD
-P 6900 5100
-F 0 "R3" V 6980 5100 50  0000 C CNN
-F 1 "100K" V 6900 5100 50  0000 C CNN
-F 2 "discret:R3" H 6900 5100 60  0001 C CNN
-F 3 "" H 6900 5100 60  0001 C CNN
-	1    6900 5100
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 4650 5100
-F 0 "R4" V 4730 5100 50  0000 C CNN
-F 1 "47K" V 4650 5100 50  0000 C CNN
-F 2 "discret:R3" H 4650 5100 60  0001 C CNN
-F 3 "" H 4650 5100 60  0001 C CNN
-	1    4650 5100
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 5050 5100
-F 0 "R2" V 5130 5100 50  0000 C CNN
-F 1 "1.5K" V 5050 5100 50  0000 C CNN
-F 2 "discret:R3" H 5050 5100 60  0001 C CNN
-F 3 "" H 5050 5100 60  0001 C CNN
-	1    5050 5100
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 4549F38A
-P 6500 3700
-F 0 "R1" V 6580 3700 50  0000 C CNN
-F 1 "1.5K" V 6500 3700 50  0000 C CNN
-F 2 "discret:R3" H 6500 3700 60  0001 C CNN
-F 3 "" H 6500 3700 60  0001 C CNN
-	1    6500 3700
-	1    0    0    -1  
+P 6200 3350
+F 0 "R1" H 6300 3150 50  0000 C CNN
+F 1 "1.5K" V 6200 3350 50  0000 C CNN
+F 2 "discret:R3" H 6200 3350 60  0001 C CNN
+F 3 "" H 6200 3350 60  0001 C CNN
+	1    6200 3350
+	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR08
 U 1 1 53B6F370
-P 6900 3700
-F 0 "#PWR08" H 6900 3700 30  0001 C CNN
-F 1 "GND" H 6900 3630 30  0001 C CNN
-F 2 "" H 6900 3700 60  0001 C CNN
-F 3 "" H 6900 3700 60  0001 C CNN
-	1    6900 3700
-	1    0    0    -1  
+P 3400 2550
+F 0 "#PWR08" 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
+	-1   0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P5
 U 1 1 54A5890A
-P 6050 7050
-F 0 "P5" H 6130 7050 40  0000 L CNN
-F 1 "CONN_1" H 6050 7105 30  0001 C CNN
-F 2 "connect:1pin" H 6050 7050 60  0001 C CNN
-F 3 "" H 6050 7050 60  0000 C CNN
-	1    6050 7050
+P 6250 7000
+F 0 "P5" H 6330 7000 40  0000 L CNN
+F 1 "CONN_1" H 6250 7055 30  0001 C CNN
+F 2 "connect:1pin" H 6250 7000 60  0001 C CNN
+F 3 "" H 6250 7000 60  0000 C CNN
+	1    6250 7000
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P6
 U 1 1 54A58C65
-P 6050 7150
-F 0 "P6" H 6130 7150 40  0000 L CNN
-F 1 "CONN_1" H 6050 7205 30  0001 C CNN
-F 2 "connect:1pin" H 6050 7150 60  0001 C CNN
-F 3 "" H 6050 7150 60  0000 C CNN
-	1    6050 7150
+P 6250 7100
+F 0 "P6" H 6330 7100 40  0000 L CNN
+F 1 "CONN_1" H 6250 7155 30  0001 C CNN
+F 2 "connect:1pin" H 6250 7100 60  0001 C CNN
+F 3 "" H 6250 7100 60  0000 C CNN
+	1    6250 7100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P7
 U 1 1 54A58C8A
-P 6050 7250
-F 0 "P7" H 6130 7250 40  0000 L CNN
-F 1 "CONN_1" H 6050 7305 30  0001 C CNN
-F 2 "connect:1pin" H 6050 7250 60  0001 C CNN
-F 3 "" H 6050 7250 60  0000 C CNN
-	1    6050 7250
+P 6250 7200
+F 0 "P7" H 6330 7200 40  0000 L CNN
+F 1 "CONN_1" H 6250 7255 30  0001 C CNN
+F 2 "connect:1pin" H 6250 7200 60  0001 C CNN
+F 3 "" H 6250 7200 60  0000 C CNN
+	1    6250 7200
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P8
 U 1 1 54A58CA3
-P 6050 7350
-F 0 "P8" H 6130 7350 40  0000 L CNN
-F 1 "CONN_1" H 6050 7405 30  0001 C CNN
-F 2 "connect:1pin" H 6050 7350 60  0001 C CNN
-F 3 "" H 6050 7350 60  0000 C CNN
-	1    6050 7350
+P 6250 7300
+F 0 "P8" H 6330 7300 40  0000 L CNN
+F 1 "CONN_1" H 6250 7355 30  0001 C CNN
+F 2 "connect:1pin" H 6250 7300 60  0001 C CNN
+F 3 "" H 6250 7300 60  0000 C CNN
+	1    6250 7300
+	1    0    0    -1  
+$EndComp
+Connection ~ 2400 3500
+Wire Wire Line
+	2500 3700 2000 3700
+Wire Wire Line
+	2600 3500 2600 3400
+Wire Wire Line
+	5350 4250 5900 4250
+Wire Wire Line
+	5700 4250 5700 4850
+Connection ~ 5700 4250
+Wire Wire Line
+	6200 2950 6200 3100
+Connection ~ 6200 3700
+Wire Wire Line
+	6000 2550 5900 2550
+Wire Wire Line
+	5900 2550 5900 3700
+Wire Wire Line
+	5900 3700 6200 3700
+Connection ~ 7400 3000
+Wire Wire Line
+	6750 3000 6200 3000
+Connection ~ 6200 3000
+Wire Wire Line
+	6300 2000 6300 2150
+Wire Wire Line
+	3400 2100 3400 2000
+Wire Wire Line
+	3400 2550 3400 2500
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 550EA992
+P 3000 1950
+F 0 "#FLG?" H 3000 2220 30  0001 C CNN
+F 1 "PWR_FLAG" H 3000 2180 30  0000 C CNN
+F 2 "" H 3000 1950 60  0001 C CNN
+F 3 "" H 3000 1950 60  0001 C CNN
+	1    3000 1950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 1950 3000 2000
+Connection ~ 3000 2000
+$Comp
+L GND #PWR?
+U 1 1 550EAB37
+P 3000 2550
+F 0 "#PWR?" H 3000 2550 30  0001 C CNN
+F 1 "GND" H 3000 2480 30  0001 C CNN
+F 2 "" H 3000 2550 60  0001 C CNN
+F 3 "" H 3000 2550 60  0001 C CNN
+	1    3000 2550
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 2350 3000 2550
+Wire Wire Line
+	2000 2200 2800 2200
+Wire Wire Line
+	2800 2200 2800 2450
+Wire Wire Line
+	2800 2450 3000 2450
+Connection ~ 3000 2450
+$Comp
+L GND #PWR?
+U 1 1 550EAF5A
+P 5450 4600
+F 0 "#PWR?" H 5450 4600 30  0001 C CNN
+F 1 "GND" H 5450 4530 30  0001 C CNN
+F 2 "" H 5450 4600 60  0000 C CNN
+F 3 "" H 5450 4600 60  0000 C CNN
+	1    5450 4600
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	5450 4600 5450 4450
+Wire Wire Line
+	5450 4450 5350 4450
+Wire Wire Line
+	6100 5350 6100 5400
+Wire Wire Line
+	5700 5350 5700 5400
+Wire Wire Line
+	7900 3200 7800 3200
+Wire Wire Line
+	7800 3200 7800 3300
+Wire Wire Line
+	7400 3750 7400 3700
 $EndSCHEMATC
diff --git a/demos/ecc83/ecc83-pp_v2.sch b/demos/ecc83/ecc83-pp_v2.sch
index 624d826..4114c0a 100644
--- a/demos/ecc83/ecc83-pp_v2.sch
+++ b/demos/ecc83/ecc83-pp_v2.sch
@@ -1,10 +1,29 @@
 EESchema Schematic File Version 2
 LIBS:power
 LIBS:device
-LIBS:valves
 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
@@ -12,7 +31,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "ECC Push-Pull"
-Date "11 dec 2006"
+Date "Sat 21 Mar 2015"
 Rev "0.1"
 Comp ""
 Comment1 ""
@@ -20,285 +39,203 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Wire Wire Line
-	6050 4450 6150 4450
-Wire Wire Line
-	5750 3850 5750 4050
-Connection ~ 4450 4500
-Wire Wire Line
-	4450 5400 4450 4450
-Wire Wire Line
-	4450 4450 4650 4450
-Wire Wire Line
-	1900 6750 2000 6750
-Wire Wire Line
-	2000 6750 2000 6550
-Wire Wire Line
-	4150 5300 4150 5000
-Wire Wire Line
-	6950 5150 6950 5000
-Wire Wire Line
-	4150 4800 4450 4800
-Connection ~ 4450 4800
-Wire Wire Line
-	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
-	6700 4250 6950 4250
-Wire Wire Line
-	6150 4450 6150 3900
-Connection ~ 6150 3900
-Wire Wire Line
-	6300 4500 6300 4900
-Connection ~ 6300 4800
-Wire Wire Line
-	6950 4800 6700 4800
-Wire Wire Line
-	6700 4800 6700 5400
-Wire Wire Line
-	2100 6550 2100 6750
-Wire Wire Line
-	2100 6650 1900 6650
-Connection ~ 2100 6650
-Wire Wire Line
-	4100 5250 4150 5250
-Connection ~ 4150 5250
-Wire Wire Line
-	1900 6650 1900 6550
-Wire Wire Line
-	6300 3900 4950 3900
-Wire Wire Line
-	4950 3900 4950 4050
-Wire Wire Line
-	5850 4850 5850 4900
-Wire Wire Line
-	5850 4900 6300 4900
 $Comp
 L ECC83 U1
 U 3 1 48B4F266
-P 2000 6100
-F 0 "U1" H 2130 6410 50  0000 C CNN
-F 1 "ECC83" H 2350 5800 50  0000 C CNN
-F 2 "Valves:VALVE-ECC-83-2" V 1750 6100 30  0000 C CNN
-F 3 "" H 2000 6100 60  0001 C CNN
-	3    2000 6100
+P 3900 3050
+F 0 "U1" H 4400 3150 50  0000 C CNN
+F 1 "ECC83" H 4400 3050 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-2" H 4400 2950 30  0000 C CNN
+F 3 "" H 3900 3050 60  0001 C CNN
+	3    3900 3050
 	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 CNN
-F 1 "ECC83" H 5150 4100 50  0000 C CNN
-F 2 "Valves:VALVE-ECC-83-2" H 5150 4000 30  0000 C CNN
-F 3 "" H 4950 4450 60  0001 C CNN
-	2    4950 4450
+P 6500 4200
+F 0 "U1" H 7000 4300 50  0000 C CNN
+F 1 "ECC83" H 7000 4200 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-2" H 7000 4100 30  0000 C CNN
+F 3 "" H 6500 4200 60  0001 C CNN
+	2    6500 4200
 	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 CNN
-F 1 "ECC83" H 5500 4150 50  0000 C CNN
-F 2 "Valves:VALVE-ECC-83-2" H 5750 3950 30  0000 C CNN
-F 3 "" H 5750 4450 60  0001 C CNN
-	1    5750 4450
-	-1   0    0    -1  
+P 6600 2300
+F 0 "U1" H 7100 2400 50  0000 C CNN
+F 1 "ECC83" H 7100 2300 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-2" H 7100 2200 30  0000 C CNN
+F 3 "" H 6600 2300 60  0001 C CNN
+	1    6600 2300
+	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 CNN
-F 1 "GND" H 6950 5080 30  0001 C CNN
-F 2 "" H 6950 5150 60  0001 C CNN
-F 3 "" H 6950 5150 60  0001 C CNN
-	1    6950 5150
+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
 	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 CNN
-F 1 "GND" H 6700 5830 30  0001 C CNN
-F 2 "" H 6700 5900 60  0001 C CNN
-F 3 "" H 6700 5900 60  0001 C CNN
-	1    6700 5900
+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
 	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 CNN
-F 1 "GND" H 4850 5830 30  0001 C CNN
-F 2 "" H 4850 5900 60  0001 C CNN
-F 3 "" H 4850 5900 60  0001 C CNN
-	1    4850 5900
+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
 	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 CNN
-F 1 "GND" H 4450 5830 30  0001 C CNN
-F 2 "" H 4450 5900 60  0001 C CNN
-F 3 "" H 4450 5900 60  0001 C CNN
-	1    4450 5900
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG05
 U 1 1 457DBAC0
-P 4100 5250
-F 0 "#FLG05" H 4100 5520 30  0001 C CNN
-F 1 "PWR_FLAG" H 4100 5480 30  0000 C CNN
-F 2 "" H 4100 5250 60  0001 C CNN
-F 3 "" H 4100 5250 60  0001 C CNN
-	1    4100 5250
-	0    -1   -1   0   
+P 3700 2200
+F 0 "#FLG05" H 3700 2470 30  0001 C CNN
+F 1 "PWR_FLAG" H 3700 2430 30  0000 C CNN
+F 2 "" H 3700 2200 60  0001 C CNN
+F 3 "" H 3700 2200 60  0001 C CNN
+	1    3700 2200
+	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P4
 U 1 1 456A8ACC
-P 2000 7100
-F 0 "P4" V 1950 7100 40  0000 C CNN
-F 1 "CONN_2" V 2050 7100 40  0000 C CNN
-F 2 "pin_array:pin_array_1x02" V 2150 7100 30  0000 C CNN
-F 3 "" H 2000 7100 60  0001 C CNN
-	1    2000 7100
-	0    1    1    0   
+P 3050 3700
+F 0 "P4" V 3000 3700 40  0000 C CNN
+F 1 "CONN_2" V 3100 3700 40  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 3050 3500 30  0000 C CNN
+F 3 "" H 3050 3700 60  0001 C CNN
+	1    3050 3700
+	-1   0    0    -1  
 $EndComp
 $Comp
 L C C1
 U 1 1 4549F4BE
-P 6700 4050
-F 0 "C1" H 6750 4150 50  0000 L CNN
-F 1 "10uF" H 6450 4150 50  0000 L CNN
-F 2 "discret:C2V10" H 6700 3950 30  0000 C CNN
-F 3 "" H 6700 4050 60  0001 C CNN
-	1    6700 4050
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR06
-U 1 1 4549F4B9
-P 4150 5300
-F 0 "#PWR06" H 4150 5300 30  0001 C CNN
-F 1 "GND" H 4150 5230 30  0001 C CNN
-F 2 "" H 4150 5300 60  0001 C CNN
-F 3 "" H 4150 5300 60  0001 C CNN
-	1    4150 5300
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR07
-U 1 1 4549F4B3
-P 6950 4350
-F 0 "#PWR07" H 6950 4350 30  0001 C CNN
-F 1 "GND" H 6950 4280 30  0001 C CNN
-F 2 "" H 6950 4350 60  0001 C CNN
-F 3 "" H 6950 4350 60  0001 C CNN
-	1    6950 4350
+P 4100 2100
+F 0 "C1" H 4250 2150 50  0000 L CNN
+F 1 "10uF" H 4250 2050 50  0000 L CNN
+F 2 "discret:C2V10" H 4300 1900 30  0000 C CNN
+F 3 "" H 4100 2100 60  0001 C CNN
+	1    4100 2100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P3
 U 1 1 4549F4A5
-P 7300 3950
-F 0 "P3" V 7250 3950 40  0000 C CNN
-F 1 "POWER" V 7350 3950 40  0000 C CNN
-F 2 "pin_array:pin_array_1x02" V 7450 3950 30  0000 C CNN
-F 3 "" H 7300 3950 60  0001 C CNN
-	1    7300 3950
-	1    0    0    -1  
+P 3050 1900
+F 0 "P3" V 3000 1900 40  0000 C CNN
+F 1 "POWER" V 3100 1900 40  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 3050 1700 30  0000 C CNN
+F 3 "" H 3050 1900 60  0001 C CNN
+	1    3050 1900
+	-1   0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P2
 U 1 1 4549F46C
-P 7300 4900
-F 0 "P2" V 7250 4900 40  0000 C CNN
-F 1 "OUT" V 7350 4900 40  0000 C CNN
-F 2 "pin_array:pin_array_1x02" V 7450 4900 30  0000 C CNN
-F 3 "" H 7300 4900 60  0001 C CNN
-	1    7300 4900
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 4549F464
-P 3800 4900
-F 0 "P1" V 3750 4900 40  0000 C CNN
-F 1 "IN" V 3850 4900 40  0000 C CNN
-F 2 "pin_array:pin_array_1x02" V 3950 4900 30  0000 C CNN
-F 3 "" H 3800 4900 60  0001 C CNN
-	1    3800 4900
+P 5350 4300
+F 0 "P1" V 5300 4300 40  0000 C CNN
+F 1 "IN" V 5400 4300 40  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 5350 4500 30  0000 C CNN
+F 3 "" H 5350 4300 60  0001 C CNN
+	1    5350 4300
 	-1   0    0    1   
 $EndComp
 $Comp
 L C C2
 U 1 1 4549F3BE
-P 6500 4800
-F 0 "C2" H 6550 4900 50  0000 L CNN
-F 1 "680nF" H 6550 4700 50  0000 L CNN
-F 2 "discret:CP8" V 6350 4800 30  0000 C CNN
-F 3 "" H 6500 4800 60  0001 C CNN
-	1    6500 4800
+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
 	0    1    1    0   
 $EndComp
 $Comp
 L R R3
 U 1 1 4549F3AD
-P 6700 5650
-F 0 "R3" V 6780 5650 50  0000 C CNN
-F 1 "100K" V 6700 5650 50  0000 C CNN
-F 2 "discret:R3" H 6700 5650 60  0000 C CNN
-F 3 "" H 6700 5650 60  0001 C CNN
-	1    6700 5650
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 4450 5650
-F 0 "R4" V 4530 5650 50  0000 C CNN
-F 1 "47K" V 4450 5650 50  0000 C CNN
-F 2 "discret:R3" V 4350 5650 60  0000 C CNN
-F 3 "" H 4450 5650 60  0001 C CNN
-	1    4450 5650
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 4850 5650
-F 0 "R2" V 4930 5650 50  0000 C CNN
-F 1 "1.5K" V 4850 5650 50  0000 C CNN
-F 2 "discret:R3" V 4756 5656 60  0000 C CNN
-F 3 "" H 4850 5650 60  0001 C CNN
-	1    4850 5650
+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
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 4549F38A
-P 6300 4250
-F 0 "R1" V 6380 4250 50  0000 C CNN
-F 1 "1.5K" V 6300 4250 50  0000 C CNN
-F 2 "discret:R3" V 6450 4250 30  0000 C CNN
-F 3 "" H 6300 4250 60  0001 C CNN
-	1    6300 4250
-	1    0    0    -1  
+P 6500 3250
+F 0 "R1" H 6600 3050 50  0000 C CNN
+F 1 "1.5K" V 6500 3250 50  0000 C CNN
+F 2 "discret:R3" V 6400 3250 30  0000 C CNN
+F 3 "" H 6500 3250 60  0001 C CNN
+	1    6500 3250
+	-1   0    0    1   
 $EndComp
 $Comp
 L CONN_1 P5
@@ -348,4 +285,128 @@ NoConn ~ 6150 6600
 NoConn ~ 6150 6700
 NoConn ~ 6150 6800
 NoConn ~ 6150 6900
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 550E41D9
+P 3700 1700
+F 0 "#FLG?" 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
+	1    3700 1700
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 550E42C4
+P 4100 2500
+F 0 "#PWR?" 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
+	1    4100 2500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3400 3800 3900 3800
+Wire Wire Line
+	3900 3800 3900 3500
+Wire Wire Line
+	6400 4600 6400 5150
+Wire Wire Line
+	7550 2900 7700 2900
+Wire Wire Line
+	7700 2900 8100 2900
+Wire Wire Line
+	3400 3600 3800 3600
+Wire Wire Line
+	3800 3600 4000 3600
+Wire Wire Line
+	3800 3600 3800 3500
+Wire Wire Line
+	6500 3500 6500 3600
+Wire Wire Line
+	6500 3600 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
+Wire Wire Line
+	6500 3600 6100 3600
+Wire Wire Line
+	6100 3600 6100 2300
+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
+Wire Wire Line
+	6600 1800 6600 1900
+Wire Wire Line
+	3700 1700 3700 1800
+Connection ~ 3700 1800
+Wire Wire Line
+	3400 2000 3500 2000
+Wire Wire Line
+	3500 2000 3500 2400
+Wire Wire Line
+	3500 2400 3700 2400
+Wire Wire Line
+	3700 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
+Connection ~ 4100 2400
+Wire Wire Line
+	4100 1900 4100 1800
+Connection ~ 4100 1800
+Wire Wire Line
+	6500 2900 7150 2900
+Connection ~ 7700 2900
+Wire Wire Line
+	7700 3900 7700 4000
+Wire Wire Line
+	7700 3400 7700 2900
+Wire Wire Line
+	8100 3100 7950 3100
+Wire Wire Line
+	7950 3100 7950 3250
+Wire Wire Line
+	5700 4200 6000 4200
+Wire Wire Line
+	6000 4200 6200 4200
+Wire Wire Line
+	6000 5150 6000 4200
+Connection ~ 6000 4200
+$Comp
+L GND #PWR?
+U 1 1 550E4C85
+P 5800 4550
+F 0 "#PWR?" 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
+	1    5800 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5800 4550 5800 4400
+Wire Wire Line
+	5800 4400 5700 4400
+Wire Wire Line
+	6400 5650 6400 5700
+Wire Wire Line
+	6000 5650 6000 5700
 $EndSCHEMATC
diff --git a/demos/flat_hierarchy/flat_hierarchy.sch b/demos/flat_hierarchy/flat_hierarchy.sch
index f40cd6c..c4f47be 100644
--- a/demos/flat_hierarchy/flat_hierarchy.sch
+++ b/demos/flat_hierarchy/flat_hierarchy.sch
@@ -28,13 +28,13 @@ LIBS:siliconi
 LIBS:opto
 LIBS:atmel
 LIBS:flat_hierarchy-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 3
 Title ""
-Date "15 jun 2008"
+Date "Sun 22 Mar 2015"
 Rev "1"
 Comp ""
 Comment1 ""
@@ -43,13 +43,13 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Sheet
-S 5550 2650 2100 1700
+S 5600 2600 2100 1700
 U 48553E7C
 F0 "sockets" 60
 F1 "pic_sockets.sch" 60
 $EndSheet
 $Sheet
-S 3150 2650 1650 1700
+S 3200 2600 1650 1700
 U 48553E53
 F0 "pic_programmer" 60
 F1 "pic_programmer.sch" 60
diff --git a/demos/flat_hierarchy/pic_programmer.sch b/demos/flat_hierarchy/pic_programmer.sch
index ad17812..6d6b5c5 100644
--- a/demos/flat_hierarchy/pic_programmer.sch
+++ b/demos/flat_hierarchy/pic_programmer.sch
@@ -28,13 +28,13 @@ LIBS:siliconi
 LIBS:opto
 LIBS:atmel
 LIBS:flat_hierarchy-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 3
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
-Date "15 apr 2008"
+Date "Sun 22 Mar 2015"
 Rev "2"
 Comp "KiCad"
 Comment1 ""
@@ -42,430 +42,387 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Connection ~ 9100 3200
+Connection ~ 8700 3800
 Wire Wire Line
-	9100 3200 9100 3050
+	8700 3800 8700 3600
 Wire Wire Line
-	4850 4750 4850 5100
+	6200 1350 6200 1500
+Connection ~ 8300 3800
 Wire Wire Line
-	5700 1250 6100 1250
+	8300 3800 8300 3700
 Wire Wire Line
-	5700 1250 5700 1200
-Connection ~ 8650 3200
+	7400 4050 7400 4100
 Wire Wire Line
-	8650 3200 8650 3150
+	7900 4500 7900 4400
 Wire Wire Line
-	7100 1600 6550 1600
+	7600 3400 7400 3400
 Wire Wire Line
-	7400 2900 7350 2900
+	7900 3600 7900 3800
 Wire Wire Line
-	7650 3300 7650 3200
+	7900 3800 7900 3900
+Connection ~ 7900 5500
 Wire Wire Line
-	8000 2900 7900 2900
+	8100 5500 8100 5550
 Wire Wire Line
-	8300 3100 8300 3200
+	7800 5500 7900 5500
 Wire Wire Line
-	9350 6500 9300 6500
+	7900 5500 8100 5500
 Wire Wire Line
-	9300 6500 9300 6250
+	2900 5850 3000 5850
 Wire Wire Line
-	9300 6250 8650 6250
-Wire Wire Line
-	9650 6750 9500 6750
-Wire Wire Line
-	9650 6250 9500 6250
-Connection ~ 1400 6850
-Wire Wire Line
-	1600 6900 1600 6850
-Wire Wire Line
-	1600 6850 1350 6850
-Wire Wire Line
-	10150 6250 10150 5950
-Wire Wire Line
-	9100 6000 8700 6000
-Wire Wire Line
-	8700 6000 8700 5750
-Wire Wire Line
-	8950 6900 9100 6900
-Wire Wire Line
-	9100 6900 9100 6600
-Wire Wire Line
-	9100 6600 9150 6600
-Wire Wire Line
-	8700 6600 8500 6600
-Wire Wire Line
-	8500 6600 8500 6700
-Wire Wire Line
-	8000 6700 7900 6700
-Wire Wire Line
-	7900 6700 7900 6900
-Wire Wire Line
-	7900 6900 8550 6900
-Wire Wire Line
-	7350 6750 7350 6700
-Wire Wire Line
-	7350 6700 7500 6700
+	3000 5850 3100 5850
 Wire Notes Line
-	11050 5050 11050 7000
+	4600 5150 4600 7700
 Wire Notes Line
-	11050 5050 5650 5050
-Wire Wire Line
-	8700 5750 8650 5750
-Wire Wire Line
-	9300 5650 9300 5750
+	4600 5150 600  5150
 Wire Notes Line
-	5650 5050 5650 7000
+	600  5150 600  7700
 Wire Notes Line
-	5650 7000 11050 7000
-Wire Wire Line
-	10150 6750 10150 6800
-Connection ~ 9950 6000
+	600  7700 4600 7700
+Connection ~ 3600 5850
 Wire Wire Line
-	9950 6000 9950 5950
+	1900 5300 1900 5350
 Wire Wire Line
-	7650 5300 7650 5250
+	1900 5350 1900 5400
+Connection ~ 10200 5300
 Wire Wire Line
-	10700 6050 10700 6000
+	10200 5250 10200 5300
 Wire Wire Line
-	10700 6000 10650 6000
-Connection ~ 10150 6000
+	10200 5300 10200 5350
+Connection ~ 9650 5300
 Wire Wire Line
-	10250 6000 9500 6000
+	9550 5300 9650 5300
 Wire Wire Line
-	1700 3700 2250 3700
+	9650 5300 10200 5300
 Wire Wire Line
-	3900 4200 2250 4200
+	10200 5950 10200 5850
 Wire Wire Line
-	2250 4200 2250 3700
-Connection ~ 3400 6650
+	9650 5300 9650 5350
+Connection ~ 8400 5300
 Wire Wire Line
-	3400 6600 3400 6650
-Connection ~ 3200 6650
+	8400 5350 8400 5300
 Wire Wire Line
-	3600 6650 3100 6650
+	8300 5300 8400 5300
 Wire Wire Line
-	4150 6750 4150 6650
+	8400 5300 8750 5300
 Wire Wire Line
-	4150 6650 4100 6650
+	7900 5600 7900 5500
 Wire Wire Line
-	3200 6650 3200 6700
-Connection ~ 1950 6650
+	7900 5300 7800 5300
 Wire Wire Line
-	1950 6700 1950 6650
+	8900 1500 9000 1500
 Wire Wire Line
-	2300 6650 1850 6650
+	9000 1500 9100 1500
 Wire Wire Line
-	1400 6900 1400 6850
+	5800 4500 5600 4500
 Wire Wire Line
-	1450 6650 1350 6650
+	5400 3150 5500 3150
 Wire Wire Line
-	8350 1600 7600 1600
+	5500 3150 5800 3150
+Connection ~ 6700 1400
 Wire Wire Line
-	6300 4750 5350 4750
+	6700 1300 6700 1400
 Wire Wire Line
-	6200 3150 5350 3150
+	6700 1400 6700 1500
 Wire Wire Line
-	5150 1700 4950 1700
+	6700 1500 6700 1700
 Wire Wire Line
-	5450 1400 5450 1500
+	7900 1000 7900 900 
 Wire Wire Line
-	5450 1400 5500 1400
-Connection ~ 6100 1400
+	7900 1400 7900 1500
 Wire Wire Line
-	6250 1400 6000 1400
+	7900 1500 7900 1600
 Wire Wire Line
-	6100 1250 6100 1400
+	7900 2550 7900 2600
 Wire Wire Line
-	6550 1200 6550 1100
+	7900 2100 7900 2150
 Wire Wire Line
-	6550 1600 6550 1650
+	2100 4400 3200 4400
 Wire Wire Line
-	6550 2600 6550 2650
+	3200 4400 3300 4400
 Wire Wire Line
-	6550 2150 6550 2200
-Wire Wire Line
-	3250 5100 2100 5100
-Wire Wire Line
-	2100 5100 2100 3500
+	2100 4400 2100 3500
 Wire Wire Line
 	2100 3500 1700 3500
 Wire Wire Line
-	2450 3800 2450 3150
+	2400 3250 3000 3250
+Wire Wire Line
+	3000 3250 3100 3250
 Wire Wire Line
-	2450 3800 1700 3800
+	2200 1300 2900 1300
 Wire Wire Line
-	2850 1700 2250 1700
+	2900 1300 3150 1300
 Wire Wire Line
-	2250 1700 2250 3600
+	2200 1300 2200 3600
 Wire Wire Line
-	2250 3600 1700 3600
+	2200 3600 1700 3600
+Connection ~ 5500 3150
 Wire Wire Line
-	2450 3150 3250 3150
-Connection ~ 5400 3150
+	4600 2200 5500 2200
 Wire Wire Line
-	4800 4200 5400 4200
+	5500 2200 5500 3150
 Wire Wire Line
-	5400 4200 5400 3150
+	5000 4500 5100 4500
 Wire Wire Line
-	4850 5100 4800 5100
+	4850 1200 4750 1200
 Wire Wire Line
-	4450 1700 4400 1700
+	4900 3150 4800 3150
+Connection ~ 3200 4400
 Wire Wire Line
-	4850 3150 4800 3150
-Connection ~ 3200 5100
+	3200 4500 3200 4400
 Wire Wire Line
-	3200 5150 3200 5100
+	3900 4300 3900 4400
 Wire Wire Line
-	3850 5050 3850 5200
-Connection ~ 3850 5100
+	3900 4400 3900 4500
 Wire Wire Line
-	3750 5100 3900 5100
-Connection ~ 3200 3150
+	3900 4500 3900 4600
+Connection ~ 3900 4500
+Connection ~ 3000 3250
 Wire Wire Line
-	3200 3200 3200 3150
+	3000 3250 3000 3350
 Wire Wire Line
-	3850 3100 3850 3250
-Connection ~ 3850 3150
+	3700 3050 3700 3150
 Wire Wire Line
-	3750 3150 3900 3150
-Connection ~ 2800 1700
+	3700 3150 3700 3250
 Wire Wire Line
-	2800 1750 2800 1700
+	3700 3250 3700 3350
+Connection ~ 3700 3250
 Wire Wire Line
-	3450 1650 3450 1800
-Connection ~ 3450 1700
+	3600 3250 3700 3250
+Connection ~ 2900 1300
 Wire Wire Line
-	3350 1700 3500 1700
+	2900 1400 2900 1300
 Wire Wire Line
-	7900 2900 7900 2650
+	3750 1100 3750 1200
 Wire Wire Line
-	8150 3200 9200 3200
-Connection ~ 8300 3200
+	3750 1200 3750 1300
 Wire Wire Line
-	5450 1500 5850 1500
+	3750 1300 3750 1400
+Connection ~ 3750 1300
 Wire Wire Line
-	5850 1500 5850 2900
+	7400 3300 7400 3400
 Wire Wire Line
-	5850 2900 6950 2900
+	7400 3400 7400 3550
+Connection ~ 7900 3800
 Wire Wire Line
-	7050 1850 7050 1600
-Connection ~ 7050 1600
+	8300 1700 8300 1500
+Connection ~ 8300 1500
 Wire Wire Line
-	5700 800  5700 750 
+	6200 950  6200 750 
 Wire Wire Line
-	5700 750  6100 750 
+	6700 700  6700 750 
 Wire Wire Line
-	6100 750  6100 700 
+	6700 750  6700 800 
 Wire Wire Line
-	7800 1500 7800 1600
-Connection ~ 7800 1600
+	9000 1400 9000 1500
+Connection ~ 9000 1500
 $Comp
 L PWR_FLAG #FLG015
 U 1 1 48553F47
-P 9100 3050
-F 0 "#FLG015" H 9100 3320 30  0001 C CNN
-F 1 "PWR_FLAG" H 9100 3280 30  0000 C CNN
-F 2 "" H 9100 3050 60  0001 C CNN
-F 3 "" H 9100 3050 60  0001 C CNN
-	1    9100 3050
+P 8700 3600
+F 0 "#FLG015" H 8700 3870 30  0001 C CNN
+F 1 "PWR_FLAG" H 8700 3830 30  0000 C CNN
+F 2 "" H 8700 3600 60  0001 C CNN
+F 3 "" H 8700 3600 60  0001 C CNN
+	1    8700 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG016
 U 1 1 48553F27
-P 7800 1500
-F 0 "#FLG016" H 7800 1770 30  0001 C CNN
-F 1 "PWR_FLAG" H 7800 1730 30  0000 C CNN
-F 2 "" H 7800 1500 60  0001 C CNN
-F 3 "" H 7800 1500 60  0001 C CNN
-	1    7800 1500
+P 9000 1400
+F 0 "#FLG016" H 9000 1670 30  0001 C CNN
+F 1 "PWR_FLAG" H 9000 1630 30  0000 C CNN
+F 2 "" H 9000 1400 60  0001 C CNN
+F 3 "" H 9000 1400 60  0001 C CNN
+	1    9000 1400
 	1    0    0    -1  
 $EndComp
-Text GLabel 6300 4750 2    60   Output ~ 0
+Text GLabel 5800 4500 2    60   Output ~ 0
 CLOCK-RB6
-Text GLabel 6200 3150 2    60   Output ~ 0
+Text GLabel 5800 3150 2    60   Output ~ 0
 DATA-RB7
-Text GLabel 8350 1600 2    60   Output ~ 0
+Text GLabel 9100 1500 2    60   Output ~ 0
 VPP-MCLR
-Text GLabel 9200 3200 2    60   Output ~ 0
+Text GLabel 8900 3800 2    60   Output ~ 0
 VCC_PIC
 $Comp
 L C C9
 U 1 1 464AD280
-P 5700 1000
-F 0 "C9" H 5750 1100 50  0000 L CNN
-F 1 "22OnF" H 5750 900 50  0000 L CNN
-F 2 "" H 5700 1000 60  0001 C CNN
-F 3 "" H 5700 1000 60  0001 C CNN
-	1    5700 1000
+P 6200 1150
+F 0 "C9" H 6250 1250 50  0000 L CNN
+F 1 "22OnF" H 6250 1050 50  0000 L CNN
+F 2 "" H 6200 1150 60  0001 C CNN
+F 3 "" H 6200 1150 60  0001 C CNN
+	1    6200 1150
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR017
 U 1 1 4639BB04
-P 8650 2550
-F 0 "#PWR017" H 8650 2650 30  0001 C CNN
-F 1 "VCC" H 8650 2650 30  0000 C CNN
-F 2 "" H 8650 2550 60  0001 C CNN
-F 3 "" H 8650 2550 60  0001 C CNN
-	1    8650 2550
+P 8300 3100
+F 0 "#PWR017" H 8300 3200 30  0001 C CNN
+F 1 "VCC" H 8300 3200 40  0000 C CNN
+F 2 "" H 8300 3100 60  0001 C CNN
+F 3 "" H 8300 3100 60  0001 C CNN
+	1    8300 3100
 	1    0    0    -1  
 $EndComp
 $Comp
 L JUMPER JP1
 U 1 1 4639BAF8
-P 8650 2850
-F 0 "JP1" H 8650 3000 60  0000 C CNN
-F 1 "JUMPER" H 8650 2770 40  0000 C CNN
-F 2 "" H 8650 2850 60  0001 C CNN
-F 3 "" H 8650 2850 60  0001 C CNN
-	1    8650 2850
+P 8300 3400
+F 0 "JP1" V 8100 3500 60  0000 C CNN
+F 1 "JUMPER" H 8300 3320 40  0000 C CNN
+F 2 "" H 8300 3400 60  0001 C CNN
+F 3 "" H 8300 3400 60  0001 C CNN
+	1    8300 3400
 	0    1    1    0   
 $EndComp
 $Comp
 L DIODESCH D11
 U 1 1 4639BA28
-P 7150 2900
-F 0 "D11" H 7150 3000 40  0000 C CNN
-F 1 "BAT43" H 7150 2800 40  0000 C CNN
-F 2 "" H 7150 2900 60  0001 C CNN
-F 3 "" H 7150 2900 60  0001 C CNN
-	1    7150 2900
-	-1   0    0    1   
+P 7400 4300
+F 0 "D11" V 7350 4500 50  0000 C CNN
+F 1 "BAT43" V 7450 4500 50  0000 C CNN
+F 2 "" H 7400 4300 60  0001 C CNN
+F 3 "" H 7400 4300 60  0001 C CNN
+	1    7400 4300
+	0    1    1    0   
 $EndComp
 $Comp
 L VCC #PWR018
 U 1 1 4639BA17
-P 8300 2700
-F 0 "#PWR018" H 8300 2800 30  0001 C CNN
-F 1 "VCC" H 8300 2800 30  0000 C CNN
-F 2 "" H 8300 2700 60  0001 C CNN
-F 3 "" H 8300 2700 60  0001 C CNN
-	1    8300 2700
+P 7900 3200
+F 0 "#PWR018" H 7900 3300 30  0001 C CNN
+F 1 "VCC" H 7900 3300 40  0000 C CNN
+F 2 "" H 7900 3200 60  0001 C CNN
+F 3 "" H 7900 3200 60  0001 C CNN
+	1    7900 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR019
 U 1 1 4639B9EB
-P 7650 3700
-F 0 "#PWR019" H 7650 3700 30  0001 C CNN
-F 1 "GND" H 7650 3630 30  0001 C CNN
-F 2 "" H 7650 3700 60  0001 C CNN
-F 3 "" H 7650 3700 60  0001 C CNN
-	1    7650 3700
+P 7900 4950
+F 0 "#PWR019" H 7900 4950 30  0001 C CNN
+F 1 "GND" H 7900 4880 30  0001 C CNN
+F 2 "" H 7900 4950 60  0001 C CNN
+F 3 "" H 7900 4950 60  0001 C CNN
+	1    7900 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED D12
 U 1 1 4639B9EA
-P 7650 3500
-F 0 "D12" H 7650 3600 50  0000 C CNN
-F 1 "YELLOW-LED" H 7650 3400 50  0000 C CNN
-F 2 "" H 7650 3500 60  0001 C CNN
-F 3 "" H 7650 3500 60  0001 C CNN
-F 4 "YELLOW-LED" H 7700 3650 40  0000 C CNN "Champ4"
-	1    7650 3500
+P 7900 4700
+F 0 "D12" V 7800 4550 50  0000 C CNN
+F 1 "YELLOW-LED" H 7900 4800 50  0000 C CNN
+F 2 "" H 7900 4700 60  0001 C CNN
+F 3 "" H 7900 4700 60  0001 C CNN
+F 4 "YELLOW-LED" H 7900 4900 40  0000 C CNN "Champ4"
+	1    7900 4700
 	0    1    1    0   
 $EndComp
 $Comp
 L R R21
 U 1 1 4639B9E9
-P 7900 3200
-F 0 "R21" V 7980 3200 50  0000 C CNN
-F 1 "470" V 7900 3200 50  0000 C CNN
-F 2 "" H 7900 3200 60  0001 C CNN
-F 3 "" H 7900 3200 60  0001 C CNN
-	1    7900 3200
-	0    -1   -1   0   
+P 7900 4150
+F 0 "R21" H 7800 4350 50  0000 C CNN
+F 1 "470" V 7900 4150 50  0000 C CNN
+F 2 "" H 7900 4150 60  0001 C CNN
+F 3 "" H 7900 4150 60  0001 C CNN
+	1    7900 4150
+	1    0    0    -1  
 $EndComp
 $Comp
 L R R20
 U 1 1 4639B9B3
-P 7650 2650
-F 0 "R20" V 7730 2650 50  0000 C CNN
-F 1 "2.2K" V 7650 2650 50  0000 C CNN
-F 2 "" H 7650 2650 60  0001 C CNN
-F 3 "" H 7650 2650 60  0001 C CNN
-	1    7650 2650
-	0    -1   -1   0   
+P 7400 3050
+F 0 "R20" H 7300 3250 50  0000 C CNN
+F 1 "2.2K" V 7400 3050 50  0000 C CNN
+F 2 "" H 7400 3050 60  0001 C CNN
+F 3 "" H 7400 3050 60  0001 C CNN
+	1    7400 3050
+	1    0    0    -1  
 $EndComp
 $Comp
 L R R19
 U 1 1 4639B9B0
-P 7650 2900
-F 0 "R19" V 7730 2900 50  0000 C CNN
-F 1 "2.2K" V 7650 2900 50  0000 C CNN
-F 2 "" H 7650 2900 60  0001 C CNN
-F 3 "" H 7650 2900 60  0001 C CNN
-	1    7650 2900
-	0    -1   -1   0   
+P 7400 3800
+F 0 "R19" H 7500 3600 50  0000 C CNN
+F 1 "2.2K" V 7400 3800 50  0000 C CNN
+F 2 "" H 7400 3800 60  0001 C CNN
+F 3 "" H 7400 3800 60  0001 C CNN
+	1    7400 3800
+	-1   0    0    1   
 $EndComp
 $Comp
 L PNP Q3
 U 1 1 4639B996
-P 8200 2900
-F 0 "Q3" H 8350 2900 60  0000 C CNN
-F 1 "BC307" H 8104 3050 60  0000 C CNN
-F 2 "" H 8200 2900 60  0001 C CNN
-F 3 "" H 8200 2900 60  0001 C CNN
-	1    8200 2900
+P 7800 3400
+F 0 "Q3" H 7700 3150 50  0000 C CNN
+F 1 "BC307" H 7700 3250 50  0000 C CNN
+F 2 "" H 7800 3400 60  0001 C CNN
+F 3 "" H 7800 3400 60  0001 C CNN
+	1    7800 3400
 	1    0    0    1   
 $EndComp
 $Comp
 L VCC #PWR020
 U 1 1 4638AB33
-P 7400 2650
-F 0 "#PWR020" H 7400 2750 30  0001 C CNN
-F 1 "VCC" H 7400 2750 30  0000 C CNN
-F 2 "" H 7400 2650 60  0001 C CNN
-F 3 "" H 7400 2650 60  0001 C CNN
-	1    7400 2650
+P 7400 2750
+F 0 "#PWR020" H 7400 2850 30  0001 C CNN
+F 1 "VCC" H 7400 2850 40  0000 C CNN
+F 2 "" H 7400 2750 60  0001 C CNN
+F 3 "" H 7400 2750 60  0001 C CNN
+	1    7400 2750
 	1    0    0    -1  
 $EndComp
-Text Notes 9700 6500 0    50   ~ 0
+Text Notes 2600 6900 0    50   ~ 0
 ADJUST for VPP = 13V
 $Comp
 L POT RV1
 U 1 1 443D0101
-P 9500 6500
-F 0 "RV1" H 9500 6400 50  0000 C CNN
-F 1 "1K" H 9500 6500 50  0000 C CNN
-F 2 "" H 9500 6500 60  0001 C CNN
-F 3 "" H 9500 6500 60  0001 C CNN
-	1    9500 6500
+P 3600 6750
+F 0 "RV1" V 3750 6900 50  0000 C CNN
+F 1 "1K" H 3600 6750 50  0000 C CNN
+F 2 "" H 3600 6750 60  0001 C CNN
+F 3 "" H 3600 6750 60  0001 C CNN
+	1    3600 6750
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R18
 U 1 1 44369638
-P 7350 1600
-F 0 "R18" V 7430 1600 50  0000 C CNN
-F 1 "220" V 7350 1600 50  0000 C CNN
-F 2 "" H 7350 1600 60  0001 C CNN
-F 3 "" H 7350 1600 60  0001 C CNN
-	1    7350 1600
+P 8650 1500
+F 0 "R18" V 8730 1500 50  0000 C CNN
+F 1 "220" V 8650 1500 50  0000 C CNN
+F 2 "" H 8650 1500 60  0001 C CNN
+F 3 "" H 8650 1500 60  0001 C CNN
+	1    8650 1500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR021
 U 1 1 442AABC2
-P 6550 2650
-F 0 "#PWR021" H 6550 2650 30  0001 C CNN
-F 1 "GND" H 6550 2580 30  0001 C CNN
-F 2 "" H 6550 2650 60  0001 C CNN
-F 3 "" H 6550 2650 60  0001 C CNN
-	1    6550 2650
+P 7900 2600
+F 0 "#PWR021" H 7900 2600 30  0001 C CNN
+F 1 "GND" H 7900 2530 30  0001 C CNN
+F 2 "" H 7900 2600 60  0001 C CNN
+F 3 "" H 7900 2600 60  0001 C CNN
+	1    7900 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG022
 U 1 1 442A8330
-P 1600 6900
-F 0 "#FLG022" H 1600 7170 30  0001 C CNN
-F 1 "PWR_FLAG" H 1600 7130 30  0000 C CNN
-F 2 "" H 1600 6900 60  0001 C CNN
-F 3 "" H 1600 6900 60  0001 C CNN
-	1    1600 6900
+P 8100 5550
+F 0 "#FLG022" H 8100 5820 30  0001 C CNN
+F 1 "PWR_FLAG" H 8100 5780 30  0000 C CNN
+F 2 "" H 8100 5550 60  0001 C CNN
+F 3 "" H 8100 5550 60  0001 C CNN
+	1    8100 5550
 	-1   0    0    1   
 $EndComp
 Text Label 1850 3800 0    60   ~ 0
@@ -476,198 +433,143 @@ Text Label 1850 3600 0    60   ~ 0
 TXD
 Text Label 1850 3500 0    60   ~ 0
 RTS
-Text Notes 850  6500 0    60   ~ 0
+Text Notes 7300 5150 0    60   ~ 0
 8 to 15V
-NoConn ~ 6650 5750
+NoConn ~ 900  5850
 $Comp
 L DIODESCH D10
 U 1 1 442A6026
-P 9300 6000
-F 0 "D10" H 9300 6100 40  0000 C CNN
-F 1 "SCHOTTKY" H 9300 5900 40  0000 C CNN
-F 2 "" H 9300 6000 60  0001 C CNN
-F 3 "" H 9300 6000 60  0001 C CNN
-	1    9300 6000
+P 3300 5850
+F 0 "D10" H 3300 5950 40  0000 C CNN
+F 1 "SCHOTTKY" H 3300 5750 40  0000 C CNN
+F 2 "" H 3300 5850 60  0001 C CNN
+F 3 "" H 3300 5850 60  0001 C CNN
+	1    3300 5850
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R10
 U 1 1 442A5F83
-P 8250 6700
-F 0 "R10" V 8330 6700 50  0000 C CNN
-F 1 "5,1K" V 8250 6700 50  0000 C CNN
-F 2 "" H 8250 6700 60  0001 C CNN
-F 3 "" H 8250 6700 60  0001 C CNN
-	1    8250 6700
-	0    -1   -1   0   
+P 2150 7200
+F 0 "R10" V 2230 7200 50  0000 C CNN
+F 1 "5.1K" V 2150 7200 50  0000 C CNN
+F 2 "" H 2150 7200 60  0001 C CNN
+F 3 "" H 2150 7200 60  0001 C CNN
+	1    2150 7200
+	0    1    -1   0   
 $EndComp
 $Comp
 L C C4
 U 1 1 442A5F61
-P 8750 6900
-F 0 "C4" H 8800 7000 50  0000 L CNN
-F 1 "0" V 8800 6800 50  0000 L CNN
-F 2 "" H 8750 6900 60  0001 C CNN
-F 3 "" H 8750 6900 60  0001 C CNN
-	1    8750 6900
-	0    -1   -1   0   
+P 1900 7450
+F 0 "C4" V 2050 7450 50  0000 C CNN
+F 1 "0" V 1750 7450 50  0000 C CNN
+F 2 "" H 1900 7450 60  0001 C CNN
+F 3 "" H 1900 7450 60  0001 C CNN
+	1    1900 7450
+	0    1    -1   0   
 $EndComp
 $Comp
 L LT1373 U4
 U 1 1 442A5E20
-P 7650 6000
-F 0 "U4" H 8250 6500 60  0000 C CNN
-F 1 "LT1373" H 7150 6500 60  0000 C CNN
-F 2 "" H 7650 6000 60  0001 C CNN
-F 3 "" H 7650 6000 60  0001 C CNN
-	1    7650 6000
+P 1900 6100
+F 0 "U4" H 2500 6600 60  0000 C CNN
+F 1 "LT1373" H 1400 6600 60  0000 C CNN
+F 2 "" H 1900 6100 60  0001 C CNN
+F 3 "" H 1900 6100 60  0001 C CNN
+	1    1900 6100
 	1    0    0    -1  
 $EndComp
-Text Notes 6150 5200 0    60   ~ 0
+Text Notes 900  5350 0    60   ~ 0
 VPP (13V) power
 $Comp
-L GND #PWR023
-U 1 1 442A58DF
-P 10150 6800
-F 0 "#PWR023" H 10150 6800 30  0001 C CNN
-F 1 "GND" H 10150 6730 30  0001 C CNN
-F 2 "" H 10150 6800 60  0001 C CNN
-F 3 "" H 10150 6800 60  0001 C CNN
-	1    10150 6800
-	1    0    0    -1  
-$EndComp
-$Comp
 L R R16
 U 1 1 442A58DC
-P 9900 6250
-F 0 "R16" V 9980 6250 50  0000 C CNN
-F 1 "62K" V 9900 6250 50  0000 C CNN
-F 2 "" H 9900 6250 60  0001 C CNN
-F 3 "" H 9900 6250 60  0001 C CNN
-	1    9900 6250
-	0    -1   -1   0   
+P 3600 6200
+F 0 "R16" H 3750 6050 50  0000 C CNN
+F 1 "62K" V 3600 6200 50  0000 C CNN
+F 2 "" H 3600 6200 60  0001 C CNN
+F 3 "" H 3600 6200 60  0001 C CNN
+	1    3600 6200
+	-1   0    0    1   
 $EndComp
 $Comp
 L R R15
 U 1 1 442A58D7
-P 9900 6750
-F 0 "R15" V 9980 6750 50  0000 C CNN
-F 1 "6.2K" V 9900 6750 50  0000 C CNN
-F 2 "" H 9900 6750 60  0001 C CNN
-F 3 "" H 9900 6750 60  0001 C CNN
-	1    9900 6750
-	0    -1   -1   0   
-$EndComp
-NoConn ~ 6650 6250
-$Comp
-L GND #PWR024
-U 1 1 442A58B8
-P 9150 6600
-F 0 "#PWR024" H 9150 6600 30  0001 C CNN
-F 1 "GND" H 9150 6530 30  0001 C CNN
-F 2 "" H 9150 6600 60  0001 C CNN
-F 3 "" H 9150 6600 60  0001 C CNN
-	1    9150 6600
-	0    -1   -1   0   
+P 3600 7300
+F 0 "R15" H 3450 7450 50  0000 C CNN
+F 1 "6.2K" V 3600 7300 50  0000 C CNN
+F 2 "" H 3600 7300 60  0001 C CNN
+F 3 "" H 3600 7300 60  0001 C CNN
+	1    3600 7300
+	1    0    0    -1  
 $EndComp
+NoConn ~ 900  6350
 $Comp
 L C C5
 U 1 1 442A58B1
-P 8900 6600
-F 0 "C5" H 8950 6700 50  0000 L CNN
-F 1 "10nF" V 9050 6450 50  0000 L CNN
-F 2 "" H 8900 6600 60  0001 C CNN
-F 3 "" H 8900 6600 60  0001 C CNN
-	1    8900 6600
-	0    -1   -1   0   
+P 1650 7200
+F 0 "C5" V 1800 7200 50  0000 C CNN
+F 1 "10nF" V 1500 7200 50  0000 C CNN
+F 2 "" H 1650 7200 60  0001 C CNN
+F 3 "" H 1650 7200 60  0001 C CNN
+	1    1650 7200
+	0    1    -1   0   
 $EndComp
 $Comp
 L PWR_FLAG #FLG025
 U 1 1 442A5893
-P 9950 5950
-F 0 "#FLG025" H 9950 6220 30  0001 C CNN
-F 1 "PWR_FLAG" H 9950 6180 30  0000 C CNN
-F 2 "" H 9950 5950 60  0001 C CNN
-F 3 "" H 9950 5950 60  0001 C CNN
-	1    9950 5950
-	1    0    0    -1  
-$EndComp
-$Comp
-L VCC #PWR026
-U 1 1 442A5882
-P 9300 5650
-F 0 "#PWR026" H 9300 5750 30  0001 C CNN
-F 1 "VCC" H 9300 5750 30  0000 C CNN
-F 2 "" H 9300 5650 60  0001 C CNN
-F 3 "" H 9300 5650 60  0001 C CNN
-	1    9300 5650
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR027
-U 1 1 442A5852
-P 10700 6050
-F 0 "#PWR027" H 10700 6050 30  0001 C CNN
-F 1 "GND" H 10700 5980 30  0001 C CNN
-F 2 "" H 10700 6050 60  0001 C CNN
-F 3 "" H 10700 6050 60  0001 C CNN
-	1    10700 6050
+P 3700 5800
+F 0 "#FLG025" 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
+	1    3700 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C3
 U 1 1 442A584C
-P 10450 6000
-F 0 "C3" H 10500 6100 50  0000 L CNN
-F 1 "22uF/25V" H 10500 5900 50  0000 L CNN
-F 2 "" H 10450 6000 60  0001 C CNN
-F 3 "" H 10450 6000 60  0001 C CNN
-	1    10450 6000
-	0    -1   -1   0   
+P 3950 6200
+F 0 "C3" H 4100 6250 50  0000 L CNN
+F 1 "22uF/25V" H 4100 6150 50  0000 L CNN
+F 2 "" H 3950 6200 60  0001 C CNN
+F 3 "" H 3950 6200 60  0001 C CNN
+	1    3950 6200
+	1    0    0    -1  
 $EndComp
 $Comp
 L VPP #PWR34
 U 1 1 442A5846
-P 10150 5950
-F 0 "#PWR34" H 10150 6150 40  0001 C CNN
-F 1 "VPP" H 10150 6100 40  0000 C CNN
-F 2 "" H 10150 5950 60  0001 C CNN
-F 3 "" H 10150 5950 60  0001 C CNN
-	1    10150 5950
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR028
-U 1 1 442A580B
-P 7350 6750
-F 0 "#PWR028" H 7350 6750 30  0001 C CNN
-F 1 "GND" H 7350 6680 30  0001 C CNN
-F 2 "" H 7350 6750 60  0001 C CNN
-F 3 "" H 7350 6750 60  0001 C CNN
-	1    7350 6750
+P 3950 5800
+F 0 "#PWR34" H 3950 6000 40  0001 C CNN
+F 1 "VPP" H 3950 5950 40  0000 C CNN
+F 2 "" H 3950 5800 60  0001 C CNN
+F 3 "" H 3950 5800 60  0001 C CNN
+	1    3950 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR029
 U 1 1 442A57CB
-P 7650 5250
-F 0 "#PWR029" H 7650 5350 30  0001 C CNN
-F 1 "VCC" H 7650 5350 30  0000 C CNN
-F 2 "" H 7650 5250 60  0001 C CNN
-F 3 "" H 7650 5250 60  0001 C CNN
-	1    7650 5250
+P 1900 5300
+F 0 "#PWR029" 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
+	1    1900 5300
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L1
 U 1 1 442A57BE
-P 9000 5750
-F 0 "L1" V 8950 5750 40  0000 C CNN
-F 1 "22uH" V 9100 5750 40  0000 C CNN
-F 2 "" H 9000 5750 60  0001 C CNN
-F 3 "" H 9000 5750 60  0001 C CNN
-	1    9000 5750
-	0    -1   -1   0   
+P 2550 5350
+F 0 "L1" V 2500 5350 40  0000 C CNN
+F 1 "22uH" V 2650 5350 40  0000 C CNN
+F 2 "" H 2550 5350 60  0001 C CNN
+F 3 "" H 2550 5350 60  0001 C CNN
+	1    2550 5350
+	0    1    -1   0   
 $EndComp
 NoConn ~ 1700 3900
 NoConn ~ 1700 3400
@@ -676,548 +578,548 @@ NoConn ~ 1700 3200
 $Comp
 L GND #PWR030
 U 1 1 442A50C2
-P 7050 2350
-F 0 "#PWR030" H 7050 2350 30  0001 C CNN
-F 1 "GND" H 7050 2280 30  0001 C CNN
-F 2 "" H 7050 2350 60  0001 C CNN
-F 3 "" H 7050 2350 60  0001 C CNN
-	1    7050 2350
+P 8300 2300
+F 0 "#PWR030" 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
+	1    8300 2300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 442A50BF
-P 7050 2100
-F 0 "R17" V 7130 2100 50  0000 C CNN
-F 1 "22K" V 7050 2100 50  0000 C CNN
-F 2 "" H 7050 2100 60  0001 C CNN
-F 3 "" H 7050 2100 60  0001 C CNN
-	1    7050 2100
+P 8300 1950
+F 0 "R17" H 8200 2150 50  0000 C CNN
+F 1 "22K" V 8300 1950 50  0000 C CNN
+F 2 "" H 8300 1950 60  0001 C CNN
+F 3 "" H 8300 1950 60  0001 C CNN
+	1    8300 1950
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR031
 U 1 1 442A50B3
-P 3400 6600
-F 0 "#PWR031" H 3400 6700 30  0001 C CNN
-F 1 "VCC" H 3400 6700 30  0000 C CNN
-F 2 "" H 3400 6600 60  0001 C CNN
-F 3 "" H 3400 6600 60  0001 C CNN
-	1    3400 6600
+P 10200 5250
+F 0 "#PWR031" 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
+	1    10200 5250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR032
 U 1 1 442A5095
-P 4150 7150
-F 0 "#PWR032" H 4150 7150 30  0001 C CNN
-F 1 "GND" H 4150 7080 30  0001 C CNN
-F 2 "" H 4150 7150 60  0001 C CNN
-F 3 "" H 4150 7150 60  0001 C CNN
-	1    4150 7150
+P 10200 6350
+F 0 "#PWR032" 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
+	1    10200 6350
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED D9
 U 1 1 442A5084
-P 4150 6950
-F 0 "D9" H 4150 7050 50  0000 C CNN
-F 1 "GREEN-LED" H 4150 6850 50  0000 C CNN
-F 2 "" H 4150 6950 60  0001 C CNN
-F 3 "" H 4150 6950 60  0001 C CNN
-F 4 "GREEN LED" H 4200 7100 40  0000 C CNN "Champ4"
-	1    4150 6950
+P 10200 6150
+F 0 "D9" V 10100 6000 50  0000 C CNN
+F 1 "GREEN-LED" H 10200 6250 50  0000 C CNN
+F 2 "" H 10200 6150 60  0001 C CNN
+F 3 "" H 10200 6150 60  0001 C CNN
+F 4 "GREEN LED" H 10200 6350 40  0000 C CNN "Champ4"
+	1    10200 6150
 	0    1    1    0   
 $EndComp
 $Comp
 L R R14
 U 1 1 442A5083
-P 3850 6650
-F 0 "R14" V 3930 6650 50  0000 C CNN
-F 1 "470" V 3850 6650 50  0000 C CNN
-F 2 "" H 3850 6650 60  0001 C CNN
-F 3 "" H 3850 6650 60  0001 C CNN
-	1    3850 6650
-	0    -1   -1   0   
+P 10200 5600
+F 0 "R14" H 10100 5800 50  0000 C CNN
+F 1 "470" V 10200 5600 50  0000 C CNN
+F 2 "" H 10200 5600 60  0001 C CNN
+F 3 "" H 10200 5600 60  0001 C CNN
+	1    10200 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR033
 U 1 1 442A5057
-P 3200 7100
-F 0 "#PWR033" H 3200 7100 30  0001 C CNN
-F 1 "GND" H 3200 7030 30  0001 C CNN
-F 2 "" H 3200 7100 60  0001 C CNN
-F 3 "" H 3200 7100 60  0001 C CNN
-	1    3200 7100
+P 9650 5800
+F 0 "#PWR033" 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
+	1    9650 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C1
 U 1 1 442A5056
-P 3200 6900
-F 0 "C1" H 3250 7000 50  0000 L CNN
-F 1 "100uF" H 3250 6800 50  0000 L CNN
-F 2 "" H 3200 6900 60  0001 C CNN
-F 3 "" H 3200 6900 60  0001 C CNN
-	1    3200 6900
+P 9650 5550
+F 0 "C1" H 9800 5600 50  0000 L CNN
+F 1 "100uF" H 9800 5500 50  0000 L CNN
+F 2 "" H 9650 5550 60  0001 C CNN
+F 3 "" H 9650 5550 60  0001 C CNN
+	1    9650 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR034
 U 1 1 442A5050
-P 2700 6950
-F 0 "#PWR034" H 2700 6950 30  0001 C CNN
-F 1 "GND" H 2700 6880 30  0001 C CNN
-F 2 "" H 2700 6950 60  0001 C CNN
-F 3 "" H 2700 6950 60  0001 C CNN
-	1    2700 6950
+P 9150 5650
+F 0 "#PWR034" 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
+	1    9150 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L 7805 U3
 U 1 1 442A504A
-P 2700 6700
-F 0 "U3" H 2850 6504 60  0000 C CNN
-F 1 "7805" H 2700 6900 60  0000 C CNN
-F 2 "" H 2700 6700 60  0001 C CNN
-F 3 "" H 2700 6700 60  0001 C CNN
-	1    2700 6700
+P 9150 5350
+F 0 "U3" H 9150 5650 60  0000 C CNN
+F 1 "7805" H 9150 5550 60  0000 C CNN
+F 2 "" H 9150 5350 60  0001 C CNN
+F 3 "" H 9150 5350 60  0001 C CNN
+	1    9150 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR035
 U 1 1 442A5023
-P 1950 7100
-F 0 "#PWR035" H 1950 7100 30  0001 C CNN
-F 1 "GND" H 1950 7030 30  0001 C CNN
-F 2 "" H 1950 7100 60  0001 C CNN
-F 3 "" H 1950 7100 60  0001 C CNN
-	1    1950 7100
+P 8400 5800
+F 0 "#PWR035" 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
+	1    8400 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C2
 U 1 1 442A501D
-P 1950 6900
-F 0 "C2" H 2000 7000 50  0000 L CNN
-F 1 "220uF" H 2000 6800 50  0000 L CNN
-F 2 "" H 1950 6900 60  0001 C CNN
-F 3 "" H 1950 6900 60  0001 C CNN
-	1    1950 6900
+P 8400 5550
+F 0 "C2" H 8550 5600 50  0000 L CNN
+F 1 "220uF" H 8550 5500 50  0000 L CNN
+F 2 "" H 8400 5550 60  0001 C CNN
+F 3 "" H 8400 5550 60  0001 C CNN
+	1    8400 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR036
 U 1 1 442A500F
-P 1400 6900
-F 0 "#PWR036" H 1400 6900 30  0001 C CNN
-F 1 "GND" H 1400 6830 30  0001 C CNN
-F 2 "" H 1400 6900 60  0001 C CNN
-F 3 "" H 1400 6900 60  0001 C CNN
-	1    1400 6900
+P 7900 5600
+F 0 "#PWR036" 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
+	1    7900 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D1
 U 1 1 442A500B
-P 1650 6650
-F 0 "D1" H 1650 6750 40  0000 C CNN
-F 1 "1N4004" H 1650 6550 40  0000 C CNN
-F 2 "" H 1650 6650 60  0001 C CNN
-F 3 "" H 1650 6650 60  0001 C CNN
-	1    1650 6650
+P 8100 5300
+F 0 "D1" H 8100 5400 50  0000 C CNN
+F 1 "1N4004" H 8100 5200 50  0000 C CNN
+F 2 "" H 8100 5300 60  0001 C CNN
+F 3 "" H 8100 5300 60  0001 C CNN
+	1    8100 5300
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 442A4FE7
-P 1000 6750
-F 0 "P1" V 950 6750 40  0000 C CNN
-F 1 "CONN_2" V 1050 6750 40  0000 C CNN
-F 2 "" H 1000 6750 60  0001 C CNN
-F 3 "" H 1000 6750 60  0001 C CNN
-	1    1000 6750
+P 7450 5400
+F 0 "P1" V 7400 5400 40  0000 C CNN
+F 1 "CONN_2" V 7500 5400 40  0000 C CNN
+F 2 "" H 7450 5400 60  0001 C CNN
+F 3 "" H 7450 5400 60  0001 C CNN
+	1    7450 5400
 	-1   0    0    1   
 $EndComp
 $Comp
 L LED D8
 U 1 1 442A4F5D
-P 6550 2400
-F 0 "D8" H 6550 2500 50  0000 C CNN
-F 1 "RED-LED" H 6550 2300 50  0000 C CNN
-F 2 "" H 6550 2400 60  0001 C CNN
-F 3 "" H 6550 2400 60  0001 C CNN
-F 4 "Low Current Led" H 6600 2550 40  0000 C CNN "Champ4"
-F 5 "RED LED" H 6550 2250 40  0000 C CNN "Champ5"
-	1    6550 2400
+P 7900 2350
+F 0 "D8" V 7800 2200 50  0000 C CNN
+F 1 "RED-LED" H 7900 2450 50  0000 C CNN
+F 2 "" H 7900 2350 60  0001 C CNN
+F 3 "" H 7900 2350 60  0001 C CNN
+F 4 "Low Current Led" V 8250 2350 40  0000 C CNN "Champ4"
+F 5 "RED LED" H 7900 2550 40  0000 C CNN "Champ5"
+	1    7900 2350
 	0    1    1    0   
 $EndComp
 $Comp
 L R R9
 U 1 1 442A4F52
-P 6550 1900
-F 0 "R9" V 6630 1900 50  0000 C CNN
-F 1 "2.2K" V 6550 1900 50  0000 C CNN
-F 2 "" H 6550 1900 60  0001 C CNN
-F 3 "" H 6550 1900 60  0001 C CNN
-	1    6550 1900
+P 7900 1850
+F 0 "R9" H 7800 2050 50  0000 C CNN
+F 1 "2.2K" V 7900 1850 50  0000 C CNN
+F 2 "" H 7900 1850 60  0001 C CNN
+F 3 "" H 7900 1850 60  0001 C CNN
+	1    7900 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L VPP #PWR23
 U 1 1 442A4F48
-P 6550 1100
-F 0 "#PWR23" H 6550 1300 40  0001 C CNN
-F 1 "VPP" H 6550 1250 40  0000 C CNN
-F 2 "" H 6550 1100 60  0001 C CNN
-F 3 "" H 6550 1100 60  0001 C CNN
-	1    6550 1100
+P 7900 900
+F 0 "#PWR23" H 7900 1100 40  0001 C CNN
+F 1 "VPP" H 7900 1050 40  0000 C CNN
+F 2 "" H 7900 900 60  0001 C CNN
+F 3 "" H 7900 900 60  0001 C CNN
+	1    7900 900 
 	1    0    0    -1  
 $EndComp
 $Comp
 L VPP #PWR22
 U 1 1 442A4F44
-P 6100 700
-F 0 "#PWR22" H 6100 900 40  0001 C CNN
-F 1 "VPP" H 6100 850 40  0000 C CNN
-F 2 "" H 6100 700 60  0001 C CNN
-F 3 "" H 6100 700 60  0001 C CNN
-	1    6100 700 
+P 6700 700
+F 0 "#PWR22" H 6700 900 40  0001 C CNN
+F 1 "VPP" H 6700 850 40  0000 C CNN
+F 2 "" H 6700 700 60  0001 C CNN
+F 3 "" H 6700 700 60  0001 C CNN
+	1    6700 700 
 	1    0    0    -1  
 $EndComp
 $Comp
 L PNP Q2
 U 1 1 442A4F30
-P 6450 1400
-F 0 "Q2" H 6600 1400 60  0000 C CNN
-F 1 "BC307" H 6354 1550 60  0000 C CNN
-F 2 "" H 6450 1400 60  0001 C CNN
-F 3 "" H 6450 1400 60  0001 C CNN
-	1    6450 1400
+P 7800 1200
+F 0 "Q2" H 7700 900 50  0000 C CNN
+F 1 "BC307" H 7700 1000 50  0000 C CNN
+F 2 "" H 7800 1200 60  0001 C CNN
+F 3 "" H 7800 1200 60  0001 C CNN
+	1    7800 1200
 	1    0    0    1   
 $EndComp
 $Comp
 L R R7
 U 1 1 442A4F2A
-P 6100 1000
-F 0 "R7" V 6180 1000 50  0000 C CNN
-F 1 "10K" V 6100 1000 50  0000 C CNN
-F 2 "" H 6100 1000 60  0001 C CNN
-F 3 "" H 6100 1000 60  0001 C CNN
-	1    6100 1000
+P 6700 1050
+F 0 "R7" H 6600 1200 50  0000 C CNN
+F 1 "10K" V 6700 1050 50  0000 C CNN
+F 2 "" H 6700 1050 60  0001 C CNN
+F 3 "" H 6700 1050 60  0001 C CNN
+	1    6700 1050
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R11
 U 1 1 442A4F23
-P 5750 1400
-F 0 "R11" V 5830 1400 50  0000 C CNN
-F 1 "22K" V 5750 1400 50  0000 C CNN
-F 2 "" H 5750 1400 60  0001 C CNN
-F 3 "" H 5750 1400 60  0001 C CNN
-	1    5750 1400
-	0    -1   -1   0   
+P 6700 1950
+F 0 "R11" H 6800 1750 50  0000 C CNN
+F 1 "22K" V 6700 1950 50  0000 C CNN
+F 2 "" H 6700 1950 60  0001 C CNN
+F 3 "" H 6700 1950 60  0001 C CNN
+	1    6700 1950
+	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR037
 U 1 1 442A4F1C
-P 5450 1900
-F 0 "#PWR037" H 5450 1900 30  0001 C CNN
-F 1 "GND" H 5450 1830 30  0001 C CNN
-F 2 "" H 5450 1900 60  0001 C CNN
-F 3 "" H 5450 1900 60  0001 C CNN
-	1    5450 1900
+P 6700 2850
+F 0 "#PWR037" 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
+	1    6700 2850
 	1    0    0    -1  
 $EndComp
-Text Label 2300 1700 0    60   ~ 0
+Text Label 2500 1300 0    60   ~ 0
 VPP_ON
 $Comp
 L NPN Q1
 U 1 1 442A4EB9
-P 5350 1700
-F 0 "Q1" H 5500 1700 50  0000 C CNN
-F 1 "BC237" H 5252 1850 50  0000 C CNN
-F 2 "" H 5350 1700 60  0001 C CNN
-F 3 "" H 5350 1700 60  0001 C CNN
-	1    5350 1700
+P 6600 2600
+F 0 "Q1" H 6500 2850 50  0000 C CNN
+F 1 "BC237" H 6502 2750 50  0000 C CNN
+F 2 "" H 6600 2600 60  0001 C CNN
+F 3 "" H 6600 2600 60  0001 C CNN
+	1    6600 2600
 	1    0    0    -1  
 $EndComp
-Text Label 2350 5100 0    60   ~ 0
+Text Label 2350 4400 0    60   ~ 0
 PC-CLOCK-OUT
 $Comp
 L GND #PWR038
 U 1 1 442A4E06
-P 1700 4000
-F 0 "#PWR038" H 1700 4000 30  0001 C CNN
-F 1 "GND" H 1700 3930 30  0001 C CNN
-F 2 "" H 1700 4000 60  0001 C CNN
-F 3 "" H 1700 4000 60  0001 C CNN
-	1    1700 4000
-	0    -1   -1   0   
+P 1700 4050
+F 0 "#PWR038" 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
+	1    1700 4050
+	1    0    0    -1  
 $EndComp
-Text Label 2700 4200 0    60   ~ 0
+Text Label 2500 2200 0    60   ~ 0
 PC-DATA-IN
-Text Label 2500 3150 0    60   ~ 0
+Text Label 2400 3250 0    60   ~ 0
 PC-DATA-OUT
 $Comp
 L GND #PWR039
 U 1 1 442A4DB3
-P 2800 2250
-F 0 "#PWR039" H 2800 2250 30  0001 C CNN
-F 1 "GND" H 2800 2180 30  0001 C CNN
-F 2 "" H 2800 2250 60  0001 C CNN
-F 3 "" H 2800 2250 60  0001 C CNN
-	1    2800 2250
+P 2900 2000
+F 0 "#PWR039" 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
+	1    2900 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR040
 U 1 1 442A4DAE
-P 3200 5650
-F 0 "#PWR040" H 3200 5650 30  0001 C CNN
-F 1 "GND" H 3200 5580 30  0001 C CNN
-F 2 "" H 3200 5650 60  0001 C CNN
-F 3 "" H 3200 5650 60  0001 C CNN
-	1    3200 5650
+P 3200 5050
+F 0 "#PWR040" 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
+	1    3200 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR041
 U 1 1 442A4DAB
-P 3200 3700
-F 0 "#PWR041" H 3200 3700 30  0001 C CNN
-F 1 "GND" H 3200 3630 30  0001 C CNN
-F 2 "" H 3200 3700 60  0001 C CNN
-F 3 "" H 3200 3700 60  0001 C CNN
-	1    3200 3700
+P 3000 3900
+F 0 "#PWR041" 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
+	1    3000 3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R8
 U 1 1 442A4D92
-P 4700 1700
-F 0 "R8" V 4780 1700 50  0000 C CNN
-F 1 "1K" V 4700 1700 50  0000 C CNN
-F 2 "" H 4700 1700 60  0001 C CNN
-F 3 "" H 4700 1700 60  0001 C CNN
-	1    4700 1700
+P 5100 1200
+F 0 "R8" V 5180 1200 50  0000 C CNN
+F 1 "1K" V 5100 1200 50  0000 C CNN
+F 2 "" H 5100 1200 60  0001 C CNN
+F 3 "" H 5100 1200 60  0001 C CNN
+	1    5100 1200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R13
 U 1 1 442A4D8D
-P 5100 4750
-F 0 "R13" V 5180 4750 50  0000 C CNN
-F 1 "470" V 5100 4750 50  0000 C CNN
-F 2 "" H 5100 4750 60  0001 C CNN
-F 3 "" H 5100 4750 60  0001 C CNN
-	1    5100 4750
+P 5350 4500
+F 0 "R13" V 5450 4500 50  0000 C CNN
+F 1 "470" V 5350 4500 50  0000 C CNN
+F 2 "" H 5350 4500 60  0001 C CNN
+F 3 "" H 5350 4500 60  0001 C CNN
+	1    5350 4500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R12
 U 1 1 442A4D85
-P 5100 3150
-F 0 "R12" V 5180 3150 50  0000 C CNN
-F 1 "470" V 5100 3150 50  0000 C CNN
-F 2 "" H 5100 3150 60  0001 C CNN
-F 3 "" H 5100 3150 60  0001 C CNN
-	1    5100 3150
+P 5150 3150
+F 0 "R12" V 5230 3150 50  0000 C CNN
+F 1 "470" V 5150 3150 50  0000 C CNN
+F 2 "" H 5150 3150 60  0001 C CNN
+F 3 "" H 5150 3150 60  0001 C CNN
+	1    5150 3150
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR042
 U 1 1 442A4D75
-P 4350 4500
-F 0 "#PWR042" H 4350 4500 30  0001 C CNN
-F 1 "GND" H 4350 4430 30  0001 C CNN
-F 2 "" H 4350 4500 60  0001 C CNN
-F 3 "" H 4350 4500 60  0001 C CNN
-	1    4350 4500
+P 4150 2550
+F 0 "#PWR042" 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
+	1    4150 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74LS125 U2
 U 4 1 442A4D6B
-P 4350 4200
-F 0 "U2" H 4350 4300 50  0000 L BNN
-F 1 "74HC125" H 4400 4050 40  0000 L TNN
-F 2 "" H 4350 4200 60  0001 C CNN
-F 3 "" H 4350 4200 60  0001 C CNN
-	4    4350 4200
+P 4150 2200
+F 0 "U2" H 4150 2500 50  0000 C BNN
+F 1 "74HC125" H 4150 2450 50  0000 C TNN
+F 2 "" H 4150 2200 60  0001 C CNN
+F 3 "" H 4150 2200 60  0001 C CNN
+	4    4150 2200
 	-1   0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR043
 U 1 1 442A4D68
-P 3850 4650
-F 0 "#PWR043" H 3850 4750 30  0001 C CNN
-F 1 "VCC" H 3850 4750 30  0000 C CNN
-F 2 "" H 3850 4650 60  0001 C CNN
-F 3 "" H 3850 4650 60  0001 C CNN
-	1    3850 4650
+P 3900 3900
+F 0 "#PWR043" 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
+	1    3900 3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR044
 U 1 1 442A4D67
-P 3850 5600
-F 0 "#PWR044" H 3850 5600 30  0001 C CNN
-F 1 "GND" H 3850 5530 30  0001 C CNN
-F 2 "" H 3850 5600 60  0001 C CNN
-F 3 "" H 3850 5600 60  0001 C CNN
-	1    3850 5600
+P 3900 5050
+F 0 "#PWR044" 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
+	1    3900 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR045
 U 1 1 442A4D66
-P 4350 5400
-F 0 "#PWR045" H 4350 5400 30  0001 C CNN
-F 1 "GND" H 4350 5330 30  0001 C CNN
-F 2 "" H 4350 5400 60  0001 C CNN
-F 3 "" H 4350 5400 60  0001 C CNN
-	1    4350 5400
+P 4550 4850
+F 0 "#PWR045" 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
+	1    4550 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D7
 U 1 1 442A4D65
-P 3850 5400
-F 0 "D7" H 3850 5500 40  0000 C CNN
-F 1 "BAT43" H 3850 5300 40  0000 C CNN
-F 2 "" H 3850 5400 60  0001 C CNN
-F 3 "" H 3850 5400 60  0001 C CNN
-	1    3850 5400
+P 3900 4800
+F 0 "D7" V 3950 4600 50  0000 C CNN
+F 1 "BAT43" V 3850 4600 50  0000 C CNN
+F 2 "" H 3900 4800 60  0001 C CNN
+F 3 "" H 3900 4800 60  0001 C CNN
+	1    3900 4800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D6
 U 1 1 442A4D64
-P 3850 4850
-F 0 "D6" H 3850 4950 40  0000 C CNN
-F 1 "BAT43" H 3850 4750 40  0000 C CNN
-F 2 "" H 3850 4850 60  0001 C CNN
-F 3 "" H 3850 4850 60  0001 C CNN
-	1    3850 4850
+P 3900 4100
+F 0 "D6" V 3950 3900 50  0000 C CNN
+F 1 "BAT43" V 3850 3900 50  0000 C CNN
+F 2 "" H 3900 4100 60  0001 C CNN
+F 3 "" H 3900 4100 60  0001 C CNN
+	1    3900 4100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R6
 U 1 1 442A4D63
-P 3200 5400
-F 0 "R6" V 3280 5400 50  0000 C CNN
-F 1 "10K" V 3200 5400 50  0000 C CNN
-F 2 "" H 3200 5400 60  0001 C CNN
-F 3 "" H 3200 5400 60  0001 C CNN
-	1    3200 5400
+P 3200 4750
+F 0 "R6" H 3100 4950 50  0000 C CNN
+F 1 "10K" V 3200 4750 50  0000 C CNN
+F 2 "" H 3200 4750 60  0001 C CNN
+F 3 "" H 3200 4750 60  0001 C CNN
+	1    3200 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 442A4D62
-P 3500 5100
-F 0 "R5" V 3580 5100 50  0000 C CNN
-F 1 "10K" V 3500 5100 50  0000 C CNN
-F 2 "" H 3500 5100 60  0001 C CNN
-F 3 "" H 3500 5100 60  0001 C CNN
-	1    3500 5100
+P 3550 4400
+F 0 "R5" V 3630 4400 50  0000 C CNN
+F 1 "10K" V 3550 4400 50  0000 C CNN
+F 2 "" H 3550 4400 60  0001 C CNN
+F 3 "" H 3550 4400 60  0001 C CNN
+	1    3550 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L 74LS125 U2
 U 3 1 442A4D61
-P 4350 5100
-F 0 "U2" H 4350 5200 50  0000 L BNN
-F 1 "74HC125" H 4400 4950 40  0000 L TNN
-F 2 "" H 4350 5100 60  0001 C CNN
-F 3 "" H 4350 5100 60  0001 C CNN
-	3    4350 5100
+P 4550 4500
+F 0 "U2" H 4550 4750 50  0000 C BNN
+F 1 "74HC125" H 4550 4700 50  0000 C TNN
+F 2 "" H 4550 4500 60  0001 C CNN
+F 3 "" H 4550 4500 60  0001 C CNN
+	3    4550 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR046
 U 1 1 442A4D60
-P 3850 2700
-F 0 "#PWR046" H 3850 2800 30  0001 C CNN
-F 1 "VCC" H 3850 2800 30  0000 C CNN
-F 2 "" H 3850 2700 60  0001 C CNN
-F 3 "" H 3850 2700 60  0001 C CNN
-	1    3850 2700
+P 3700 2600
+F 0 "#PWR046" 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
+	1    3700 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR047
 U 1 1 442A4D5F
-P 3850 3650
-F 0 "#PWR047" H 3850 3650 30  0001 C CNN
-F 1 "GND" H 3850 3580 30  0001 C CNN
-F 2 "" H 3850 3650 60  0001 C CNN
-F 3 "" H 3850 3650 60  0001 C CNN
-	1    3850 3650
+P 3700 3800
+F 0 "#PWR047" 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
+	1    3700 3800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR048
 U 1 1 442A4D5E
-P 4350 3450
-F 0 "#PWR048" H 4350 3450 30  0001 C CNN
-F 1 "GND" H 4350 3380 30  0001 C CNN
-F 2 "" H 4350 3450 60  0001 C CNN
-F 3 "" H 4350 3450 60  0001 C CNN
-	1    4350 3450
+P 4350 3500
+F 0 "#PWR048" 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
+	1    4350 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D5
 U 1 1 442A4D5D
-P 3850 3450
-F 0 "D5" H 3850 3550 40  0000 C CNN
-F 1 "BAT43" H 3850 3350 40  0000 C CNN
-F 2 "" H 3850 3450 60  0001 C CNN
-F 3 "" H 3850 3450 60  0001 C CNN
-	1    3850 3450
+P 3700 3550
+F 0 "D5" V 3750 3350 50  0000 C CNN
+F 1 "BAT43" V 3650 3350 50  0000 C CNN
+F 2 "" H 3700 3550 60  0001 C CNN
+F 3 "" H 3700 3550 60  0001 C CNN
+	1    3700 3550
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D4
 U 1 1 442A4D5C
-P 3850 2900
-F 0 "D4" H 3850 3000 40  0000 C CNN
-F 1 "BAT43" H 3850 2800 40  0000 C CNN
-F 2 "" H 3850 2900 60  0001 C CNN
-F 3 "" H 3850 2900 60  0001 C CNN
-	1    3850 2900
+P 3700 2850
+F 0 "D4" V 3750 2650 50  0000 C CNN
+F 1 "BAT43" V 3650 2650 50  0000 C CNN
+F 2 "" H 3700 2850 60  0001 C CNN
+F 3 "" H 3700 2850 60  0001 C CNN
+	1    3700 2850
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R4
 U 1 1 442A4D5B
-P 3200 3450
-F 0 "R4" V 3280 3450 50  0000 C CNN
-F 1 "10K" V 3200 3450 50  0000 C CNN
-F 2 "" H 3200 3450 60  0001 C CNN
-F 3 "" H 3200 3450 60  0001 C CNN
-	1    3200 3450
+P 3000 3600
+F 0 "R4" V 3080 3600 50  0000 C CNN
+F 1 "10K" V 3000 3600 50  0000 C CNN
+F 2 "" H 3000 3600 60  0001 C CNN
+F 3 "" H 3000 3600 60  0001 C CNN
+	1    3000 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R3
 U 1 1 442A4D5A
-P 3500 3150
-F 0 "R3" V 3580 3150 50  0000 C CNN
-F 1 "10K" V 3500 3150 50  0000 C CNN
-F 2 "" H 3500 3150 60  0001 C CNN
-F 3 "" H 3500 3150 60  0001 C CNN
-	1    3500 3150
+P 3350 3250
+F 0 "R3" V 3430 3250 50  0000 C CNN
+F 1 "10K" V 3350 3250 50  0000 C CNN
+F 2 "" H 3350 3250 60  0001 C CNN
+F 3 "" H 3350 3250 60  0001 C CNN
+	1    3350 3250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L 74LS125 U2
 U 2 1 442A4D59
 P 4350 3150
-F 0 "U2" H 4350 3250 50  0000 L BNN
-F 1 "74HC125" H 4400 3000 40  0000 L TNN
+F 0 "U2" H 4350 3400 50  0000 C BNN
+F 1 "74HC125" H 4350 3350 50  0000 C TNN
 F 2 "" H 4350 3150 60  0001 C CNN
 F 3 "" H 4350 3150 60  0001 C CNN
 	2    4350 3150
@@ -1226,100 +1128,315 @@ $EndComp
 $Comp
 L VCC #PWR049
 U 1 1 442A4D41
-P 3450 1250
-F 0 "#PWR049" H 3450 1350 30  0001 C CNN
-F 1 "VCC" H 3450 1350 30  0000 C CNN
-F 2 "" H 3450 1250 60  0001 C CNN
-F 3 "" H 3450 1250 60  0001 C CNN
-	1    3450 1250
+P 3750 700
+F 0 "#PWR049" 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
+	1    3750 700 
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR050
 U 1 1 442A4D3B
-P 3450 2200
-F 0 "#PWR050" H 3450 2200 30  0001 C CNN
-F 1 "GND" H 3450 2130 30  0001 C CNN
-F 2 "" H 3450 2200 60  0001 C CNN
-F 3 "" H 3450 2200 60  0001 C CNN
-	1    3450 2200
+P 3750 1800
+F 0 "#PWR050" 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
+	1    3750 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR051
 U 1 1 442A4D38
-P 3950 2000
-F 0 "#PWR051" H 3950 2000 30  0001 C CNN
-F 1 "GND" H 3950 1930 30  0001 C CNN
-F 2 "" H 3950 2000 60  0001 C CNN
-F 3 "" H 3950 2000 60  0001 C CNN
-	1    3950 2000
+P 4300 1550
+F 0 "#PWR051" 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
+	1    4300 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D3
 U 1 1 442A4D25
-P 3450 2000
-F 0 "D3" H 3450 2100 40  0000 C CNN
-F 1 "BAT43" H 3450 1900 40  0000 C CNN
-F 2 "" H 3450 2000 60  0001 C CNN
-F 3 "" H 3450 2000 60  0001 C CNN
-	1    3450 2000
+P 3750 1600
+F 0 "D3" V 3800 1400 50  0000 C CNN
+F 1 "BAT43" V 3700 1400 50  0000 C CNN
+F 2 "" H 3750 1600 60  0001 C CNN
+F 3 "" H 3750 1600 60  0001 C CNN
+	1    3750 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D2
 U 1 1 442A4D1B
-P 3450 1450
-F 0 "D2" H 3450 1550 40  0000 C CNN
-F 1 "BAT43" H 3450 1350 40  0000 C CNN
-F 2 "" H 3450 1450 60  0001 C CNN
-F 3 "" H 3450 1450 60  0001 C CNN
-	1    3450 1450
+P 3750 900
+F 0 "D2" V 3800 700 50  0000 C CNN
+F 1 "BAT43" V 3700 700 50  0000 C CNN
+F 2 "" H 3750 900 60  0001 C CNN
+F 3 "" H 3750 900 60  0001 C CNN
+	1    3750 900 
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R2
 U 1 1 442A4CFB
-P 2800 2000
-F 0 "R2" V 2880 2000 50  0000 C CNN
-F 1 "10K" V 2800 2000 50  0000 C CNN
-F 2 "" H 2800 2000 60  0001 C CNN
-F 3 "" H 2800 2000 60  0001 C CNN
-	1    2800 2000
+P 2900 1650
+F 0 "R2" H 2800 1850 50  0000 C CNN
+F 1 "10K" V 2900 1650 50  0000 C CNN
+F 2 "" H 2900 1650 60  0001 C CNN
+F 3 "" H 2900 1650 60  0001 C CNN
+	1    2900 1650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 442A4CF4
-P 3100 1700
-F 0 "R1" V 3180 1700 50  0000 C CNN
-F 1 "10K" V 3100 1700 50  0000 C CNN
-F 2 "" H 3100 1700 60  0001 C CNN
-F 3 "" H 3100 1700 60  0001 C CNN
-	1    3100 1700
+P 3400 1300
+F 0 "R1" V 3480 1300 50  0000 C CNN
+F 1 "10K" V 3400 1300 50  0000 C CNN
+F 2 "" H 3400 1300 60  0001 C CNN
+F 3 "" H 3400 1300 60  0001 C CNN
+	1    3400 1300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L 74LS125 U2
 U 1 1 442A4CC8
-P 3950 1700
-F 0 "U2" H 3950 1800 50  0000 L BNN
-F 1 "74HC125" H 4000 1550 40  0000 L TNN
-F 2 "" H 3950 1700 60  0001 C CNN
-F 3 "" H 3950 1700 60  0001 C CNN
-	1    3950 1700
+P 4300 1200
+F 0 "U2" H 4300 1500 50  0000 C BNN
+F 1 "74HC125" H 4300 1450 50  0000 C TNN
+F 2 "" H 4300 1200 60  0001 C CNN
+F 3 "" H 4300 1200 60  0001 C CNN
+	1    4300 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L DB9 J1
 U 1 1 442A4C93
 P 1250 3600
-F 0 "J1" H 1250 4150 70  0000 C CNN
-F 1 "DB9-FEMAL" H 1250 3050 70  0000 C CNN
+F 0 "J1" H 1250 3000 70  0000 C CNN
+F 1 "DB9-FEMAL" H 1250 4200 70  0000 C CNN
 F 2 "" H 1250 3600 60  0001 C CNN
 F 3 "" H 1250 3600 60  0001 C CNN
 	1    1250 3600
 	-1   0    0    1   
 $EndComp
+Wire Wire Line
+	1700 4050 1700 4000
+Wire Wire Line
+	2900 2000 2900 1900
+Wire Wire Line
+	3200 5050 3200 5000
+Connection ~ 3900 4400
+Wire Wire Line
+	3900 5050 3900 5000
+Wire Wire Line
+	4550 4850 4550 4800
+Wire Wire Line
+	3000 3850 3000 3900
+Wire Wire Line
+	3900 3150 3700 3150
+Connection ~ 3700 3150
+Wire Wire Line
+	3700 2600 3700 2650
+Wire Wire Line
+	3700 3800 3700 3750
+Wire Wire Line
+	4350 3450 4350 3500
+Wire Wire Line
+	4150 2550 4150 2500
+Wire Wire Line
+	6700 2200 6700 2300
+Wire Wire Line
+	6700 2300 6700 2400
+Wire Wire Line
+	6700 2300 7100 2300
+Connection ~ 6700 2300
+Wire Wire Line
+	4300 1550 4300 1500
+Wire Wire Line
+	3750 1200 3850 1200
+Connection ~ 3750 1200
+Wire Wire Line
+	3750 1300 3650 1300
+Wire Wire Line
+	7900 1500 8300 1500
+Wire Wire Line
+	8300 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
+Connection ~ 7400 3400
+Wire Wire Line
+	7400 4500 7400 4600
+Wire Wire Line
+	7400 4600 7100 4600
+Wire Wire Line
+	7100 4600 7100 2300
+Wire Wire Line
+	8300 2300 8300 2200
+Wire Wire Line
+	6200 750  6700 750 
+Connection ~ 6700 750 
+Wire Wire Line
+	6200 1500 6700 1500
+Connection ~ 6700 1500
+Wire Wire Line
+	6700 2850 6700 2800
+Wire Wire Line
+	7900 4900 7900 4950
+Wire Wire Line
+	8400 5800 8400 5750
+Wire Wire Line
+	9650 5750 9650 5800
+Wire Wire Line
+	9150 5650 9150 5600
+Wire Wire Line
+	1850 7200 1900 7200
+Wire Wire Line
+	2450 7450 2100 7450
+Wire Wire Line
+	2450 6800 2450 7200
+Wire Wire Line
+	2450 7200 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
+Wire Wire Line
+	1400 7200 1450 7200
+Wire Wire Line
+	2150 6800 2450 6800
+Connection ~ 2450 7200
+Wire Wire Line
+	1750 6800 1750 6950
+Wire Wire Line
+	1750 6950 1400 6950
+Connection ~ 1400 7200
+$Comp
+L GND #PWR?
+U 1 1 5510C3A9
+P 1600 6850
+F 0 "#PWR?" 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
+	1    1600 6850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1600 6850 1600 6800
+$Comp
+L GND #PWR?
+U 1 1 5510C540
+P 1400 7500
+F 0 "#PWR?" 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
+	1    1400 7500
+	1    0    0    -1  
+$EndComp
+Connection ~ 1400 7450
+Wire Wire Line
+	1900 5350 2250 5350
+Connection ~ 1900 5350
+Wire Wire Line
+	2850 5350 3000 5350
+Connection ~ 3000 5850
+Wire Wire Line
+	3000 5350 3000 5850
+Wire Wire Line
+	3600 6450 3600 6500
+Wire Wire Line
+	3600 7000 3600 7050
+Wire Wire Line
+	3600 5850 3600 5950
+Wire Wire Line
+	2900 6350 3000 6350
+Wire Wire Line
+	3000 6350 3000 6750
+Wire Wire Line
+	3000 6750 3450 6750
+$Comp
+L GND #PWR?
+U 1 1 5510EE04
+P 3600 7600
+F 0 "#PWR?" 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
+	1    3600 7600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3600 7600 3600 7550
+Wire Wire Line
+	3950 5800 3950 5850
+Wire Wire Line
+	3950 5850 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
+Wire Wire Line
+	3700 5800 3700 5850
+Connection ~ 3700 5850
+$Comp
+L GND #PWR?
+U 1 1 5510F50D
+P 3950 6450
+F 0 "#PWR?" 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
+	1    3950 6450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3950 6450 3950 6400
+Wire Wire Line
+	5350 1200 5800 1200
+Wire Wire Line
+	5800 1200 5800 2600
+Wire Wire Line
+	5800 2600 6400 2600
+Wire Wire Line
+	1700 3700 2300 3700
+Wire Wire Line
+	2300 3700 2300 2200
+Wire Wire Line
+	2300 2200 3700 2200
+Wire Wire Line
+	2400 3250 2400 3800
+Wire Wire Line
+	2400 3800 1700 3800
+Wire Wire Line
+	3800 4400 3900 4400
+Wire Wire Line
+	4100 4500 3900 4500
+Wire Wire Line
+	7600 1200 7300 1200
+Wire Wire Line
+	7300 1200 7300 1400
+Wire Wire Line
+	7300 1400 6700 1400
 $EndSCHEMATC
diff --git a/demos/flat_hierarchy/pic_sockets.sch b/demos/flat_hierarchy/pic_sockets.sch
index 614360d..6d528f7 100644
--- a/demos/flat_hierarchy/pic_sockets.sch
+++ b/demos/flat_hierarchy/pic_sockets.sch
@@ -28,13 +28,13 @@ LIBS:siliconi
 LIBS:opto
 LIBS:atmel
 LIBS:flat_hierarchy-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 3
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
-Date "15 apr 2008"
+Date "Sun 22 Mar 2015"
 Rev "3"
 Comp "KiCad"
 Comment1 ""
@@ -42,115 +42,111 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text GLabel 2350 1900 0    60   Input ~ 0
+Text GLabel 1500 3500 0    60   Input ~ 0
 VPP-MCLR
-Text GLabel 2350 1700 0    60   Input ~ 0
+Text GLabel 10150 1500 2    55   Input ~ 0
 CLOCK-RB6
-Text GLabel 2350 1500 0    60   Input ~ 0
+Text GLabel 10150 1600 2    55   Input ~ 0
 DATA-RB7
-Text GLabel 2350 2150 0    60   Input ~ 0
+Text GLabel 1500 2500 0    60   Input ~ 0
 VCC_PIC
-Text Label 2550 2150 0    60   ~ 0
+Text Label 2000 2500 0    60   ~ 0
 VCC_PIC
-Text Label 2450 3150 0    60   ~ 0
+Text Label 1900 3500 0    60   ~ 0
 VPP-MCLR
 Wire Wire Line
-	3700 7000 3700 6900
+	1650 2500 1650 6600
 Wire Wire Line
-	2350 2150 3100 2150
+	1500 2500 2550 2500
 Wire Wire Line
-	10250 1800 9400 1800
+	8900 2250 9800 2250
 Wire Wire Line
-	9400 1700 10200 1700
+	8900 2150 9700 2150
 Wire Wire Line
-	8200 1700 7450 1700
-Connection ~ 2950 1100
+	6700 2150 7700 2150
+Connection ~ 2350 1300
 Wire Wire Line
-	2950 1100 3150 1100
-Connection ~ 2950 1200
+	2350 1300 2550 1300
+Connection ~ 2350 1400
 Wire Wire Line
-	2950 1250 2950 1000
+	2350 1200 2350 1450
 Wire Wire Line
-	2950 1000 3150 1000
+	2350 1200 2550 1200
 Wire Wire Line
-	3150 1200 2950 1200
+	2550 1400 2350 1400
 Wire Wire Line
-	4550 1400 5350 1400
+	3950 1600 10150 1600
 Wire Wire Line
-	5400 1300 4550 1300
+	3950 1500 10150 1500
 Wire Wire Line
-	10500 4250 9650 4250
+	9800 4100 8900 4100
 Wire Wire Line
-	9650 4150 10450 4150
+	9700 4000 8900 4000
 Wire Wire Line
-	8450 4150 7700 4150
+	6700 4000 7700 4000
 Wire Wire Line
 	2500 4850 2300 4850
 Wire Wire Line
 	4900 5150 4050 5150
 Wire Wire Line
-	4050 5000 4850 5000
-Wire Wire Line
 	2500 4700 1750 4700
 Wire Wire Line
-	5400 2850 4550 2850
+	4000 3200 4900 3200
 Wire Wire Line
-	4550 2450 5350 2450
+	4000 2800 4800 2800
 Wire Wire Line
-	3100 3150 2350 3150
+	1500 3500 2550 3500
 Wire Wire Line
 	2300 4850 2300 4900
 Wire Wire Line
-	4850 4850 4050 4850
+	4050 4850 5000 4850
 Wire Wire Line
-	10200 2500 9400 2500
+	8900 2950 9900 2950
 Wire Wire Line
-	10450 4950 9650 4950
+	8900 4800 9900 4800
 Wire Wire Line
-	8450 5150 7650 5150
+	7700 5000 6900 5000
 Wire Wire Line
-	3700 6900 4550 6900
+	1650 6500 2200 6500
 Wire Wire Line
-	4550 6900 4550 7000
-Text Label 3950 6900 0    60   ~ 0
-VCC_PIC
+	2200 6500 2200 6600
 $Comp
 L GND #PWR01
 U 1 1 4639BE2E
-P 4550 7400
-F 0 "#PWR01" H 4550 7400 30  0001 C CNN
-F 1 "GND" H 4550 7330 30  0001 C CNN
-F 2 "" H 4550 7400 60  0001 C CNN
-F 3 "" H 4550 7400 60  0001 C CNN
-	1    4550 7400
+P 2200 7050
+F 0 "#PWR01" H 2200 7050 30  0001 C CNN
+F 1 "GND" H 2200 6980 30  0001 C CNN
+F 2 "" H 2200 7050 60  0001 C CNN
+F 3 "" H 2200 7050 60  0001 C CNN
+	1    2200 7050
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C8
 U 1 1 4639BE2C
-P 4550 7200
-F 0 "C8" H 4600 7300 50  0000 L CNN
-F 1 "100nF" H 4600 7100 50  0000 L CNN
-F 2 "" H 4550 7200 60  0001 C CNN
-F 3 "" H 4550 7200 60  0001 C CNN
-	1    4550 7200
+P 2200 6800
+F 0 "C8" H 2250 6900 50  0000 L CNN
+F 1 "100nF" H 2250 6700 50  0000 L CNN
+F 2 "" H 2200 6800 60  0001 C CNN
+F 3 "" H 2200 6800 60  0001 C CNN
+	1    2200 6800
 	1    0    0    -1  
 $EndComp
-Text Label 7650 5150 0    60   ~ 0
+Text Label 6900 5000 0    60   ~ 0
 VCC_PIC
-Text Label 9900 4950 0    60   ~ 0
+Text Label 9150 4800 0    60   ~ 0
 VCC_PIC
-Text Label 9650 2500 0    60   ~ 0
+Text Label 9150 2950 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR02
 U 1 1 442A8794
-P 8450 5250
-F 0 "#PWR02" H 8450 5250 30  0001 C CNN
-F 1 "GND" H 8450 5180 30  0001 C CNN
-F 2 "" H 8450 5250 60  0001 C CNN
-F 3 "" H 8450 5250 60  0001 C CNN
-	1    8450 5250
+P 7700 5100
+F 0 "#PWR02" H 7700 5100 30  0001 C CNN
+F 1 "GND" H 7700 5030 30  0001 C CNN
+F 2 "" H 7700 5100 60  0001 C CNN
+F 3 "" H 7700 5100 60  0001 C CNN
+	1    7700 5100
 	0    1    1    0   
 $EndComp
 Text Label 4300 4850 0    60   ~ 0
@@ -158,216 +154,216 @@ VCC_PIC
 $Comp
 L GND #PWR03
 U 1 1 443CCA5D
-P 8450 4850
-F 0 "#PWR03" H 8450 4850 30  0001 C CNN
-F 1 "GND" H 8450 4780 30  0001 C CNN
-F 2 "" H 8450 4850 60  0001 C CNN
-F 3 "" H 8450 4850 60  0001 C CNN
-	1    8450 4850
+P 7700 4700
+F 0 "#PWR03" H 7700 4700 30  0001 C CNN
+F 1 "GND" H 7700 4630 30  0001 C CNN
+F 2 "" H 7700 4700 60  0001 C CNN
+F 3 "" H 7700 4700 60  0001 C CNN
+	1    7700 4700
 	0    1    1    0   
 $EndComp
-NoConn ~ 8200 2700
-NoConn ~ 9400 3000
-NoConn ~ 9400 2900
-NoConn ~ 9400 2800
-NoConn ~ 9400 2700
-NoConn ~ 9400 2400
-NoConn ~ 9400 2300
-NoConn ~ 9400 2200
-NoConn ~ 9400 2100
-NoConn ~ 9400 2000
-NoConn ~ 9400 1900
-NoConn ~ 8200 3000
-NoConn ~ 8200 2900
-NoConn ~ 8200 2800
-NoConn ~ 8200 2600
-NoConn ~ 8200 2500
-NoConn ~ 8200 2300
-NoConn ~ 8200 2200
-NoConn ~ 8200 2100
-NoConn ~ 8200 2000
-NoConn ~ 8200 1900
-NoConn ~ 8200 1800
+NoConn ~ 7700 3150
+NoConn ~ 8900 3450
+NoConn ~ 8900 3350
+NoConn ~ 8900 3250
+NoConn ~ 8900 3150
+NoConn ~ 8900 2850
+NoConn ~ 8900 2750
+NoConn ~ 8900 2650
+NoConn ~ 8900 2550
+NoConn ~ 8900 2450
+NoConn ~ 8900 2350
+NoConn ~ 7700 3450
+NoConn ~ 7700 3350
+NoConn ~ 7700 3250
+NoConn ~ 7700 3050
+NoConn ~ 7700 2950
+NoConn ~ 7700 2750
+NoConn ~ 7700 2650
+NoConn ~ 7700 2550
+NoConn ~ 7700 2450
+NoConn ~ 7700 2350
+NoConn ~ 7700 2250
 $Comp
 L GND #PWR04
 U 1 1 443697C7
-P 9400 2600
-F 0 "#PWR04" H 9400 2600 30  0001 C CNN
-F 1 "GND" H 9400 2530 30  0001 C CNN
-F 2 "" H 9400 2600 60  0001 C CNN
-F 3 "" H 9400 2600 60  0001 C CNN
-	1    9400 2600
+P 8900 3050
+F 0 "#PWR04" H 8900 3050 30  0001 C CNN
+F 1 "GND" H 8900 2980 30  0001 C CNN
+F 2 "" H 8900 3050 60  0001 C CNN
+F 3 "" H 8900 3050 60  0001 C CNN
+	1    8900 3050
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR05
 U 1 1 443697C3
-P 8200 2400
-F 0 "#PWR05" H 8200 2400 30  0001 C CNN
-F 1 "GND" H 8200 2330 30  0001 C CNN
-F 2 "" H 8200 2400 60  0001 C CNN
-F 3 "" H 8200 2400 60  0001 C CNN
-	1    8200 2400
+P 7700 2850
+F 0 "#PWR05" H 7700 2850 30  0001 C CNN
+F 1 "GND" H 7700 2780 30  0001 C CNN
+F 2 "" H 7700 2850 60  0001 C CNN
+F 3 "" H 7700 2850 60  0001 C CNN
+	1    7700 2850
 	0    1    1    0   
 $EndComp
-Text Label 9550 1800 0    60   ~ 0
+Text Label 9050 2250 0    60   ~ 0
 CLOCK-RB6
-Text Label 9550 1700 0    60   ~ 0
+Text Label 9050 2150 0    60   ~ 0
 DATA-RB7
-Text Label 7550 1700 0    60   ~ 0
+Text Label 7050 2150 0    60   ~ 0
 VPP-MCLR
 $Comp
 L SUPP28 P2
 U 1 1 4436967E
-P 8800 2350
-F 0 "P2" H 8850 3150 70  0000 C CNN
-F 1 "SUPP28" H 8800 1550 70  0000 C CNN
-F 2 "" H 8800 2350 60  0001 C CNN
-F 3 "" H 8800 2350 60  0001 C CNN
-	1    8800 2350
+P 8300 2800
+F 0 "P2" H 8300 3600 70  0000 C CNN
+F 1 "SUPP28" H 8300 1950 70  0000 C CNN
+F 2 "" H 8300 2800 60  0001 C CNN
+F 3 "" H 8300 2800 60  0001 C CNN
+	1    8300 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR06
 U 1 1 442AA147
-P 3700 7400
-F 0 "#PWR06" H 3700 7400 30  0001 C CNN
-F 1 "GND" H 3700 7330 30  0001 C CNN
-F 2 "" H 3700 7400 60  0001 C CNN
-F 3 "" H 3700 7400 60  0001 C CNN
-	1    3700 7400
+P 1650 7050
+F 0 "#PWR06" H 1650 7050 30  0001 C CNN
+F 1 "GND" H 1650 6980 30  0001 C CNN
+F 2 "" H 1650 7050 60  0001 C CNN
+F 3 "" H 1650 7050 60  0001 C CNN
+	1    1650 7050
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 442AA145
-P 3700 7200
-F 0 "C7" H 3750 7300 50  0000 L CNN
-F 1 "100nF" H 3750 7100 50  0000 L CNN
-F 2 "" H 3700 7200 60  0001 C CNN
-F 3 "" H 3700 7200 60  0001 C CNN
-	1    3700 7200
+P 1650 6800
+F 0 "C7" H 1700 6900 50  0000 L CNN
+F 1 "100nF" H 1700 6700 50  0000 L CNN
+F 2 "" H 1650 6800 60  0001 C CNN
+F 3 "" H 1650 6800 60  0001 C CNN
+	1    1650 6800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR07
 U 1 1 442AA138
-P 2700 7400
-F 0 "#PWR07" H 2700 7400 30  0001 C CNN
-F 1 "GND" H 2700 7330 30  0001 C CNN
-F 2 "" H 2700 7400 60  0001 C CNN
-F 3 "" H 2700 7400 60  0001 C CNN
-	1    2700 7400
+P 2750 7050
+F 0 "#PWR07" H 2750 7050 30  0001 C CNN
+F 1 "GND" H 2750 6980 30  0001 C CNN
+F 2 "" H 2750 7050 60  0001 C CNN
+F 3 "" H 2750 7050 60  0001 C CNN
+	1    2750 7050
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR08
 U 1 1 442AA134
-P 2700 7000
-F 0 "#PWR08" H 2700 7100 30  0001 C CNN
-F 1 "VCC" H 2700 7100 30  0000 C CNN
-F 2 "" H 2700 7000 60  0001 C CNN
-F 3 "" H 2700 7000 60  0001 C CNN
-	1    2700 7000
+P 2750 6600
+F 0 "#PWR08" H 2750 6700 30  0001 C CNN
+F 1 "VCC" H 2750 6700 40  0000 C CNN
+F 2 "" H 2750 6600 60  0001 C CNN
+F 3 "" H 2750 6600 60  0001 C CNN
+	1    2750 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C6
 U 1 1 442AA12B
-P 2700 7200
-F 0 "C6" H 2750 7300 50  0000 L CNN
-F 1 "100nF" H 2750 7100 50  0000 L CNN
-F 2 "" H 2700 7200 60  0001 C CNN
-F 3 "" H 2700 7200 60  0001 C CNN
-	1    2700 7200
+P 2750 6800
+F 0 "C6" H 2800 6900 50  0000 L CNN
+F 1 "100nF" H 2800 6700 50  0000 L CNN
+F 2 "" H 2750 6800 60  0001 C CNN
+F 3 "" H 2750 6800 60  0001 C CNN
+	1    2750 6800
 	1    0    0    -1  
 $EndComp
-NoConn ~ 9650 6050
-NoConn ~ 9650 5950
-NoConn ~ 9650 5850
-NoConn ~ 9650 5750
-NoConn ~ 9650 5650
-NoConn ~ 9650 5550
-NoConn ~ 9650 5450
-NoConn ~ 9650 5350
-NoConn ~ 9650 5250
-NoConn ~ 9650 5150
-NoConn ~ 9650 4850
-NoConn ~ 9650 4750
-NoConn ~ 9650 4650
-NoConn ~ 9650 4550
-NoConn ~ 9650 4450
-NoConn ~ 9650 4350
-NoConn ~ 8450 6050
-NoConn ~ 8450 5950
-NoConn ~ 8450 5850
-NoConn ~ 8450 5750
-NoConn ~ 8450 5650
-NoConn ~ 8450 5550
-NoConn ~ 8450 5450
-NoConn ~ 8450 5350
-NoConn ~ 8450 5050
-NoConn ~ 8450 4950
-NoConn ~ 8450 4750
-NoConn ~ 8450 4650
-NoConn ~ 8450 4550
-NoConn ~ 8450 4450
-NoConn ~ 8450 4350
-NoConn ~ 8450 4250
+NoConn ~ 8900 5900
+NoConn ~ 8900 5800
+NoConn ~ 8900 5700
+NoConn ~ 8900 5600
+NoConn ~ 8900 5500
+NoConn ~ 8900 5400
+NoConn ~ 8900 5300
+NoConn ~ 8900 5200
+NoConn ~ 8900 5100
+NoConn ~ 8900 5000
+NoConn ~ 8900 4700
+NoConn ~ 8900 4600
+NoConn ~ 8900 4500
+NoConn ~ 8900 4400
+NoConn ~ 8900 4300
+NoConn ~ 8900 4200
+NoConn ~ 7700 5900
+NoConn ~ 7700 5800
+NoConn ~ 7700 5700
+NoConn ~ 7700 5600
+NoConn ~ 7700 5500
+NoConn ~ 7700 5400
+NoConn ~ 7700 5300
+NoConn ~ 7700 5200
+NoConn ~ 7700 4900
+NoConn ~ 7700 4800
+NoConn ~ 7700 4600
+NoConn ~ 7700 4500
+NoConn ~ 7700 4400
+NoConn ~ 7700 4300
+NoConn ~ 7700 4200
+NoConn ~ 7700 4100
 $Comp
 L GND #PWR09
 U 1 1 442A896A
-P 9650 5050
-F 0 "#PWR09" H 9650 5050 30  0001 C CNN
-F 1 "GND" H 9650 4980 30  0001 C CNN
-F 2 "" H 9650 5050 60  0001 C CNN
-F 3 "" H 9650 5050 60  0001 C CNN
-	1    9650 5050
+P 8900 4900
+F 0 "#PWR09" H 8900 4900 30  0001 C CNN
+F 1 "GND" H 8900 4830 30  0001 C CNN
+F 2 "" H 8900 4900 60  0001 C CNN
+F 3 "" H 8900 4900 60  0001 C CNN
+	1    8900 4900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L SUPP40 P3
 U 1 1 442A88ED
-P 9050 5100
-F 0 "P3" H 9100 6200 70  0000 C CNN
-F 1 "SUPP40" H 8900 4000 70  0000 C CNN
-F 2 "" H 9050 5100 60  0001 C CNN
-F 3 "" H 9050 5100 60  0001 C CNN
-	1    9050 5100
+P 8300 4950
+F 0 "P3" H 8300 6050 70  0000 C CNN
+F 1 "SUPP40" H 8300 3800 70  0000 C CNN
+F 2 "" H 8300 4950 60  0001 C CNN
+F 3 "" H 8300 4950 60  0001 C CNN
+	1    8300 4950
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4550 1100
+NoConn ~ 3950 1300
 $Comp
 L GND #PWR010
 U 1 1 442A8838
-P 2950 1250
-F 0 "#PWR010" H 2950 1250 30  0001 C CNN
-F 1 "GND" H 2950 1180 30  0001 C CNN
-F 2 "" H 2950 1250 60  0001 C CNN
-F 3 "" H 2950 1250 60  0001 C CNN
-	1    2950 1250
+P 2350 1450
+F 0 "#PWR010" H 2350 1450 30  0001 C CNN
+F 1 "GND" H 2350 1380 30  0001 C CNN
+F 2 "" H 2350 1450 60  0001 C CNN
+F 3 "" H 2350 1450 60  0001 C CNN
+	1    2350 1450
 	1    0    0    -1  
 $EndComp
-Text Label 4700 1400 0    60   ~ 0
+Text Label 4100 1600 0    60   ~ 0
 DATA-RB7
-Text Label 4700 1300 0    60   ~ 0
+Text Label 4100 1500 0    60   ~ 0
 CLOCK-RB6
 $Comp
 L 24C16 U1
 U 1 1 442A87F7
-P 3850 1200
-F 0 "U1" H 4000 1550 60  0000 C CNN
-F 1 "24Cxx" H 4050 850 60  0000 C CNN
-F 2 "" H 3850 1200 60  0001 C CNN
-F 3 "" H 3850 1200 60  0001 C CNN
-	1    3850 1200
+P 3250 1400
+F 0 "U1" H 3400 1750 60  0000 C CNN
+F 1 "24Cxx" H 3450 1050 60  0000 C CNN
+F 2 "" H 3250 1400 60  0001 C CNN
+F 3 "" H 3250 1400 60  0001 C CNN
+	1    3250 1400
 	1    0    0    -1  
 $EndComp
-Text Label 9800 4250 0    60   ~ 0
+Text Label 9050 4100 0    60   ~ 0
 CLOCK-RB6
-Text Label 9800 4150 0    60   ~ 0
+Text Label 9050 4000 0    60   ~ 0
 DATA-RB7
-Text Label 7800 4150 0    60   ~ 0
+Text Label 7050 4000 0    60   ~ 0
 VPP-MCLR
 NoConn ~ 2500 4400
 NoConn ~ 4050 5450
@@ -386,25 +382,25 @@ $Comp
 L PIC16F54 U5
 U 1 1 442A81A7
 P 3300 4850
-F 0 "U5" H 3600 5650 60  0000 C CNN
-F 1 "PIC_18_PINS" H 3750 4050 60  0000 C CNN
+F 0 "U5" H 3300 5600 60  0000 C CNN
+F 1 "PIC_18_PINS" H 3300 4050 60  0000 C CNN
 F 2 "" H 3300 4850 60  0001 C CNN
 F 3 "" H 3300 4850 60  0001 C CNN
 	1    3300 4850
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4550 3150
-NoConn ~ 3100 2850
-NoConn ~ 3100 2450
+NoConn ~ 4000 3500
+NoConn ~ 2550 3200
+NoConn ~ 2550 2800
 Text Label 4200 5150 0    60   ~ 0
 CLOCK-RB6
 Text Label 4200 5000 0    60   ~ 0
 DATA-RB7
 Text Label 1850 4700 0    60   ~ 0
 VPP-MCLR
-Text Label 4700 2850 0    60   ~ 0
+Text Label 4150 3200 0    60   ~ 0
 CLOCK-RB6
-Text Label 4700 2450 0    60   ~ 0
+Text Label 4150 2800 0    60   ~ 0
 DATA-RB7
 $Comp
 L GND #PWR011
@@ -420,45 +416,97 @@ $EndComp
 $Comp
 L GND #PWR012
 U 1 1 442A8205
-P 4550 2150
-F 0 "#PWR012" H 4550 2150 30  0001 C CNN
-F 1 "GND" H 4550 2080 30  0001 C CNN
-F 2 "" H 4550 2150 60  0001 C CNN
-F 3 "" H 4550 2150 60  0001 C CNN
-	1    4550 2150
+P 4000 2500
+F 0 "#PWR012" H 4000 2500 30  0001 C CNN
+F 1 "GND" H 4000 2430 30  0001 C CNN
+F 2 "" H 4000 2500 60  0001 C CNN
+F 3 "" H 4000 2500 60  0001 C CNN
+	1    4000 2500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L PIC12C508A U6
 U 1 1 442A81A5
-P 3850 2650
-F 0 "U6" H 3800 3350 60  0000 C CNN
-F 1 "PIC_8_PINS" H 3850 1950 60  0000 C CNN
-F 2 "" H 3850 2650 60  0001 C CNN
-F 3 "" H 3850 2650 60  0001 C CNN
-	1    3850 2650
+P 3300 3000
+F 0 "U6" H 3250 3700 60  0000 C CNN
+F 1 "PIC_8_PINS" H 3300 2300 60  0000 C CNN
+F 2 "" H 3300 3000 60  0001 C CNN
+F 3 "" H 3300 3000 60  0001 C CNN
+	1    3300 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR013
 U 1 1 53B84749
-P 3850 700
-F 0 "#PWR013" H 3850 800 30  0001 C CNN
-F 1 "VCC" H 3850 800 30  0000 C CNN
-F 2 "" H 3850 700 60  0001 C CNN
-F 3 "" H 3850 700 60  0001 C CNN
-	1    3850 700 
+P 3250 900
+F 0 "#PWR013" H 3250 1000 30  0001 C CNN
+F 1 "VCC" H 3250 1000 40  0000 C CNN
+F 2 "" H 3250 900 60  0001 C CNN
+F 3 "" H 3250 900 60  0001 C CNN
+	1    3250 900 
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR014
 U 1 1 53B847AC
-P 3850 1700
-F 0 "#PWR014" H 3850 1700 30  0001 C CNN
-F 1 "GND" H 3850 1630 30  0001 C CNN
-F 2 "" H 3850 1700 60  0001 C CNN
-F 3 "" H 3850 1700 60  0001 C CNN
-	1    3850 1700
+P 3250 1900
+F 0 "#PWR014" H 3250 1900 30  0001 C CNN
+F 1 "GND" H 3250 1830 30  0001 C CNN
+F 2 "" H 3250 1900 60  0001 C CNN
+F 3 "" H 3250 1900 60  0001 C CNN
+	1    3250 1900
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	4800 1600 4800 5000
+Connection ~ 4800 5000
+Connection ~ 4800 2800
+Wire Wire Line
+	4800 5000 4050 5000
+Wire Wire Line
+	4900 1500 4900 5150
+Connection ~ 4900 3200
+Wire Wire Line
+	9800 1500 9800 4100
+Connection ~ 4900 1500
+Connection ~ 9800 2250
+Wire Wire Line
+	9700 1600 9700 4000
+Connection ~ 4800 1600
+Connection ~ 9700 2150
+Wire Wire Line
+	9900 2950 9900 6200
+Wire Wire Line
+	5000 4850 5000 6200
+Wire Wire Line
+	9900 6200 1650 6200
+Connection ~ 9900 4800
+Wire Wire Line
+	1750 3500 1750 6100
+Connection ~ 5000 6200
+Connection ~ 1650 2500
+Wire Wire Line
+	1750 6100 6700 6100
+Wire Wire Line
+	6700 6100 6700 2150
+Connection ~ 1750 4700
+Connection ~ 6700 4000
+Wire Wire Line
+	6900 5000 6900 6200
+Connection ~ 6900 6200
+Text Label 3000 6200 0    60   ~ 0
+VCC_PIC
+Text Label 2950 6100 0    60   ~ 0
+VPP-MCLR
+Connection ~ 1650 6200
+Connection ~ 1650 6500
+Connection ~ 9700 1600
+Connection ~ 9800 1500
+Connection ~ 1750 3500
+Wire Wire Line
+	2750 7000 2750 7050
+Wire Wire Line
+	2200 7000 2200 7050
+Wire Wire Line
+	1650 7000 1650 7050
 $EndSCHEMATC
diff --git a/demos/interf_u/interf_u.sch b/demos/interf_u/interf_u.sch
index b23dd57..4e30ece 100644
--- a/demos/interf_u/interf_u.sch
+++ b/demos/interf_u/interf_u.sch
@@ -12,13 +12,13 @@ LIBS:xilinx
 LIBS:special
 LIBS:image
 LIBS:interf_u-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 1 1
-Title "INTERFACE UNIVERSEL"
-Date "18 dec 2011"
+Title "UNIVERSAL INTERFACE"
+Date "Sun 22 Mar 2015"
 Rev "2B"
 Comp "KICAD"
 Comment1 "Comment 1"
@@ -27,8 +27,8 @@ Comment3 "Comment 3"
 Comment4 "Comment 4"
 $EndDescr
 $Bitmap
-Pos 9350 10600
-Scale 1,000000
+Pos 11050 10550
+Scale 1.000000
 Data
 89 50 4E 47 0D 0A 1A 0A 00 00 00 0D 49 48 44 52 00 00 00 E5 00 00 01 0E 08 02 00 00 00 F9 5F 47 
 B4 00 00 00 03 73 42 49 54 08 08 08 DB E1 4F E0 00 00 20 00 49 44 41 54 78 9C EC BD 77 94 5D 47 
@@ -1181,7 +1181,7 @@ BF FD 96 77 9E 38 7E F1 EC E1 55 E2 AF 2F E0 1B 5F F9 FC FE BD 4F B9 56 EB C9 C9
 29 65 D5 9A 89 35 EB 37 F6 E3 02 4F 95 57 89 BF 1E 63 D9 CA D5 CB 7E 65 BC F3 FF E1 D5 7A 1F CE 
 A2 94 8E 79 E6 79 49 E6 FD 75 9E B9 C4 BC BF CE 33 97 98 F7 D7 79 E6 12 F3 FE 3A CF 5C E2 E7 E2 
 03 93 93 93 FD BA 8E 79 E6 39 19 8E FB EB DC 15 0B E6 F9 D5 61 7E 3F 30 CF 5C 62 DE 5F E7 99 4B 
-FC 1F 94 BD 62 D3 EE A5 8B 6B 00 00 00 00 49 45 4E 44 AE 42 60 82 41 
+FC 1F 94 BD 62 D3 EE A5 8B 6B 00 00 00 00 49 45 4E 44 AE 42 60 82 F9 
 EndData
 $EndBitmap
 Wire Bus Line
@@ -1203,17 +1203,7 @@ Wire Wire Line
 Wire Wire Line
 	3150 2250 3650 2250
 Wire Wire Line
-	4450 9300 2600 9300
-Wire Wire Line
-	2600 9300 2600 9350
-Wire Wire Line
-	2600 8900 2600 8850
-Wire Wire Line
-	4450 8900 2600 8900
-Connection ~ 3250 8900
-Connection ~ 3800 8900
-Connection ~ 3800 9300
-Connection ~ 3250 9300
+	1000 9850 1000 9950
 Wire Wire Line
 	4500 3100 4000 3100
 Wire Wire Line
@@ -1283,7 +1273,7 @@ Wire Wire Line
 Wire Wire Line
 	3400 6750 3900 6750
 Wire Wire Line
-	3150 2450 3650 2450
+	3150 2450 3600 2450
 Wire Wire Line
 	1350 2650 850  2650
 Wire Wire Line
@@ -1347,12 +1337,12 @@ Wire Wire Line
 Connection ~ 10050 3100
 Connection ~ 10050 3200
 Wire Wire Line
-	13550 4400 13550 3700
+	13500 3700 13500 4400
 Wire Wire Line
-	14350 4400 14350 3700
-Connection ~ 13550 4150
-Connection ~ 14350 4150
-Connection ~ 14350 3700
+	14400 3700 14400 4400
+Connection ~ 13500 4150
+Connection ~ 14400 4150
+Connection ~ 14400 3700
 Wire Wire Line
 	8450 1250 9000 1250
 Wire Wire Line
@@ -1517,7 +1507,7 @@ Wire Wire Line
 	10100 8100 9650 8100
 Wire Wire Line
 	10100 8200 9650 8200
-Connection ~ 13550 3700
+Connection ~ 13500 3700
 Wire Wire Line
 	12300 3600 12700 3600
 Wire Wire Line
@@ -1599,7 +1589,7 @@ Wire Wire Line
 Wire Wire Line
 	14700 7500 14750 7500
 Wire Wire Line
-	14700 7500 14700 6100
+	14700 6100 14700 7500
 Wire Wire Line
 	14650 6100 14750 6100
 Wire Wire Line
@@ -1658,7 +1648,7 @@ Wire Wire Line
 Wire Wire Line
 	1200 6900 1300 6900
 Wire Wire Line
-	1200 7700 1200 6900
+	1200 6900 1200 7700
 Wire Wire Line
 	1300 7000 1200 7000
 Wire Wire Line
@@ -1693,7 +1683,7 @@ Wire Wire Line
 Wire Wire Line
 	3150 7950 3150 6800
 Wire Wire Line
-	3900 7000 2600 7000
+	2600 7000 3900 7000
 Wire Wire Line
 	2600 7000 2600 7100
 Wire Wire Line
@@ -1739,7 +1729,7 @@ Wire Wire Line
 Wire Wire Line
 	3900 7500 2850 7500
 Wire Wire Line
-	3900 7400 2100 7400
+	2100 7400 3900 7400
 Connection ~ 2450 7600
 Connection ~ 2550 7500
 Connection ~ 2650 7400
@@ -1751,9 +1741,9 @@ Wire Wire Line
 Wire Wire Line
 	2850 7200 2100 7200
 Wire Wire Line
-	2850 7950 2850 7200
+	2850 7200 2850 7950
 Wire Wire Line
-	2550 7950 2550 7150
+	2550 7150 2550 7950
 Wire Wire Line
 	2550 7150 2900 7150
 Wire Wire Line
@@ -1765,11 +1755,11 @@ Wire Wire Line
 Wire Wire Line
 	14650 1050 14650 1350
 Wire Wire Line
-	13550 4150 13650 4150
+	13500 4150 13650 4150
 Wire Wire Line
-	14250 4150 14350 4150
+	14250 4150 14400 4150
 Wire Bus Line
-	3750 2350 3750 1650
+	3750 1650 3750 2350
 Wire Bus Line
 	3750 3450 3750 5350
 Wire Bus Line
@@ -1777,9 +1767,9 @@ Wire Bus Line
 Wire Bus Line
 	3300 5350 3300 6650
 Wire Bus Line
-	3900 3700 3900 2450
+	3900 2450 3900 3700
 Wire Wire Line
-	13700 3700 12300 3700
+	12300 3700 13700 3700
 Wire Wire Line
 	14200 3700 14650 3700
 Wire Wire Line
@@ -1804,23 +1794,23 @@ Selection
 $Comp
 L GND #PWR01
 U 1 1 43020357
-P 14350 4800
-F 0 "#PWR01" H 14350 4800 30  0001 C CNN
-F 1 "GND" H 14350 4730 30  0001 C CNN
-F 2 "" H 14350 4800 60  0001 C CNN
-F 3 "" H 14350 4800 60  0001 C CNN
-	1    14350 4800
+P 14400 4800
+F 0 "#PWR01" H 14400 4800 30  0001 C CNN
+F 1 "GND" H 14400 4730 30  0001 C CNN
+F 2 "" H 14400 4800 60  0001 C CNN
+F 3 "" H 14400 4800 60  0001 C CNN
+	1    14400 4800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR02
 U 1 1 43020354
-P 13550 4800
-F 0 "#PWR02" H 13550 4800 30  0001 C CNN
-F 1 "GND" H 13550 4730 30  0001 C CNN
-F 2 "" H 13550 4800 60  0001 C CNN
-F 3 "" H 13550 4800 60  0001 C CNN
-	1    13550 4800
+P 13500 4800
+F 0 "#PWR02" H 13500 4800 30  0001 C CNN
+F 1 "GND" H 13500 4730 30  0001 C CNN
+F 2 "" H 13500 4800 60  0001 C CNN
+F 3 "" H 13500 4800 60  0001 C CNN
+	1    13500 4800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1848,67 +1838,67 @@ $EndComp
 $Comp
 L GND #PWR05
 U 1 1 43020328
-P 2600 9350
-F 0 "#PWR05" H 2600 9350 30  0001 C CNN
-F 1 "GND" H 2600 9280 30  0001 C CNN
-F 2 "" H 2600 9350 60  0001 C CNN
-F 3 "" H 2600 9350 60  0001 C CNN
-	1    2600 9350
+P 1000 9950
+F 0 "#PWR05" H 1000 9950 30  0001 C CNN
+F 1 "GND" H 1000 9880 30  0001 C CNN
+F 2 "" H 1000 9950 60  0001 C CNN
+F 3 "" H 1000 9950 60  0001 C CNN
+	1    1000 9950
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG06
 U 1 1 38CEA284
-P 3250 9300
-F 0 "#FLG06" H 3250 9570 30  0001 C CNN
-F 1 "PWR_FLAG" H 3250 9530 30  0000 C CNN
-F 2 "" H 3250 9300 60  0001 C CNN
-F 3 "" H 3250 9300 60  0001 C CNN
-	1    3250 9300
+P 2850 9950
+F 0 "#FLG06" H 2850 10220 30  0001 C CNN
+F 1 "PWR_FLAG" H 2850 10180 30  0000 C CNN
+F 2 "" H 2850 9950 60  0001 C CNN
+F 3 "" H 2850 9950 60  0001 C CNN
+	1    2850 9950
 	-1   0    0    1   
 $EndComp
 $Comp
 L PWR_FLAG #PWR07
 U 1 1 38C8E81F
-P 3250 8900
-F 0 "#PWR07" H 3250 9170 30  0001 C CNN
-F 1 "PWR_FLAG" H 3250 9130 30  0000 C CNN
-F 2 "" H 3250 8900 60  0001 C CNN
-F 3 "" H 3250 8900 60  0001 C CNN
-	1    3250 8900
+P 2850 9350
+F 0 "#PWR07" H 2850 9620 30  0001 C CNN
+F 1 "PWR_FLAG" H 2850 9580 30  0000 C CNN
+F 2 "" H 2850 9350 60  0001 C CNN
+F 3 "" H 2850 9350 60  0001 C CNN
+	1    2850 9350
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR08
 U 1 1 38C8E014
-P 8450 2550
-F 0 "#PWR08" H 8450 2650 30  0001 C CNN
-F 1 "VCC" H 8450 2650 30  0000 C CNN
-F 2 "" H 8450 2550 60  0001 C CNN
-F 3 "" H 8450 2550 60  0001 C CNN
-	1    8450 2550
-	1    0    0    -1  
+P 8500 2550
+F 0 "#PWR08" H 8500 2650 30  0001 C CNN
+F 1 "VCC" V 8500 2700 40  0000 C CNN
+F 2 "" H 8500 2550 60  0001 C CNN
+F 3 "" H 8500 2550 60  0001 C CNN
+	1    8500 2550
+	0    1    1    0   
 $EndComp
 $Comp
 L VCC #PWR09
 U 1 1 4A33B1CF
-P 1350 4250
-F 0 "#PWR09" H 1350 4450 40  0001 C CNN
-F 1 "VCC" H 1350 4400 40  0000 C CNN
-F 2 "" H 1350 4250 60  0001 C CNN
-F 3 "" H 1350 4250 60  0001 C CNN
-	1    1350 4250
+P 1300 4250
+F 0 "#PWR09" H 1300 4450 40  0001 C CNN
+F 1 "VCC" V 1300 4400 40  0000 C CNN
+F 2 "" H 1300 4250 60  0001 C CNN
+F 3 "" H 1300 4250 60  0001 C CNN
+	1    1300 4250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L VCC #PWR010
 U 1 1 4A33B1D0
-P 1350 1650
-F 0 "#PWR010" H 1350 1850 40  0001 C CNN
-F 1 "VCC" H 1350 1800 40  0000 C CNN
-F 2 "" H 1350 1650 60  0001 C CNN
-F 3 "" H 1350 1650 60  0001 C CNN
-	1    1350 1650
+P 1300 1650
+F 0 "#PWR010" H 1300 1850 40  0001 C CNN
+F 1 "VCC" V 1300 1800 40  0000 C CNN
+F 2 "" H 1300 1650 60  0001 C CNN
+F 3 "" H 1300 1650 60  0001 C CNN
+	1    1300 1650
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -1916,7 +1906,7 @@ L VCC #PWR011
 U 1 1 4A33B1D1
 P 10050 3000
 F 0 "#PWR011" H 10050 3100 30  0001 C CNN
-F 1 "VCC" H 10050 3100 30  0000 C CNN
+F 1 "VCC" H 10050 3100 40  0000 C CNN
 F 2 "" H 10050 3000 60  0001 C CNN
 F 3 "" H 10050 3000 60  0001 C CNN
 	1    10050 3000
@@ -1925,23 +1915,23 @@ $EndComp
 $Comp
 L VCC #PWR012
 U 1 1 4A33B1D2
-P 6100 9900
-F 0 "#PWR012" H 6100 10000 30  0001 C CNN
-F 1 "VCC" H 6100 10000 30  0000 C CNN
-F 2 "" H 6100 9900 60  0001 C CNN
-F 3 "" H 6100 9900 60  0001 C CNN
-	1    6100 9900
+P 6050 9900
+F 0 "#PWR012" H 6050 10000 30  0001 C CNN
+F 1 "VCC" H 6050 10000 40  0000 C CNN
+F 2 "" H 6050 9900 60  0001 C CNN
+F 3 "" H 6050 9900 60  0001 C CNN
+	1    6050 9900
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR013
 U 1 1 38C8DFD2
-P 2600 8850
-F 0 "#PWR013" H 2600 8950 30  0001 C CNN
-F 1 "VCC" H 2600 8950 30  0000 C CNN
-F 2 "" H 2600 8850 60  0001 C CNN
-F 3 "" H 2600 8850 60  0001 C CNN
-	1    2600 8850
+P 1000 9350
+F 0 "#PWR013" H 1000 9450 30  0001 C CNN
+F 1 "VCC" H 1000 9450 30  0000 C CNN
+F 2 "" H 1000 9350 60  0001 C CNN
+F 3 "" H 1000 9350 60  0001 C CNN
+	1    1000 9350
 	1    0    0    -1  
 $EndComp
 Entry Wire Line
@@ -2019,12 +2009,12 @@ Entry Wire Line
 $Comp
 L GND #GND014
 U 1 1 3268ED7F
-P 6850 2550
-F 0 "#GND014" H 6850 2550 30  0001 C CNN
-F 1 "GND" H 6850 2480 30  0001 C CNN
-F 2 "" H 6850 2550 60  0001 C CNN
-F 3 "" H 6850 2550 60  0001 C CNN
-	1    6850 2550
+P 6800 2550
+F 0 "#GND014" H 6800 2550 30  0001 C CNN
+F 1 "GND" H 6800 2480 30  0001 C CNN
+F 2 "" H 6800 2550 60  0001 C CNN
+F 3 "" H 6800 2550 60  0001 C CNN
+	1    6800 2550
 	0    1    1    0   
 $EndComp
 Text Label 2150 7600 0    60   ~ 0
@@ -2060,12 +2050,12 @@ NoConn ~ 2350 7950
 $Comp
 L VCC #015
 U 1 1 32567A22
-P 3250 7950
-F 0 "#015" H 3250 8150 40  0001 C CNN
-F 1 "VCC" H 3250 8100 40  0000 C CNN
-F 2 "" H 3250 7950 60  0001 C CNN
-F 3 "" H 3250 7950 60  0001 C CNN
-	1    3250 7950
+P 3300 7950
+F 0 "#015" H 3300 8150 40  0001 C CNN
+F 1 "VCC" V 3300 8100 40  0000 C CNN
+F 2 "" H 3300 7950 60  0001 C CNN
+F 3 "" H 3300 7950 60  0001 C CNN
+	1    3300 7950
 	0    1    1    0   
 $EndComp
 $Comp
@@ -2130,7 +2120,7 @@ U 1 1 3256759C
 P 15200 7200
 F 0 "P1" H 15250 8550 70  0000 C CNN
 F 1 "DB25FEMELLE" H 15150 5850 70  0000 C CNN
-F 2 "connect:DB25FC" H 15150 5750 60  0000 C CNN
+F 2 "connect:DB25FC" H 15150 5750 50  0000 C CNN
 F 3 "" H 15200 7200 60  0001 C CNN
 	1    15200 7200
 	1    0    0    -1  
@@ -2333,7 +2323,7 @@ U 1 1 324002E6
 P 6350 9900
 F 0 "R3" V 6430 9900 50  0000 C CNN
 F 1 "10K" V 6350 9900 50  0000 C CNN
-F 2 "discret:R3" V 6250 9900 60  0000 C CNN
+F 2 "discret:R3" V 6500 9900 50  0000 C CNN
 F 3 "" H 6350 9900 60  0001 C CNN
 	1    6350 9900
 	0    1    1    0   
@@ -2382,9 +2372,9 @@ $Comp
 L 628128 U5
 U 1 1 3240023F
 P 7700 9050
-F 0 "U5" H 7750 10200 70  0000 C CNN
-F 1 "628128" H 7700 7900 70  0000 C CNN
-F 2 "dip_sockets:DIP-32__600" H 7700 7800 60  0000 C CNN
+F 0 "U5" H 7700 10200 70  0000 C CNN
+F 1 "628128" H 7700 7850 70  0000 C CNN
+F 2 "dip_sockets:DIP-32__600" H 7700 7750 50  0000 C CNN
 F 3 "" H 7700 9050 60  0001 C CNN
 	1    7700 9050
 	1    0    0    -1  
@@ -2414,35 +2404,35 @@ ENBBUF
 $Comp
 L VCC #017
 U 1 1 32332C72
-P 8450 1050
-F 0 "#017" H 8450 1150 30  0001 C CNN
-F 1 "VCC" H 8450 1150 30  0000 C CNN
-F 2 "" H 8450 1050 60  0001 C CNN
-F 3 "" H 8450 1050 60  0001 C CNN
-	1    8450 1050
-	1    0    0    -1  
+P 8500 1050
+F 0 "#017" H 8500 1150 30  0001 C CNN
+F 1 "VCC" V 8500 1200 40  0000 C CNN
+F 2 "" H 8500 1050 60  0001 C CNN
+F 3 "" H 8500 1050 60  0001 C CNN
+	1    8500 1050
+	0    1    1    0   
 $EndComp
-Text Label 6400 1250 0    60   ~ 0
+Text Label 6350 1250 0    60   ~ 0
 MATCHL
 $Comp
 L GND #018
 U 1 1 32331877
-P 6850 1050
-F 0 "#018" H 6850 1050 30  0001 C CNN
-F 1 "GND" H 6850 980 30  0001 C CNN
-F 2 "" H 6850 1050 60  0001 C CNN
-F 3 "" H 6850 1050 60  0001 C CNN
-	1    6850 1050
+P 6800 1050
+F 0 "#018" H 6800 1050 30  0001 C CNN
+F 1 "GND" H 6800 980 30  0001 C CNN
+F 2 "" H 6800 1050 60  0001 C CNN
+F 3 "" H 6800 1050 60  0001 C CNN
+	1    6800 1050
 	0    1    1    0   
 $EndComp
 NoConn ~ 6850 2150
 NoConn ~ 6850 2050
 NoConn ~ 6850 1950
-Text Label 6050 2050 0    60   ~ 0
+Text Label 6100 2050 0    60   ~ 0
 RSTL
-Text Label 6050 1950 0    60   ~ 0
+Text Label 6400 1950 2    60   ~ 0
 PC-RD
-Text Label 6050 1850 0    60   ~ 0
+Text Label 6400 1850 2    60   ~ 0
 PC-WR
 NoConn ~ 5950 2150
 Text Label 6000 3800 0    60   ~ 0
@@ -2463,21 +2453,21 @@ Text Label 6000 3100 0    60   ~ 0
 D0
 Text Label 5350 6050 0    60   Italic 12
 MATCHL
-Text Label 4100 2050 0    60   ~ 0
+Text Label 4050 2050 0    60   ~ 0
 PC-RST
 Text Label 800  1550 0    60   ~ 0
 PC-RST
-Text Label 4100 1950 0    60   ~ 0
+Text Label 4050 1950 0    60   ~ 0
 PC-IOR
-Text Label 4100 1850 0    60   ~ 0
+Text Label 4050 1850 0    60   ~ 0
 PC-IOW
-Text Label 900  2750 0    60   ~ 0
+Text Label 850  2750 0    60   ~ 0
 PC-IOR
-Text Label 900  2650 0    60   ~ 0
+Text Label 850  2650 0    60   ~ 0
 PC-IOW
 Text Label 3500 7750 0    60   ~ 0
 PC-AEN
-Text Label 3250 2450 0    60   ~ 0
+Text Label 3600 2450 2    60   ~ 0
 PC-AEN
 Text Label 3500 6750 0    60   ~ 0
 PC-A4
@@ -2495,13 +2485,13 @@ Text Label 3500 6450 0    60   ~ 0
 PC-A10
 Text Label 3500 6350 0    60   ~ 0
 PC-A11
-Text Label 4150 1750 0    60   ~ 0
+Text Label 4050 1750 0    60   ~ 0
 PC-A3
-Text Label 4150 1650 0    60   ~ 0
+Text Label 4050 1650 0    60   ~ 0
 PC-A2
-Text Label 4150 1450 0    60   ~ 0
+Text Label 4050 1450 0    60   ~ 0
 PC-A1
-Text Label 4150 1550 0    60   ~ 0
+Text Label 4050 1550 0    60   ~ 0
 PC-A0
 $Comp
 L GND #019
@@ -2602,45 +2592,45 @@ NoConn ~ 1350 4350
 $Comp
 L GND #021
 U 1 1 32307FB9
-P 1350 4450
-F 0 "#021" H 1350 4450 40  0001 C CNN
-F 1 "GND" H 1350 4380 40  0000 C CNN
-F 2 "" H 1350 4450 60  0001 C CNN
-F 3 "" H 1350 4450 60  0001 C CNN
-	1    1350 4450
+P 1300 4450
+F 0 "#021" H 1300 4450 40  0001 C CNN
+F 1 "GND" H 1300 4380 40  0001 C CNN
+F 2 "" H 1300 4450 60  0001 C CNN
+F 3 "" H 1300 4450 60  0001 C CNN
+	1    1300 4450
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #022
 U 1 1 32307FA7
-P 1350 1450
-F 0 "#022" H 1350 1450 40  0001 C CNN
-F 1 "GND" H 1350 1380 40  0000 C CNN
-F 2 "" H 1350 1450 60  0001 C CNN
-F 3 "" H 1350 1450 60  0001 C CNN
-	1    1350 1450
+P 1300 1450
+F 0 "#022" H 1300 1450 40  0001 C CNN
+F 1 "GND" H 1300 1380 40  0001 C CNN
+F 2 "" H 1300 1450 60  0001 C CNN
+F 3 "" H 1300 1450 60  0001 C CNN
+	1    1300 1450
 	0    1    1    0   
 $EndComp
 $Comp
 L C C3
 U 1 1 32307ED4
-P 14350 4600
-F 0 "C3" V 14450 4750 50  0000 C CNN
-F 1 "47pF" V 14450 4450 50  0000 C CNN
-F 2 "discret:C1" H 14550 4600 60  0000 C CNN
-F 3 "" H 14350 4600 60  0001 C CNN
-	1    14350 4600
+P 14400 4600
+F 0 "C3" H 14650 4650 50  0000 C CNN
+F 1 "47pF" H 14650 4550 50  0000 C CNN
+F 2 "discret:C1" H 14650 4450 50  0000 C CNN
+F 3 "" H 14400 4600 60  0001 C CNN
+	1    14400 4600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C2
 U 1 1 32307ECF
-P 13550 4600
-F 0 "C2" V 13650 4750 50  0000 C CNN
-F 1 "47pF" V 13650 4450 50  0000 C CNN
-F 2 "discret:C1" H 13350 4600 60  0000 C CNN
-F 3 "" H 13550 4600 60  0001 C CNN
-	1    13550 4600
+P 13500 4600
+F 0 "C2" H 13750 4650 50  0000 C CNN
+F 1 "47pF" H 13750 4550 50  0000 C CNN
+F 2 "discret:C1" H 13750 4450 50  0000 C CNN
+F 3 "" H 13500 4600 60  0001 C CNN
+	1    13500 4600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2649,7 +2639,7 @@ U 1 1 32307EC0
 P 13950 4150
 F 0 "X1" H 13950 4350 70  0000 C CNN
 F 1 "8MHz" H 13950 3950 70  0000 C CNN
-F 2 "discret:HC-18UH" H 13950 3850 60  0000 C CNN
+F 2 "discret:HC-18UH" H 13950 3850 50  0000 C CNN
 F 3 "" H 13950 4150 60  0001 C CNN
 	1    13950 4150
 	1    0    0    -1  
@@ -2658,9 +2648,9 @@ $Comp
 L R R2
 U 1 1 32307EAA
 P 14900 3700
-F 0 "R2" V 14980 3700 50  0000 C CNN
+F 0 "R2" V 14800 3700 50  0000 C CNN
 F 1 "1K" V 14900 3700 50  0000 C CNN
-F 2 "discret:R3" V 14800 3700 60  0000 C CNN
+F 2 "discret:R3" V 15000 3700 50  0000 C CNN
 F 3 "" H 14900 3700 60  0001 C CNN
 	1    14900 3700
 	0    1    1    0   
@@ -2669,9 +2659,9 @@ $Comp
 L R R1
 U 1 1 32307EA1
 P 13950 3700
-F 0 "R1" V 14030 3700 50  0000 C CNN
+F 0 "R1" V 13850 3700 50  0000 C CNN
 F 1 "100K" V 13950 3700 50  0000 C CNN
-F 2 "discret:R3" V 13850 3700 60  0000 C CNN
+F 2 "discret:R3" V 14050 3700 50  0000 C CNN
 F 3 "" H 13950 3700 60  0001 C CNN
 	1    13950 3700
 	0    1    1    0   
@@ -2679,45 +2669,45 @@ $EndComp
 $Comp
 L CP C1
 U 1 1 32307DE2
-P 4450 9100
-F 0 "C1" H 4500 9200 50  0000 L CNN
-F 1 "47uF" H 4500 9000 50  0000 L CNN
-F 2 "discret:CP6" H 4650 9100 60  0000 C CNN
-F 3 "" H 4450 9100 60  0001 C CNN
-	1    4450 9100
+P 2850 9650
+F 0 "C1" H 2950 9700 50  0000 L CNN
+F 1 "47uF" H 2950 9600 50  0000 L CNN
+F 2 "discret:CP6" H 3100 9500 50  0000 C CNN
+F 3 "" H 2850 9650 60  0001 C CNN
+	1    2850 9650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C4
 U 1 1 32307DCF
-P 3800 9100
-F 0 "C4" H 3850 9200 50  0000 L CNN
-F 1 "47uF" H 3850 9000 50  0000 L CNN
-F 2 "discret:CP6" H 4000 9100 60  0000 C CNN
-F 3 "" H 3800 9100 60  0001 C CNN
-	1    3800 9100
+P 2200 9650
+F 0 "C4" H 2300 9700 50  0000 L CNN
+F 1 "47uF" H 2300 9600 50  0000 L CNN
+F 2 "discret:CP6" H 2450 9500 50  0000 C CNN
+F 3 "" H 2200 9650 60  0001 C CNN
+	1    2200 9650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C5
 U 1 1 32307DCA
-P 3250 9100
-F 0 "C5" H 3300 9200 50  0000 L CNN
-F 1 "47uF" H 3300 9000 50  0000 L CNN
-F 2 "discret:CP6" H 3450 9100 60  0000 C CNN
-F 3 "" H 3250 9100 60  0001 C CNN
-	1    3250 9100
+P 1650 9650
+F 0 "C5" H 1750 9700 50  0000 L CNN
+F 1 "47uF" H 1750 9600 50  0000 L CNN
+F 2 "discret:CP6" H 1900 9500 50  0000 C CNN
+F 3 "" H 1650 9650 60  0001 C CNN
+	1    1650 9650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C6
 U 1 1 32307DC0
-P 2600 9100
-F 0 "C6" H 2650 9200 50  0000 L CNN
-F 1 "47uF" H 2650 9000 50  0000 L CNN
-F 2 "discret:CP6" H 2800 9100 60  0000 C CNN
-F 3 "" H 2600 9100 60  0001 C CNN
-	1    2600 9100
+P 1000 9650
+F 0 "C6" H 1100 9700 50  0000 L CNN
+F 1 "47uF" H 1100 9600 50  0000 L CNN
+F 2 "discret:CP6" H 1250 9500 50  0000 C CNN
+F 3 "" H 1000 9650 60  0001 C CNN
+	1    1000 9650
 	1    0    0    -1  
 $EndComp
 Text Label 3250 2250 0    60   ~ 0
@@ -2742,7 +2732,7 @@ U 1 1 322D35B4
 P 4600 6900
 F 0 "U2" H 4600 7850 60  0000 C CNN
 F 1 "74LS688" H 4600 5950 60  0000 C CIB
-F 2 "dip_sockets:DIP-20__300" H 4600 5850 60  0000 C CNB
+F 2 "dip_sockets:DIP-20__300" H 4600 5850 50  0000 C CNN
 F 3 "" H 4600 6900 60  0001 C CNN
 	1    4600 6900
 	1    0    0    -1  
@@ -2753,7 +2743,7 @@ U 1 1 322D32FA
 P 11200 5700
 F 0 "U9" H 11200 8450 70  0000 C CNN
 F 1 "4003APG120" H 11200 2950 70  0000 C CNN
-F 2 "PGA120" H 11200 2850 60  0000 C CNN
+F 2 "PGA120" H 11200 2850 50  0000 C CNN
 F 3 "" H 11200 5700 60  0001 C CNN
 F 4 "50$" H 11200 5700 60  0001 C CNN "price"
 F 5 "test" H 11200 5700 60  0001 C CNN "Field5"
@@ -2764,9 +2754,9 @@ $Comp
 L LED D2
 U 1 1 322D32BE
 P 14250 2000
-F 0 "D2" H 14250 2100 50  0000 C CNN
-F 1 "LED" H 14250 1900 50  0000 C CNN
-F 2 "discret:LEDV" V 14250 2250 60  0000 C CNN
+F 0 "D2" V 14150 1850 50  0000 C CNN
+F 1 "LED" V 14250 2250 50  0000 C CNN
+F 2 "discret:LEDV" V 14350 2250 50  0000 C CNN
 F 3 "" H 14250 2000 60  0001 C CNN
 	1    14250 2000
 	0    1    1    0   
@@ -2775,9 +2765,9 @@ $Comp
 L LED D1
 U 1 1 322D32AC
 P 14650 1550
-F 0 "D1" H 14650 1650 50  0000 C CNN
-F 1 "LED" H 14650 1450 50  0000 C CNN
-F 2 "discret:LEDV" V 14650 1800 60  0000 C CNN
+F 0 "D1" V 14550 1400 50  0000 C CNN
+F 1 "LED" V 14650 1800 50  0000 C CNN
+F 2 "discret:LEDV" V 14750 1800 50  0000 C CNN
 F 3 "" H 14650 1550 60  0001 C CNN
 	1    14650 1550
 	0    1    1    0   
@@ -2786,9 +2776,9 @@ $Comp
 L R R5
 U 1 1 322D32A0
 P 13700 1500
-F 0 "R5" V 13780 1500 50  0000 C CNN
+F 0 "R5" V 13600 1500 50  0000 C CNN
 F 1 "330" V 13700 1500 50  0000 C CNN
-F 2 "discret:R3" V 13730 1680 30  0000 C CNN
+F 2 "discret:R3" V 13800 1500 50  0000 C CNN
 F 3 "" H 13700 1500 60  0001 C CNN
 	1    13700 1500
 	0    1    1    0   
@@ -2797,9 +2787,9 @@ $Comp
 L R R4
 U 1 1 322D3295
 P 13700 1050
-F 0 "R4" V 13780 1050 50  0000 C CNN
+F 0 "R4" V 13600 1050 50  0000 C CNN
 F 1 "330" V 13700 1050 50  0000 C CNN
-F 2 "discret:R3" V 13850 1050 60  0000 C CNN
+F 2 "discret:R3" V 13800 1050 50  0000 C CNN
 F 3 "" H 13700 1050 60  0001 C CNN
 	1    13700 1050
 	0    1    1    0   
@@ -2808,7 +2798,7 @@ $Comp
 L EP600 U8
 U 1 1 322D321C
 P 7650 1800
-F 0 "U8" H 7650 1900 70  0000 C CNN
+F 0 "U8" H 7650 2700 70  0000 C CNN
 F 1 "EP600" H 7650 850 70  0000 C CNN
 F 2 "dip_sockets:DIP-24__300" H 7700 750 60  0000 C CNN
 F 3 "" H 7650 1800 60  0001 C CNN
@@ -2819,9 +2809,9 @@ $Comp
 L 74LS245 U1
 U 1 1 322D31F4
 P 5200 3600
-F 0 "U1" H 5300 4175 60  0000 L BNN
-F 1 "74LS245" H 5250 3025 60  0000 L TNN
-F 2 "dip_sockets:DIP-20__300" H 5400 2900 60  0000 C CNN
+F 0 "U1" H 5200 4200 60  0000 C CNN
+F 1 "74LS245" H 5200 2950 60  0000 C CNN
+F 2 "dip_sockets:DIP-20__300" H 5200 2850 50  0000 C CNN
 F 3 "" H 5200 3600 60  0001 C CNN
 	1    5200 3600
 	1    0    0    -1  
@@ -2837,4 +2827,50 @@ F 3 "" H 2250 2950 60  0001 C CNN
 	1    2250 2950
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	1000 9900 2850 9900
+Wire Wire Line
+	2850 9850 2850 9950
+Connection ~ 1000 9900
+Connection ~ 2850 9900
+Wire Wire Line
+	2200 9850 2200 9900
+Connection ~ 2200 9900
+Wire Wire Line
+	1650 9850 1650 9900
+Connection ~ 1650 9900
+Wire Wire Line
+	1000 9350 1000 9450
+Wire Wire Line
+	1000 9400 2850 9400
+Wire Wire Line
+	2850 9350 2850 9450
+Connection ~ 1000 9400
+Connection ~ 2850 9400
+Wire Wire Line
+	2200 9400 2200 9450
+Connection ~ 2200 9400
+Wire Wire Line
+	1650 9400 1650 9450
+Connection ~ 1650 9400
+Wire Wire Line
+	1300 1450 1350 1450
+Wire Wire Line
+	1300 1650 1350 1650
+Wire Wire Line
+	1300 4250 1350 4250
+Wire Wire Line
+	1300 4450 1350 4450
+Wire Wire Line
+	8500 2550 8450 2550
+Wire Wire Line
+	8500 1050 8450 1050
+Wire Wire Line
+	6800 2550 6850 2550
+Wire Wire Line
+	6800 1050 6850 1050
+Wire Wire Line
+	6050 9900 6100 9900
+Wire Wire Line
+	3300 7950 3250 7950
 $EndSCHEMATC
diff --git a/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch b/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
index c1427ab..d1565bb 100644
--- a/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
+++ b/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
@@ -13,13 +13,13 @@ LIBS:special
 LIBS:microcontrollers
 LIBS:motorola
 LIBS:kit-dev-coldfire-xilinx_5213-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 2 3
 Title "Dev kit coldfire 5213"
-Date "8 feb 2008"
+Date "Sun 22 Mar 2015"
 Rev "0"
 Comp ""
 Comment1 ""
@@ -27,541 +27,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Wire Wire Line
-	13550 4450 13550 4400
-Wire Wire Line
-	13550 4400 13500 4400
-Wire Wire Line
-	12450 9150 12900 9150
-Wire Wire Line
-	13400 9400 13400 9500
-Wire Wire Line
-	14500 9400 14550 9400
-Wire Wire Line
-	10550 10050 11000 10050
-Wire Wire Line
-	11800 10150 12300 10150
-Wire Wire Line
-	10450 9050 10950 9050
-Wire Wire Line
-	10400 9350 10400 9200
-Wire Wire Line
-	10400 9200 10950 9200
-Wire Wire Line
-	12000 9450 12000 9400
-Wire Wire Line
-	12000 9400 11900 9400
-Wire Wire Line
-	10850 8750 10950 8750
-Wire Wire Line
-	12300 9250 11900 9250
-Wire Wire Line
-	12300 9150 11900 9150
-Connection ~ 8050 6350
-Wire Wire Line
-	7900 6350 8050 6350
-Wire Wire Line
-	7850 7450 7850 7400
-Wire Wire Line
-	7850 7400 7750 7400
-Wire Wire Line
-	7950 6700 7950 6500
-Wire Wire Line
-	7950 6500 7900 6500
-Wire Wire Line
-	9850 6300 9850 6650
-Wire Wire Line
-	9850 6300 9650 6300
-Connection ~ 8850 6650
-Wire Wire Line
-	8850 6650 8850 6700
-Wire Wire Line
-	9850 6650 8500 6650
-Wire Wire Line
-	11750 6650 11450 6650
-Wire Wire Line
-	8200 5500 8200 5050
-Wire Wire Line
-	8200 5050 8100 5050
-Wire Wire Line
-	8900 9850 9700 9850
-Wire Wire Line
-	9700 9850 9700 9500
-Wire Wire Line
-	8900 9650 9300 9650
-Wire Wire Line
-	9300 9650 9300 9500
-Wire Wire Line
-	2150 1500 2150 1600
-Wire Wire Line
-	3150 6750 3150 6900
-Wire Wire Line
-	2150 9000 2600 9000
-Wire Wire Line
-	2600 9000 2600 8200
-Wire Wire Line
-	2050 8150 2050 8200
-Wire Wire Line
-	2050 8200 2350 8200
-Wire Wire Line
-	2350 8200 2350 7400
-Wire Wire Line
-	2350 7400 1350 7400
-Wire Wire Line
-	1950 9000 1550 9000
-Wire Wire Line
-	1950 7050 1550 7050
-Wire Wire Line
-	2050 7050 2050 7200
-Wire Wire Line
-	2050 7200 1350 7200
-Connection ~ 3950 5450
-Wire Wire Line
-	4000 5850 3950 5850
-Wire Wire Line
-	3950 5850 3950 5450
-Wire Wire Line
-	5150 8300 5100 8300
-Wire Wire Line
-	5100 8300 4850 8200
-Wire Wire Line
-	4850 8200 4750 8200
-Connection ~ 4950 8200
-Wire Wire Line
-	5150 8200 4950 8200
-Wire Wire Line
-	4950 8550 4950 8000
-Wire Wire Line
-	4950 8000 4750 8000
-Wire Wire Line
-	3050 8350 3050 7800
-Wire Wire Line
-	3050 7800 3150 7800
-Connection ~ 1400 7100
-Wire Wire Line
-	1350 7100 1400 7100
-Wire Wire Line
-	4900 7800 4750 7800
-Wire Wire Line
-	4900 7300 4750 7300
-Wire Wire Line
-	3150 7300 3000 7300
-Wire Wire Line
-	3000 6650 3000 6900
-Wire Wire Line
-	6300 8000 5950 8000
-Wire Wire Line
-	6300 8100 5950 8100
-Wire Wire Line
-	6300 8200 5950 8200
-Wire Wire Line
-	6300 8300 5950 8300
-Wire Wire Line
-	3000 6900 3150 6900
-Wire Wire Line
-	4900 6900 4750 6900
-Wire Wire Line
-	4900 7400 4750 7400
-Wire Wire Line
-	1350 7000 1400 7000
-Wire Wire Line
-	1400 7000 1400 7600
-Wire Wire Line
-	1400 7600 1350 7600
-Wire Wire Line
-	3150 8100 2700 8100
-Wire Wire Line
-	2900 8000 2900 7500
-Wire Wire Line
-	2900 8000 3150 8000
-Wire Wire Line
-	2600 8200 3150 8200
-Wire Wire Line
-	2100 5700 2100 5150
-Wire Wire Line
-	2100 5150 2200 5150
-Wire Wire Line
-	2200 5650 1850 5650
-Wire Wire Line
-	1850 5650 1850 4650
-Wire Wire Line
-	1850 4650 1350 4650
-Connection ~ 1400 4450
-Wire Wire Line
-	1350 4450 1400 4450
-Wire Wire Line
-	3950 5150 3800 5150
-Wire Wire Line
-	3950 4650 3800 4650
-Wire Wire Line
-	2200 4650 2050 4650
-Wire Wire Line
-	2050 4000 2050 4250
-Wire Wire Line
-	4200 5450 4100 5450
-Wire Wire Line
-	4100 5450 4000 5550
-Wire Wire Line
-	4000 5550 3800 5550
-Wire Wire Line
-	3800 5650 4200 5650
-Wire Wire Line
-	3800 5350 4200 5350
-Wire Wire Line
-	3800 5450 4000 5450
-Wire Wire Line
-	4200 5550 4100 5550
-Wire Wire Line
-	4100 5550 4000 5450
-Wire Wire Line
-	5350 5350 5000 5350
-Wire Wire Line
-	5350 5450 5000 5450
-Wire Wire Line
-	5350 5550 5000 5550
-Wire Wire Line
-	5350 5650 5000 5650
-Wire Wire Line
-	2050 4250 2200 4250
-Wire Wire Line
-	3950 4250 3800 4250
-Wire Wire Line
-	3950 4750 3800 4750
-Wire Wire Line
-	1350 4350 1400 4350
-Wire Wire Line
-	1400 4350 1400 4950
-Wire Wire Line
-	1400 4950 1350 4950
-Wire Wire Line
-	1350 4850 1750 4850
-Wire Wire Line
-	1750 4850 1750 5450
-Wire Wire Line
-	1750 5450 2200 5450
-Wire Wire Line
-	1350 4550 1950 4550
-Wire Wire Line
-	1950 4550 1950 5350
-Wire Wire Line
-	1950 5350 2200 5350
-Wire Wire Line
-	1350 4750 1650 4750
-Wire Wire Line
-	1650 4750 1650 5550
-Wire Wire Line
-	1650 5550 2200 5550
-Wire Wire Line
-	2050 3050 2050 2500
-Wire Wire Line
-	2050 2500 2150 2500
-Wire Wire Line
-	2150 3000 1800 3000
-Wire Wire Line
-	1800 3000 1800 2000
-Wire Wire Line
-	1800 2000 1300 2000
-Connection ~ 1350 1800
-Wire Wire Line
-	1300 1800 1350 1800
-Wire Wire Line
-	3900 2500 3750 2500
-Wire Wire Line
-	3900 2000 3750 2000
-Wire Wire Line
-	2150 2000 2000 2000
-Wire Wire Line
-	2000 1350 2000 1600
-Wire Wire Line
-	4150 2800 4050 2800
-Wire Wire Line
-	4050 2800 3950 2900
-Wire Wire Line
-	3950 2900 3750 2900
-Wire Wire Line
-	3750 3000 4150 3000
-Wire Wire Line
-	3750 2700 4150 2700
-Wire Wire Line
-	7650 4150 7400 4150
-Connection ~ 7500 3400
-Wire Wire Line
-	7500 3400 7850 3400
-Wire Wire Line
-	7850 2300 7500 2300
-Connection ~ 12700 1200
-Wire Wire Line
-	12700 1500 12700 1200
-Wire Wire Line
-	12100 2900 12700 2900
-Wire Wire Line
-	12100 2700 12700 2700
-Wire Wire Line
-	12250 4100 12700 4100
-Wire Wire Line
-	12250 4000 12700 4000
-Wire Wire Line
-	12250 3900 12700 3900
-Wire Wire Line
-	12250 3800 12700 3800
-Wire Wire Line
-	12250 3700 12700 3700
-Wire Wire Line
-	12250 3600 12700 3600
-Wire Wire Line
-	12250 3500 12700 3500
-Wire Wire Line
-	12250 3400 12700 3400
-Wire Wire Line
-	12250 3300 12700 3300
-Wire Wire Line
-	12250 3200 12700 3200
-Wire Wire Line
-	12250 3100 12700 3100
-Wire Wire Line
-	12250 3000 12700 3000
-Wire Wire Line
-	12250 2500 12700 2500
-Wire Wire Line
-	12250 2400 12700 2400
-Wire Wire Line
-	12250 2300 12700 2300
-Wire Wire Line
-	12250 2200 12700 2200
-Wire Wire Line
-	12250 2100 12700 2100
-Wire Wire Line
-	12250 2000 12700 2000
-Wire Wire Line
-	12250 1900 12700 1900
-Wire Wire Line
-	12250 1800 12700 1800
-Wire Wire Line
-	12250 1700 12700 1700
-Wire Wire Line
-	13900 2600 13500 2600
-Wire Wire Line
-	13900 2500 13500 2500
-Wire Wire Line
-	13900 2400 13500 2400
-Wire Wire Line
-	13900 2300 13500 2300
-Wire Wire Line
-	13900 2200 13500 2200
-Wire Wire Line
-	13900 2100 13500 2100
-Wire Wire Line
-	13900 2000 13500 2000
-Wire Wire Line
-	13900 1900 13500 1900
-Wire Wire Line
-	13900 1500 13500 1500
-Wire Wire Line
-	13500 1600 13900 1600
-Wire Wire Line
-	13500 1700 13900 1700
-Wire Wire Line
-	13900 1800 13500 1800
-Wire Wire Line
-	13500 2700 13900 2700
-Wire Wire Line
-	13500 2800 13900 2800
-Wire Wire Line
-	13900 2900 13500 2900
-Wire Wire Line
-	13900 3000 13500 3000
-Wire Wire Line
-	13900 3100 13500 3100
-Wire Wire Line
-	13900 3200 13500 3200
-Wire Wire Line
-	13900 3300 13500 3300
-Wire Wire Line
-	13900 3400 13500 3400
-Wire Wire Line
-	13900 3500 13500 3500
-Wire Wire Line
-	13900 3600 13500 3600
-Wire Wire Line
-	13900 3700 13500 3700
-Wire Wire Line
-	13900 3800 13500 3800
-Wire Wire Line
-	13900 3900 13500 3900
-Wire Wire Line
-	13900 4000 13500 4000
-Wire Wire Line
-	12100 2600 12700 2600
-Wire Wire Line
-	12100 2800 12700 2800
-Wire Wire Line
-	12850 1200 12650 1200
-Wire Wire Line
-	7500 3950 7850 3950
-Connection ~ 7500 3950
-Wire Wire Line
-	7850 2850 7500 2850
-Connection ~ 7500 2850
-Wire Wire Line
-	7400 2000 7000 2000
-Wire Wire Line
-	7400 2550 7000 2550
-Wire Wire Line
-	7400 3100 7000 3100
-Wire Wire Line
-	7400 3650 7000 3650
-Wire Wire Line
-	7500 2300 7500 4150
-Connection ~ 7500 4150
-Wire Wire Line
-	3750 2800 3950 2800
-Wire Wire Line
-	4150 2900 4050 2900
-Wire Wire Line
-	4050 2900 3950 2800
-Wire Wire Line
-	5300 2700 4950 2700
-Wire Wire Line
-	5300 2800 4950 2800
-Wire Wire Line
-	5300 2900 4950 2900
-Wire Wire Line
-	5300 3000 4950 3000
-Wire Wire Line
-	2000 1600 2150 1600
-Wire Wire Line
-	3900 1600 3750 1600
-Wire Wire Line
-	3900 2100 3750 2100
-Wire Wire Line
-	1300 1700 1350 1700
-Wire Wire Line
-	1350 1700 1350 2300
-Wire Wire Line
-	1350 2300 1300 2300
-Wire Wire Line
-	1300 2200 1700 2200
-Wire Wire Line
-	1700 2200 1700 2800
-Wire Wire Line
-	1700 2800 2150 2800
-Wire Wire Line
-	1300 1900 1900 1900
-Wire Wire Line
-	1900 1900 1900 2700
-Wire Wire Line
-	1900 2700 2150 2700
-Wire Wire Line
-	1300 2100 1600 2100
-Wire Wire Line
-	1600 2100 1600 2900
-Wire Wire Line
-	1600 2900 2150 2900
-Wire Wire Line
-	4750 8100 4850 8100
-Wire Wire Line
-	5150 8000 5050 8000
-Wire Wire Line
-	4750 8300 5000 8300
-Wire Wire Line
-	5000 8300 5000 8100
-Wire Wire Line
-	5000 8100 5150 8100
-Wire Wire Line
-	5050 8000 4850 8100
-Wire Wire Line
-	3900 2800 3900 3250
-Wire Wire Line
-	3900 3250 3950 3250
-Connection ~ 3900 2800
-Wire Wire Line
-	2700 7150 2150 7150
-Wire Wire Line
-	2700 8100 2700 7150
-Wire Wire Line
-	2150 7150 2150 7050
-Wire Wire Line
-	2150 8150 2150 8300
-Wire Wire Line
-	2150 8300 3150 8300
-Wire Wire Line
-	2900 7500 1350 7500
-Wire Wire Line
-	2050 9000 2050 9150
-Wire Wire Line
-	2050 9150 2450 9150
-Wire Wire Line
-	2450 9150 2450 7300
-Wire Wire Line
-	2450 7300 1350 7300
-Wire Wire Line
-	2200 4250 2200 4150
-Wire Wire Line
-	9100 9500 9100 9550
-Wire Wire Line
-	9100 9550 8900 9550
-Wire Wire Line
-	9500 9500 9500 9750
-Wire Wire Line
-	9500 9750 8900 9750
-Wire Wire Line
-	8100 9550 7500 9550
-Wire Wire Line
-	8100 9650 7500 9650
-Wire Wire Line
-	8100 9750 7500 9750
-Wire Wire Line
-	8100 9850 7500 9850
-Wire Wire Line
-	12250 10050 11800 10050
-Wire Wire Line
-	11000 10150 10550 10150
-Wire Wire Line
-	7050 5450 7500 5450
-Wire Wire Line
-	7050 5050 7500 5050
-Wire Wire Line
-	8100 5450 8200 5450
-Connection ~ 8200 5450
-Wire Wire Line
-	11600 6750 11600 6450
-Connection ~ 11600 6650
-Wire Wire Line
-	8500 6650 8500 6700
-Wire Wire Line
-	9250 6650 9250 6700
-Connection ~ 9250 6650
-Wire Wire Line
-	8150 6200 8050 6200
-Wire Wire Line
-	7900 6600 7950 6600
-Connection ~ 7950 6600
-Wire Wire Line
-	8050 6200 8050 7200
-Wire Wire Line
-	8050 7200 7750 7200
-Wire Wire Line
-	10450 8750 10450 8800
-Wire Wire Line
-	10950 8750 10950 8900
-Wire Wire Line
-	12000 8900 11900 8900
-Wire Wire Line
-	10950 9350 10450 9350
-Wire Wire Line
-	14000 9400 14000 9150
-Wire Wire Line
-	12900 9150 12900 9400
-Wire Wire Line
-	14000 9150 14400 9150
-Wire Wire Line
-	11450 6650 11450 6850
-Wire Wire Line
-	12250 4200 12700 4200
-Wire Wire Line
-	12250 4300 12700 4300
-Wire Wire Line
-	13900 4300 13500 4300
 $Comp
 L GND #PWR051
 U 1 1 48D5174C
@@ -576,12 +41,12 @@ $EndComp
 $Comp
 L GNDA #PWR052
 U 1 1 4652A71A
-P 13500 4200
-F 0 "#PWR052" H 13500 4200 40  0001 C CNN
-F 1 "GNDA" H 13500 4130 40  0000 C CNN
-F 2 "" H 13500 4200 60  0001 C CNN
-F 3 "" H 13500 4200 60  0001 C CNN
-	1    13500 4200
+P 13550 4200
+F 0 "#PWR052" H 13550 4200 40  0001 C CNN
+F 1 "GNDA" V 13550 4050 40  0000 C CNN
+F 2 "" H 13550 4200 60  0001 C CNN
+F 3 "" H 13550 4200 60  0001 C CNN
+	1    13550 4200
 	0    -1   -1   0   
 $EndComp
 Text HLabel 13900 4300 2    60   Input ~ 0
@@ -589,1293 +54,1293 @@ VRL
 $Comp
 L GND #PWR053
 U 1 1 4652A67A
-P 13500 4100
-F 0 "#PWR053" H 13500 4100 30  0001 C CNN
-F 1 "GND" H 13500 4030 30  0001 C CNN
-F 2 "" H 13500 4100 60  0001 C CNN
-F 3 "" H 13500 4100 60  0001 C CNN
-	1    13500 4100
+P 13550 4100
+F 0 "#PWR053" H 13550 4100 30  0001 C CNN
+F 1 "GND" H 13550 4030 30  0001 C CNN
+F 2 "" H 13550 4100 60  0001 C CNN
+F 3 "" H 13550 4100 60  0001 C CNN
+	1    13550 4100
 	0    -1   -1   0   
 $EndComp
 Text HLabel 12250 4200 0    60   Input ~ 0
 VCCA
 Text HLabel 12250 4300 0    60   Input ~ 0
 VRH
-NoConn ~ 9850 6850
+NoConn ~ 11300 6000
 $Comp
 L LT1129_QPACK VR1
 U 1 1 46603376
-P 10650 6950
-F 0 "VR1" H 10900 7400 60  0000 C CNN
-F 1 "LT1129_QPACK" H 11150 6455 60  0000 C CNN
-F 2 "lib_smd:DPAK5" H 10650 6950 60  0001 C CNN
-F 3 "" H 10650 6950 60  0001 C CNN
-	1    10650 6950
+P 12100 6100
+F 0 "VR1" H 12100 6650 60  0000 C CNN
+F 1 "LT1129_QPACK" H 12100 6550 60  0000 C CNN
+F 2 "lib_smd:DPAK5" H 12100 6100 60  0001 C CNN
+F 3 "" H 12100 6100 60  0001 C CNN
+	1    12100 6100
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR054
 U 1 1 46546CAD
-P 7450 1300
-F 0 "#PWR054" H 7450 1260 30  0001 C CNN
-F 1 "+3.3V" H 7450 1410 30  0000 C CNN
-F 2 "" H 7450 1300 60  0001 C CNN
-F 3 "" H 7450 1300 60  0001 C CNN
-	1    7450 1300
+P 6900 1350
+F 0 "#PWR054" H 6900 1310 30  0001 C CNN
+F 1 "+3.3V" H 6900 1460 40  0000 C CNN
+F 2 "" H 6900 1350 60  0001 C CNN
+F 3 "" H 6900 1350 60  0001 C CNN
+	1    6900 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C26
 U 1 1 46546CA6
-P 7450 1500
-F 0 "C26" H 7500 1600 50  0000 L CNN
-F 1 "100nF" H 7500 1400 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 7450 1500 60  0001 C CNN
-F 3 "" H 7450 1500 60  0001 C CNN
-	1    7450 1500
+P 6900 1600
+F 0 "C26" H 6950 1700 50  0000 L CNN
+F 1 "100nF" H 6950 1500 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 6900 1600 60  0001 C CNN
+F 3 "" H 6900 1600 60  0001 C CNN
+	1    6900 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR055
 U 1 1 46546CA5
-P 7450 1700
-F 0 "#PWR055" H 7450 1700 30  0001 C CNN
-F 1 "GND" H 7450 1630 30  0001 C CNN
-F 2 "" H 7450 1700 60  0001 C CNN
-F 3 "" H 7450 1700 60  0001 C CNN
-	1    7450 1700
+P 6900 1850
+F 0 "#PWR055" H 6900 1850 30  0001 C CNN
+F 1 "GND" H 6900 1780 30  0001 C CNN
+F 2 "" H 6900 1850 60  0001 C CNN
+F 3 "" H 6900 1850 60  0001 C CNN
+	1    6900 1850
 	1    0    0    -1  
 $EndComp
-Text Label 14050 9150 0    60   ~ 0
+Text Label 14700 7900 2    60   ~ 0
 CAN_L
-Text Label 12500 9150 0    60   ~ 0
+Text Label 12800 7900 0    60   ~ 0
 CAN_H
 $Comp
 L +3.3V #PWR056
 U 1 1 465401BF
-P 14550 9400
-F 0 "#PWR056" H 14550 9360 30  0001 C CNN
-F 1 "+3.3V" H 14550 9510 30  0000 C CNN
-F 2 "" H 14550 9400 60  0001 C CNN
-F 3 "" H 14550 9400 60  0001 C CNN
-	1    14550 9400
+P 14850 8200
+F 0 "#PWR056" H 14850 8160 30  0001 C CNN
+F 1 "+3.3V" H 14850 8310 40  0000 C CNN
+F 2 "" H 14850 8200 60  0001 C CNN
+F 3 "" H 14850 8200 60  0001 C CNN
+	1    14850 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR057
 U 1 1 465401B2
-P 13400 9500
-F 0 "#PWR057" H 13400 9500 30  0001 C CNN
-F 1 "GND" H 13400 9430 30  0001 C CNN
-F 2 "" H 13400 9500 60  0001 C CNN
-F 3 "" H 13400 9500 60  0001 C CNN
-	1    13400 9500
+P 13700 8300
+F 0 "#PWR057" H 13700 8300 30  0001 C CNN
+F 1 "GND" H 13700 8230 30  0001 C CNN
+F 2 "" H 13700 8300 60  0001 C CNN
+F 3 "" H 13700 8300 60  0001 C CNN
+	1    13700 8300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RCAN1
 U 1 1 4654018B
-P 14250 9400
-F 0 "RCAN1" V 14330 9400 50  0000 C CNN
-F 1 "R" V 14250 9400 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14250 9400 60  0001 C CNN
-F 3 "" H 14250 9400 60  0001 C CNN
-	1    14250 9400
+P 14550 8200
+F 0 "RCAN1" V 14630 8200 50  0000 C CNN
+F 1 "R" V 14550 8200 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14550 8200 60  0001 C CNN
+F 3 "" H 14550 8200 60  0001 C CNN
+	1    14550 8200
 	0    1    1    0   
 $EndComp
 $Comp
 L R RCAN2
 U 1 1 46540184
-P 13150 9400
-F 0 "RCAN2" V 13230 9400 50  0000 C CNN
-F 1 "R" V 13150 9400 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 13150 9400 60  0001 C CNN
-F 3 "" H 13150 9400 60  0001 C CNN
-	1    13150 9400
+P 13450 8200
+F 0 "RCAN2" V 13530 8200 50  0000 C CNN
+F 1 "R" V 13450 8200 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 13450 8200 60  0001 C CNN
+F 3 "" H 13450 8200 60  0001 C CNN
+	1    13450 8200
 	0    1    1    0   
 $EndComp
 $Comp
 L R R38
 U 1 1 46540164
-P 13750 9150
-F 0 "R38" V 13830 9150 50  0000 C CNN
-F 1 "62" V 13750 9150 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 13750 9150 60  0001 C CNN
-F 3 "" H 13750 9150 60  0001 C CNN
-	1    13750 9150
+P 14050 7900
+F 0 "R38" V 14130 7900 50  0000 C CNN
+F 1 "62" V 14050 7900 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14050 7900 60  0001 C CNN
+F 3 "" H 14050 7900 60  0001 C CNN
+	1    14050 7900
 	0    1    1    0   
 $EndComp
 $Comp
 L JUMPER CAN_TERM1
 U 1 1 46540159
-P 13200 9150
-F 0 "CAN_TERM1" H 13200 9300 60  0000 C CNN
-F 1 "JUMPER" H 13200 9070 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 13200 9150 60  0001 C CNN
-F 3 "" H 13200 9150 60  0001 C CNN
-	1    13200 9150
+P 13500 7900
+F 0 "CAN_TERM1" H 13500 8050 60  0000 C CNN
+F 1 "JUMPER" H 13500 7820 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 13500 7900 60  0001 C CNN
+F 3 "" H 13500 7900 60  0001 C CNN
+	1    13500 7900
 	1    0    0    -1  
 $EndComp
-Text Label 10450 9350 0    60   ~ 0
+Text Label 10800 8100 0    60   ~ 0
 RxD_CAN
-Text Label 10550 10050 0    60   ~ 0
+Text Label 10850 8800 0    60   ~ 0
 RxD_CAN
-Text Label 11800 10150 0    60   ~ 0
+Text Label 12100 8900 0    60   ~ 0
 TxD_CAN
-Text Label 10450 9050 0    60   ~ 0
+Text Label 10800 7800 0    60   ~ 0
 TxD_CAN
 $Comp
 L CONN_1 RS1
 U 1 1 4654007F
-P 10250 9200
-F 0 "RS1" H 10330 9200 40  0000 C CNN
-F 1 "CONN_1" H 10200 9240 30  0001 C CNN
-F 2 "connect:PINTST" H 10250 9200 60  0001 C CNN
-F 3 "" H 10250 9200 60  0001 C CNN
-	1    10250 9200
+P 10500 7950
+F 0 "RS1" H 10580 7950 40  0000 C CNN
+F 1 "CONN_1" H 10450 7990 30  0001 C CNN
+F 2 "connect:PINTST" H 10500 7950 60  0001 C CNN
+F 3 "" H 10500 7950 60  0001 C CNN
+	1    10500 7950
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR058
 U 1 1 4654006D
-P 10400 9850
-F 0 "#PWR058" H 10400 9850 30  0001 C CNN
-F 1 "GND" H 10400 9780 30  0001 C CNN
-F 2 "" H 10400 9850 60  0001 C CNN
-F 3 "" H 10400 9850 60  0001 C CNN
-	1    10400 9850
+P 10700 8650
+F 0 "#PWR058" H 10700 8650 30  0001 C CNN
+F 1 "GND" H 10700 8580 30  0001 C CNN
+F 2 "" H 10700 8650 60  0001 C CNN
+F 3 "" H 10700 8650 60  0001 C CNN
+	1    10700 8650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R36
 U 1 1 46540063
-P 10400 9600
-F 0 "R36" V 10480 9600 50  0000 C CNN
-F 1 "1K" V 10400 9600 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 10400 9600 60  0001 C CNN
-F 3 "" H 10400 9600 60  0001 C CNN
-	1    10400 9600
+P 10700 8350
+F 0 "R36" H 10600 8550 50  0000 C CNN
+F 1 "1K" V 10700 8350 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 10700 8350 60  0001 C CNN
+F 3 "" H 10700 8350 60  0001 C CNN
+	1    10700 8350
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 VREF1
 U 1 1 4654003D
-P 12150 8900
-F 0 "VREF1" H 12230 8900 40  0000 C CNN
-F 1 "CONN_1" H 12100 8940 30  0001 C CNN
-F 2 "connect:PINTST" H 12150 8900 60  0001 C CNN
-F 3 "" H 12150 8900 60  0001 C CNN
-	1    12150 8900
+P 12450 7650
+F 0 "VREF1" H 12450 7750 40  0000 C CNN
+F 1 "CONN_1" H 12400 7690 30  0001 C CNN
+F 2 "connect:PINTST" H 12450 7650 60  0001 C CNN
+F 3 "" H 12450 7650 60  0001 C CNN
+	1    12450 7650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR059
 U 1 1 46540007
-P 10450 8800
-F 0 "#PWR059" H 10450 8800 30  0001 C CNN
-F 1 "GND" H 10450 8730 30  0001 C CNN
-F 2 "" H 10450 8800 60  0001 C CNN
-F 3 "" H 10450 8800 60  0001 C CNN
-	1    10450 8800
+P 10750 7550
+F 0 "#PWR059" H 10750 7550 30  0001 C CNN
+F 1 "GND" H 10750 7480 30  0001 C CNN
+F 2 "" H 10750 7550 60  0001 C CNN
+F 3 "" H 10750 7550 60  0001 C CNN
+	1    10750 7550
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C34
 U 1 1 4653FFFE
-P 10650 8750
-F 0 "C34" V 10700 8900 50  0000 L CNN
-F 1 "100nF" V 10500 8750 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 10650 8750 60  0001 C CNN
-F 3 "" H 10650 8750 60  0001 C CNN
-	1    10650 8750
+P 10950 7500
+F 0 "C34" V 10800 7500 50  0000 C CNN
+F 1 "100nF" V 11100 7500 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 10950 7500 60  0001 C CNN
+F 3 "" H 10950 7500 60  0001 C CNN
+	1    10950 7500
 	0    1    1    0   
 $EndComp
 $Comp
 L +3.3V #PWR060
 U 1 1 4653FFF7
-P 10950 8750
-F 0 "#PWR060" H 10950 8710 30  0001 C CNN
-F 1 "+3.3V" H 10950 8860 30  0000 C CNN
-F 2 "" H 10950 8750 60  0001 C CNN
-F 3 "" H 10950 8750 60  0001 C CNN
-	1    10950 8750
+P 11250 7450
+F 0 "#PWR060" H 11250 7410 30  0001 C CNN
+F 1 "+3.3V" H 11250 7560 30  0000 C CNN
+F 2 "" H 11250 7450 60  0001 C CNN
+F 3 "" H 11250 7450 60  0001 C CNN
+	1    11250 7450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR061
 U 1 1 4653FFF3
-P 12000 9450
-F 0 "#PWR061" H 12000 9450 30  0001 C CNN
-F 1 "GND" H 12000 9380 30  0001 C CNN
-F 2 "" H 12000 9450 60  0001 C CNN
-F 3 "" H 12000 9450 60  0001 C CNN
-	1    12000 9450
+P 12300 8200
+F 0 "#PWR061" H 12300 8200 30  0001 C CNN
+F 1 "GND" H 12300 8130 30  0001 C CNN
+F 2 "" H 12300 8200 60  0001 C CNN
+F 3 "" H 12300 8200 60  0001 C CNN
+	1    12300 8200
 	1    0    0    -1  
 $EndComp
-Text Label 11950 9250 0    60   ~ 0
+Text Label 12250 8000 0    60   ~ 0
 CAN_L
-Text Label 11950 9150 0    60   ~ 0
+Text Label 12250 7900 0    60   ~ 0
 CAN_H
 $Comp
 L PCA82C251 U7
 U 1 1 4653FF97
-P 11400 9200
-F 0 "U7" H 11550 9650 60  0000 C CNN
-F 1 "PCA82C251" H 11700 8850 60  0000 C CNN
-F 2 "lib_smd:SO8E" H 11400 9200 60  0001 C CNN
-F 3 "" H 11400 9200 60  0001 C CNN
-	1    11400 9200
+P 11700 7950
+F 0 "U7" H 11700 8500 60  0000 C CNN
+F 1 "PCA82C251" H 11700 8400 60  0000 C CNN
+F 2 "lib_smd:SO8E" H 11700 7950 60  0001 C CNN
+F 3 "" H 11700 7950 60  0001 C CNN
+	1    11700 7950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR062
 U 1 1 4653080F
-P 7850 7450
-F 0 "#PWR062" H 7850 7450 30  0001 C CNN
-F 1 "GND" H 7850 7380 30  0001 C CNN
-F 2 "" H 7850 7450 60  0001 C CNN
-F 3 "" H 7850 7450 60  0001 C CNN
-	1    7850 7450
+P 9300 6650
+F 0 "#PWR062" H 9300 6650 30  0001 C CNN
+F 1 "GND" H 9300 6580 30  0001 C CNN
+F 2 "" H 9300 6650 60  0001 C CNN
+F 3 "" H 9300 6650 60  0001 C CNN
+	1    9300 6650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 TB1
 U 1 1 46530806
-P 7400 7300
-F 0 "TB1" V 7350 7300 40  0000 C CNN
-F 1 "CONN_2" V 7450 7300 40  0000 C CNN
-F 2 "connect:bornier2" H 7400 7300 60  0001 C CNN
-F 3 "" H 7400 7300 60  0001 C CNN
-	1    7400 7300
+P 8850 6500
+F 0 "TB1" V 8800 6500 40  0000 C CNN
+F 1 "CONN_2" V 8900 6500 40  0000 C CNN
+F 2 "connect:bornier2" H 8850 6500 60  0001 C CNN
+F 3 "" H 8850 6500 60  0001 C CNN
+	1    8850 6500
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR063
 U 1 1 465307DA
-P 7950 6700
-F 0 "#PWR063" H 7950 6700 30  0001 C CNN
-F 1 "GND" H 7950 6630 30  0001 C CNN
-F 2 "" H 7950 6700 60  0001 C CNN
-F 3 "" H 7950 6700 60  0001 C CNN
-	1    7950 6700
+P 9300 5750
+F 0 "#PWR063" H 9300 5750 30  0001 C CNN
+F 1 "GND" H 9300 5680 30  0001 C CNN
+F 2 "" H 9300 5750 60  0001 C CNN
+F 3 "" H 9300 5750 60  0001 C CNN
+	1    9300 5750
 	1    0    0    -1  
 $EndComp
 $Comp
 L JACK_2P J1
 U 1 1 465307C6
-P 7450 6500
-F 0 "J1" H 7100 6300 60  0000 C CNN
-F 1 "JACK_2P" H 7300 6750 60  0000 C CNN
-F 2 "connect:JACK_ALIM" H 7450 6500 60  0001 C CNN
-F 3 "" H 7450 6500 60  0001 C CNN
-	1    7450 6500
+P 8750 5550
+F 0 "J1" H 8400 5350 60  0000 C CNN
+F 1 "JACK_2P" H 8600 5800 60  0000 C CNN
+F 2 "connect:JACK_ALIM" H 8750 5550 60  0001 C CNN
+F 3 "" H 8750 5550 60  0001 C CNN
+	1    8750 5550
 	1    0    0    -1  
 $EndComp
-NoConn ~ 8150 6400
+NoConn ~ 9500 5600
 $Comp
 L SWITCH_INV SW_ONOFF1
 U 1 1 46530763
-P 8650 6300
-F 0 "SW_ONOFF1" H 8450 6450 50  0000 C CNN
-F 1 "SWITCH_INV" H 8500 6150 50  0000 C CNN
-F 2 "discret:SW_SPDT" H 8650 6300 60  0001 C CNN
-F 3 "" H 8650 6300 60  0001 C CNN
-	1    8650 6300
+P 10000 5500
+F 0 "SW_ONOFF1" H 9800 5650 50  0000 C CNN
+F 1 "SWITCH_INV" H 9850 5350 50  0000 C CNN
+F 2 "discret:SW_SPDT" H 10000 5500 60  0001 C CNN
+F 3 "" H 10000 5500 60  0001 C CNN
+	1    10000 5500
 	-1   0    0    1   
 $EndComp
 $Comp
 L FUSE F1
 U 1 1 46530747
-P 9400 6300
-F 0 "F1" H 9500 6350 40  0000 C CNN
-F 1 "FUSE" H 9300 6250 40  0000 C CNN
-F 2 "lib_smd:FSUPCMS" H 9400 6300 60  0001 C CNN
-F 3 "" H 9400 6300 60  0001 C CNN
-	1    9400 6300
+P 10850 5500
+F 0 "F1" H 10950 5550 40  0000 C CNN
+F 1 "FUSE" H 10750 5450 40  0000 C CNN
+F 2 "lib_smd:FSUPCMS" H 10850 5500 60  0001 C CNN
+F 3 "" H 10850 5500 60  0001 C CNN
+	1    10850 5500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR064
 U 1 1 46530706
-P 9250 7100
-F 0 "#PWR064" H 9250 7100 30  0001 C CNN
-F 1 "GND" H 9250 7030 30  0001 C CNN
-F 2 "" H 9250 7100 60  0001 C CNN
-F 3 "" H 9250 7100 60  0001 C CNN
-	1    9250 7100
+P 10650 6300
+F 0 "#PWR064" H 10650 6300 30  0001 C CNN
+F 1 "GND" H 10650 6230 30  0001 C CNN
+F 2 "" H 10650 6300 60  0001 C CNN
+F 3 "" H 10650 6300 60  0001 C CNN
+	1    10650 6300
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C41
 U 1 1 465306F6
-P 9250 6900
-F 0 "C41" H 9300 7000 50  0000 L CNN
-F 1 "100nF" H 9300 6800 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 9250 6900 60  0001 C CNN
-F 3 "" H 9250 6900 60  0001 C CNN
-	1    9250 6900
+P 10650 6050
+F 0 "C41" H 10700 6150 50  0000 L CNN
+F 1 "100nF" H 10700 5950 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 10650 6050 60  0001 C CNN
+F 3 "" H 10650 6050 60  0001 C CNN
+	1    10650 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR065
 U 1 1 465306EA
-P 8500 7100
-F 0 "#PWR065" H 8500 7100 30  0001 C CNN
-F 1 "GND" H 8500 7030 30  0001 C CNN
-F 2 "" H 8500 7100 60  0001 C CNN
-F 3 "" H 8500 7100 60  0001 C CNN
-	1    8500 7100
+P 9700 6300
+F 0 "#PWR065" H 9700 6300 30  0001 C CNN
+F 1 "GND" H 9700 6230 30  0001 C CNN
+F 2 "" H 9700 6300 60  0001 C CNN
+F 3 "" H 9700 6300 60  0001 C CNN
+	1    9700 6300
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D7
 U 1 1 465306C8
-P 8500 6900
-F 0 "D7" H 8500 7000 40  0000 C CNN
-F 1 "1N4004" H 8500 6800 40  0000 C CNN
-F 2 "discret:D5" H 8500 6900 60  0001 C CNN
-F 3 "" H 8500 6900 60  0001 C CNN
-	1    8500 6900
+P 9700 6050
+F 0 "D7" V 9750 5800 50  0000 C CNN
+F 1 "1N4004" V 9650 5800 50  0000 C CNN
+F 2 "discret:D5" H 9700 6050 60  0001 C CNN
+F 3 "" H 9700 6050 60  0001 C CNN
+	1    9700 6050
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR066
 U 1 1 465306B2
-P 8850 7100
-F 0 "#PWR066" H 8850 7100 30  0001 C CNN
-F 1 "GND" H 8850 7030 30  0001 C CNN
-F 2 "" H 8850 7100 60  0001 C CNN
-F 3 "" H 8850 7100 60  0001 C CNN
-	1    8850 7100
+P 10250 6300
+F 0 "#PWR066" H 10250 6300 30  0001 C CNN
+F 1 "GND" H 10250 6230 30  0001 C CNN
+F 2 "" H 10250 6300 60  0001 C CNN
+F 3 "" H 10250 6300 60  0001 C CNN
+	1    10250 6300
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C38
 U 1 1 465306B1
-P 8850 6900
-F 0 "C38" H 8900 7000 50  0000 L CNN
-F 1 "10uF" H 8900 6800 50  0000 L CNN
-F 2 "discret:C2V8" H 8850 6900 60  0001 C CNN
-F 3 "" H 8850 6900 60  0001 C CNN
-	1    8850 6900
+P 10250 6050
+F 0 "C38" H 10300 6150 50  0000 L CNN
+F 1 "10uF" H 10300 5950 50  0000 L CNN
+F 2 "discret:C2V8" H 10250 6050 60  0001 C CNN
+F 3 "" H 10250 6050 60  0001 C CNN
+	1    10250 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR067
 U 1 1 4653065B
-P 11600 6450
-F 0 "#PWR067" H 11600 6410 30  0001 C CNN
-F 1 "+3.3V" H 11600 6560 30  0000 C CNN
-F 2 "" H 11600 6450 60  0001 C CNN
-F 3 "" H 11600 6450 60  0001 C CNN
-	1    11600 6450
+P 13050 5650
+F 0 "#PWR067" H 13050 5610 30  0001 C CNN
+F 1 "+3.3V" H 13050 5760 40  0000 C CNN
+F 2 "" H 13050 5650 60  0001 C CNN
+F 3 "" H 13050 5650 60  0001 C CNN
+	1    13050 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR068
 U 1 1 4653063A
-P 12650 6650
-F 0 "#PWR068" H 12650 6650 30  0001 C CNN
-F 1 "GND" H 12650 6580 30  0001 C CNN
-F 2 "" H 12650 6650 60  0001 C CNN
-F 3 "" H 12650 6650 60  0001 C CNN
-	1    12650 6650
+P 14100 5800
+F 0 "#PWR068" H 14100 5800 30  0001 C CNN
+F 1 "GND" H 14100 5730 30  0001 C CNN
+F 2 "" H 14100 5800 60  0001 C CNN
+F 3 "" H 14100 5800 60  0001 C CNN
+	1    14100 5800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L LED LED5
 U 1 1 46530639
-P 12450 6650
-F 0 "LED5" H 12450 6750 50  0000 C CNN
-F 1 "LED" H 12450 6550 50  0000 C CNN
-F 2 "lib_smd:SM1206POL" H 12450 6650 60  0001 C CNN
-F 3 "" H 12450 6650 60  0001 C CNN
-	1    12450 6650
+P 13900 5800
+F 0 "LED5" H 13900 5900 50  0000 C CNN
+F 1 "LED" H 13900 5700 50  0000 C CNN
+F 2 "lib_smd:SM1206POL" H 13900 5800 60  0001 C CNN
+F 3 "" H 13900 5800 60  0001 C CNN
+	1    13900 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R53
 U 1 1 46530638
-P 12000 6650
-F 0 "R53" V 12080 6650 50  0000 C CNN
-F 1 "270" V 12000 6650 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 12000 6650 60  0001 C CNN
-F 3 "" H 12000 6650 60  0001 C CNN
-	1    12000 6650
+P 13450 5800
+F 0 "R53" V 13530 5800 50  0000 C CNN
+F 1 "270" V 13450 5800 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 13450 5800 60  0001 C CNN
+F 3 "" H 13450 5800 60  0001 C CNN
+	1    13450 5800
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR069
 U 1 1 46530616
-P 11600 7150
-F 0 "#PWR069" H 11600 7150 30  0001 C CNN
-F 1 "GND" H 11600 7080 30  0001 C CNN
-F 2 "" H 11600 7150 60  0001 C CNN
-F 3 "" H 11600 7150 60  0001 C CNN
-	1    11600 7150
+P 13050 6300
+F 0 "#PWR069" H 13050 6300 30  0001 C CNN
+F 1 "GND" H 13050 6230 30  0001 C CNN
+F 2 "" H 13050 6300 60  0001 C CNN
+F 3 "" H 13050 6300 60  0001 C CNN
+	1    13050 6300
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C40
 U 1 1 465305FE
-P 11600 6950
-F 0 "C40" H 11650 7050 50  0000 L CNN
-F 1 "220uF" H 11650 6850 50  0000 L CNN
-F 2 "discret:C2V8" H 11600 6950 60  0001 C CNN
-F 3 "" H 11600 6950 60  0001 C CNN
-	1    11600 6950
+P 13050 6100
+F 0 "C40" H 13100 6200 50  0000 L CNN
+F 1 "220uF" H 13100 6000 50  0000 L CNN
+F 2 "discret:C2V8" H 13050 6100 60  0001 C CNN
+F 3 "" H 13050 6100 60  0001 C CNN
+	1    13050 6100
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR070
 U 1 1 46530574
-P 10650 7650
-F 0 "#PWR070" H 10650 7650 30  0001 C CNN
-F 1 "GND" H 10650 7580 30  0001 C CNN
-F 2 "" H 10650 7650 60  0001 C CNN
-F 3 "" H 10650 7650 60  0001 C CNN
-	1    10650 7650
+P 12100 6850
+F 0 "#PWR070" H 12100 6850 30  0001 C CNN
+F 1 "GND" H 12100 6780 30  0001 C CNN
+F 2 "" H 12100 6850 60  0001 C CNN
+F 3 "" H 12100 6850 60  0001 C CNN
+	1    12100 6850
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR071
 U 1 1 4652DE09
-P 8200 5500
-F 0 "#PWR071" H 8200 5500 30  0001 C CNN
-F 1 "GND" H 8200 5430 30  0001 C CNN
-F 2 "" H 8200 5500 60  0001 C CNN
-F 3 "" H 8200 5500 60  0001 C CNN
-	1    8200 5500
+P 4800 10350
+F 0 "#PWR071" H 4800 10350 30  0001 C CNN
+F 1 "GND" H 4800 10280 30  0001 C CNN
+F 2 "" H 4800 10350 60  0001 C CNN
+F 3 "" H 4800 10350 60  0001 C CNN
+	1    4800 10350
 	1    0    0    -1  
 $EndComp
-Text Label 7100 5450 0    60   ~ 0
+Text Label 3700 10300 0    60   ~ 0
 IRQ-5
-Text Label 7100 5050 0    60   ~ 0
+Text Label 3700 9900 0    60   ~ 0
 IRQ-4
 $Comp
 L SW_PUSH SW2
 U 1 1 4652DDE7
-P 7800 5450
-F 0 "SW2" H 7950 5560 50  0000 C CNN
-F 1 "SW_PUSH" H 7800 5370 50  0000 C CNN
-F 2 "discret:SW_PUSH_SMALL" H 7800 5450 60  0001 C CNN
-F 3 "" H 7800 5450 60  0001 C CNN
-	1    7800 5450
+P 4400 10300
+F 0 "SW2" H 4550 10410 50  0000 C CNN
+F 1 "SW_PUSH" H 4400 10220 50  0000 C CNN
+F 2 "discret:SW_PUSH_SMALL" H 4400 10300 60  0001 C CNN
+F 3 "" H 4400 10300 60  0001 C CNN
+	1    4400 10300
 	1    0    0    -1  
 $EndComp
 $Comp
 L SW_PUSH SW1
 U 1 1 4652DDDF
-P 7800 5050
-F 0 "SW1" H 7950 5160 50  0000 C CNN
-F 1 "SW_PUSH" H 7800 4970 50  0000 C CNN
-F 2 "discret:SW_PUSH_SMALL" H 7800 5050 60  0001 C CNN
-F 3 "" H 7800 5050 60  0001 C CNN
-	1    7800 5050
+P 4400 9900
+F 0 "SW1" H 4550 10010 50  0000 C CNN
+F 1 "SW_PUSH" H 4400 9820 50  0000 C CNN
+F 2 "discret:SW_PUSH_SMALL" H 4400 9900 60  0001 C CNN
+F 3 "" H 4400 9900 60  0001 C CNN
+	1    4400 9900
 	1    0    0    -1  
 $EndComp
-Text Label 10600 10150 0    60   ~ 0
+Text Label 10900 8900 0    60   ~ 0
 CANRX
-Text Label 11850 10050 0    60   ~ 0
+Text Label 12150 8800 0    60   ~ 0
 CANTX
 $Comp
 L CONN_2X2 CAN_EN1
 U 1 1 4652BFF1
-P 11400 10100
-F 0 "CAN_EN1" H 11400 10250 50  0000 C CNN
-F 1 "CONN_2X2" H 11410 9970 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X2" H 11400 10100 60  0001 C CNN
-F 3 "" H 11400 10100 60  0001 C CNN
-	1    11400 10100
+P 11700 8850
+F 0 "CAN_EN1" H 11700 9000 50  0000 C CNN
+F 1 "CONN_2X2" H 11710 8720 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X2" H 11700 8850 60  0001 C CNN
+F 3 "" H 11700 8850 60  0001 C CNN
+	1    11700 8850
 	-1   0    0    -1  
 $EndComp
-Text Label 7550 9850 0    60   ~ 0
+Text Label 7650 9050 0    60   ~ 0
 CANRX
-Text Label 7550 9750 0    60   ~ 0
+Text Label 7650 8950 0    60   ~ 0
 CANTX
-Text Label 7550 9650 0    60   ~ 0
+Text Label 7650 8850 0    60   ~ 0
 QSPI_CS0
-Text Label 7550 9550 0    60   ~ 0
+Text Label 7650 8750 0    60   ~ 0
 QSPI_SCLK
 $Comp
 L +3.3V #PWR072
 U 1 1 4652BF8D
-P 9700 9000
-F 0 "#PWR072" H 9700 8960 30  0001 C CNN
-F 1 "+3.3V" H 9700 9110 30  0000 C CNN
-F 2 "" H 9700 9000 60  0001 C CNN
-F 3 "" H 9700 9000 60  0001 C CNN
-	1    9700 9000
+P 9800 8200
+F 0 "#PWR072" H 9800 8160 30  0001 C CNN
+F 1 "+3.3V" H 9800 8310 40  0000 C CNN
+F 2 "" H 9800 8200 60  0001 C CNN
+F 3 "" H 9800 8200 60  0001 C CNN
+	1    9800 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR073
 U 1 1 4652BF8C
-P 9500 9000
-F 0 "#PWR073" H 9500 8960 30  0001 C CNN
-F 1 "+3.3V" H 9500 9110 30  0000 C CNN
-F 2 "" H 9500 9000 60  0001 C CNN
-F 3 "" H 9500 9000 60  0001 C CNN
-	1    9500 9000
+P 9600 8200
+F 0 "#PWR073" H 9600 8160 30  0001 C CNN
+F 1 "+3.3V" H 9600 8310 40  0000 C CNN
+F 2 "" H 9600 8200 60  0001 C CNN
+F 3 "" H 9600 8200 60  0001 C CNN
+	1    9600 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR074
 U 1 1 4652BF8B
-P 9300 9000
-F 0 "#PWR074" H 9300 8960 30  0001 C CNN
-F 1 "+3.3V" H 9300 9110 30  0000 C CNN
-F 2 "" H 9300 9000 60  0001 C CNN
-F 3 "" H 9300 9000 60  0001 C CNN
-	1    9300 9000
+P 9400 8200
+F 0 "#PWR074" H 9400 8160 30  0001 C CNN
+F 1 "+3.3V" H 9400 8310 40  0000 C CNN
+F 2 "" H 9400 8200 60  0001 C CNN
+F 3 "" H 9400 8200 60  0001 C CNN
+	1    9400 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR075
 U 1 1 4652BF88
-P 9100 9000
-F 0 "#PWR075" H 9100 8960 30  0001 C CNN
-F 1 "+3.3V" H 9100 9110 30  0000 C CNN
-F 2 "" H 9100 9000 60  0001 C CNN
-F 3 "" H 9100 9000 60  0001 C CNN
-	1    9100 9000
+P 9200 8200
+F 0 "#PWR075" H 9200 8160 30  0001 C CNN
+F 1 "+3.3V" H 9200 8310 40  0000 C CNN
+F 2 "" H 9200 8200 60  0001 C CNN
+F 3 "" H 9200 8200 60  0001 C CNN
+	1    9200 8200
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R47
 U 1 1 4652BF65
-P 9700 9250
-F 0 "R47" V 9780 9250 50  0000 C CNN
-F 1 "4,7K" V 9700 9250 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 9700 9250 60  0001 C CNN
-F 3 "" H 9700 9250 60  0001 C CNN
-	1    9700 9250
+P 9800 8450
+F 0 "R47" V 9880 8450 50  0000 C CNN
+F 1 "4,7K" V 9800 8450 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 9800 8450 60  0001 C CNN
+F 3 "" H 9800 8450 60  0001 C CNN
+	1    9800 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R48
 U 1 1 4652BF62
-P 9500 9250
-F 0 "R48" V 9580 9250 50  0000 C CNN
-F 1 "4,7K" V 9500 9250 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 9500 9250 60  0001 C CNN
-F 3 "" H 9500 9250 60  0001 C CNN
-	1    9500 9250
+P 9600 8450
+F 0 "R48" V 9680 8450 50  0000 C CNN
+F 1 "4,7K" V 9600 8450 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 9600 8450 60  0001 C CNN
+F 3 "" H 9600 8450 60  0001 C CNN
+	1    9600 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R49
 U 1 1 4652BF5C
-P 9300 9250
-F 0 "R49" V 9380 9250 50  0000 C CNN
-F 1 "4,7K" V 9300 9250 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 9300 9250 60  0001 C CNN
-F 3 "" H 9300 9250 60  0001 C CNN
-	1    9300 9250
+P 9400 8450
+F 0 "R49" V 9480 8450 50  0000 C CNN
+F 1 "4,7K" V 9400 8450 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 9400 8450 60  0001 C CNN
+F 3 "" H 9400 8450 60  0001 C CNN
+	1    9400 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R50
 U 1 1 4652BF48
-P 9100 9250
-F 0 "R50" V 9180 9250 50  0000 C CNN
-F 1 "4,7K" V 9100 9250 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 9100 9250 60  0001 C CNN
-F 3 "" H 9100 9250 60  0001 C CNN
-	1    9100 9250
+P 9200 8450
+F 0 "R50" V 9280 8450 50  0000 C CNN
+F 1 "4,7K" V 9200 8450 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 9200 8450 60  0001 C CNN
+F 3 "" H 9200 8450 60  0001 C CNN
+	1    9200 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_4X2 PULUPEN1
 U 1 1 4652BF26
-P 8500 9700
-F 0 "PULUPEN1" H 8500 9950 50  0000 C CNN
-F 1 "CONN_4X2" V 8500 9700 40  0000 C CNN
-F 2 "pin_array:pin_array_4x2" H 8500 9700 60  0001 C CNN
-F 3 "" H 8500 9700 60  0001 C CNN
-	1    8500 9700
+P 8600 8900
+F 0 "PULUPEN1" H 8600 9150 50  0000 C CNN
+F 1 "CONN_4X2" V 8600 8900 40  0000 C CNN
+F 2 "pin_array:pin_array_4x2" H 8600 8900 60  0001 C CNN
+F 3 "" H 8600 8900 60  0001 C CNN
+	1    8600 8900
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR076
 U 1 1 4652BC04
-P 3150 6750
-F 0 "#PWR076" H 3150 6710 30  0001 C CNN
-F 1 "+3.3V" H 3150 6860 30  0000 C CNN
-F 2 "" H 3150 6750 60  0001 C CNN
-F 3 "" H 3150 6750 60  0001 C CNN
-	1    3150 6750
+P 3400 6950
+F 0 "#PWR076" H 3400 6910 30  0001 C CNN
+F 1 "+3.3V" H 3400 7060 40  0000 C CNN
+F 2 "" H 3400 6950 60  0001 C CNN
+F 3 "" H 3400 6950 60  0001 C CNN
+	1    3400 6950
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR077
 U 1 1 4652BBFE
-P 2200 4150
-F 0 "#PWR077" H 2200 4110 30  0001 C CNN
-F 1 "+3.3V" H 2200 4260 30  0000 C CNN
-F 2 "" H 2200 4150 60  0001 C CNN
-F 3 "" H 2200 4150 60  0001 C CNN
-	1    2200 4150
+P 2450 4300
+F 0 "#PWR077" H 2450 4260 30  0001 C CNN
+F 1 "+3.3V" H 2450 4410 40  0000 C CNN
+F 2 "" H 2450 4300 60  0001 C CNN
+F 3 "" H 2450 4300 60  0001 C CNN
+	1    2450 4300
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR078
 U 1 1 4652BBF3
-P 2150 1500
-F 0 "#PWR078" H 2150 1460 30  0001 C CNN
-F 1 "+3.3V" H 2150 1610 30  0000 C CNN
-F 2 "" H 2150 1500 60  0001 C CNN
-F 3 "" H 2150 1500 60  0001 C CNN
-	1    2150 1500
+P 2450 1600
+F 0 "#PWR078" H 2450 1560 30  0001 C CNN
+F 1 "+3.3V" H 2450 1710 40  0000 C CNN
+F 2 "" H 2450 1600 60  0001 C CNN
+F 3 "" H 2450 1600 60  0001 C CNN
+	1    2450 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR079
 U 1 1 4652BB1A
-P 1950 8150
-F 0 "#PWR079" H 1950 8150 30  0001 C CNN
-F 1 "GND" H 1950 8080 30  0001 C CNN
-F 2 "" H 1950 8150 60  0001 C CNN
-F 3 "" H 1950 8150 60  0001 C CNN
-	1    1950 8150
+P 2250 8400
+F 0 "#PWR079" H 2250 8400 30  0001 C CNN
+F 1 "GND" H 2250 8330 30  0001 C CNN
+F 2 "" H 2250 8400 60  0001 C CNN
+F 3 "" H 2250 8400 60  0001 C CNN
+	1    2250 8400
 	1    0    0    -1  
 $EndComp
-Text Label 1600 9000 0    60   ~ 0
+Text Label 1900 9200 0    60   ~ 0
 CAN_H
 $Comp
 L CONN_3 COM_SEL1
 U 1 1 4652BADD
-P 2050 8650
-F 0 "COM_SEL1" V 2200 8650 50  0000 C CNN
-F 1 "CONN_3" V 2100 8650 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_3X1" H 2050 8650 60  0001 C CNN
-F 3 "" H 2050 8650 60  0001 C CNN
-	1    2050 8650
+P 2350 8850
+F 0 "COM_SEL1" V 2500 8850 50  0000 C CNN
+F 1 "CONN_3" V 2400 8850 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_3X1" H 2350 8850 60  0001 C CNN
+F 3 "" H 2350 8850 60  0001 C CNN
+	1    2350 8850
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_3 COM_SEL2
 U 1 1 4652BAD4
-P 2050 7800
-F 0 "COM_SEL2" V 2200 7800 50  0000 C CNN
-F 1 "CONN_3" V 2100 7800 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_3X1" H 2050 7800 60  0001 C CNN
-F 3 "" H 2050 7800 60  0001 C CNN
-	1    2050 7800
+P 2350 8000
+F 0 "COM_SEL2" V 2500 8000 50  0000 C CNN
+F 1 "CONN_3" V 2400 8000 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_3X1" H 2350 8000 60  0001 C CNN
+F 3 "" H 2350 8000 60  0001 C CNN
+	1    2350 8000
 	0    -1   -1   0   
 $EndComp
-Text Label 1600 7050 0    60   ~ 0
+Text Label 1850 7250 0    60   ~ 0
 CAN_L
 $Comp
 L CONN_3 COM_SEL3
 U 1 1 4652BA65
-P 2050 6700
-F 0 "COM_SEL3" V 2200 6700 50  0000 C CNN
-F 1 "CONN_3" V 2100 6700 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_3X1" H 2050 6700 60  0001 C CNN
-F 3 "" H 2050 6700 60  0001 C CNN
-	1    2050 6700
+P 2350 6900
+F 0 "COM_SEL3" V 2500 6900 50  0000 C CNN
+F 1 "CONN_3" V 2400 6900 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_3X1" H 2350 6900 60  0001 C CNN
+F 3 "" H 2350 6900 60  0001 C CNN
+	1    2350 6900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR080
 U 1 1 4652B9D6
-P 4450 3250
-F 0 "#PWR080" H 4450 3250 30  0001 C CNN
-F 1 "GND" H 4450 3180 30  0001 C CNN
-F 2 "" H 4450 3250 60  0001 C CNN
-F 3 "" H 4450 3250 60  0001 C CNN
-	1    4450 3250
+P 4800 3500
+F 0 "#PWR080" H 4800 3500 30  0001 C CNN
+F 1 "GND" H 4800 3430 30  0001 C CNN
+F 2 "" H 4800 3500 60  0001 C CNN
+F 3 "" H 4800 3500 60  0001 C CNN
+	1    4800 3500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R30
 U 1 1 4652B9D5
-P 4200 3250
-F 0 "R30" V 4280 3250 50  0000 C CNN
-F 1 "10K" V 4200 3250 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 4200 3250 60  0001 C CNN
-F 3 "" H 4200 3250 60  0001 C CNN
-	1    4200 3250
+P 4500 3500
+F 0 "R30" V 4580 3500 50  0000 C CNN
+F 1 "10K" V 4500 3500 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 4500 3500 60  0001 C CNN
+F 3 "" H 4500 3500 60  0001 C CNN
+	1    4500 3500
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR081
 U 1 1 4652B9CD
-P 4500 5850
-F 0 "#PWR081" H 4500 5850 30  0001 C CNN
-F 1 "GND" H 4500 5780 30  0001 C CNN
-F 2 "" H 4500 5850 60  0001 C CNN
-F 3 "" H 4500 5850 60  0001 C CNN
-	1    4500 5850
+P 4850 6100
+F 0 "#PWR081" H 4850 6100 30  0001 C CNN
+F 1 "GND" H 4850 6030 30  0001 C CNN
+F 2 "" H 4850 6100 60  0001 C CNN
+F 3 "" H 4850 6100 60  0001 C CNN
+	1    4850 6100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R35
 U 1 1 4652B9CC
-P 4250 5850
-F 0 "R35" V 4330 5850 50  0000 C CNN
-F 1 "10K" V 4250 5850 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 4250 5850 60  0001 C CNN
-F 3 "" H 4250 5850 60  0001 C CNN
-	1    4250 5850
+P 4550 6100
+F 0 "R35" V 4630 6100 50  0000 C CNN
+F 1 "10K" V 4550 6100 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 4550 6100 60  0001 C CNN
+F 3 "" H 4550 6100 60  0001 C CNN
+	1    4550 6100
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR082
 U 1 1 4652B9BF
-P 5450 8550
-F 0 "#PWR082" H 5450 8550 30  0001 C CNN
-F 1 "GND" H 5450 8480 30  0001 C CNN
-F 2 "" H 5450 8550 60  0001 C CNN
-F 3 "" H 5450 8550 60  0001 C CNN
-	1    5450 8550
+P 5800 8800
+F 0 "#PWR082" H 5800 8800 30  0001 C CNN
+F 1 "GND" H 5800 8730 30  0001 C CNN
+F 2 "" H 5800 8800 60  0001 C CNN
+F 3 "" H 5800 8800 60  0001 C CNN
+	1    5800 8800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R23
 U 1 1 4652B5F4
-P 5200 8550
-F 0 "R23" V 5280 8550 50  0000 C CNN
-F 1 "10K" V 5200 8550 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 5200 8550 60  0001 C CNN
-F 3 "" H 5200 8550 60  0001 C CNN
-	1    5200 8550
+P 5500 8800
+F 0 "R23" V 5580 8800 50  0000 C CNN
+F 1 "10K" V 5500 8800 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 5500 8800 60  0001 C CNN
+F 3 "" H 5500 8800 60  0001 C CNN
+	1    5500 8800
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR083
 U 1 1 4652B4DE
-P 2600 6650
-F 0 "#PWR083" H 2600 6650 30  0001 C CNN
-F 1 "GND" H 2600 6580 30  0001 C CNN
-F 2 "" H 2600 6650 60  0001 C CNN
-F 3 "" H 2600 6650 60  0001 C CNN
-	1    2600 6650
+P 2650 7000
+F 0 "#PWR083" H 2650 7000 30  0001 C CNN
+F 1 "GND" H 2650 6930 30  0001 C CNN
+F 2 "" H 2650 7000 60  0001 C CNN
+F 3 "" H 2650 7000 60  0001 C CNN
+	1    2650 7000
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR084
 U 1 1 4652B4DD
-P 3150 7500
-F 0 "#PWR084" H 3150 7500 30  0001 C CNN
-F 1 "GND" H 3150 7430 30  0001 C CNN
-F 2 "" H 3150 7500 60  0001 C CNN
-F 3 "" H 3150 7500 60  0001 C CNN
-	1    3150 7500
+P 3350 7700
+F 0 "#PWR084" H 3350 7700 30  0001 C CNN
+F 1 "GND" H 3350 7630 30  0001 C CNN
+F 2 "" H 3350 7700 60  0001 C CNN
+F 3 "" H 3350 7700 60  0001 C CNN
+	1    3350 7700
 	0    1    1    0   
 $EndComp
 $Comp
 L C C45
 U 1 1 4652B4DC
-P 3050 8550
-F 0 "C45" H 3100 8650 50  0000 L CNN
-F 1 "100nF" H 3100 8450 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 3050 8550 60  0001 C CNN
-F 3 "" H 3050 8550 60  0001 C CNN
-	1    3050 8550
+P 3300 8750
+F 0 "C45" H 3350 8850 50  0000 L CNN
+F 1 "100nF" H 3350 8650 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 3300 8750 60  0001 C CNN
+F 3 "" H 3300 8750 60  0001 C CNN
+	1    3300 8750
 	1    0    0    -1  
 $EndComp
-Text Label 1500 7300 0    60   ~ 0
+Text Label 1600 7500 0    60   ~ 0
 CTS2/CANH
-Text Label 1500 7500 0    60   ~ 0
+Text Label 1600 7700 0    60   ~ 0
 RTS2
-Text Label 1500 7400 0    60   ~ 0
+Text Label 1600 7600 0    60   ~ 0
 RXD2
-Text Label 1500 7200 0    60   ~ 0
+Text Label 1600 7400 0    60   ~ 0
 TXD2/CANL
-NoConn ~ 1350 7700
+NoConn ~ 1500 7900
 $Comp
 L GND #PWR085
 U 1 1 4652B4DB
-P 1350 7800
-F 0 "#PWR085" H 1350 7800 30  0001 C CNN
-F 1 "GND" H 1350 7730 30  0001 C CNN
-F 2 "" H 1350 7800 60  0001 C CNN
-F 3 "" H 1350 7800 60  0001 C CNN
-	1    1350 7800
+P 1550 8000
+F 0 "#PWR085" H 1550 8000 30  0001 C CNN
+F 1 "GND" H 1550 7930 30  0001 C CNN
+F 2 "" H 1550 8000 60  0001 C CNN
+F 3 "" H 1550 8000 60  0001 C CNN
+	1    1550 8000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR086
 U 1 1 4652B4DA
-P 3050 8750
-F 0 "#PWR086" H 3050 8750 30  0001 C CNN
-F 1 "GND" H 3050 8680 30  0001 C CNN
-F 2 "" H 3050 8750 60  0001 C CNN
-F 3 "" H 3050 8750 60  0001 C CNN
-	1    3050 8750
+P 3300 9000
+F 0 "#PWR086" H 3300 9000 30  0001 C CNN
+F 1 "GND" H 3300 8930 30  0001 C CNN
+F 2 "" H 3300 9000 60  0001 C CNN
+F 3 "" H 3300 9000 60  0001 C CNN
+	1    3300 9000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C46
 U 1 1 4652B4D9
-P 2800 6650
-F 0 "C46" H 2850 6750 50  0000 L CNN
-F 1 "100nF" H 2850 6550 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2800 6650 60  0001 C CNN
-F 3 "" H 2800 6650 60  0001 C CNN
-	1    2800 6650
+P 2900 7000
+F 0 "C46" V 2750 7000 50  0000 C CNN
+F 1 "100nF" V 3050 7000 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 2900 7000 60  0001 C CNN
+F 3 "" H 2900 7000 60  0001 C CNN
+	1    2900 7000
 	0    1    1    0   
 $EndComp
 $Comp
 L C C36
 U 1 1 4652B4D8
-P 4900 7600
-F 0 "C36" H 4950 7700 50  0000 L CNN
-F 1 "100nF" H 4950 7500 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 4900 7600 60  0001 C CNN
-F 3 "" H 4900 7600 60  0001 C CNN
-	1    4900 7600
+P 5200 7800
+F 0 "C36" H 5250 7900 50  0000 L CNN
+F 1 "100nF" H 5250 7700 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 5200 7800 60  0001 C CNN
+F 3 "" H 5200 7800 60  0001 C CNN
+	1    5200 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C44
 U 1 1 4652B4D7
-P 4900 7100
-F 0 "C44" H 4950 7200 50  0000 L CNN
-F 1 "100nF" H 4950 7000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 4900 7100 60  0001 C CNN
-F 3 "" H 4900 7100 60  0001 C CNN
-	1    4900 7100
+P 5200 7300
+F 0 "C44" H 5250 7400 50  0000 L CNN
+F 1 "100nF" H 5250 7200 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 5200 7300 60  0001 C CNN
+F 3 "" H 5200 7300 60  0001 C CNN
+	1    5200 7300
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C35
 U 1 1 4652B4D6
-P 3000 7100
-F 0 "C35" H 3050 7200 50  0000 L CNN
-F 1 "100nF" H 3050 7000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 3000 7100 60  0001 C CNN
-F 3 "" H 3000 7100 60  0001 C CNN
-	1    3000 7100
+P 3200 7300
+F 0 "C35" H 3250 7400 50  0000 L CNN
+F 1 "100nF" H 3250 7200 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 3200 7300 60  0001 C CNN
+F 3 "" H 3200 7300 60  0001 C CNN
+	1    3200 7300
 	1    0    0    -1  
 $EndComp
-Text Label 6000 8300 0    60   ~ 0
+Text Label 6300 8500 0    60   ~ 0
 UCTS2
-Text Label 6000 8200 0    60   ~ 0
+Text Label 6300 8400 0    60   ~ 0
 URTS2
-Text Label 6000 8100 0    60   ~ 0
+Text Label 6300 8300 0    60   ~ 0
 URXD2
-Text Label 6000 8000 0    60   ~ 0
+Text Label 6300 8200 0    60   ~ 0
 UTXD2
 $Comp
 L CONN_4X2 UART_EN2
 U 1 1 4652B4D5
-P 5550 8150
-F 0 "UART_EN2" H 5550 8400 50  0000 C CNN
-F 1 "CONN_4X2" V 5550 8150 40  0000 C CNN
-F 2 "pin_array:pin_array_4x2" H 5550 8150 60  0001 C CNN
-F 3 "" H 5550 8150 60  0001 C CNN
-	1    5550 8150
+P 5850 8350
+F 0 "UART_EN2" H 5850 8600 50  0000 C CNN
+F 1 "CONN_4X2" V 5850 8350 40  0000 C CNN
+F 2 "pin_array:pin_array_4x2" H 5850 8350 60  0001 C CNN
+F 3 "" H 5850 8350 60  0001 C CNN
+	1    5850 8350
 	1    0    0    -1  
 $EndComp
 $Comp
 L DB9 UARTCAN2
 U 1 1 4652B4D4
-P 900 7400
-F 0 "UARTCAN2" H 900 7950 70  0000 C CNN
-F 1 "DB9" H 900 6850 70  0000 C CNN
-F 2 "connect:DB9FC" H 900 7400 60  0001 C CNN
-F 3 "" H 900 7400 60  0001 C CNN
-	1    900  7400
+P 1050 7600
+F 0 "UARTCAN2" H 1050 8150 70  0000 C CNN
+F 1 "DB9" H 1050 7050 70  0000 C CNN
+F 2 "connect:DB9FC" H 1050 7600 60  0001 C CNN
+F 3 "" H 1050 7600 60  0001 C CNN
+	1    1050 7600
 	-1   0    0    1   
 $EndComp
 $Comp
 L MAX202 U8
 U 1 1 4652B4D3
-P 3950 7600
-F 0 "U8" H 3950 8450 70  0000 C CNN
-F 1 "MAX202" H 3950 6750 70  0000 C CNN
-F 2 "lib_smd:SO16E" H 3950 7600 60  0001 C CNN
-F 3 "" H 3950 7600 60  0001 C CNN
-	1    3950 7600
+P 4200 7800
+F 0 "U8" H 4200 8650 70  0000 C CNN
+F 1 "MAX202" H 4200 6950 70  0000 C CNN
+F 2 "lib_smd:SO16E" H 4200 7800 60  0001 C CNN
+F 3 "" H 4200 7800 60  0001 C CNN
+	1    4200 7800
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR087
 U 1 1 4652B4CC
-P 1650 4000
-F 0 "#PWR087" H 1650 4000 30  0001 C CNN
-F 1 "GND" H 1650 3930 30  0001 C CNN
-F 2 "" H 1650 4000 60  0001 C CNN
-F 3 "" H 1650 4000 60  0001 C CNN
-	1    1650 4000
+P 1750 4350
+F 0 "#PWR087" H 1750 4350 30  0001 C CNN
+F 1 "GND" H 1750 4280 30  0001 C CNN
+F 2 "" H 1750 4350 60  0001 C CNN
+F 3 "" H 1750 4350 60  0001 C CNN
+	1    1750 4350
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR088
 U 1 1 4652B4CB
-P 2200 4850
-F 0 "#PWR088" H 2200 4850 30  0001 C CNN
-F 1 "GND" H 2200 4780 30  0001 C CNN
-F 2 "" H 2200 4850 60  0001 C CNN
-F 3 "" H 2200 4850 60  0001 C CNN
-	1    2200 4850
+P 2400 5050
+F 0 "#PWR088" H 2400 5050 30  0001 C CNN
+F 1 "GND" H 2400 4980 30  0001 C CNN
+F 2 "" H 2400 5050 60  0001 C CNN
+F 3 "" H 2400 5050 60  0001 C CNN
+	1    2400 5050
 	0    1    1    0   
 $EndComp
 $Comp
 L C C33
 U 1 1 4652B4CA
-P 2100 5900
-F 0 "C33" H 2150 6000 50  0000 L CNN
-F 1 "100nF" H 2150 5800 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2100 5900 60  0001 C CNN
-F 3 "" H 2100 5900 60  0001 C CNN
-	1    2100 5900
+P 2350 6100
+F 0 "C33" H 2400 6200 50  0000 L CNN
+F 1 "100nF" H 2400 6000 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 2350 6100 60  0001 C CNN
+F 3 "" H 2350 6100 60  0001 C CNN
+	1    2350 6100
 	1    0    0    -1  
 $EndComp
-Text Label 1500 4650 0    60   ~ 0
+Text Label 1650 4850 0    60   ~ 0
 CTS1
-Text Label 1500 4850 0    60   ~ 0
+Text Label 1650 5050 0    60   ~ 0
 RTS1
-Text Label 1500 4750 0    60   ~ 0
+Text Label 1650 4950 0    60   ~ 0
 RXD1
-Text Label 1500 4550 0    60   ~ 0
+Text Label 1650 4750 0    60   ~ 0
 TXD1
-NoConn ~ 1350 5050
+NoConn ~ 1500 5250
 $Comp
 L GND #PWR089
 U 1 1 4652B4C9
-P 1350 5150
-F 0 "#PWR089" H 1350 5150 30  0001 C CNN
-F 1 "GND" H 1350 5080 30  0001 C CNN
-F 2 "" H 1350 5150 60  0001 C CNN
-F 3 "" H 1350 5150 60  0001 C CNN
-	1    1350 5150
+P 1550 5350
+F 0 "#PWR089" H 1550 5350 30  0001 C CNN
+F 1 "GND" H 1550 5280 30  0001 C CNN
+F 2 "" H 1550 5350 60  0001 C CNN
+F 3 "" H 1550 5350 60  0001 C CNN
+	1    1550 5350
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR090
 U 1 1 4652B4C8
-P 2100 6100
-F 0 "#PWR090" H 2100 6100 30  0001 C CNN
-F 1 "GND" H 2100 6030 30  0001 C CNN
-F 2 "" H 2100 6100 60  0001 C CNN
-F 3 "" H 2100 6100 60  0001 C CNN
-	1    2100 6100
+P 2350 6350
+F 0 "#PWR090" H 2350 6350 30  0001 C CNN
+F 1 "GND" H 2350 6280 30  0001 C CNN
+F 2 "" H 2350 6350 60  0001 C CNN
+F 3 "" H 2350 6350 60  0001 C CNN
+	1    2350 6350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C28
 U 1 1 4652B4C7
-P 1850 4000
-F 0 "C28" H 1900 4100 50  0000 L CNN
-F 1 "100nF" H 1900 3900 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 1850 4000 60  0001 C CNN
-F 3 "" H 1850 4000 60  0001 C CNN
-	1    1850 4000
+P 2000 4350
+F 0 "C28" V 1850 4350 50  0000 C CNN
+F 1 "100nF" V 2150 4350 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 2000 4350 60  0001 C CNN
+F 3 "" H 2000 4350 60  0001 C CNN
+	1    2000 4350
 	0    1    1    0   
 $EndComp
 $Comp
 L C C32
 U 1 1 4652B4C6
-P 3950 4950
-F 0 "C32" H 4000 5050 50  0000 L CNN
-F 1 "100nF" H 4000 4850 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 3950 4950 60  0001 C CNN
-F 3 "" H 3950 4950 60  0001 C CNN
-	1    3950 4950
+P 4200 5150
+F 0 "C32" H 4250 5250 50  0000 L CNN
+F 1 "100nF" H 4250 5050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 4200 5150 60  0001 C CNN
+F 3 "" H 4200 5150 60  0001 C CNN
+	1    4200 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C31
 U 1 1 4652B4C5
-P 3950 4450
-F 0 "C31" H 4000 4550 50  0000 L CNN
-F 1 "100nF" H 4000 4350 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 3950 4450 60  0001 C CNN
-F 3 "" H 3950 4450 60  0001 C CNN
-	1    3950 4450
+P 4200 4650
+F 0 "C31" H 4250 4750 50  0000 L CNN
+F 1 "100nF" H 4250 4550 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 4200 4650 60  0001 C CNN
+F 3 "" H 4200 4650 60  0001 C CNN
+	1    4200 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C30
 U 1 1 4652B4C4
-P 2050 4450
-F 0 "C30" H 2100 4550 50  0000 L CNN
-F 1 "100nF" H 2100 4350 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2050 4450 60  0001 C CNN
-F 3 "" H 2050 4450 60  0001 C CNN
-	1    2050 4450
+P 2300 4650
+F 0 "C30" H 2350 4750 50  0000 L CNN
+F 1 "100nF" H 2350 4550 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 2300 4650 60  0001 C CNN
+F 3 "" H 2300 4650 60  0001 C CNN
+	1    2300 4650
 	1    0    0    -1  
 $EndComp
-Text Label 5050 5650 0    60   ~ 0
+Text Label 5350 5850 0    60   ~ 0
 UCTS1
-Text Label 5050 5550 0    60   ~ 0
+Text Label 5350 5750 0    60   ~ 0
 URTS1
-Text Label 5050 5450 0    60   ~ 0
+Text Label 5350 5650 0    60   ~ 0
 URXD1
-Text Label 5050 5350 0    60   ~ 0
+Text Label 5350 5550 0    60   ~ 0
 UTXD1
 $Comp
 L CONN_4X2 UART_EN1
 U 1 1 4652B4C3
-P 4600 5500
-F 0 "UART_EN1" H 4600 5750 50  0000 C CNN
-F 1 "CONN_4X2" V 4600 5500 40  0000 C CNN
-F 2 "pin_array:pin_array_4x2" H 4600 5500 60  0001 C CNN
-F 3 "" H 4600 5500 60  0001 C CNN
-	1    4600 5500
+P 4900 5700
+F 0 "UART_EN1" H 4900 5950 50  0000 C CNN
+F 1 "CONN_4X2" V 4900 5700 40  0000 C CNN
+F 2 "pin_array:pin_array_4x2" H 4900 5700 60  0001 C CNN
+F 3 "" H 4900 5700 60  0001 C CNN
+	1    4900 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L DB9 UARTCAN1
 U 1 1 4652B4C2
-P 900 4750
-F 0 "UARTCAN1" H 900 5300 70  0000 C CNN
-F 1 "DB9" H 900 4200 70  0000 C CNN
-F 2 "connect:DB9FC" H 900 4750 60  0001 C CNN
-F 3 "" H 900 4750 60  0001 C CNN
-	1    900  4750
+P 1050 4950
+F 0 "UARTCAN1" H 1050 5500 70  0000 C CNN
+F 1 "DB9" H 1050 4400 70  0000 C CNN
+F 2 "connect:DB9FC" H 1050 4950 60  0001 C CNN
+F 3 "" H 1050 4950 60  0001 C CNN
+	1    1050 4950
 	-1   0    0    1   
 $EndComp
 $Comp
 L MAX202 U5
 U 1 1 4652B4C1
-P 3000 4950
-F 0 "U5" H 3000 5800 70  0000 C CNN
-F 1 "MAX202" H 3000 4100 70  0000 C CNN
-F 2 "lib_smd:SO16E" H 3000 4950 60  0001 C CNN
-F 3 "" H 3000 4950 60  0001 C CNN
-	1    3000 4950
+P 3250 5150
+F 0 "U5" H 3250 6000 70  0000 C CNN
+F 1 "MAX202" H 3250 4300 70  0000 C CNN
+F 2 "lib_smd:SO16E" H 3250 5150 60  0001 C CNN
+F 3 "" H 3250 5150 60  0001 C CNN
+	1    3250 5150
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR091
 U 1 1 4652B4AA
-P 1600 1350
-F 0 "#PWR091" H 1600 1350 30  0001 C CNN
-F 1 "GND" H 1600 1280 30  0001 C CNN
-F 2 "" H 1600 1350 60  0001 C CNN
-F 3 "" H 1600 1350 60  0001 C CNN
-	1    1600 1350
+P 1750 1700
+F 0 "#PWR091" H 1750 1700 30  0001 C CNN
+F 1 "GND" H 1750 1630 30  0001 C CNN
+F 2 "" H 1750 1700 60  0001 C CNN
+F 3 "" H 1750 1700 60  0001 C CNN
+	1    1750 1700
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR092
 U 1 1 4652B49A
-P 2150 2200
-F 0 "#PWR092" H 2150 2200 30  0001 C CNN
-F 1 "GND" H 2150 2130 30  0001 C CNN
-F 2 "" H 2150 2200 60  0001 C CNN
-F 3 "" H 2150 2200 60  0001 C CNN
-	1    2150 2200
+P 2400 2400
+F 0 "#PWR092" H 2400 2400 30  0001 C CNN
+F 1 "GND" H 2400 2330 30  0001 C CNN
+F 2 "" H 2400 2400 60  0001 C CNN
+F 3 "" H 2400 2400 60  0001 C CNN
+	1    2400 2400
 	0    1    1    0   
 $EndComp
 $Comp
 L C C27
 U 1 1 4652B486
-P 2050 3250
-F 0 "C27" H 2100 3350 50  0000 L CNN
-F 1 "100nF" H 2100 3150 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2050 3250 60  0001 C CNN
-F 3 "" H 2050 3250 60  0001 C CNN
-	1    2050 3250
+P 2350 3450
+F 0 "C27" H 2400 3550 50  0000 L CNN
+F 1 "100nF" H 2400 3350 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 2350 3450 60  0001 C CNN
+F 3 "" H 2350 3450 60  0001 C CNN
+	1    2350 3450
 	1    0    0    -1  
 $EndComp
-Text Label 1450 2000 0    60   ~ 0
+Text Label 1650 2200 0    60   ~ 0
 CTS0
-Text Label 1450 2200 0    60   ~ 0
+Text Label 1650 2400 0    60   ~ 0
 RTS0
-Text Label 1450 2100 0    60   ~ 0
+Text Label 1650 2300 0    60   ~ 0
 RXD0
-Text Label 1450 1900 0    60   ~ 0
+Text Label 1650 2100 0    60   ~ 0
 TXD0
-NoConn ~ 1300 2400
+NoConn ~ 1500 2600
 $Comp
 L GND #PWR093
 U 1 1 4652B392
-P 1300 2500
-F 0 "#PWR093" H 1300 2500 30  0001 C CNN
-F 1 "GND" H 1300 2430 30  0001 C CNN
-F 2 "" H 1300 2500 60  0001 C CNN
-F 3 "" H 1300 2500 60  0001 C CNN
-	1    1300 2500
+P 1550 2700
+F 0 "#PWR093" H 1550 2700 30  0001 C CNN
+F 1 "GND" H 1550 2630 30  0001 C CNN
+F 2 "" H 1550 2700 60  0001 C CNN
+F 3 "" H 1550 2700 60  0001 C CNN
+	1    1550 2700
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR094
 U 1 1 4652B389
-P 2050 3450
-F 0 "#PWR094" H 2050 3450 30  0001 C CNN
-F 1 "GND" H 2050 3380 30  0001 C CNN
-F 2 "" H 2050 3450 60  0001 C CNN
-F 3 "" H 2050 3450 60  0001 C CNN
-	1    2050 3450
+P 2350 3700
+F 0 "#PWR094" H 2350 3700 30  0001 C CNN
+F 1 "GND" H 2350 3630 30  0001 C CNN
+F 2 "" H 2350 3700 60  0001 C CNN
+F 3 "" H 2350 3700 60  0001 C CNN
+	1    2350 3700
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C22
 U 1 1 4652B365
-P 1800 1350
-F 0 "C22" H 1850 1450 50  0000 L CNN
-F 1 "100nF" H 1850 1250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 1800 1350 60  0001 C CNN
-F 3 "" H 1800 1350 60  0001 C CNN
-	1    1800 1350
+P 2000 1700
+F 0 "C22" V 1850 1700 50  0000 C CNN
+F 1 "100nF" V 2150 1700 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 2000 1700 60  0001 C CNN
+F 3 "" H 2000 1700 60  0001 C CNN
+	1    2000 1700
 	0    1    1    0   
 $EndComp
 $Comp
 L C C25
 U 1 1 4652B35B
-P 3900 2300
-F 0 "C25" H 3950 2400 50  0000 L CNN
-F 1 "100nF" H 3950 2200 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 3900 2300 60  0001 C CNN
-F 3 "" H 3900 2300 60  0001 C CNN
-	1    3900 2300
+P 4200 2500
+F 0 "C25" H 4250 2600 50  0000 L CNN
+F 1 "100nF" H 4250 2400 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 4200 2500 60  0001 C CNN
+F 3 "" H 4200 2500 60  0001 C CNN
+	1    4200 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C24
 U 1 1 4652B354
-P 3900 1800
-F 0 "C24" H 3950 1900 50  0000 L CNN
-F 1 "100nF" H 3950 1700 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 3900 1800 60  0001 C CNN
-F 3 "" H 3900 1800 60  0001 C CNN
-	1    3900 1800
+P 4200 2000
+F 0 "C24" H 4250 2100 50  0000 L CNN
+F 1 "100nF" H 4250 1900 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 4200 2000 60  0001 C CNN
+F 3 "" H 4200 2000 60  0001 C CNN
+	1    4200 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C23
 U 1 1 4652B33B
-P 2000 1800
-F 0 "C23" H 2050 1900 50  0000 L CNN
-F 1 "100nF" H 2050 1700 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2000 1800 60  0001 C CNN
-F 3 "" H 2000 1800 60  0001 C CNN
-	1    2000 1800
+P 2300 2000
+F 0 "C23" H 2350 2100 50  0000 L CNN
+F 1 "100nF" H 2350 1900 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 2300 2000 60  0001 C CNN
+F 3 "" H 2300 2000 60  0001 C CNN
+	1    2300 2000
 	1    0    0    -1  
 $EndComp
-Text Label 5000 3000 0    60   ~ 0
+Text Label 5300 3200 0    60   ~ 0
 UCTS0
-Text Label 5000 2900 0    60   ~ 0
+Text Label 5300 3100 0    60   ~ 0
 URTS0
-Text Label 5000 2800 0    60   ~ 0
+Text Label 5300 3000 0    60   ~ 0
 URXD0
-Text Label 5000 2700 0    60   ~ 0
+Text Label 5300 2900 0    60   ~ 0
 UTXD0
 $Comp
 L CONN_4X2 UART_EN0
 U 1 1 4652B289
-P 4550 2850
-F 0 "UART_EN0" H 4550 3100 50  0000 C CNN
-F 1 "CONN_4X2" V 4550 2850 40  0000 C CNN
-F 2 "pin_array:pin_array_4x2" H 4550 2850 60  0001 C CNN
-F 3 "" H 4550 2850 60  0001 C CNN
-	1    4550 2850
+P 4850 3050
+F 0 "UART_EN0" H 4850 3300 50  0000 C CNN
+F 1 "CONN_4X2" V 4850 3050 40  0000 C CNN
+F 2 "pin_array:pin_array_4x2" H 4850 3050 60  0001 C CNN
+F 3 "" H 4850 3050 60  0001 C CNN
+	1    4850 3050
 	1    0    0    -1  
 $EndComp
 $Comp
 L DB9 UARTCAN0
 U 1 1 4652B26D
-P 850 2100
-F 0 "UARTCAN0" H 850 2650 70  0000 C CNN
-F 1 "DB9" H 850 1550 70  0000 C CNN
-F 2 "connect:DB9FC" H 850 2100 60  0001 C CNN
-F 3 "" H 850 2100 60  0001 C CNN
-	1    850  2100
+P 1050 2300
+F 0 "UARTCAN0" H 1050 2850 70  0000 C CNN
+F 1 "DB9" H 1050 1750 70  0000 C CNN
+F 2 "connect:DB9FC" H 1050 2300 60  0001 C CNN
+F 3 "" H 1050 2300 60  0001 C CNN
+	1    1050 2300
 	-1   0    0    1   
 $EndComp
 $Comp
 L MAX202 U3
 U 1 1 4652B22B
-P 2950 2300
-F 0 "U3" H 2950 3150 70  0000 C CNN
-F 1 "MAX202" H 2950 1450 70  0000 C CNN
-F 2 "lib_smd:SO16E" H 2950 2300 60  0001 C CNN
-F 3 "" H 2950 2300 60  0001 C CNN
-	1    2950 2300
+P 3250 2500
+F 0 "U3" H 3250 3350 70  0000 C CNN
+F 1 "MAX202" H 3250 1650 70  0000 C CNN
+F 2 "lib_smd:SO16E" H 3250 2500 60  0001 C CNN
+F 3 "" H 3250 2500 60  0001 C CNN
+	1    3250 2500
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR095
 U 1 1 4652B1F0
-P 9200 3650
-F 0 "#PWR095" H 9200 3650 30  0001 C CNN
-F 1 "GND" H 9200 3580 30  0001 C CNN
-F 2 "" H 9200 3650 60  0001 C CNN
-F 3 "" H 9200 3650 60  0001 C CNN
-	1    9200 3650
+P 9250 3650
+F 0 "#PWR095" H 9250 3650 30  0001 C CNN
+F 1 "GND" H 9250 3580 30  0001 C CNN
+F 2 "" H 9250 3650 60  0001 C CNN
+F 3 "" H 9250 3650 60  0001 C CNN
+	1    9250 3650
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR096
 U 1 1 4652B1EE
-P 9200 3100
-F 0 "#PWR096" H 9200 3100 30  0001 C CNN
-F 1 "GND" H 9200 3030 30  0001 C CNN
-F 2 "" H 9200 3100 60  0001 C CNN
-F 3 "" H 9200 3100 60  0001 C CNN
-	1    9200 3100
+P 9250 3100
+F 0 "#PWR096" H 9250 3100 30  0001 C CNN
+F 1 "GND" H 9250 3030 30  0001 C CNN
+F 2 "" H 9250 3100 60  0001 C CNN
+F 3 "" H 9250 3100 60  0001 C CNN
+	1    9250 3100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR097
 U 1 1 4652B1ED
-P 9200 2550
-F 0 "#PWR097" H 9200 2550 30  0001 C CNN
-F 1 "GND" H 9200 2480 30  0001 C CNN
-F 2 "" H 9200 2550 60  0001 C CNN
-F 3 "" H 9200 2550 60  0001 C CNN
-	1    9200 2550
+P 9250 2550
+F 0 "#PWR097" H 9250 2550 30  0001 C CNN
+F 1 "GND" H 9250 2480 30  0001 C CNN
+F 2 "" H 9250 2550 60  0001 C CNN
+F 3 "" H 9250 2550 60  0001 C CNN
+	1    9250 2550
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR098
 U 1 1 4652B1E8
-P 9200 2000
-F 0 "#PWR098" H 9200 2000 30  0001 C CNN
-F 1 "GND" H 9200 1930 30  0001 C CNN
-F 2 "" H 9200 2000 60  0001 C CNN
-F 3 "" H 9200 2000 60  0001 C CNN
-	1    9200 2000
+P 9250 2000
+F 0 "#PWR098" H 9250 2000 30  0001 C CNN
+F 1 "GND" H 9250 1930 30  0001 C CNN
+F 2 "" H 9250 2000 60  0001 C CNN
+F 3 "" H 9250 2000 60  0001 C CNN
+	1    9250 2000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR099
 U 1 1 4652B136
-P 6800 4150
-F 0 "#PWR099" H 6800 4150 30  0001 C CNN
-F 1 "GND" H 6800 4080 30  0001 C CNN
-F 2 "" H 6800 4150 60  0001 C CNN
-F 3 "" H 6800 4150 60  0001 C CNN
-	1    6800 4150
+P 6800 3950
+F 0 "#PWR099" H 6800 3950 30  0001 C CNN
+F 1 "GND" H 6800 3880 30  0001 C CNN
+F 2 "" H 6800 3950 60  0001 C CNN
+F 3 "" H 6800 3950 60  0001 C CNN
+	1    6800 3950
 	0    1    1    0   
 $EndComp
 $Comp
 L +3.3V #PWR0100
 U 1 1 4652B12E
-P 8150 4150
-F 0 "#PWR0100" H 8150 4110 30  0001 C CNN
-F 1 "+3.3V" H 8150 4260 30  0000 C CNN
-F 2 "" H 8150 4150 60  0001 C CNN
-F 3 "" H 8150 4150 60  0001 C CNN
-	1    8150 4150
+P 7500 1350
+F 0 "#PWR0100" H 7500 1310 30  0001 C CNN
+F 1 "+3.3V" H 7500 1460 40  0000 C CNN
+F 2 "" H 7500 1350 60  0001 C CNN
+F 3 "" H 7500 1350 60  0001 C CNN
+	1    7500 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R34
 U 1 1 4652B111
-P 7900 4150
-F 0 "R34" V 7980 4150 50  0000 C CNN
-F 1 "10K" V 7900 4150 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 7900 4150 60  0001 C CNN
-F 3 "" H 7900 4150 60  0001 C CNN
-	1    7900 4150
-	0    1    1    0   
+P 7500 1650
+F 0 "R34" H 7350 1850 50  0000 C CNN
+F 1 "10K" V 7500 1650 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 7500 1650 60  0001 C CNN
+F 3 "" H 7500 1650 60  0001 C CNN
+	1    7500 1650
+	1    0    0    -1  
 $EndComp
 $Comp
 L JUMPER LED_EN1
 U 1 1 4652B108
-P 7100 4150
-F 0 "LED_EN1" H 7100 4300 60  0000 C CNN
-F 1 "JUMPER" H 7100 4070 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 7100 4150 60  0001 C CNN
-F 3 "" H 7100 4150 60  0001 C CNN
-	1    7100 4150
+P 7100 3950
+F 0 "LED_EN1" H 7100 4100 60  0000 C CNN
+F 1 "JUMPER" H 7100 3870 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 7100 3950 60  0001 C CNN
+F 3 "" H 7100 3950 60  0001 C CNN
+	1    7100 3950
 	1    0    0    -1  
 $EndComp
 Text Label 7050 3650 0    60   ~ 0
@@ -2049,31 +1514,31 @@ DTIN0
 $Comp
 L +3.3V #PWR0101
 U 1 1 4652A9F1
-P 12050 1200
-F 0 "#PWR0101" H 12050 1160 30  0001 C CNN
-F 1 "+3.3V" H 12050 1310 30  0000 C CNN
-F 2 "" H 12050 1200 60  0001 C CNN
-F 3 "" H 12050 1200 60  0001 C CNN
-	1    12050 1200
+P 11900 1150
+F 0 "#PWR0101" H 11900 1110 30  0001 C CNN
+F 1 "+3.3V" H 11900 1260 40  0000 C CNN
+F 2 "" H 11900 1150 60  0001 C CNN
+F 3 "" H 11900 1150 60  0001 C CNN
+	1    11900 1150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR0102
 U 1 1 4652A9EB
-P 13250 1200
-F 0 "#PWR0102" H 13250 1200 30  0001 C CNN
-F 1 "GND" H 13250 1130 30  0001 C CNN
-F 2 "" H 13250 1200 60  0001 C CNN
-F 3 "" H 13250 1200 60  0001 C CNN
-	1    13250 1200
+P 13300 1200
+F 0 "#PWR0102" H 13300 1200 30  0001 C CNN
+F 1 "GND" H 13300 1130 30  0001 C CNN
+F 2 "" H 13300 1200 60  0001 C CNN
+F 3 "" H 13300 1200 60  0001 C CNN
+	1    13300 1200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C43
 U 1 1 4652A9D3
 P 13050 1200
-F 0 "C43" H 12850 1350 50  0000 L CNN
-F 1 "100nF" V 12850 1100 50  0000 L CNN
+F 0 "C43" V 12800 1200 50  0000 C CNN
+F 1 "100nF" V 12900 1200 50  0000 C CNN
 F 2 "lib_smd:SM0805" H 13050 1200 60  0001 C CNN
 F 3 "" H 13050 1200 60  0001 C CNN
 	1    13050 1200
@@ -2082,12 +1547,12 @@ $EndComp
 $Comp
 L JUMPER VX_EN1
 U 1 1 4652A9C4
-P 12350 1200
-F 0 "VX_EN1" H 12350 1350 60  0000 C CNN
-F 1 "JUMPER" H 12350 1120 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 12350 1200 60  0001 C CNN
-F 3 "" H 12350 1200 60  0001 C CNN
-	1    12350 1200
+P 12300 1200
+F 0 "VX_EN1" H 12300 1350 60  0000 C CNN
+F 1 "JUMPER" H 12300 1120 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 12300 1200 60  0001 C CNN
+F 3 "" H 12300 1200 60  0001 C CNN
+	1    12300 1200
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2160,12 +1625,12 @@ PWM5
 $Comp
 L +3.3V #PWR0104
 U 1 1 4652A6B1
-P 12700 4400
-F 0 "#PWR0104" H 12700 4360 30  0001 C CNN
-F 1 "+3.3V" H 12700 4510 30  0000 C CNN
-F 2 "" H 12700 4400 60  0001 C CNN
-F 3 "" H 12700 4400 60  0001 C CNN
-	1    12700 4400
+P 12650 4400
+F 0 "#PWR0104" H 12650 4360 30  0001 C CNN
+F 1 "+3.3V" V 12650 4600 40  0000 C CNN
+F 2 "" H 12650 4400 60  0001 C CNN
+F 3 "" H 12650 4400 60  0001 C CNN
+	1    12650 4400
 	0    -1   -1   0   
 $EndComp
 Text HLabel 13900 2800 2    60   Input ~ 0
@@ -2207,4 +1672,614 @@ F 3 "" H 13100 2950 60  0001 C CNN
 	1    13100 2950
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	13550 4450 13550 4400
+Wire Wire Line
+	13550 4400 13500 4400
+Wire Wire Line
+	12800 7900 13200 7900
+Wire Wire Line
+	13700 8200 13700 8300
+Wire Wire Line
+	14800 8200 14850 8200
+Wire Wire Line
+	10850 8800 11300 8800
+Wire Wire Line
+	12100 8900 12600 8900
+Wire Wire Line
+	10800 7800 11250 7800
+Wire Wire Line
+	10700 8100 10700 7950
+Wire Wire Line
+	10650 7950 11250 7950
+Wire Wire Line
+	12300 8200 12300 8150
+Wire Wire Line
+	12300 8150 12200 8150
+Wire Wire Line
+	11150 7500 11250 7500
+Wire Wire Line
+	12600 8000 12200 8000
+Wire Wire Line
+	12600 7900 12200 7900
+Wire Wire Line
+	9300 6650 9300 6600
+Wire Wire Line
+	9300 6600 9200 6600
+Wire Wire Line
+	9300 5550 9300 5750
+Wire Wire Line
+	9300 5550 9200 5550
+Connection ~ 10250 5800
+Wire Wire Line
+	10250 5800 10250 5850
+Wire Wire Line
+	9700 5800 11300 5800
+Wire Wire Line
+	12900 5800 13200 5800
+Wire Wire Line
+	4800 9900 4800 10350
+Wire Wire Line
+	4800 9900 4700 9900
+Wire Wire Line
+	9000 9050 9800 9050
+Wire Wire Line
+	9800 9050 9800 8700
+Wire Wire Line
+	9000 8850 9400 8850
+Wire Wire Line
+	9400 8850 9400 8700
+Wire Wire Line
+	2450 9200 2800 9200
+Wire Wire Line
+	2800 9200 2800 8400
+Wire Wire Line
+	2350 8350 2350 8400
+Wire Wire Line
+	2350 8400 2600 8400
+Wire Wire Line
+	2600 8400 2600 7600
+Wire Wire Line
+	2600 7600 1500 7600
+Wire Wire Line
+	2250 9200 1850 9200
+Wire Wire Line
+	2250 7250 1850 7250
+Wire Wire Line
+	2350 7250 2350 7400
+Wire Wire Line
+	2350 7400 1500 7400
+Connection ~ 4250 5650
+Wire Wire Line
+	4300 6100 4250 6100
+Wire Wire Line
+	4250 6100 4250 5650
+Wire Wire Line
+	5450 8500 5400 8500
+Wire Wire Line
+	5400 8500 5150 8400
+Wire Wire Line
+	5150 8400 5000 8400
+Connection ~ 5250 8400
+Wire Wire Line
+	5450 8400 5250 8400
+Wire Wire Line
+	5250 8200 5250 8800
+Wire Wire Line
+	5250 8200 5000 8200
+Wire Wire Line
+	3300 8550 3300 8000
+Wire Wire Line
+	3300 8000 3400 8000
+Connection ~ 1550 7300
+Wire Wire Line
+	1500 7300 1550 7300
+Wire Wire Line
+	5200 8000 5000 8000
+Wire Wire Line
+	5200 7500 5000 7500
+Wire Wire Line
+	3400 7500 3200 7500
+Wire Wire Line
+	6600 8200 6250 8200
+Wire Wire Line
+	6600 8300 6250 8300
+Wire Wire Line
+	6600 8400 6250 8400
+Wire Wire Line
+	6600 8500 6250 8500
+Wire Wire Line
+	5200 7100 5000 7100
+Wire Wire Line
+	5200 7600 5000 7600
+Wire Wire Line
+	1500 7200 1550 7200
+Wire Wire Line
+	1550 7200 1550 7800
+Wire Wire Line
+	1550 7800 1500 7800
+Wire Wire Line
+	3400 8300 2800 8300
+Wire Wire Line
+	2900 8200 2900 7700
+Wire Wire Line
+	2900 8200 3400 8200
+Wire Wire Line
+	2800 8400 3400 8400
+Wire Wire Line
+	2350 5900 2350 5350
+Wire Wire Line
+	2350 5350 2450 5350
+Wire Wire Line
+	2450 5850 2100 5850
+Wire Wire Line
+	2100 5850 2100 4850
+Wire Wire Line
+	2100 4850 1500 4850
+Connection ~ 1550 4650
+Wire Wire Line
+	1500 4650 1550 4650
+Wire Wire Line
+	4200 5350 4050 5350
+Wire Wire Line
+	4200 4850 4050 4850
+Wire Wire Line
+	2450 4850 2300 4850
+Wire Wire Line
+	4500 5650 4400 5650
+Wire Wire Line
+	4400 5650 4300 5750
+Wire Wire Line
+	4300 5750 4050 5750
+Wire Wire Line
+	4050 5850 4500 5850
+Wire Wire Line
+	4050 5550 4500 5550
+Wire Wire Line
+	4050 5650 4300 5650
+Wire Wire Line
+	4500 5750 4400 5750
+Wire Wire Line
+	4400 5750 4300 5650
+Wire Wire Line
+	5650 5550 5300 5550
+Wire Wire Line
+	5650 5650 5300 5650
+Wire Wire Line
+	5650 5750 5300 5750
+Wire Wire Line
+	5650 5850 5300 5850
+Wire Wire Line
+	4200 4450 4050 4450
+Wire Wire Line
+	4200 4950 4050 4950
+Wire Wire Line
+	1500 4550 1550 4550
+Wire Wire Line
+	1550 4550 1550 5150
+Wire Wire Line
+	1550 5150 1500 5150
+Wire Wire Line
+	1500 5050 2000 5050
+Wire Wire Line
+	2000 5050 2000 5650
+Wire Wire Line
+	2000 5650 2450 5650
+Wire Wire Line
+	1500 4750 2200 4750
+Wire Wire Line
+	2200 4750 2200 5550
+Wire Wire Line
+	2200 5550 2450 5550
+Wire Wire Line
+	1500 4950 1900 4950
+Wire Wire Line
+	1900 4950 1900 5750
+Wire Wire Line
+	1900 5750 2450 5750
+Wire Wire Line
+	2350 3250 2350 2700
+Wire Wire Line
+	2350 2700 2450 2700
+Wire Wire Line
+	2450 3200 2100 3200
+Wire Wire Line
+	2100 3200 2100 2200
+Wire Wire Line
+	2100 2200 1500 2200
+Connection ~ 1550 2000
+Wire Wire Line
+	1500 2000 1550 2000
+Wire Wire Line
+	4200 2700 4050 2700
+Wire Wire Line
+	4200 2200 4050 2200
+Wire Wire Line
+	2450 2200 2300 2200
+Wire Wire Line
+	4450 3000 4350 3000
+Wire Wire Line
+	4350 3000 4250 3100
+Wire Wire Line
+	4250 3100 4050 3100
+Wire Wire Line
+	4050 3200 4450 3200
+Wire Wire Line
+	4050 2900 4450 2900
+Connection ~ 7500 3400
+Wire Wire Line
+	7500 3400 7850 3400
+Wire Wire Line
+	7850 2300 7500 2300
+Connection ~ 12700 1200
+Wire Wire Line
+	12700 1500 12700 1200
+Wire Wire Line
+	12100 2900 12700 2900
+Wire Wire Line
+	12100 2700 12700 2700
+Wire Wire Line
+	12250 4100 12700 4100
+Wire Wire Line
+	12250 4000 12700 4000
+Wire Wire Line
+	12250 3900 12700 3900
+Wire Wire Line
+	12250 3800 12700 3800
+Wire Wire Line
+	12250 3700 12700 3700
+Wire Wire Line
+	12250 3600 12700 3600
+Wire Wire Line
+	12250 3500 12700 3500
+Wire Wire Line
+	12250 3400 12700 3400
+Wire Wire Line
+	12250 3300 12700 3300
+Wire Wire Line
+	12250 3200 12700 3200
+Wire Wire Line
+	12250 3100 12700 3100
+Wire Wire Line
+	12250 3000 12700 3000
+Wire Wire Line
+	12250 2500 12700 2500
+Wire Wire Line
+	12250 2400 12700 2400
+Wire Wire Line
+	12250 2300 12700 2300
+Wire Wire Line
+	12250 2200 12700 2200
+Wire Wire Line
+	12250 2100 12700 2100
+Wire Wire Line
+	12250 2000 12700 2000
+Wire Wire Line
+	12250 1900 12700 1900
+Wire Wire Line
+	12250 1800 12700 1800
+Wire Wire Line
+	12250 1700 12700 1700
+Wire Wire Line
+	13900 2600 13500 2600
+Wire Wire Line
+	13900 2500 13500 2500
+Wire Wire Line
+	13900 2400 13500 2400
+Wire Wire Line
+	13900 2300 13500 2300
+Wire Wire Line
+	13900 2200 13500 2200
+Wire Wire Line
+	13900 2100 13500 2100
+Wire Wire Line
+	13900 2000 13500 2000
+Wire Wire Line
+	13900 1900 13500 1900
+Wire Wire Line
+	13900 1500 13500 1500
+Wire Wire Line
+	13500 1600 13900 1600
+Wire Wire Line
+	13500 1700 13900 1700
+Wire Wire Line
+	13900 1800 13500 1800
+Wire Wire Line
+	13500 2700 13900 2700
+Wire Wire Line
+	13500 2800 13900 2800
+Wire Wire Line
+	13900 2900 13500 2900
+Wire Wire Line
+	13900 3000 13500 3000
+Wire Wire Line
+	13900 3100 13500 3100
+Wire Wire Line
+	13900 3200 13500 3200
+Wire Wire Line
+	13900 3300 13500 3300
+Wire Wire Line
+	13900 3400 13500 3400
+Wire Wire Line
+	13900 3500 13500 3500
+Wire Wire Line
+	13900 3600 13500 3600
+Wire Wire Line
+	13900 3700 13500 3700
+Wire Wire Line
+	13900 3800 13500 3800
+Wire Wire Line
+	13900 3900 13500 3900
+Wire Wire Line
+	13900 4000 13500 4000
+Wire Wire Line
+	12100 2600 12700 2600
+Wire Wire Line
+	12100 2800 12700 2800
+Wire Wire Line
+	12600 1200 12850 1200
+Wire Wire Line
+	7400 3950 7850 3950
+Connection ~ 7500 3950
+Wire Wire Line
+	7500 2850 7850 2850
+Connection ~ 7500 2850
+Wire Wire Line
+	7400 2000 7000 2000
+Wire Wire Line
+	7400 2550 7000 2550
+Wire Wire Line
+	7400 3100 7000 3100
+Wire Wire Line
+	7400 3650 7000 3650
+Wire Wire Line
+	7500 1900 7500 3950
+Wire Wire Line
+	4050 3000 4250 3000
+Wire Wire Line
+	4450 3100 4350 3100
+Wire Wire Line
+	4350 3100 4250 3000
+Wire Wire Line
+	5600 2900 5250 2900
+Wire Wire Line
+	5600 3000 5250 3000
+Wire Wire Line
+	5600 3100 5250 3100
+Wire Wire Line
+	5600 3200 5250 3200
+Wire Wire Line
+	4200 1800 4050 1800
+Wire Wire Line
+	4200 2300 4050 2300
+Wire Wire Line
+	1500 1900 1550 1900
+Wire Wire Line
+	1550 1900 1550 2500
+Wire Wire Line
+	1550 2500 1500 2500
+Wire Wire Line
+	1500 2400 2000 2400
+Wire Wire Line
+	2000 2400 2000 3000
+Wire Wire Line
+	2000 3000 2450 3000
+Wire Wire Line
+	1500 2100 2200 2100
+Wire Wire Line
+	2200 2100 2200 2900
+Wire Wire Line
+	2200 2900 2450 2900
+Wire Wire Line
+	1500 2300 1900 2300
+Wire Wire Line
+	1900 2300 1900 3100
+Wire Wire Line
+	1900 3100 2450 3100
+Wire Wire Line
+	5000 8300 5150 8300
+Wire Wire Line
+	5450 8200 5350 8200
+Wire Wire Line
+	5000 8500 5300 8500
+Wire Wire Line
+	5300 8500 5300 8300
+Wire Wire Line
+	5300 8300 5450 8300
+Wire Wire Line
+	5350 8200 5150 8300
+Wire Wire Line
+	4200 3000 4200 3500
+Wire Wire Line
+	4200 3500 4250 3500
+Connection ~ 4200 3000
+Wire Wire Line
+	2800 7350 2450 7350
+Wire Wire Line
+	2800 8300 2800 7350
+Wire Wire Line
+	2450 7350 2450 7250
+Wire Wire Line
+	2450 8350 2450 8500
+Wire Wire Line
+	2450 8500 3400 8500
+Wire Wire Line
+	2900 7700 1500 7700
+Wire Wire Line
+	2350 9200 2350 9350
+Wire Wire Line
+	2350 9350 2700 9350
+Wire Wire Line
+	2700 9350 2700 7500
+Wire Wire Line
+	2700 7500 1500 7500
+Wire Wire Line
+	9200 8700 9200 8750
+Wire Wire Line
+	9200 8750 9000 8750
+Wire Wire Line
+	9600 8700 9600 8950
+Wire Wire Line
+	9600 8950 9000 8950
+Wire Wire Line
+	8200 8750 7600 8750
+Wire Wire Line
+	8200 8850 7600 8850
+Wire Wire Line
+	8200 8950 7600 8950
+Wire Wire Line
+	8200 9050 7600 9050
+Wire Wire Line
+	12550 8800 12100 8800
+Wire Wire Line
+	11300 8900 10850 8900
+Wire Wire Line
+	3650 10300 4100 10300
+Wire Wire Line
+	3650 9900 4100 9900
+Wire Wire Line
+	4700 10300 4800 10300
+Connection ~ 4800 10300
+Wire Wire Line
+	13050 5650 13050 5900
+Connection ~ 13050 5800
+Wire Wire Line
+	9700 5800 9700 5850
+Wire Wire Line
+	10650 5800 10650 5850
+Connection ~ 10650 5800
+Wire Wire Line
+	9200 5650 9300 5650
+Connection ~ 9300 5650
+Wire Wire Line
+	9400 6400 9200 6400
+Wire Wire Line
+	10750 7500 10750 7550
+Wire Wire Line
+	11250 7450 11250 7650
+Wire Wire Line
+	12300 7650 12200 7650
+Wire Wire Line
+	11250 8100 10800 8100
+Wire Wire Line
+	14300 8200 14300 7900
+Wire Wire Line
+	13200 7900 13200 8200
+Wire Wire Line
+	14300 7900 14700 7900
+Wire Wire Line
+	12900 5800 12900 6000
+Wire Wire Line
+	12250 4200 12700 4200
+Wire Wire Line
+	12250 4300 12700 4300
+Wire Wire Line
+	13900 4300 13500 4300
+Wire Wire Line
+	1750 1700 1800 1700
+Wire Wire Line
+	2200 1700 2450 1700
+Wire Wire Line
+	2450 1600 2450 1800
+Wire Wire Line
+	2300 1800 2300 1700
+Connection ~ 2300 1700
+Connection ~ 2450 1700
+Wire Wire Line
+	1750 4350 1800 4350
+Wire Wire Line
+	2300 4450 2300 4350
+Wire Wire Line
+	2200 4350 2450 4350
+Wire Wire Line
+	2450 4300 2450 4450
+Connection ~ 2300 4350
+Connection ~ 2450 4350
+Wire Wire Line
+	4750 3500 4800 3500
+Wire Wire Line
+	4850 6100 4800 6100
+Wire Wire Line
+	2400 5050 2450 5050
+Wire Wire Line
+	2400 2400 2450 2400
+Wire Wire Line
+	3400 6950 3400 7100
+Wire Wire Line
+	3100 7000 3400 7000
+Wire Wire Line
+	3200 7000 3200 7100
+Connection ~ 3400 7000
+Connection ~ 3200 7000
+Wire Wire Line
+	2650 7000 2700 7000
+Wire Wire Line
+	3350 7700 3400 7700
+Wire Wire Line
+	2250 8400 2250 8350
+Wire Wire Line
+	1550 8000 1500 8000
+Wire Wire Line
+	1550 5350 1500 5350
+Wire Wire Line
+	1550 2700 1500 2700
+Wire Wire Line
+	6900 1350 6900 1400
+Wire Wire Line
+	6900 1800 6900 1850
+Wire Wire Line
+	7500 1350 7500 1400
+Connection ~ 7500 2300
+Wire Wire Line
+	9250 2000 9200 2000
+Wire Wire Line
+	9250 2550 9200 2550
+Wire Wire Line
+	9250 3100 9200 3100
+Wire Wire Line
+	9250 3650 9200 3650
+Wire Wire Line
+	9200 5400 9500 5400
+Wire Wire Line
+	9400 6400 9400 5400
+Connection ~ 9400 5400
+Wire Wire Line
+	10600 5500 10500 5500
+Wire Wire Line
+	11100 5500 11200 5500
+Wire Wire Line
+	11200 5500 11200 5800
+Connection ~ 11200 5800
+Wire Wire Line
+	10650 6300 10650 6250
+Wire Wire Line
+	10250 6300 10250 6250
+Wire Wire Line
+	9700 6300 9700 6250
+Connection ~ 11250 7500
+Connection ~ 10700 7950
+Wire Wire Line
+	10700 8650 10700 8600
+Wire Wire Line
+	12100 6800 12100 6850
+Wire Wire Line
+	11900 1150 11900 1200
+Wire Wire Line
+	11900 1200 12000 1200
+Wire Wire Line
+	13300 1200 13250 1200
+Wire Wire Line
+	13550 4200 13500 4200
+Wire Wire Line
+	13550 4100 13500 4100
+Wire Wire Line
+	12650 4400 12700 4400
+Wire Wire Line
+	5800 8800 5750 8800
+Wire Wire Line
+	2350 3650 2350 3700
+Wire Wire Line
+	2350 6300 2350 6350
+Wire Wire Line
+	3300 9000 3300 8950
 $EndSCHEMATC
diff --git a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
index 95c85ff..751ac0d 100644
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
@@ -13,13 +13,13 @@ LIBS:special
 LIBS:microcontrollers
 LIBS:motorola
 LIBS:kit-dev-coldfire-xilinx_5213-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 1 3
 Title "Dev kit coldfire 5213"
-Date "8 feb 2008"
+Date "Sun 22 Mar 2015"
 Rev "0"
 Comp ""
 Comment1 ""
@@ -31,34 +31,66 @@ Connection ~ 7100 1400
 Wire Wire Line
 	6900 1200 7100 1200
 Wire Wire Line
-	7100 1200 7100 1450
+	7100 1200 7100 1400
 Wire Wire Line
-	6700 8950 6450 8950
-Connection ~ 6450 8500
+	7100 1400 7100 1450
+Connection ~ 2900 10000
 Wire Wire Line
-	5500 9850 9650 9850
+	3850 10000 4000 10000
 Wire Wire Line
-	2950 8150 1700 8150
+	4000 10000 4200 10000
 Wire Wire Line
-	1700 8150 1700 9050
+	4200 10000 4400 10000
 Wire Wire Line
-	2400 8450 2950 8450
+	4400 10000 4750 10000
 Wire Wire Line
-	13850 4400 13800 4400
-Connection ~ 2600 3000
+	4750 10000 5150 10000
 Wire Wire Line
-	1900 3000 2650 3000
+	5150 10000 5550 10000
+Wire Wire Line
+	5550 10000 5900 10000
+Wire Wire Line
+	5900 10000 6250 10000
+Wire Wire Line
+	6250 10000 6600 10000
+Wire Wire Line
+	6600 10000 7000 10000
+Wire Wire Line
+	7000 10000 7350 10000
+Wire Wire Line
+	7350 10000 7750 10000
+Wire Wire Line
+	2350 7800 1100 7800
+Wire Wire Line
+	1100 7800 1100 8100
+Wire Wire Line
+	1100 8100 1100 8500
+Wire Wire Line
+	1100 8500 1100 8700
+Wire Wire Line
+	1800 8100 1900 8100
+Wire Wire Line
+	1900 8100 2350 8100
+Wire Wire Line
+	13900 4450 13850 4450
+Connection ~ 2300 3000
+Wire Wire Line
+	1600 3000 1900 3000
+Wire Wire Line
+	1900 3000 2300 3000
+Wire Wire Line
+	2300 3000 2400 3000
 Wire Wire Line
 	13100 6750 12200 6750
 Wire Wire Line
 	12550 6200 13100 6200
 Wire Wire Line
 	12550 6100 13100 6100
-Connection ~ 7050 10350
+Connection ~ 5150 10500
 Wire Wire Line
-	3250 4300 3200 4300
+	1900 4300 2000 4300
 Wire Wire Line
-	5500 9850 5500 9800
+	3850 10000 3850 9950
 Wire Wire Line
 	15600 7950 15100 7950
 Wire Wire Line
@@ -116,10 +148,10 @@ Wire Wire Line
 Wire Wire Line
 	15100 8350 15700 8350
 Wire Wire Line
-	14750 1650 14700 1650
-Connection ~ 1700 8450
+	12500 1700 12600 1700
+Connection ~ 1100 8100
 Wire Wire Line
-	1700 8450 1900 8450
+	1100 8100 1300 8100
 Wire Wire Line
 	5450 2450 6150 2450
 Wire Wire Line
@@ -145,18 +177,20 @@ Wire Wire Line
 Wire Wire Line
 	10600 2550 10150 2550
 Wire Wire Line
-	2900 4500 2900 4600
+	2300 4500 2300 4600
+Wire Wire Line
+	2800 3000 2950 3000
 Wire Wire Line
-	3050 3000 3900 3000
+	2950 3000 3600 3000
 Wire Wire Line
-	1150 2950 1150 3000
+	850  2950 850  3000
 Wire Wire Line
-	1150 3000 1200 3000
-Connection ~ 6150 8500
+	850  3000 900  3000
+Connection ~ 2600 10000
 Wire Wire Line
-	6150 8550 6150 8500
+	2600 10050 2600 10000
 Wire Wire Line
-	6450 8500 6450 8550
+	2900 10000 2900 10050
 Wire Wire Line
 	5350 6950 5350 6900
 Wire Wire Line
@@ -166,29 +200,49 @@ Wire Wire Line
 Wire Wire Line
 	5450 6800 6150 6800
 Wire Wire Line
-	4650 8500 4600 8500
+	1100 10000 1050 10000
+Wire Wire Line
+	1050 10000 1050 9950
 Wire Wire Line
-	4600 8500 4600 8450
+	2450 10000 2600 10000
 Wire Wire Line
-	6000 8500 6900 8500
+	2600 10000 2900 10000
+Wire Wire Line
+	2900 10000 3200 10000
 Wire Wire Line
 	6150 6950 5700 6950
 Wire Wire Line
 	5700 6700 6150 6700
-Connection ~ 12800 1650
+Connection ~ 14450 1700
+Wire Wire Line
+	14350 1700 14450 1700
 Wire Wire Line
-	12700 1650 12900 1650
+	14450 1700 14600 1700
 Wire Wire Line
-	12800 1100 12800 1050
-Connection ~ 13950 1650
+	14450 1150 14450 1100
+Connection ~ 13300 1700
 Wire Wire Line
-	13950 1800 13950 1650
+	13300 1850 13300 1700
 Wire Wire Line
-	13800 1650 14200 1650
+	13100 1700 13300 1700
+Wire Wire Line
+	13300 1700 13450 1700
 Wire Wire Line
 	6150 3050 5750 3050
 Wire Bus Line
-	5550 5950 5550 6650
+	5550 5950 5550 6050
+Wire Bus Line
+	5550 6050 5550 6150
+Wire Bus Line
+	5550 6150 5550 6250
+Wire Bus Line
+	5550 6250 5550 6350
+Wire Bus Line
+	5550 6350 5550 6450
+Wire Bus Line
+	5550 6450 5550 6550
+Wire Bus Line
+	5550 6550 5550 6650
 Connection ~ 6750 1400
 Wire Wire Line
 	6750 1450 6750 1400
@@ -203,114 +257,160 @@ Wire Wire Line
 Wire Bus Line
 	5400 5900 4600 5900
 Wire Bus Line
-	5400 5150 5400 5900
+	5400 5150 5400 5250
+Wire Bus Line
+	5400 5250 5400 5350
+Wire Bus Line
+	5400 5350 5400 5450
+Wire Bus Line
+	5400 5450 5400 5550
+Wire Bus Line
+	5400 5550 5400 5650
+Wire Bus Line
+	5400 5650 5400 5750
+Wire Bus Line
+	5400 5750 5400 5900
 Connection ~ 4150 5150
 Wire Wire Line
 	4150 5150 4200 5150
 Connection ~ 4750 5450
 Wire Wire Line
-	4800 5450 4750 5450
+	4750 5450 4800 5450
 Connection ~ 4750 5050
 Wire Wire Line
 	4750 5050 4800 5050
 Wire Wire Line
-	5300 5650 6150 5650
+	5300 5650 5400 5650
+Wire Wire Line
+	5400 5650 6150 5650
+Wire Wire Line
+	5300 5450 5400 5450
 Wire Wire Line
-	5300 5450 6150 5450
+	5400 5450 6150 5450
 Wire Wire Line
-	5300 5250 6150 5250
+	5300 5250 5400 5250
+Wire Wire Line
+	5400 5250 6150 5250
 Wire Wire Line
 	5300 5050 6150 5050
 Wire Wire Line
-	13550 4650 13550 4750
+	13600 4700 13600 4800
+Wire Wire Line
+	14550 4450 14550 4600
+Wire Wire Line
+	14550 4600 14550 4750
+Wire Wire Line
+	12800 4400 12100 4400
+Wire Wire Line
+	15150 4000 13600 4000
 Wire Wire Line
-	14500 4400 14500 4700
+	15150 4200 13600 4200
 Wire Wire Line
-	12750 4350 12150 4350
+	12800 4100 12100 4100
 Wire Wire Line
-	15100 3950 13550 3950
+	12450 4700 12700 4700
 Wire Wire Line
-	15100 4150 13550 4150
+	12700 4700 12800 4700
+Connection ~ 14100 4600
 Wire Wire Line
-	12750 4050 12150 4050
+	14100 4600 14100 4700
+Connection ~ 14350 3800
 Wire Wire Line
-	12500 4650 12750 4650
-Connection ~ 14050 4550
+	14350 3250 14350 3800
 Wire Wire Line
-	14050 4550 14050 4650
-Connection ~ 14300 3750
+	13600 3600 14100 3600
 Wire Wire Line
-	14300 3200 14300 3750
+	14100 3600 15150 3600
+Connection ~ 13850 3500
 Wire Wire Line
-	13550 3550 15100 3550
-Connection ~ 13800 3450
+	13850 3250 13850 3500
+Connection ~ 14350 2700
 Wire Wire Line
-	13800 3200 13800 3450
-Connection ~ 14300 2650
+	14350 2700 14350 2750
+Connection ~ 13850 2700
 Wire Wire Line
-	14300 2650 14300 2700
-Connection ~ 13800 2650
+	13850 2650 13850 2700
 Wire Wire Line
-	13800 2600 13800 2700
+	13850 2700 13850 2750
 Wire Wire Line
-	13800 2650 14550 2650
+	13850 2700 14100 2700
 Wire Wire Line
-	13550 4550 15050 4550
+	14100 2700 14350 2700
 Wire Wire Line
-	13550 3750 15100 3750
+	14350 2700 14600 2700
+Wire Wire Line
+	13600 4600 14100 4600
+Wire Wire Line
+	14100 4600 14550 4600
+Wire Wire Line
+	14550 4600 15100 4600
+Wire Wire Line
+	13600 3800 14350 3800
+Wire Wire Line
+	14350 3800 15150 3800
 Wire Wire Line
 	5700 3850 6150 3850
 Wire Wire Line
 	5700 3550 6150 3550
 Wire Wire Line
 	6150 3750 5650 3750
-Connection ~ 4450 1650
+Connection ~ 2850 1650
+Wire Wire Line
+	2750 1650 2850 1650
+Wire Wire Line
+	2850 1650 3600 1650
+Wire Wire Line
+	2850 1600 2850 1650
+Connection ~ 5150 10000
+Wire Wire Line
+	5150 10000 5150 10050
+Wire Wire Line
+	5000 3350 5050 3350
 Wire Wire Line
-	4350 1650 5200 1650
+	5050 3350 6150 3350
+Connection ~ 12600 4000
 Wire Wire Line
-	4450 1600 4450 1650
-Connection ~ 7050 9850
+	12600 4000 12800 4000
 Wire Wire Line
-	7050 9850 7050 9900
+	12600 3600 12600 3700
 Wire Wire Line
-	5000 3350 6150 3350
-Connection ~ 12650 3950
+	12600 3700 12600 4000
 Wire Wire Line
-	12650 3950 12750 3950
+	12600 4000 12600 4600
 Wire Wire Line
-	12650 3550 12650 4750
+	12600 4600 12600 4800
 Wire Wire Line
-	12650 3550 12750 3550
-Connection ~ 6650 9850
+	12600 3600 12800 3600
+Connection ~ 4750 10000
 Wire Wire Line
-	6650 9850 6650 9900
-Connection ~ 9250 9850
+	4750 10000 4750 10050
+Connection ~ 7350 10000
 Wire Wire Line
-	9250 9900 9250 9850
-Connection ~ 8500 9850
+	7350 10050 7350 10000
+Connection ~ 6600 10000
 Wire Wire Line
-	8500 9850 8500 9900
-Connection ~ 7800 9850
+	6600 10000 6600 10050
+Connection ~ 5900 10000
 Wire Wire Line
-	7800 9850 7800 9900
-Connection ~ 6300 9850
+	5900 10000 5900 10050
+Connection ~ 4400 10000
+Connection ~ 5550 10500
 Wire Wire Line
-	6300 9800 6300 9900
-Connection ~ 7450 10350
+	5550 10500 5550 10450
+Connection ~ 6250 10500
 Wire Wire Line
-	7450 10350 7450 10300
-Connection ~ 8150 10350
+	6250 10500 6250 10450
+Connection ~ 7000 10500
 Wire Wire Line
-	8150 10350 8150 10300
-Connection ~ 8900 10350
+	7000 10500 7000 10450
+Connection ~ 7750 10500
 Wire Wire Line
-	8900 10350 8900 10300
-Connection ~ 9650 10350
+	7750 10500 7750 10450
 Wire Wire Line
-	9650 10300 9650 10400
+	7850 10500 7850 10550
 Connection ~ 8350 7500
 Wire Wire Line
-	8350 7450 8350 7500
+	8350 7500 8350 7450
 Connection ~ 8250 7500
 Wire Wire Line
 	8250 7500 8250 7450
@@ -324,7 +424,25 @@ Connection ~ 7950 7500
 Wire Wire Line
 	7950 7500 7950 7450
 Wire Wire Line
-	7900 7500 8400 7500
+	7900 7500 7950 7500
+Wire Wire Line
+	7950 7500 8000 7500
+Wire Wire Line
+	8000 7500 8050 7500
+Wire Wire Line
+	8050 7500 8100 7500
+Wire Wire Line
+	8100 7500 8150 7500
+Wire Wire Line
+	8150 7500 8200 7500
+Wire Wire Line
+	8200 7500 8250 7500
+Wire Wire Line
+	8250 7500 8300 7500
+Wire Wire Line
+	8300 7500 8350 7500
+Wire Wire Line
+	8350 7500 8400 7500
 Wire Wire Line
 	7900 7500 7900 7450
 Connection ~ 8000 1700
@@ -357,7 +475,9 @@ Wire Wire Line
 	7950 1750 7950 1700
 Connection ~ 7950 1700
 Wire Wire Line
-	8400 7450 8400 7550
+	8400 7450 8400 7500
+Wire Wire Line
+	8400 7500 8400 7550
 Connection ~ 8400 7500
 Wire Wire Line
 	8000 7500 8000 7450
@@ -372,74 +492,80 @@ Wire Wire Line
 	8300 7500 8300 7450
 Connection ~ 8300 7500
 Wire Wire Line
-	6650 10300 6650 10350
+	4750 10450 4750 10500
 Wire Wire Line
-	9250 10350 9250 10300
-Connection ~ 9250 10350
+	7350 10500 7350 10450
+Connection ~ 7350 10500
 Wire Wire Line
-	8500 10350 8500 10300
-Connection ~ 8500 10350
+	6600 10500 6600 10450
+Connection ~ 6600 10500
 Wire Wire Line
-	7800 10350 7800 10300
-Connection ~ 7800 10350
+	5900 10500 5900 10450
+Connection ~ 5900 10500
 Wire Wire Line
-	9650 9850 9650 9900
+	7750 10000 7750 10050
 Wire Wire Line
-	7450 9850 7450 9900
-Connection ~ 7450 9850
+	5550 10000 5550 10050
+Connection ~ 5550 10000
 Wire Wire Line
-	8150 9850 8150 9900
-Connection ~ 8150 9850
+	6250 10000 6250 10050
+Connection ~ 6250 10000
 Wire Wire Line
-	8900 9850 8900 9900
-Connection ~ 8900 9850
+	7000 10000 7000 10050
+Connection ~ 7000 10000
 Wire Wire Line
-	6300 10300 6300 10350
-Connection ~ 6650 10350
+	4400 10450 4400 10500
+Connection ~ 4750 10500
 Wire Wire Line
-	5650 9800 5650 9850
+	4000 9950 4000 10000
 Wire Wire Line
-	12750 3650 12650 3650
-Connection ~ 12650 3650
+	12800 3700 12600 3700
+Connection ~ 12600 3700
 Wire Wire Line
-	12650 4550 12750 4550
-Connection ~ 12650 4550
+	12600 4600 12800 4600
+Connection ~ 12600 4600
 Wire Wire Line
 	5050 3300 5050 3350
 Connection ~ 5050 3350
 Wire Wire Line
-	7050 10350 7050 10300
+	5150 10500 5150 10450
 Wire Wire Line
 	5550 2850 6150 2850
 Wire Wire Line
 	5550 2950 6150 2950
 Wire Wire Line
-	4650 1600 4650 2000
-Connection ~ 4650 2000
+	3050 1600 3050 2000
+Connection ~ 3050 2000
 Wire Wire Line
-	4350 2000 5200 2000
+	2750 2000 3050 2000
+Wire Wire Line
+	3050 2000 3600 2000
 Wire Wire Line
 	5150 3750 4750 3750
 Wire Wire Line
 	5700 3650 6150 3650
 Wire Wire Line
-	14550 2650 14550 2700
+	14600 2700 14600 2750
+Wire Wire Line
+	14100 2700 14100 2750
+Connection ~ 14100 2700
 Wire Wire Line
-	14050 2650 14050 2700
-Connection ~ 14050 2650
+	13600 3500 13850 3500
 Wire Wire Line
-	13550 3450 15100 3450
+	13850 3500 15150 3500
 Wire Wire Line
 	5700 3450 6150 3450
 Wire Wire Line
-	14050 3200 14050 3550
-Connection ~ 14050 3550
+	14100 3250 14100 3600
+Connection ~ 14100 3600
+Wire Wire Line
+	13600 3900 14600 3900
 Wire Wire Line
-	13550 3850 15100 3850
+	14600 3900 15150 3900
 Wire Wire Line
-	14550 3200 14550 3850
-Connection ~ 14550 3850
-Connection ~ 14500 4550
+	14600 3250 14600 3900
+Connection ~ 14600 3900
+Connection ~ 14550 4600
 Wire Wire Line
 	6150 4100 5600 4100
 Wire Wire Line
@@ -457,41 +583,57 @@ Wire Wire Line
 Wire Wire Line
 	6150 4800 5600 4800
 Wire Wire Line
-	12750 3850 12700 3850
+	12800 3900 12700 3900
+Wire Wire Line
+	12700 3900 12700 4700
+Connection ~ 12700 4700
+Wire Wire Line
+	12800 4200 12100 4200
 Wire Wire Line
-	12700 3850 12700 4650
-Connection ~ 12700 4650
+	15150 4100 13600 4100
 Wire Wire Line
-	12750 4150 12150 4150
+	15150 4300 13600 4300
 Wire Wire Line
-	15100 4050 13550 4050
+	12800 4300 12100 4300
 Wire Wire Line
-	15100 4250 13550 4250
+	12100 3800 12800 3800
 Wire Wire Line
-	12750 4250 12150 4250
+	13600 3700 13850 3700
 Wire Wire Line
-	12150 3750 12750 3750
+	13850 3700 13850 4450
 Wire Wire Line
-	13550 3650 13800 3650
+	4700 5150 5400 5150
 Wire Wire Line
-	13800 3650 13800 4400
+	5400 5150 6150 5150
 Wire Wire Line
-	4700 5150 6150 5150
+	4700 5350 5400 5350
 Wire Wire Line
-	4700 5350 6150 5350
+	5400 5350 6150 5350
 Wire Wire Line
-	4700 5550 6150 5550
+	4700 5550 5400 5550
+Wire Wire Line
+	5400 5550 6150 5550
 Wire Wire Line
 	4750 5650 4800 5650
 Wire Wire Line
-	4750 5000 4750 5650
+	4750 5000 4750 5050
+Wire Wire Line
+	4750 5050 4750 5250
+Wire Wire Line
+	4750 5250 4750 5450
+Wire Wire Line
+	4750 5450 4750 5650
 Wire Wire Line
 	4750 5250 4800 5250
 Connection ~ 4750 5250
 Wire Wire Line
 	4150 5550 4200 5550
 Wire Wire Line
-	4150 5000 4150 5550
+	4150 5000 4150 5150
+Wire Wire Line
+	4150 5150 4150 5350
+Wire Wire Line
+	4150 5350 4150 5550
 Wire Wire Line
 	4150 5350 4200 5350
 Connection ~ 4150 5350
@@ -512,7 +654,9 @@ Wire Wire Line
 Wire Wire Line
 	10600 3300 10150 3300
 Wire Wire Line
-	6150 1400 7100 1400
+	6150 1400 6750 1400
+Wire Wire Line
+	6750 1400 7100 1400
 Wire Wire Line
 	6150 1400 6150 2100
 Wire Wire Line
@@ -538,27 +682,27 @@ Wire Wire Line
 Wire Wire Line
 	6150 4000 5500 4000
 Wire Wire Line
-	14200 1650 14200 1750
+	13100 1700 13100 1800
 Wire Wire Line
-	12800 1600 12800 1650
+	14450 1650 14450 1700
 Wire Wire Line
-	15450 1650 15350 1650
+	11800 1700 11900 1700
 Wire Wire Line
-	11850 1650 12300 1650
+	15400 1700 15000 1700
 Wire Wire Line
 	6150 7050 6100 7050
 Wire Wire Line
 	6100 7050 6100 7100
 Wire Wire Line
-	5250 8500 5400 8500
+	1700 10000 1850 10000
 Wire Wire Line
-	5400 8950 5350 8950
+	1850 10500 1800 10500
 Wire Wire Line
-	5350 8950 5350 9000
+	1800 10500 1800 10550
 Wire Wire Line
-	6000 8950 6150 8950
+	2600 10450 2600 10500
 Wire Wire Line
-	6150 8950 6150 9000
+	2600 10500 2600 10600
 Wire Wire Line
 	10150 5700 11050 5700
 Wire Wire Line
@@ -574,18 +718,16 @@ Wire Wire Line
 Wire Wire Line
 	10150 6300 11050 6300
 Wire Wire Line
-	2200 3000 2200 3100
-Wire Wire Line
-	3250 2900 3250 3000
-Connection ~ 3250 3000
+	1900 3000 1900 3100
 Wire Wire Line
-	3750 4300 4350 4300
+	2950 2900 2950 3000
+Connection ~ 2950 3000
 Wire Wire Line
-	2400 4600 2350 4600
+	1400 4300 800  4300
 Wire Wire Line
-	1950 4600 1900 4600
+	2300 5100 2300 5200
 Wire Wire Line
-	1900 4600 1900 4650
+	2300 5600 2300 5700
 Wire Wire Line
 	10600 4100 10150 4100
 Wire Wire Line
@@ -605,12 +747,12 @@ Wire Wire Line
 Wire Wire Line
 	6150 3150 6100 3150
 Wire Wire Line
-	1700 8850 1800 8850
-Connection ~ 1700 8850
+	1100 8500 1200 8500
+Connection ~ 1100 8500
 Wire Wire Line
-	2400 8850 2500 8850
-Connection ~ 2500 8850
-Connection ~ 2500 8450
+	1800 8500 1900 8500
+Connection ~ 1900 8500
+Connection ~ 1900 8100
 Wire Bus Line
 	12300 7850 13100 7850
 Wire Bus Line
@@ -619,9 +761,7 @@ Wire Bus Line
 	12300 7650 13100 7650
 Wire Bus Line
 	12300 7750 13100 7750
-Connection ~ 5650 9850
-Wire Wire Line
-	6700 8950 6700 9000
+Connection ~ 4000 10000
 Wire Wire Line
 	12550 5750 13100 5750
 Wire Wire Line
@@ -637,30 +777,78 @@ Wire Wire Line
 Wire Wire Line
 	13100 6650 12200 6650
 Wire Wire Line
-	8400 1650 8400 1750
+	8400 1650 8400 1700
+Wire Wire Line
+	8400 1700 8400 1750
 Connection ~ 8400 1700
 Wire Wire Line
-	2600 3050 2600 3000
-Connection ~ 2200 3000
+	2300 3100 2300 3000
+Connection ~ 1900 3000
+Wire Wire Line
+	14550 4450 14500 4450
+Wire Wire Line
+	4400 10500 4750 10500
+Wire Wire Line
+	4750 10500 5150 10500
+Wire Wire Line
+	5150 10500 5550 10500
+Wire Wire Line
+	5550 10500 5900 10500
 Wire Wire Line
-	14500 4400 14450 4400
+	5900 10500 6250 10500
 Wire Wire Line
-	6300 10350 10000 10350
+	6250 10500 6600 10500
 Wire Wire Line
-	2500 8450 2500 9000
+	6600 10500 7000 10500
+Wire Wire Line
+	7000 10500 7350 10500
+Wire Wire Line
+	7350 10500 7750 10500
+Wire Wire Line
+	7750 10500 7850 10500
+Wire Wire Line
+	7850 10500 8000 10500
+Wire Wire Line
+	8000 10500 8100 10500
+Wire Wire Line
+	1900 8100 1900 8500
+Wire Wire Line
+	1900 8500 1900 8650
 Wire Wire Line
 	12200 6850 13100 6850
 Wire Wire Line
-	6450 8950 6450 9000
+	2900 10450 2900 10500
+Wire Wire Line
+	2900 10500 2900 10600
 Wire Wire Line
 	8500 1700 8500 1750
 Wire Wire Line
-	7900 1700 8500 1700
+	7900 1700 7950 1700
+Wire Wire Line
+	7950 1700 8000 1700
+Wire Wire Line
+	8000 1700 8050 1700
+Wire Wire Line
+	8050 1700 8100 1700
+Wire Wire Line
+	8100 1700 8150 1700
+Wire Wire Line
+	8150 1700 8200 1700
+Wire Wire Line
+	8200 1700 8250 1700
+Wire Wire Line
+	8250 1700 8300 1700
+Wire Wire Line
+	8300 1700 8350 1700
+Wire Wire Line
+	8350 1700 8400 1700
+Wire Wire Line
+	8400 1700 8500 1700
 $Comp
 L MCF5213-LQFP100 U1
 U 1 1 46161C39
 P 8150 4600
-F 0 "U1" H 9100 7300 60  0000 L CNN
+F 0 "U1" H 8150 7600 60  0000 C CNN
 F 1 "MCF5213-LQFP100" H 8750 1950 60  0000 L CNN
 F 2 "lib_smd:VQFP100" H 8150 4600 60  0001 C CNN
 F 3 "" H 8150 4600 60  0001 C CNN
@@ -670,28 +858,28 @@ $EndComp
 $Comp
 L GNDA #PWR01
 U 1 1 462382A4
-P 6450 9000
-F 0 "#PWR01" H 6450 9000 40  0001 C CNN
-F 1 "GNDA" H 6450 8930 40  0000 C CNN
-F 2 "" H 6450 9000 60  0001 C CNN
-F 3 "" H 6450 9000 60  0001 C CNN
-	1    6450 9000
+P 2900 10600
+F 0 "#PWR01" H 2900 10600 40  0001 C CNN
+F 1 "GNDA" H 2900 10530 40  0000 C CNN
+F 2 "" H 2900 10600 60  0001 C CNN
+F 3 "" H 2900 10600 60  0001 C CNN
+	1    2900 10600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C18
 U 1 1 46238286
-P 6450 8750
-F 0 "C18" H 6500 8850 50  0000 L CNN
-F 1 "100nF" H 6500 8650 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 6450 8750 60  0001 C CNN
-F 3 "" H 6450 8750 60  0001 C CNN
-	1    6450 8750
+P 2900 10250
+F 0 "C18" H 2950 10350 50  0000 L CNN
+F 1 "100nF" H 2950 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 2900 10250 60  0001 C CNN
+F 3 "" H 2900 10250 60  0001 C CNN
+	1    2900 10250
 	1    0    0    -1  
 $EndComp
 Text Label 12450 6850 0    60   ~ 0
 XTAL
-Text Label 2650 8450 0    60   ~ 0
+Text Label 2050 8100 0    60   ~ 0
 XTAL
 $Comp
 L GNDA #PWR02
@@ -707,12 +895,12 @@ $EndComp
 $Comp
 L CONN_1 GND1
 U 1 1 465FE6C5
-P 10150 10350
-F 0 "GND1" H 10230 10350 40  0000 L CNN
-F 1 "CONN_1" H 10150 10405 30  0001 C CNN
-F 2 "connect:PINTST" H 10150 10350 60  0001 C CNN
-F 3 "" H 10150 10350 60  0001 C CNN
-	1    10150 10350
+P 8250 10500
+F 0 "GND1" H 8330 10500 40  0000 L CNN
+F 1 "CONN_1" H 8250 10555 30  0001 C CNN
+F 2 "connect:PINTST" H 8250 10500 60  0001 C CNN
+F 3 "" H 8250 10500 60  0001 C CNN
+	1    8250 10500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -729,67 +917,67 @@ $EndComp
 $Comp
 L +3.3V #PWR04
 U 1 1 46554FD2
-P 13400 1450
-F 0 "#PWR04" H 13400 1410 30  0001 C CNN
-F 1 "+3.3V" H 13400 1560 30  0000 C CNN
-F 2 "" H 13400 1450 60  0001 C CNN
-F 3 "" H 13400 1450 60  0001 C CNN
-	1    13400 1450
-	1    0    0    -1  
+P 13850 1450
+F 0 "#PWR04" H 13850 1410 30  0001 C CNN
+F 1 "+3.3V" H 13850 1560 40  0000 C CNN
+F 2 "" H 13850 1450 60  0001 C CNN
+F 3 "" H 13850 1450 60  0001 C CNN
+	1    13850 1450
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR05
 U 1 1 46554FCD
-P 13400 1850
-F 0 "#PWR05" H 13400 1850 30  0001 C CNN
-F 1 "GND" H 13400 1780 30  0001 C CNN
-F 2 "" H 13400 1850 60  0001 C CNN
-F 3 "" H 13400 1850 60  0001 C CNN
-	1    13400 1850
-	1    0    0    -1  
+P 13850 1950
+F 0 "#PWR05" H 13850 1950 30  0001 C CNN
+F 1 "GND" H 13850 1880 30  0001 C CNN
+F 2 "" H 13850 1950 60  0001 C CNN
+F 3 "" H 13850 1950 60  0001 C CNN
+	1    13850 1950
+	-1   0    0    -1  
 $EndComp
 $Comp
 L 74AHC1G14 U2
 U 1 1 46554FB5
-P 13350 1650
-F 0 "U2" H 13545 1765 60  0000 C CNN
-F 1 "74AHC1G14" H 13650 1500 60  0000 C CNN
-F 2 "lib_smd:SOT353" H 13350 1650 60  0001 C CNN
-F 3 "" H 13350 1650 60  0001 C CNN
-	1    13350 1650
-	-1   0    0    -1  
+P 13900 1700
+F 0 "U2" H 13950 1850 50  0000 C CNN
+F 1 "74AHC1G14" H 13900 1350 50  0000 C CNN
+F 2 "lib_smd:SOT353" H 13900 1700 60  0001 C CNN
+F 3 "" H 13900 1700 60  0001 C CNN
+	1    13900 1700
+	1    0    0    -1  
 $EndComp
 $Comp
 L JUMPER CT1
 U 1 1 46545507
-P 14150 4400
-F 0 "CT1" H 14550 4450 60  0000 C CNN
-F 1 "JUMPER" H 14150 4320 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 14150 4400 60  0001 C CNN
-F 3 "" H 14150 4400 60  0001 C CNN
-	1    14150 4400
+P 14200 4450
+F 0 "CT1" H 14600 4500 60  0000 C CNN
+F 1 "JUMPER" H 14200 4370 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 14200 4450 60  0001 C CNN
+F 3 "" H 14200 4450 60  0001 C CNN
+	1    14200 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR06
 U 1 1 465451F6
-P 2600 3650
-F 0 "#PWR06" H 2600 3650 30  0001 C CNN
-F 1 "GND" H 2600 3580 30  0001 C CNN
-F 2 "" H 2600 3650 60  0001 C CNN
-F 3 "" H 2600 3650 60  0001 C CNN
-	1    2600 3650
+P 2300 3750
+F 0 "#PWR06" H 2300 3750 30  0001 C CNN
+F 1 "GND" H 2300 3680 30  0001 C CNN
+F 2 "" H 2300 3750 60  0001 C CNN
+F 3 "" H 2300 3750 60  0001 C CNN
+	1    2300 3750
 	1    0    0    -1  
 $EndComp
 $Comp
 L SW_PUSH RST_SW1
 U 1 1 465451D4
-P 2600 3350
-F 0 "RST_SW1" H 2750 3460 50  0000 C CNN
-F 1 "SW_PUSH" H 2600 3270 50  0000 C CNN
-F 2 "discret:SW_PUSH_SMALL" H 2600 3350 60  0001 C CNN
-F 3 "" H 2600 3350 60  0001 C CNN
-	1    2600 3350
+P 2300 3400
+F 0 "RST_SW1" V 2250 3750 50  0000 C CNN
+F 1 "SW_PUSH" V 2350 3750 50  0000 C CNN
+F 2 "discret:SW_PUSH_SMALL" H 2300 3400 60  0001 C CNN
+F 3 "" H 2300 3400 60  0001 C CNN
+	1    2300 3400
 	0    1    1    0   
 $EndComp
 Text Label 12350 6750 0    60   ~ 0
@@ -815,23 +1003,23 @@ IRQ-1
 $Comp
 L VCC #PWR07
 U 1 1 4652AF7E
-P 5500 9800
-F 0 "#PWR07" H 5500 9900 30  0001 C CNN
-F 1 "VCC" H 5500 9900 30  0000 C CNN
-F 2 "" H 5500 9800 60  0001 C CNN
-F 3 "" H 5500 9800 60  0001 C CNN
-	1    5500 9800
+P 3850 9950
+F 0 "#PWR07" H 3850 10050 30  0001 C CNN
+F 1 "VCC" H 3850 10050 40  0000 C CNN
+F 2 "" H 3850 9950 60  0001 C CNN
+F 3 "" H 3850 9950 60  0001 C CNN
+	1    3850 9950
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG08
 U 1 1 4652AF2F
-P 6700 9000
-F 0 "#FLG08" H 6700 9270 30  0001 C CNN
-F 1 "PWR_FLAG" H 6700 9230 30  0000 C CNN
-F 2 "" H 6700 9000 60  0001 C CNN
-F 3 "" H 6700 9000 60  0001 C CNN
-	1    6700 9000
+P 3150 10550
+F 0 "#FLG08" H 3150 10820 30  0001 C CNN
+F 1 "PWR_FLAG" H 3150 10780 30  0000 C CNN
+F 2 "" H 3150 10550 60  0001 C CNN
+F 3 "" H 3150 10550 60  0001 C CNN
+	1    3150 10550
 	-1   0    0    1   
 $EndComp
 Text Label 15200 7850 0    60   ~ 0
@@ -841,12 +1029,12 @@ VRH
 $Comp
 L PWR_FLAG #FLG09
 U 1 1 4652AE72
-P 9250 10350
-F 0 "#FLG09" H 9250 10620 30  0001 C CNN
-F 1 "PWR_FLAG" H 9250 10580 30  0000 C CNN
-F 2 "" H 9250 10350 60  0001 C CNN
-F 3 "" H 9250 10350 60  0001 C CNN
-	1    9250 10350
+P 8000 10550
+F 0 "#FLG09" H 8000 10820 30  0001 C CNN
+F 1 "PWR_FLAG" H 8000 10780 30  0000 C CNN
+F 2 "" H 8000 10550 60  0001 C CNN
+F 3 "" H 8000 10550 60  0001 C CNN
+	1    8000 10550
 	-1   0    0    1   
 $EndComp
 Text Label 12700 8150 0    60   ~ 0
@@ -964,72 +1152,72 @@ F10 "IRQ-1" I L 13100 5750 60
 F11 "QSPI_SCLK" I L 13100 6750 60 
 F12 "GLCK2" I L 13100 6850 60 
 $EndSheet
-Text Label 1750 8150 0    60   ~ 0
+Text Label 1150 7800 0    60   ~ 0
 CLKIN/EXTAL
 $Comp
 L GND #PWR010
 U 1 1 46238A4E
-P 1700 9450
-F 0 "#PWR010" H 1700 9450 30  0001 C CNN
-F 1 "GND" H 1700 9380 30  0001 C CNN
-F 2 "" H 1700 9450 60  0001 C CNN
-F 3 "" H 1700 9450 60  0001 C CNN
-	1    1700 9450
+P 1100 9100
+F 0 "#PWR010" H 1100 9100 30  0001 C CNN
+F 1 "GND" H 1100 9030 30  0001 C CNN
+F 2 "" H 1100 9100 60  0001 C CNN
+F 3 "" H 1100 9100 60  0001 C CNN
+	1    1100 9100
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR011
 U 1 1 46238A48
-P 2500 9400
-F 0 "#PWR011" H 2500 9400 30  0001 C CNN
-F 1 "GND" H 2500 9330 30  0001 C CNN
-F 2 "" H 2500 9400 60  0001 C CNN
-F 3 "" H 2500 9400 60  0001 C CNN
-	1    2500 9400
+P 1900 9050
+F 0 "#PWR011" H 1900 9050 30  0001 C CNN
+F 1 "GND" H 1900 8980 30  0001 C CNN
+F 2 "" H 1900 9050 60  0001 C CNN
+F 3 "" H 1900 9050 60  0001 C CNN
+	1    1900 9050
 	1    0    0    -1  
 $EndComp
 $Comp
 L CRYSTAL Y1
 U 1 1 462389C7
-P 2100 8850
-F 0 "Y1" H 2100 9000 60  0000 C CNN
-F 1 "8MHz" H 2100 8700 60  0000 C CNN
-F 2 "discret:HC-18UH" H 2100 8850 60  0001 C CNN
-F 3 "" H 2100 8850 60  0001 C CNN
-	1    2100 8850
+P 1500 8500
+F 0 "Y1" H 1500 8650 60  0000 C CNN
+F 1 "8MHz" H 1500 8350 60  0000 C CNN
+F 2 "discret:HC-18UH" H 1500 8500 60  0001 C CNN
+F 3 "" H 1500 8500 60  0001 C CNN
+	1    1500 8500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C2
 U 1 1 462389C0
-P 2500 9200
-F 0 "C2" H 2550 9300 50  0000 L CNN
-F 1 "10pF" H 2550 9100 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2500 9200 60  0001 C CNN
-F 3 "" H 2500 9200 60  0001 C CNN
-	1    2500 9200
+P 1900 8850
+F 0 "C2" H 1950 8950 50  0000 L CNN
+F 1 "10pF" H 1950 8750 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 1900 8850 60  0001 C CNN
+F 3 "" H 1900 8850 60  0001 C CNN
+	1    1900 8850
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1
 U 1 1 462389BC
-P 1700 9250
-F 0 "C1" H 1750 9350 50  0000 L CNN
-F 1 "10pF" H 1750 9150 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 1700 9250 60  0001 C CNN
-F 3 "" H 1700 9250 60  0001 C CNN
-	1    1700 9250
+P 1100 8900
+F 0 "C1" H 1150 9000 50  0000 L CNN
+F 1 "10pF" H 1150 8800 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 1100 8900 60  0001 C CNN
+F 3 "" H 1100 8900 60  0001 C CNN
+	1    1100 8900
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 462389B6
-P 2150 8450
-F 0 "R1" V 2230 8450 50  0000 C CNN
-F 1 "1M" V 2150 8450 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 2150 8450 60  0001 C CNN
-F 3 "" H 2150 8450 60  0001 C CNN
-	1    2150 8450
+P 1550 8100
+F 0 "R1" V 1630 8100 50  0000 C CNN
+F 1 "1M" V 1550 8100 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 1550 8100 60  0001 C CNN
+F 3 "" H 1550 8100 60  0001 C CNN
+	1    1550 8100
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1088,59 +1276,59 @@ GPT0
 $Comp
 L GND #PWR012
 U 1 1 462385BA
-P 1900 4650
-F 0 "#PWR012" H 1900 4650 30  0001 C CNN
-F 1 "GND" H 1900 4580 30  0001 C CNN
-F 2 "" H 1900 4650 60  0001 C CNN
-F 3 "" H 1900 4650 60  0001 C CNN
-	1    1900 4650
+P 2300 5700
+F 0 "#PWR012" H 2300 5700 30  0001 C CNN
+F 1 "GND" H 2300 5630 30  0001 C CNN
+F 2 "" H 2300 5700 60  0001 C CNN
+F 3 "" H 2300 5700 60  0001 C CNN
+	1    2300 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED RED1
 U 1 1 46238597
-P 2150 4600
-F 0 "RED1" H 2150 4700 50  0000 C CNN
-F 1 "LED_RESET1" H 2150 4500 50  0000 C CNN
-F 2 "lib_smd:SM1206POL" H 2150 4600 60  0001 C CNN
-F 3 "" H 2150 4600 60  0001 C CNN
-	1    2150 4600
-	-1   0    0    1   
+P 2300 5400
+F 0 "RED1" V 2250 5700 50  0000 C CNN
+F 1 "LED_RESET1" V 2350 5700 50  0000 C CNN
+F 2 "lib_smd:SM1206POL" H 2300 5400 60  0001 C CNN
+F 3 "" H 2300 5400 60  0001 C CNN
+	1    2300 5400
+	0    1    1    0   
 $EndComp
 $Comp
 L R R22
 U 1 1 4623857F
-P 2650 4600
-F 0 "R22" V 2750 4600 50  0000 C CNN
-F 1 "270" V 2650 4600 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 2650 4600 60  0001 C CNN
-F 3 "" H 2650 4600 60  0001 C CNN
-	1    2650 4600
-	0    1    1    0   
+P 2300 4850
+F 0 "R22" H 2150 5000 50  0000 C CNN
+F 1 "270" V 2300 4850 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 2300 4850 60  0001 C CNN
+F 3 "" H 2300 4850 60  0001 C CNN
+	1    2300 4850
+	1    0    0    -1  
 $EndComp
-Text Label 3950 4300 0    60   ~ 0
+Text Label 1200 4300 2    60   ~ 0
 RSTO-
 $Comp
 L R R21
 U 1 1 46238545
-P 3500 4300
-F 0 "R21" V 3600 4300 50  0000 C CNN
-F 1 "4,7K" V 3500 4300 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 3500 4300 60  0001 C CNN
-F 3 "" H 3500 4300 60  0001 C CNN
-	1    3500 4300
-	0    1    1    0   
+P 1650 4300
+F 0 "R21" V 1550 4300 50  0000 C CNN
+F 1 "4.7K" V 1650 4300 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 1650 4300 60  0001 C CNN
+F 3 "" H 1650 4300 60  0001 C CNN
+	1    1650 4300
+	0    -1   1    0   
 $EndComp
 $Comp
 L VDD #PWR013
 U 1 1 46238539
-P 2900 4100
-F 0 "#PWR013" H 2900 4200 30  0001 C CNN
-F 1 "VDD" H 2900 4210 30  0000 C CNN
-F 2 "" H 2900 4100 60  0001 C CNN
-F 3 "" H 2900 4100 60  0001 C CNN
-	1    2900 4100
-	1    0    0    -1  
+P 2300 4050
+F 0 "#PWR013" H 2300 4150 30  0001 C CNN
+F 1 "VDD" H 2300 4160 40  0000 C CNN
+F 2 "" H 2300 4050 60  0001 C CNN
+F 3 "" H 2300 4050 60  0001 C CNN
+	1    2300 4050
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR014
@@ -1156,102 +1344,102 @@ $EndComp
 $Comp
 L PNP Q1
 U 1 1 46238519
-P 3000 4300
-F 0 "Q1" H 3150 4300 60  0000 C CNN
-F 1 "3906" H 2904 4450 60  0000 C CNN
-F 2 "lib_smd:SOT23EBC" H 3000 4300 60  0001 C CNN
-F 3 "" H 3000 4300 60  0001 C CNN
-	1    3000 4300
-	-1   0    0    1   
-$EndComp
-Text Label 3550 3000 0    60   ~ 0
+P 2200 4300
+F 0 "Q1" H 2050 4150 60  0000 C CNN
+F 1 "3906" H 2050 4450 60  0000 C CNN
+F 2 "lib_smd:SOT23EBC" H 2200 4300 60  0001 C CNN
+F 3 "" H 2200 4300 60  0001 C CNN
+	1    2200 4300
+	1    0    0    1   
+$EndComp
+Text Label 3250 3000 0    60   ~ 0
 RSTI-
 $Comp
 L +3.3V #PWR015
 U 1 1 462384A7
-P 3250 2400
-F 0 "#PWR015" H 3250 2360 30  0001 C CNN
-F 1 "+3.3V" H 3250 2510 30  0000 C CNN
-F 2 "" H 3250 2400 60  0001 C CNN
-F 3 "" H 3250 2400 60  0001 C CNN
-	1    3250 2400
+P 2950 2400
+F 0 "#PWR015" H 2950 2360 40  0001 C CNN
+F 1 "+3.3V" H 2950 2510 40  0000 C CNN
+F 2 "" H 2950 2400 60  0001 C CNN
+F 3 "" H 2950 2400 60  0001 C CNN
+	1    2950 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR016
 U 1 1 4623848E
-P 2200 3500
-F 0 "#PWR016" H 2200 3500 30  0001 C CNN
-F 1 "GND" H 2200 3430 30  0001 C CNN
-F 2 "" H 2200 3500 60  0001 C CNN
-F 3 "" H 2200 3500 60  0001 C CNN
-	1    2200 3500
+P 1900 3550
+F 0 "#PWR016" H 1900 3550 30  0001 C CNN
+F 1 "GND" H 1900 3480 30  0001 C CNN
+F 2 "" H 1900 3550 60  0001 C CNN
+F 3 "" H 1900 3550 60  0001 C CNN
+	1    1900 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R15
 U 1 1 4623847B
-P 3250 2650
-F 0 "R15" V 3330 2650 50  0000 C CNN
-F 1 "4,7K" V 3250 2650 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 3250 2650 60  0001 C CNN
-F 3 "" H 3250 2650 60  0001 C CNN
-	1    3250 2650
+P 2950 2650
+F 0 "R15" H 2800 2800 50  0000 C CNN
+F 1 "4,7K" V 2950 2650 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 2950 2650 60  0001 C CNN
+F 3 "" H 2950 2650 60  0001 C CNN
+	1    2950 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D3
 U 1 1 4623846D
-P 2850 3000
-F 0 "D3" H 2850 3100 40  0000 C CNN
-F 1 "BAT54" H 2850 2900 40  0000 C CNN
-F 2 "lib_smd:ST23AK#1" H 2850 3000 60  0001 C CNN
-F 3 "" H 2850 3000 60  0001 C CNN
-	1    2850 3000
+P 2600 3000
+F 0 "D3" H 2600 2800 50  0000 C CNN
+F 1 "BAT54" H 2600 2900 50  0000 C CNN
+F 2 "lib_smd:ST23AK#1" H 2600 3000 60  0001 C CNN
+F 3 "" H 2600 3000 60  0001 C CNN
+	1    2600 3000
 	-1   0    0    1   
 $EndComp
 $Comp
 L C C3
 U 1 1 46238468
-P 2200 3300
-F 0 "C3" H 2250 3400 50  0000 L CNN
-F 1 "1nF" H 2250 3200 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 2200 3300 60  0001 C CNN
-F 3 "" H 2200 3300 60  0001 C CNN
-	1    2200 3300
+P 1900 3300
+F 0 "C3" H 1950 3400 50  0000 L CNN
+F 1 "1nF" H 1950 3200 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 1900 3300 60  0001 C CNN
+F 3 "" H 1900 3300 60  0001 C CNN
+	1    1900 3300
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR017
 U 1 1 4623840E
-P 1150 2950
-F 0 "#PWR017" H 1150 2910 30  0001 C CNN
-F 1 "+3.3V" H 1150 3060 30  0000 C CNN
-F 2 "" H 1150 2950 60  0001 C CNN
-F 3 "" H 1150 2950 60  0001 C CNN
-	1    1150 2950
+P 850 2950
+F 0 "#PWR017" H 850 2910 40  0001 C CNN
+F 1 "+3.3V" H 850 3060 40  0000 C CNN
+F 2 "" H 850 2950 60  0001 C CNN
+F 3 "" H 850 2950 60  0001 C CNN
+	1    850  2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR018
 U 1 1 46238409
-P 1550 3350
-F 0 "#PWR018" H 1550 3350 30  0001 C CNN
-F 1 "GND" H 1550 3280 30  0001 C CNN
-F 2 "" H 1550 3350 60  0001 C CNN
-F 3 "" H 1550 3350 60  0001 C CNN
-	1    1550 3350
+P 1250 3400
+F 0 "#PWR018" H 1250 3400 30  0001 C CNN
+F 1 "GND" H 1250 3330 30  0001 C CNN
+F 2 "" H 1250 3400 60  0001 C CNN
+F 3 "" H 1250 3400 60  0001 C CNN
+	1    1250 3400
 	1    0    0    -1  
 $EndComp
 $Comp
 L MC34064P LV1
 U 1 1 462383E5
-P 1550 3050
-F 0 "LV1" H 1600 3250 60  0000 C CNN
-F 1 "DS1818" H 1850 2860 60  0000 C CNN
-F 2 "discret:TO92-INVERT" H 1550 3050 60  0001 C CNN
-F 3 "" H 1550 3050 60  0001 C CNN
-	1    1550 3050
+P 1250 3050
+F 0 "LV1" H 1250 3350 60  0000 C CNN
+F 1 "DS1818" H 1250 3250 60  0000 C CNN
+F 2 "discret:TO92-INVERT" H 1250 3050 60  0001 C CNN
+F 3 "" H 1250 3050 60  0001 C CNN
+	1    1250 3050
 	1    0    0    -1  
 $EndComp
 Text Label 10250 6300 0    60   ~ 0
@@ -1271,83 +1459,83 @@ QSPI_DIN
 $Comp
 L CP C16
 U 1 1 462382CE
-P 6150 8750
-F 0 "C16" H 6200 8850 50  0000 L CNN
-F 1 "10uF" H 6200 8650 50  0000 L CNN
-F 2 "lib_smd:SM1206POL" H 6150 8750 60  0001 C CNN
-F 3 "" H 6150 8750 60  0001 C CNN
-	1    6150 8750
+P 2600 10250
+F 0 "C16" H 2650 10350 50  0000 L CNN
+F 1 "10uF" H 2650 10150 50  0000 L CNN
+F 2 "lib_smd:SM1206POL" H 2600 10250 60  0001 C CNN
+F 3 "" H 2600 10250 60  0001 C CNN
+	1    2600 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GNDA #PWR019
 U 1 1 462380EB
-P 6150 9000
-F 0 "#PWR019" H 6150 9000 40  0001 C CNN
-F 1 "GNDA" H 6150 8930 40  0000 C CNN
-F 2 "" H 6150 9000 60  0001 C CNN
-F 3 "" H 6150 9000 60  0001 C CNN
-	1    6150 9000
+P 2600 10600
+F 0 "#PWR019" H 2600 10600 40  0001 C CNN
+F 1 "GNDA" H 2600 10530 40  0000 C CNN
+F 2 "" H 2600 10600 60  0001 C CNN
+F 3 "" H 2600 10600 60  0001 C CNN
+	1    2600 10600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR020
 U 1 1 462380D3
-P 5350 9000
-F 0 "#PWR020" H 5350 9000 30  0001 C CNN
-F 1 "GND" H 5350 8930 30  0001 C CNN
-F 2 "" H 5350 9000 60  0001 C CNN
-F 3 "" H 5350 9000 60  0001 C CNN
-	1    5350 9000
+P 1800 10550
+F 0 "#PWR020" H 1800 10550 30  0001 C CNN
+F 1 "GND" H 1800 10480 30  0001 C CNN
+F 2 "" H 1800 10550 60  0001 C CNN
+F 3 "" H 1800 10550 60  0001 C CNN
+	1    1800 10550
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR FB1
 U 1 1 462380B8
-P 5700 8950
-F 0 "FB1" V 5650 8950 40  0000 C CNN
-F 1 "BEAD" V 5800 8950 40  0000 C CNN
-F 2 "lib_smd:SM1206" H 5700 8950 60  0001 C CNN
-F 3 "" H 5700 8950 60  0001 C CNN
-	1    5700 8950
+P 2150 10500
+F 0 "FB1" V 2250 10500 50  0000 C CNN
+F 1 "BEAD" V 2100 10500 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2150 10500 60  0001 C CNN
+F 3 "" H 2150 10500 60  0001 C CNN
+	1    2150 10500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L INDUCTOR L1
 U 1 1 46238092
-P 5700 8500
-F 0 "L1" V 5650 8500 40  0000 C CNN
-F 1 "10uH" V 5800 8500 40  0000 C CNN
-F 2 "lib_smd:SM1206" H 5700 8500 60  0001 C CNN
-F 3 "" H 5700 8500 60  0001 C CNN
-	1    5700 8500
+P 2150 10000
+F 0 "L1" V 2250 10000 50  0000 C CNN
+F 1 "10uH" V 2100 10000 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2150 10000 60  0001 C CNN
+F 3 "" H 2150 10000 60  0001 C CNN
+	1    2150 10000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L JUMPER VDDA1
 U 1 1 46238079
-P 4950 8500
-F 0 "VDDA1" H 4950 8650 60  0000 C CNN
-F 1 "JUMPER" H 4950 8420 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 4950 8500 60  0001 C CNN
-F 3 "" H 4950 8500 60  0001 C CNN
-	1    4950 8500
+P 1400 10000
+F 0 "VDDA1" H 1400 10150 60  0000 C CNN
+F 1 "JUMPER" H 1400 9920 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 1400 10000 60  0001 C CNN
+F 3 "" H 1400 10000 60  0001 C CNN
+	1    1400 10000
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR021
 U 1 1 46238078
-P 4600 8450
-F 0 "#PWR021" H 4600 8410 30  0001 C CNN
-F 1 "+3.3V" H 4600 8560 30  0000 C CNN
-F 2 "" H 4600 8450 60  0001 C CNN
-F 3 "" H 4600 8450 60  0001 C CNN
-	1    4600 8450
+P 1050 9950
+F 0 "#PWR021" H 1050 9910 30  0001 C CNN
+F 1 "+3.3V" H 1050 10060 40  0000 C CNN
+F 2 "" H 1050 9950 60  0001 C CNN
+F 3 "" H 1050 9950 60  0001 C CNN
+	1    1050 9950
 	1    0    0    -1  
 $EndComp
-Text Label 6100 8500 0    60   ~ 0
+Text Label 2650 10000 0    60   ~ 0
 VCCA
-Text Label 6600 8500 0    60   ~ 0
+Text Label 3200 10000 2    60   ~ 0
 VRH
 Text Label 5800 6950 0    60   ~ 0
 VCCA
@@ -1355,161 +1543,161 @@ Text Label 5850 6800 0    60   ~ 0
 VRL
 Text Label 5850 6700 0    60   ~ 0
 VRH
-Text Label 11850 1650 0    60   ~ 0
+Text Label 15400 1700 2    60   ~ 0
 IRQ-7
 $Comp
 L DIODE D1
 U 1 1 46237F86
-P 12500 1650
-F 0 "D1" H 12500 1750 40  0000 C CNN
-F 1 "BAT54" H 12500 1550 40  0000 C CNN
-F 2 "lib_smd:ST23AK#1" H 12500 1650 60  0001 C CNN
-F 3 "" H 12500 1650 60  0001 C CNN
-	1    12500 1650
-	1    0    0    -1  
+P 14800 1700
+F 0 "D1" H 14800 1800 40  0000 C CNN
+F 1 "BAT54" H 14800 1600 40  0000 C CNN
+F 2 "lib_smd:ST23AK#1" H 14800 1700 60  0001 C CNN
+F 3 "" H 14800 1700 60  0001 C CNN
+	1    14800 1700
+	-1   0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR022
 U 1 1 46237F59
-P 15450 1650
-F 0 "#PWR022" H 15450 1610 30  0001 C CNN
-F 1 "+3.3V" H 15450 1760 30  0000 C CNN
-F 2 "" H 15450 1650 60  0001 C CNN
-F 3 "" H 15450 1650 60  0001 C CNN
-	1    15450 1650
-	1    0    0    -1  
+P 11800 1700
+F 0 "#PWR022" H 11800 1660 30  0001 C CNN
+F 1 "+3.3V" H 11800 1810 40  0000 C CNN
+F 2 "" H 11800 1700 60  0001 C CNN
+F 3 "" H 11800 1700 60  0001 C CNN
+	1    11800 1700
+	-1   0    0    -1  
 $EndComp
 $Comp
 L SW_PUSH ABRT_SW1
 U 1 1 46237F50
-P 15050 1650
-F 0 "ABRT_SW1" H 15050 1800 50  0000 C CNN
-F 1 "SW_PUSH" H 15050 1570 50  0000 C CNN
-F 2 "discret:SW_PUSH_SMALL" H 15050 1650 60  0001 C CNN
-F 3 "" H 15050 1650 60  0001 C CNN
-	1    15050 1650
-	1    0    0    -1  
+P 12200 1700
+F 0 "ABRT_SW1" H 12200 1850 50  0000 C CNN
+F 1 "SW_PUSH" H 12200 1620 50  0000 C CNN
+F 2 "discret:SW_PUSH_SMALL" H 12200 1700 60  0001 C CNN
+F 3 "" H 12200 1700 60  0001 C CNN
+	1    12200 1700
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR023
 U 1 1 46237F11
-P 14200 2250
-F 0 "#PWR023" H 14200 2250 30  0001 C CNN
-F 1 "GND" H 14200 2180 30  0001 C CNN
-F 2 "" H 14200 2250 60  0001 C CNN
-F 3 "" H 14200 2250 60  0001 C CNN
-	1    14200 2250
-	1    0    0    -1  
+P 13100 2350
+F 0 "#PWR023" H 13100 2350 30  0001 C CNN
+F 1 "GND" H 13100 2280 30  0001 C CNN
+F 2 "" H 13100 2350 60  0001 C CNN
+F 3 "" H 13100 2350 60  0001 C CNN
+	1    13100 2350
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR024
 U 1 1 46237F0E
-P 13950 2200
-F 0 "#PWR024" H 13950 2200 30  0001 C CNN
-F 1 "GND" H 13950 2130 30  0001 C CNN
-F 2 "" H 13950 2200 60  0001 C CNN
-F 3 "" H 13950 2200 60  0001 C CNN
-	1    13950 2200
-	1    0    0    -1  
+P 13300 2350
+F 0 "#PWR024" H 13300 2350 30  0001 C CNN
+F 1 "GND" H 13300 2280 30  0001 C CNN
+F 2 "" H 13300 2350 60  0001 C CNN
+F 3 "" H 13300 2350 60  0001 C CNN
+	1    13300 2350
+	-1   0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR025
 U 1 1 46237E86
-P 12800 650
-F 0 "#PWR025" H 12800 610 30  0001 C CNN
-F 1 "+3.3V" H 12800 760 30  0000 C CNN
-F 2 "" H 12800 650 60  0001 C CNN
-F 3 "" H 12800 650 60  0001 C CNN
-	1    12800 650 
-	1    0    0    -1  
+P 14450 650
+F 0 "#PWR025" H 14450 610 30  0001 C CNN
+F 1 "+3.3V" H 14450 760 40  0000 C CNN
+F 2 "" H 14450 650 60  0001 C CNN
+F 3 "" H 14450 650 60  0001 C CNN
+	1    14450 650 
+	-1   0    0    -1  
 $EndComp
 $Comp
 L LED LEDABRT1
 U 1 1 46237E52
-P 12800 850
-F 0 "LEDABRT1" H 12800 950 50  0000 C CNN
-F 1 "RED" H 12800 750 50  0000 C CNN
-F 2 "lib_smd:SM1206POL" H 12800 850 60  0001 C CNN
-F 3 "" H 12800 850 60  0001 C CNN
-	1    12800 850 
-	0    1    1    0   
+P 14450 900
+F 0 "LEDABRT1" H 14450 1000 50  0000 C CNN
+F 1 "RED" H 14450 800 50  0000 C CNN
+F 2 "lib_smd:SM1206POL" H 14450 900 60  0001 C CNN
+F 3 "" H 14450 900 60  0001 C CNN
+	1    14450 900 
+	0    -1   1    0   
 $EndComp
 $Comp
 L R R14
 U 1 1 46237E3D
-P 12800 1350
-F 0 "R14" V 12880 1350 50  0000 C CNN
-F 1 "270" V 12800 1350 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 12800 1350 60  0001 C CNN
-F 3 "" H 12800 1350 60  0001 C CNN
-	1    12800 1350
-	1    0    0    -1  
+P 14450 1400
+F 0 "R14" V 14530 1400 50  0000 C CNN
+F 1 "270" V 14450 1400 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14450 1400 60  0001 C CNN
+F 3 "" H 14450 1400 60  0001 C CNN
+	1    14450 1400
+	-1   0    0    -1  
 $EndComp
 $Comp
 L C C15
 U 1 1 46237E36
-P 13950 2000
-F 0 "C15" H 13700 2100 50  0000 L CNN
-F 1 "100nF" H 13650 1900 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 13950 2000 60  0001 C CNN
-F 3 "" H 13950 2000 60  0001 C CNN
-	1    13950 2000
-	1    0    0    -1  
+P 13300 2050
+F 0 "C15" H 13050 2150 50  0000 L CNN
+F 1 "100nF" H 13000 1950 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 13300 2050 60  0001 C CNN
+F 3 "" H 13300 2050 60  0001 C CNN
+	1    13300 2050
+	-1   0    0    -1  
 $EndComp
 $Comp
 L R R12
 U 1 1 46237E2F
-P 14200 2000
-F 0 "R12" V 14280 2000 50  0000 C CNN
-F 1 "20K" V 14200 2000 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14200 2000 60  0001 C CNN
-F 3 "" H 14200 2000 60  0001 C CNN
-	1    14200 2000
-	1    0    0    -1  
+P 13100 2050
+F 0 "R12" H 13250 2200 50  0000 C CNN
+F 1 "20K" V 13100 2050 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 13100 2050 60  0001 C CNN
+F 3 "" H 13100 2050 60  0001 C CNN
+	1    13100 2050
+	-1   0    0    -1  
 $EndComp
 $Comp
 L R R7
 U 1 1 46237E28
-P 14450 1650
-F 0 "R7" V 14530 1650 50  0000 C CNN
-F 1 "1K" V 14450 1650 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14450 1650 60  0001 C CNN
-F 3 "" H 14450 1650 60  0001 C CNN
-	1    14450 1650
-	0    1    1    0   
+P 12850 1700
+F 0 "R7" V 12750 1700 50  0000 C CNN
+F 1 "1K" V 12850 1700 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 12850 1700 60  0001 C CNN
+F 3 "" H 12850 1700 60  0001 C CNN
+	1    12850 1700
+	0    -1   1    0   
 $EndComp
 $Comp
 L +3.3V #PWR026
 U 1 1 46237E18
-P 13350 1200
-F 0 "#PWR026" H 13350 1160 30  0001 C CNN
-F 1 "+3.3V" H 13350 1310 30  0000 C CNN
-F 2 "" H 13350 1200 60  0001 C CNN
-F 3 "" H 13350 1200 60  0001 C CNN
-	1    13350 1200
-	1    0    0    -1  
+P 13300 1000
+F 0 "#PWR026" H 13300 960 30  0001 C CNN
+F 1 "+3.3V" H 13300 1110 40  0000 C CNN
+F 2 "" H 13300 1000 60  0001 C CNN
+F 3 "" H 13300 1000 60  0001 C CNN
+	1    13300 1000
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR027
 U 1 1 46237E07
-P 13750 1200
-F 0 "#PWR027" H 13750 1200 30  0001 C CNN
-F 1 "GND" H 13750 1130 30  0001 C CNN
-F 2 "" H 13750 1200 60  0001 C CNN
-F 3 "" H 13750 1200 60  0001 C CNN
-	1    13750 1200
-	0    -1   -1   0   
+P 13300 1450
+F 0 "#PWR027" H 13300 1450 30  0001 C CNN
+F 1 "GND" H 13300 1380 30  0001 C CNN
+F 2 "" H 13300 1450 60  0001 C CNN
+F 3 "" H 13300 1450 60  0001 C CNN
+	1    13300 1450
+	-1   0    0    -1  
 $EndComp
 $Comp
 L C C14
 U 1 1 46237DF9
-P 13550 1200
-F 0 "C14" H 13600 1300 50  0000 L CNN
-F 1 "100nF" V 13350 1200 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 13550 1200 60  0001 C CNN
-F 3 "" H 13550 1200 60  0001 C CNN
-	1    13550 1200
-	0    1    1    0   
+P 13300 1250
+F 0 "C14" H 13400 1200 50  0000 L CNN
+F 1 "100nF" H 13400 1300 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 13300 1250 60  0001 C CNN
+F 3 "" H 13300 1250 60  0001 C CNN
+	1    13300 1250
+	1    0    0    1   
 $EndComp
 Text Label 5650 4000 0    60   ~ 0
 ALLPST
@@ -1518,7 +1706,7 @@ L VDD #PWR028
 U 1 1 461BE524
 P 5250 3000
 F 0 "#PWR028" H 5250 3100 30  0001 C CNN
-F 1 "VDD" H 5250 3110 30  0000 C CNN
+F 1 "VDD" H 5250 3110 40  0000 C CNN
 F 2 "" H 5250 3000 60  0001 C CNN
 F 3 "" H 5250 3000 60  0001 C CNN
 	1    5250 3000
@@ -1631,7 +1819,7 @@ L +3.3V #PWR031
 U 1 1 461BE318
 P 6250 1150
 F 0 "#PWR031" H 6250 1110 30  0001 C CNN
-F 1 "+3.3V" H 6250 1260 30  0000 C CNN
+F 1 "+3.3V" H 6250 1260 40  0000 C CNN
 F 2 "" H 6250 1150 60  0001 C CNN
 F 3 "" H 6250 1150 60  0001 C CNN
 	1    6250 1150
@@ -1640,12 +1828,12 @@ $EndComp
 $Comp
 L GND #PWR032
 U 1 1 461BE2B7
-P 4400 3350
-F 0 "#PWR032" H 4400 3350 30  0001 C CNN
-F 1 "GND" H 4400 3280 30  0001 C CNN
-F 2 "" H 4400 3350 60  0001 C CNN
-F 3 "" H 4400 3350 60  0001 C CNN
-	1    4400 3350
+P 4350 3350
+F 0 "#PWR032" H 4350 3350 30  0001 C CNN
+F 1 "GND" H 4350 3280 30  0001 C CNN
+F 2 "" H 4350 3350 60  0001 C CNN
+F 3 "" H 4350 3350 60  0001 C CNN
+	1    4350 3350
 	0    1    1    0   
 $EndComp
 Text Label 5600 2750 0    60   ~ 0
@@ -1711,7 +1899,7 @@ L VDD #PWR034
 U 1 1 461BE128
 P 4750 5000
 F 0 "#PWR034" H 4750 5100 30  0001 C CNN
-F 1 "VDD" H 4750 5110 30  0000 C CNN
+F 1 "VDD" H 4750 5110 40  0000 C CNN
 F 2 "" H 4750 5000 60  0001 C CNN
 F 3 "" H 4750 5000 60  0001 C CNN
 	1    4750 5000
@@ -1722,7 +1910,7 @@ L VDD #PWR035
 U 1 1 461BE125
 P 4150 5000
 F 0 "#PWR035" H 4150 5100 30  0001 C CNN
-F 1 "VDD" H 4150 5110 30  0000 C CNN
+F 1 "VDD" H 4150 5110 40  0000 C CNN
 F 2 "" H 4150 5000 60  0001 C CNN
 F 3 "" H 4150 5000 60  0001 C CNN
 	1    4150 5000
@@ -1822,45 +2010,45 @@ IRQ-1
 $Comp
 L CONN_1 TA-1
 U 1 1 461BBA34
-P 13700 4750
-F 0 "TA-1" H 13750 4650 40  0000 C CNN
-F 1 "CONN_1" H 13650 4790 30  0001 C CNN
-F 2 "connect:PINTST" H 13700 4750 60  0001 C CNN
-F 3 "" H 13700 4750 60  0001 C CNN
-	1    13700 4750
+P 13750 4800
+F 0 "TA-1" H 13800 4700 40  0000 C CNN
+F 1 "CONN_1" H 13700 4840 30  0001 C CNN
+F 2 "connect:PINTST" H 13750 4800 60  0001 C CNN
+F 3 "" H 13750 4800 60  0001 C CNN
+	1    13750 4800
 	1    0    0    -1  
 $EndComp
-Text Label 12200 3750 0    60   ~ 0
+Text Label 12150 3800 0    60   ~ 0
 RSTI-
-NoConn ~ 12750 4450
+NoConn ~ 12800 4500
 $Comp
 L +3.3V #PWR036
 U 1 1 461BB93F
-P 12500 4650
-F 0 "#PWR036" H 12500 4610 30  0001 C CNN
-F 1 "+3.3V" H 12500 4760 30  0000 C CNN
-F 2 "" H 12500 4650 60  0001 C CNN
-F 3 "" H 12500 4650 60  0001 C CNN
-	1    12500 4650
+P 12450 4700
+F 0 "#PWR036" H 12450 4660 30  0001 C CNN
+F 1 "+3.3V" H 12450 4810 40  0000 C CNN
+F 2 "" H 12450 4700 60  0001 C CNN
+F 3 "" H 12450 4700 60  0001 C CNN
+	1    12450 4700
 	0    -1   -1   0   
 $EndComp
-NoConn ~ 13550 4450
-NoConn ~ 12750 3450
-Text Label 14650 4150 0    60   ~ 0
+NoConn ~ 13600 4500
+NoConn ~ 12800 3500
+Text Label 14700 4200 0    60   ~ 0
 DDAT3
-Text Label 12200 4250 0    60   ~ 0
+Text Label 12150 4300 0    60   ~ 0
 DDAT2
-Text Label 14650 4250 0    60   ~ 0
+Text Label 14700 4300 0    60   ~ 0
 DDAT1
-Text Label 12200 4350 0    60   ~ 0
+Text Label 12150 4400 0    60   ~ 0
 DDAT0
-Text Label 14700 3950 0    60   ~ 0
+Text Label 14750 4000 0    60   ~ 0
 PST3
-Text Label 12200 4050 0    60   ~ 0
+Text Label 12150 4100 0    60   ~ 0
 PST2
-Text Label 14700 4050 0    60   ~ 0
+Text Label 14750 4100 0    60   ~ 0
 PST1
-Text Label 12200 4150 0    60   ~ 0
+Text Label 12150 4200 0    60   ~ 0
 PST0
 Text Label 5650 4800 0    60   ~ 0
 DDAT3
@@ -1881,102 +2069,102 @@ PST0
 $Comp
 L GND #PWR037
 U 1 1 461BB8C6
-P 14050 5150
-F 0 "#PWR037" H 14050 5150 30  0001 C CNN
-F 1 "GND" H 14050 5080 30  0001 C CNN
-F 2 "" H 14050 5150 60  0001 C CNN
-F 3 "" H 14050 5150 60  0001 C CNN
-	1    14050 5150
+P 14100 5200
+F 0 "#PWR037" H 14100 5200 30  0001 C CNN
+F 1 "GND" H 14100 5130 30  0001 C CNN
+F 2 "" H 14100 5200 60  0001 C CNN
+F 3 "" H 14100 5200 60  0001 C CNN
+	1    14100 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R26
 U 1 1 461BB8C0
-P 14050 4900
-F 0 "R26" V 14130 4900 50  0000 C CNN
-F 1 "10K" V 14050 4900 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14050 4900 60  0001 C CNN
-F 3 "" H 14050 4900 60  0001 C CNN
-	1    14050 4900
+P 14100 4950
+F 0 "R26" V 14180 4950 50  0000 C CNN
+F 1 "10K" V 14100 4950 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14100 4950 60  0001 C CNN
+F 3 "" H 14100 4950 60  0001 C CNN
+	1    14100 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 CLKOUT1
 U 1 1 461BB894
-P 14650 4700
-F 0 "CLKOUT1" H 14700 4600 40  0000 C CNN
-F 1 "CONN_1" H 14600 4740 30  0001 C CNN
-F 2 "connect:PINTST" H 14650 4700 60  0001 C CNN
-F 3 "" H 14650 4700 60  0001 C CNN
-	1    14650 4700
+P 14700 4750
+F 0 "CLKOUT1" H 14750 4650 40  0000 C CNN
+F 1 "CONN_1" H 14650 4790 30  0001 C CNN
+F 2 "connect:PINTST" H 14700 4750 60  0001 C CNN
+F 3 "" H 14700 4750 60  0001 C CNN
+	1    14700 4750
 	1    0    0    -1  
 $EndComp
-Text Label 14700 3550 0    60   ~ 0
+Text Label 14750 3600 0    60   ~ 0
 DSCLK
 Text Label 5750 3450 0    60   ~ 0
 DSCLK
 $Comp
 L VDD #PWR038
 U 1 1 461BB7AD
-P 13800 2600
-F 0 "#PWR038" H 13800 2700 30  0001 C CNN
-F 1 "VDD" H 13800 2710 30  0000 C CNN
-F 2 "" H 13800 2600 60  0001 C CNN
-F 3 "" H 13800 2600 60  0001 C CNN
-	1    13800 2600
+P 13850 2650
+F 0 "#PWR038" H 13850 2750 30  0001 C CNN
+F 1 "VDD" H 13850 2760 40  0000 C CNN
+F 2 "" H 13850 2650 60  0001 C CNN
+F 3 "" H 13850 2650 60  0001 C CNN
+	1    13850 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R20
 U 1 1 461BB799
-P 14550 2950
-F 0 "R20" V 14630 2950 50  0000 C CNN
-F 1 "4,7K" V 14550 2950 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14550 2950 60  0001 C CNN
-F 3 "" H 14550 2950 60  0001 C CNN
-	1    14550 2950
+P 14600 3000
+F 0 "R20" V 14680 3000 50  0000 C CNN
+F 1 "4,7K" V 14600 3000 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14600 3000 60  0001 C CNN
+F 3 "" H 14600 3000 60  0001 C CNN
+	1    14600 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R19
 U 1 1 461BB798
-P 14300 2950
-F 0 "R19" V 14380 2950 50  0000 C CNN
-F 1 "4,7K" V 14300 2950 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14300 2950 60  0001 C CNN
-F 3 "" H 14300 2950 60  0001 C CNN
-	1    14300 2950
+P 14350 3000
+F 0 "R19" V 14430 3000 50  0000 C CNN
+F 1 "4,7K" V 14350 3000 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14350 3000 60  0001 C CNN
+F 3 "" H 14350 3000 60  0001 C CNN
+	1    14350 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R18
 U 1 1 461BB795
-P 14050 2950
-F 0 "R18" V 14130 2950 50  0000 C CNN
-F 1 "4,7K" V 14050 2950 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 14050 2950 60  0001 C CNN
-F 3 "" H 14050 2950 60  0001 C CNN
-	1    14050 2950
+P 14100 3000
+F 0 "R18" V 14180 3000 50  0000 C CNN
+F 1 "4,7K" V 14100 3000 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 14100 3000 60  0001 C CNN
+F 3 "" H 14100 3000 60  0001 C CNN
+	1    14100 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 461BB790
-P 13800 2950
-F 0 "R17" V 13880 2950 50  0000 C CNN
-F 1 "4,7K" V 13800 2950 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 13800 2950 60  0001 C CNN
-F 3 "" H 13800 2950 60  0001 C CNN
-	1    13800 2950
+P 13850 3000
+F 0 "R17" V 13930 3000 50  0000 C CNN
+F 1 "4,7K" V 13850 3000 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 13850 3000 60  0001 C CNN
+F 3 "" H 13850 3000 60  0001 C CNN
+	1    13850 3000
 	1    0    0    -1  
 $EndComp
-Text Label 14700 3450 0    60   ~ 0
+Text Label 14750 3500 0    60   ~ 0
 BKPT-
-Text Label 14700 4550 0    60   ~ 0
+Text Label 14750 4600 0    60   ~ 0
 TCLK
-Text Label 14700 3850 0    60   ~ 0
+Text Label 14750 3900 0    60   ~ 0
 DSO
-Text Label 14700 3750 0    60   ~ 0
+Text Label 14750 3800 0    60   ~ 0
 DSI
 Text Label 4800 3750 0    60   ~ 0
 TCLK
@@ -1999,9 +2187,9 @@ Text Label 5750 3550 0    60   ~ 0
 DSI
 Text Label 5750 3850 0    60   ~ 0
 BKPT-
-Text Label 4750 2000 0    60   ~ 0
+Text Label 3150 2000 0    60   ~ 0
 CLKMOD1
-Text Label 4750 1650 0    60   ~ 0
+Text Label 3150 1650 0    60   ~ 0
 CLKMOD0
 Text Label 5550 2950 0    60   ~ 0
 CLKMOD1
@@ -2021,78 +2209,78 @@ $EndComp
 $Comp
 L GND #PWR040
 U 1 1 461BB68E
-P 3750 2000
-F 0 "#PWR040" H 3750 2000 30  0001 C CNN
-F 1 "GND" H 3750 1930 30  0001 C CNN
-F 2 "" H 3750 2000 60  0001 C CNN
-F 3 "" H 3750 2000 60  0001 C CNN
-	1    3750 2000
+P 2100 2000
+F 0 "#PWR040" H 2100 2000 30  0001 C CNN
+F 1 "GND" H 2100 1930 30  0001 C CNN
+F 2 "" H 2100 2000 60  0001 C CNN
+F 3 "" H 2100 2000 60  0001 C CNN
+	1    2100 2000
 	0    1    1    0   
 $EndComp
 $Comp
 L VDD #PWR041
 U 1 1 461BB662
-P 4650 1100
-F 0 "#PWR041" H 4650 1200 30  0001 C CNN
-F 1 "VDD" H 4650 1210 30  0000 C CNN
-F 2 "" H 4650 1100 60  0001 C CNN
-F 3 "" H 4650 1100 60  0001 C CNN
-	1    4650 1100
+P 3050 1050
+F 0 "#PWR041" H 3050 1150 30  0001 C CNN
+F 1 "VDD" H 3050 1160 40  0000 C CNN
+F 2 "" H 3050 1050 60  0001 C CNN
+F 3 "" H 3050 1050 60  0001 C CNN
+	1    3050 1050
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 461BB661
-P 4650 1350
-F 0 "R2" V 4730 1350 50  0000 C CNN
-F 1 "4,7K" V 4650 1350 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 4650 1350 60  0001 C CNN
-F 3 "" H 4650 1350 60  0001 C CNN
-	1    4650 1350
+P 3050 1350
+F 0 "R2" H 2950 1550 50  0000 C CNN
+F 1 "4,7K" V 3050 1350 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 3050 1350 60  0001 C CNN
+F 3 "" H 3050 1350 60  0001 C CNN
+	1    3050 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L VDD #PWR042
 U 1 1 461BB660
-P 4450 1100
-F 0 "#PWR042" H 4450 1200 30  0001 C CNN
-F 1 "VDD" H 4450 1210 30  0000 C CNN
-F 2 "" H 4450 1100 60  0001 C CNN
-F 3 "" H 4450 1100 60  0001 C CNN
-	1    4450 1100
+P 2850 1050
+F 0 "#PWR042" H 2850 1150 30  0001 C CNN
+F 1 "VDD" H 2850 1160 40  0000 C CNN
+F 2 "" H 2850 1050 60  0001 C CNN
+F 3 "" H 2850 1050 60  0001 C CNN
+	1    2850 1050
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R25
 U 1 1 461BB65F
-P 4450 1350
-F 0 "R25" V 4530 1350 50  0000 C CNN
-F 1 "4,7K" V 4450 1350 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 4450 1350 60  0001 C CNN
-F 3 "" H 4450 1350 60  0001 C CNN
-	1    4450 1350
+P 2850 1350
+F 0 "R25" H 2700 1550 50  0000 C CNN
+F 1 "4,7K" V 2850 1350 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 2850 1350 60  0001 C CNN
+F 3 "" H 2850 1350 60  0001 C CNN
+	1    2850 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L JUMPER CLK1
 U 1 1 461BB648
-P 4050 2000
-F 0 "CLK1" H 4050 2150 60  0000 C CNN
-F 1 "JUMPER" H 4050 1920 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 4050 2000 60  0001 C CNN
-F 3 "" H 4050 2000 60  0001 C CNN
-	1    4050 2000
+P 2450 2000
+F 0 "CLK1" H 2450 2150 60  0000 C CNN
+F 1 "JUMPER" H 2450 1920 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 2450 2000 60  0001 C CNN
+F 3 "" H 2450 2000 60  0001 C CNN
+	1    2450 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L JUMPER CLK0
 U 1 1 461BB62E
-P 4050 1650
-F 0 "CLK0" H 4050 1800 60  0000 C CNN
-F 1 "JUMPER" H 4050 1570 40  0000 C CNN
-F 2 "pin_array:PIN_ARRAY_2X1" H 4050 1650 60  0001 C CNN
-F 3 "" H 4050 1650 60  0001 C CNN
-	1    4050 1650
+P 2450 1650
+F 0 "CLK0" H 2450 1800 60  0000 C CNN
+F 1 "JUMPER" H 2450 1570 40  0000 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 2450 1650 60  0001 C CNN
+F 3 "" H 2450 1650 60  0001 C CNN
+	1    2450 1650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2100,7 +2288,7 @@ L VDD #PWR043
 U 1 1 461BB60D
 P 8400 1650
 F 0 "#PWR043" H 8400 1750 30  0001 C CNN
-F 1 "VDD" H 8400 1760 30  0000 C CNN
+F 1 "VDD" H 8400 1760 40  0000 C CNN
 F 2 "" H 8400 1650 60  0001 C CNN
 F 3 "" H 8400 1650 60  0001 C CNN
 	1    8400 1650
@@ -2109,34 +2297,34 @@ $EndComp
 $Comp
 L C C6
 U 1 1 461BB5E5
-P 7050 10100
-F 0 "C6" H 7100 10200 50  0000 L CNN
-F 1 "100nF" H 7100 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 7050 10100 60  0001 C CNN
-F 3 "" H 7050 10100 60  0001 C CNN
-	1    7050 10100
+P 5150 10250
+F 0 "C6" H 5200 10350 50  0000 L CNN
+F 1 "100nF" H 5200 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 5150 10250 60  0001 C CNN
+F 3 "" H 5150 10250 60  0001 C CNN
+	1    5150 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L VDD #PWR044
 U 1 1 461BB525
-P 5050 2800
-F 0 "#PWR044" H 5050 2900 30  0001 C CNN
-F 1 "VDD" H 5050 2910 30  0000 C CNN
-F 2 "" H 5050 2800 60  0001 C CNN
-F 3 "" H 5050 2800 60  0001 C CNN
-	1    5050 2800
+P 5050 2750
+F 0 "#PWR044" H 5050 2850 30  0001 C CNN
+F 1 "VDD" H 5050 2860 40  0000 C CNN
+F 2 "" H 5050 2750 60  0001 C CNN
+F 3 "" H 5050 2750 60  0001 C CNN
+	1    5050 2750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR045
 U 1 1 461BAF82
-P 3750 1650
-F 0 "#PWR045" H 3750 1650 30  0001 C CNN
-F 1 "GND" H 3750 1580 30  0001 C CNN
-F 2 "" H 3750 1650 60  0001 C CNN
-F 3 "" H 3750 1650 60  0001 C CNN
-	1    3750 1650
+P 2100 1650
+F 0 "#PWR045" H 2100 1650 30  0001 C CNN
+F 1 "GND" H 2100 1580 30  0001 C CNN
+F 2 "" H 2100 1650 60  0001 C CNN
+F 3 "" H 2100 1650 60  0001 C CNN
+	1    2100 1650
 	0    1    1    0   
 $EndComp
 $Comp
@@ -2164,166 +2352,215 @@ $EndComp
 $Comp
 L GND #PWR046
 U 1 1 461BAF37
-P 13550 4350
-F 0 "#PWR046" H 13550 4350 30  0001 C CNN
-F 1 "GND" H 13550 4280 30  0001 C CNN
-F 2 "" H 13550 4350 60  0001 C CNN
-F 3 "" H 13550 4350 60  0001 C CNN
-	1    13550 4350
+P 13600 4400
+F 0 "#PWR046" H 13600 4400 30  0001 C CNN
+F 1 "GND" H 13600 4330 30  0001 C CNN
+F 2 "" H 13600 4400 60  0001 C CNN
+F 3 "" H 13600 4400 60  0001 C CNN
+	1    13600 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR047
 U 1 1 461BAF13
-P 12650 4750
-F 0 "#PWR047" H 12650 4750 30  0001 C CNN
-F 1 "GND" H 12650 4680 30  0001 C CNN
-F 2 "" H 12650 4750 60  0001 C CNN
-F 3 "" H 12650 4750 60  0001 C CNN
-	1    12650 4750
+P 12600 4800
+F 0 "#PWR047" H 12600 4800 30  0001 C CNN
+F 1 "GND" H 12600 4730 30  0001 C CNN
+F 2 "" H 12600 4800 60  0001 C CNN
+F 3 "" H 12600 4800 60  0001 C CNN
+	1    12600 4800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_13X2 BDM_PORT1
 U 1 1 461BAEE7
-P 13150 4050
-F 0 "BDM_PORT1" H 13150 4750 60  0000 C CNN
-F 1 "CONN_13X2" V 13150 4050 50  0000 C CNN
-F 2 "pin_array:pin_array_13x2" H 13150 4050 60  0001 C CNN
-F 3 "" H 13150 4050 60  0001 C CNN
-	1    13150 4050
+P 13200 4100
+F 0 "BDM_PORT1" H 13200 4800 60  0000 C CNN
+F 1 "CONN_13X2" V 13200 4100 50  0000 C CNN
+F 2 "pin_array:pin_array_13x2" H 13200 4100 60  0001 C CNN
+F 3 "" H 13200 4100 60  0001 C CNN
+	1    13200 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L VDD #PWR048
 U 1 1 461BAEA3
-P 6300 9800
-F 0 "#PWR048" H 6300 9900 30  0001 C CNN
-F 1 "VDD" H 6300 9910 30  0000 C CNN
-F 2 "" H 6300 9800 60  0001 C CNN
-F 3 "" H 6300 9800 60  0001 C CNN
-	1    6300 9800
+P 4200 9950
+F 0 "#PWR048" H 4200 10050 30  0001 C CNN
+F 1 "VDD" H 4200 10060 40  0000 C CNN
+F 2 "" H 4200 9950 60  0001 C CNN
+F 3 "" H 4200 9950 60  0001 C CNN
+	1    4200 9950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR049
 U 1 1 46161D48
-P 9650 10400
-F 0 "#PWR049" H 9650 10400 30  0001 C CNN
-F 1 "GND" H 9650 10330 30  0001 C CNN
-F 2 "" H 9650 10400 60  0001 C CNN
-F 3 "" H 9650 10400 60  0001 C CNN
-	1    9650 10400
+P 7850 10550
+F 0 "#PWR049" H 7850 10550 30  0001 C CNN
+F 1 "GND" H 7850 10480 30  0001 C CNN
+F 2 "" H 7850 10550 60  0001 C CNN
+F 3 "" H 7850 10550 60  0001 C CNN
+	1    7850 10550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C17
 U 1 1 46161D3C
-P 9650 10100
-F 0 "C17" H 9700 10200 50  0000 L CNN
-F 1 "100uF" H 9700 10000 50  0000 L CNN
-F 2 "lib_smd:SM1206POL" H 9650 10100 60  0001 C CNN
-F 3 "" H 9650 10100 60  0001 C CNN
-	1    9650 10100
+P 7750 10250
+F 0 "C17" H 7800 10350 50  0000 L CNN
+F 1 "100uF" H 7800 10150 50  0000 L CNN
+F 2 "lib_smd:SM1206POL" H 7750 10250 60  0001 C CNN
+F 3 "" H 7750 10250 60  0001 C CNN
+	1    7750 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR050
 U 1 1 46161D18
-P 5650 9800
-F 0 "#PWR050" H 5650 9760 30  0001 C CNN
-F 1 "+3.3V" H 5650 9910 30  0000 C CNN
-F 2 "" H 5650 9800 60  0001 C CNN
-F 3 "" H 5650 9800 60  0001 C CNN
-	1    5650 9800
+P 4000 9950
+F 0 "#PWR050" H 4000 9910 30  0001 C CNN
+F 1 "+3.3V" H 4000 10060 40  0000 C CNN
+F 2 "" H 4000 9950 60  0001 C CNN
+F 3 "" H 4000 9950 60  0001 C CNN
+	1    4000 9950
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C12
 U 1 1 46161CDA
-P 9250 10100
-F 0 "C12" H 9300 10200 50  0000 L CNN
-F 1 "100nF" H 9300 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 9250 10100 60  0001 C CNN
-F 3 "" H 9250 10100 60  0001 C CNN
-	1    9250 10100
+P 7350 10250
+F 0 "C12" H 7400 10350 50  0000 L CNN
+F 1 "100nF" H 7400 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 7350 10250 60  0001 C CNN
+F 3 "" H 7350 10250 60  0001 C CNN
+	1    7350 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C11
 U 1 1 46161CD9
-P 8900 10100
-F 0 "C11" H 8950 10200 50  0000 L CNN
-F 1 "100nF" H 8950 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 8900 10100 60  0001 C CNN
-F 3 "" H 8900 10100 60  0001 C CNN
-	1    8900 10100
+P 7000 10250
+F 0 "C11" H 7050 10350 50  0000 L CNN
+F 1 "100nF" H 7050 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 7000 10250 60  0001 C CNN
+F 3 "" H 7000 10250 60  0001 C CNN
+	1    7000 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C10
 U 1 1 46161CD8
-P 8500 10100
-F 0 "C10" H 8550 10200 50  0000 L CNN
-F 1 "100nF" H 8550 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 8500 10100 60  0001 C CNN
-F 3 "" H 8500 10100 60  0001 C CNN
-	1    8500 10100
+P 6600 10250
+F 0 "C10" H 6650 10350 50  0000 L CNN
+F 1 "100nF" H 6650 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 6600 10250 60  0001 C CNN
+F 3 "" H 6600 10250 60  0001 C CNN
+	1    6600 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C9
 U 1 1 46161CD7
-P 8150 10100
-F 0 "C9" H 8200 10200 50  0000 L CNN
-F 1 "100nF" H 8200 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 8150 10100 60  0001 C CNN
-F 3 "" H 8150 10100 60  0001 C CNN
-	1    8150 10100
+P 6250 10250
+F 0 "C9" H 6300 10350 50  0000 L CNN
+F 1 "100nF" H 6300 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 6250 10250 60  0001 C CNN
+F 3 "" H 6250 10250 60  0001 C CNN
+	1    6250 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C8
 U 1 1 46161CD4
-P 7800 10100
-F 0 "C8" H 7850 10200 50  0000 L CNN
-F 1 "100nF" H 7850 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 7800 10100 60  0001 C CNN
-F 3 "" H 7800 10100 60  0001 C CNN
-	1    7800 10100
+P 5900 10250
+F 0 "C8" H 5950 10350 50  0000 L CNN
+F 1 "100nF" H 5950 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 5900 10250 60  0001 C CNN
+F 3 "" H 5900 10250 60  0001 C CNN
+	1    5900 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 46161CD3
-P 7450 10100
-F 0 "C7" H 7500 10200 50  0000 L CNN
-F 1 "100nF" H 7500 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 7450 10100 60  0001 C CNN
-F 3 "" H 7450 10100 60  0001 C CNN
-	1    7450 10100
+P 5550 10250
+F 0 "C7" H 5600 10350 50  0000 L CNN
+F 1 "100nF" H 5600 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 5550 10250 60  0001 C CNN
+F 3 "" H 5550 10250 60  0001 C CNN
+	1    5550 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C5
 U 1 1 46161CB8
-P 6650 10100
-F 0 "C5" H 6700 10200 50  0000 L CNN
-F 1 "100nF" H 6700 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 6650 10100 60  0001 C CNN
-F 3 "" H 6650 10100 60  0001 C CNN
-	1    6650 10100
+P 4750 10250
+F 0 "C5" H 4800 10350 50  0000 L CNN
+F 1 "100nF" H 4800 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 4750 10250 60  0001 C CNN
+F 3 "" H 4750 10250 60  0001 C CNN
+	1    4750 10250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C4
 U 1 1 46161CB5
-P 6300 10100
-F 0 "C4" H 6350 10200 50  0000 L CNN
-F 1 "100nF" H 6350 10000 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 6300 10100 60  0001 C CNN
-F 3 "" H 6300 10100 60  0001 C CNN
-	1    6300 10100
+P 4400 10250
+F 0 "C4" H 4450 10350 50  0000 L CNN
+F 1 "100nF" H 4450 10150 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 4400 10250 60  0001 C CNN
+F 3 "" H 4400 10250 60  0001 C CNN
+	1    4400 10250
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	1250 3350 1250 3400
+Wire Wire Line
+	2450 10500 2600 10500
+Connection ~ 2600 10500
+Wire Wire Line
+	3150 10550 3150 10500
+Wire Wire Line
+	3150 10500 2900 10500
+Connection ~ 2900 10500
+Connection ~ 7850 10500
+Wire Wire Line
+	8000 10550 8000 10500
+Connection ~ 8000 10500
+Wire Wire Line
+	4200 9950 4200 10000
+Connection ~ 4200 10000
+Wire Wire Line
+	4400 10000 4400 10050
+Wire Wire Line
+	2150 1650 2100 1650
+Wire Wire Line
+	2150 2000 2100 2000
+Wire Wire Line
+	2850 1050 2850 1100
+Wire Wire Line
+	3050 1100 3050 1050
+Wire Wire Line
+	2300 4050 2300 4100
+Wire Wire Line
+	2300 3750 2300 3700
+Wire Wire Line
+	1900 3550 1900 3500
+Wire Wire Line
+	5050 2750 5050 2800
+Wire Wire Line
+	4350 3350 4400 3350
+Wire Wire Line
+	13300 1000 13300 1050
+Wire Wire Line
+	14450 650  14450 700 
+Wire Wire Line
+	13850 1450 13850 1500
+Wire Wire Line
+	13850 1950 13850 1900
+Wire Wire Line
+	13300 2350 13300 2250
+Wire Wire Line
+	13100 2350 13100 2300
 $EndSCHEMATC
diff --git a/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch b/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
index 300fec8..b425a82 100644
--- a/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
+++ b/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
@@ -13,13 +13,13 @@ LIBS:special
 LIBS:microcontrollers
 LIBS:motorola
 LIBS:kit-dev-coldfire-xilinx_5213-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 3
 Title "Dev kit coldfire 5213"
-Date "8 feb 2008"
+Date "Sun 22 Mar 2015"
 Rev "0"
 Comp ""
 Comment1 ""
@@ -109,85 +109,125 @@ Wire Wire Line
 Wire Wire Line
 	3600 3800 3400 3800
 Wire Wire Line
-	10650 6550 10650 6600
-Connection ~ 10050 6600
+	10600 6350 10600 6400
+Connection ~ 10000 6400
 Wire Wire Line
-	10050 6600 10050 6550
-Connection ~ 9450 6600
+	10000 6400 10000 6350
+Connection ~ 9400 6400
 Wire Wire Line
-	9450 6600 9450 6550
-Connection ~ 8850 6600
+	9400 6400 9400 6350
+Connection ~ 8800 6400
 Wire Wire Line
-	8850 6600 8850 6550
+	8800 6400 8800 6350
 Wire Wire Line
-	10650 6600 7650 6600
+	10600 6400 10300 6400
 Wire Wire Line
-	7650 6100 10650 6100
-Connection ~ 9750 6100
-Connection ~ 9150 6100
-Connection ~ 8550 6100
+	10300 6400 10000 6400
+Wire Wire Line
+	10000 6400 9700 6400
+Wire Wire Line
+	9700 6400 9400 6400
+Wire Wire Line
+	9400 6400 9100 6400
+Wire Wire Line
+	9100 6400 8800 6400
+Wire Wire Line
+	8800 6400 8500 6400
+Wire Wire Line
+	8500 6400 8200 6400
+Wire Wire Line
+	8200 6400 7900 6400
+Wire Wire Line
+	7900 6400 7600 6400
+Wire Wire Line
+	7600 5900 7900 5900
+Wire Wire Line
+	7900 5900 8200 5900
+Wire Wire Line
+	8200 5900 8500 5900
+Wire Wire Line
+	8500 5900 8800 5900
+Wire Wire Line
+	8800 5900 9100 5900
+Wire Wire Line
+	9100 5900 9400 5900
+Wire Wire Line
+	9400 5900 9700 5900
+Wire Wire Line
+	9700 5900 10000 5900
+Wire Wire Line
+	10000 5900 10300 5900
+Wire Wire Line
+	10300 5900 10600 5900
+Connection ~ 9700 5900
+Connection ~ 9100 5900
+Connection ~ 8500 5900
 Wire Wire Line
 	2750 1300 2700 1300
 Wire Wire Line
-	7850 4950 8550 4950
+	8350 5100 9000 5100
+Wire Wire Line
+	9600 5100 9500 5100
+Connection ~ 7600 5900
 Wire Wire Line
-	9100 4950 9050 4950
-Connection ~ 7650 6100
+	7600 5950 7600 5900
 Wire Wire Line
-	7650 6150 7650 6050
-Connection ~ 10050 6100
-Connection ~ 7950 6100
+	7600 5900 7600 5850
+Connection ~ 10000 5900
+Connection ~ 7900 5900
 Wire Wire Line
-	7950 6100 7950 6150
-Connection ~ 8250 6100
+	7900 5900 7900 5950
+Connection ~ 8200 5900
 Wire Wire Line
-	8250 6100 8250 6150
+	8200 5900 8200 5950
 Wire Wire Line
-	8550 6100 8550 6150
-Connection ~ 8850 6100
+	8500 5900 8500 5950
+Connection ~ 8800 5900
 Wire Wire Line
-	9150 6100 9150 6150
-Connection ~ 9450 6100
+	9100 5900 9100 5950
+Connection ~ 9400 5900
 Wire Wire Line
-	9750 6100 9750 6150
-Connection ~ 8550 6600
-Connection ~ 10350 6100
+	9700 5900 9700 5950
+Connection ~ 8500 6400
+Connection ~ 10300 5900
 Wire Wire Line
-	10350 6150 10350 6100
+	10300 5950 10300 5900
 Wire Wire Line
-	10650 6100 10650 6150
-Connection ~ 7950 6600
+	10600 5900 10600 5950
+Connection ~ 7900 6400
 Wire Wire Line
-	7950 6550 7950 6600
-Connection ~ 8250 6600
+	7900 6350 7900 6400
+Connection ~ 8200 6400
 Wire Wire Line
-	8250 6600 8250 6550
+	8200 6400 8200 6350
 Wire Wire Line
-	8550 6600 8550 6550
+	8500 6400 8500 6350
 Wire Wire Line
-	7850 5250 8550 5250
+	8350 5400 9000 5400
 Wire Wire Line
-	9100 5250 9050 5250
+	9600 5400 9500 5400
 Wire Wire Line
 	2700 1100 3600 1100
 Wire Wire Line
-	8850 6100 8850 6150
+	8800 5900 8800 5950
 Wire Wire Line
-	9450 6100 9450 6150
+	9400 5900 9400 5950
 Wire Wire Line
-	10050 6100 10050 6150
+	10000 5900 10000 5950
 Wire Wire Line
-	7650 6650 7650 6550
-Connection ~ 7650 6600
+	7600 6450 7600 6400
 Wire Wire Line
-	9150 6600 9150 6550
-Connection ~ 9150 6600
+	7600 6400 7600 6350
+Connection ~ 7600 6400
 Wire Wire Line
-	9750 6600 9750 6550
-Connection ~ 9750 6600
+	9100 6400 9100 6350
+Connection ~ 9100 6400
 Wire Wire Line
-	10350 6600 10350 6550
-Connection ~ 10350 6600
+	9700 6400 9700 6350
+Connection ~ 9700 6400
+Wire Wire Line
+	10300 6400 10300 6350
+Connection ~ 10300 6400
 Wire Wire Line
 	7600 1200 7000 1200
 Wire Wire Line
@@ -343,13 +383,19 @@ Wire Wire Line
 Wire Wire Line
 	3450 1200 3450 1250
 Wire Wire Line
-	3600 900  2700 900 
+	3600 900  3050 900 
+Wire Wire Line
+	3050 900  2700 900 
 Wire Wire Line
 	3600 3900 3550 3900
 Wire Wire Line
-	3550 3900 3550 4100
+	3550 3900 3550 4000
+Wire Wire Line
+	3550 4000 3550 4100
 Wire Wire Line
-	3500 4100 3600 4100
+	3500 4100 3550 4100
+Wire Wire Line
+	3550 4100 3600 4100
 Connection ~ 3550 4100
 Wire Wire Line
 	5500 2600 6350 2600
@@ -373,7 +419,7 @@ L +3,3V #PWR0106
 U 1 1 4791D619
 P 10850 3900
 F 0 "#PWR0106" H 10850 3860 30  0001 C CNN
-F 1 "+3,3V" H 10850 4010 30  0000 C CNN
+F 1 "+3,3V" H 10850 4010 40  0000 C CNN
 F 2 "" H 10850 3900 60  0001 C CNN
 F 3 "" H 10850 3900 60  0001 C CNN
 	1    10850 3900
@@ -383,7 +429,7 @@ $Comp
 L R R64
 U 1 1 4791D59D
 P 10450 3900
-F 0 "R64" V 10530 3900 50  0000 C CNN
+F 0 "R64" V 10350 3900 50  0000 C CNN
 F 1 "3,3" V 10450 3900 50  0000 C CNN
 F 2 "discret:R4" H 10450 3900 60  0001 C CNN
 F 3 "" H 10450 3900 60  0001 C CNN
@@ -479,7 +525,7 @@ $Comp
 L XCR3256-TQ144 U9
 U 1 1 470F38BE
 P 4550 4100
-F 0 "U9" H 4600 4150 70  0000 C CNN
+F 0 "U9" H 4550 7550 70  0000 C CNN
 F 1 "XCR3256-TQ144" H 4550 500 60  0000 C CNN
 F 2 "lib_smd:TQFP144" H 4550 4100 60  0001 C CNN
 F 3 "" H 4550 4100 60  0001 C CNN
@@ -579,23 +625,23 @@ XIL_D35
 $Comp
 L GND #PWR0108
 U 1 1 46ADE620
-P 9600 4000
-F 0 "#PWR0108" H 9600 4000 30  0001 C CNN
-F 1 "GND" H 9600 3930 30  0001 C CNN
-F 2 "" H 9600 4000 60  0001 C CNN
-F 3 "" H 9600 4000 60  0001 C CNN
-	1    9600 4000
+P 9650 4000
+F 0 "#PWR0108" H 9650 4000 30  0001 C CNN
+F 1 "GND" H 9650 3930 30  0001 C CNN
+F 2 "" H 9650 4000 60  0001 C CNN
+F 3 "" H 9650 4000 60  0001 C CNN
+	1    9650 4000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR0109
 U 1 1 46ADE61B
-P 9600 2100
-F 0 "#PWR0109" H 9600 2100 30  0001 C CNN
-F 1 "GND" H 9600 2030 30  0001 C CNN
-F 2 "" H 9600 2100 60  0001 C CNN
-F 3 "" H 9600 2100 60  0001 C CNN
-	1    9600 2100
+P 9650 2100
+F 0 "#PWR0109" H 9650 2100 30  0001 C CNN
+F 1 "GND" H 9650 2030 30  0001 C CNN
+F 2 "" H 9650 2100 60  0001 C CNN
+F 3 "" H 9650 2100 60  0001 C CNN
+	1    9650 2100
 	0    -1   -1   0   
 $EndComp
 Text Label 3100 2700 0    60   ~ 0
@@ -660,7 +706,7 @@ $Comp
 L CONN_20X2 P4
 U 1 1 46ADE55A
 P 9200 3050
-F 0 "P4" H 9250 3100 60  0000 C CNN
+F 0 "P4" H 9200 4100 60  0000 C CNN
 F 1 "CONN_20X2" V 9200 3050 50  0000 C CNN
 F 2 "pin_array:PIN_ARRAY_20X2" H 9200 3050 60  0001 C CNN
 F 3 "" H 9200 3050 60  0001 C CNN
@@ -702,7 +748,7 @@ L +3,3V #PWR0110
 U 1 1 46A76BD3
 P 2750 1300
 F 0 "#PWR0110" H 2750 1260 30  0001 C CNN
-F 1 "+3,3V" V 2750 1500 30  0000 C CNN
+F 1 "+3,3V" V 2750 1500 40  0000 C CNN
 F 2 "" H 2750 1300 60  0001 C CNN
 F 3 "" H 2750 1300 60  0001 C CNN
 	1    2750 1300
@@ -711,238 +757,238 @@ $EndComp
 $Comp
 L +3,3V #PWR0111
 U 1 1 46A76BD2
-P 3550 650
-F 0 "#PWR0111" H 3550 610 30  0001 C CNN
-F 1 "+3,3V" H 3550 760 30  0000 C CNN
-F 2 "" H 3550 650 60  0001 C CNN
-F 3 "" H 3550 650 60  0001 C CNN
-	1    3550 650 
+P 3600 650
+F 0 "#PWR0111" H 3600 610 30  0001 C CNN
+F 1 "+3,3V" H 3600 760 40  0000 C CNN
+F 2 "" H 3600 650 60  0001 C CNN
+F 3 "" H 3600 650 60  0001 C CNN
+	1    3600 650 
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R57
 U 1 1 46A76BCA
 P 3300 650
-F 0 "R57" V 3380 650 50  0000 C CNN
+F 0 "R57" V 3200 650 50  0000 C CNN
 F 1 "4K7" V 3300 650 50  0000 C CNN
 F 2 "lib_smd:SM0805" H 3300 650 60  0001 C CNN
 F 3 "" H 3300 650 60  0001 C CNN
 	1    3300 650 
 	0    1    1    0   
 $EndComp
-Text Label 7850 4950 0    60   ~ 0
+Text Label 8350 5100 0    60   ~ 0
 LED_TEST1
 $Comp
 L GND #PWR0112
 U 1 1 46A76BC5
-P 9500 4950
-F 0 "#PWR0112" H 9500 4950 40  0001 C CNN
-F 1 "GND" H 9500 4880 40  0001 C CNN
-F 2 "" H 9500 4950 60  0001 C CNN
-F 3 "" H 9500 4950 60  0001 C CNN
-	1    9500 4950
+P 10050 5100
+F 0 "#PWR0112" H 10050 5100 40  0001 C CNN
+F 1 "GND" H 10050 5030 40  0001 C CNN
+F 2 "" H 10050 5100 60  0001 C CNN
+F 3 "" H 10050 5100 60  0001 C CNN
+	1    10050 5100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L LED D8
 U 1 1 46A76BC4
-P 9300 4950
-F 0 "D8" H 9300 5050 50  0000 C CNN
-F 1 "LED" H 9300 4850 50  0000 C CNN
-F 2 "lib_smd:SM1206POL" H 9300 4950 60  0001 C CNN
-F 3 "" H 9300 4950 60  0001 C CNN
-	1    9300 4950
+P 9800 5100
+F 0 "D8" H 9800 5200 50  0000 C CNN
+F 1 "LED" H 9800 5000 50  0000 C CNN
+F 2 "lib_smd:SM1206POL" H 9800 5100 60  0001 C CNN
+F 3 "" H 9800 5100 60  0001 C CNN
+	1    9800 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R62
 U 1 1 46A76BC3
-P 8800 4950
-F 0 "R62" V 8880 4950 50  0000 C CNN
-F 1 "1K" V 8800 4950 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 8800 4950 60  0001 C CNN
-F 3 "" H 8800 4950 60  0001 C CNN
-	1    8800 4950
+P 9250 5100
+F 0 "R62" V 9330 5100 50  0000 C CNN
+F 1 "1K" V 9250 5100 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 9250 5100 60  0001 C CNN
+F 3 "" H 9250 5100 60  0001 C CNN
+	1    9250 5100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR0113
 U 1 1 46A76BC1
-P 7650 6650
-F 0 "#PWR0113" H 7650 6650 30  0001 C CNN
-F 1 "GND" H 7650 6580 30  0001 C CNN
-F 2 "" H 7650 6650 60  0001 C CNN
-F 3 "" H 7650 6650 60  0001 C CNN
-	1    7650 6650
+P 7600 6450
+F 0 "#PWR0113" H 7600 6450 30  0001 C CNN
+F 1 "GND" H 7600 6380 30  0001 C CNN
+F 2 "" H 7600 6450 60  0001 C CNN
+F 3 "" H 7600 6450 60  0001 C CNN
+	1    7600 6450
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3,3V #PWR0114
 U 1 1 46A76BBF
-P 7650 6050
-F 0 "#PWR0114" H 7650 6010 30  0001 C CNN
-F 1 "+3,3V" H 7650 6160 30  0000 C CNN
-F 2 "" H 7650 6050 60  0001 C CNN
-F 3 "" H 7650 6050 60  0001 C CNN
-	1    7650 6050
+P 7600 5850
+F 0 "#PWR0114" H 7600 5810 30  0001 C CNN
+F 1 "+3,3V" H 7600 5960 40  0000 C CNN
+F 2 "" H 7600 5850 60  0001 C CNN
+F 3 "" H 7600 5850 60  0001 C CNN
+	1    7600 5850
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C61
 U 1 1 46A76BBC
-P 10650 6350
-F 0 "C61" H 10700 6450 50  0000 L CNN
-F 1 "100nF" H 10650 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 10650 6350 60  0001 C CNN
-F 3 "" H 10650 6350 60  0001 C CNN
-	1    10650 6350
+P 10600 6150
+F 0 "C61" H 10650 6250 50  0000 L CNN
+F 1 "100nF" H 10600 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 10600 6150 60  0001 C CNN
+F 3 "" H 10600 6150 60  0001 C CNN
+	1    10600 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C60
 U 1 1 46A76BBB
-P 10350 6350
-F 0 "C60" H 10400 6450 50  0000 L CNN
-F 1 "100nF" H 10350 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 10350 6350 60  0001 C CNN
-F 3 "" H 10350 6350 60  0001 C CNN
-	1    10350 6350
+P 10300 6150
+F 0 "C60" H 10350 6250 50  0000 L CNN
+F 1 "100nF" H 10300 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 10300 6150 60  0001 C CNN
+F 3 "" H 10300 6150 60  0001 C CNN
+	1    10300 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C59
 U 1 1 46A76BBA
-P 10050 6350
-F 0 "C59" H 10100 6450 50  0000 L CNN
-F 1 "100nF" H 10050 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 10050 6350 60  0001 C CNN
-F 3 "" H 10050 6350 60  0001 C CNN
-	1    10050 6350
+P 10000 6150
+F 0 "C59" H 10050 6250 50  0000 L CNN
+F 1 "100nF" H 10000 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 10000 6150 60  0001 C CNN
+F 3 "" H 10000 6150 60  0001 C CNN
+	1    10000 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C54
 U 1 1 46A76BB5
-P 8550 6350
-F 0 "C54" H 8600 6450 50  0000 L CNN
-F 1 "100nF" H 8550 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 8550 6350 60  0001 C CNN
-F 3 "" H 8550 6350 60  0001 C CNN
-	1    8550 6350
+P 8500 6150
+F 0 "C54" H 8550 6250 50  0000 L CNN
+F 1 "100nF" H 8500 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 8500 6150 60  0001 C CNN
+F 3 "" H 8500 6150 60  0001 C CNN
+	1    8500 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C53
 U 1 1 46A76BB4
-P 8250 6350
-F 0 "C53" H 8300 6450 50  0000 L CNN
-F 1 "100nF" H 8250 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 8250 6350 60  0001 C CNN
-F 3 "" H 8250 6350 60  0001 C CNN
-	1    8250 6350
+P 8200 6150
+F 0 "C53" H 8250 6250 50  0000 L CNN
+F 1 "100nF" H 8200 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 8200 6150 60  0001 C CNN
+F 3 "" H 8200 6150 60  0001 C CNN
+	1    8200 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C52
 U 1 1 46A76BB3
-P 7950 6350
-F 0 "C52" H 8000 6450 50  0000 L CNN
-F 1 "100nF" H 7950 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 7950 6350 60  0001 C CNN
-F 3 "" H 7950 6350 60  0001 C CNN
-	1    7950 6350
+P 7900 6150
+F 0 "C52" H 7950 6250 50  0000 L CNN
+F 1 "100nF" H 7900 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 7900 6150 60  0001 C CNN
+F 3 "" H 7900 6150 60  0001 C CNN
+	1    7900 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C51
 U 1 1 46A76BB2
-P 7650 6350
-F 0 "C51" H 7700 6450 50  0000 L CNN
-F 1 "100nF" H 7650 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 7650 6350 60  0001 C CNN
-F 3 "" H 7650 6350 60  0001 C CNN
-	1    7650 6350
+P 7600 6150
+F 0 "C51" H 7650 6250 50  0000 L CNN
+F 1 "100nF" H 7600 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 7600 6150 60  0001 C CNN
+F 3 "" H 7600 6150 60  0001 C CNN
+	1    7600 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C58
 U 1 1 46A76BB1
-P 9750 6350
-F 0 "C58" H 9800 6450 50  0000 L CNN
-F 1 "100nF" H 9750 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 9750 6350 60  0001 C CNN
-F 3 "" H 9750 6350 60  0001 C CNN
-	1    9750 6350
+P 9700 6150
+F 0 "C58" H 9750 6250 50  0000 L CNN
+F 1 "100nF" H 9700 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 9700 6150 60  0001 C CNN
+F 3 "" H 9700 6150 60  0001 C CNN
+	1    9700 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C57
 U 1 1 46A76BB0
-P 9450 6350
-F 0 "C57" H 9500 6450 50  0000 L CNN
-F 1 "100nF" H 9450 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 9450 6350 60  0001 C CNN
-F 3 "" H 9450 6350 60  0001 C CNN
-	1    9450 6350
+P 9400 6150
+F 0 "C57" H 9450 6250 50  0000 L CNN
+F 1 "100nF" H 9400 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 9400 6150 60  0001 C CNN
+F 3 "" H 9400 6150 60  0001 C CNN
+	1    9400 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C56
 U 1 1 46A76BAF
-P 9150 6350
-F 0 "C56" H 9200 6450 50  0000 L CNN
-F 1 "100nF" H 9150 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 9150 6350 60  0001 C CNN
-F 3 "" H 9150 6350 60  0001 C CNN
-	1    9150 6350
+P 9100 6150
+F 0 "C56" H 9150 6250 50  0000 L CNN
+F 1 "100nF" H 9100 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 9100 6150 60  0001 C CNN
+F 3 "" H 9100 6150 60  0001 C CNN
+	1    9100 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C55
 U 1 1 46A76BAE
-P 8850 6350
-F 0 "C55" H 8900 6450 50  0000 L CNN
-F 1 "100nF" H 8850 6250 50  0000 L CNN
-F 2 "lib_smd:SM0805" H 8850 6350 60  0001 C CNN
-F 3 "" H 8850 6350 60  0001 C CNN
-	1    8850 6350
+P 8800 6150
+F 0 "C55" H 8850 6250 50  0000 L CNN
+F 1 "100nF" H 8800 6050 50  0000 L CNN
+F 2 "lib_smd:SM0805" H 8800 6150 60  0001 C CNN
+F 3 "" H 8800 6150 60  0001 C CNN
+	1    8800 6150
 	1    0    0    -1  
 $EndComp
-Text Label 7850 5250 0    60   ~ 0
+Text Label 8350 5400 0    60   ~ 0
 LED_TEST2
 Text Label 2800 900  0    60   ~ 0
 TCK
 $Comp
 L GND #PWR0115
 U 1 1 46A76BA9
-P 9500 5250
-F 0 "#PWR0115" H 9500 5250 40  0001 C CNN
-F 1 "GND" H 9500 5180 40  0001 C CNN
-F 2 "" H 9500 5250 60  0001 C CNN
-F 3 "" H 9500 5250 60  0001 C CNN
-	1    9500 5250
+P 10050 5400
+F 0 "#PWR0115" H 10050 5400 40  0001 C CNN
+F 1 "GND" H 10050 5330 40  0001 C CNN
+F 2 "" H 10050 5400 60  0001 C CNN
+F 3 "" H 10050 5400 60  0001 C CNN
+	1    10050 5400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L LED D9
 U 1 1 46A76BA8
-P 9300 5250
-F 0 "D9" H 9300 5350 50  0000 C CNN
-F 1 "LED" H 9300 5150 50  0000 C CNN
-F 2 "lib_smd:SM1206POL" H 9300 5250 60  0001 C CNN
-F 3 "" H 9300 5250 60  0001 C CNN
-	1    9300 5250
+P 9800 5400
+F 0 "D9" H 9800 5500 50  0000 C CNN
+F 1 "LED" H 9800 5300 50  0000 C CNN
+F 2 "lib_smd:SM1206POL" H 9800 5400 60  0001 C CNN
+F 3 "" H 9800 5400 60  0001 C CNN
+	1    9800 5400
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R63
 U 1 1 46A76BA7
-P 8800 5250
-F 0 "R63" V 8880 5250 50  0000 C CNN
-F 1 "1K" V 8800 5250 50  0000 C CNN
-F 2 "lib_smd:SM0805" H 8800 5250 60  0001 C CNN
-F 3 "" H 8800 5250 60  0001 C CNN
-	1    8800 5250
+P 9250 5400
+F 0 "R63" V 9330 5400 50  0000 C CNN
+F 1 "1K" V 9250 5400 50  0000 C CNN
+F 2 "lib_smd:SM0805" H 9250 5400 60  0001 C CNN
+F 3 "" H 9250 5400 60  0001 C CNN
+	1    9250 5400
 	0    -1   -1   0   
 $EndComp
 Text Label 2800 1100 0    60   ~ 0
@@ -965,12 +1011,12 @@ $EndComp
 $Comp
 L GND #PWR0116
 U 1 1 46A76BA5
-P 2700 1200
-F 0 "#PWR0116" H 2700 1200 40  0001 C CNN
-F 1 "GND" H 2700 1130 40  0001 C CNN
-F 2 "" H 2700 1200 60  0001 C CNN
-F 3 "" H 2700 1200 60  0001 C CNN
-	1    2700 1200
+P 2750 1200
+F 0 "#PWR0116" H 2750 1200 40  0001 C CNN
+F 1 "GND" H 2750 1130 40  0001 C CNN
+F 2 "" H 2750 1200 60  0001 C CNN
+F 3 "" H 2750 1200 60  0001 C CNN
+	1    2750 1200
 	0    -1   -1   0   
 $EndComp
 Text HLabel 1300 2600 0    60   Input ~ 0
@@ -993,4 +1039,16 @@ Text HLabel 1300 2300 0    60   Input ~ 0
 QSPI_CS2
 Text HLabel 1300 2200 0    60   Input ~ 0
 IRQ-1
+Wire Wire Line
+	3600 650  3550 650 
+Wire Wire Line
+	2750 1200 2700 1200
+Wire Wire Line
+	9650 2100 9600 2100
+Wire Wire Line
+	9650 4000 9600 4000
+Wire Wire Line
+	10050 5400 10000 5400
+Wire Wire Line
+	10000 5100 10050 5100
 $EndSCHEMATC
diff --git a/demos/pic_programmer/pic_programmer.sch b/demos/pic_programmer/pic_programmer.sch
index 037a73f..9464bfa 100644
--- a/demos/pic_programmer/pic_programmer.sch
+++ b/demos/pic_programmer/pic_programmer.sch
@@ -1,17 +1,12 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:74xx
-LIBS:conn
-LIBS:xilinx
 LIBS:pic_programmer-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 2
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
-Date "05 jan 2014"
+Date "Sun 22 Mar 2015"
 Rev "2"
 Comp "KiCad"
 Comment1 ""
@@ -19,413 +14,193 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Wire Wire Line
-	5700 1250 6100 1250
-Wire Wire Line
-	5700 1250 5700 1200
-Wire Wire Line
-	8650 3200 8650 3150
-Wire Wire Line
-	6550 1600 7100 1600
-Wire Wire Line
-	7400 2900 7350 2900
-Wire Wire Line
-	7650 3300 7650 3200
-Wire Wire Line
-	8000 2900 7900 2900
-Wire Wire Line
-	8300 3200 8300 3100
-Wire Wire Line
-	9450 5900 9400 5900
-Wire Wire Line
-	9400 5900 9400 5650
-Wire Wire Line
-	9400 5650 8750 5650
-Wire Wire Line
-	9750 6150 9600 6150
-Wire Wire Line
-	9750 5650 9600 5650
-Connection ~ 1400 6850
-Wire Wire Line
-	1600 6850 1600 6900
-Wire Wire Line
-	1350 6850 1600 6850
-Wire Wire Line
-	8300 3500 9200 3500
-Wire Wire Line
-	9200 4150 8250 4150
-Wire Wire Line
-	9200 3850 8250 3850
-Wire Wire Line
-	10250 5350 10250 5650
-Wire Wire Line
-	9200 5400 8800 5400
-Wire Wire Line
-	8800 5400 8800 5150
-Wire Wire Line
-	9050 6300 9200 6300
-Wire Wire Line
-	9200 6300 9200 6000
-Wire Wire Line
-	9200 6000 9250 6000
-Wire Wire Line
-	8800 6000 8600 6000
-Wire Wire Line
-	8600 6000 8600 6100
-Wire Wire Line
-	8100 6100 8000 6100
-Wire Wire Line
-	8000 6100 8000 6300
-Wire Wire Line
-	8000 6300 8650 6300
-Wire Wire Line
-	7450 6150 7450 6100
-Wire Wire Line
-	7450 6100 7600 6100
-Wire Notes Line
-	11150 4500 11150 6450
-Wire Notes Line
-	11150 4500 6400 4500
-Wire Wire Line
-	8800 5150 8750 5150
-Wire Wire Line
-	9400 5050 9400 5150
-Wire Notes Line
-	6400 4500 6400 6450
-Wire Notes Line
-	6400 6450 11150 6450
-Wire Wire Line
-	10250 6150 10250 6200
-Connection ~ 10050 5400
-Wire Wire Line
-	10050 5350 10050 5400
-Wire Wire Line
-	7750 4700 7750 4650
-Wire Wire Line
-	10800 5450 10800 5400
-Wire Wire Line
-	10800 5400 10750 5400
-Connection ~ 10250 5400
-Wire Wire Line
-	9600 5400 10350 5400
-Wire Wire Line
-	1700 3700 2250 3700
-Wire Wire Line
-	3900 4200 2250 4200
-Wire Wire Line
-	2250 4200 2250 3700
-Connection ~ 3400 6650
-Wire Wire Line
-	3400 6650 3400 6600
-Connection ~ 3200 6650
-Wire Wire Line
-	3100 6650 3600 6650
-Wire Wire Line
-	4150 6750 4150 6650
-Wire Wire Line
-	4150 6650 4100 6650
-Wire Wire Line
-	3200 6650 3200 6700
-Connection ~ 1950 6650
-Wire Wire Line
-	1950 6700 1950 6650
-Wire Wire Line
-	1850 6650 2300 6650
-Wire Wire Line
-	1400 6900 1400 6850
-Wire Wire Line
-	1450 6650 1350 6650
-Wire Wire Line
-	7600 1600 8250 1600
-Wire Wire Line
-	5950 5100 5350 5100
-Wire Wire Line
-	5350 3150 6200 3150
-Wire Wire Line
-	5150 1700 4950 1700
-Wire Wire Line
-	5450 1400 5450 1500
-Wire Wire Line
-	5450 1400 5500 1400
-Connection ~ 6100 1400
-Wire Wire Line
-	6000 1400 6250 1400
-Wire Wire Line
-	6100 1250 6100 1400
-Wire Wire Line
-	6550 1200 6550 1100
-Wire Wire Line
-	6550 1600 6550 1650
-Wire Wire Line
-	6550 2600 6550 2650
-Wire Wire Line
-	6550 2150 6550 2200
-Wire Wire Line
-	2100 5100 3250 5100
-Wire Wire Line
-	2100 5100 2100 3500
-Wire Wire Line
-	2100 3500 1700 3500
-Wire Wire Line
-	2450 3800 2450 3150
-Wire Wire Line
-	2450 3800 1700 3800
-Wire Wire Line
-	2250 1700 2850 1700
-Wire Wire Line
-	2250 1700 2250 3600
-Wire Wire Line
-	2250 3600 1700 3600
-Wire Wire Line
-	2450 3150 3250 3150
-Connection ~ 5400 3150
-Wire Wire Line
-	4800 4200 5400 4200
-Wire Wire Line
-	5400 4200 5400 3150
-Wire Wire Line
-	4850 5100 4800 5100
-Wire Wire Line
-	4450 1700 4400 1700
-Wire Wire Line
-	4850 3150 4800 3150
-Connection ~ 3200 5100
-Wire Wire Line
-	3200 5150 3200 5100
-Wire Wire Line
-	3850 5050 3850 5200
-Connection ~ 3850 5100
-Wire Wire Line
-	3750 5100 3900 5100
-Connection ~ 3200 3150
-Wire Wire Line
-	3200 3200 3200 3150
-Wire Wire Line
-	3850 3100 3850 3250
-Connection ~ 3850 3150
-Wire Wire Line
-	3750 3150 3900 3150
-Connection ~ 2800 1700
-Wire Wire Line
-	2800 1750 2800 1700
-Wire Wire Line
-	3450 1650 3450 1800
-Connection ~ 3450 1700
-Wire Wire Line
-	3350 1700 3500 1700
-Wire Wire Line
-	7900 2900 7900 2650
-Wire Wire Line
-	8150 3200 9200 3200
-Connection ~ 8300 3200
-Wire Wire Line
-	5450 1500 5850 1500
-Wire Wire Line
-	5850 1500 5850 2900
-Wire Wire Line
-	5850 2900 6950 2900
-Wire Wire Line
-	7050 1850 7050 1600
-Connection ~ 7050 1600
-Wire Wire Line
-	5700 800  5700 750 
-Wire Wire Line
-	5700 750  6100 750 
-Wire Wire Line
-	6100 750  6100 700 
 $Comp
 L C C9
 U 1 1 464AD280
-P 5700 1000
-F 0 "C9" H 5750 1100 50  0000 L CNN
-F 1 "22OnF" H 5750 900 50  0000 L CNN
-F 2 "discret:C1-1" H 5500 900 30  0000 C CNN
-F 3 "" H 5700 1000 60  0001 C CNN
-	1    5700 1000
+P 6700 1150
+F 0 "C9" H 6750 1250 50  0000 L CNN
+F 1 "22OnF" H 6750 1050 50  0000 L CNN
+F 2 "discret:C1-1" H 6900 950 30  0000 C CNN
+F 3 "" H 6700 1150 60  0001 C CNN
+	1    6700 1150
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR01
 U 1 1 4639BB04
-P 8650 2550
-F 0 "#PWR01" H 8650 2650 30  0001 C CNN
-F 1 "VCC" H 8650 2650 30  0000 C CNN
-F 2 "" H 8650 2550 60  0001 C CNN
-F 3 "" H 8650 2550 60  0001 C CNN
-	1    8650 2550
+P 8100 3550
+F 0 "#PWR01" H 8100 3650 30  0001 C CNN
+F 1 "VCC" H 8100 3650 40  0000 C CNN
+F 2 "" H 8100 3550 60  0001 C CNN
+F 3 "" H 8100 3550 60  0001 C CNN
+	1    8100 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L JUMPER JP1
 U 1 1 4639BAF8
-P 8650 2850
-F 0 "JP1" H 8650 3000 60  0000 C CNN
-F 1 "JUMPER" H 8650 2770 40  0000 C CNN
-F 2 "connect:GS2" H 8650 3050 30  0000 C CNN
-F 3 "" H 8650 2850 60  0001 C CNN
-	1    8650 2850
+P 8100 3900
+F 0 "JP1" V 7800 3750 60  0000 C CNN
+F 1 "JUMPER" H 8100 4050 40  0000 C CNN
+F 2 "connect:GS2" H 8100 4100 30  0000 C CNN
+F 3 "" H 8100 3900 60  0001 C CNN
+	1    8100 3900
 	0    1    1    0   
 $EndComp
 $Comp
 L DIODESCH D11
 U 1 1 4639BA28
-P 7150 2900
-F 0 "D11" H 7150 3000 40  0000 C CNN
-F 1 "BAT43" H 7150 2800 40  0000 C CNN
-F 2 "discret:D3" H 7150 3050 30  0000 C CNN
-F 3 "" H 7150 2900 60  0001 C CNN
-	1    7150 2900
-	-1   0    0    1   
+P 7200 4900
+F 0 "D11" V 7100 5100 50  0000 C CNN
+F 1 "BAT43" V 7200 5100 50  0000 C CNN
+F 2 "discret:D3" V 7300 5100 30  0000 C CNN
+F 3 "" H 7200 4900 60  0001 C CNN
+	1    7200 4900
+	0    1    1    0   
 $EndComp
 $Comp
 L VCC #PWR02
 U 1 1 4639BA17
-P 8300 2700
-F 0 "#PWR02" H 8300 2800 30  0001 C CNN
-F 1 "VCC" H 8300 2800 30  0000 C CNN
-F 2 "" H 8300 2700 60  0001 C CNN
-F 3 "" H 8300 2700 60  0001 C CNN
-	1    8300 2700
+P 7600 3750
+F 0 "#PWR02" H 7600 3850 30  0001 C CNN
+F 1 "VCC" H 7600 3850 40  0000 C CNN
+F 2 "" H 7600 3750 60  0001 C CNN
+F 3 "" H 7600 3750 60  0001 C CNN
+	1    7600 3750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR03
 U 1 1 4639B9EB
-P 7650 3700
-F 0 "#PWR03" H 7650 3700 30  0001 C CNN
-F 1 "GND" H 7650 3630 30  0001 C CNN
-F 2 "" H 7650 3700 60  0001 C CNN
-F 3 "" H 7650 3700 60  0001 C CNN
-	1    7650 3700
+P 7600 5450
+F 0 "#PWR03" H 7600 5450 30  0001 C CNN
+F 1 "GND" H 7600 5380 30  0001 C CNN
+F 2 "" H 7600 5450 60  0001 C CNN
+F 3 "" H 7600 5450 60  0001 C CNN
+	1    7600 5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED D12
 U 1 1 4639B9EA
-P 7650 3500
-F 0 "D12" H 7650 3600 50  0000 C CNN
-F 1 "YELLOW-LED" H 7650 3400 50  0000 C CNN
-F 2 "discret:LEDV" H 7650 3650 30  0000 C CNN
-F 3 "" H 7650 3500 60  0001 C CNN
-	1    7650 3500
+P 7600 5200
+F 0 "D12" V 7500 5050 50  0000 C CNN
+F 1 "YELLOW-LED" H 7600 5350 50  0000 C CNN
+F 2 "discret:LEDV" H 7600 5400 30  0000 C CNN
+F 3 "" H 7600 5200 60  0001 C CNN
+	1    7600 5200
 	0    1    1    0   
 $EndComp
 $Comp
 L R R21
 U 1 1 4639B9E9
-P 7900 3200
-F 0 "R21" V 7980 3200 50  0000 C CNN
-F 1 "470" V 7900 3200 50  0000 C CNN
-F 2 "discret:R4" V 7824 3189 30  0000 C CNN
-F 3 "" H 7900 3200 60  0001 C CNN
-	1    7900 3200
-	0    -1   -1   0   
+P 7600 4650
+F 0 "R21" H 7700 4450 50  0000 C CNN
+F 1 "470" V 7600 4650 50  0000 C CNN
+F 2 "discret:R4" V 7524 4639 30  0000 C CNN
+F 3 "" H 7600 4650 60  0001 C CNN
+	1    7600 4650
+	-1   0    0    1   
 $EndComp
 $Comp
 L R R20
 U 1 1 4639B9B3
-P 7650 2650
-F 0 "R20" V 7730 2650 50  0000 C CNN
-F 1 "2.2K" V 7650 2650 50  0000 C CNN
-F 2 "discret:R4" V 7778 2650 30  0000 C CNN
-F 3 "" H 7650 2650 60  0001 C CNN
-	1    7650 2650
-	0    -1   -1   0   
+P 7200 3650
+F 0 "R20" H 7300 3850 50  0000 C CNN
+F 1 "2.2K" V 7200 3650 50  0000 C CNN
+F 2 "discret:R4" V 7150 3650 30  0000 C CNN
+F 3 "" H 7200 3650 60  0001 C CNN
+	1    7200 3650
+	-1   0    0    -1  
 $EndComp
 $Comp
 L R R19
 U 1 1 4639B9B0
-P 7650 2900
-F 0 "R19" V 7730 2900 50  0000 C CNN
-F 1 "2.2K" V 7650 2900 50  0000 C CNN
-F 2 "discret:R4" V 7578 2900 30  0000 C CNN
-F 3 "" H 7650 2900 60  0001 C CNN
-	1    7650 2900
-	0    -1   -1   0   
+P 7200 4350
+F 0 "R19" H 7300 4150 50  0000 C CNN
+F 1 "2.2K" V 7200 4350 50  0000 C CNN
+F 2 "discret:R4" V 7128 4350 30  0000 C CNN
+F 3 "" H 7200 4350 60  0001 C CNN
+	1    7200 4350
+	-1   0    0    1   
 $EndComp
 $Comp
 L PNP Q3
 U 1 1 4639B996
-P 8200 2900
-F 0 "Q3" H 8350 2900 60  0000 C CNN
-F 1 "BC307" H 8104 3050 60  0000 C CNN
-F 2 "discret:TO92" H 8100 3100 30  0000 C CNN
-F 3 "" H 8200 2900 60  0001 C CNN
-	1    8200 2900
+P 7500 4000
+F 0 "Q3" H 7800 3800 60  0000 C CNN
+F 1 "BC307" H 7800 3900 60  0000 C CNN
+F 2 "discret:TO92" H 7800 4100 30  0000 C CNN
+F 3 "" H 7500 4000 60  0001 C CNN
+	1    7500 4000
 	1    0    0    1   
 $EndComp
 $Comp
 L VCC #PWR04
 U 1 1 4638AB33
-P 7400 2650
-F 0 "#PWR04" H 7400 2750 30  0001 C CNN
-F 1 "VCC" H 7400 2750 30  0000 C CNN
-F 2 "" H 7400 2650 60  0001 C CNN
-F 3 "" H 7400 2650 60  0001 C CNN
-	1    7400 2650
-	1    0    0    -1  
+P 7200 3300
+F 0 "#PWR04" H 7200 3400 30  0001 C CNN
+F 1 "VCC" H 7200 3400 40  0000 C CNN
+F 2 "" H 7200 3300 60  0001 C CNN
+F 3 "" H 7200 3300 60  0001 C CNN
+	1    7200 3300
+	-1   0    0    -1  
 $EndComp
-Text Notes 9800 5900 0    50   ~ 0
+Text Notes 2750 6850 0    50   ~ 0
 ADJUST for VPP = 13V
 $Comp
 L POT RV1
 U 1 1 443D0101
-P 9600 5900
-F 0 "RV1" H 9600 5800 50  0000 C CNN
-F 1 "1K" H 9600 5900 50  0000 C CNN
-F 2 "discret:RV2X4" H 9600 5750 30  0000 C CNN
-F 3 "" H 9600 5900 60  0001 C CNN
-	1    9600 5900
+P 3800 6700
+F 0 "RV1" H 3800 6600 50  0000 C CNN
+F 1 "1K" H 3800 6700 50  0000 C CNN
+F 2 "discret:RV2X4" H 3800 6550 30  0000 C CNN
+F 3 "" H 3800 6700 60  0001 C CNN
+	1    3800 6700
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R18
 U 1 1 44369638
-P 7350 1600
-F 0 "R18" V 7430 1600 50  0000 C CNN
-F 1 "220" V 7350 1600 50  0000 C CNN
-F 2 "discret:R4" V 7500 1600 60  0000 C CNN
-F 3 "" H 7350 1600 60  0001 C CNN
-	1    7350 1600
+P 8350 1900
+F 0 "R18" V 8430 1900 50  0000 C CNN
+F 1 "220" V 8350 1900 50  0000 C CNN
+F 2 "discret:R4" V 8250 1900 40  0000 C CNN
+F 3 "" H 8350 1900 60  0001 C CNN
+	1    8350 1900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR05
 U 1 1 442AABC2
-P 6550 2650
-F 0 "#PWR05" H 6550 2650 30  0001 C CNN
-F 1 "GND" H 6550 2580 30  0001 C CNN
-F 2 "" H 6550 2650 60  0001 C CNN
-F 3 "" H 6550 2650 60  0001 C CNN
-	1    6550 2650
+P 7600 3050
+F 0 "#PWR05" H 7600 3050 30  0001 C CNN
+F 1 "GND" H 7600 2980 30  0001 C CNN
+F 2 "" H 7600 3050 60  0001 C CNN
+F 3 "" H 7600 3050 60  0001 C CNN
+	1    7600 3050
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG06
 U 1 1 442A8330
-P 1600 6900
-F 0 "#FLG06" H 1600 7170 30  0001 C CNN
-F 1 "PWR_FLAG" H 1600 7130 30  0000 C CNN
-F 2 "" H 1600 6900 60  0001 C CNN
-F 3 "" H 1600 6900 60  0001 C CNN
-	1    1600 6900
+P 10050 3850
+F 0 "#FLG06" H 10050 4120 30  0001 C CNN
+F 1 "PWR_FLAG" H 10050 4050 30  0000 C CNN
+F 2 "" H 10050 3850 60  0001 C CNN
+F 3 "" H 10050 3850 60  0001 C CNN
+	1    10050 3850
 	-1   0    0    1   
 $EndComp
-Text Label 8400 4150 0    60   ~ 0
-CLOCK-RB6
-Text Label 8350 3850 0    60   ~ 0
-DATA-RB7
-Text Label 8400 3500 0    60   ~ 0
-VPP/MCLR
 $Sheet
-S 9200 3100 1550 1200
+S 9500 1750 1550 1200
 U 4804A5E2
 F0 "pic_sockets" 60
 F1 "pic_sockets.sch" 60
-F2 "VPP-MCLR" I L 9200 3500 60 
-F3 "CLOCK-RB6" I L 9200 4150 60 
-F4 "DATA-RB7" I L 9200 3850 60 
-F5 "VCC_PIC" I L 9200 3200 60 
+F2 "VPP-MCLR" I L 9500 1900 60 
+F3 "CLOCK-RB6" I L 9500 2800 60 
+F4 "DATA-RB7" I L 9500 2500 60 
+F5 "VCC_PIC" I L 9500 2200 60 
 $EndSheet
 Text Label 1850 3800 0    60   ~ 0
 DTR
@@ -435,198 +210,143 @@ Text Label 1850 3600 0    60   ~ 0
 TXD
 Text Label 1850 3500 0    60   ~ 0
 RTS
-Text Notes 850  6500 0    60   ~ 0
+Text Notes 9250 3500 0    60   ~ 0
 8 to 15V
-NoConn ~ 6750 5150
+NoConn ~ 1100 5800
 $Comp
 L DIODESCH D10
 U 1 1 442A6026
-P 9400 5400
-F 0 "D10" H 9400 5500 40  0000 C CNN
-F 1 "SCHOTTKY" H 9400 5300 40  0000 C CNN
-F 2 "discret:D5" H 9400 5250 30  0000 C CNN
-F 3 "" H 9400 5400 60  0001 C CNN
-	1    9400 5400
+P 3500 5800
+F 0 "D10" H 3500 5900 40  0000 C CNN
+F 1 "SCHOTTKY" H 3500 5700 40  0000 C CNN
+F 2 "discret:D5" H 3500 5650 30  0000 C CNN
+F 3 "" H 3500 5800 60  0001 C CNN
+	1    3500 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R10
 U 1 1 442A5F83
-P 8350 6100
-F 0 "R10" V 8430 6100 50  0000 C CNN
-F 1 "5,1K" V 8350 6100 50  0000 C CNN
-F 2 "discret:R4" V 8250 6100 30  0000 C CNN
-F 3 "" H 8350 6100 60  0001 C CNN
-	1    8350 6100
-	0    -1   -1   0   
+P 2250 7100
+F 0 "R10" V 2330 7100 50  0000 C CNN
+F 1 "5.1K" V 2250 7100 50  0000 C CNN
+F 2 "discret:R4" V 2150 7100 30  0000 C CNN
+F 3 "" H 2250 7100 60  0001 C CNN
+	1    2250 7100
+	0    1    -1   0   
 $EndComp
 $Comp
 L C C4
 U 1 1 442A5F61
-P 8850 6300
-F 0 "C4" H 8900 6400 50  0000 L CNN
-F 1 "0" V 8900 6200 50  0000 L CNN
-F 2 "discret:C1-1" V 8800 6100 30  0000 C CNN
-F 3 "" H 8850 6300 60  0001 C CNN
-	1    8850 6300
-	0    -1   -1   0   
+P 1800 7400
+F 0 "C4" H 1850 7500 50  0000 L CNN
+F 1 "0" V 1850 7300 50  0000 L CNN
+F 2 "discret:C1-1" V 1750 7200 30  0000 C CNN
+F 3 "" H 1800 7400 60  0001 C CNN
+	1    1800 7400
+	0    1    -1   0   
 $EndComp
 $Comp
 L LT1373 U4
 U 1 1 442A5E20
-P 7750 5400
-F 0 "U4" H 8350 5900 60  0000 C CNN
-F 1 "LT1373" H 7250 5900 60  0000 C CNN
-F 2 "dip_sockets:DIP-8__300_ELL" H 7350 5850 30  0000 C CNN
-F 3 "" H 7750 5400 60  0001 C CNN
-	1    7750 5400
+P 2100 6050
+F 0 "U4" H 2700 6550 60  0000 C CNN
+F 1 "LT1373" H 1600 6550 60  0000 C CNN
+F 2 "dip_sockets:DIP-8__300_ELL" H 1700 6500 30  0000 C CNN
+F 3 "" H 2100 6050 60  0001 C CNN
+	1    2100 6050
 	1    0    0    -1  
 $EndComp
-Text Notes 6550 4650 0    60   ~ 0
+Text Notes 900  5300 0    60   ~ 0
 VPP (13V) power
 $Comp
 L GND #PWR07
 U 1 1 442A58DF
-P 10250 6200
-F 0 "#PWR07" H 10250 6200 30  0001 C CNN
-F 1 "GND" H 10250 6130 30  0001 C CNN
-F 2 "" H 10250 6200 60  0001 C CNN
-F 3 "" H 10250 6200 60  0001 C CNN
-	1    10250 6200
+P 3800 7550
+F 0 "#PWR07" H 3800 7550 30  0001 C CNN
+F 1 "GND" H 3800 7480 30  0001 C CNN
+F 2 "" H 3800 7550 60  0001 C CNN
+F 3 "" H 3800 7550 60  0001 C CNN
+	1    3800 7550
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R16
 U 1 1 442A58DC
-P 10000 5650
-F 0 "R16" V 10080 5650 50  0000 C CNN
-F 1 "62K" V 10000 5650 50  0000 C CNN
-F 2 "discret:R4" V 9929 5647 30  0000 C CNN
-F 3 "" H 10000 5650 60  0001 C CNN
-	1    10000 5650
-	0    -1   -1   0   
+P 3800 6150
+F 0 "R16" V 3880 6150 50  0000 C CNN
+F 1 "62K" V 3800 6150 50  0000 C CNN
+F 2 "discret:R4" V 3729 6147 30  0000 C CNN
+F 3 "" H 3800 6150 60  0001 C CNN
+	1    3800 6150
+	-1   0    0    1   
 $EndComp
 $Comp
 L R R15
 U 1 1 442A58D7
-P 10000 6150
-F 0 "R15" V 10080 6150 50  0000 C CNN
-F 1 "6.2K" V 10000 6150 50  0000 C CNN
-F 2 "discret:R4" V 9922 6141 30  0000 C CNN
-F 3 "" H 10000 6150 60  0001 C CNN
-	1    10000 6150
-	0    -1   -1   0   
-$EndComp
-NoConn ~ 6750 5650
-$Comp
-L GND #PWR08
-U 1 1 442A58B8
-P 9250 6000
-F 0 "#PWR08" H 9250 6000 30  0001 C CNN
-F 1 "GND" H 9250 5930 30  0001 C CNN
-F 2 "" H 9250 6000 60  0001 C CNN
-F 3 "" H 9250 6000 60  0001 C CNN
-	1    9250 6000
-	0    -1   -1   0   
+P 3800 7250
+F 0 "R15" V 3880 7250 50  0000 C CNN
+F 1 "6.2K" V 3800 7250 50  0000 C CNN
+F 2 "discret:R4" V 3722 7241 30  0000 C CNN
+F 3 "" H 3800 7250 60  0001 C CNN
+	1    3800 7250
+	-1   0    0    -1  
 $EndComp
+NoConn ~ 1100 6300
 $Comp
 L C C5
 U 1 1 442A58B1
-P 9000 6000
-F 0 "C5" H 9050 6100 50  0000 L CNN
-F 1 "10nF" V 9150 5850 50  0000 L CNN
-F 2 "discret:C1-1" V 8950 6200 30  0000 C CNN
-F 3 "" H 9000 6000 60  0001 C CNN
-	1    9000 6000
-	0    -1   -1   0   
+P 1650 7100
+F 0 "C5" V 1700 6950 50  0000 L CNN
+F 1 "10nF" V 1700 7150 50  0000 L CNN
+F 2 "discret:C1-1" V 1600 7300 30  0000 C CNN
+F 3 "" H 1650 7100 60  0001 C CNN
+	1    1650 7100
+	0    1    -1   0   
 $EndComp
 $Comp
 L PWR_FLAG #FLG09
 U 1 1 442A5893
-P 10050 5350
-F 0 "#FLG09" H 10050 5620 30  0001 C CNN
-F 1 "PWR_FLAG" H 10050 5580 30  0000 C CNN
-F 2 "" H 10050 5350 60  0001 C CNN
-F 3 "" H 10050 5350 60  0001 C CNN
-	1    10050 5350
-	1    0    0    -1  
-$EndComp
-$Comp
-L VCC #PWR010
-U 1 1 442A5882
-P 9400 5050
-F 0 "#PWR010" H 9400 5150 30  0001 C CNN
-F 1 "VCC" H 9400 5150 30  0000 C CNN
-F 2 "" H 9400 5050 60  0001 C CNN
-F 3 "" H 9400 5050 60  0001 C CNN
-	1    9400 5050
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR011
-U 1 1 442A5852
-P 10800 5450
-F 0 "#PWR011" H 10800 5450 30  0001 C CNN
-F 1 "GND" H 10800 5380 30  0001 C CNN
-F 2 "" H 10800 5450 60  0001 C CNN
-F 3 "" H 10800 5450 60  0001 C CNN
-	1    10800 5450
+P 3900 5750
+F 0 "#FLG09" H 3900 6020 30  0001 C CNN
+F 1 "PWR_FLAG" H 3900 5980 30  0000 C CNN
+F 2 "" H 3900 5750 60  0001 C CNN
+F 3 "" H 3900 5750 60  0001 C CNN
+	1    3900 5750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C3
 U 1 1 442A584C
-P 10550 5400
-F 0 "C3" H 10600 5500 50  0000 L CNN
-F 1 "22uF/25V" V 10700 5050 50  0000 L CNN
-F 2 "discret:CP8" V 10450 5400 30  0000 C CNN
-F 3 "" H 10550 5400 60  0001 C CNN
-	1    10550 5400
-	0    -1   -1   0   
-$EndComp
-$Comp
-L VPP #PWR134
-U 1 1 442A5846
-P 10250 5350
-F 0 "#PWR134" H 10250 5550 40  0001 C CNN
-F 1 "VPP" H 10250 5500 40  0000 C CNN
-F 2 "" H 10250 5350 60  0001 C CNN
-F 3 "" H 10250 5350 60  0001 C CNN
-	1    10250 5350
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR012
-U 1 1 442A580B
-P 7450 6150
-F 0 "#PWR012" H 7450 6150 30  0001 C CNN
-F 1 "GND" H 7450 6080 30  0001 C CNN
-F 2 "" H 7450 6150 60  0001 C CNN
-F 3 "" H 7450 6150 60  0001 C CNN
-	1    7450 6150
+P 4200 6150
+F 0 "C3" H 4250 6250 50  0000 L CNN
+F 1 "22uF/25V" V 4350 5800 50  0000 L CNN
+F 2 "discret:CP8" V 4100 6150 30  0000 C CNN
+F 3 "" H 4200 6150 60  0001 C CNN
+	1    4200 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR013
 U 1 1 442A57CB
-P 7750 4650
-F 0 "#PWR013" H 7750 4750 30  0001 C CNN
-F 1 "VCC" H 7750 4750 30  0000 C CNN
-F 2 "" H 7750 4650 60  0001 C CNN
-F 3 "" H 7750 4650 60  0001 C CNN
-	1    7750 4650
+P 2100 5200
+F 0 "#PWR013" H 2100 5300 30  0001 C CNN
+F 1 "VCC" H 2100 5300 40  0000 C CNN
+F 2 "" H 2100 5200 60  0001 C CNN
+F 3 "" H 2100 5200 60  0001 C CNN
+	1    2100 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L1
 U 1 1 442A57BE
-P 9100 5150
-F 0 "L1" V 9050 5150 40  0000 C CNN
-F 1 "22uH" V 9200 5150 40  0000 C CNN
-F 2 "inductors:INDUCTOR_V" V 9250 5150 30  0000 C CNN
-F 3 "" H 9100 5150 60  0001 C CNN
-	1    9100 5150
-	0    -1   -1   0   
+P 2800 5300
+F 0 "L1" V 2750 5300 40  0000 C CNN
+F 1 "22uH" V 2900 5300 40  0000 C CNN
+F 2 "inductors:INDUCTOR_V" V 2950 5300 30  0000 C CNN
+F 3 "" H 2800 5300 60  0001 C CNN
+	1    2800 5300
+	0    1    -1   0   
 $EndComp
 NoConn ~ 1700 3900
 NoConn ~ 1700 3400
@@ -635,644 +355,633 @@ NoConn ~ 1700 3200
 $Comp
 L GND #PWR014
 U 1 1 442A50C2
-P 7050 2350
-F 0 "#PWR014" H 7050 2350 30  0001 C CNN
-F 1 "GND" H 7050 2280 30  0001 C CNN
-F 2 "" H 7050 2350 60  0001 C CNN
-F 3 "" H 7050 2350 60  0001 C CNN
-	1    7050 2350
+P 8000 2700
+F 0 "#PWR014" H 8000 2700 30  0001 C CNN
+F 1 "GND" H 8000 2630 30  0001 C CNN
+F 2 "" H 8000 2700 60  0001 C CNN
+F 3 "" H 8000 2700 60  0001 C CNN
+	1    8000 2700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 442A50BF
-P 7050 2100
-F 0 "R17" V 7130 2100 50  0000 C CNN
-F 1 "22K" V 7050 2100 50  0000 C CNN
-F 2 "discret:R4" V 7200 2100 60  0000 C CNN
-F 3 "" H 7050 2100 60  0001 C CNN
-	1    7050 2100
+P 8000 2350
+F 0 "R17" H 7900 2550 50  0000 C CNN
+F 1 "22K" V 8000 2350 50  0000 C CNN
+F 2 "discret:R4" V 8100 2350 40  0000 C CNN
+F 3 "" H 8000 2350 60  0001 C CNN
+	1    8000 2350
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR015
 U 1 1 442A50B3
-P 3400 6600
-F 0 "#PWR015" H 3400 6700 30  0001 C CNN
-F 1 "VCC" H 3400 6700 30  0000 C CNN
-F 2 "" H 3400 6600 60  0001 C CNN
-F 3 "" H 3400 6600 60  0001 C CNN
-	1    3400 6600
+P 10900 4850
+F 0 "#PWR015" H 10900 4950 30  0001 C CNN
+F 1 "VCC" H 10900 4950 40  0000 C CNN
+F 2 "" H 10900 4850 60  0001 C CNN
+F 3 "" H 10900 4850 60  0001 C CNN
+	1    10900 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR016
 U 1 1 442A5095
-P 4150 7150
-F 0 "#PWR016" H 4150 7150 30  0001 C CNN
-F 1 "GND" H 4150 7080 30  0001 C CNN
-F 2 "" H 4150 7150 60  0001 C CNN
-F 3 "" H 4150 7150 60  0001 C CNN
-	1    4150 7150
+P 10450 6050
+F 0 "#PWR016" H 10450 6050 30  0001 C CNN
+F 1 "GND" H 10450 5980 30  0001 C CNN
+F 2 "" H 10450 6050 60  0001 C CNN
+F 3 "" H 10450 6050 60  0001 C CNN
+	1    10450 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L LED D9
 U 1 1 442A5084
-P 4150 6950
-F 0 "D9" H 4150 7050 50  0000 C CNN
-F 1 "GREEN-LED" H 4150 6850 50  0000 C CNN
-F 2 "discret:LEDV" H 4150 7200 30  0000 C CNN
-F 3 "" H 4150 6950 60  0001 C CNN
-F 4 "GREEN LED" H 4200 7100 40  0000 C CNN "Champ4"
-	1    4150 6950
+P 10450 5800
+F 0 "D9" V 10350 5700 50  0000 C CNN
+F 1 "GREEN-LED" H 10450 5900 50  0000 C CNN
+F 2 "discret:LEDV" H 10450 6050 30  0000 C CNN
+F 3 "" H 10450 5800 60  0001 C CNN
+F 4 "GREEN LED" H 10450 6000 40  0000 C CNN "Champ4"
+	1    10450 5800
 	0    1    1    0   
 $EndComp
 $Comp
 L R R14
 U 1 1 442A5083
-P 3850 6650
-F 0 "R14" V 3930 6650 50  0000 C CNN
-F 1 "470" V 3850 6650 50  0000 C CNN
-F 2 "discret:R4" V 3765 6645 30  0000 C CNN
-F 3 "" H 3850 6650 60  0001 C CNN
-	1    3850 6650
-	0    -1   -1   0   
+P 10450 5250
+F 0 "R14" H 10550 5450 50  0000 C CNN
+F 1 "470" V 10450 5250 50  0000 C CNN
+F 2 "discret:R4" V 10365 5245 30  0000 C CNN
+F 3 "" H 10450 5250 60  0001 C CNN
+	1    10450 5250
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR017
 U 1 1 442A5057
-P 3200 7100
-F 0 "#PWR017" H 3200 7100 30  0001 C CNN
-F 1 "GND" H 3200 7030 30  0001 C CNN
-F 2 "" H 3200 7100 60  0001 C CNN
-F 3 "" H 3200 7100 60  0001 C CNN
-	1    3200 7100
+P 10900 5400
+F 0 "#PWR017" H 10900 5400 30  0001 C CNN
+F 1 "GND" H 10900 5330 30  0001 C CNN
+F 2 "" H 10900 5400 60  0001 C CNN
+F 3 "" H 10900 5400 60  0001 C CNN
+	1    10900 5400
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C1
 U 1 1 442A5056
-P 3200 6900
-F 0 "C1" H 3250 7000 50  0000 L CNN
-F 1 "100µF" H 3250 6800 50  0000 L CNN
-F 2 "discret:CP10" H 3500 6750 30  0000 C CNN
-F 3 "" H 3200 6900 60  0001 C CNN
-	1    3200 6900
+P 10900 5150
+F 0 "C1" H 10950 5250 50  0000 L CNN
+F 1 "100µF" H 10950 5050 50  0000 L CNN
+F 2 "discret:CP10" H 11000 4800 30  0000 C CNN
+F 3 "" H 10900 5150 60  0001 C CNN
+	1    10900 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR018
 U 1 1 442A5050
-P 2700 6950
-F 0 "#PWR018" H 2700 6950 30  0001 C CNN
-F 1 "GND" H 2700 6880 30  0001 C CNN
-F 2 "" H 2700 6950 60  0001 C CNN
-F 3 "" H 2700 6950 60  0001 C CNN
-	1    2700 6950
+P 9900 5250
+F 0 "#PWR018" H 9900 5250 30  0001 C CNN
+F 1 "GND" H 9900 5180 30  0001 C CNN
+F 2 "" H 9900 5250 60  0001 C CNN
+F 3 "" H 9900 5250 60  0001 C CNN
+	1    9900 5250
 	1    0    0    -1  
 $EndComp
 $Comp
 L 7805 U3
 U 1 1 442A504A
-P 2700 6700
-F 0 "U3" H 2850 6504 60  0000 C CNN
-F 1 "7805" H 2700 6900 60  0000 C CNN
-F 2 "discret:LM78XX" H 2750 7000 60  0000 C CNN
-F 3 "" H 2700 6700 60  0001 C CNN
-	1    2700 6700
+P 9900 4950
+F 0 "U3" H 9900 5250 60  0000 C CNN
+F 1 "7805" H 9900 5150 60  0000 C CNN
+F 2 "discret:LM78XX" H 9900 4550 40  0000 C CNN
+F 3 "" H 9900 4950 60  0001 C CNN
+	1    9900 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR019
 U 1 1 442A5023
-P 1950 7100
-F 0 "#PWR019" H 1950 7100 30  0001 C CNN
-F 1 "GND" H 1950 7030 30  0001 C CNN
-F 2 "" H 1950 7100 60  0001 C CNN
-F 3 "" H 1950 7100 60  0001 C CNN
-	1    1950 7100
+P 10400 4150
+F 0 "#PWR019" H 10400 4150 30  0001 C CNN
+F 1 "GND" H 10400 4080 30  0001 C CNN
+F 2 "" H 10400 4150 60  0001 C CNN
+F 3 "" H 10400 4150 60  0001 C CNN
+	1    10400 4150
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C2
 U 1 1 442A501D
-P 1950 6900
-F 0 "C2" H 2000 7000 50  0000 L CNN
-F 1 "220uF" H 2000 6800 50  0000 L CNN
-F 2 "discret:CP10" H 2300 6700 60  0000 C CNN
-F 3 "" H 1950 6900 60  0001 C CNN
-	1    1950 6900
+P 10400 3900
+F 0 "C2" H 10450 4000 50  0000 L CNN
+F 1 "220uF" H 10450 3800 50  0000 L CNN
+F 2 "discret:CP10" H 10650 3700 40  0000 C CNN
+F 3 "" H 10400 3900 60  0001 C CNN
+	1    10400 3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR020
 U 1 1 442A500F
-P 1400 6900
-F 0 "#PWR020" H 1400 6900 30  0001 C CNN
-F 1 "GND" H 1400 6830 30  0001 C CNN
-F 2 "" H 1400 6900 60  0001 C CNN
-F 3 "" H 1400 6900 60  0001 C CNN
-	1    1400 6900
+P 9850 3850
+F 0 "#PWR020" H 9850 3850 30  0001 C CNN
+F 1 "GND" H 9850 3780 30  0001 C CNN
+F 2 "" H 9850 3850 60  0001 C CNN
+F 3 "" H 9850 3850 60  0001 C CNN
+	1    9850 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODE D1
 U 1 1 442A500B
-P 1650 6650
-F 0 "D1" H 1650 6750 40  0000 C CNN
-F 1 "1N4004" H 1650 6550 40  0000 C CNN
-F 2 "discret:D5" H 1646 6800 30  0000 C CNN
-F 3 "" H 1650 6650 60  0001 C CNN
-	1    1650 6650
+P 10100 3600
+F 0 "D1" H 10100 3700 50  0000 C CNN
+F 1 "1N4004" H 10100 3500 50  0000 C CNN
+F 2 "discret:D5" H 10100 3450 30  0000 C CNN
+F 3 "" H 10100 3600 60  0001 C CNN
+	1    10100 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 442A4FE7
-P 1000 6750
-F 0 "P1" V 950 6750 40  0000 C CNN
-F 1 "CONN_2" V 1050 6750 40  0000 C CNN
-F 2 "connect:bornier2" H 950 7000 60  0000 C CNN
-F 3 "" H 1000 6750 60  0001 C CNN
-	1    1000 6750
+P 9450 3700
+F 0 "P1" V 9400 3700 40  0000 C CNN
+F 1 "CONN_2" V 9500 3700 40  0000 C CNN
+F 2 "connect:bornier2" H 9450 3900 40  0000 C CNN
+F 3 "" H 9450 3700 60  0001 C CNN
+	1    9450 3700
 	-1   0    0    1   
 $EndComp
-Text Label 7750 1600 0    60   ~ 0
+Text Label 8750 1900 0    60   ~ 0
 VPP/MCLR
 $Comp
 L LED D8
 U 1 1 442A4F5D
-P 6550 2400
-F 0 "D8" H 6550 2500 50  0000 C CNN
-F 1 "RED-LED" H 6550 2300 50  0000 C CNN
-F 2 "discret:LEDV" H 6550 2250 30  0000 C CNN
-F 3 "" H 6550 2400 60  0001 C CNN
-F 4 "Low Current Led" H 6600 2550 40  0000 C CNN "Champ4"
-	1    6550 2400
+P 7600 2800
+F 0 "D8" V 7400 2650 50  0000 C CNN
+F 1 "RED-LED" H 7600 2900 50  0000 C CNN
+F 2 "discret:LEDV" H 7600 3000 30  0000 C CNN
+F 3 "" H 7600 2800 60  0001 C CNN
+F 4 "Low Current Led" H 7600 2950 40  0000 C CNN "Champ4"
+	1    7600 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L R R9
 U 1 1 442A4F52
-P 6550 1900
-F 0 "R9" V 6630 1900 50  0000 C CNN
-F 1 "2.2K" V 6550 1900 50  0000 C CNN
-F 2 "discret:R4" V 6450 1900 30  0000 C CNN
-F 3 "" H 6550 1900 60  0001 C CNN
-	1    6550 1900
+P 7600 2250
+F 0 "R9" H 7500 2450 50  0000 C CNN
+F 1 "2.2K" V 7600 2250 50  0000 C CNN
+F 2 "discret:R4" V 7700 2250 30  0000 C CNN
+F 3 "" H 7600 2250 60  0001 C CNN
+	1    7600 2250
 	1    0    0    -1  
 $EndComp
 $Comp
 L VPP #PWR123
 U 1 1 442A4F48
-P 6550 1100
-F 0 "#PWR123" H 6550 1300 40  0001 C CNN
-F 1 "VPP" H 6550 1250 40  0000 C CNN
-F 2 "" H 6550 1100 60  0001 C CNN
-F 3 "" H 6550 1100 60  0001 C CNN
-	1    6550 1100
+P 7600 1200
+F 0 "#PWR123" H 7600 1400 40  0001 C CNN
+F 1 "VPP" H 7600 1350 40  0000 C CNN
+F 2 "" H 7600 1200 60  0001 C CNN
+F 3 "" H 7600 1200 60  0001 C CNN
+	1    7600 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L VPP #PWR122
 U 1 1 442A4F44
-P 6100 700
-F 0 "#PWR122" H 6100 900 40  0001 C CNN
-F 1 "VPP" H 6100 850 40  0000 C CNN
-F 2 "" H 6100 700 60  0001 C CNN
-F 3 "" H 6100 700 60  0001 C CNN
-	1    6100 700 
+P 7100 750
+F 0 "#PWR122" H 7100 950 40  0001 C CNN
+F 1 "VPP" H 7100 900 40  0000 C CNN
+F 2 "" H 7100 750 60  0001 C CNN
+F 3 "" H 7100 750 60  0001 C CNN
+	1    7100 750 
 	1    0    0    -1  
 $EndComp
 $Comp
-L PNP Q2
-U 1 1 442A4F30
-P 6450 1400
-F 0 "Q2" H 6400 1250 60  0000 C CNN
-F 1 "BC307" H 6354 1550 60  0000 C CNN
-F 2 "discret:TO92" H 6348 1617 30  0000 C CNN
-F 3 "" H 6450 1400 60  0001 C CNN
-	1    6450 1400
-	1    0    0    1   
-$EndComp
-$Comp
 L R R7
 U 1 1 442A4F2A
-P 6100 1000
-F 0 "R7" V 6180 1000 50  0000 C CNN
-F 1 "10K" V 6100 1000 50  0000 C CNN
-F 2 "discret:R4" V 6250 1000 60  0000 C CNN
-F 3 "" H 6100 1000 60  0001 C CNN
-	1    6100 1000
+P 7100 1150
+F 0 "R7" H 7000 1350 50  0000 C CNN
+F 1 "10K" V 7100 1150 50  0000 C CNN
+F 2 "discret:R4" V 7200 1150 40  0000 C CNN
+F 3 "" H 7100 1150 60  0001 C CNN
+	1    7100 1150
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R11
 U 1 1 442A4F23
-P 5750 1400
-F 0 "R11" V 5830 1400 50  0000 C CNN
-F 1 "22K" V 5750 1400 50  0000 C CNN
-F 2 "discret:R4" V 5821 1591 30  0000 C CNN
-F 3 "" H 5750 1400 60  0001 C CNN
-	1    5750 1400
-	0    -1   -1   0   
+P 7100 2150
+F 0 "R11" H 7200 1950 50  0000 C CNN
+F 1 "22K" V 7100 2150 50  0000 C CNN
+F 2 "discret:R4" V 7000 2150 30  0000 C CNN
+F 3 "" H 7100 2150 60  0001 C CNN
+	1    7100 2150
+	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR021
 U 1 1 442A4F1C
-P 5450 1900
-F 0 "#PWR021" H 5450 1900 30  0001 C CNN
-F 1 "GND" H 5450 1830 30  0001 C CNN
-F 2 "" H 5450 1900 60  0001 C CNN
-F 3 "" H 5450 1900 60  0001 C CNN
-	1    5450 1900
+P 5450 1450
+F 0 "#PWR021" H 5450 1450 30  0001 C CNN
+F 1 "GND" H 5450 1380 30  0001 C CNN
+F 2 "" H 5450 1450 60  0001 C CNN
+F 3 "" H 5450 1450 60  0001 C CNN
+	1    5450 1450
 	1    0    0    -1  
 $EndComp
-Text Label 2300 1700 0    60   ~ 0
+Text Label 2300 1300 0    60   ~ 0
 VPP_ON
-Text Label 5400 5100 0    60   ~ 0
+Text Label 5600 4100 0    60   ~ 0
 CLOCK-RB6
-Text Label 5500 3150 0    60   ~ 0
+Text Label 5550 2900 0    60   ~ 0
 DATA-RB7
 $Comp
 L NPN Q1
 U 1 1 442A4EB9
-P 5350 1700
-F 0 "Q1" H 5500 1700 50  0000 C CNN
-F 1 "BC237" H 5252 1850 50  0000 C CNN
-F 2 "discret:TO92" H 5200 1550 30  0000 C CNN
-F 3 "" H 5350 1700 60  0001 C CNN
-	1    5350 1700
+P 5350 1200
+F 0 "Q1" H 5250 1450 50  0000 C CNN
+F 1 "BC237" H 5250 1350 50  0000 C CNN
+F 2 "discret:TO92" H 5200 1050 30  0000 C CNN
+F 3 "" H 5350 1200 60  0001 C CNN
+	1    5350 1200
 	1    0    0    -1  
 $EndComp
-Text Label 2350 5100 0    60   ~ 0
+Text Label 2550 4200 0    60   ~ 0
 PC-CLOCK-OUT
 $Comp
 L GND #PWR022
 U 1 1 442A4E06
-P 1700 4000
-F 0 "#PWR022" H 1700 4000 30  0001 C CNN
-F 1 "GND" H 1700 3930 30  0001 C CNN
-F 2 "" H 1700 4000 60  0001 C CNN
-F 3 "" H 1700 4000 60  0001 C CNN
-	1    1700 4000
+P 1750 4000
+F 0 "#PWR022" H 1750 4000 30  0001 C CNN
+F 1 "GND" H 1750 3930 30  0001 C CNN
+F 2 "" H 1750 4000 60  0001 C CNN
+F 3 "" H 1750 4000 60  0001 C CNN
+	1    1750 4000
 	0    -1   -1   0   
 $EndComp
-Text Label 2700 4200 0    60   ~ 0
+Text Label 2400 2100 0    60   ~ 0
 PC-DATA-IN
-Text Label 2500 3150 0    60   ~ 0
+Text Label 2400 3000 0    60   ~ 0
 PC-DATA-OUT
 $Comp
 L GND #PWR023
 U 1 1 442A4DB3
-P 2800 2250
-F 0 "#PWR023" H 2800 2250 30  0001 C CNN
-F 1 "GND" H 2800 2180 30  0001 C CNN
-F 2 "" H 2800 2250 60  0001 C CNN
-F 3 "" H 2800 2250 60  0001 C CNN
-	1    2800 2250
+P 2700 1900
+F 0 "#PWR023" H 2700 1900 30  0001 C CNN
+F 1 "GND" H 2700 1830 30  0001 C CNN
+F 2 "" H 2700 1900 60  0001 C CNN
+F 3 "" H 2700 1900 60  0001 C CNN
+	1    2700 1900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR024
 U 1 1 442A4DAE
-P 3200 5650
-F 0 "#PWR024" H 3200 5650 30  0001 C CNN
-F 1 "GND" H 3200 5580 30  0001 C CNN
-F 2 "" H 3200 5650 60  0001 C CNN
-F 3 "" H 3200 5650 60  0001 C CNN
-	1    3200 5650
+P 3300 4800
+F 0 "#PWR024" H 3300 4800 30  0001 C CNN
+F 1 "GND" H 3300 4730 30  0001 C CNN
+F 2 "" H 3300 4800 60  0001 C CNN
+F 3 "" H 3300 4800 60  0001 C CNN
+	1    3300 4800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR025
 U 1 1 442A4DAB
-P 3200 3700
-F 0 "#PWR025" H 3200 3700 30  0001 C CNN
-F 1 "GND" H 3200 3630 30  0001 C CNN
-F 2 "" H 3200 3700 60  0001 C CNN
-F 3 "" H 3200 3700 60  0001 C CNN
-	1    3200 3700
+P 3100 3650
+F 0 "#PWR025" H 3100 3650 30  0001 C CNN
+F 1 "GND" H 3100 3580 30  0001 C CNN
+F 2 "" H 3100 3650 60  0001 C CNN
+F 3 "" H 3100 3650 60  0001 C CNN
+	1    3100 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R8
 U 1 1 442A4D92
-P 4700 1700
-F 0 "R8" V 4780 1700 50  0000 C CNN
-F 1 "1K" V 4700 1700 50  0000 C CNN
-F 2 "discret:R4" V 4850 1700 30  0000 C CNN
-F 3 "" H 4700 1700 60  0001 C CNN
-	1    4700 1700
+P 4700 1200
+F 0 "R8" V 4800 1200 50  0000 C CNN
+F 1 "1K" V 4700 1200 50  0000 C CNN
+F 2 "discret:R4" V 4600 1200 30  0000 C CNN
+F 3 "" H 4700 1200 60  0001 C CNN
+	1    4700 1200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R13
 U 1 1 442A4D8D
-P 5100 5100
-F 0 "R13" V 5180 5100 50  0000 C CNN
-F 1 "470" V 5100 5100 50  0000 C CNN
-F 2 "discret:R4" V 5250 5100 30  0000 C CNN
-F 3 "" H 5100 5100 60  0001 C CNN
-	1    5100 5100
+P 5300 4100
+F 0 "R13" V 5400 4100 50  0000 C CNN
+F 1 "470" V 5300 4100 50  0000 C CNN
+F 2 "discret:R4" V 5200 4100 30  0000 C CNN
+F 3 "" H 5300 4100 60  0001 C CNN
+	1    5300 4100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R12
 U 1 1 442A4D85
-P 5100 3150
-F 0 "R12" V 5180 3150 50  0000 C CNN
-F 1 "470" V 5100 3150 50  0000 C CNN
-F 2 "discret:R4" V 5250 3150 60  0000 C CNN
-F 3 "" H 5100 3150 60  0001 C CNN
-	1    5100 3150
+P 5150 2900
+F 0 "R12" V 5250 2900 50  0000 C CNN
+F 1 "470" V 5150 2900 50  0000 C CNN
+F 2 "discret:R4" V 5050 2900 40  0000 C CNN
+F 3 "" H 5150 2900 60  0001 C CNN
+	1    5150 2900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR026
 U 1 1 442A4D75
-P 4350 4500
-F 0 "#PWR026" H 4350 4500 30  0001 C CNN
-F 1 "GND" H 4350 4430 30  0001 C CNN
-F 2 "" H 4350 4500 60  0001 C CNN
-F 3 "" H 4350 4500 60  0001 C CNN
-	1    4350 4500
+P 4350 2450
+F 0 "#PWR026" H 4350 2450 30  0001 C CNN
+F 1 "GND" H 4350 2380 30  0001 C CNN
+F 2 "" H 4350 2450 60  0001 C CNN
+F 3 "" H 4350 2450 60  0001 C CNN
+	1    4350 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74LS125 U2
 U 4 1 442A4D6B
-P 4350 4200
-F 0 "U2" H 4350 4300 50  0000 L BNN
-F 1 "74HC125" H 4400 4050 40  0000 L TNN
-F 2 "dip_sockets:DIP-14__300_ELL" H 4750 4100 30  0000 C CNN
-F 3 "" H 4350 4200 60  0001 C CNN
-	4    4350 4200
+P 4350 2100
+F 0 "U2" H 4350 2400 50  0000 C CNN
+F 1 "74HC125" H 4350 2300 40  0000 C CNN
+F 2 "dip_sockets:DIP-14__300_ELL" H 4850 2050 30  0000 C CNN
+F 3 "" H 4350 2100 60  0001 C CNN
+	4    4350 2100
 	-1   0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR027
 U 1 1 442A4D68
-P 3850 4650
-F 0 "#PWR027" H 3850 4750 30  0001 C CNN
-F 1 "VCC" H 3850 4750 30  0000 C CNN
-F 2 "" H 3850 4650 60  0001 C CNN
-F 3 "" H 3850 4650 60  0001 C CNN
-	1    3850 4650
+P 4000 3600
+F 0 "#PWR027" H 4000 3700 30  0001 C CNN
+F 1 "VCC" H 4000 3700 40  0000 C CNN
+F 2 "" H 4000 3600 60  0001 C CNN
+F 3 "" H 4000 3600 60  0001 C CNN
+	1    4000 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR028
 U 1 1 442A4D67
-P 3850 5600
-F 0 "#PWR028" H 3850 5600 30  0001 C CNN
-F 1 "GND" H 3850 5530 30  0001 C CNN
-F 2 "" H 3850 5600 60  0001 C CNN
-F 3 "" H 3850 5600 60  0001 C CNN
-	1    3850 5600
+P 4000 4750
+F 0 "#PWR028" H 4000 4750 30  0001 C CNN
+F 1 "GND" H 4000 4680 30  0001 C CNN
+F 2 "" H 4000 4750 60  0001 C CNN
+F 3 "" H 4000 4750 60  0001 C CNN
+	1    4000 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR029
 U 1 1 442A4D66
-P 4350 5400
-F 0 "#PWR029" H 4350 5400 30  0001 C CNN
-F 1 "GND" H 4350 5330 30  0001 C CNN
-F 2 "" H 4350 5400 60  0001 C CNN
-F 3 "" H 4350 5400 60  0001 C CNN
-	1    4350 5400
+P 4550 4450
+F 0 "#PWR029" H 4550 4450 30  0001 C CNN
+F 1 "GND" H 4550 4380 30  0001 C CNN
+F 2 "" H 4550 4450 60  0001 C CNN
+F 3 "" H 4550 4450 60  0001 C CNN
+	1    4550 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D7
 U 1 1 442A4D65
-P 3850 5400
-F 0 "D7" H 3850 5500 40  0000 C CNN
-F 1 "BAT43" H 3850 5300 40  0000 C CNN
-F 2 "discret:D3" H 3850 5250 30  0000 C CNN
-F 3 "" H 3850 5400 60  0001 C CNN
-	1    3850 5400
+P 4000 4500
+F 0 "D7" V 4100 4300 50  0000 C CNN
+F 1 "BAT43" V 4000 4300 50  0000 C CNN
+F 2 "discret:D3" V 3900 4300 30  0000 C CNN
+F 3 "" H 4000 4500 60  0001 C CNN
+	1    4000 4500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D6
 U 1 1 442A4D64
-P 3850 4850
-F 0 "D6" H 3850 4950 40  0000 C CNN
-F 1 "BAT43" H 3850 4750 40  0000 C CNN
-F 2 "discret:D3" H 3850 4700 30  0000 C CNN
-F 3 "" H 3850 4850 60  0001 C CNN
-	1    3850 4850
+P 4000 3800
+F 0 "D6" V 4100 3600 50  0000 C CNN
+F 1 "BAT43" V 4000 3600 50  0000 C CNN
+F 2 "discret:D3" V 3900 3600 30  0000 C CNN
+F 3 "" H 4000 3800 60  0001 C CNN
+	1    4000 3800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R6
 U 1 1 442A4D63
-P 3200 5400
-F 0 "R6" V 3280 5400 50  0000 C CNN
-F 1 "10K" V 3200 5400 50  0000 C CNN
-F 2 "discret:R4" V 3100 5400 30  0000 C CNN
-F 3 "" H 3200 5400 60  0001 C CNN
-	1    3200 5400
+P 3300 4500
+F 0 "R6" H 3200 4650 50  0000 C CNN
+F 1 "10K" V 3300 4500 50  0000 C CNN
+F 2 "discret:R4" V 3400 4500 30  0000 C CNN
+F 3 "" H 3300 4500 60  0001 C CNN
+	1    3300 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 442A4D62
-P 3500 5100
-F 0 "R5" V 3580 5100 50  0000 C CNN
-F 1 "10K" V 3500 5100 50  0000 C CNN
-F 2 "discret:R4" V 3420 5088 30  0000 C CNN
-F 3 "" H 3500 5100 60  0001 C CNN
-	1    3500 5100
+P 3650 4200
+F 0 "R5" V 3750 4200 50  0000 C CNN
+F 1 "10K" V 3650 4200 50  0000 C CNN
+F 2 "discret:R4" V 3570 4188 30  0000 C CNN
+F 3 "" H 3650 4200 60  0001 C CNN
+	1    3650 4200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L 74LS125 U2
 U 3 1 442A4D61
-P 4350 5100
-F 0 "U2" H 4350 5200 50  0000 L BNN
-F 1 "74HC125" H 4400 4950 40  0000 L TNN
-F 2 "dip_sockets:DIP-14__300_ELL" H 4750 4850 30  0000 C CNN
-F 3 "" H 4350 5100 60  0001 C CNN
-	3    4350 5100
+P 4550 4100
+F 0 "U2" H 4550 4350 50  0000 C CNN
+F 1 "74HC125" H 4550 4300 40  0000 C TNN
+F 2 "dip_sockets:DIP-14__300_ELL" H 4950 3850 30  0000 C CNN
+F 3 "" H 4550 4100 60  0001 C CNN
+	3    4550 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR030
 U 1 1 442A4D60
-P 3850 2700
-F 0 "#PWR030" H 3850 2800 30  0001 C CNN
-F 1 "VCC" H 3850 2800 30  0000 C CNN
-F 2 "" H 3850 2700 60  0001 C CNN
-F 3 "" H 3850 2700 60  0001 C CNN
-	1    3850 2700
+P 3800 2350
+F 0 "#PWR030" H 3800 2450 30  0001 C CNN
+F 1 "VCC" H 3800 2450 40  0000 C CNN
+F 2 "" H 3800 2350 60  0001 C CNN
+F 3 "" H 3800 2350 60  0001 C CNN
+	1    3800 2350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR031
 U 1 1 442A4D5F
-P 3850 3650
-F 0 "#PWR031" H 3850 3650 30  0001 C CNN
-F 1 "GND" H 3850 3580 30  0001 C CNN
-F 2 "" H 3850 3650 60  0001 C CNN
-F 3 "" H 3850 3650 60  0001 C CNN
-	1    3850 3650
+P 3800 3550
+F 0 "#PWR031" H 3800 3550 30  0001 C CNN
+F 1 "GND" H 3800 3480 30  0001 C CNN
+F 2 "" H 3800 3550 60  0001 C CNN
+F 3 "" H 3800 3550 60  0001 C CNN
+	1    3800 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR032
 U 1 1 442A4D5E
-P 4350 3450
-F 0 "#PWR032" H 4350 3450 30  0001 C CNN
-F 1 "GND" H 4350 3380 30  0001 C CNN
-F 2 "" H 4350 3450 60  0001 C CNN
-F 3 "" H 4350 3450 60  0001 C CNN
-	1    4350 3450
+P 4350 3250
+F 0 "#PWR032" H 4350 3250 30  0001 C CNN
+F 1 "GND" H 4350 3180 30  0001 C CNN
+F 2 "" H 4350 3250 60  0001 C CNN
+F 3 "" H 4350 3250 60  0001 C CNN
+	1    4350 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D5
 U 1 1 442A4D5D
-P 3850 3450
-F 0 "D5" H 3850 3550 40  0000 C CNN
-F 1 "BAT43" H 3850 3350 40  0000 C CNN
-F 2 "discret:D3" H 3850 3300 60  0000 C CNN
-F 3 "" H 3850 3450 60  0001 C CNN
-	1    3850 3450
+P 3800 3300
+F 0 "D5" V 3900 3100 50  0000 C CNN
+F 1 "BAT43" V 3800 3100 50  0000 C CNN
+F 2 "discret:D3" V 3700 3100 40  0000 C CNN
+F 3 "" H 3800 3300 60  0001 C CNN
+	1    3800 3300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D4
 U 1 1 442A4D5C
-P 3850 2900
-F 0 "D4" H 3850 3000 40  0000 C CNN
-F 1 "BAT43" H 3850 2800 40  0000 C CNN
-F 2 "discret:D3" H 3850 2750 30  0000 C CNN
-F 3 "" H 3850 2900 60  0001 C CNN
-	1    3850 2900
+P 3800 2600
+F 0 "D4" V 3900 2400 50  0000 C CNN
+F 1 "BAT43" V 3800 2400 50  0000 C CNN
+F 2 "discret:D3" V 3700 2400 30  0000 C CNN
+F 3 "" H 3800 2600 60  0001 C CNN
+	1    3800 2600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R4
 U 1 1 442A4D5B
-P 3200 3450
-F 0 "R4" V 3280 3450 50  0000 C CNN
-F 1 "10K" V 3200 3450 50  0000 C CNN
-F 2 "discret:R4" V 3100 3450 60  0000 C CNN
-F 3 "" H 3200 3450 60  0001 C CNN
-	1    3200 3450
+P 3100 3350
+F 0 "R4" H 3000 3550 50  0000 C CNN
+F 1 "10K" V 3100 3350 50  0000 C CNN
+F 2 "discret:R4" V 3200 3350 40  0000 C CNN
+F 3 "" H 3100 3350 60  0001 C CNN
+	1    3100 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R3
 U 1 1 442A4D5A
-P 3500 3150
-F 0 "R3" V 3580 3150 50  0000 C CNN
-F 1 "10K" V 3500 3150 50  0000 C CNN
-F 2 "discret:R4" V 3650 3150 30  0000 C CNN
-F 3 "" H 3500 3150 60  0001 C CNN
-	1    3500 3150
+P 3450 3000
+F 0 "R3" V 3550 3000 50  0000 C CNN
+F 1 "10K" V 3450 3000 50  0000 C CNN
+F 2 "discret:R4" V 3350 3000 30  0000 C CNN
+F 3 "" H 3450 3000 60  0001 C CNN
+	1    3450 3000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L 74LS125 U2
 U 2 1 442A4D59
-P 4350 3150
-F 0 "U2" H 4350 3250 50  0000 L BNN
-F 1 "74HC125" H 4400 3000 40  0000 L TNN
-F 2 "dip_sockets:DIP-14__300_ELL" H 4712 2930 30  0000 C CNN
-F 3 "" H 4350 3150 60  0001 C CNN
-	2    4350 3150
+P 4350 2900
+F 0 "U2" H 4350 3200 50  0000 C CNN
+F 1 "74HC125" H 4350 3100 40  0000 C CNN
+F 2 "dip_sockets:DIP-14__300_ELL" H 4712 2680 30  0000 C CNN
+F 3 "" H 4350 2900 60  0001 C CNN
+	2    4350 2900
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR033
 U 1 1 442A4D41
-P 3450 1250
-F 0 "#PWR033" H 3450 1350 30  0001 C CNN
-F 1 "VCC" H 3450 1350 30  0000 C CNN
-F 2 "" H 3450 1250 60  0001 C CNN
-F 3 "" H 3450 1250 60  0001 C CNN
-	1    3450 1250
+P 3400 650
+F 0 "#PWR033" H 3400 750 30  0001 C CNN
+F 1 "VCC" H 3400 750 40  0000 C CNN
+F 2 "" H 3400 650 60  0001 C CNN
+F 3 "" H 3400 650 60  0001 C CNN
+	1    3400 650 
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR034
 U 1 1 442A4D3B
-P 3450 2200
-F 0 "#PWR034" H 3450 2200 30  0001 C CNN
-F 1 "GND" H 3450 2130 30  0001 C CNN
-F 2 "" H 3450 2200 60  0001 C CNN
-F 3 "" H 3450 2200 60  0001 C CNN
-	1    3450 2200
+P 3400 1850
+F 0 "#PWR034" H 3400 1850 30  0001 C CNN
+F 1 "GND" H 3400 1780 30  0001 C CNN
+F 2 "" H 3400 1850 60  0001 C CNN
+F 3 "" H 3400 1850 60  0001 C CNN
+	1    3400 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR035
 U 1 1 442A4D38
-P 3950 2000
-F 0 "#PWR035" H 3950 2000 30  0001 C CNN
-F 1 "GND" H 3950 1930 30  0001 C CNN
-F 2 "" H 3950 2000 60  0001 C CNN
-F 3 "" H 3950 2000 60  0001 C CNN
-	1    3950 2000
+P 3950 1550
+F 0 "#PWR035" H 3950 1550 30  0001 C CNN
+F 1 "GND" H 3950 1480 30  0001 C CNN
+F 2 "" H 3950 1550 60  0001 C CNN
+F 3 "" H 3950 1550 60  0001 C CNN
+	1    3950 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D3
 U 1 1 442A4D25
-P 3450 2000
-F 0 "D3" H 3450 2100 40  0000 C CNN
-F 1 "BAT43" H 3450 1900 40  0000 C CNN
-F 2 "discret:D3" H 3450 1850 30  0000 C CNN
-F 3 "" H 3450 2000 60  0001 C CNN
-	1    3450 2000
+P 3400 1600
+F 0 "D3" V 3450 1400 50  0000 C CNN
+F 1 "BAT43" V 3350 1400 50  0000 C CNN
+F 2 "discret:D3" V 3250 1400 30  0000 C CNN
+F 3 "" H 3400 1600 60  0001 C CNN
+	1    3400 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L DIODESCH D2
 U 1 1 442A4D1B
-P 3450 1450
-F 0 "D2" H 3450 1550 40  0000 C CNN
-F 1 "BAT43" H 3450 1350 40  0000 C CNN
-F 2 "discret:D3" H 3500 1300 30  0000 C CNN
-F 3 "" H 3450 1450 60  0001 C CNN
-	1    3450 1450
+P 3400 900
+F 0 "D2" V 3450 700 50  0000 C CNN
+F 1 "BAT43" V 3350 700 50  0000 C CNN
+F 2 "discret:D3" V 3250 700 30  0000 C CNN
+F 3 "" H 3400 900 60  0001 C CNN
+	1    3400 900 
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R2
 U 1 1 442A4CFB
-P 2800 2000
-F 0 "R2" V 2880 2000 50  0000 C CNN
-F 1 "10K" V 2800 2000 50  0000 C CNN
-F 2 "discret:R4" V 2700 2000 60  0000 C CNN
-F 3 "" H 2800 2000 60  0001 C CNN
-	1    2800 2000
+P 2700 1600
+F 0 "R2" H 2600 1750 50  0000 C CNN
+F 1 "10K" V 2700 1600 50  0000 C CNN
+F 2 "discret:R4" V 2800 1600 40  0000 C CNN
+F 3 "" H 2700 1600 60  0001 C CNN
+	1    2700 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 442A4CF4
-P 3100 1700
-F 0 "R1" V 3180 1700 50  0000 C CNN
-F 1 "10K" V 3100 1700 50  0000 C CNN
-F 2 "discret:R4" V 3250 1700 60  0000 C CNN
-F 3 "" H 3100 1700 60  0001 C CNN
-	1    3100 1700
+P 3050 1300
+F 0 "R1" V 3130 1300 50  0000 C CNN
+F 1 "10K" V 3050 1300 50  0000 C CNN
+F 2 "discret:R4" V 2950 1300 40  0000 C CNN
+F 3 "" H 3050 1300 60  0001 C CNN
+	1    3050 1300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L 74LS125 U2
 U 1 1 442A4CC8
-P 3950 1700
-F 0 "U2" H 3950 1800 50  0000 L BNN
-F 1 "74HC125" H 4000 1550 40  0000 L TNN
-F 2 "dip_sockets:DIP-14__300_ELL" H 4350 1450 30  0000 C CNN
-F 3 "" H 3950 1700 60  0001 C CNN
-	1    3950 1700
+P 3950 1200
+F 0 "U2" H 3950 1450 50  0000 C BNN
+F 1 "74HC125" H 3950 1400 40  0000 C TNN
+F 2 "dip_sockets:DIP-14__300_ELL" H 4300 1000 30  0000 C CNN
+F 3 "" H 3950 1200 60  0001 C CNN
+	1    3950 1200
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1289,78 +998,443 @@ $EndComp
 $Comp
 L CONN_1 P101
 U 1 1 54020BEA
-P 6400 6800
-F 0 "P101" H 6480 6800 40  0000 L CNN
-F 1 "CONN_1" H 6400 6855 30  0001 C CNN
-F 2 "footprints:1pin-4" H 6400 6800 60  0001 C CNN
-F 3 "" H 6400 6800 60  0000 C CNN
-	1    6400 6800
+P 6500 6750
+F 0 "P101" H 6580 6750 40  0000 L CNN
+F 1 "CONN_1" H 6500 6805 30  0001 C CNN
+F 2 "footprints:1pin-4" H 6500 6750 60  0001 C CNN
+F 3 "" H 6500 6750 60  0000 C CNN
+	1    6500 6750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P102
 U 1 1 54020DA9
-P 6400 6950
-F 0 "P102" H 6480 6950 40  0000 L CNN
-F 1 "CONN_1" H 6400 7005 30  0001 C CNN
-F 2 "footprints:1pin-4" H 6400 6950 60  0001 C CNN
-F 3 "" H 6400 6950 60  0000 C CNN
-	1    6400 6950
+P 6500 6900
+F 0 "P102" H 6580 6900 40  0000 L CNN
+F 1 "CONN_1" H 6500 6955 30  0001 C CNN
+F 2 "footprints:1pin-4" H 6500 6900 60  0001 C CNN
+F 3 "" H 6500 6900 60  0000 C CNN
+	1    6500 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P103
 U 1 1 54020DC2
-P 6400 7100
-F 0 "P103" H 6480 7100 40  0000 L CNN
-F 1 "CONN_1" H 6400 7155 30  0001 C CNN
-F 2 "footprints:1pin-4" H 6400 7100 60  0001 C CNN
-F 3 "" H 6400 7100 60  0000 C CNN
-	1    6400 7100
+P 6500 7050
+F 0 "P103" H 6580 7050 40  0000 L CNN
+F 1 "CONN_1" H 6500 7105 30  0001 C CNN
+F 2 "footprints:1pin-4" H 6500 7050 60  0001 C CNN
+F 3 "" H 6500 7050 60  0000 C CNN
+	1    6500 7050
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P104
 U 1 1 54020DE3
-P 6400 7250
-F 0 "P104" H 6480 7250 40  0000 L CNN
-F 1 "CONN_1" H 6400 7305 30  0001 C CNN
-F 2 "footprints:1pin-4" H 6400 7250 60  0001 C CNN
-F 3 "" H 6400 7250 60  0000 C CNN
-	1    6400 7250
+P 6500 7200
+F 0 "P104" H 6580 7200 40  0000 L CNN
+F 1 "CONN_1" H 6500 7255 30  0001 C CNN
+F 2 "footprints:1pin-4" H 6500 7200 60  0001 C CNN
+F 3 "" H 6500 7200 60  0000 C CNN
+	1    6500 7200
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P105
 U 1 1 54020E5D
-P 6400 7400
-F 0 "P105" H 6480 7400 40  0000 L CNN
-F 1 "CONN_1" H 6400 7455 30  0001 C CNN
-F 2 "footprints:1pin-4" H 6400 7400 60  0001 C CNN
-F 3 "" H 6400 7400 60  0000 C CNN
-	1    6400 7400
+P 6500 7350
+F 0 "P105" H 6580 7350 40  0000 L CNN
+F 1 "CONN_1" H 6500 7405 30  0001 C CNN
+F 2 "footprints:1pin-4" H 6500 7350 60  0001 C CNN
+F 3 "" H 6500 7350 60  0000 C CNN
+	1    6500 7350
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P106
 U 1 1 54020E76
-P 6400 7550
-F 0 "P106" H 6480 7550 40  0000 L CNN
-F 1 "CONN_1" H 6400 7605 30  0001 C CNN
-F 2 "footprints:1pin-4" H 6400 7550 60  0001 C CNN
-F 3 "" H 6400 7550 60  0000 C CNN
-	1    6400 7550
+P 6500 7500
+F 0 "P106" H 6580 7500 40  0000 L CNN
+F 1 "CONN_1" H 6500 7555 30  0001 C CNN
+F 2 "footprints:1pin-4" H 6500 7500 60  0001 C CNN
+F 3 "" H 6500 7500 60  0000 C CNN
+	1    6500 7500
 	1    0    0    -1  
 $EndComp
-Connection ~ 8650 3200
+Text Notes 6150 7650 0    40   Italic 0
+Mounting holes
+Text Label 8300 4300 0    60   ~ 0
+VCC_PIC
+$Comp
+L PNP Q2
+U 1 1 442A4F30
+P 7500 1600
+F 0 "Q2" H 7850 1400 60  0000 C CNN
+F 1 "BC307" H 7850 1500 60  0000 C CNN
+F 2 "discret:TO92" H 7850 1600 30  0000 C CNN
+F 3 "" H 7500 1600 60  0001 C CNN
+	1    7500 1600
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	6700 1350 6700 1500
+Wire Wire Line
+	8100 4300 8100 4200
+Wire Wire Line
+	7600 1900 8100 1900
+Wire Wire Line
+	7200 4600 7200 4700
+Wire Wire Line
+	7300 4000 7200 4000
+Wire Wire Line
+	7600 4200 7600 4400
+Wire Wire Line
+	3800 7000 3800 6950
+Wire Wire Line
+	3800 6400 3800 6450
+Connection ~ 9850 3800
+Wire Wire Line
+	10050 3800 10050 3850
+Wire Wire Line
+	9800 3800 10050 3800
+Wire Wire Line
+	4100 5800 4100 5750
+Wire Wire Line
+	1400 7100 1450 7100
+Wire Wire Line
+	2650 7400 2000 7400
+Wire Wire Line
+	1800 6800 1800 6750
 Wire Notes Line
-	5850 6700 6800 6700
+	4600 5000 4600 7700
 Wire Notes Line
-	6800 6700 6800 7750
+	4600 5000 650  5000
 Wire Notes Line
-	6800 7750 5850 7750
+	650  5000 650  7700
+Connection ~ 3900 5800
+Wire Wire Line
+	3900 5800 3900 5750
+Wire Wire Line
+	2100 5200 2100 5350
+Connection ~ 4100 5800
+Wire Wire Line
+	1700 3700 2300 3700
+Wire Wire Line
+	3900 2100 2300 2100
+Wire Wire Line
+	2300 2100 2300 3700
+Connection ~ 10450 4900
+Wire Wire Line
+	10300 4900 10900 4900
+Wire Wire Line
+	10450 4900 10450 5000
+Connection ~ 10400 3600
+Wire Wire Line
+	10400 3700 10400 3600
+Wire Wire Line
+	10300 3600 10900 3600
+Wire Wire Line
+	9850 3850 9850 3800
+Wire Wire Line
+	9900 3600 9800 3600
+Wire Wire Line
+	8600 1900 9500 1900
+Wire Wire Line
+	5550 4100 6200 4100
+Wire Wire Line
+	5400 2900 6300 2900
+Wire Wire Line
+	5150 1200 4950 1200
+Wire Wire Line
+	5450 850  5450 1000
+Connection ~ 7100 1600
+Wire Wire Line
+	7100 1600 7300 1600
+Wire Wire Line
+	7100 1400 7100 1900
+Wire Wire Line
+	7600 1400 7600 1200
+Wire Wire Line
+	7600 3000 7600 3050
+Wire Wire Line
+	7600 2500 7600 2600
+Wire Wire Line
+	2400 3000 3200 3000
+Wire Wire Line
+	2200 1300 2800 1300
+Wire Wire Line
+	2200 1300 2200 3600
+Wire Wire Line
+	2200 3600 1700 3600
+Connection ~ 5500 2900
+Wire Wire Line
+	4800 2100 5500 2100
+Wire Wire Line
+	5500 2100 5500 2900
+Wire Wire Line
+	5050 4100 5000 4100
+Wire Wire Line
+	4450 1200 4400 1200
+Wire Wire Line
+	4900 2900 4800 2900
+Connection ~ 3300 4200
+Wire Wire Line
+	3300 4250 3300 4200
+Wire Wire Line
+	4000 4000 4000 4300
+Connection ~ 4000 4200
+Connection ~ 3100 3000
+Wire Wire Line
+	3100 3100 3100 3000
+Wire Wire Line
+	3800 2800 3800 3100
+Connection ~ 3800 3000
+Wire Wire Line
+	3700 3000 3800 3000
+Connection ~ 2700 1300
+Wire Wire Line
+	2700 1350 2700 1300
+Wire Wire Line
+	3400 1100 3400 1400
+Connection ~ 3400 1300
+Wire Wire Line
+	3300 1300 3400 1300
+Connection ~ 7600 4300
+Wire Wire Line
+	8000 2100 8000 1900
+Connection ~ 8000 1900
+Wire Wire Line
+	6700 800  6700 950 
+Wire Wire Line
+	7100 750  7100 900 
+Connection ~ 8100 4300
 Wire Notes Line
-	5850 7750 5850 6700
-Text Notes 6050 7700 0    40   Italic 0
-Mounting holes
+	5950 6650 6900 6650
+Wire Notes Line
+	6900 6650 6900 7700
+Wire Notes Line
+	6900 7700 5950 7700
+Wire Notes Line
+	5950 7700 5950 6650
+Wire Wire Line
+	7600 4300 8800 4300
+Wire Wire Line
+	7100 800  6700 800 
+Connection ~ 7100 800 
+Wire Wire Line
+	6700 1500 7100 1500
+Connection ~ 7100 1500
+Wire Wire Line
+	7600 1800 7600 2000
+Connection ~ 7600 1900
+Wire Wire Line
+	7600 4900 7600 5000
+Wire Wire Line
+	7600 5400 7600 5450
+Wire Wire Line
+	7200 3900 7200 4100
+Connection ~ 7200 4000
+Wire Wire Line
+	7200 3300 7200 3400
+Wire Wire Line
+	8100 3550 8100 3600
+Wire Wire Line
+	7600 3750 7600 3800
+Wire Wire Line
+	2400 3000 2400 3800
+Wire Wire Line
+	2400 3800 1700 3800
+Wire Wire Line
+	1700 3500 2500 3500
+Wire Wire Line
+	2500 3500 2500 4200
+Wire Wire Line
+	2500 4200 3400 4200
+Wire Wire Line
+	3300 4800 3300 4750
+Wire Wire Line
+	4000 4750 4000 4700
+Wire Wire Line
+	4100 4100 4000 4100
+Connection ~ 4000 4100
+Wire Wire Line
+	3900 2900 3800 2900
+Connection ~ 3800 2900
+Wire Wire Line
+	3500 1200 3400 1200
+Connection ~ 3400 1200
+Wire Wire Line
+	7200 5100 7200 5200
+Wire Wire Line
+	7200 5200 6400 5200
+Wire Wire Line
+	6400 5200 6400 850 
+Wire Wire Line
+	6400 850  5450 850 
+Wire Wire Line
+	7100 2400 7100 2600
+Wire Wire Line
+	7100 2600 6400 2600
+Connection ~ 6400 2600
+Wire Wire Line
+	8000 2700 8000 2600
+Wire Wire Line
+	8800 4300 8800 2200
+Wire Wire Line
+	8800 2200 9500 2200
+Wire Wire Line
+	6300 2900 6300 5600
+Wire Wire Line
+	6300 5600 9000 5600
+Wire Wire Line
+	9000 5600 9000 2500
+Wire Wire Line
+	9000 2500 9500 2500
+Wire Wire Line
+	6200 4100 6200 5700
+Wire Wire Line
+	6200 5700 9100 5700
+Wire Wire Line
+	9100 5700 9100 2800
+Wire Wire Line
+	9100 2800 9500 2800
+Wire Wire Line
+	10400 4150 10400 4100
+Wire Wire Line
+	9900 5250 9900 5200
+Wire Wire Line
+	10900 4850 10900 4950
+Wire Wire Line
+	10450 5600 10450 5500
+Wire Wire Line
+	2000 7100 1850 7100
+Wire Wire Line
+	2650 6950 2650 7400
+Wire Wire Line
+	2650 7100 2500 7100
+Wire Wire Line
+	1400 6950 1400 7450
+Wire Wire Line
+	1400 7400 1600 7400
+Connection ~ 1400 7100
+Wire Wire Line
+	2350 6750 2350 6950
+Wire Wire Line
+	2350 6950 2650 6950
+Connection ~ 2650 7100
+Wire Wire Line
+	1950 6750 1950 6950
+Wire Wire Line
+	1950 6950 1400 6950
+$Comp
+L GND #PWR?
+U 1 1 550FA8C7
+P 1400 7450
+F 0 "#PWR?" H 1400 7450 30  0001 C CNN
+F 1 "GND" H 1400 7380 30  0001 C CNN
+F 2 "" H 1400 7450 60  0000 C CNN
+F 3 "" H 1400 7450 60  0000 C CNN
+	1    1400 7450
+	1    0    0    -1  
+$EndComp
+Connection ~ 1400 7400
+$Comp
+L GND #PWR?
+U 1 1 550FAD93
+P 1800 6800
+F 0 "#PWR?" H 1800 6800 30  0001 C CNN
+F 1 "GND" H 1800 6730 30  0001 C CNN
+F 2 "" H 1800 6800 60  0000 C CNN
+F 3 "" H 1800 6800 60  0000 C CNN
+	1    1800 6800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3800 7500 3800 7550
+Wire Wire Line
+	3100 5800 3300 5800
+Wire Wire Line
+	3100 5300 3200 5300
+Wire Wire Line
+	3200 5300 3200 5800
+Connection ~ 3200 5800
+Wire Wire Line
+	3800 5900 3800 5800
+Connection ~ 3800 5800
+Wire Wire Line
+	3100 6300 3200 6300
+Wire Wire Line
+	3200 6300 3200 6700
+Wire Wire Line
+	3200 6700 3650 6700
+Wire Wire Line
+	2500 5300 2100 5300
+Connection ~ 2100 5300
+Wire Wire Line
+	4200 5800 4200 5950
+$Comp
+L GND #PWR?
+U 1 1 550FE6C2
+P 4200 6400
+F 0 "#PWR?" H 4200 6400 30  0001 C CNN
+F 1 "GND" H 4200 6330 30  0001 C CNN
+F 2 "" H 4200 6400 60  0001 C CNN
+F 3 "" H 4200 6400 60  0001 C CNN
+	1    4200 6400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4200 6350 4200 6400
+$Comp
+L VPP #PWR134
+U 1 1 442A5846
+P 4100 5750
+F 0 "#PWR134" H 4100 5950 40  0001 C CNN
+F 1 "VPP" H 4100 5900 40  0000 C CNN
+F 2 "" H 4100 5750 60  0001 C CNN
+F 3 "" H 4100 5750 60  0001 C CNN
+	1    4100 5750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3700 5800 4200 5800
+Wire Notes Line
+	650  7700 4600 7700
+Wire Wire Line
+	10900 3600 10900 4400
+Wire Wire Line
+	10900 4400 9400 4400
+Wire Wire Line
+	9400 4400 9400 4900
+Wire Wire Line
+	9400 4900 9500 4900
+Connection ~ 10900 4900
+Wire Wire Line
+	3100 3650 3100 3600
+Wire Wire Line
+	2700 1850 2700 1900
+Wire Wire Line
+	1750 4000 1700 4000
+Wire Wire Line
+	3400 650  3400 700 
+Wire Wire Line
+	3800 2350 3800 2400
+Wire Wire Line
+	3800 3550 3800 3500
+Wire Wire Line
+	3400 1850 3400 1800
+Wire Wire Line
+	4350 3250 4350 3200
+Wire Wire Line
+	4350 2450 4350 2400
+Wire Wire Line
+	3950 1550 3950 1500
+Wire Wire Line
+	5450 1400 5450 1450
+Wire Wire Line
+	4550 4450 4550 4400
+Wire Wire Line
+	10450 6050 10450 6000
+Wire Wire Line
+	10900 5400 10900 5350
 $EndSCHEMATC
diff --git a/demos/pic_programmer/pic_sockets.sch b/demos/pic_programmer/pic_sockets.sch
index e0227e8..07c7f67 100644
--- a/demos/pic_programmer/pic_sockets.sch
+++ b/demos/pic_programmer/pic_sockets.sch
@@ -1,17 +1,12 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:74xx
-LIBS:conn
-LIBS:xilinx
 LIBS:pic_programmer-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 2
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
-Date "15 apr 2008"
+Date "Sun 22 Mar 2015"
 Rev "3"
 Comp "KiCad"
 Comment1 ""
@@ -20,380 +15,434 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	3700 7000 3700 6900
+	3300 6600 3300 6500
 Wire Wire Line
-	2350 2150 3100 2150
+	2100 2400 3000 2400
 Wire Wire Line
-	10250 1800 9400 1800
+	9200 2000 10100 2000
 Wire Wire Line
-	9400 1700 10200 1700
+	9200 1900 10000 1900
 Wire Wire Line
-	8200 1700 7550 1700
-Connection ~ 2950 1100
+	7100 1900 8000 1900
+Connection ~ 2800 1200
 Wire Wire Line
-	2950 1100 3150 1100
-Connection ~ 2950 1200
+	2800 1200 3000 1200
+Connection ~ 2800 1300
 Wire Wire Line
-	2950 1000 2950 1250
+	2800 1100 2800 1350
 Wire Wire Line
-	2950 1000 3150 1000
+	2800 1100 3000 1100
 Wire Wire Line
-	3150 1200 2950 1200
+	3000 1300 2800 1300
 Wire Wire Line
-	4550 1400 5350 1400
+	4400 1500 10000 1500
 Wire Wire Line
-	5400 1300 4550 1300
+	4400 1400 10100 1400
 Wire Wire Line
-	10500 4250 9650 4250
+	10100 4000 9200 4000
 Wire Wire Line
-	9650 4150 10450 4150
+	10000 3900 9200 3900
 Wire Wire Line
-	8450 4150 7700 4150
+	7100 3900 8000 3900
 Wire Wire Line
-	2500 4850 2300 4850
+	2950 4600 2750 4600
 Wire Wire Line
-	4900 5150 4050 5150
+	5400 4900 4500 4900
 Wire Wire Line
-	4050 5000 4850 5000
+	5300 4750 4500 4750
 Wire Wire Line
-	2500 4700 1850 4700
+	2200 4450 2950 4450
 Wire Wire Line
-	5400 2850 4550 2850
+	5400 3100 4450 3100
 Wire Wire Line
-	4550 2450 5350 2450
+	5300 2700 4450 2700
 Wire Wire Line
-	3100 3150 2350 3150
+	3000 3400 2200 3400
 Wire Wire Line
-	2300 4850 2300 4900
+	2750 4600 2750 4650
 Wire Wire Line
-	4850 4850 4050 4850
+	5500 4600 4500 4600
 Wire Wire Line
-	10200 2500 9400 2500
+	10200 2700 9200 2700
 Wire Wire Line
-	10450 4950 9650 4950
+	10200 4700 9200 4700
 Wire Wire Line
-	8450 5150 7650 5150
+	8000 4900 7200 4900
 Wire Wire Line
-	3700 6900 2700 6900
-Text HLabel 2350 2150 0    60   Input ~ 0
+	3300 6500 2400 6500
+Text HLabel 1900 6200 0    60   Input ~ 0
 VCC_PIC
-Text Label 2550 2150 0    60   ~ 0
+Text Label 2450 2400 0    60   ~ 0
 VCC_PIC
-Text Label 7650 5150 0    60   ~ 0
+Text Label 7200 4900 0    60   ~ 0
 VCC_PIC
-Text Label 9900 4950 0    60   ~ 0
+Text Label 9450 4700 0    60   ~ 0
 VCC_PIC
-Text Label 9650 2500 0    60   ~ 0
+Text Label 9450 2700 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR036
 U 1 1 442A8794
-P 8450 5250
-F 0 "#PWR036" H 8450 5250 30  0001 C CNN
-F 1 "GND" H 8450 5180 30  0001 C CNN
-F 2 "" H 8450 5250 60  0001 C CNN
-F 3 "" H 8450 5250 60  0001 C CNN
-	1    8450 5250
+P 8000 5000
+F 0 "#PWR036" H 8000 5000 30  0001 C CNN
+F 1 "GND" H 8000 4930 30  0001 C CNN
+F 2 "" H 8000 5000 60  0001 C CNN
+F 3 "" H 8000 5000 60  0001 C CNN
+	1    8000 5000
 	0    1    1    0   
 $EndComp
-Text Label 4300 4850 0    60   ~ 0
+Text Label 4750 4600 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR037
 U 1 1 443CCA5D
-P 8450 4850
-F 0 "#PWR037" H 8450 4850 30  0001 C CNN
-F 1 "GND" H 8450 4780 30  0001 C CNN
-F 2 "" H 8450 4850 60  0001 C CNN
-F 3 "" H 8450 4850 60  0001 C CNN
-	1    8450 4850
+P 8000 4600
+F 0 "#PWR037" H 8000 4600 30  0001 C CNN
+F 1 "GND" H 8000 4530 30  0001 C CNN
+F 2 "" H 8000 4600 60  0001 C CNN
+F 3 "" H 8000 4600 60  0001 C CNN
+	1    8000 4600
 	0    1    1    0   
 $EndComp
-NoConn ~ 8200 2700
-NoConn ~ 9400 3000
-NoConn ~ 9400 2900
-NoConn ~ 9400 2800
-NoConn ~ 9400 2700
-NoConn ~ 9400 2400
-NoConn ~ 9400 2300
-NoConn ~ 9400 2200
-NoConn ~ 9400 2100
-NoConn ~ 9400 2000
-NoConn ~ 9400 1900
-NoConn ~ 8200 3000
-NoConn ~ 8200 2900
-NoConn ~ 8200 2800
-NoConn ~ 8200 2600
-NoConn ~ 8200 2500
-NoConn ~ 8200 2300
-NoConn ~ 8200 2200
-NoConn ~ 8200 2100
-NoConn ~ 8200 2000
-NoConn ~ 8200 1900
-NoConn ~ 8200 1800
+NoConn ~ 8000 2900
+NoConn ~ 9200 3200
+NoConn ~ 9200 3100
+NoConn ~ 9200 3000
+NoConn ~ 9200 2900
+NoConn ~ 9200 2600
+NoConn ~ 9200 2500
+NoConn ~ 9200 2400
+NoConn ~ 9200 2300
+NoConn ~ 9200 2200
+NoConn ~ 9200 2100
+NoConn ~ 8000 3200
+NoConn ~ 8000 3100
+NoConn ~ 8000 3000
+NoConn ~ 8000 2800
+NoConn ~ 8000 2700
+NoConn ~ 8000 2500
+NoConn ~ 8000 2400
+NoConn ~ 8000 2300
+NoConn ~ 8000 2200
+NoConn ~ 8000 2100
+NoConn ~ 8000 2000
 $Comp
 L GND #PWR038
 U 1 1 443697C7
-P 9400 2600
-F 0 "#PWR038" H 9400 2600 30  0001 C CNN
-F 1 "GND" H 9400 2530 30  0001 C CNN
-F 2 "" H 9400 2600 60  0001 C CNN
-F 3 "" H 9400 2600 60  0001 C CNN
-	1    9400 2600
+P 9200 2800
+F 0 "#PWR038" H 9200 2800 30  0001 C CNN
+F 1 "GND" H 9200 2730 30  0001 C CNN
+F 2 "" H 9200 2800 60  0001 C CNN
+F 3 "" H 9200 2800 60  0001 C CNN
+	1    9200 2800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR039
 U 1 1 443697C3
-P 8200 2400
-F 0 "#PWR039" H 8200 2400 30  0001 C CNN
-F 1 "GND" H 8200 2330 30  0001 C CNN
-F 2 "" H 8200 2400 60  0001 C CNN
-F 3 "" H 8200 2400 60  0001 C CNN
-	1    8200 2400
+P 8000 2600
+F 0 "#PWR039" H 8000 2600 30  0001 C CNN
+F 1 "GND" H 8000 2530 30  0001 C CNN
+F 2 "" H 8000 2600 60  0001 C CNN
+F 3 "" H 8000 2600 60  0001 C CNN
+	1    8000 2600
 	0    1    1    0   
 $EndComp
-Text Label 9550 1800 0    60   ~ 0
+Text Label 9350 2000 0    60   ~ 0
 CLOCK-RB6
-Text Label 9550 1700 0    60   ~ 0
+Text Label 9350 1900 0    60   ~ 0
 DATA-RB7
-Text Label 7550 1700 0    60   ~ 0
+Text Label 7350 1900 0    60   ~ 0
 VPP-MCLR
 $Comp
 L SUPP28 P2
 U 1 1 4436967E
-P 8800 2350
-F 0 "P2" H 8850 3150 70  0000 C CNN
-F 1 "SUPP28" H 8800 1550 70  0000 C CNN
-F 2 "dip_sockets:DIP-28__300_ELL" H 8800 1450 60  0000 C CNN
-F 3 "" H 8800 2350 60  0001 C CNN
-	1    8800 2350
+P 8600 2550
+F 0 "P2" H 8600 3350 70  0000 C CNN
+F 1 "SUPP28" H 8600 1700 70  0000 C CNN
+F 2 "dip_sockets:DIP-28__300_ELL" H 8600 1600 60  0000 C CNN
+F 3 "" H 8600 2550 60  0001 C CNN
+	1    8600 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR040
 U 1 1 442AA147
-P 3700 7400
-F 0 "#PWR040" H 3700 7400 30  0001 C CNN
-F 1 "GND" H 3700 7330 30  0001 C CNN
-F 2 "" H 3700 7400 60  0001 C CNN
-F 3 "" H 3700 7400 60  0001 C CNN
-	1    3700 7400
+P 3300 7050
+F 0 "#PWR040" H 3300 7050 30  0001 C CNN
+F 1 "GND" H 3300 6980 30  0001 C CNN
+F 2 "" H 3300 7050 60  0001 C CNN
+F 3 "" H 3300 7050 60  0001 C CNN
+	1    3300 7050
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 442AA145
-P 3700 7200
-F 0 "C7" H 3750 7300 50  0000 L CNN
-F 1 "100nF" H 3750 7100 50  0000 L CNN
-F 2 "discret:C1-1" H 4050 7000 60  0000 C CNN
-F 3 "" H 3700 7200 60  0001 C CNN
-	1    3700 7200
+P 3300 6800
+F 0 "C7" H 3350 6900 50  0000 L CNN
+F 1 "100nF" H 3350 6700 50  0000 L CNN
+F 2 "discret:C1-1" H 3650 6600 60  0000 C CNN
+F 3 "" H 3300 6800 60  0001 C CNN
+	1    3300 6800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR041
 U 1 1 442AA138
-P 2700 7400
-F 0 "#PWR041" H 2700 7400 30  0001 C CNN
-F 1 "GND" H 2700 7330 30  0001 C CNN
-F 2 "" H 2700 7400 60  0001 C CNN
-F 3 "" H 2700 7400 60  0001 C CNN
-	1    2700 7400
+P 2400 7050
+F 0 "#PWR041" H 2400 7050 30  0001 C CNN
+F 1 "GND" H 2400 6980 30  0001 C CNN
+F 2 "" H 2400 7050 60  0001 C CNN
+F 3 "" H 2400 7050 60  0001 C CNN
+	1    2400 7050
 	1    0    0    -1  
 $EndComp
-NoConn ~ 9650 6050
-NoConn ~ 9650 5950
-NoConn ~ 9650 5850
-NoConn ~ 9650 5750
-NoConn ~ 9650 5650
-NoConn ~ 9650 5550
-NoConn ~ 9650 5450
-NoConn ~ 9650 5350
-NoConn ~ 9650 5250
-NoConn ~ 9650 5150
-NoConn ~ 9650 4850
-NoConn ~ 9650 4750
-NoConn ~ 9650 4650
-NoConn ~ 9650 4550
-NoConn ~ 9650 4450
-NoConn ~ 9650 4350
-NoConn ~ 8450 6050
-NoConn ~ 8450 5950
-NoConn ~ 8450 5850
-NoConn ~ 8450 5750
-NoConn ~ 8450 5650
-NoConn ~ 8450 5550
-NoConn ~ 8450 5450
-NoConn ~ 8450 5350
-NoConn ~ 8450 5050
-NoConn ~ 8450 4950
-NoConn ~ 8450 4750
-NoConn ~ 8450 4650
-NoConn ~ 8450 4550
-NoConn ~ 8450 4450
-NoConn ~ 8450 4350
-NoConn ~ 8450 4250
+NoConn ~ 9200 5800
+NoConn ~ 9200 5700
+NoConn ~ 9200 5600
+NoConn ~ 9200 5500
+NoConn ~ 9200 5400
+NoConn ~ 9200 5300
+NoConn ~ 9200 5200
+NoConn ~ 9200 5100
+NoConn ~ 9200 5000
+NoConn ~ 9200 4900
+NoConn ~ 9200 4600
+NoConn ~ 9200 4500
+NoConn ~ 9200 4400
+NoConn ~ 9200 4300
+NoConn ~ 9200 4200
+NoConn ~ 9200 4100
+NoConn ~ 8000 5800
+NoConn ~ 8000 5700
+NoConn ~ 8000 5600
+NoConn ~ 8000 5500
+NoConn ~ 8000 5400
+NoConn ~ 8000 5300
+NoConn ~ 8000 5200
+NoConn ~ 8000 5100
+NoConn ~ 8000 4800
+NoConn ~ 8000 4700
+NoConn ~ 8000 4500
+NoConn ~ 8000 4400
+NoConn ~ 8000 4300
+NoConn ~ 8000 4200
+NoConn ~ 8000 4100
+NoConn ~ 8000 4000
 $Comp
 L GND #PWR042
 U 1 1 442A896A
-P 9650 5050
-F 0 "#PWR042" H 9650 5050 30  0001 C CNN
-F 1 "GND" H 9650 4980 30  0001 C CNN
-F 2 "" H 9650 5050 60  0001 C CNN
-F 3 "" H 9650 5050 60  0001 C CNN
-	1    9650 5050
+P 9200 4800
+F 0 "#PWR042" H 9200 4800 30  0001 C CNN
+F 1 "GND" H 9200 4730 30  0001 C CNN
+F 2 "" H 9200 4800 60  0001 C CNN
+F 3 "" H 9200 4800 60  0001 C CNN
+	1    9200 4800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L SUPP40 P3
 U 1 1 442A88ED
-P 9050 5100
-F 0 "P3" H 9100 6200 70  0000 C CNN
-F 1 "SUPP40" H 8900 4000 70  0000 C CNN
-F 2 "sockets:40tex-Ell600" H 9100 3900 60  0000 C CNN
-F 3 "" H 9050 5100 60  0001 C CNN
-	1    9050 5100
+P 8600 4850
+F 0 "P3" H 8600 5950 70  0000 C CNN
+F 1 "SUPP40" H 8600 3700 70  0000 C CNN
+F 2 "sockets:40tex-Ell600" H 8600 3600 60  0000 C CNN
+F 3 "" H 8600 4850 60  0001 C CNN
+	1    8600 4850
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4550 1100
+NoConn ~ 4400 1200
 $Comp
 L GND #PWR043
 U 1 1 442A8838
-P 2950 1250
-F 0 "#PWR043" H 2950 1250 30  0001 C CNN
-F 1 "GND" H 2950 1180 30  0001 C CNN
-F 2 "" H 2950 1250 60  0001 C CNN
-F 3 "" H 2950 1250 60  0001 C CNN
-	1    2950 1250
+P 2800 1350
+F 0 "#PWR043" H 2800 1350 30  0001 C CNN
+F 1 "GND" H 2800 1280 30  0001 C CNN
+F 2 "" H 2800 1350 60  0001 C CNN
+F 3 "" H 2800 1350 60  0001 C CNN
+	1    2800 1350
 	1    0    0    -1  
 $EndComp
-Text Label 4700 1400 0    60   ~ 0
+Text Label 4550 1500 0    60   ~ 0
 DATA-RB7
-Text Label 4700 1300 0    60   ~ 0
+Text Label 4550 1400 0    60   ~ 0
 CLOCK-RB6
 $Comp
 L 24C16 U1
 U 1 1 442A87F7
-P 3850 1200
-F 0 "U1" H 4000 1550 60  0000 C CNN
-F 1 "24Cxx" H 4050 850 60  0000 C CNN
-F 2 "dip_sockets:DIP-8__300_ELL" H 4600 800 60  0000 C CNN
-F 3 "" H 3850 1200 60  0001 C CNN
-	1    3850 1200
+P 3700 1300
+F 0 "U1" H 3850 1650 60  0000 C CNN
+F 1 "24Cxx" H 3900 950 60  0000 C CNN
+F 2 "dip_sockets:DIP-8__300_ELL" H 4450 850 60  0000 C CNN
+F 3 "" H 3700 1300 60  0001 C CNN
+	1    3700 1300
 	1    0    0    -1  
 $EndComp
-Text Label 9800 4250 0    60   ~ 0
+Text Label 9350 4000 0    60   ~ 0
 CLOCK-RB6
-Text Label 9800 4150 0    60   ~ 0
+Text Label 9350 3900 0    60   ~ 0
 DATA-RB7
-Text Label 7800 4150 0    60   ~ 0
+Text Label 7350 3900 0    60   ~ 0
 VPP-MCLR
-NoConn ~ 2500 4400
-NoConn ~ 4050 5450
-NoConn ~ 4050 5300
-NoConn ~ 4050 4550
-NoConn ~ 4050 4700
-NoConn ~ 4050 4400
-NoConn ~ 4050 4250
-NoConn ~ 2500 5450
-NoConn ~ 2500 5300
-NoConn ~ 2500 5150
-NoConn ~ 2500 5000
-NoConn ~ 2500 4550
-NoConn ~ 2500 4250
+NoConn ~ 2950 4150
+NoConn ~ 4500 5200
+NoConn ~ 4500 5050
+NoConn ~ 4500 4300
+NoConn ~ 4500 4450
+NoConn ~ 4500 4150
+NoConn ~ 4500 4000
+NoConn ~ 2950 5200
+NoConn ~ 2950 5050
+NoConn ~ 2950 4900
+NoConn ~ 2950 4750
+NoConn ~ 2950 4300
+NoConn ~ 2950 4000
 $Comp
 L PIC16F54 U5
 U 1 1 442A81A7
-P 3300 4850
-F 0 "U5" H 3300 5600 60  0000 C CNN
-F 1 "PIC_18_PINS" H 3300 4050 60  0000 C CNN
-F 2 "dip_sockets:DIP-18__300_ELL" H 3350 3950 60  0000 C CNN
-F 3 "" H 3300 4850 60  0001 C CNN
-	1    3300 4850
+P 3750 4600
+F 0 "U5" H 3750 5350 60  0000 C CNN
+F 1 "PIC_18_PINS" H 3750 3800 60  0000 C CNN
+F 2 "dip_sockets:DIP-18__300_ELL" H 3800 3700 60  0000 C CNN
+F 3 "" H 3750 4600 60  0001 C CNN
+	1    3750 4600
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4550 3150
-NoConn ~ 3100 2850
-NoConn ~ 3100 2450
-Text Label 4200 5150 0    60   ~ 0
+NoConn ~ 4450 3400
+NoConn ~ 3000 3100
+NoConn ~ 3000 2700
+Text Label 4650 4900 0    60   ~ 0
 CLOCK-RB6
-Text Label 4200 5000 0    60   ~ 0
+Text Label 4650 4750 0    60   ~ 0
 DATA-RB7
-Text Label 1850 4700 0    60   ~ 0
+Text Label 2300 4450 0    60   ~ 0
 VPP-MCLR
-Text Label 2450 3150 0    60   ~ 0
+Text Label 2350 3400 0    60   ~ 0
 VPP-MCLR
-Text Label 4700 2850 0    60   ~ 0
+Text Label 4600 3100 0    60   ~ 0
 CLOCK-RB6
-Text Label 4700 2450 0    60   ~ 0
+Text Label 4600 2700 0    60   ~ 0
 DATA-RB7
-Text HLabel 1350 4450 0    60   Input ~ 0
+Text HLabel 1900 6300 0    60   Input ~ 0
 VPP-MCLR
-Text HLabel 1350 4250 0    60   Input ~ 0
+Text HLabel 1900 2000 0    60   Input ~ 0
 CLOCK-RB6
-Text HLabel 1350 4050 0    60   Input ~ 0
+Text HLabel 1900 2100 0    60   Input ~ 0
 DATA-RB7
 $Comp
 L GND #PWR044
 U 1 1 442A820F
-P 2300 4900
-F 0 "#PWR044" H 2300 4900 30  0001 C CNN
-F 1 "GND" H 2300 4830 30  0001 C CNN
-F 2 "" H 2300 4900 60  0001 C CNN
-F 3 "" H 2300 4900 60  0001 C CNN
-	1    2300 4900
+P 2750 4650
+F 0 "#PWR044" H 2750 4650 30  0001 C CNN
+F 1 "GND" H 2750 4580 30  0001 C CNN
+F 2 "" H 2750 4650 60  0001 C CNN
+F 3 "" H 2750 4650 60  0001 C CNN
+	1    2750 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR045
 U 1 1 442A8205
-P 4550 2150
-F 0 "#PWR045" H 4550 2150 30  0001 C CNN
-F 1 "GND" H 4550 2080 30  0001 C CNN
-F 2 "" H 4550 2150 60  0001 C CNN
-F 3 "" H 4550 2150 60  0001 C CNN
-	1    4550 2150
+P 4450 2400
+F 0 "#PWR045" H 4450 2400 30  0001 C CNN
+F 1 "GND" H 4450 2330 30  0001 C CNN
+F 2 "" H 4450 2400 60  0001 C CNN
+F 3 "" H 4450 2400 60  0001 C CNN
+	1    4450 2400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L PIC12C508A U6
 U 1 1 442A81A5
-P 3850 2650
-F 0 "U6" H 3800 3350 60  0000 C CNN
-F 1 "PIC_8_PINS" H 3850 1950 60  0000 C CNN
-F 2 "dip_sockets:DIP-8__300_ELL" H 3850 1850 60  0000 C CNN
-F 3 "" H 3850 2650 60  0001 C CNN
-	1    3850 2650
+P 3750 2900
+F 0 "U6" H 3700 3600 60  0000 C CNN
+F 1 "PIC_8_PINS" H 3750 2200 60  0000 C CNN
+F 2 "dip_sockets:DIP-8__300_ELL" H 3750 2100 60  0000 C CNN
+F 3 "" H 3750 2900 60  0001 C CNN
+	1    3750 2900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR046
 U 1 1 52C92629
-P 3850 1700
-F 0 "#PWR046" H 3850 1700 30  0001 C CNN
-F 1 "GND" H 3850 1630 30  0001 C CNN
-F 2 "" H 3850 1700 60  0001 C CNN
-F 3 "" H 3850 1700 60  0001 C CNN
-	1    3850 1700
+P 3700 1850
+F 0 "#PWR046" H 3700 1850 30  0001 C CNN
+F 1 "GND" H 3700 1780 30  0001 C CNN
+F 2 "" H 3700 1850 60  0001 C CNN
+F 3 "" H 3700 1850 60  0001 C CNN
+	1    3700 1850
 	1    0    0    -1  
 $EndComp
-Text Label 3850 700  0    60   ~ 0
+Text Label 3700 800  0    60   ~ 0
 VCC_PIC
 $Comp
 L C C6
 U 1 1 442AA12B
-P 2700 7200
-F 0 "C6" H 2750 7300 50  0000 L CNN
-F 1 "100nF" H 2750 7100 50  0000 L CNN
-F 2 "discret:C1-1" H 3050 7050 60  0000 C CNN
-F 3 "" H 2700 7200 60  0001 C CNN
-	1    2700 7200
+P 2400 6800
+F 0 "C6" H 2450 6900 50  0000 L CNN
+F 1 "100nF" H 2450 6700 50  0000 L CNN
+F 2 "discret:C1-1" H 2750 6600 60  0000 C CNN
+F 3 "" H 2400 6800 60  0001 C CNN
+	1    2400 6800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2700 6900 2700 7000
-Text Label 3150 6900 0    60   ~ 0
+	2400 6200 2400 6600
+Text Label 2750 6500 0    60   ~ 0
 VCC_PIC
+Wire Wire Line
+	5300 1500 5300 4750
+Connection ~ 5300 2700
+Wire Wire Line
+	5400 1400 5400 4900
+Connection ~ 5400 3100
+Wire Wire Line
+	10000 1500 10000 3900
+Connection ~ 5300 1500
+Connection ~ 10000 1900
+Wire Wire Line
+	10100 1400 10100 4000
+Connection ~ 10100 2000
+Connection ~ 5400 1400
+Wire Wire Line
+	10200 6200 10200 2700
+Wire Wire Line
+	5500 6200 5500 800 
+Wire Wire Line
+	1900 6200 10200 6200
+Connection ~ 10200 4700
+Wire Wire Line
+	5500 800  3700 800 
+Connection ~ 5500 4600
+Wire Wire Line
+	2200 3400 2200 6300
+Wire Wire Line
+	7100 6300 1900 6300
+Wire Wire Line
+	7100 1900 7100 6300
+Connection ~ 2200 4450
+Connection ~ 7100 3900
+Wire Wire Line
+	7200 4900 7200 6200
+Connection ~ 7200 6200
+Connection ~ 5500 6200
+Connection ~ 2200 6300
+Wire Wire Line
+	2100 2400 2100 6200
+Connection ~ 2100 6200
+Wire Wire Line
+	1900 2000 5400 2000
+Connection ~ 5400 2000
+Wire Wire Line
+	1900 2100 5300 2100
+Connection ~ 5300 2100
+Connection ~ 2400 6500
+Connection ~ 2400 6200
+Wire Wire Line
+	3700 1850 3700 1800
+Wire Wire Line
+	2400 7000 2400 7050
+Wire Wire Line
+	3300 7000 3300 7050
 $EndSCHEMATC
diff --git a/demos/pspice/pspice.sch b/demos/pspice/pspice.sch
index 7794896..9e64a24 100644
--- a/demos/pspice/pspice.sch
+++ b/demos/pspice/pspice.sch
@@ -1,13 +1,13 @@
 EESchema Schematic File Version 2
 LIBS:pspice
 LIBS:pspice-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "14 jul 2010"
+Date "Sun 22 Mar 2015"
 Rev ""
 Comp ""
 Comment1 ""
@@ -20,13 +20,13 @@ VIN
 Text Label 8650 2100 0    60   ~ 0
 VOUT
 Wire Notes Line
-	4050 6600 4050 5700
+	1100 7100 1100 6200
 Wire Notes Line
-	4050 6600 6850 6600
+	1100 7100 3900 7100
 Wire Notes Line
-	6850 6600 6850 5700
+	3900 7100 3900 6200
 Wire Notes Line
-	6850 5700 4050 5700
+	3900 6200 1100 6200
 Wire Wire Line
 	4400 2800 5300 2800
 Connection ~ 9200 1800
@@ -40,11 +40,8 @@ Wire Wire Line
 	7800 1500 8250 1500
 Wire Wire Line
 	9200 1500 9200 2100
-Connection ~ 7700 2800
 Wire Wire Line
-	8250 2800 8400 2800
-Wire Wire Line
-	7450 2800 7750 2800
+	8250 2900 8400 2900
 Connection ~ 7050 2450
 Wire Wire Line
 	7050 2600 7050 2450
@@ -61,8 +58,6 @@ Wire Wire Line
 Wire Wire Line
 	3900 2800 3850 2800
 Wire Wire Line
-	7700 2950 7700 2800
-Wire Wire Line
 	6100 2450 7250 2450
 Wire Wire Line
 	6100 2450 6100 2300
@@ -75,14 +70,12 @@ Wire Wire Line
 Wire Wire Line
 	6700 2300 6700 3300
 Wire Wire Line
-	6100 3150 6100 3300
-Wire Wire Line
 	5100 2300 5100 3300
 Wire Wire Line
 	9200 2100 7700 2100
-Text Notes 4100 6100 0    60   ~ 0
+Text Notes 1150 6600 0    60   ~ 0
 +gnucap .model Q2N2222 npn (bf=200)\n.print tran v(nodes)\n.print dc v(nodes)\n.tran 10 10000 10 > pspice.dat\n
-Text Notes 4050 5700 0    60   ~ 0
+Text Notes 1100 6200 0    60   ~ 0
 Pspice directives using one multiline text:
 $Comp
 L R R12
@@ -99,7 +92,7 @@ $Comp
 L R R11
 U 1 1 3E9D4D47
 P 7800 1200
-F 0 "R11" V 7880 1200 50  0000 C CNN
+F 0 "R11" H 7700 1400 50  0000 C CNN
 F 1 "100" V 7800 1200 50  0000 C CNN
 F 2 "" H 7800 1200 60  0001 C CNN
 F 3 "" H 7800 1200 60  0001 C CNN
@@ -110,55 +103,55 @@ $Comp
 L INDUCTOR L1
 U 1 1 3E9D4A5D
 P 8500 1500
-F 0 "L1" H 8500 1600 70  0000 C CNN
-F 1 "100mH" H 8500 1350 70  0000 C CNN
+F 0 "L1" H 8500 1600 50  0000 C CNN
+F 1 "100mH" H 8500 1400 50  0000 C CNN
 F 2 "" H 8500 1500 60  0001 C CNN
 F 3 "" H 8500 1500 60  0001 C CNN
 	1    8500 1500
-	1    0    0    1   
+	1    0    0    -1  
 $EndComp
 $Comp
 L R R10
 U 1 1 3E9D3DED
-P 8000 2800
-F 0 "R10" V 8080 2800 50  0000 C CNN
-F 1 "220" V 8000 2800 50  0000 C CNN
-F 2 "" H 8000 2800 60  0001 C CNN
-F 3 "" H 8000 2800 60  0001 C CNN
-	1    8000 2800
+P 8000 2900
+F 0 "R10" V 8080 2900 50  0000 C CNN
+F 1 "220" V 8000 2900 50  0000 C CNN
+F 2 "" H 8000 2900 60  0001 C CNN
+F 3 "" H 8000 2900 60  0001 C CNN
+	1    8000 2900
 	0    1    1    0   
 $EndComp
 $Comp
 L 0 #GND01
 U 1 1 3E9D3DE2
-P 8400 3300
-F 0 "#GND01" H 8400 3200 40  0001 C CNN
-F 1 "0" H 8400 3230 40  0000 C CNN
-F 2 "" H 8400 3300 60  0001 C CNN
-F 3 "" H 8400 3300 60  0001 C CNN
-	1    8400 3300
+P 8400 3450
+F 0 "#GND01" H 8400 3350 40  0001 C CNN
+F 1 "0" H 8400 3380 40  0000 C CNN
+F 2 "" H 8400 3450 60  0001 C CNN
+F 3 "" H 8400 3450 60  0001 C CNN
+	1    8400 3450
 	1    0    0    -1  
 $EndComp
 $Comp
 L CAP C3
 U 1 1 3E9D3DD3
-P 8400 3050
-F 0 "C3" V 8500 3200 50  0000 C CNN
-F 1 "10uF" V 8500 2900 50  0000 C CNN
-F 2 "" H 8400 3050 60  0000 C CNN
-F 3 "" H 8400 3050 60  0000 C CNN
-	1    8400 3050
+P 8400 3150
+F 0 "C3" V 8500 3300 50  0000 C CNN
+F 1 "10uF" V 8500 3000 50  0000 C CNN
+F 2 "" H 8400 3150 60  0000 C CNN
+F 3 "" H 8400 3150 60  0000 C CNN
+	1    8400 3150
 	1    0    0    -1  
 $EndComp
 $Comp
 L 0 #GND02
 U 1 1 3E9D1EFF
-P 7050 3100
-F 0 "#GND02" H 7050 3000 40  0001 C CNN
-F 1 "0" H 7050 3030 40  0000 C CNN
-F 2 "" H 7050 3100 60  0001 C CNN
-F 3 "" H 7050 3100 60  0001 C CNN
-	1    7050 3100
+P 7050 3150
+F 0 "#GND02" H 7050 3050 40  0001 C CNN
+F 1 "0" H 7050 3080 40  0000 C CNN
+F 2 "" H 7050 3150 60  0001 C CNN
+F 3 "" H 7050 3150 60  0001 C CNN
+	1    7050 3150
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -175,34 +168,34 @@ $EndComp
 $Comp
 L 0 #GND03
 U 1 1 32E8B852
-P 7700 3450
-F 0 "#GND03" H 7700 3350 40  0001 C CNN
-F 1 "0" H 7700 3380 40  0000 C CNN
-F 2 "" H 7700 3450 60  0001 C CNN
-F 3 "" H 7700 3450 60  0001 C CNN
-	1    7700 3450
+P 7700 3550
+F 0 "#GND03" H 7700 3450 40  0001 C CNN
+F 1 "0" H 7700 3480 40  0000 C CNN
+F 2 "" H 7700 3550 60  0001 C CNN
+F 3 "" H 7700 3550 60  0001 C CNN
+	1    7700 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #+12V6
 U 1 1 32E8B84A
-P 7800 950
-F 0 "#+12V6" H 7800 1150 40  0001 C CNN
-F 1 "+12V" H 7800 1100 40  0000 C CNN
-F 2 "" H 7800 950 60  0001 C CNN
-F 3 "" H 7800 950 60  0001 C CNN
-	1    7800 950 
+P 7800 900
+F 0 "#+12V6" H 7800 1100 40  0001 C CNN
+F 1 "+12V" H 7800 1050 40  0000 C CNN
+F 2 "" H 7800 900 60  0001 C CNN
+F 3 "" H 7800 900 60  0001 C CNN
+	1    7800 900 
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R8
 U 1 1 32E8B80E
-P 7700 3200
-F 0 "R8" V 7780 3200 50  0000 C CNN
-F 1 "2.2K" V 7700 3200 50  0000 C CNN
-F 2 "" H 7700 3200 60  0001 C CNN
-F 3 "" H 7700 3200 60  0001 C CNN
-	1    7700 3200
+P 7700 3250
+F 0 "R8" V 7780 3250 50  0000 C CNN
+F 1 "2.2K" V 7700 3250 50  0000 C CNN
+F 2 "" H 7700 3250 60  0001 C CNN
+F 3 "" H 7700 3250 60  0001 C CNN
+	1    7700 3250
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -219,12 +212,12 @@ $EndComp
 $Comp
 L 0 #GND04
 U 1 1 32CFC469
-P 3850 4200
-F 0 "#GND04" H 3850 4100 40  0001 C CNN
-F 1 "0" H 3850 4130 40  0000 C CNN
-F 2 "" H 3850 4200 60  0001 C CNN
-F 3 "" H 3850 4200 60  0001 C CNN
-	1    3850 4200
+P 3850 4250
+F 0 "#GND04" H 3850 4150 40  0001 C CNN
+F 1 "0" H 3850 4180 40  0000 C CNN
+F 2 "" H 3850 4250 60  0001 C CNN
+F 3 "" H 3850 4250 60  0001 C CNN
+	1    3850 4250
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -263,12 +256,12 @@ $EndComp
 $Comp
 L 0 #GND05
 U 1 1 32CFC344
-P 2850 2900
-F 0 "#GND05" H 2850 2800 40  0001 C CNN
-F 1 "0" H 2850 2830 40  0000 C CNN
-F 2 "" H 2850 2900 60  0001 C CNN
-F 3 "" H 2850 2900 60  0001 C CNN
-	1    2850 2900
+P 2850 2950
+F 0 "#GND05" H 2850 2850 40  0001 C CNN
+F 1 "0" H 2850 2880 40  0000 C CNN
+F 2 "" H 2850 2950 60  0001 C CNN
+F 3 "" H 2850 2950 60  0001 C CNN
+	1    2850 2950
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -285,67 +278,67 @@ $EndComp
 $Comp
 L +12V #+12V4
 U 1 1 32CFC303
-P 6700 1800
-F 0 "#+12V4" H 6700 2000 40  0001 C CNN
-F 1 "+12V" H 6700 1950 40  0000 C CNN
-F 2 "" H 6700 1800 60  0001 C CNN
-F 3 "" H 6700 1800 60  0001 C CNN
-	1    6700 1800
+P 6700 1750
+F 0 "#+12V4" H 6700 1950 40  0001 C CNN
+F 1 "+12V" H 6700 1900 40  0000 C CNN
+F 2 "" H 6700 1750 60  0001 C CNN
+F 3 "" H 6700 1750 60  0001 C CNN
+	1    6700 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #+12V3
 U 1 1 32CFC2FF
-P 6100 1800
-F 0 "#+12V3" H 6100 2000 40  0001 C CNN
-F 1 "+12V" H 6100 1950 40  0000 C CNN
-F 2 "" H 6100 1800 60  0001 C CNN
-F 3 "" H 6100 1800 60  0001 C CNN
-	1    6100 1800
+P 6100 1750
+F 0 "#+12V3" H 6100 1950 40  0001 C CNN
+F 1 "+12V" H 6100 1900 40  0000 C CNN
+F 2 "" H 6100 1750 60  0001 C CNN
+F 3 "" H 6100 1750 60  0001 C CNN
+	1    6100 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #+12V2
 U 1 1 32CFC2FD
-P 5750 1800
-F 0 "#+12V2" H 5750 2000 40  0001 C CNN
-F 1 "+12V" H 5750 1950 40  0000 C CNN
-F 2 "" H 5750 1800 60  0001 C CNN
-F 3 "" H 5750 1800 60  0001 C CNN
-	1    5750 1800
+P 5750 1750
+F 0 "#+12V2" H 5750 1950 40  0001 C CNN
+F 1 "+12V" H 5750 1900 40  0000 C CNN
+F 2 "" H 5750 1750 60  0001 C CNN
+F 3 "" H 5750 1750 60  0001 C CNN
+	1    5750 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #+12V1
 U 1 1 32CFC2F7
-P 5100 1800
-F 0 "#+12V1" H 5100 2000 40  0001 C CNN
-F 1 "+12V" H 5100 1950 40  0000 C CNN
-F 2 "" H 5100 1800 60  0001 C CNN
-F 3 "" H 5100 1800 60  0001 C CNN
-	1    5100 1800
+P 5100 1750
+F 0 "#+12V1" H 5100 1950 40  0001 C CNN
+F 1 "+12V" H 5100 1900 40  0000 C CNN
+F 2 "" H 5100 1750 60  0001 C CNN
+F 3 "" H 5100 1750 60  0001 C CNN
+	1    5100 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L 0 #GND06
 U 1 1 32CFC2B8
-P 6700 3800
-F 0 "#GND06" H 6700 3700 40  0001 C CNN
-F 1 "0" H 6700 3730 40  0000 C CNN
-F 2 "" H 6700 3800 60  0001 C CNN
-F 3 "" H 6700 3800 60  0001 C CNN
-	1    6700 3800
+P 6700 3850
+F 0 "#GND06" H 6700 3750 40  0001 C CNN
+F 1 "0" H 6700 3780 40  0000 C CNN
+F 2 "" H 6700 3850 60  0001 C CNN
+F 3 "" H 6700 3850 60  0001 C CNN
+	1    6700 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L 0 #GND07
 U 1 1 32CFC2B5
-P 5100 3800
-F 0 "#GND07" H 5100 3700 40  0001 C CNN
-F 1 "0" H 5100 3730 40  0000 C CNN
-F 2 "" H 5100 3800 60  0001 C CNN
-F 3 "" H 5100 3800 60  0001 C CNN
-	1    5100 3800
+P 5100 3850
+F 0 "#GND07" H 5100 3750 40  0001 C CNN
+F 1 "0" H 5100 3780 40  0000 C CNN
+F 2 "" H 5100 3850 60  0001 C CNN
+F 3 "" H 5100 3850 60  0001 C CNN
+	1    5100 3850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -363,7 +356,7 @@ $Comp
 L R R6
 U 1 1 32CFC288
 P 5100 2050
-F 0 "R6" V 5180 2050 50  0000 C CNN
+F 0 "R6" H 5000 2250 50  0000 C CNN
 F 1 "22K" V 5100 2050 50  0000 C CNN
 F 2 "" H 5100 2050 60  0001 C CNN
 F 3 "" H 5100 2050 60  0001 C CNN
@@ -374,7 +367,7 @@ $Comp
 L R R5
 U 1 1 32CFC27F
 P 6700 2050
-F 0 "R5" V 6780 2050 50  0000 C CNN
+F 0 "R5" H 6600 2250 50  0000 C CNN
 F 1 "22K" V 6700 2050 50  0000 C CNN
 F 2 "" H 6700 2050 60  0001 C CNN
 F 3 "" H 6700 2050 60  0001 C CNN
@@ -395,30 +388,30 @@ $EndComp
 $Comp
 L 0 #GND08
 U 1 1 32CFC26C
-P 6100 3800
-F 0 "#GND08" H 6100 3700 40  0001 C CNN
-F 1 "0" H 6100 3730 40  0000 C CNN
-F 2 "" H 6100 3800 60  0001 C CNN
-F 3 "" H 6100 3800 60  0001 C CNN
-	1    6100 3800
+P 5950 3850
+F 0 "#GND08" H 5950 3750 40  0001 C CNN
+F 1 "0" H 5950 3780 40  0000 C CNN
+F 2 "" H 5950 3850 60  0001 C CNN
+F 3 "" H 5950 3850 60  0001 C CNN
+	1    5950 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R7
 U 1 1 32CFC25A
-P 6100 3550
-F 0 "R7" V 6180 3550 50  0000 C CNN
-F 1 "470" V 6100 3550 50  0000 C CNN
-F 2 "" H 6100 3550 60  0001 C CNN
-F 3 "" H 6100 3550 60  0001 C CNN
-	1    6100 3550
+P 5950 3550
+F 0 "R7" V 6030 3550 50  0000 C CNN
+F 1 "470" V 5950 3550 50  0000 C CNN
+F 2 "" H 5950 3550 60  0001 C CNN
+F 3 "" H 5950 3550 60  0001 C CNN
+	1    5950 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 32CFC254
 P 6100 2050
-F 0 "R4" V 6180 2050 50  0000 C CNN
+F 0 "R4" H 6000 2250 50  0000 C CNN
 F 1 "1K" V 6100 2050 50  0000 C CNN
 F 2 "" H 6100 2050 60  0001 C CNN
 F 3 "" H 6100 2050 60  0001 C CNN
@@ -429,7 +422,7 @@ $Comp
 L R R3
 U 1 1 32CFC24C
 P 5750 2050
-F 0 "R3" V 5830 2050 50  0000 C CNN
+F 0 "R3" H 5650 2250 50  0000 C CNN
 F 1 "1K" V 5750 2050 50  0000 C CNN
 F 2 "" H 5750 2050 60  0001 C CNN
 F 3 "" H 5750 2050 60  0001 C CNN
@@ -461,4 +454,45 @@ $EndComp
 Wire Wire Line
 	9200 1500 8750 1500
 Connection ~ 7800 1500
+Wire Wire Line
+	2850 2900 2850 2950
+Wire Wire Line
+	3850 4200 3850 4250
+Wire Wire Line
+	5100 3800 5100 3850
+Wire Wire Line
+	5950 3800 5950 3850
+Wire Wire Line
+	6100 3150 6100 3200
+Wire Wire Line
+	5950 3200 5950 3300
+Connection ~ 5950 3200
+Wire Wire Line
+	6700 3850 6700 3800
+Wire Wire Line
+	7050 3150 7050 3100
+Wire Wire Line
+	7700 3550 7700 3500
+Wire Wire Line
+	8400 3450 8400 3400
+Wire Wire Line
+	7700 2800 7700 3000
+Wire Wire Line
+	7750 2900 7700 2900
+Connection ~ 7700 2900
+Wire Wire Line
+	7700 2850 7450 2850
+Wire Wire Line
+	7450 2850 7450 2800
+Connection ~ 7700 2850
+Wire Wire Line
+	6700 1750 6700 1800
+Wire Wire Line
+	6100 1750 6100 1800
+Wire Wire Line
+	5750 1750 5750 1800
+Wire Wire Line
+	5100 1750 5100 1800
+Wire Wire Line
+	7800 900  7800 950 
 $EndSCHEMATC
diff --git a/demos/sonde xilinx/sonde xilinx.sch b/demos/sonde xilinx/sonde xilinx.sch
index 6868742..05ef1f6 100644
--- a/demos/sonde xilinx/sonde xilinx.sch	
+++ b/demos/sonde xilinx/sonde xilinx.sch	
@@ -4,13 +4,13 @@ LIBS:device
 LIBS:conn
 LIBS:74xx
 LIBS:sonde xilinx-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
-Title "CABLE PARALLELE III"
-Date "10 feb 2011"
+Title "PARALLEL CABLE III"
+Date "Sun 22 Mar 2015"
 Rev "1"
 Comp ""
 Comment1 ""
@@ -37,16 +37,18 @@ Connection ~ 6300 4200
 Wire Wire Line
 	6300 4250 6300 4200
 Wire Wire Line
-	6400 4200 5900 4200
+	5900 4200 6300 4200
+Wire Wire Line
+	6300 4200 6400 4200
 $Comp
 L GND #PWR01
 U 1 1 3EBF81B1
-P 6300 4650
-F 0 "#PWR01" H 6300 4650 40  0001 C CNN
-F 1 "GND" H 6300 4580 40  0001 C CNN
-F 2 "" H 6300 4650 60  0001 C CNN
-F 3 "" H 6300 4650 60  0001 C CNN
-	1    6300 4650
+P 6300 4700
+F 0 "#PWR01" H 6300 4700 40  0001 C CNN
+F 1 "GND" H 6300 4630 40  0001 C CNN
+F 2 "" H 6300 4700 60  0001 C CNN
+F 3 "" H 6300 4700 60  0001 C CNN
+	1    6300 4700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -74,41 +76,49 @@ $EndComp
 Wire Wire Line
 	5000 4200 4200 4200
 Wire Wire Line
-	5450 4500 4800 4500
+	4800 4500 5450 4500
 $Comp
 L 74LS125 U1
 U 4 1 3EBF7DBD
 P 5450 4200
 F 0 "U1" H 5450 4300 50  0000 L BNN
-F 1 "74LS125" H 5500 4051 40  0000 L TNN
+F 1 "74LS125" H 5500 4051 50  0000 L TNN
 F 2 "" H 5450 4200 60  0001 C CNN
 F 3 "" H 5450 4200 60  0001 C CNN
 	4    5450 4200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4800 4500 4800 2900
-Text Label 8250 3800 1    60   ~ 0
+	4800 2900 4800 3600
+Wire Wire Line
+	4800 3600 4800 4500
+Text Label 8100 3800 1    60   ~ 0
 TMS-PROG
 Wire Wire Line
-	10250 4100 8300 4100
+	10250 4100 8200 4100
 Wire Wire Line
-	10250 4300 8250 4300
+	10250 4300 8100 4300
 Wire Wire Line
-	10250 3900 8350 3900
+	10250 3900 8300 3900
 Wire Wire Line
 	10250 3700 8400 3700
 Wire Wire Line
-	10250 3600 10050 3600
+	10050 3600 10200 3600
+Wire Wire Line
+	10200 3600 10250 3600
 Connection ~ 10200 3600
 Connection ~ 10200 4000
 Connection ~ 10200 3800
 Wire Wire Line
-	10250 4000 10200 4000
+	10200 4000 10250 4000
 Wire Wire Line
 	10250 3800 10200 3800
 Wire Wire Line
-	10200 3600 10200 4200
+	10200 3600 10200 3800
+Wire Wire Line
+	10200 3800 10200 4000
+Wire Wire Line
+	10200 4000 10200 4200
 Wire Wire Line
 	10200 4200 10250 4200
 $Comp
@@ -122,60 +132,60 @@ F 3 "" H 10700 3900 60  0001 C CNN
 	1    10700 3900
 	1    0    0    1   
 $EndComp
-Connection ~ 8250 3050
-Connection ~ 8300 2950
-Connection ~ 8350 2850
+Connection ~ 8100 3050
+Connection ~ 8200 2950
+Connection ~ 8300 2850
 Connection ~ 8400 2750
 Wire Wire Line
-	8250 4300 8250 3050
+	8100 4300 8100 3050
 Wire Wire Line
-	8300 4100 8300 2950
+	8200 4100 8200 2950
 Wire Wire Line
-	8350 3900 8350 2850
+	8300 3900 8300 2850
 Wire Wire Line
 	8400 3700 8400 2750
 $Comp
 L PWR_FLAG #FLG02
 U 1 1 3EBF848F
-P 6200 1050
-F 0 "#FLG02" H 6200 1320 30  0001 C CNN
-F 1 "PWR_FLAG" H 6200 1280 30  0000 C CNN
-F 2 "" H 6200 1050 60  0001 C CNN
-F 3 "" H 6200 1050 60  0001 C CNN
-	1    6200 1050
+P 6100 950
+F 0 "#FLG02" H 6100 1220 30  0001 C CNN
+F 1 "PWR_FLAG" H 6100 1180 30  0000 C CNN
+F 2 "" H 6100 950 60  0001 C CNN
+F 3 "" H 6100 950 60  0001 C CNN
+	1    6100 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR03
 U 1 1 3EBF8479
-P 5900 1050
-F 0 "#PWR03" H 5900 1150 30  0001 C CNN
-F 1 "VCC" H 5900 1150 30  0000 C CNN
-F 2 "" H 5900 1050 60  0001 C CNN
-F 3 "" H 5900 1050 60  0001 C CNN
-	1    5900 1050
+P 5800 950
+F 0 "#PWR03" H 5800 1050 30  0001 C CNN
+F 1 "VCC" H 5800 1050 30  0000 C CNN
+F 2 "" H 5800 950 60  0001 C CNN
+F 3 "" H 5800 950 60  0001 C CNN
+	1    5800 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR04
 U 1 1 3EBF8458
-P 800 7300
-F 0 "#PWR04" H 800 7300 40  0001 C CNN
-F 1 "GND" H 800 7230 40  0001 C CNN
-F 2 "" H 800 7300 60  0001 C CNN
-F 3 "" H 800 7300 60  0001 C CNN
-	1    800  7300
+P 10200 4850
+F 0 "#PWR04" H 10200 4850 40  0001 C CNN
+F 1 "GND" H 10200 4780 40  0001 C CNN
+F 2 "" H 10200 4850 60  0001 C CNN
+F 3 "" H 10200 4850 60  0001 C CNN
+	1    10200 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG05
 U 1 1 3EBF843C
-P 800 7300
-F 0 "#FLG05" H 800 7570 30  0001 C CNN
-F 1 "PWR_FLAG" H 800 7530 30  0000 C CNN
-F 2 "" H 800 7300 60  0001 C CNN
-F 3 "" H 800 7300 60  0001 C CNN
-	1    800  7300
+P 10200 4800
+F 0 "#FLG05" H 10200 5070 30  0001 C CNN
+F 1 "PWR_FLAG" H 10200 5030 30  0000 C CNN
+F 2 "" H 10200 4800 60  0001 C CNN
+F 3 "" H 10200 4800 60  0001 C CNN
+	1    10200 4800
 	1    0    0    -1  
 $EndComp
 NoConn ~ 2200 4000
@@ -234,30 +244,38 @@ PWR_3,3-5V
 $Comp
 L GND #PWR08
 U 1 1 3EBF8376
-P 8500 2650
-F 0 "#PWR08" H 8500 2650 40  0001 C CNN
-F 1 "GND" H 8500 2580 40  0001 C CNN
-F 2 "" H 8500 2650 60  0001 C CNN
-F 3 "" H 8500 2650 60  0001 C CNN
-	1    8500 2650
+P 8450 2650
+F 0 "#PWR08" H 8450 2650 40  0001 C CNN
+F 1 "GND" H 8450 2580 40  0001 C CNN
+F 2 "" H 8450 2650 60  0001 C CNN
+F 3 "" H 8450 2650 60  0001 C CNN
+	1    8450 2650
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	7350 3050 8500 3050
+	7350 3050 8100 3050
+Wire Wire Line
+	8100 3050 8500 3050
 Wire Wire Line
-	8500 2950 7250 2950
+	7250 2950 8200 2950
+Wire Wire Line
+	8200 2950 8500 2950
 Wire Wire Line
 	7250 2950 7250 3300
 Wire Wire Line
 	7250 3300 6900 3300
 Wire Wire Line
-	8500 2850 7250 2850
+	7250 2850 8300 2850
+Wire Wire Line
+	8300 2850 8500 2850
 Wire Wire Line
 	7250 2850 7250 2600
 Wire Wire Line
 	7250 2600 6900 2600
 Wire Wire Line
-	8500 2750 7450 2750
+	7450 2750 8400 2750
+Wire Wire Line
+	8400 2750 8500 2750
 Wire Wire Line
 	7450 2750 7450 1900
 Wire Wire Line
@@ -265,9 +283,11 @@ Wire Wire Line
 Wire Wire Line
 	8500 2550 7650 2550
 Wire Wire Line
-	7650 2550 7650 1050
+	7650 2550 7650 1000
 Wire Wire Line
-	7650 1050 7300 1050
+	7300 1000 7650 1000
+Wire Wire Line
+	7650 1000 9400 1000
 $Comp
 L CONN_6 P1
 U 1 1 3EBF830C
@@ -279,9 +299,9 @@ F 3 "" H 8850 2800 60  0001 C CNN
 	1    8850 2800
 	1    0    0    -1  
 $EndComp
-Connection ~ 6500 1050
+Connection ~ 6500 1000
 Wire Wire Line
-	6500 1100 6500 1050
+	6500 1000 6500 1050
 $Comp
 L GND #PWR09
 U 1 1 3EBF82CF
@@ -296,38 +316,46 @@ $EndComp
 $Comp
 L CP C1
 U 1 1 3EBF82C6
-P 6500 1300
-F 0 "C1" H 6550 1400 50  0000 L CNN
-F 1 "1uF" H 6550 1201 50  0000 L CNN
-F 2 "" H 6500 1300 60  0001 C CNN
-F 3 "" H 6500 1300 60  0001 C CNN
-	1    6500 1300
+P 6500 1250
+F 0 "C1" H 6550 1350 50  0000 L CNN
+F 1 "1uF" H 6550 1151 50  0000 L CNN
+F 2 "" H 6500 1250 60  0001 C CNN
+F 3 "" H 6500 1250 60  0001 C CNN
+	1    6500 1250
 	1    0    0    -1  
 $EndComp
 Connection ~ 6300 3300
 Connection ~ 6300 2600
 Connection ~ 6300 1900
 Wire Wire Line
-	6300 1950 6300 1900
+	6300 1900 6300 1950
 Wire Wire Line
 	6300 2650 6300 2600
 Wire Wire Line
 	6300 3350 6300 3300
 Wire Wire Line
-	6400 3300 5900 3300
+	5900 3300 6300 3300
+Wire Wire Line
+	6300 3300 6400 3300
+Wire Wire Line
+	5900 2600 6300 2600
 Wire Wire Line
-	5900 2600 6400 2600
+	6300 2600 6400 2600
 Wire Wire Line
-	6400 1900 5900 1900
+	5850 1900 5900 1900
+Wire Wire Line
+	5900 1900 6300 1900
+Wire Wire Line
+	6300 1900 6400 1900
 $Comp
 L GND #PWR010
 U 1 1 4D528089
-P 6300 3750
-F 0 "#PWR010" H 6300 3750 40  0001 C CNN
-F 1 "GND" H 6300 3680 40  0001 C CNN
-F 2 "" H 6300 3750 60  0001 C CNN
-F 3 "" H 6300 3750 60  0001 C CNN
-	1    6300 3750
+P 6300 3800
+F 0 "#PWR010" H 6300 3800 40  0001 C CNN
+F 1 "GND" H 6300 3730 40  0001 C CNN
+F 2 "" H 6300 3800 60  0001 C CNN
+F 3 "" H 6300 3800 60  0001 C CNN
+	1    6300 3800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -355,12 +383,12 @@ $EndComp
 $Comp
 L GND #PWR011
 U 1 1 4D528088
-P 6300 3050
-F 0 "#PWR011" H 6300 3050 40  0001 C CNN
-F 1 "GND" H 6300 2980 40  0001 C CNN
-F 2 "" H 6300 3050 60  0001 C CNN
-F 3 "" H 6300 3050 60  0001 C CNN
-	1    6300 3050
+P 6300 3100
+F 0 "#PWR011" H 6300 3100 40  0001 C CNN
+F 1 "GND" H 6300 3030 40  0001 C CNN
+F 2 "" H 6300 3100 60  0001 C CNN
+F 3 "" H 6300 3100 60  0001 C CNN
+	1    6300 3100
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -374,18 +402,28 @@ F 3 "" H 6300 2850 60  0001 C CNN
 	1    6300 2850
 	1    0    0    -1  
 $EndComp
-Connection ~ 5900 1050
-Connection ~ 6200 1050
+Connection ~ 5900 1000
+Connection ~ 6200 1000
+Wire Wire Line
+	4300 1000 4200 1000
+Wire Wire Line
+	2300 1000 2300 3700
+Wire Wire Line
+	4700 1000 5800 1000
+Wire Wire Line
+	5800 1000 5900 1000
 Wire Wire Line
-	4300 1050 4200 1050
+	5900 1000 6100 1000
 Wire Wire Line
-	2300 1050 2300 3700
+	6100 1000 6200 1000
 Wire Wire Line
-	6900 1050 4700 1050
+	6200 1000 6500 1000
 Wire Wire Line
-	5900 1050 5900 1100
+	6500 1000 6900 1000
 Wire Wire Line
-	6200 1050 6200 1100
+	5900 1000 5900 1050
+Wire Wire Line
+	6200 1000 6200 1050
 $Comp
 L GND #PWR012
 U 1 1 3EBF81B3
@@ -400,12 +438,12 @@ $EndComp
 $Comp
 L GND #PWR013
 U 1 1 4D528087
-P 6300 2350
-F 0 "#PWR013" H 6300 2350 40  0001 C CNN
-F 1 "GND" H 6300 2280 40  0001 C CNN
-F 2 "" H 6300 2350 60  0001 C CNN
-F 3 "" H 6300 2350 60  0001 C CNN
-	1    6300 2350
+P 6300 2400
+F 0 "#PWR013" H 6300 2400 40  0001 C CNN
+F 1 "GND" H 6300 2330 40  0001 C CNN
+F 2 "" H 6300 2400 60  0001 C CNN
+F 3 "" H 6300 2400 60  0001 C CNN
+	1    6300 2400
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -433,50 +471,52 @@ $EndComp
 $Comp
 L R R5
 U 1 1 3EBF818E
-P 6200 1350
-F 0 "R5" V 6280 1350 50  0000 C CNN
-F 1 "1K" V 6200 1350 50  0000 C CNN
-F 2 "" H 6200 1350 60  0001 C CNN
-F 3 "" H 6200 1350 60  0001 C CNN
-	1    6200 1350
+P 6200 1300
+F 0 "R5" H 6050 1500 50  0000 C CNN
+F 1 "1K" V 6200 1300 50  0000 C CNN
+F 2 "" H 6200 1300 60  0001 C CNN
+F 3 "" H 6200 1300 60  0001 C CNN
+	1    6200 1300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 3EBF8187
-P 5900 1350
-F 0 "R2" V 5980 1350 50  0000 C CNN
-F 1 "5,1K" V 5900 1350 50  0000 C CNN
-F 2 "" H 5900 1350 60  0001 C CNN
-F 3 "" H 5900 1350 60  0001 C CNN
-	1    5900 1350
+P 5900 1300
+F 0 "R2" H 5750 1500 50  0000 C CNN
+F 1 "5,1K" V 5900 1300 50  0000 C CNN
+F 2 "" H 5900 1300 60  0001 C CNN
+F 3 "" H 5900 1300 60  0001 C CNN
+	1    5900 1300
 	1    0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D2
 U 1 1 3EBF8176
-P 7100 1050
-F 0 "D2" H 7100 1150 40  0000 C CNN
-F 1 "BAT46" H 7100 950 40  0000 C CNN
-F 2 "" H 7100 1050 60  0001 C CNN
-F 3 "" H 7100 1050 60  0001 C CNN
-	1    7100 1050
+P 7100 1000
+F 0 "D2" H 7100 1100 50  0000 C CNN
+F 1 "BAT46" H 7100 900 50  0000 C CNN
+F 2 "" H 7100 1000 60  0001 C CNN
+F 3 "" H 7100 1000 60  0001 C CNN
+	1    7100 1000
 	-1   0    0    -1  
 $EndComp
 $Comp
 L DIODESCH D1
 U 1 1 3EBF815E
-P 4500 1050
-F 0 "D1" H 4500 1150 40  0000 C CNN
-F 1 "BAT46" H 4500 950 40  0000 C CNN
-F 2 "" H 4500 1050 60  0001 C CNN
-F 3 "" H 4500 1050 60  0001 C CNN
-	1    4500 1050
+P 4500 1000
+F 0 "D1" H 4500 1100 50  0000 C CNN
+F 1 "BAT46" H 4500 900 50  0000 C CNN
+F 2 "" H 4500 1000 60  0001 C CNN
+F 3 "" H 4500 1000 60  0001 C CNN
+	1    4500 1000
 	-1   0    0    -1  
 $EndComp
 Connection ~ 2350 2000
 Wire Wire Line
-	2350 2600 2350 1800
+	2350 1800 2350 2000
+Wire Wire Line
+	2350 2000 2350 2600
 Wire Wire Line
 	2350 2600 2200 2600
 Wire Wire Line
@@ -511,7 +551,7 @@ F 3 "" H 4650 2000 60  0001 C CNN
 $EndComp
 Connection ~ 4800 3600
 Connection ~ 4800 2900
-Text Label 2500 1050 0    60   ~ 0
+Text Label 2600 1000 0    60   ~ 0
 VCC_SENSE-ERROR*
 Text Label 2400 3800 0    60   ~ 0
 TDI-DIN-D0
@@ -524,7 +564,7 @@ CTRL-D3
 Text Label 2400 3000 0    60   ~ 0
 TD0-PROG-D4
 Wire Wire Line
-	2300 1050 3700 1050
+	2300 1000 3700 1000
 Wire Wire Line
 	2300 3700 2200 3700
 Wire Wire Line
@@ -534,30 +574,30 @@ Wire Wire Line
 Wire Wire Line
 	3600 3400 2200 3400
 Wire Wire Line
-	2200 3600 3450 3600
+	2200 3600 3400 3600
 Wire Wire Line
-	3450 3600 3450 3300
+	3400 3600 3400 3300
 Wire Wire Line
-	3450 3300 3700 3300
+	3400 3300 3700 3300
 Wire Wire Line
-	2200 3200 3450 3200
+	2200 3200 3400 3200
 Wire Wire Line
-	3450 3200 3450 2900
+	3400 3200 3400 2900
 Wire Wire Line
-	3450 2900 3700 2900
+	3400 2900 3700 2900
 Wire Wire Line
-	2200 3800 3400 3800
+	2200 3800 3300 3800
 Wire Wire Line
-	3400 3800 3400 2600
+	3300 3800 3300 2600
 Wire Wire Line
-	3400 2600 3700 2600
+	3300 2600 3700 2600
 Wire Wire Line
-	2200 3000 3350 3000
+	2200 3000 3200 3000
 Wire Wire Line
-	3350 3000 3350 2250
+	3200 3000 3200 2250
 Wire Wire Line
-	3350 2250 3700 2250
-Text Label 2500 1600 0    60   ~ 0
+	3200 2250 3700 2250
+Text Label 2600 1600 0    60   ~ 0
 DONE-SELECT*
 NoConn ~ 2150 6900
 NoConn ~ 2150 6250
@@ -569,9 +609,9 @@ Connection ~ 1150 5900
 Wire Wire Line
 	1700 5900 1150 5900
 Wire Wire Line
-	1700 6550 1150 6550
+	1150 6550 1700 6550
 Wire Wire Line
-	1700 7200 1150 7200
+	1150 7200 1700 7200
 $Comp
 L GND #PWR016
 U 1 1 3EBF7F0D
@@ -585,11 +625,21 @@ F 3 "" H 1150 7300 60  0001 C CNN
 $EndComp
 Connection ~ 1150 6250
 Wire Wire Line
-	1250 6250 1150 6250
+	1150 6250 1250 6250
+Wire Wire Line
+	1150 6900 1250 6900
+Wire Wire Line
+	1150 5600 1150 5900
+Wire Wire Line
+	1150 5900 1150 6250
 Wire Wire Line
-	1250 6900 1150 6900
+	1150 6250 1150 6550
 Wire Wire Line
-	1150 7300 1150 5600
+	1150 6550 1150 6900
+Wire Wire Line
+	1150 6900 1150 7200
+Wire Wire Line
+	1150 7200 1150 7300
 Wire Wire Line
 	1150 5600 1250 5600
 $Comp
@@ -628,29 +678,25 @@ $EndComp
 Wire Wire Line
 	5450 3600 4800 3600
 Wire Wire Line
-	5450 2900 4200 2900
-Wire Wire Line
-	5900 1900 5900 1600
+	4200 2900 4800 2900
 Wire Wire Line
-	5900 1600 5100 1600
+	4800 2900 5450 2900
 Wire Wire Line
 	5000 3300 4200 3300
 Wire Wire Line
 	5000 2600 4200 2600
 Wire Wire Line
-	4200 2250 5450 2250
+	4200 2250 5400 2250
 Wire Wire Line
-	5450 2250 5450 2200
+	5400 2250 5400 2200
 Wire Wire Line
 	4650 2000 4650 1900
-Wire Wire Line
-	4650 1900 5000 1900
 $Comp
 L 74LS125 U1
 U 3 1 3EBF7DB3
 P 5450 3300
 F 0 "U1" H 5450 3400 50  0000 L BNN
-F 1 "74LS125" H 5500 3151 40  0000 L TNN
+F 1 "74LS125" H 5500 3151 50  0000 L TNN
 F 2 "" H 5450 3300 60  0001 C CNN
 F 3 "" H 5450 3300 60  0001 C CNN
 	3    5450 3300
@@ -661,7 +707,7 @@ L 74LS125 U1
 U 2 1 3EBF7DAD
 P 5450 2600
 F 0 "U1" H 5450 2700 50  0000 L BNN
-F 1 "74LS125" H 5500 2451 40  0000 L TNN
+F 1 "74LS125" H 5500 2451 50  0000 L TNN
 F 2 "" H 5450 2600 60  0001 C CNN
 F 3 "" H 5450 2600 60  0001 C CNN
 	2    5450 2600
@@ -670,12 +716,12 @@ $EndComp
 $Comp
 L 74LS125 U1
 U 1 1 3EBF7D9F
-P 5450 1900
-F 0 "U1" H 5450 2000 50  0000 L BNN
-F 1 "74LS125" H 5500 1750 40  0000 L TNN
-F 2 "" H 5450 1900 60  0001 C CNN
-F 3 "" H 5450 1900 60  0001 C CNN
-	1    5450 1900
+P 5400 1900
+F 0 "U1" H 5400 2000 50  0000 L BNN
+F 1 "74LS125" H 5450 1750 50  0000 L TNN
+F 2 "" H 5400 1900 60  0001 C CNN
+F 3 "" H 5400 1900 60  0001 C CNN
+	1    5400 1900
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -683,7 +729,7 @@ L 74LS125 U2
 U 1 1 3EBF7D92
 P 4650 1600
 F 0 "U2" H 4650 1700 50  0000 L BNN
-F 1 "74LS125" H 4700 1450 40  0000 L TNN
+F 1 "74LS125" H 4700 1450 50  0000 L TNN
 F 2 "" H 4650 1600 60  0001 C CNN
 F 3 "" H 4650 1600 60  0001 C CNN
 	1    4650 1600
@@ -760,12 +806,12 @@ $EndComp
 $Comp
 L R R1
 U 1 1 3EBF7D16
-P 3950 1050
-F 0 "R1" V 4030 1050 50  0000 C CNN
-F 1 "100" V 3950 1050 50  0000 C CNN
-F 2 "" H 3950 1050 60  0001 C CNN
-F 3 "" H 3950 1050 60  0001 C CNN
-	1    3950 1050
+P 3950 1000
+F 0 "R1" V 4030 1000 50  0000 C CNN
+F 1 "100" V 3950 1000 50  0000 C CNN
+F 2 "" H 3950 1000 60  0001 C CNN
+F 3 "" H 3950 1000 60  0001 C CNN
+	1    3950 1000
 	0    1    1    0   
 $EndComp
 $Comp
@@ -779,4 +825,50 @@ F 3 "" H 1750 2800 60  0001 C CNN
 	1    1750 2800
 	-1   0    0    -1  
 $EndComp
+Wire Wire Line
+	9400 1000 9400 3500
+Connection ~ 7650 1000
+$Comp
+L GND #PWR?
+U 1 1 5510FC05
+P 4950 2000
+F 0 "#PWR?" H 4950 2000 30  0001 C CNN
+F 1 "GND" H 4950 1930 30  0001 C CNN
+F 2 "" H 4950 2000 60  0000 C CNN
+F 3 "" H 4950 2000 60  0000 C CNN
+	1    4950 2000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4950 1900 4950 2000
+Wire Wire Line
+	5100 1600 5900 1600
+Wire Wire Line
+	5900 1550 5900 1600
+Wire Wire Line
+	5900 1600 5900 1900
+Connection ~ 5900 1900
+Connection ~ 5900 1600
+Wire Wire Line
+	10200 4850 10200 4800
+Wire Wire Line
+	6300 4650 6300 4700
+Wire Wire Line
+	6300 3750 6300 3800
+Wire Wire Line
+	6300 3100 6300 3050
+Wire Wire Line
+	6300 2400 6300 2350
+Wire Wire Line
+	6200 1600 6200 1550
+Wire Wire Line
+	6500 1500 6500 1450
+Wire Wire Line
+	6100 950  6100 1000
+Connection ~ 6100 1000
+Wire Wire Line
+	5800 1000 5800 950 
+Connection ~ 5800 1000
+Wire Wire Line
+	8450 2650 8500 2650
 $EndSCHEMATC
diff --git a/demos/test_xil_95108/carte_test.sch b/demos/test_xil_95108/carte_test.sch
index 8d4abb1..4410a80 100644
--- a/demos/test_xil_95108/carte_test.sch
+++ b/demos/test_xil_95108/carte_test.sch
@@ -11,13 +11,13 @@ LIBS:xilinx
 LIBS:special
 LIBS:analog_switches
 LIBS:carte_test-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 1 1
-Title "CARTE d'EXPERIMENTATION a XC95108PC84"
-Date "15 apr 2008"
+Title "XC95108PC84 EXPERIMENTATION BOARD"
+Date "Sun 22 Mar 2015"
 Rev ""
 Comp ""
 Comment1 ""
@@ -25,41 +25,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Connection ~ 11000 1600
-Wire Wire Line
-	10600 1600 11700 1600
-Wire Wire Line
-	11000 1550 11000 1600
-Connection ~ 11150 1850
-Wire Wire Line
-	4500 2500 4500 2100
-Wire Wire Line
-	4300 2600 4300 2100
-Wire Wire Line
-	4800 2600 4300 2600
-Wire Wire Line
-	4100 2400 4100 2100
-Wire Wire Line
-	4800 2400 4100 2400
-Wire Wire Line
-	3900 2700 4800 2700
-Wire Wire Line
-	3900 2100 3900 2700
-Wire Wire Line
-	3450 2100 3700 2100
-Connection ~ 3800 2150
-Connection ~ 4000 2150
-Connection ~ 4200 2150
-Wire Wire Line
-	4000 2100 4000 2150
-Wire Wire Line
-	4200 2100 4200 2150
-Wire Wire Line
-	4400 2150 4400 2100
-Wire Wire Line
-	3800 2150 4400 2150
-Wire Wire Line
-	3800 2200 3800 2100
 $Comp
 L DB9 J2
 U 1 1 3ECDEBEA
@@ -74,159 +39,116 @@ $EndComp
 $Comp
 L PWR_FLAG #FLG01
 U 1 1 3ECDDD9A
-P 2500 7850
-F 0 "#FLG01" H 2500 8120 30  0001 C CNN
-F 1 "PWR_FLAG" H 2500 8080 30  0000 C CNN
-F 2 "" H 2500 7850 60  0001 C CNN
-F 3 "" H 2500 7850 60  0001 C CNN
-	1    2500 7850
+P 2400 7750
+F 0 "#FLG01" H 2400 8020 30  0001 C CNN
+F 1 "PWR_FLAG" H 2400 7980 30  0000 C CNN
+F 2 "" H 2400 7750 60  0001 C CNN
+F 3 "" H 2400 7750 60  0001 C CNN
+	1    2400 7750
 	1    0    0    -1  
 $EndComp
-Connection ~ 2350 8050
-Wire Wire Line
-	2100 8350 2350 8350
-Wire Wire Line
-	2100 8450 2100 8350
-Wire Wire Line
-	1900 8050 1750 8050
-Wire Wire Line
-	2350 8350 2350 8050
-Wire Wire Line
-	2500 8050 2500 8100
-Wire Wire Line
-	2300 8050 2500 8050
-Wire Wire Line
-	2500 7850 2850 7850
-Wire Wire Line
-	1750 7850 2100 7850
 $Comp
 L DIODE D4
 U 1 1 3ECDDCDD
-P 2100 8050
-F 0 "D4" H 2100 8150 40  0000 C CNN
-F 1 "1N4004" H 2100 7951 40  0000 C CNN
-F 2 "" H 2100 8050 60  0001 C CNN
-F 3 "" H 2100 8050 60  0001 C CNN
-	1    2100 8050
+P 1800 8000
+F 0 "D4" H 1800 8100 50  0000 C CNN
+F 1 "1N4004" H 1800 7901 50  0000 C CNN
+F 2 "" H 1800 8000 60  0001 C CNN
+F 3 "" H 1800 8000 60  0001 C CNN
+	1    1800 8000
 	-1   0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG02
 U 1 1 3ECDDCBE
-P 2100 8450
-F 0 "#FLG02" H 2100 8720 30  0001 C CNN
-F 1 "PWR_FLAG" H 2100 8680 30  0000 C CNN
-F 2 "" H 2100 8450 60  0001 C CNN
-F 3 "" H 2100 8450 60  0001 C CNN
-	1    2100 8450
+P 2150 8050
+F 0 "#FLG02" H 2150 8320 30  0001 C CNN
+F 1 "PWR_FLAG" H 2150 8280 30  0000 C CNN
+F 2 "" H 2150 8050 60  0001 C CNN
+F 3 "" H 2150 8050 60  0001 C CNN
+	1    2150 8050
 	1    0    0    1   
 $EndComp
 $Comp
 L GND #PWR03
 U 1 1 3ECDDCB7
-P 2350 8750
-F 0 "#PWR03" H 2350 8750 40  0001 C CNN
-F 1 "GND" H 2350 8680 40  0001 C CNN
-F 2 "" H 2350 8750 60  0001 C CNN
-F 3 "" H 2350 8750 60  0001 C CNN
-	1    2350 8750
+P 2400 8700
+F 0 "#PWR03" H 2400 8700 40  0001 C CNN
+F 1 "GND" H 2400 8630 40  0001 C CNN
+F 2 "" H 2400 8700 60  0001 C CNN
+F 3 "" H 2400 8700 60  0001 C CNN
+	1    2400 8700
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C13
 U 1 1 3ECDDCAD
-P 2350 8550
-F 0 "C13" H 2400 8650 50  0000 L CNN
-F 1 "10uF" H 2400 8450 50  0000 L CNN
-F 2 "" H 2350 8550 60  0001 C CNN
-F 3 "" H 2350 8550 60  0001 C CNN
-	1    2350 8550
+P 2400 8500
+F 0 "C13" H 2450 8600 50  0000 L CNN
+F 1 "10uF" H 2450 8400 50  0000 L CNN
+F 2 "" H 2400 8500 60  0001 C CNN
+F 3 "" H 2400 8500 60  0001 C CNN
+	1    2400 8500
 	1    0    0    1   
 $EndComp
 $Comp
 L -12V #PWR04
 U 1 1 3ECDDC9F
-P 2500 8100
-F 0 "#PWR04" H 2500 8300 40  0001 C CNN
-F 1 "-12V" H 2500 8250 40  0000 C CNN
-F 2 "" H 2500 8100 60  0001 C CNN
-F 3 "" H 2500 8100 60  0001 C CNN
-	1    2500 8100
+P 2550 8050
+F 0 "#PWR04" H 2550 8250 40  0001 C CNN
+F 1 "-12V" H 2550 8200 40  0000 C CNN
+F 2 "" H 2550 8050 60  0001 C CNN
+F 3 "" H 2550 8050 60  0001 C CNN
+	1    2550 8050
 	1    0    0    1   
 $EndComp
-Connection ~ 12300 4200
-Connection ~ 12400 3850
 NoConn ~ 13400 4200
 NoConn ~ 13400 4100
 NoConn ~ 13400 3900
 $Comp
 L -12V #PWR05
 U 1 1 3ECDDC1A
-P 12800 3600
-F 0 "#PWR05" H 12800 3800 40  0001 C CNN
-F 1 "-12V" H 12800 3750 40  0000 C CNN
-F 2 "" H 12800 3600 60  0001 C CNN
-F 3 "" H 12800 3600 60  0001 C CNN
-	1    12800 3600
+P 12800 3550
+F 0 "#PWR05" H 12800 3750 40  0001 C CNN
+F 1 "-12V" H 12800 3700 40  0000 C CNN
+F 2 "" H 12800 3550 60  0001 C CNN
+F 3 "" H 12800 3550 60  0001 C CNN
+	1    12800 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #PWR06
 U 1 1 3ECDDC05
-P 12800 4400
-F 0 "#PWR06" H 12800 4600 40  0001 C CNN
-F 1 "+12V" H 12800 4550 40  0000 C CNN
-F 2 "" H 12800 4400 60  0001 C CNN
-F 3 "" H 12800 4400 60  0001 C CNN
-	1    12800 4400
+P 12800 4450
+F 0 "#PWR06" H 12800 4650 40  0001 C CNN
+F 1 "+12V" H 12800 4600 40  0000 C CNN
+F 2 "" H 12800 4450 60  0001 C CNN
+F 3 "" H 12800 4450 60  0001 C CNN
+	1    12800 4450
 	1    0    0    1   
 $EndComp
-Wire Wire Line
-	2800 7900 2800 7800
 $Comp
 L +12V #PWR07
 U 1 1 3ECDDBF2
-P 2800 7800
-F 0 "#PWR07" H 2800 8000 40  0001 C CNN
-F 1 "+12V" H 2800 7950 40  0000 C CNN
-F 2 "" H 2800 7800 60  0001 C CNN
-F 3 "" H 2800 7800 60  0001 C CNN
-	1    2800 7800
+P 2700 7750
+F 0 "#PWR07" H 2700 7950 40  0001 C CNN
+F 1 "+12V" H 2700 7900 40  0000 C CNN
+F 2 "" H 2700 7750 60  0001 C CNN
+F 3 "" H 2700 7750 60  0001 C CNN
+	1    2700 7750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR08
 U 1 1 3ECDDBE0
-P 12300 4750
-F 0 "#PWR08" H 12300 4750 40  0001 C CNN
-F 1 "GND" H 12300 4680 40  0001 C CNN
-F 2 "" H 12300 4750 60  0001 C CNN
-F 3 "" H 12300 4750 60  0001 C CNN
-	1    12300 4750
+P 12300 4800
+F 0 "#PWR08" H 12300 4800 40  0001 C CNN
+F 1 "GND" H 12300 4730 40  0001 C CNN
+F 2 "" H 12300 4800 60  0001 C CNN
+F 3 "" H 12300 4800 60  0001 C CNN
+	1    12300 4800
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	12400 4200 12400 4100
-Wire Wire Line
-	12250 4200 12400 4200
-Wire Wire Line
-	12300 4200 12300 4250
-Wire Wire Line
-	13500 3300 13500 4000
-Wire Wire Line
-	13000 3300 13500 3300
-Wire Wire Line
-	12400 3300 12500 3300
-Wire Wire Line
-	12400 3900 12400 3300
-Wire Wire Line
-	12250 3850 12400 3850
-Wire Wire Line
-	11600 3850 11750 3850
-Wire Wire Line
-	14000 4000 14100 4000
-Wire Wire Line
-	13500 4000 13400 4000
 $Comp
 L LM318N U6
 U 1 1 3ECDDB8B
@@ -241,30 +163,30 @@ $EndComp
 $Comp
 L R R10
 U 1 1 3ECDDB6D
-P 13750 4000
-F 0 "R10" V 13830 4000 50  0000 C CNN
-F 1 "75" V 13750 4000 50  0000 C CNN
-F 2 "" H 13750 4000 60  0001 C CNN
-F 3 "" H 13750 4000 60  0001 C CNN
-	1    13750 4000
+P 13850 4000
+F 0 "R10" V 13930 4000 50  0000 C CNN
+F 1 "75" V 13850 4000 50  0000 C CNN
+F 2 "" H 13850 4000 60  0001 C CNN
+F 3 "" H 13850 4000 60  0001 C CNN
+	1    13850 4000
 	0    1    1    0   
 $EndComp
 $Comp
 L R R7
 U 1 1 3ECDDB60
-P 12750 3300
-F 0 "R7" V 12830 3300 50  0000 C CNN
-F 1 "1,1K" V 12750 3300 50  0000 C CNN
-F 2 "" H 12750 3300 60  0001 C CNN
-F 3 "" H 12750 3300 60  0001 C CNN
-	1    12750 3300
+P 12950 3300
+F 0 "R7" V 13030 3300 50  0000 C CNN
+F 1 "1,1K" V 12950 3300 50  0000 C CNN
+F 2 "" H 12950 3300 60  0001 C CNN
+F 3 "" H 12950 3300 60  0001 C CNN
+	1    12950 3300
 	0    1    1    0   
 $EndComp
 $Comp
 L R R6
 U 1 1 3ECDDB57
 P 12300 4500
-F 0 "R6" V 12380 4500 50  0000 C CNN
+F 0 "R6" H 12150 4650 50  0000 C CNN
 F 1 "1,1k" V 12300 4500 50  0000 C CNN
 F 2 "" H 12300 4500 60  0001 C CNN
 F 3 "" H 12300 4500 60  0001 C CNN
@@ -297,60 +219,43 @@ $Comp
 L CP C14
 U 1 1 3ECDDACB
 P 11400 3850
-F 0 "C14" H 11450 3950 50  0000 L CNN
-F 1 "10uF" H 11450 3750 50  0000 L CNN
+F 0 "C14" V 11550 3850 50  0000 C CNN
+F 1 "10uF" V 11250 3850 50  0000 C TNN
 F 2 "" H 11400 3850 60  0001 C CNN
 F 3 "" H 11400 3850 60  0001 C CNN
 	1    11400 3850
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	4150 3000 4800 3000
-Wire Wire Line
-	4150 2900 4800 2900
 Text Label 4150 3000 0    60   ~ 0
 PIN_TEST1
 Text Label 4150 2900 0    60   ~ 0
 PIN_TEST0
-Connection ~ 13600 1600
-Wire Wire Line
-	13650 1600 13600 1600
-Wire Wire Line
-	13600 1500 13650 1500
-Wire Wire Line
-	13600 1650 13600 1500
 $Comp
 L GND #PWR09
 U 1 1 3ECB3F8B
-P 13600 1650
-F 0 "#PWR09" H 13600 1650 40  0001 C CNN
-F 1 "GND" H 13600 1580 40  0001 C CNN
-F 2 "" H 13600 1650 60  0001 C CNN
-F 3 "" H 13600 1650 60  0001 C CNN
-	1    13600 1650
+P 13550 1650
+F 0 "#PWR09" H 13550 1650 40  0001 C CNN
+F 1 "GND" H 13550 1580 40  0001 C CNN
+F 2 "" H 13550 1650 60  0001 C CNN
+F 3 "" H 13550 1650 60  0001 C CNN
+	1    13550 1650
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	14450 1600 15100 1600
-Wire Wire Line
-	14450 1500 15100 1500
-Text Label 14500 1600 0    60   ~ 0
+Text Label 14450 1600 0    60   ~ 0
 PIN_TEST1
-Text Label 14500 1500 0    60   ~ 0
+Text Label 14450 1500 0    60   ~ 0
 PIN_TEST0
 $Comp
 L CONN_2X2 P4
 U 1 1 3ECB3F5E
-P 14050 1550
-F 0 "P4" H 14050 1700 50  0000 C CNN
-F 1 "CONN_2X2" H 14060 1420 40  0000 C CNN
-F 2 "" H 14050 1550 60  0001 C CNN
-F 3 "" H 14050 1550 60  0001 C CNN
-	1    14050 1550
+P 14000 1550
+F 0 "P4" H 14000 1700 50  0000 C CNN
+F 1 "CONN_2X2" H 14010 1420 40  0000 C CNN
+F 2 "" H 14000 1550 60  0001 C CNN
+F 3 "" H 14000 1550 60  0001 C CNN
+	1    14000 1550
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3800 3400 4800 3400
 Text Label 3900 3400 0    60   ~ 0
 PAR_AUX7/INIT
 $Comp
@@ -375,12 +280,8 @@ F 3 "" H 1950 4800 60  0001 C CNN
 	1    1950 4800
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	3700 3200 4800 3200
 Text Label 3800 3200 0    60   ~ 0
 PAR_AUX8/SELECT
-Wire Wire Line
-	1950 5200 3050 5200
 $Comp
 L GND #PWR012
 U 1 1 3ECB3A50
@@ -444,22 +345,6 @@ NoConn ~ 4800 4500
 NoConn ~ 4800 4400
 NoConn ~ 4800 4300
 NoConn ~ 4800 4200
-Wire Wire Line
-	1950 5400 2950 5400
-Wire Wire Line
-	1950 4100 3000 4100
-Wire Wire Line
-	1950 3900 3000 3900
-Wire Wire Line
-	1950 3700 2850 3700
-Wire Wire Line
-	7100 3400 8200 3400
-Wire Wire Line
-	1950 5900 3100 5900
-Wire Wire Line
-	1950 5800 3050 5800
-Wire Wire Line
-	1950 5600 3050 5600
 Text Label 2050 5200 0    60   ~ 0
 PAR_AUX8/SELECT
 Text Label 2050 5400 0    60   ~ 0
@@ -477,12 +362,6 @@ F 3 "" H 5950 4750 60  0001 C CNN
 $EndComp
 NoConn ~ 7100 4700
 NoConn ~ 7100 5200
-Wire Wire Line
-	7550 5500 7100 5500
-Wire Wire Line
-	11150 1850 11150 1550
-Wire Wire Line
-	10600 1850 11700 1850
 Text Label 10600 1850 0    60   ~ 0
 SW1
 Text Label 10600 1600 0    60   ~ 0
@@ -490,53 +369,47 @@ SW0
 $Comp
 L VCC #PWR016
 U 1 1 3EC8B981
-P 11150 1050
-F 0 "#PWR016" H 11150 1250 40  0001 C CNN
-F 1 "VCC" H 11150 1200 40  0000 C CNN
-F 2 "" H 11150 1050 60  0001 C CNN
-F 3 "" H 11150 1050 60  0001 C CNN
-	1    11150 1050
+P 11200 950
+F 0 "#PWR016" H 11200 1150 40  0001 C CNN
+F 1 "VCC" H 11200 1100 40  0000 C CNN
+F 2 "" H 11200 950 60  0001 C CNN
+F 3 "" H 11200 950 60  0001 C CNN
+	1    11200 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR017
 U 1 1 3EC8B97E
-P 11000 1050
-F 0 "#PWR017" H 11000 1250 40  0001 C CNN
-F 1 "VCC" H 11000 1200 40  0000 C CNN
-F 2 "" H 11000 1050 60  0001 C CNN
-F 3 "" H 11000 1050 60  0001 C CNN
-	1    11000 1050
+P 11000 950
+F 0 "#PWR017" H 11000 1150 40  0001 C CNN
+F 1 "VCC" H 11000 1100 40  0000 C CNN
+F 2 "" H 11000 950 60  0001 C CNN
+F 3 "" H 11000 950 60  0001 C CNN
+	1    11000 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R5
 U 1 1 3EC8B978
-P 11000 1300
-F 0 "R5" V 11080 1300 50  0000 C CNN
-F 1 "4,7K" V 11000 1300 50  0000 C CNN
-F 2 "" H 11000 1300 60  0001 C CNN
-F 3 "" H 11000 1300 60  0001 C CNN
-	1    11000 1300
+P 11000 1250
+F 0 "R5" V 11080 1250 50  0000 C CNN
+F 1 "4,7K" V 11000 1250 50  0000 C CNN
+F 2 "" H 11000 1250 60  0001 C CNN
+F 3 "" H 11000 1250 60  0001 C CNN
+	1    11000 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 3EC8B970
-P 11150 1300
-F 0 "R4" V 11230 1300 50  0000 C CNN
-F 1 "4,7K" V 11150 1300 50  0000 C CNN
-F 2 "" H 11150 1300 60  0001 C CNN
-F 3 "" H 11150 1300 60  0001 C CNN
-	1    11150 1300
+P 11200 1250
+F 0 "R4" V 11280 1250 50  0000 C CNN
+F 1 "4,7K" V 11200 1250 50  0000 C CNN
+F 2 "" H 11200 1250 60  0001 C CNN
+F 3 "" H 11200 1250 60  0001 C CNN
+	1    11200 1250
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3750 7900 3750 7850
-Wire Wire Line
-	7450 4000 7100 4000
-Wire Wire Line
-	7450 3900 7100 3900
 Text Label 7150 4000 0    60   ~ 0
 SW1
 Text Label 7150 3900 0    60   ~ 0
@@ -544,23 +417,23 @@ SW0
 $Comp
 L GND #PWR018
 U 1 1 3EC8B890
-P 12300 1850
-F 0 "#PWR018" H 12300 1850 40  0001 C CNN
-F 1 "GND" H 12300 1780 40  0001 C CNN
-F 2 "" H 12300 1850 60  0001 C CNN
-F 3 "" H 12300 1850 60  0001 C CNN
-	1    12300 1850
+P 12350 1850
+F 0 "#PWR018" H 12350 1850 40  0001 C CNN
+F 1 "GND" H 12350 1780 40  0001 C CNN
+F 2 "" H 12350 1850 60  0001 C CNN
+F 3 "" H 12350 1850 60  0001 C CNN
+	1    12350 1850
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR019
 U 1 1 3EC8B88C
-P 12300 1600
-F 0 "#PWR019" H 12300 1600 40  0001 C CNN
-F 1 "GND" H 12300 1530 40  0001 C CNN
-F 2 "" H 12300 1600 60  0001 C CNN
-F 3 "" H 12300 1600 60  0001 C CNN
-	1    12300 1600
+P 12350 1600
+F 0 "#PWR019" H 12350 1600 40  0001 C CNN
+F 1 "GND" H 12350 1530 40  0001 C CNN
+F 2 "" H 12350 1600 60  0001 C CNN
+F 3 "" H 12350 1600 60  0001 C CNN
+	1    12350 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -585,20 +458,10 @@ F 3 "" H 12000 1600 60  0001 C CNN
 	1    12000 1600
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4800 3600 3700 3600
 Text Label 3750 3600 0    60   ~ 0
 PAR_AUX1/ERROR*
-Wire Wire Line
-	3700 4000 4800 4000
 Text Label 3750 4000 0    60   ~ 0
 PAR_AUX0/STROBE*
-Wire Wire Line
-	7100 3300 8200 3300
-Wire Wire Line
-	7100 3500 8200 3500
-Wire Wire Line
-	7100 3700 8200 3700
 Text Label 7150 3300 0    60   ~ 0
 PAR_AUX5/BUSY*
 Text Label 7150 3500 0    60   ~ 0
@@ -620,27 +483,19 @@ Text Label 7150 3800 0    60   ~ 0
 LED2
 Text Label 7150 3600 0    60   ~ 0
 LED1
-Wire Wire Line
-	7450 3800 7100 3800
-Wire Wire Line
-	7450 3600 7100 3600
 Text Label 10650 2600 0    60   ~ 0
 LED2
 Text Label 10650 2300 0    60   ~ 0
 LED1
-Wire Wire Line
-	11000 2600 10650 2600
-Wire Wire Line
-	11000 2300 10650 2300
 $Comp
 L GND #PWR021
 U 1 1 3EC4D095
-P 11900 2600
-F 0 "#PWR021" H 11900 2600 40  0001 C CNN
-F 1 "GND" H 11900 2530 40  0001 C CNN
-F 2 "" H 11900 2600 60  0001 C CNN
-F 3 "" H 11900 2600 60  0001 C CNN
-	1    11900 2600
+P 11950 2600
+F 0 "#PWR021" H 11950 2600 40  0001 C CNN
+F 1 "GND" H 11950 2530 40  0001 C CNN
+F 2 "" H 11950 2600 60  0001 C CNN
+F 3 "" H 11950 2600 60  0001 C CNN
+	1    11950 2600
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -668,12 +523,12 @@ $EndComp
 $Comp
 L GND #PWR022
 U 1 1 52CEE1D5
-P 11900 2300
-F 0 "#PWR022" H 11900 2300 40  0001 C CNN
-F 1 "GND" H 11900 2230 40  0001 C CNN
-F 2 "" H 11900 2300 60  0001 C CNN
-F 3 "" H 11900 2300 60  0001 C CNN
-	1    11900 2300
+P 11950 2300
+F 0 "#PWR022" H 11950 2300 40  0001 C CNN
+F 1 "GND" H 11950 2230 40  0001 C CNN
+F 2 "" H 11950 2300 60  0001 C CNN
+F 3 "" H 11950 2300 60  0001 C CNN
+	1    11950 2300
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -701,23 +556,23 @@ $EndComp
 $Comp
 L GND #PWR023
 U 1 1 3EC4C7F6
-P 4700 9450
-F 0 "#PWR023" H 4700 9450 40  0001 C CNN
-F 1 "GND" H 4700 9380 40  0001 C CNN
-F 2 "" H 4700 9450 60  0001 C CNN
-F 3 "" H 4700 9450 60  0001 C CNN
-	1    4700 9450
+P 4700 9500
+F 0 "#PWR023" H 4700 9500 40  0001 C CNN
+F 1 "GND" H 4700 9430 40  0001 C CNN
+F 2 "" H 4700 9500 60  0001 C CNN
+F 3 "" H 4700 9500 60  0001 C CNN
+	1    4700 9500
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR024
 U 1 1 3EC4C7EA
-P 4700 9050
-F 0 "#PWR024" H 4700 9250 40  0001 C CNN
-F 1 "VCC" H 4700 9200 40  0000 C CNN
-F 2 "" H 4700 9050 60  0001 C CNN
-F 3 "" H 4700 9050 60  0001 C CNN
-	1    4700 9050
+P 4700 9000
+F 0 "#PWR024" H 4700 9200 40  0001 C CNN
+F 1 "VCC" H 4700 9150 40  0000 C CNN
+F 2 "" H 4700 9000 60  0001 C CNN
+F 3 "" H 4700 9000 60  0001 C CNN
+	1    4700 9000
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -734,89 +589,89 @@ $EndComp
 $Comp
 L GND #PWR025
 U 1 1 52CEE1D2
-P 12350 7950
-F 0 "#PWR025" H 12350 7950 40  0001 C CNN
-F 1 "GND" H 12350 7880 40  0001 C CNN
-F 2 "" H 12350 7950 60  0001 C CNN
-F 3 "" H 12350 7950 60  0001 C CNN
-	1    12350 7950
+P 12300 7950
+F 0 "#PWR025" H 12300 7950 40  0001 C CNN
+F 1 "GND" H 12300 7880 40  0001 C CNN
+F 2 "" H 12300 7950 60  0001 C CNN
+F 3 "" H 12300 7950 60  0001 C CNN
+	1    12300 7950
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR026
 U 1 1 52CEE1CE
-P 12350 7550
-F 0 "#PWR026" H 12350 7750 40  0001 C CNN
-F 1 "VCC" H 12350 7700 40  0000 C CNN
-F 2 "" H 12350 7550 60  0001 C CNN
-F 3 "" H 12350 7550 60  0001 C CNN
-	1    12350 7550
+P 12300 7450
+F 0 "#PWR026" H 12300 7650 40  0001 C CNN
+F 1 "VCC" H 12300 7600 40  0000 C CNN
+F 2 "" H 12300 7450 60  0001 C CNN
+F 3 "" H 12300 7450 60  0001 C CNN
+	1    12300 7450
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C7
 U 1 1 52CEE1C8
-P 12350 7750
-F 0 "C7" H 12400 7850 50  0000 L CNN
-F 1 "100nF" H 12400 7650 50  0000 L CNN
-F 2 "" H 12350 7750 60  0001 C CNN
-F 3 "" H 12350 7750 60  0001 C CNN
-	1    12350 7750
+P 12300 7700
+F 0 "C7" H 12350 7800 50  0000 L CNN
+F 1 "100nF" H 12350 7600 50  0000 L CNN
+F 2 "" H 12300 7700 60  0001 C CNN
+F 3 "" H 12300 7700 60  0001 C CNN
+	1    12300 7700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR027
 U 1 1 52CEE1D0
-P 7950 2100
-F 0 "#PWR027" H 7950 2100 40  0001 C CNN
-F 1 "GND" H 7950 2030 40  0001 C CNN
-F 2 "" H 7950 2100 60  0001 C CNN
-F 3 "" H 7950 2100 60  0001 C CNN
-	1    7950 2100
+P 8000 2150
+F 0 "#PWR027" H 8000 2150 40  0001 C CNN
+F 1 "GND" H 8000 2080 40  0001 C CNN
+F 2 "" H 8000 2150 60  0001 C CNN
+F 3 "" H 8000 2150 60  0001 C CNN
+	1    8000 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR028
 U 1 1 52CEE1CD
-P 7950 1700
-F 0 "#PWR028" H 7950 1900 40  0001 C CNN
-F 1 "VCC" H 7950 1850 40  0000 C CNN
-F 2 "" H 7950 1700 60  0001 C CNN
-F 3 "" H 7950 1700 60  0001 C CNN
-	1    7950 1700
+P 8000 1650
+F 0 "#PWR028" H 8000 1850 40  0001 C CNN
+F 1 "VCC" H 8000 1750 40  0000 C CNN
+F 2 "" H 8000 1650 60  0001 C CNN
+F 3 "" H 8000 1650 60  0001 C CNN
+	1    8000 1650
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C11
 U 1 1 52CEE1C7
-P 7950 1900
-F 0 "C11" H 8000 2000 50  0000 L CNN
-F 1 "100nF" H 8000 1800 50  0000 L CNN
-F 2 "" H 7950 1900 60  0001 C CNN
-F 3 "" H 7950 1900 60  0001 C CNN
-	1    7950 1900
+P 8000 1900
+F 0 "C11" H 8050 2000 50  0000 L CNN
+F 1 "100nF" H 8050 1800 50  0000 L CNN
+F 2 "" H 8000 1900 60  0001 C CNN
+F 3 "" H 8000 1900 60  0001 C CNN
+	1    8000 1900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR029
 U 1 1 52CEE1CF
-P 7600 2100
-F 0 "#PWR029" H 7600 2100 40  0001 C CNN
-F 1 "GND" H 7600 2030 40  0001 C CNN
-F 2 "" H 7600 2100 60  0001 C CNN
-F 3 "" H 7600 2100 60  0001 C CNN
-	1    7600 2100
+P 7600 2150
+F 0 "#PWR029" H 7600 2150 40  0001 C CNN
+F 1 "GND" H 7600 2080 40  0001 C CNN
+F 2 "" H 7600 2150 60  0001 C CNN
+F 3 "" H 7600 2150 60  0001 C CNN
+	1    7600 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR030
 U 1 1 52CEE1CC
-P 7600 1700
-F 0 "#PWR030" H 7600 1900 40  0001 C CNN
-F 1 "VCC" H 7600 1850 40  0000 C CNN
-F 2 "" H 7600 1700 60  0001 C CNN
-F 3 "" H 7600 1700 60  0001 C CNN
-	1    7600 1700
+P 7600 1650
+F 0 "#PWR030" H 7600 1850 40  0001 C CNN
+F 1 "VCC" H 7600 1750 40  0000 C CNN
+F 2 "" H 7600 1650 60  0001 C CNN
+F 3 "" H 7600 1650 60  0001 C CNN
+	1    7600 1650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -833,34 +688,34 @@ $EndComp
 $Comp
 L GND #PWR031
 U 1 1 52CEE1D1
-P 7150 2100
-F 0 "#PWR031" H 7150 2100 40  0001 C CNN
-F 1 "GND" H 7150 2030 40  0001 C CNN
-F 2 "" H 7150 2100 60  0001 C CNN
-F 3 "" H 7150 2100 60  0001 C CNN
-	1    7150 2100
+P 7200 2150
+F 0 "#PWR031" H 7200 2150 40  0001 C CNN
+F 1 "GND" H 7200 2080 40  0001 C CNN
+F 2 "" H 7200 2150 60  0001 C CNN
+F 3 "" H 7200 2150 60  0001 C CNN
+	1    7200 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR032
 U 1 1 52CEE1CB
-P 7150 1700
-F 0 "#PWR032" H 7150 1900 40  0001 C CNN
-F 1 "VCC" H 7150 1850 40  0000 C CNN
-F 2 "" H 7150 1700 60  0001 C CNN
-F 3 "" H 7150 1700 60  0001 C CNN
-	1    7150 1700
+P 7200 1650
+F 0 "#PWR032" H 7200 1850 40  0001 C CNN
+F 1 "VCC" H 7200 1750 40  0000 C CNN
+F 2 "" H 7200 1650 60  0001 C CNN
+F 3 "" H 7200 1650 60  0001 C CNN
+	1    7200 1650
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C8
 U 1 1 52CEE1CA
-P 7150 1900
-F 0 "C8" H 7200 2000 50  0000 L CNN
-F 1 "100nF" H 7200 1800 50  0000 L CNN
-F 2 "" H 7150 1900 60  0001 C CNN
-F 3 "" H 7150 1900 60  0001 C CNN
-	1    7150 1900
+P 7200 1900
+F 0 "C8" H 7250 2000 50  0000 L CNN
+F 1 "100nF" H 7250 1800 50  0000 L CNN
+F 2 "" H 7200 1900 60  0001 C CNN
+F 3 "" H 7200 1900 60  0001 C CNN
+	1    7200 1900
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -874,8 +729,6 @@ F 3 "" H 1950 3600 60  0001 C CNN
 	1    1950 3600
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	2650 3500 1950 3500
 Text Label 2050 4100 0    60   ~ 0
 PAR_AUX6/ACK
 Text Label 2050 3900 0    60   ~ 0
@@ -890,22 +743,6 @@ Text Label 2050 5600 0    60   ~ 0
 PAR_AUX1/ERROR*
 Text Label 2050 5900 0    60   ~ 0
 PAR_AUX0/STROBE*
-Wire Wire Line
-	2650 5700 1950 5700
-Wire Wire Line
-	2650 5500 1950 5500
-Wire Wire Line
-	2650 5300 1950 5300
-Wire Wire Line
-	2650 5100 1950 5100
-Wire Wire Line
-	2650 4900 1950 4900
-Wire Wire Line
-	2650 4700 1950 4700
-Wire Wire Line
-	2650 4500 1950 4500
-Wire Wire Line
-	2650 4300 1950 4300
 Text Label 2050 4300 0    60   ~ 0
 PARBUS7
 Text Label 2050 4500 0    60   ~ 0
@@ -922,8 +759,6 @@ Text Label 2050 5500 0    60   ~ 0
 PARBUS1
 Text Label 2050 5700 0    60   ~ 0
 PARBUS0
-Wire Wire Line
-	4800 3800 3700 3800
 Text Label 7150 3400 0    60   ~ 0
 PAR_AUX6/ACK
 Text Label 3750 3800 0    60   ~ 0
@@ -944,22 +779,6 @@ Text Label 4200 3500 0    60   ~ 0
 PARBUS1
 Text Label 4200 3700 0    60   ~ 0
 PARBUS0
-Wire Wire Line
-	7700 3100 7100 3100
-Wire Wire Line
-	7700 3200 7100 3200
-Wire Wire Line
-	7700 3000 7100 3000
-Wire Wire Line
-	7700 2900 7100 2900
-Wire Wire Line
-	4800 3100 4200 3100
-Wire Wire Line
-	4800 3300 4200 3300
-Wire Wire Line
-	4800 3500 4200 3500
-Wire Wire Line
-	4800 3700 4200 3700
 Text Label 7200 5800 0    60   ~ 0
 MD13
 Text Label 7250 5600 0    60   ~ 0
@@ -988,34 +807,6 @@ Text Label 4350 6000 0    60   ~ 0
 MD1
 Text Label 4350 5800 0    60   ~ 0
 MD0
-Wire Wire Line
-	7650 5800 7100 5800
-Wire Wire Line
-	7550 5600 7100 5600
-Wire Wire Line
-	7650 6500 7100 6500
-Wire Wire Line
-	4800 6300 4250 6300
-Wire Wire Line
-	7650 6300 7100 6300
-Wire Wire Line
-	7650 6000 7100 6000
-Wire Wire Line
-	7650 5900 7100 5900
-Wire Wire Line
-	7650 6100 7100 6100
-Wire Wire Line
-	7650 6200 7100 6200
-Wire Wire Line
-	7650 6400 7100 6400
-Wire Wire Line
-	4800 6500 4250 6500
-Wire Wire Line
-	4800 6200 4250 6200
-Wire Wire Line
-	4800 6000 4250 6000
-Wire Wire Line
-	4800 5800 4250 5800
 Text Label 7250 5500 0    60   ~ 0
 MD14
 Text Label 7150 5700 0    60   ~ 0
@@ -1024,12 +815,6 @@ Text Label 4350 6400 0    60   ~ 0
 OEMEM
 Text Label 4350 6100 0    60   ~ 0
 CSMEM
-Wire Wire Line
-	7650 5700 7100 5700
-Wire Wire Line
-	4800 6400 4250 6400
-Wire Wire Line
-	4800 6100 4250 6100
 Text Label 4500 5900 0    60   ~ 0
 MA7
 Text Label 4500 5700 0    60   ~ 0
@@ -1046,200 +831,97 @@ Text Label 4500 5500 0    60   ~ 0
 MA1
 Text Label 4500 5600 0    60   ~ 0
 MA0
-Wire Wire Line
-	4350 5900 4800 5900
-Wire Wire Line
-	4350 5700 4800 5700
-Wire Wire Line
-	4350 5300 4800 5300
-Wire Wire Line
-	4350 5000 4800 5000
-Wire Wire Line
-	4350 5100 4800 5100
-Wire Wire Line
-	4350 5200 4800 5200
-Wire Wire Line
-	4350 5500 4800 5500
-Wire Wire Line
-	4350 5600 4800 5600
-Text Label 10200 7850 0    60   ~ 0
+Text Label 10200 7800 0    60   ~ 0
 R/W-A14
-Text Label 10250 7750 0    60   ~ 0
+Text Label 10250 7700 0    60   ~ 0
 OEMEM
-Text Label 10250 7650 0    60   ~ 0
+Text Label 10250 7600 0    60   ~ 0
 CSMEM
-Wire Wire Line
-	9700 7550 9400 7550
-Text Label 9450 7550 0    60   ~ 0
+Text Label 9450 7650 0    60   ~ 0
 MD14
-Text Label 10250 7350 0    60   ~ 0
+Text Label 10250 7300 0    60   ~ 0
 MD13
-Text Label 10250 7250 0    60   ~ 0
+Text Label 10250 7200 0    60   ~ 0
 MD12
-Text Label 10250 7150 0    60   ~ 0
+Text Label 10250 7100 0    60   ~ 0
 MD11
-Text Label 10250 7050 0    60   ~ 0
+Text Label 10250 7000 0    60   ~ 0
 MD10
-Text Label 10250 6950 0    60   ~ 0
+Text Label 10250 6900 0    60   ~ 0
 MD9
-Text Label 10250 6850 0    60   ~ 0
+Text Label 10250 6800 0    60   ~ 0
 MD8
-Text Label 10250 6750 0    60   ~ 0
+Text Label 10250 6700 0    60   ~ 0
 MD7
-Text Label 10250 6650 0    60   ~ 0
+Text Label 10250 6600 0    60   ~ 0
 MD6
-Text Label 10250 6550 0    60   ~ 0
+Text Label 10250 6500 0    60   ~ 0
 MD5
-Text Label 10250 6450 0    60   ~ 0
+Text Label 10250 6400 0    60   ~ 0
 MD4
-Text Label 10250 6350 0    60   ~ 0
+Text Label 10250 6300 0    60   ~ 0
 MD3
-Text Label 10250 6250 0    60   ~ 0
+Text Label 10250 6200 0    60   ~ 0
 MD2
-Text Label 10250 6150 0    60   ~ 0
+Text Label 10250 6100 0    60   ~ 0
 MD1
-Text Label 10250 6050 0    60   ~ 0
+Text Label 10250 6000 0    60   ~ 0
 MD0
-Text Label 12250 6750 0    60   ~ 0
+Text Label 12250 6700 0    60   ~ 0
 MA7
-Text Label 12250 6650 0    60   ~ 0
+Text Label 12250 6600 0    60   ~ 0
 MA6
-Text Label 12250 6550 0    60   ~ 0
+Text Label 12250 6500 0    60   ~ 0
 MA5
-Text Label 12250 6450 0    60   ~ 0
+Text Label 12250 6400 0    60   ~ 0
 MA4
-Text Label 12250 6350 0    60   ~ 0
+Text Label 12250 6300 0    60   ~ 0
 MA3
-Text Label 12250 6250 0    60   ~ 0
+Text Label 12250 6200 0    60   ~ 0
 MA2
-Text Label 12250 6150 0    60   ~ 0
+Text Label 12250 6100 0    60   ~ 0
 MA1
-Text Label 12250 6050 0    60   ~ 0
+Text Label 12250 6000 0    60   ~ 0
 MA0
 $Comp
 L VCC #PWR034
 U 1 1 3EC4C4B5
-P 9900 7550
-F 0 "#PWR034" H 9900 7750 40  0001 C CNN
-F 1 "VCC" H 9900 7700 40  0000 C CNN
-F 2 "" H 9900 7550 60  0001 C CNN
-F 3 "" H 9900 7550 60  0001 C CNN
-	1    9900 7550
+P 9900 7600
+F 0 "#PWR034" H 9900 7800 40  0001 C CNN
+F 1 "VCC" H 9900 7750 40  0000 C CNN
+F 2 "" H 9900 7600 60  0001 C CNN
+F 3 "" H 9900 7600 60  0001 C CNN
+	1    9900 7600
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9800 7450 9800 7550
-Wire Wire Line
-	10700 7450 9800 7450
 $Comp
 L CONN_3 K1
 U 1 1 3EC4C49F
-P 9800 7900
-F 0 "K1" V 9750 7900 50  0000 C CNN
-F 1 "CONN_3" V 9850 7900 40  0000 C CNN
-F 2 "" H 9800 7900 60  0001 C CNN
-F 3 "" H 9800 7900 60  0001 C CNN
-	1    9800 7900
+P 9800 8000
+F 0 "K1" V 9750 8000 50  0000 C CNN
+F 1 "CONN_3" V 9850 8000 40  0000 C CNN
+F 2 "" H 9800 8000 60  0001 C CNN
+F 3 "" H 9800 8000 60  0001 C CNN
+	1    9800 8000
 	0    1    1    0   
 $EndComp
 $Comp
 L RAM_32KO U5
 U 1 1 3EC4C463
-P 11400 6850
-F 0 "U5" H 11550 6550 70  0000 C CNN
-F 1 "RAM_32KO" H 11500 6150 60  0000 C CNN
-F 2 "" H 11400 6850 60  0001 C CNN
-F 3 "" H 11400 6850 60  0001 C CNN
-	1    11400 6850
+P 11400 6800
+F 0 "U5" H 11550 6500 70  0000 C CNN
+F 1 "RAM_32KO" H 11500 6100 60  0000 C CNN
+F 2 "" H 11400 6800 60  0001 C CNN
+F 3 "" H 11400 6800 60  0001 C CNN
+	1    11400 6800
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	10700 7850 10150 7850
-Wire Wire Line
-	10700 7750 10150 7750
-Wire Wire Line
-	10700 7650 10150 7650
-Wire Wire Line
-	10700 7350 10150 7350
-Wire Wire Line
-	10700 7250 10150 7250
-Wire Wire Line
-	10700 7150 10150 7150
-Wire Wire Line
-	10700 7050 10150 7050
-Wire Wire Line
-	10700 6950 10150 6950
-Wire Wire Line
-	10700 6850 10150 6850
-Wire Wire Line
-	10700 6750 10150 6750
-Wire Wire Line
-	10700 6650 10150 6650
-Wire Wire Line
-	10700 6550 10150 6550
-Wire Wire Line
-	10700 6450 10150 6450
-Wire Wire Line
-	10700 6350 10150 6350
-Wire Wire Line
-	10700 6250 10150 6250
-Wire Wire Line
-	10700 6150 10150 6150
-Wire Wire Line
-	10700 6050 10150 6050
-Wire Wire Line
-	12100 6750 12550 6750
-Wire Wire Line
-	12100 6650 12550 6650
-Wire Wire Line
-	12100 6550 12550 6550
-Wire Wire Line
-	12100 6450 12550 6450
-Wire Wire Line
-	12100 6350 12550 6350
-Wire Wire Line
-	12100 6250 12550 6250
-Wire Wire Line
-	12100 6150 12550 6150
-Wire Wire Line
-	12100 6050 12550 6050
-Wire Wire Line
-	4200 3900 4800 3900
 Text Label 4300 3900 0    60   ~ 0
 XIN/CLK
-Connection ~ 5150 9450
-Connection ~ 6300 9450
-Wire Wire Line
-	5900 9450 6300 9450
-Connection ~ 6300 8900
-Wire Wire Line
-	6300 9850 6300 8900
-Wire Wire Line
-	5850 9850 6300 9850
-Wire Wire Line
-	7650 8900 8250 8900
-Wire Wire Line
-	6200 8900 6750 8900
-Wire Wire Line
-	5150 8900 5300 8900
-Wire Wire Line
-	5150 9900 5150 8900
 NoConn ~ 3100 10300
 NoConn ~ 2000 10750
 NoConn ~ 2000 10300
 NoConn ~ 2000 9850
-Connection ~ 1050 10750
-Connection ~ 1050 10300
-Wire Wire Line
-	1100 10750 1050 10750
-Wire Wire Line
-	1100 10300 1050 10300
-Wire Wire Line
-	1050 9850 1100 9850
-Wire Wire Line
-	1050 10850 1050 9850
-Wire Wire Line
-	2200 10350 2200 10300
 $Comp
 L GND #PWR035
 U 1 1 3EC4C328
@@ -1309,12 +991,12 @@ $EndComp
 $Comp
 L 74HC04 U4
 U 2 1 3EC4C300
-P 7200 8900
-F 0 "U4" H 7395 9015 60  0000 C CNN
-F 1 "74HC04" H 7390 8776 60  0000 C CNN
-F 2 "" H 7200 8900 60  0001 C CNN
-F 3 "" H 7200 8900 60  0001 C CNN
-	2    7200 8900
+P 6850 8900
+F 0 "U4" H 7045 9015 60  0000 C CNN
+F 1 "74HC04" H 7040 8776 60  0000 C CNN
+F 2 "" H 6850 8900 60  0001 C CNN
+F 3 "" H 6850 8900 60  0001 C CNN
+	2    6850 8900
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1331,70 +1013,56 @@ $EndComp
 $Comp
 L PWR_FLAG #FLG037
 U 1 1 3EC24491
-P 3100 8700
-F 0 "#FLG037" H 3100 8970 30  0001 C CNN
-F 1 "PWR_FLAG" H 3100 8930 30  0000 C CNN
-F 2 "" H 3100 8700 60  0001 C CNN
-F 3 "" H 3100 8700 60  0001 C CNN
-	1    3100 8700
+P 2150 8650
+F 0 "#FLG037" H 2150 8920 30  0001 C CNN
+F 1 "PWR_FLAG" H 2150 8880 30  0000 C CNN
+F 2 "" H 2150 8650 60  0001 C CNN
+F 3 "" H 2150 8650 60  0001 C CNN
+	1    2150 8650
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3100 8750 3100 8700
 $Comp
 L GND #PWR038
 U 1 1 52CEE1C6
-P 3100 8750
-F 0 "#PWR038" H 3100 8750 40  0001 C CNN
-F 1 "GND" H 3100 8680 40  0001 C CNN
-F 2 "" H 3100 8750 60  0001 C CNN
-F 3 "" H 3100 8750 60  0001 C CNN
-	1    3100 8750
+P 2150 8700
+F 0 "#PWR038" H 2150 8700 40  0001 C CNN
+F 1 "GND" H 2150 8630 40  0001 C CNN
+F 2 "" H 2150 8700 60  0001 C CNN
+F 3 "" H 2150 8700 60  0001 C CNN
+	1    2150 8700
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	11750 4200 11600 4200
 $Comp
 L GND #PWR039
 U 1 1 52CEE1C4
-P 14100 4250
-F 0 "#PWR039" H 14100 4250 40  0001 C CNN
-F 1 "GND" H 14100 4180 40  0001 C CNN
-F 2 "" H 14100 4250 60  0001 C CNN
-F 3 "" H 14100 4250 60  0001 C CNN
-	1    14100 4250
+P 14200 4250
+F 0 "#PWR039" H 14200 4250 40  0001 C CNN
+F 1 "GND" H 14200 4180 40  0001 C CNN
+F 2 "" H 14200 4250 60  0001 C CNN
+F 3 "" H 14200 4250 60  0001 C CNN
+	1    14200 4250
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	14100 4250 14100 4200
 $Comp
 L CONN_2 P3
 U 1 1 3EC2446D
-P 14450 4100
-F 0 "P3" V 14400 4100 40  0000 C CNN
-F 1 "CONN_2" V 14500 4100 40  0000 C CNN
-F 2 "" H 14450 4100 60  0001 C CNN
-F 3 "" H 14450 4100 60  0001 C CNN
-	1    14450 4100
+P 14550 4100
+F 0 "P3" V 14500 4100 40  0000 C CNN
+F 1 "CONN_2" V 14600 4100 40  0000 C CNN
+F 2 "" H 14550 4100 60  0001 C CNN
+F 3 "" H 14550 4100 60  0001 C CNN
+	1    14550 4100
 	1    0    0    -1  
 $EndComp
-Connection ~ 2800 7850
-Connection ~ 6050 2000
-Connection ~ 5750 2000
-Connection ~ 5850 2000
-Connection ~ 6100 6900
-Connection ~ 6000 6900
-Connection ~ 5900 6900
-Connection ~ 5800 6900
 $Comp
 L GND #PWR040
 U 1 1 3EC243DC
-P 2800 8300
-F 0 "#PWR040" H 2800 8300 40  0001 C CNN
-F 1 "GND" H 2800 8230 40  0001 C CNN
-F 2 "" H 2800 8300 60  0001 C CNN
-F 3 "" H 2800 8300 60  0001 C CNN
-	1    2800 8300
+P 2800 8350
+F 0 "#PWR040" H 2800 8350 40  0001 C CNN
+F 1 "GND" H 2800 8280 40  0001 C CNN
+F 2 "" H 2800 8350 60  0001 C CNN
+F 3 "" H 2800 8350 60  0001 C CNN
+	1    2800 8350
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1411,138 +1079,124 @@ $EndComp
 $Comp
 L DIODE D1
 U 1 1 3EC243C8
-P 2300 7850
-F 0 "D1" H 2300 7950 40  0000 C CNN
-F 1 "1N4004" H 2300 7750 40  0000 C CNN
-F 2 "" H 2300 7850 60  0001 C CNN
-F 3 "" H 2300 7850 60  0001 C CNN
-	1    2300 7850
+P 2100 7800
+F 0 "D1" H 2100 7900 50  0000 C CNN
+F 1 "1N4004" H 2100 7700 50  0000 C CNN
+F 2 "" H 2100 7800 60  0001 C CNN
+F 3 "" H 2100 7800 60  0001 C CNN
+	1    2100 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR041
 U 1 1 3EC243BD
-P 1750 7950
-F 0 "#PWR041" H 1750 7950 40  0001 C CNN
-F 1 "GND" H 1750 7881 40  0001 C CNN
-F 2 "" H 1750 7950 60  0001 C CNN
-F 3 "" H 1750 7950 60  0001 C CNN
-	1    1750 7950
+P 1500 7900
+F 0 "#PWR041" H 1500 7900 40  0001 C CNN
+F 1 "GND" H 1500 7831 40  0001 C CNN
+F 2 "" H 1500 7900 60  0001 C CNN
+F 3 "" H 1500 7900 60  0001 C CNN
+	1    1500 7900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_3 P2
 U 1 1 3EC243AC
-P 1400 7950
-F 0 "P2" V 1352 7950 40  0000 C CNN
-F 1 "CONN_3" V 1450 7950 40  0000 C CNN
-F 2 "" H 1400 7950 60  0001 C CNN
-F 3 "" H 1400 7950 60  0001 C CNN
-	1    1400 7950
+P 1150 7900
+F 0 "P2" V 1102 7900 40  0000 C CNN
+F 1 "CONN_3" V 1200 7900 40  0000 C CNN
+F 2 "" H 1150 7900 60  0001 C CNN
+F 3 "" H 1150 7900 60  0001 C CNN
+	1    1150 7900
 	-1   0    0    -1  
 $EndComp
-Wire Wire Line
-	3750 7850 3650 7850
 $Comp
 L VCC #PWR042
 U 1 1 3EC24382
-P 3750 7850
-F 0 "#PWR042" H 3750 8050 40  0001 C CNN
-F 1 "VCC" H 3750 8000 40  0000 C CNN
-F 2 "" H 3750 7850 60  0001 C CNN
-F 3 "" H 3750 7850 60  0001 C CNN
-	1    3750 7850
+P 3900 7750
+F 0 "#PWR042" H 3900 7950 40  0001 C CNN
+F 1 "VCC" H 3900 7900 40  0000 C CNN
+F 2 "" H 3900 7750 60  0001 C CNN
+F 3 "" H 3900 7750 60  0001 C CNN
+	1    3900 7750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR043
 U 1 1 3EC2437A
-P 3250 8150
-F 0 "#PWR043" H 3250 8150 40  0001 C CNN
-F 1 "GND" H 3250 8080 40  0001 C CNN
-F 2 "" H 3250 8150 60  0001 C CNN
-F 3 "" H 3250 8150 60  0001 C CNN
-	1    3250 8150
+P 3400 8150
+F 0 "#PWR043" H 3400 8150 40  0001 C CNN
+F 1 "GND" H 3400 8080 40  0001 C CNN
+F 2 "" H 3400 8150 60  0001 C CNN
+F 3 "" H 3400 8150 60  0001 C CNN
+	1    3400 8150
 	1    0    0    -1  
 $EndComp
 $Comp
 L LM7805 U3
 U 1 1 3EC2436D
-P 3250 7900
-F 0 "U3" H 3400 7704 60  0000 C CNN
-F 1 "LM7805" H 3250 8100 60  0000 C CNN
-F 2 "" H 3250 7900 60  0001 C CNN
-F 3 "" H 3250 7900 60  0001 C CNN
-	1    3250 7900
+P 3400 7850
+F 0 "U3" H 3400 8150 60  0000 C CNN
+F 1 "LM7805" H 3400 8050 60  0000 C CNN
+F 2 "" H 3400 7850 60  0001 C CNN
+F 3 "" H 3400 7850 60  0001 C CNN
+	1    3400 7850
 	1    0    0    -1  
 $EndComp
-Text Label 7750 8900 0    60   ~ 0
+Text Label 7400 8900 0    60   ~ 0
 XIN/CLK
-Connection ~ 5950 9850
-Wire Wire Line
-	5950 9900 5950 9850
 $Comp
 L GND #PWR044
 U 1 1 52CEE1C2
-P 5950 10350
-F 0 "#PWR044" H 5950 10350 40  0001 C CNN
-F 1 "GND" H 5950 10280 40  0001 C CNN
-F 2 "" H 5950 10350 60  0001 C CNN
-F 3 "" H 5950 10350 60  0001 C CNN
-	1    5950 10350
+P 6300 10350
+F 0 "#PWR044" H 6300 10350 40  0001 C CNN
+F 1 "GND" H 6300 10280 40  0001 C CNN
+F 2 "" H 6300 10350 60  0001 C CNN
+F 3 "" H 6300 10350 60  0001 C CNN
+	1    6300 10350
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5950 10350 5950 10300
 $Comp
 L C C4
 U 1 1 3EC242AD
-P 5950 10100
-F 0 "C4" H 6000 10200 50  0000 C CNN
-F 1 "22pF" H 6000 10000 50  0000 C CNN
-F 2 "" H 5950 10100 60  0001 C CNN
-F 3 "" H 5950 10100 60  0001 C CNN
-	1    5950 10100
+P 6300 10100
+F 0 "C4" H 6400 10200 50  0000 L CNN
+F 1 "22pF" H 6400 10000 50  0000 L CNN
+F 2 "" H 6300 10100 60  0001 C CNN
+F 3 "" H 6300 10100 60  0001 C CNN
+	1    6300 10100
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5150 10350 5150 10300
-Connection ~ 5150 9850
-Wire Wire Line
-	5350 9850 5150 9850
-Wire Wire Line
-	5150 9450 5300 9450
 $Comp
 L R R1
 U 1 1 3EC242C1
-P 5600 9850
-F 0 "R1" V 5680 9850 50  0000 C CNN
-F 1 "100K" V 5600 9850 50  0000 C CNN
-F 2 "" H 5600 9850 60  0001 C CNN
-F 3 "" H 5600 9850 60  0001 C CNN
-	1    5600 9850
+P 5750 9800
+F 0 "R1" V 5830 9800 50  0000 C CNN
+F 1 "100K" V 5750 9800 50  0000 C CNN
+F 2 "" H 5750 9800 60  0001 C CNN
+F 3 "" H 5750 9800 60  0001 C CNN
+	1    5750 9800
 	0    1    1    0   
 $EndComp
 $Comp
 L C C5
 U 1 1 52CEE1C5
-P 5150 10100
-F 0 "C5" H 5200 10200 50  0000 L CNN
-F 1 "22pF" H 5200 10000 50  0000 L CNN
-F 2 "" H 5150 10100 60  0001 C CNN
-F 3 "" H 5150 10100 60  0001 C CNN
-	1    5150 10100
+P 5200 10100
+F 0 "C5" H 5300 10200 50  0000 L CNN
+F 1 "22pF" H 5300 10000 50  0000 L CNN
+F 2 "" H 5200 10100 60  0001 C CNN
+F 3 "" H 5200 10100 60  0001 C CNN
+	1    5200 10100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CRYSTAL X1
 U 1 1 3EC2428D
-P 5600 9450
-F 0 "X1" H 5600 9600 60  0000 C CNN
-F 1 "10MHz" H 5600 9300 60  0000 C CNN
-F 2 "" H 5600 9450 60  0001 C CNN
-F 3 "" H 5600 9450 60  0001 C CNN
-	1    5600 9450
+P 5750 9400
+F 0 "X1" H 5750 9550 60  0000 C CNN
+F 1 "10MHz" H 5750 9250 60  0000 C CNN
+F 2 "" H 5750 9400 60  0001 C CNN
+F 3 "" H 5750 9400 60  0001 C CNN
+	1    5750 9400
 	1    0    0    -1  
 $EndComp
 Text Label 4550 2400 0    60   ~ 0
@@ -1553,8 +1207,6 @@ Text Label 4550 2600 0    60   ~ 0
 TCK
 Text Label 4550 2700 0    60   ~ 0
 TDO
-Wire Wire Line
-	4800 2500 4500 2500
 $Comp
 L GND #PWR045
 U 1 1 3EC23E6E
@@ -1571,42 +1223,40 @@ L VCC #PWR046
 U 1 1 52CEE1C0
 P 3450 2000
 F 0 "#PWR046" H 3450 2200 40  0001 C CNN
-F 1 "VCC" H 3450 2150 40  0000 C CNN
+F 1 "VCC" H 3450 2100 40  0000 C CNN
 F 2 "" H 3450 2000 60  0001 C CNN
 F 3 "" H 3450 2000 60  0001 C CNN
 	1    3450 2000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3450 2100 3450 2000
 $Comp
 L GND #PWR047
 U 1 1 3EC23DE5
-P 3750 8300
-F 0 "#PWR047" H 3750 8300 40  0001 C CNN
-F 1 "GND" H 3750 8230 40  0001 C CNN
-F 2 "" H 3750 8300 60  0001 C CNN
-F 3 "" H 3750 8300 60  0001 C CNN
-	1    3750 8300
+P 3900 8350
+F 0 "#PWR047" H 3900 8350 40  0001 C CNN
+F 1 "GND" H 3900 8280 40  0001 C CNN
+F 2 "" H 3900 8350 60  0001 C CNN
+F 3 "" H 3900 8350 60  0001 C CNN
+	1    3900 8350
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C3
 U 1 1 3EC23DCD
-P 3750 8100
-F 0 "C3" H 3800 8200 50  0000 L CNN
-F 1 "10uF" H 3800 8000 50  0000 L CNN
-F 2 "" H 3750 8100 60  0001 C CNN
-F 3 "" H 3750 8100 60  0001 C CNN
-	1    3750 8100
+P 3900 8100
+F 0 "C3" H 3950 8200 50  0000 L CNN
+F 1 "10uF" H 3950 8000 50  0000 L CNN
+F 2 "" H 3900 8100 60  0001 C CNN
+F 3 "" H 3900 8100 60  0001 C CNN
+	1    3900 8100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C2
 U 1 1 3EC23B98
 P 11400 4200
-F 0 "C2" H 11450 4300 50  0000 L CNN
-F 1 "10uF" H 11450 4100 50  0000 L CNN
+F 0 "C2" V 11550 4200 50  0000 C BNN
+F 1 "10uF" V 11250 4200 50  0000 C CNN
 F 2 "" H 11400 4200 60  0001 C CNN
 F 3 "" H 11400 4200 60  0001 C CNN
 	1    11400 4200
@@ -1623,10 +1273,6 @@ F 3 "" H 9500 5150 60  0001 C CNN
 	1    9500 5150
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	9500 4450 9500 4750
-Wire Wire Line
-	9600 4450 9500 4450
 $Comp
 L C C1
 U 1 1 3EC23ABA
@@ -1641,71 +1287,51 @@ $EndComp
 $Comp
 L GND #PWR049
 U 1 1 3EC23A35
-P 10500 5000
-F 0 "#PWR049" H 10500 5000 40  0001 C CNN
-F 1 "GND" H 10500 4930 40  0001 C CNN
-F 2 "" H 10500 5000 60  0001 C CNN
-F 3 "" H 10500 5000 60  0001 C CNN
-	1    10500 5000
+P 10400 5000
+F 0 "#PWR049" H 10400 5000 40  0001 C CNN
+F 1 "GND" H 10400 4930 40  0001 C CNN
+F 2 "" H 10400 5000 60  0001 C CNN
+F 3 "" H 10400 5000 60  0001 C CNN
+	1    10400 5000
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR050
 U 1 1 52CEE1C3
-P 6200 6950
-F 0 "#PWR050" H 6200 6950 40  0001 C CNN
-F 1 "GND" H 6200 6880 40  0001 C CNN
-F 2 "" H 6200 6950 60  0001 C CNN
-F 3 "" H 6200 6950 60  0001 C CNN
-	1    6200 6950
+P 6200 7000
+F 0 "#PWR050" H 6200 7000 40  0001 C CNN
+F 1 "GND" H 6200 6930 40  0001 C CNN
+F 2 "" H 6200 7000 60  0001 C CNN
+F 3 "" H 6200 7000 60  0001 C CNN
+	1    6200 7000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6200 6900 5700 6900
-Wire Wire Line
-	6200 6950 6200 6900
-Wire Wire Line
-	10500 5000 10500 4950
-Wire Wire Line
-	10500 4950 10300 4950
-Wire Wire Line
-	10500 3150 10300 3150
 $Comp
 L VCC #PWR051
 U 1 1 3EC239FE
-P 10500 3050
-F 0 "#PWR051" H 10500 3250 40  0001 C CNN
-F 1 "VCC" H 10500 3200 40  0000 C CNN
-F 2 "" H 10500 3050 60  0001 C CNN
-F 3 "" H 10500 3050 60  0001 C CNN
-	1    10500 3050
+P 10400 3050
+F 0 "#PWR051" H 10400 3250 40  0001 C CNN
+F 1 "VCC" H 10400 3200 40  0000 C CNN
+F 2 "" H 10400 3050 60  0001 C CNN
+F 3 "" H 10400 3050 60  0001 C CNN
+	1    10400 3050
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	10500 3150 10500 3050
 $Comp
 L VCC #PWR052
 U 1 1 52CEE1C1
 P 6150 1900
 F 0 "#PWR052" H 6150 2100 40  0001 C CNN
-F 1 "VCC" H 6150 2050 40  0000 C CNN
+F 1 "VCC" H 6150 2000 40  0000 C CNN
 F 2 "" H 6150 1900 60  0001 C CNN
 F 3 "" H 6150 1900 60  0001 C CNN
 	1    6150 1900
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	6150 2000 6150 1900
-Wire Wire Line
-	5650 2000 6150 2000
 Text Label 7150 4500 0    60   ~ 0
 DCLK
-Wire Wire Line
-	7400 4500 7100 4500
 Text Label 9150 4650 0    60   ~ 0
 DCLK
-Wire Wire Line
-	9600 4650 9150 4650
 Text Label 7150 4900 0    60   ~ 0
 DAT7
 Text Label 7150 5100 0    60   ~ 0
@@ -1722,22 +1348,6 @@ Text Label 7150 4600 0    60   ~ 0
 DAT1
 Text Label 7150 4300 0    60   ~ 0
 DAT0
-Wire Wire Line
-	7400 4900 7100 4900
-Wire Wire Line
-	7400 5100 7100 5100
-Wire Wire Line
-	7400 5000 7100 5000
-Wire Wire Line
-	7400 4800 7100 4800
-Wire Wire Line
-	7400 4400 7100 4400
-Wire Wire Line
-	7400 4200 7100 4200
-Wire Wire Line
-	7400 4600 7100 4600
-Wire Wire Line
-	7400 4300 7100 4300
 Text Label 9300 4150 0    60   ~ 0
 DAT7
 Text Label 9300 4050 0    60   ~ 0
@@ -1754,22 +1364,6 @@ Text Label 9300 3550 0    60   ~ 0
 DAT1
 Text Label 9300 3450 0    60   ~ 0
 DAT0
-Wire Wire Line
-	9600 4150 9300 4150
-Wire Wire Line
-	9600 4050 9300 4050
-Wire Wire Line
-	9600 3950 9300 3950
-Wire Wire Line
-	9600 3850 9300 3850
-Wire Wire Line
-	9600 3750 9300 3750
-Wire Wire Line
-	9600 3650 9300 3650
-Wire Wire Line
-	9600 3550 9300 3550
-Wire Wire Line
-	9600 3450 9300 3450
 $Comp
 L TDA8702 U1
 U 1 1 3EC238E5
@@ -1784,12 +1378,546 @@ $EndComp
 $Comp
 L GND #PWR053
 U 1 1 3EC23A2D
-P 5150 10350
-F 0 "#PWR053" H 5150 10350 40  0001 C CNN
-F 1 "GND" H 5150 10280 40  0001 C CNN
-F 2 "" H 5150 10350 60  0001 C CNN
-F 3 "" H 5150 10350 60  0001 C CNN
-	1    5150 10350
+P 5200 10350
+F 0 "#PWR053" H 5200 10350 40  0001 C CNN
+F 1 "GND" H 5200 10280 40  0001 C CNN
+F 2 "" H 5200 10350 60  0001 C CNN
+F 3 "" H 5200 10350 60  0001 C CNN
+	1    5200 10350
 	1    0    0    -1  
 $EndComp
+Connection ~ 11000 1600
+Wire Wire Line
+	10600 1600 11000 1600
+Wire Wire Line
+	11000 1600 11700 1600
+Wire Wire Line
+	11000 1500 11000 1600
+Connection ~ 11200 1850
+Wire Wire Line
+	4500 2500 4500 2100
+Wire Wire Line
+	4300 2600 4300 2100
+Wire Wire Line
+	4800 2600 4300 2600
+Wire Wire Line
+	4100 2400 4100 2100
+Wire Wire Line
+	4800 2400 4100 2400
+Wire Wire Line
+	3900 2700 4800 2700
+Wire Wire Line
+	3900 2100 3900 2700
+Wire Wire Line
+	3450 2100 3700 2100
+Connection ~ 3800 2150
+Connection ~ 4000 2150
+Connection ~ 4200 2150
+Wire Wire Line
+	4000 2100 4000 2150
+Wire Wire Line
+	4200 2150 4200 2100
+Wire Wire Line
+	4400 2150 4400 2100
+Wire Wire Line
+	3800 2150 4000 2150
+Wire Wire Line
+	4000 2150 4200 2150
+Wire Wire Line
+	4200 2150 4400 2150
+Wire Wire Line
+	3800 2100 3800 2150
+Wire Wire Line
+	3800 2150 3800 2200
+Connection ~ 2400 8000
+Wire Wire Line
+	1600 8000 1500 8000
+Wire Wire Line
+	2400 8000 2400 8300
+Wire Wire Line
+	2550 8000 2550 8050
+Wire Wire Line
+	2000 8000 2150 8000
+Wire Wire Line
+	2150 8000 2400 8000
+Wire Wire Line
+	2400 8000 2550 8000
+Wire Wire Line
+	2300 7800 2400 7800
+Wire Wire Line
+	2400 7800 2700 7800
+Wire Wire Line
+	2700 7800 2800 7800
+Wire Wire Line
+	2800 7800 3000 7800
+Wire Wire Line
+	1500 7800 1900 7800
+Connection ~ 12300 4200
+Connection ~ 12400 3850
+Wire Wire Line
+	12400 4200 12400 4100
+Wire Wire Line
+	12250 4200 12300 4200
+Wire Wire Line
+	12300 4200 12400 4200
+Wire Wire Line
+	12300 4200 12300 4250
+Wire Wire Line
+	13500 3300 13500 4000
+Wire Wire Line
+	13200 3300 13500 3300
+Wire Wire Line
+	12400 3300 12700 3300
+Wire Wire Line
+	12400 3300 12400 3850
+Wire Wire Line
+	12400 3850 12400 3900
+Wire Wire Line
+	12250 3850 12400 3850
+Wire Wire Line
+	11600 3850 11750 3850
+Wire Wire Line
+	14100 4000 14200 4000
+Wire Wire Line
+	13400 4000 13500 4000
+Wire Wire Line
+	13500 4000 13600 4000
+Wire Wire Line
+	4150 3000 4800 3000
+Wire Wire Line
+	4150 2900 4800 2900
+Connection ~ 13550 1600
+Wire Wire Line
+	13600 1600 13550 1600
+Wire Wire Line
+	13550 1500 13600 1500
+Wire Wire Line
+	13550 1500 13550 1600
+Wire Wire Line
+	13550 1600 13550 1650
+Wire Wire Line
+	14400 1600 15050 1600
+Wire Wire Line
+	14400 1500 15050 1500
+Wire Wire Line
+	3800 3400 4800 3400
+Wire Wire Line
+	3700 3200 4800 3200
+Wire Wire Line
+	1950 5200 3050 5200
+Wire Wire Line
+	1950 5400 2950 5400
+Wire Wire Line
+	1950 4100 3000 4100
+Wire Wire Line
+	1950 3900 3000 3900
+Wire Wire Line
+	1950 3700 2850 3700
+Wire Wire Line
+	7100 3400 8200 3400
+Wire Wire Line
+	1950 5900 3100 5900
+Wire Wire Line
+	1950 5800 3050 5800
+Wire Wire Line
+	1950 5600 3050 5600
+Wire Wire Line
+	7550 5500 7100 5500
+Wire Wire Line
+	11200 1850 11200 1500
+Wire Wire Line
+	10600 1850 11200 1850
+Wire Wire Line
+	11200 1850 11700 1850
+Wire Wire Line
+	3900 7750 3900 7800
+Wire Wire Line
+	3900 7800 3900 7900
+Wire Wire Line
+	7450 4000 7100 4000
+Wire Wire Line
+	7450 3900 7100 3900
+Wire Wire Line
+	4800 3600 3700 3600
+Wire Wire Line
+	3700 4000 4800 4000
+Wire Wire Line
+	7100 3300 8200 3300
+Wire Wire Line
+	7100 3500 8200 3500
+Wire Wire Line
+	7100 3700 8200 3700
+Wire Wire Line
+	7450 3800 7100 3800
+Wire Wire Line
+	7450 3600 7100 3600
+Wire Wire Line
+	11000 2600 10650 2600
+Wire Wire Line
+	11000 2300 10650 2300
+Wire Wire Line
+	2650 3500 1950 3500
+Wire Wire Line
+	2650 5700 1950 5700
+Wire Wire Line
+	2650 5500 1950 5500
+Wire Wire Line
+	2650 5300 1950 5300
+Wire Wire Line
+	2650 5100 1950 5100
+Wire Wire Line
+	2650 4900 1950 4900
+Wire Wire Line
+	2650 4700 1950 4700
+Wire Wire Line
+	2650 4500 1950 4500
+Wire Wire Line
+	2650 4300 1950 4300
+Wire Wire Line
+	4800 3800 3700 3800
+Wire Wire Line
+	7700 3100 7100 3100
+Wire Wire Line
+	7700 3200 7100 3200
+Wire Wire Line
+	7700 3000 7100 3000
+Wire Wire Line
+	7700 2900 7100 2900
+Wire Wire Line
+	4800 3100 4200 3100
+Wire Wire Line
+	4800 3300 4200 3300
+Wire Wire Line
+	4800 3500 4200 3500
+Wire Wire Line
+	4800 3700 4200 3700
+Wire Wire Line
+	7650 5800 7100 5800
+Wire Wire Line
+	7550 5600 7100 5600
+Wire Wire Line
+	7650 6500 7100 6500
+Wire Wire Line
+	4800 6300 4250 6300
+Wire Wire Line
+	7650 6300 7100 6300
+Wire Wire Line
+	7650 6000 7100 6000
+Wire Wire Line
+	7650 5900 7100 5900
+Wire Wire Line
+	7650 6100 7100 6100
+Wire Wire Line
+	7650 6200 7100 6200
+Wire Wire Line
+	7650 6400 7100 6400
+Wire Wire Line
+	4800 6500 4250 6500
+Wire Wire Line
+	4800 6200 4250 6200
+Wire Wire Line
+	4800 6000 4250 6000
+Wire Wire Line
+	4800 5800 4250 5800
+Wire Wire Line
+	7650 5700 7100 5700
+Wire Wire Line
+	4800 6400 4250 6400
+Wire Wire Line
+	4800 6100 4250 6100
+Wire Wire Line
+	4350 5900 4800 5900
+Wire Wire Line
+	4350 5700 4800 5700
+Wire Wire Line
+	4350 5300 4800 5300
+Wire Wire Line
+	4350 5000 4800 5000
+Wire Wire Line
+	4350 5100 4800 5100
+Wire Wire Line
+	4350 5200 4800 5200
+Wire Wire Line
+	4350 5500 4800 5500
+Wire Wire Line
+	4350 5600 4800 5600
+Wire Wire Line
+	9700 7650 9400 7650
+Wire Wire Line
+	9800 7400 9800 7650
+Wire Wire Line
+	10700 7400 9800 7400
+Wire Wire Line
+	10700 7800 10150 7800
+Wire Wire Line
+	10700 7700 10150 7700
+Wire Wire Line
+	10700 7600 10150 7600
+Wire Wire Line
+	10700 7300 10150 7300
+Wire Wire Line
+	10700 7200 10150 7200
+Wire Wire Line
+	10700 7100 10150 7100
+Wire Wire Line
+	10700 7000 10150 7000
+Wire Wire Line
+	10700 6900 10150 6900
+Wire Wire Line
+	10700 6800 10150 6800
+Wire Wire Line
+	10700 6700 10150 6700
+Wire Wire Line
+	10700 6600 10150 6600
+Wire Wire Line
+	10700 6500 10150 6500
+Wire Wire Line
+	10700 6400 10150 6400
+Wire Wire Line
+	10700 6300 10150 6300
+Wire Wire Line
+	10700 6200 10150 6200
+Wire Wire Line
+	10700 6100 10150 6100
+Wire Wire Line
+	10700 6000 10150 6000
+Wire Wire Line
+	12100 6700 12550 6700
+Wire Wire Line
+	12100 6600 12550 6600
+Wire Wire Line
+	12100 6500 12550 6500
+Wire Wire Line
+	12100 6400 12550 6400
+Wire Wire Line
+	12100 6300 12550 6300
+Wire Wire Line
+	12100 6200 12550 6200
+Wire Wire Line
+	12100 6100 12550 6100
+Wire Wire Line
+	12100 6000 12550 6000
+Wire Wire Line
+	4200 3900 4800 3900
+Connection ~ 5200 9400
+Connection ~ 6300 9400
+Wire Wire Line
+	6050 9400 6300 9400
+Connection ~ 6300 8900
+Wire Wire Line
+	6300 8900 6300 9400
+Wire Wire Line
+	6300 9400 6300 9800
+Wire Wire Line
+	6300 9800 6300 9900
+Wire Wire Line
+	6300 9800 6000 9800
+Wire Wire Line
+	7300 8900 7900 8900
+Wire Wire Line
+	6200 8900 6300 8900
+Wire Wire Line
+	6300 8900 6400 8900
+Wire Wire Line
+	5200 8900 5300 8900
+Wire Wire Line
+	5200 8900 5200 9400
+Wire Wire Line
+	5200 9400 5200 9800
+Wire Wire Line
+	5200 9800 5200 9900
+Connection ~ 1050 10750
+Connection ~ 1050 10300
+Wire Wire Line
+	1050 10750 1100 10750
+Wire Wire Line
+	1100 10300 1050 10300
+Wire Wire Line
+	1050 9850 1100 9850
+Wire Wire Line
+	1050 9850 1050 10300
+Wire Wire Line
+	1050 10300 1050 10750
+Wire Wire Line
+	1050 10750 1050 10850
+Wire Wire Line
+	2200 10350 2200 10300
+Wire Wire Line
+	2150 8700 2150 8650
+Wire Wire Line
+	11750 4200 11600 4200
+Wire Wire Line
+	14200 4250 14200 4200
+Connection ~ 2800 7800
+Connection ~ 6050 2000
+Connection ~ 5750 2000
+Connection ~ 5850 2000
+Wire Wire Line
+	3900 7800 3800 7800
+Connection ~ 6300 9800
+Wire Wire Line
+	6300 10350 6300 10300
+Wire Wire Line
+	5200 10350 5200 10300
+Connection ~ 5200 9800
+Wire Wire Line
+	5500 9800 5200 9800
+Wire Wire Line
+	5200 9400 5450 9400
+Wire Wire Line
+	4800 2500 4500 2500
+Wire Wire Line
+	3450 2100 3450 2000
+Wire Wire Line
+	9500 4450 9500 4750
+Wire Wire Line
+	9600 4450 9500 4450
+Wire Wire Line
+	6200 6900 6200 6950
+Wire Wire Line
+	6200 6950 6200 7000
+Wire Wire Line
+	10400 5000 10400 4950
+Wire Wire Line
+	10300 4950 10400 4950
+Wire Wire Line
+	10400 4950 10500 4950
+Wire Wire Line
+	10300 3150 10400 3150
+Wire Wire Line
+	10400 3150 10500 3150
+Wire Wire Line
+	10400 3150 10400 3050
+Wire Wire Line
+	6150 2000 6150 1900
+Wire Wire Line
+	5650 2000 5750 2000
+Wire Wire Line
+	5750 2000 5850 2000
+Wire Wire Line
+	5850 2000 6050 2000
+Wire Wire Line
+	6050 2000 6150 2000
+Wire Wire Line
+	7400 4500 7100 4500
+Wire Wire Line
+	9600 4650 9150 4650
+Wire Wire Line
+	7400 4900 7100 4900
+Wire Wire Line
+	7400 5100 7100 5100
+Wire Wire Line
+	7400 5000 7100 5000
+Wire Wire Line
+	7400 4800 7100 4800
+Wire Wire Line
+	7400 4400 7100 4400
+Wire Wire Line
+	7400 4200 7100 4200
+Wire Wire Line
+	7400 4600 7100 4600
+Wire Wire Line
+	7400 4300 7100 4300
+Wire Wire Line
+	9600 4150 9300 4150
+Wire Wire Line
+	9600 4050 9300 4050
+Wire Wire Line
+	9600 3950 9300 3950
+Wire Wire Line
+	9600 3850 9300 3850
+Wire Wire Line
+	9600 3750 9300 3750
+Wire Wire Line
+	9600 3650 9300 3650
+Wire Wire Line
+	9600 3550 9300 3550
+Wire Wire Line
+	9600 3450 9300 3450
+Connection ~ 3900 7800
+Wire Wire Line
+	2400 7750 2400 7800
+Connection ~ 2400 7800
+Wire Wire Line
+	2150 8050 2150 8000
+Connection ~ 2150 8000
+Wire Wire Line
+	5700 6900 5700 6950
+Wire Wire Line
+	5700 6950 5800 6950
+Wire Wire Line
+	5800 6950 5900 6950
+Wire Wire Line
+	5900 6950 6000 6950
+Wire Wire Line
+	6000 6950 6100 6950
+Wire Wire Line
+	6100 6950 6200 6950
+Wire Wire Line
+	6100 6900 6100 6950
+Connection ~ 6100 6950
+Wire Wire Line
+	6000 6900 6000 6950
+Connection ~ 6000 6950
+Wire Wire Line
+	5900 6900 5900 6950
+Connection ~ 5900 6950
+Wire Wire Line
+	5800 6900 5800 6950
+Connection ~ 5800 6950
+Connection ~ 6200 6950
+Connection ~ 13500 4000
+Wire Wire Line
+	7200 2100 7200 2150
+Wire Wire Line
+	7600 2100 7600 2150
+Wire Wire Line
+	8000 2100 8000 2150
+Wire Wire Line
+	8000 1650 8000 1700
+Wire Wire Line
+	7600 1650 7600 1700
+Wire Wire Line
+	7200 1700 7200 1650
+Wire Wire Line
+	2700 7750 2700 7800
+Connection ~ 2700 7800
+Wire Wire Line
+	2800 7800 2800 7900
+Wire Wire Line
+	3900 8350 3900 8300
+Wire Wire Line
+	2800 8300 2800 8350
+Wire Wire Line
+	3400 8150 3400 8100
+Wire Wire Line
+	4700 9000 4700 9050
+Wire Wire Line
+	4700 9450 4700 9500
+Wire Wire Line
+	12300 7450 12300 7500
+Wire Wire Line
+	12300 7950 12300 7900
+Wire Wire Line
+	9900 7600 9900 7650
+Connection ~ 10400 4950
+Connection ~ 10400 3150
+Wire Wire Line
+	12300 4800 12300 4750
+Wire Wire Line
+	12800 3550 12800 3600
+Wire Wire Line
+	12800 4450 12800 4400
+Wire Wire Line
+	11900 2300 11950 2300
+Wire Wire Line
+	11950 2600 11900 2600
+Wire Wire Line
+	12350 1600 12300 1600
+Wire Wire Line
+	12300 1850 12350 1850
+Wire Wire Line
+	11200 950  11200 1000
+Wire Wire Line
+	11000 950  11000 1000
 $EndSCHEMATC
diff --git a/demos/video/bus_pci.sch b/demos/video/bus_pci.sch
index 4d91a21..d3b9276 100644
--- a/demos/video/bus_pci.sch
+++ b/demos/video/bus_pci.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 7 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Interface Bus PCI"
@@ -49,31 +49,32 @@ F 3 "" H 1500 10750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Connection ~ 1150 8850
-Connection ~ 1050 10200
 Wire Wire Line
-	600  10200 1250 10200
+	600  10200 1050 10200
+Wire Wire Line
+	1050 10150 1050 10300
 $Comp
 L PWR_FLAG #FLG077
 U 1 1 4BF03691
-P 1250 10200
-F 0 "#FLG077" H 1250 10470 30  0001 C CNN
-F 1 "PWR_FLAG" H 1250 10430 30  0000 C CNN
-F 2 "" H 1250 10200 60  0001 C CNN
-F 3 "" H 1250 10200 60  0001 C CNN
-	1    1250 10200
+P 1050 10150
+F 0 "#FLG077" H 1050 10420 30  0001 C CNN
+F 1 "PWR_FLAG" H 1050 10380 30  0000 C CNN
+F 2 "" H 1050 10150 60  0001 C CNN
+F 3 "" H 1050 10150 60  0001 C CNN
+	1    1050 10150
 	1    0    0    -1  
 $EndComp
 Connection ~ 4500 1000
 Wire Wire Line
 	4250 1000 4500 1000
 Wire Wire Line
-	700  8850 1350 8850
+	700  8850 1150 8850
 $Comp
 L PWR_FLAG #FLG078
 U 1 1 4174D820
 P 4250 1000
 F 0 "#FLG078" H 4250 1270 30  0001 C CNN
-F 1 "PWR_FLAG" H 4250 1230 30  0000 C CNN
+F 1 "PWR_FLAG" H 4250 1200 30  0000 C CNN
 F 2 "" H 4250 1000 60  0001 C CNN
 F 3 "" H 4250 1000 60  0001 C CNN
 	1    4250 1000
@@ -82,12 +83,12 @@ $EndComp
 $Comp
 L PWR_FLAG #FLG079
 U 1 1 4174D80F
-P 1350 8850
-F 0 "#FLG079" H 1350 9120 30  0001 C CNN
-F 1 "PWR_FLAG" H 1350 9080 30  0000 C CNN
-F 2 "" H 1350 8850 60  0001 C CNN
-F 3 "" H 1350 8850 60  0001 C CNN
-	1    1350 8850
+P 1150 8850
+F 0 "#FLG079" H 1150 9120 30  0001 C CNN
+F 1 "PWR_FLAG" H 1150 9080 30  0000 C CNN
+F 2 "" H 1150 8850 60  0001 C CNN
+F 3 "" H 1150 8850 60  0001 C CNN
+	1    1150 8850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -107,29 +108,27 @@ Connection ~ 1050 10750
 $Comp
 L VCC #PWR081
 U 1 1 33B3DC6A
-P 1150 8850
-F 0 "#PWR081" H 1150 9050 40  0001 C CNN
-F 1 "VCC" H 1150 9000 40  0000 C CNN
-F 2 "" H 1150 8850 60  0001 C CNN
-F 3 "" H 1150 8850 60  0001 C CNN
-	1    1150 8850
+P 850 8800
+F 0 "#PWR081" H 850 9000 40  0001 C CNN
+F 1 "VCC" H 850 8950 40  0000 C CNN
+F 2 "" H 850 8800 60  0001 C CNN
+F 3 "" H 850 8800 60  0001 C CNN
+	1    850  8800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1050 10200 1050 10300
-Wire Wire Line
-	600  10200 600  10300
+	600  10150 600  10300
 Wire Wire Line
 	1150 8850 1150 8950
 $Comp
 L +3.3V #PWR082
 U 1 1 33AFD455
-P 600 10200
-F 0 "#PWR082" H 600 10400 40  0001 C CNN
-F 1 "+3.3V" H 600 10350 40  0000 C CNN
-F 2 "" H 600 10200 60  0001 C CNN
-F 3 "" H 600 10200 60  0001 C CNN
-	1    600  10200
+P 600 10150
+F 0 "#PWR082" H 600 10350 40  0001 C CNN
+F 1 "+3.3V" H 600 10300 40  0000 C CNN
+F 2 "" H 600 10150 60  0001 C CNN
+F 3 "" H 600 10150 60  0001 C CNN
+	1    600  10150
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -137,7 +136,7 @@ L GND #GND083
 U 1 1 4BF036CB
 P 1050 10800
 F 0 "#GND083" H 1050 10900 60  0001 C CNN
-F 1 "GND" H 1050 10700 60  0000 C CNN
+F 1 "GND" H 1050 10700 60  0001 C CNN
 F 2 "" H 1050 10800 60  0001 C CNN
 F 3 "" H 1050 10800 60  0001 C CNN
 	1    1050 10800
@@ -150,7 +149,7 @@ L GND #GND084
 U 1 1 4BF036CC
 P 600 10800
 F 0 "#GND084" H 600 10900 60  0001 C CNN
-F 1 "GND" H 600 10700 60  0000 C CNN
+F 1 "GND" H 600 10700 60  0001 C CNN
 F 2 "" H 600 10800 60  0001 C CNN
 F 3 "" H 600 10800 60  0001 C CNN
 	1    600  10800
@@ -483,8 +482,8 @@ Wire Wire Line
 	1350 6650 2200 6650
 Wire Wire Line
 	1350 6850 2200 6850
-Text Notes 2300 10850 0    60   ~ 0
-Decouplage du "S5933"
+Text Notes 2550 10900 0    60   ~ 0
+Decoupling for "S5933"
 Wire Notes Line
 	1700 10950 1700 9050
 Wire Notes Line
@@ -507,111 +506,111 @@ $EndComp
 $Comp
 L GND #GND086
 U 1 1 2691B5BF
-P 2200 1350
-F 0 "#GND086" H 2200 1450 60  0001 C CNN
-F 1 "GND" H 2200 1250 60  0000 C CNN
-F 2 "" H 2200 1350 60  0001 C CNN
-F 3 "" H 2200 1350 60  0001 C CNN
-	1    2200 1350
+P 2150 1350
+F 0 "#GND086" H 2150 1450 60  0001 C CNN
+F 1 "GND" H 2150 1250 60  0001 C CNN
+F 2 "" H 2150 1350 60  0001 C CNN
+F 3 "" H 2150 1350 60  0001 C CNN
+	1    2150 1350
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND087
 U 1 1 2691B5CE
-P 2200 2550
-F 0 "#GND087" H 2200 2650 60  0001 C CNN
-F 1 "GND" H 2200 2450 60  0000 C CNN
-F 2 "" H 2200 2550 60  0001 C CNN
-F 3 "" H 2200 2550 60  0001 C CNN
-	1    2200 2550
+P 2150 2550
+F 0 "#GND087" H 2150 2650 60  0001 C CNN
+F 1 "GND" H 2150 2450 60  0001 C CNN
+F 2 "" H 2150 2550 60  0001 C CNN
+F 3 "" H 2150 2550 60  0001 C CNN
+	1    2150 2550
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND088
 U 1 1 2691B5D3
-P 2200 2750
-F 0 "#GND088" H 2200 2850 60  0001 C CNN
-F 1 "GND" H 2200 2650 60  0000 C CNN
-F 2 "" H 2200 2750 60  0001 C CNN
-F 3 "" H 2200 2750 60  0001 C CNN
-	1    2200 2750
+P 2150 2750
+F 0 "#GND088" H 2150 2850 60  0001 C CNN
+F 1 "GND" H 2150 2650 60  0001 C CNN
+F 2 "" H 2150 2750 60  0001 C CNN
+F 3 "" H 2150 2750 60  0001 C CNN
+	1    2150 2750
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND089
 U 1 1 2691B5D8
-P 2200 3250
-F 0 "#GND089" H 2200 3350 60  0001 C CNN
-F 1 "GND" H 2200 3150 60  0000 C CNN
-F 2 "" H 2200 3250 60  0001 C CNN
-F 3 "" H 2200 3250 60  0001 C CNN
-	1    2200 3250
+P 2150 3250
+F 0 "#GND089" H 2150 3350 60  0001 C CNN
+F 1 "GND" H 2150 3150 60  0001 C CNN
+F 2 "" H 2150 3250 60  0001 C CNN
+F 3 "" H 2150 3250 60  0001 C CNN
+	1    2150 3250
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND090
 U 1 1 2691B5DD
-P 2200 3850
-F 0 "#GND090" H 2200 3950 60  0001 C CNN
-F 1 "GND" H 2200 3750 60  0000 C CNN
-F 2 "" H 2200 3850 60  0001 C CNN
-F 3 "" H 2200 3850 60  0001 C CNN
-	1    2200 3850
+P 2150 3850
+F 0 "#GND090" H 2150 3950 60  0001 C CNN
+F 1 "GND" H 2150 3750 60  0001 C CNN
+F 2 "" H 2150 3850 60  0001 C CNN
+F 3 "" H 2150 3850 60  0001 C CNN
+	1    2150 3850
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND091
 U 1 1 2691B5E2
-P 2200 4450
-F 0 "#GND091" H 2200 4550 60  0001 C CNN
-F 1 "GND" H 2200 4350 60  0000 C CNN
-F 2 "" H 2200 4450 60  0001 C CNN
-F 3 "" H 2200 4450 60  0001 C CNN
-	1    2200 4450
+P 2150 4450
+F 0 "#GND091" H 2150 4550 60  0001 C CNN
+F 1 "GND" H 2150 4350 60  0001 C CNN
+F 2 "" H 2150 4450 60  0001 C CNN
+F 3 "" H 2150 4450 60  0001 C CNN
+	1    2150 4450
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND092
 U 1 1 2691B5E7
-P 2200 4850
-F 0 "#GND092" H 2200 4950 60  0001 C CNN
-F 1 "GND" H 2200 4750 60  0000 C CNN
-F 2 "" H 2200 4850 60  0001 C CNN
-F 3 "" H 2200 4850 60  0001 C CNN
-	1    2200 4850
+P 2150 4850
+F 0 "#GND092" H 2150 4950 60  0001 C CNN
+F 1 "GND" H 2150 4750 60  0001 C CNN
+F 2 "" H 2150 4850 60  0001 C CNN
+F 3 "" H 2150 4850 60  0001 C CNN
+	1    2150 4850
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND093
 U 1 1 2691B5EC
-P 2200 5650
-F 0 "#GND093" H 2200 5750 60  0001 C CNN
-F 1 "GND" H 2200 5550 60  0000 C CNN
-F 2 "" H 2200 5650 60  0001 C CNN
-F 3 "" H 2200 5650 60  0001 C CNN
-	1    2200 5650
+P 2150 5650
+F 0 "#GND093" H 2150 5750 60  0001 C CNN
+F 1 "GND" H 2150 5550 60  0001 C CNN
+F 2 "" H 2150 5650 60  0001 C CNN
+F 3 "" H 2150 5650 60  0001 C CNN
+	1    2150 5650
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND094
 U 1 1 2691B5F1
-P 2200 5950
-F 0 "#GND094" H 2200 6050 60  0001 C CNN
-F 1 "GND" H 2200 5850 60  0000 C CNN
-F 2 "" H 2200 5950 60  0001 C CNN
-F 3 "" H 2200 5950 60  0001 C CNN
-	1    2200 5950
+P 2150 5950
+F 0 "#GND094" H 2150 6050 60  0001 C CNN
+F 1 "GND" H 2150 5850 60  0001 C CNN
+F 2 "" H 2150 5950 60  0001 C CNN
+F 3 "" H 2150 5950 60  0001 C CNN
+	1    2150 5950
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND095
 U 1 1 2691B5F6
-P 2200 6750
-F 0 "#GND095" H 2200 6850 60  0001 C CNN
-F 1 "GND" H 2200 6650 60  0000 C CNN
-F 2 "" H 2200 6750 60  0001 C CNN
-F 3 "" H 2200 6750 60  0001 C CNN
-	1    2200 6750
+P 2150 6750
+F 0 "#GND095" H 2150 6850 60  0001 C CNN
+F 1 "GND" H 2150 6650 60  0001 C CNN
+F 2 "" H 2150 6750 60  0001 C CNN
+F 3 "" H 2150 6750 60  0001 C CNN
+	1    2150 6750
 	0    1    1    0   
 $EndComp
 $Comp
@@ -619,7 +618,7 @@ L GND #GND096
 U 1 1 2691B5FB
 P 4500 6650
 F 0 "#GND096" H 4500 6750 60  0001 C CNN
-F 1 "GND" H 4500 6550 60  0000 C CNN
+F 1 "GND" H 4500 6550 60  0001 C CNN
 F 2 "" H 4500 6650 60  0001 C CNN
 F 3 "" H 4500 6650 60  0001 C CNN
 	1    4500 6650
@@ -630,7 +629,7 @@ L GND #GND097
 U 1 1 2691B600
 P 4500 5850
 F 0 "#GND097" H 4500 5950 60  0001 C CNN
-F 1 "GND" H 4500 5750 60  0000 C CNN
+F 1 "GND" H 4500 5750 60  0001 C CNN
 F 2 "" H 4500 5850 60  0001 C CNN
 F 3 "" H 4500 5850 60  0001 C CNN
 	1    4500 5850
@@ -641,7 +640,7 @@ L GND #GND098
 U 1 1 2691B605
 P 4500 5250
 F 0 "#GND098" H 4500 5350 60  0001 C CNN
-F 1 "GND" H 4500 5150 60  0000 C CNN
+F 1 "GND" H 4500 5150 60  0001 C CNN
 F 2 "" H 4500 5250 60  0001 C CNN
 F 3 "" H 4500 5250 60  0001 C CNN
 	1    4500 5250
@@ -652,7 +651,7 @@ L GND #GND099
 U 1 1 2691B60A
 P 4500 4750
 F 0 "#GND099" H 4500 4850 60  0001 C CNN
-F 1 "GND" H 4500 4650 60  0000 C CNN
+F 1 "GND" H 4500 4650 60  0001 C CNN
 F 2 "" H 4500 4750 60  0001 C CNN
 F 3 "" H 4500 4750 60  0001 C CNN
 	1    4500 4750
@@ -663,7 +662,7 @@ L GND #GND0100
 U 1 1 2691B60F
 P 4500 4550
 F 0 "#GND0100" H 4500 4650 60  0001 C CNN
-F 1 "GND" H 4500 4450 60  0000 C CNN
+F 1 "GND" H 4500 4450 60  0001 C CNN
 F 2 "" H 4500 4550 60  0001 C CNN
 F 3 "" H 4500 4550 60  0001 C CNN
 	1    4500 4550
@@ -674,7 +673,7 @@ L GND #GND0101
 U 1 1 2691B614
 P 4500 4050
 F 0 "#GND0101" H 4500 4150 60  0001 C CNN
-F 1 "GND" H 4500 3950 60  0000 C CNN
+F 1 "GND" H 4500 3950 60  0001 C CNN
 F 2 "" H 4500 4050 60  0001 C CNN
 F 3 "" H 4500 4050 60  0001 C CNN
 	1    4500 4050
@@ -685,7 +684,7 @@ L GND #GND0102
 U 1 1 2691B619
 P 4500 3450
 F 0 "#GND0102" H 4500 3550 60  0001 C CNN
-F 1 "GND" H 4500 3350 60  0000 C CNN
+F 1 "GND" H 4500 3350 60  0001 C CNN
 F 2 "" H 4500 3450 60  0001 C CNN
 F 3 "" H 4500 3450 60  0001 C CNN
 	1    4500 3450
@@ -696,7 +695,7 @@ L GND #GND0103
 U 1 1 2691B61E
 P 4500 2850
 F 0 "#GND0103" H 4500 2850 40  0001 C CNN
-F 1 "GND" H 4500 2780 40  0000 C CNN
+F 1 "GND" H 4500 2780 40  0001 C CNN
 F 2 "" H 4500 2850 60  0001 C CNN
 F 3 "" H 4500 2850 60  0001 C CNN
 	1    4500 2850
@@ -738,12 +737,12 @@ $EndComp
 $Comp
 L GND #GND0105
 U 1 1 26A799F2
-P 12050 6650
-F 0 "#GND0105" H 12050 6750 60  0001 C CNN
-F 1 "GND" H 12050 6550 60  0000 C CNN
-F 2 "" H 12050 6650 60  0001 C CNN
-F 3 "" H 12050 6650 60  0001 C CNN
-	1    12050 6650
+P 12050 6700
+F 0 "#GND0105" H 12050 6800 60  0001 C CNN
+F 1 "GND" H 12050 6600 60  0001 C CNN
+F 2 "" H 12050 6700 60  0001 C CNN
+F 3 "" H 12050 6700 60  0001 C CNN
+	1    12050 6700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -751,7 +750,7 @@ L GND #GND0106
 U 1 1 26A799FC
 P 11900 7950
 F 0 "#GND0106" H 11900 8050 60  0001 C CNN
-F 1 "GND" H 11900 7850 60  0000 C CNN
+F 1 "GND" H 11900 7850 60  0001 C CNN
 F 2 "" H 11900 7950 60  0001 C CNN
 F 3 "" H 11900 7950 60  0001 C CNN
 	1    11900 7950
@@ -762,7 +761,7 @@ L GND #GND0107
 U 1 1 26A79A06
 P 11900 8850
 F 0 "#GND0107" H 11900 8950 60  0001 C CNN
-F 1 "GND" H 11900 8750 60  0000 C CNN
+F 1 "GND" H 11900 8750 60  0001 C CNN
 F 2 "" H 11900 8850 60  0001 C CNN
 F 3 "" H 11900 8850 60  0001 C CNN
 	1    11900 8850
@@ -806,7 +805,7 @@ L GND #GND0108
 U 1 1 26B211BB
 P 4950 9600
 F 0 "#GND0108" H 4950 9700 60  0001 C CNN
-F 1 "GND" H 4950 9500 60  0000 C CNN
+F 1 "GND" H 4950 9500 60  0001 C CNN
 F 2 "" H 4950 9600 60  0001 C CNN
 F 3 "" H 4950 9600 60  0001 C CNN
 	1    4950 9600
@@ -815,12 +814,12 @@ $EndComp
 $Comp
 L R R28
 U 1 1 26B211C0
-P 6850 9300
-F 0 "R28" V 6930 9300 50  0000 C CNN
-F 1 "2,2K" V 6850 9300 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 6850 9300 60  0001 C CNN
-F 3 "" H 6850 9300 60  0001 C CNN
-	1    6850 9300
+P 6800 9300
+F 0 "R28" V 6880 9300 50  0000 C CNN
+F 1 "2,2K" V 6800 9300 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 6800 9300 60  0001 C CNN
+F 3 "" H 6800 9300 60  0001 C CNN
+	1    6800 9300
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -848,12 +847,12 @@ $EndComp
 $Comp
 L GND #GND0109
 U 1 1 26B211DE
-P 1900 9800
-F 0 "#GND0109" H 1900 9900 60  0001 C CNN
-F 1 "GND" H 1900 9700 60  0000 C CNN
-F 2 "" H 1900 9800 60  0001 C CNN
-F 3 "" H 1900 9800 60  0001 C CNN
-	1    1900 9800
+P 1900 9850
+F 0 "#GND0109" H 1900 9950 60  0001 C CNN
+F 1 "GND" H 1900 9750 60  0001 C CNN
+F 2 "" H 1900 9850 60  0001 C CNN
+F 3 "" H 1900 9850 60  0001 C CNN
+	1    1900 9850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -870,12 +869,12 @@ $EndComp
 $Comp
 L GND #GND0110
 U 1 1 26B211E8
-P 2600 9800
-F 0 "#GND0110" H 2600 9900 60  0001 C CNN
-F 1 "GND" H 2600 9700 60  0000 C CNN
-F 2 "" H 2600 9800 60  0001 C CNN
-F 3 "" H 2600 9800 60  0001 C CNN
-	1    2600 9800
+P 2600 9850
+F 0 "#GND0110" H 2600 9950 60  0001 C CNN
+F 1 "GND" H 2600 9750 60  0001 C CNN
+F 2 "" H 2600 9850 60  0001 C CNN
+F 3 "" H 2600 9850 60  0001 C CNN
+	1    2600 9850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -892,12 +891,12 @@ $EndComp
 $Comp
 L GND #GND0111
 U 1 1 26B211F2
-P 3300 9800
-F 0 "#GND0111" H 3300 9900 60  0001 C CNN
-F 1 "GND" H 3300 9700 60  0000 C CNN
-F 2 "" H 3300 9800 60  0001 C CNN
-F 3 "" H 3300 9800 60  0001 C CNN
-	1    3300 9800
+P 3300 9850
+F 0 "#GND0111" H 3300 9950 60  0001 C CNN
+F 1 "GND" H 3300 9750 60  0001 C CNN
+F 2 "" H 3300 9850 60  0001 C CNN
+F 3 "" H 3300 9850 60  0001 C CNN
+	1    3300 9850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -914,12 +913,12 @@ $EndComp
 $Comp
 L GND #GND0112
 U 1 1 26B211FC
-P 4000 9800
-F 0 "#GND0112" H 4000 9900 60  0001 C CNN
-F 1 "GND" H 4000 9700 60  0000 C CNN
-F 2 "" H 4000 9800 60  0001 C CNN
-F 3 "" H 4000 9800 60  0001 C CNN
-	1    4000 9800
+P 4000 9850
+F 0 "#GND0112" H 4000 9950 60  0001 C CNN
+F 1 "GND" H 4000 9750 60  0001 C CNN
+F 2 "" H 4000 9850 60  0001 C CNN
+F 3 "" H 4000 9850 60  0001 C CNN
+	1    4000 9850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -936,12 +935,12 @@ $EndComp
 $Comp
 L GND #GND0113
 U 1 1 26B21206
-P 1900 10600
-F 0 "#GND0113" H 1900 10700 60  0001 C CNN
-F 1 "GND" H 1900 10500 60  0000 C CNN
-F 2 "" H 1900 10600 60  0001 C CNN
-F 3 "" H 1900 10600 60  0001 C CNN
-	1    1900 10600
+P 1900 10650
+F 0 "#GND0113" H 1900 10750 60  0001 C CNN
+F 1 "GND" H 1900 10550 60  0001 C CNN
+F 2 "" H 1900 10650 60  0001 C CNN
+F 3 "" H 1900 10650 60  0001 C CNN
+	1    1900 10650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -958,12 +957,12 @@ $EndComp
 $Comp
 L GND #GND0114
 U 1 1 26B21210
-P 2600 10600
-F 0 "#GND0114" H 2600 10700 60  0001 C CNN
-F 1 "GND" H 2600 10500 60  0000 C CNN
-F 2 "" H 2600 10600 60  0001 C CNN
-F 3 "" H 2600 10600 60  0001 C CNN
-	1    2600 10600
+P 2600 10650
+F 0 "#GND0114" H 2600 10750 60  0001 C CNN
+F 1 "GND" H 2600 10550 60  0001 C CNN
+F 2 "" H 2600 10650 60  0001 C CNN
+F 3 "" H 2600 10650 60  0001 C CNN
+	1    2600 10650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -980,12 +979,12 @@ $EndComp
 $Comp
 L GND #GND0115
 U 1 1 26B2121A
-P 3300 10600
-F 0 "#GND0115" H 3300 10700 60  0001 C CNN
-F 1 "GND" H 3300 10500 60  0000 C CNN
-F 2 "" H 3300 10600 60  0001 C CNN
-F 3 "" H 3300 10600 60  0001 C CNN
-	1    3300 10600
+P 3300 10650
+F 0 "#GND0115" H 3300 10750 60  0001 C CNN
+F 1 "GND" H 3300 10550 60  0001 C CNN
+F 2 "" H 3300 10650 60  0001 C CNN
+F 3 "" H 3300 10650 60  0001 C CNN
+	1    3300 10650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1002,12 +1001,12 @@ $EndComp
 $Comp
 L GND #GND0116
 U 1 1 26B21224
-P 4000 10600
-F 0 "#GND0116" H 4000 10700 60  0001 C CNN
-F 1 "GND" H 4000 10500 60  0000 C CNN
-F 2 "" H 4000 10600 60  0001 C CNN
-F 3 "" H 4000 10600 60  0001 C CNN
-	1    4000 10600
+P 4000 10650
+F 0 "#GND0116" H 4000 10750 60  0001 C CNN
+F 1 "GND" H 4000 10550 60  0001 C CNN
+F 2 "" H 4000 10650 60  0001 C CNN
+F 3 "" H 4000 10650 60  0001 C CNN
+	1    4000 10650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1619,89 +1618,89 @@ $EndComp
 $Comp
 L +5V #+0119
 U 1 1 4BF036A1
-P 1900 9400
-F 0 "#+0119" H 1900 9600 40  0001 C CNN
-F 1 "+5V" H 1900 9550 40  0000 C CNN
-F 2 "" H 1900 9400 60  0001 C CNN
-F 3 "" H 1900 9400 60  0001 C CNN
-	1    1900 9400
+P 1900 9350
+F 0 "#+0119" H 1900 9550 40  0001 C CNN
+F 1 "+5V" H 1900 9500 40  0000 C CNN
+F 2 "" H 1900 9350 60  0001 C CNN
+F 3 "" H 1900 9350 60  0001 C CNN
+	1    1900 9350
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0120
 U 1 1 4BF036A3
-P 2600 9400
-F 0 "#+0120" H 2600 9600 40  0001 C CNN
-F 1 "+5V" H 2600 9550 40  0000 C CNN
-F 2 "" H 2600 9400 60  0001 C CNN
-F 3 "" H 2600 9400 60  0001 C CNN
-	1    2600 9400
+P 2600 9350
+F 0 "#+0120" H 2600 9550 40  0001 C CNN
+F 1 "+5V" H 2600 9500 40  0000 C CNN
+F 2 "" H 2600 9350 60  0001 C CNN
+F 3 "" H 2600 9350 60  0001 C CNN
+	1    2600 9350
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0121
 U 1 1 4BF036A2
-P 3300 9400
-F 0 "#+0121" H 3300 9600 40  0001 C CNN
-F 1 "+5V" H 3300 9550 40  0000 C CNN
-F 2 "" H 3300 9400 60  0001 C CNN
-F 3 "" H 3300 9400 60  0001 C CNN
-	1    3300 9400
+P 3300 9350
+F 0 "#+0121" H 3300 9550 40  0001 C CNN
+F 1 "+5V" H 3300 9500 40  0000 C CNN
+F 2 "" H 3300 9350 60  0001 C CNN
+F 3 "" H 3300 9350 60  0001 C CNN
+	1    3300 9350
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0122
 U 1 1 4BF036A0
-P 4000 9400
-F 0 "#+0122" H 4000 9600 40  0001 C CNN
-F 1 "+5V" H 4000 9550 40  0000 C CNN
-F 2 "" H 4000 9400 60  0001 C CNN
-F 3 "" H 4000 9400 60  0001 C CNN
-	1    4000 9400
+P 4000 9350
+F 0 "#+0122" H 4000 9550 40  0001 C CNN
+F 1 "+5V" H 4000 9500 40  0000 C CNN
+F 2 "" H 4000 9350 60  0001 C CNN
+F 3 "" H 4000 9350 60  0001 C CNN
+	1    4000 9350
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0123
 U 1 1 4BF03698
-P 1900 10200
-F 0 "#+0123" H 1900 10400 40  0001 C CNN
-F 1 "+5V" H 1900 10350 40  0000 C CNN
-F 2 "" H 1900 10200 60  0001 C CNN
-F 3 "" H 1900 10200 60  0001 C CNN
-	1    1900 10200
+P 1900 10150
+F 0 "#+0123" H 1900 10350 40  0001 C CNN
+F 1 "+5V" H 1900 10300 40  0000 C CNN
+F 2 "" H 1900 10150 60  0001 C CNN
+F 3 "" H 1900 10150 60  0001 C CNN
+	1    1900 10150
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0124
 U 1 1 4BF03697
-P 2600 10200
-F 0 "#+0124" H 2600 10400 40  0001 C CNN
-F 1 "+5V" H 2600 10350 40  0000 C CNN
-F 2 "" H 2600 10200 60  0001 C CNN
-F 3 "" H 2600 10200 60  0001 C CNN
-	1    2600 10200
+P 2600 10150
+F 0 "#+0124" H 2600 10350 40  0001 C CNN
+F 1 "+5V" H 2600 10300 40  0000 C CNN
+F 2 "" H 2600 10150 60  0001 C CNN
+F 3 "" H 2600 10150 60  0001 C CNN
+	1    2600 10150
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0125
 U 1 1 4BF03696
-P 3300 10200
-F 0 "#+0125" H 3300 10400 40  0001 C CNN
-F 1 "+5V" H 3300 10350 40  0000 C CNN
-F 2 "" H 3300 10200 60  0001 C CNN
-F 3 "" H 3300 10200 60  0001 C CNN
-	1    3300 10200
+P 3300 10150
+F 0 "#+0125" H 3300 10350 40  0001 C CNN
+F 1 "+5V" H 3300 10300 40  0000 C CNN
+F 2 "" H 3300 10150 60  0001 C CNN
+F 3 "" H 3300 10150 60  0001 C CNN
+	1    3300 10150
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0126
 U 1 1 4BF03695
-P 4000 10200
-F 0 "#+0126" H 4000 10400 40  0001 C CNN
-F 1 "+5V" H 4000 10350 40  0000 C CNN
-F 2 "" H 4000 10200 60  0001 C CNN
-F 3 "" H 4000 10200 60  0001 C CNN
-	1    4000 10200
+P 4000 10150
+F 0 "#+0126" H 4000 10350 40  0001 C CNN
+F 1 "+5V" H 4000 10300 40  0000 C CNN
+F 2 "" H 4000 10150 60  0001 C CNN
+F 3 "" H 4000 10150 60  0001 C CNN
+	1    4000 10150
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1709,7 +1708,7 @@ L +3.3V #+0127
 U 1 1 4BF03694
 P 4500 3150
 F 0 "#+0127" H 4500 3350 40  0001 C CNN
-F 1 "+3.3V" H 4500 3300 40  0000 C CNN
+F 1 "+3.3V" V 4500 3350 40  0000 C CNN
 F 2 "" H 4500 3150 60  0001 C CNN
 F 3 "" H 4500 3150 60  0001 C CNN
 	1    4500 3150
@@ -1720,7 +1719,7 @@ L +3.3V #+0128
 U 1 1 4BF03693
 P 4500 5550
 F 0 "#+0128" H 4500 5750 40  0001 C CNN
-F 1 "+3.3V" H 4500 5700 40  0000 C CNN
+F 1 "+3.3V" V 4500 5750 40  0000 C CNN
 F 2 "" H 4500 5550 60  0001 C CNN
 F 3 "" H 4500 5550 60  0001 C CNN
 	1    4500 5550
@@ -1729,12 +1728,12 @@ $EndComp
 $Comp
 L +5V #+0129
 U 1 1 4BF03692
-P 700 8850
-F 0 "#+0129" H 700 9050 40  0001 C CNN
-F 1 "+5V" H 700 9000 40  0000 C CNN
-F 2 "" H 700 8850 60  0001 C CNN
-F 3 "" H 700 8850 60  0001 C CNN
-	1    700  8850
+P 700 8800
+F 0 "#+0129" H 700 9000 40  0001 C CNN
+F 1 "+5V" H 700 8950 40  0000 C CNN
+F 2 "" H 700 8800 60  0001 C CNN
+F 3 "" H 700 8800 60  0001 C CNN
+	1    700  8800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1742,7 +1741,7 @@ L +5V #+0130
 U 1 1 4BF036B5
 P 4900 1500
 F 0 "#+0130" H 4900 1590 20  0001 C CNN
-F 1 "+5V" H 4900 1590 30  0000 C CNN
+F 1 "+5V" H 4900 1590 40  0000 C CNN
 F 2 "" H 4900 1500 60  0001 C CNN
 F 3 "" H 4900 1500 60  0001 C CNN
 	1    4900 1500
@@ -1852,7 +1851,7 @@ L +3.3V #+0140
 U 1 1 4BF036BF
 P 2100 3550
 F 0 "#+0140" H 2100 3750 40  0001 C CNN
-F 1 "+3.3V" H 2100 3700 40  0000 C CNN
+F 1 "+3.3V" V 2150 3700 40  0000 C CNN
 F 2 "" H 2100 3550 60  0001 C CNN
 F 3 "" H 2100 3550 60  0001 C CNN
 	1    2100 3550
@@ -1863,7 +1862,7 @@ L +3.3V #+0141
 U 1 1 4BF036C0
 P 2100 4150
 F 0 "#+0141" H 2100 4350 40  0001 C CNN
-F 1 "+3.3V" H 2100 4300 40  0000 C CNN
+F 1 "+3.3V" V 2150 4300 40  0000 C CNN
 F 2 "" H 2100 4150 60  0001 C CNN
 F 3 "" H 2100 4150 60  0001 C CNN
 	1    2100 4150
@@ -1874,7 +1873,7 @@ L +3.3V #+0142
 U 1 1 4BF036C1
 P 2100 4650
 F 0 "#+0142" H 2100 4850 40  0001 C CNN
-F 1 "+3.3V" H 2100 4800 40  0000 C CNN
+F 1 "+3.3V" V 2150 4800 40  0000 C CNN
 F 2 "" H 2100 4650 60  0001 C CNN
 F 3 "" H 2100 4650 60  0001 C CNN
 	1    2100 4650
@@ -1885,7 +1884,7 @@ L +3.3V #+0143
 U 1 1 4BF036C2
 P 2100 5150
 F 0 "#+0143" H 2100 5350 40  0001 C CNN
-F 1 "+3.3V" H 2100 5300 40  0000 C CNN
+F 1 "+3.3V" V 2150 5350 40  0000 C CNN
 F 2 "" H 2100 5150 60  0001 C CNN
 F 3 "" H 2100 5150 60  0001 C CNN
 	1    2100 5150
@@ -1896,7 +1895,7 @@ L +3.3V #+0144
 U 1 1 4BF036C3
 P 2100 5350
 F 0 "#+0144" H 2100 5550 40  0001 C CNN
-F 1 "+3.3V" H 2100 5500 40  0000 C CNN
+F 1 "+3.3V" V 2150 5550 40  0000 C CNN
 F 2 "" H 2100 5350 60  0001 C CNN
 F 3 "" H 2100 5350 60  0001 C CNN
 	1    2100 5350
@@ -1907,7 +1906,7 @@ L +3.3V #+0145
 U 1 1 4BF036C4
 P 2100 6450
 F 0 "#+0145" H 2100 6650 40  0001 C CNN
-F 1 "+3.3V" H 2100 6600 40  0000 C CNN
+F 1 "+3.3V" V 2100 6650 40  0000 C CNN
 F 2 "" H 2100 6450 60  0001 C CNN
 F 3 "" H 2100 6450 60  0001 C CNN
 	1    2100 6450
@@ -1940,7 +1939,7 @@ L +5V #+0148
 U 1 1 4BF036A4
 P 2100 2950
 F 0 "#+0148" H 2100 3150 40  0001 C CNN
-F 1 "+5V" H 2100 3100 40  0000 C CNN
+F 1 "+5V" V 2100 3150 40  0000 C CNN
 F 2 "" H 2100 2950 60  0001 C CNN
 F 3 "" H 2100 2950 60  0001 C CNN
 	1    2100 2950
@@ -1951,7 +1950,7 @@ L +3.3V #+0149
 U 1 1 4BF036A5
 P 4500 6350
 F 0 "#+0149" H 4500 6550 40  0001 C CNN
-F 1 "+3.3V" H 4500 6500 40  0000 C CNN
+F 1 "+3.3V" V 4500 6550 40  0000 C CNN
 F 2 "" H 4500 6350 60  0001 C CNN
 F 3 "" H 4500 6350 60  0001 C CNN
 	1    4500 6350
@@ -1962,7 +1961,7 @@ L +3.3V #+0150
 U 1 1 4BF036A6
 P 4500 4950
 F 0 "#+0150" H 4500 5150 40  0001 C CNN
-F 1 "+3.3V" H 4500 5100 40  0000 C CNN
+F 1 "+3.3V" V 4500 5150 40  0000 C CNN
 F 2 "" H 4500 4950 60  0001 C CNN
 F 3 "" H 4500 4950 60  0001 C CNN
 	1    4500 4950
@@ -1973,7 +1972,7 @@ L +3.3V #+0151
 U 1 1 4BF036A7
 P 4500 4350
 F 0 "#+0151" H 4500 4550 40  0001 C CNN
-F 1 "+3.3V" H 4500 4500 40  0000 C CNN
+F 1 "+3.3V" V 4500 4550 40  0000 C CNN
 F 2 "" H 4500 4350 60  0001 C CNN
 F 3 "" H 4500 4350 60  0001 C CNN
 	1    4500 4350
@@ -1984,7 +1983,7 @@ L +3.3V #+0152
 U 1 1 4BF036A8
 P 4500 3750
 F 0 "#+0152" H 4500 3950 40  0001 C CNN
-F 1 "+3.3V" H 4500 3900 40  0000 C CNN
+F 1 "+3.3V" V 4500 3950 40  0000 C CNN
 F 2 "" H 4500 3750 60  0001 C CNN
 F 3 "" H 4500 3750 60  0001 C CNN
 	1    4500 3750
@@ -1995,7 +1994,7 @@ L +5V #+0153
 U 1 1 4BF036A9
 P 4600 6950
 F 0 "#+0153" H 4600 7150 40  0001 C CNN
-F 1 "+5V" H 4600 7100 40  0000 C CNN
+F 1 "+5V" V 4600 7100 40  0000 C CNN
 F 2 "" H 4600 6950 60  0001 C CNN
 F 3 "" H 4600 6950 60  0001 C CNN
 	1    4600 6950
@@ -2061,7 +2060,7 @@ L +5V #+0159
 U 1 1 4BF036AF
 P 4500 2650
 F 0 "#+0159" H 4500 2850 40  0001 C CNN
-F 1 "+5V" H 4500 2800 40  0000 C CNN
+F 1 "+5V" V 4500 2800 40  0000 C CNN
 F 2 "" H 4500 2650 60  0001 C CNN
 F 3 "" H 4500 2650 60  0001 C CNN
 	1    4500 2650
@@ -2108,10 +2107,10 @@ Connection ~ 4500 7150
 Connection ~ 11900 7350
 Connection ~ 11900 8250
 Connection ~ 6550 8950
-Connection ~ 6850 8950
+Connection ~ 6800 8950
 Connection ~ 4950 9450
 Connection ~ 4950 9550
-Connection ~ 6850 9650
+Connection ~ 6800 9650
 Connection ~ 7100 9750
 NoConn ~ 4400 1150
 NoConn ~ 2200 1250
@@ -2634,7 +2633,7 @@ Wire Wire Line
 Wire Bus Line
 	11600 850  11700 850 
 Wire Wire Line
-	700  8850 700  8950
+	700  8800 700  8950
 Wire Wire Line
 	700  9350 700  9450
 Wire Wire Line
@@ -2650,9 +2649,9 @@ Wire Wire Line
 Wire Wire Line
 	6550 8850 6550 9450
 Wire Wire Line
-	6850 8950 6850 9050
+	6800 8950 6800 9050
 Wire Wire Line
-	6850 9550 6850 9650
+	6800 9550 6800 9650
 Wire Wire Line
 	7100 8950 7100 9050
 Wire Wire Line
@@ -2678,23 +2677,87 @@ Wire Wire Line
 $Comp
 L GND #PWR0160
 U 1 1 54022E29
-P 5750 10050
-F 0 "#PWR0160" H 5750 10050 30  0001 C CNN
-F 1 "GND" H 5750 9980 30  0001 C CNN
-F 2 "" H 5750 10050 60  0000 C CNN
-F 3 "" H 5750 10050 60  0000 C CNN
-	1    5750 10050
+P 5750 10100
+F 0 "#PWR0160" H 5750 10100 30  0001 C CNN
+F 1 "GND" H 5750 10030 30  0001 C CNN
+F 2 "" H 5750 10100 60  0000 C CNN
+F 3 "" H 5750 10100 60  0000 C CNN
+	1    5750 10100
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #+0161
 U 1 1 54022EE0
-P 5750 9050
-F 0 "#+0161" H 5750 9250 40  0001 C CNN
-F 1 "+5V" H 5750 9200 40  0000 C CNN
-F 2 "" H 5750 9050 60  0001 C CNN
-F 3 "" H 5750 9050 60  0001 C CNN
-	1    5750 9050
+P 5750 9000
+F 0 "#+0161" H 5750 9200 40  0001 C CNN
+F 1 "+5V" H 5750 9150 40  0000 C CNN
+F 2 "" H 5750 9000 60  0001 C CNN
+F 3 "" H 5750 9000 60  0001 C CNN
+	1    5750 9000
 	1    0    0    -1  
 $EndComp
+Connection ~ 600  10200
+Connection ~ 1050 10200
+Connection ~ 700  8850
+Wire Wire Line
+	850  8800 850  8850
+Connection ~ 850  8850
+Wire Wire Line
+	4000 9350 4000 9400
+Wire Wire Line
+	3300 9350 3300 9400
+Wire Wire Line
+	2600 9400 2600 9350
+Wire Wire Line
+	1900 9350 1900 9400
+Wire Wire Line
+	4000 9850 4000 9800
+Wire Wire Line
+	3300 9850 3300 9800
+Wire Wire Line
+	2600 9850 2600 9800
+Wire Wire Line
+	1900 9800 1900 9850
+Wire Wire Line
+	4000 10150 4000 10200
+Wire Wire Line
+	3300 10200 3300 10150
+Wire Wire Line
+	2600 10150 2600 10200
+Wire Wire Line
+	1900 10150 1900 10200
+Wire Wire Line
+	1900 10600 1900 10650
+Wire Wire Line
+	2600 10600 2600 10650
+Wire Wire Line
+	3300 10600 3300 10650
+Wire Wire Line
+	4000 10600 4000 10650
+Wire Wire Line
+	5750 10050 5750 10100
+Wire Wire Line
+	5750 9000 5750 9050
+Wire Wire Line
+	2200 1350 2150 1350
+Wire Wire Line
+	2200 2550 2150 2550
+Wire Wire Line
+	2150 2750 2200 2750
+Wire Wire Line
+	2150 3250 2200 3250
+Wire Wire Line
+	2150 3850 2200 3850
+Wire Wire Line
+	2200 4450 2150 4450
+Wire Wire Line
+	2200 4850 2150 4850
+Wire Wire Line
+	2150 5650 2200 5650
+Wire Wire Line
+	2200 5950 2150 5950
+Wire Wire Line
+	2150 6750 2200 6750
+Wire Wire Line
+	12050 6700 12050 6650
 $EndSCHEMATC
diff --git a/demos/video/esvideo.sch b/demos/video/esvideo.sch
index d764d90..8da5240 100644
--- a/demos/video/esvideo.sch
+++ b/demos/video/esvideo.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 8 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
@@ -35,10 +35,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 NoConn ~ 11350 6250
-Text Label 5600 2200 0    60   ~ 0
+Text Label 5700 2200 0    60   ~ 0
 VAA
 Wire Wire Line
-	5550 2300 5550 2200
+	5650 2300 5650 2200
 Wire Wire Line
 	11350 6450 11900 6450
 Wire Wire Line
@@ -63,18 +63,15 @@ Text Label 4100 7100 0    60   ~ 0
 PCA1
 Text Label 4100 7000 0    60   ~ 0
 PCA0
-Connection ~ 9350 7750
-Wire Wire Line
-	9350 7650 9350 7800
 $Comp
 L GND #PWR0162
 U 1 1 33A566EB
-P 9350 7800
-F 0 "#PWR0162" H 9350 7800 40  0001 C CNN
-F 1 "GND" H 9350 7730 40  0000 C CNN
-F 2 "" H 9350 7800 60  0001 C CNN
-F 3 "" H 9350 7800 60  0001 C CNN
-	1    9350 7800
+P 9300 7800
+F 0 "#PWR0162" H 9300 7800 40  0001 C CNN
+F 1 "GND" H 9300 7730 40  0001 C CNN
+F 2 "" H 9300 7800 60  0001 C CNN
+F 3 "" H 9300 7800 60  0001 C CNN
+	1    9300 7800
 	1    0    0    -1  
 $EndComp
 Connection ~ 4350 3100
@@ -83,7 +80,7 @@ L GND #PWR0163
 U 1 1 3392D11C
 P 4350 4200
 F 0 "#PWR0163" H 4350 4200 40  0001 C CNN
-F 1 "GND" H 4350 4130 40  0000 C CNN
+F 1 "GND" H 4350 4130 40  0001 C CNN
 F 2 "" H 4350 4200 60  0001 C CNN
 F 3 "" H 4350 4200 60  0001 C CNN
 	1    4350 4200
@@ -95,13 +92,13 @@ Connection ~ 4350 3400
 Connection ~ 4350 3300
 Connection ~ 4350 3200
 Wire Wire Line
-	4450 3600 4350 3600
+	4350 3600 4450 3600
 Wire Wire Line
-	4450 3500 4350 3500
+	4350 3500 4450 3500
 Wire Wire Line
-	4450 3400 4350 3400
+	4350 3400 4450 3400
 Wire Wire Line
-	4450 3300 4350 3300
+	4350 3300 4450 3300
 Wire Wire Line
 	4450 3200 4350 3200
 Wire Wire Line
@@ -119,20 +116,20 @@ RED_IN
 $Comp
 L GND #PWR0164
 U 1 1 335F5DFC
-P 12000 5050
-F 0 "#PWR0164" H 12000 5050 40  0001 C CNN
-F 1 "GND" H 12000 4980 40  0000 C CNN
-F 2 "" H 12000 5050 60  0001 C CNN
-F 3 "" H 12000 5050 60  0001 C CNN
-	1    12000 5050
+P 12050 5050
+F 0 "#PWR0164" H 12050 5050 40  0001 C CNN
+F 1 "GND" H 12050 4980 40  0001 C CNN
+F 2 "" H 12050 5050 60  0001 C CNN
+F 3 "" H 12050 5050 60  0001 C CNN
+	1    12050 5050
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C32
 U 1 1 335F5DF2
 P 11800 5050
-F 0 "C32" V 11850 5200 50  0000 C CNN
-F 1 "100nF" V 11850 4900 50  0000 C CNN
+F 0 "C32" V 11650 5050 50  0000 C CNN
+F 1 "100nF" V 11950 5050 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 11800 5050 60  0001 C CNN
 F 3 "" H 11800 5050 60  0001 C CNN
 	1    11800 5050
@@ -147,9 +144,9 @@ Wire Wire Line
 Wire Wire Line
 	11500 4450 11350 4450
 Wire Wire Line
-	11350 4850 11450 4850
+	11450 4850 11350 4850
 Wire Wire Line
-	11450 4850 11450 3250
+	11450 3300 11450 4850
 Wire Wire Line
 	9350 7550 8950 7550
 Wire Wire Line
@@ -366,30 +363,30 @@ Wire Wire Line
 $Comp
 L GND #GND0165
 U 1 1 A458682C
-P 12750 4250
-F 0 "#GND0165" H 12750 4350 60  0001 C CNN
-F 1 "GND" H 12750 4150 60  0000 C CNN
-F 2 "" H 12750 4250 60  0001 C CNN
-F 3 "" H 12750 4250 60  0001 C CNN
-	1    12750 4250
+P 12850 4250
+F 0 "#GND0165" H 12850 4350 60  0001 C CNN
+F 1 "GND" H 12850 4150 60  0001 C CNN
+F 2 "" H 12850 4250 60  0001 C CNN
+F 3 "" H 12850 4250 60  0001 C CNN
+	1    12850 4250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R8
 U 1 1 A4586827
-P 12500 4250
-F 0 "R8" V 12580 4250 50  0000 C CNN
-F 1 "150" V 12500 4250 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 12500 4250 60  0001 C CNN
-F 3 "" H 12500 4250 60  0001 C CNN
-	1    12500 4250
+P 12550 4250
+F 0 "R8" V 12630 4250 50  0000 C CNN
+F 1 "150" V 12550 4250 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 12550 4250 60  0001 C CNN
+F 3 "" H 12550 4250 60  0001 C CNN
+	1    12550 4250
 	0    -1   -1   0   
 $EndComp
 Connection ~ 12150 4250
 Wire Wire Line
-	11350 4250 12250 4250
+	11350 4250 12300 4250
 Wire Wire Line
-	12150 4250 12150 2750
+	12150 2800 12150 4250
 Wire Wire Line
 	11450 4650 11350 4650
 Text HLabel 1500 1250 0    60   3State ~ 0
@@ -399,12 +396,12 @@ PCA[0..2]
 $Comp
 L GND #GND0166
 U 1 1 32FA0485
-P 5650 8200
-F 0 "#GND0166" H 5650 8200 40  0001 C CNN
-F 1 "GND" H 5650 8130 40  0000 C CNN
-F 2 "" H 5650 8200 60  0001 C CNN
-F 3 "" H 5650 8200 60  0001 C CNN
-	1    5650 8200
+P 5650 8250
+F 0 "#GND0166" H 5650 8250 40  0001 C CNN
+F 1 "GND" H 5650 8180 40  0001 C CNN
+F 2 "" H 5650 8250 60  0001 C CNN
+F 3 "" H 5650 8250 60  0001 C CNN
+	1    5650 8250
 	1    0    0    -1  
 $EndComp
 Text HLabel 1500 1050 0    60   3State ~ 0
@@ -413,11 +410,11 @@ Text HLabel 1500 950  0    60   3State ~ 0
 TVG[0..7]
 Text HLabel 1500 850  0    60   3State ~ 0
 TVR[0..7]
-Text HLabel 11350 5450 2    60   Input ~ 0
+Text HLabel 11400 5450 2    60   Input ~ 0
 CSYNCOUT-
-Text HLabel 11350 5650 2    60   Input ~ 0
+Text HLabel 11400 5650 2    60   Input ~ 0
 BLANK-
-Text HLabel 11350 5850 2    60   Input ~ 0
+Text HLabel 11400 5850 2    60   Input ~ 0
 CLKCDA
 Text HLabel 6650 4000 2    60   Input ~ 0
 CLAMP
@@ -435,30 +432,20 @@ Wire Wire Line
 $Comp
 L GND #GND0167
 U 1 1 32F9F3E8
-P 10450 8200
-F 0 "#GND0167" H 10450 8200 40  0001 C CNN
-F 1 "GND" H 10450 8130 40  0000 C CNN
-F 2 "" H 10450 8200 60  0001 C CNN
-F 3 "" H 10450 8200 60  0001 C CNN
-	1    10450 8200
+P 10450 8250
+F 0 "#GND0167" H 10450 8250 40  0001 C CNN
+F 1 "GND" H 10450 8180 40  0001 C CNN
+F 2 "" H 10450 8250 60  0001 C CNN
+F 3 "" H 10450 8250 60  0001 C CNN
+	1    10450 8250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	1700 6200 1800 6200
-Connection ~ 5550 2300
-Connection ~ 5450 2300
-Connection ~ 5450 8100
-Connection ~ 5550 8100
-Wire Wire Line
-	5650 8200 5650 8100
-Wire Wire Line
-	5650 8100 5350 8100
-Wire Wire Line
-	5650 2300 5350 2300
 Wire Wire Line
-	4450 2200 3850 2200
+	3800 2100 4450 2100
 Wire Wire Line
-	4450 2200 4450 2700
+	4450 2100 4450 2700
 Wire Wire Line
 	4350 2900 4450 2900
 Wire Wire Line
@@ -487,19 +474,13 @@ Wire Wire Line
 	4450 4200 4450 4400
 Wire Wire Line
 	4450 3800 4450 4000
-Text HLabel 9350 7250 0    60   Input ~ 0
+Text HLabel 9300 7250 0    60   Input ~ 0
 WRCDA-
-Text HLabel 9350 7150 0    60   Input ~ 0
+Text HLabel 9300 7150 0    60   Input ~ 0
 RDCDA-
-Connection ~ 10350 8150
-Connection ~ 10250 8150
 Connection ~ 10250 2750
 Connection ~ 10150 2750
 Wire Wire Line
-	10450 8200 10450 8150
-Wire Wire Line
-	10450 8150 10150 8150
-Wire Wire Line
 	4050 7200 4450 7200
 Text HLabel 4450 6800 0    60   Input ~ 0
 WRCAD-
@@ -528,11 +509,11 @@ F 3 "" H 5500 5200 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3850 2200 3850 2250
+	3800 2000 3800 2200
 Wire Wire Line
-	3850 2650 3850 2800
+	3800 2800 3800 2600
 Wire Wire Line
-	3850 2800 3800 2800
+	3750 2800 3850 2800
 Wire Wire Line
 	2750 6200 3000 6200
 Wire Wire Line
@@ -553,7 +534,7 @@ $Comp
 L R R42
 U 1 1 84DFB9D2
 P 12600 3000
-F 0 "R42" V 12680 3000 50  0000 C CNN
+F 0 "R42" H 12500 3200 50  0000 C CNN
 F 1 "75" V 12600 3000 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 12600 3000 60  0001 C CNN
 F 3 "" H 12600 3000 60  0001 C CNN
@@ -564,7 +545,7 @@ $Comp
 L R R43
 U 1 1 84DFB9D7
 P 12900 3000
-F 0 "R43" V 12980 3000 50  0000 C CNN
+F 0 "R43" H 12800 3200 50  0000 C CNN
 F 1 "75" V 12900 3000 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 12900 3000 60  0001 C CNN
 F 3 "" H 12900 3000 60  0001 C CNN
@@ -575,7 +556,7 @@ $Comp
 L R R44
 U 1 1 84DFB9DC
 P 13150 3000
-F 0 "R44" V 13230 3000 50  0000 C CNN
+F 0 "R44" H 13050 3200 50  0000 C CNN
 F 1 "75" V 13150 3000 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 13150 3000 60  0001 C CNN
 F 3 "" H 13150 3000 60  0001 C CNN
@@ -585,45 +566,45 @@ $EndComp
 $Comp
 L C C33
 U 1 1 84DFBA31
-P 9350 2550
-F 0 "C33" V 9400 2700 50  0000 C CNN
-F 1 "100nF" V 9400 2400 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9350 2550 60  0001 C CNN
-F 3 "" H 9350 2550 60  0001 C CNN
-	1    9350 2550
+P 9350 2500
+F 0 "C33" H 9500 2600 50  0000 C CNN
+F 1 "100nF" H 9500 2400 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9350 2500 60  0001 C CNN
+F 3 "" H 9350 2500 60  0001 C CNN
+	1    9350 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C34
 U 1 1 84DFBA36
-P 11650 2550
-F 0 "C34" V 11700 2700 50  0000 C CNN
-F 1 "100nF" V 11700 2400 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 11650 2550 60  0001 C CNN
-F 3 "" H 11650 2550 60  0001 C CNN
-	1    11650 2550
+P 11650 2600
+F 0 "C34" H 11800 2700 50  0000 C CNN
+F 1 "100nF" H 11800 2500 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 11650 2600 60  0001 C CNN
+F 3 "" H 11650 2600 60  0001 C CNN
+	1    11650 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C42
 U 1 1 84DFBAEF
-P 12150 2550
-F 0 "C42" H 12250 2700 50  0000 C CNN
-F 1 "2,2uF" H 12250 2400 50  0000 C CNN
-F 2 "lib_smd:SM1210L" H 12150 2550 60  0001 C CNN
-F 3 "" H 12150 2550 60  0001 C CNN
-	1    12150 2550
+P 12150 2600
+F 0 "C42" H 12300 2700 50  0000 C CNN
+F 1 "2.2uF" H 12300 2500 50  0000 C CNN
+F 2 "lib_smd:SM1210L" H 12150 2600 60  0001 C CNN
+F 3 "" H 12150 2600 60  0001 C CNN
+	1    12150 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C35
 U 1 1 84DFBB21
-P 11450 3050
-F 0 "C35" V 11500 3200 50  0000 C CNN
-F 1 "100nF" V 11500 2900 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 11450 3050 60  0001 C CNN
-F 3 "" H 11450 3050 60  0001 C CNN
-	1    11450 3050
+P 11450 3100
+F 0 "C35" H 11600 3200 50  0000 C CNN
+F 1 "100nF" H 11600 3000 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 11450 3100 60  0001 C CNN
+F 3 "" H 11450 3100 60  0001 C CNN
+	1    11450 3100
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -631,7 +612,7 @@ L GND #GND0168
 U 1 1 684863B9
 P 9350 2750
 F 0 "#GND0168" H 9350 2850 60  0001 C CNN
-F 1 "GND" H 9350 2650 60  0000 C CNN
+F 1 "GND" H 9350 2650 60  0001 C CNN
 F 2 "" H 9350 2750 60  0001 C CNN
 F 3 "" H 9350 2750 60  0001 C CNN
 	1    9350 2750
@@ -642,7 +623,7 @@ L GND #GND0169
 U 1 1 684863BE
 P 9850 2750
 F 0 "#GND0169" H 9850 2850 60  0001 C CNN
-F 1 "GND" H 9850 2650 60  0000 C CNN
+F 1 "GND" H 9850 2650 60  0001 C CNN
 F 2 "" H 9850 2750 60  0001 C CNN
 F 3 "" H 9850 2750 60  0001 C CNN
 	1    9850 2750
@@ -651,34 +632,34 @@ $EndComp
 $Comp
 L GND #GND0170
 U 1 1 684863C3
-P 12600 2750
-F 0 "#GND0170" H 12600 2850 60  0001 C CNN
-F 1 "GND" H 12600 2650 60  0000 C CNN
-F 2 "" H 12600 2750 60  0001 C CNN
-F 3 "" H 12600 2750 60  0001 C CNN
-	1    12600 2750
+P 12600 2700
+F 0 "#GND0170" H 12600 2800 60  0001 C CNN
+F 1 "GND" H 12600 2600 60  0001 C CNN
+F 2 "" H 12600 2700 60  0001 C CNN
+F 3 "" H 12600 2700 60  0001 C CNN
+	1    12600 2700
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #GND0171
 U 1 1 684863C8
-P 12900 2750
-F 0 "#GND0171" H 12900 2850 60  0001 C CNN
-F 1 "GND" H 12900 2650 60  0000 C CNN
-F 2 "" H 12900 2750 60  0001 C CNN
-F 3 "" H 12900 2750 60  0001 C CNN
-	1    12900 2750
+P 12900 2700
+F 0 "#GND0171" H 12900 2800 60  0001 C CNN
+F 1 "GND" H 12900 2600 60  0001 C CNN
+F 2 "" H 12900 2700 60  0001 C CNN
+F 3 "" H 12900 2700 60  0001 C CNN
+	1    12900 2700
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #GND0172
 U 1 1 684863CD
-P 13150 2750
-F 0 "#GND0172" H 13150 2850 60  0001 C CNN
-F 1 "GND" H 13150 2650 60  0000 C CNN
-F 2 "" H 13150 2750 60  0001 C CNN
-F 3 "" H 13150 2750 60  0001 C CNN
-	1    13150 2750
+P 13150 2700
+F 0 "#GND0172" H 13150 2800 60  0001 C CNN
+F 1 "GND" H 13150 2600 60  0001 C CNN
+F 2 "" H 13150 2700 60  0001 C CNN
+F 3 "" H 13150 2700 60  0001 C CNN
+	1    13150 2700
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -728,34 +709,34 @@ $EndComp
 $Comp
 L GND #GND0174
 U 1 1 A44C0393
-P 2300 5000
-F 0 "#GND0174" H 2300 5100 60  0001 C CNN
-F 1 "GND" H 2300 4900 60  0000 C CNN
-F 2 "" H 2300 5000 60  0001 C CNN
-F 3 "" H 2300 5000 60  0001 C CNN
-	1    2300 5000
+P 2350 5000
+F 0 "#GND0174" H 2350 5100 60  0001 C CNN
+F 1 "GND" H 2350 4900 60  0001 C CNN
+F 2 "" H 2350 5000 60  0001 C CNN
+F 3 "" H 2350 5000 60  0001 C CNN
+	1    2350 5000
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #GND0175
 U 1 1 A44C0398
-P 2300 5800
-F 0 "#GND0175" H 2300 5900 60  0001 C CNN
-F 1 "GND" H 2300 5700 60  0000 C CNN
-F 2 "" H 2300 5800 60  0001 C CNN
-F 3 "" H 2300 5800 60  0001 C CNN
-	1    2300 5800
+P 2350 5800
+F 0 "#GND0175" H 2350 5900 60  0001 C CNN
+F 1 "GND" H 2350 5700 60  0001 C CNN
+F 2 "" H 2350 5800 60  0001 C CNN
+F 3 "" H 2350 5800 60  0001 C CNN
+	1    2350 5800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #GND0176
 U 1 1 A44C039D
-P 2300 6600
-F 0 "#GND0176" H 2300 6700 60  0001 C CNN
-F 1 "GND" H 2300 6500 60  0000 C CNN
-F 2 "" H 2300 6600 60  0001 C CNN
-F 3 "" H 2300 6600 60  0001 C CNN
-	1    2300 6600
+P 2350 6600
+F 0 "#GND0176" H 2350 6700 60  0001 C CNN
+F 1 "GND" H 2350 6500 60  0001 C CNN
+F 2 "" H 2350 6600 60  0001 C CNN
+F 3 "" H 2350 6600 60  0001 C CNN
+	1    2350 6600
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -772,56 +753,56 @@ $EndComp
 $Comp
 L GND #GND0177
 U 1 1 A44C03B1
-P 3850 2900
-F 0 "#GND0177" H 3850 3000 60  0001 C CNN
-F 1 "GND" H 3850 2800 60  0000 C CNN
-F 2 "" H 3850 2900 60  0001 C CNN
-F 3 "" H 3850 2900 60  0001 C CNN
-	1    3850 2900
+P 3800 2900
+F 0 "#GND0177" H 3800 3000 60  0001 C CNN
+F 1 "GND" H 3800 2800 60  0001 C CNN
+F 2 "" H 3800 2900 60  0001 C CNN
+F 3 "" H 3800 2900 60  0001 C CNN
+	1    3800 2900
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND0178
 U 1 1 A44D982F
-P 3850 1700
-F 0 "#GND0178" H 3850 1800 60  0001 C CNN
-F 1 "GND" H 3850 1600 60  0000 C CNN
-F 2 "" H 3850 1700 60  0001 C CNN
-F 3 "" H 3850 1700 60  0001 C CNN
-	1    3850 1700
+P 3800 1450
+F 0 "#GND0178" H 3800 1550 60  0001 C CNN
+F 1 "GND" H 3800 1350 60  0001 C CNN
+F 2 "" H 3800 1450 60  0001 C CNN
+F 3 "" H 3800 1450 60  0001 C CNN
+	1    3800 1450
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R15
 U 1 1 A44D982A
-P 3850 1950
-F 0 "R15" V 3930 1950 50  0000 C CNN
-F 1 "1M" V 3850 1950 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3850 1950 60  0001 C CNN
-F 3 "" H 3850 1950 60  0001 C CNN
-	1    3850 1950
+P 3800 1750
+F 0 "R15" V 3880 1750 50  0000 C CNN
+F 1 "1M" V 3800 1750 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 3800 1750 60  0001 C CNN
+F 3 "" H 3800 1750 60  0001 C CNN
+	1    3800 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND0179
 U 1 1 A44D9852
-P 3400 2800
-F 0 "#GND0179" H 3400 2900 60  0001 C CNN
-F 1 "GND" H 3400 2700 60  0000 C CNN
-F 2 "" H 3400 2800 60  0001 C CNN
-F 3 "" H 3400 2800 60  0001 C CNN
-	1    3400 2800
+P 3300 2800
+F 0 "#GND0179" H 3300 2900 60  0001 C CNN
+F 1 "GND" H 3300 2700 60  0001 C CNN
+F 2 "" H 3300 2800 60  0001 C CNN
+F 3 "" H 3300 2800 60  0001 C CNN
+	1    3300 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L C C36
 U 1 1 A44D9848
-P 3850 2450
-F 0 "C36" V 3900 2600 50  0000 C CNN
-F 1 "100nF" V 3900 2300 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3850 2450 60  0001 C CNN
-F 3 "" H 3850 2450 60  0001 C CNN
-	1    3850 2450
+P 3800 2400
+F 0 "C36" H 3950 2500 50  0000 C CNN
+F 1 "100nF" H 3950 2300 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 3800 2400 60  0001 C CNN
+F 3 "" H 3800 2400 60  0001 C CNN
+	1    3800 2400
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -838,12 +819,12 @@ $EndComp
 $Comp
 L C C37
 U 1 1 A44D984D
-P 3600 2800
-F 0 "C37" V 3650 2950 50  0000 C CNN
-F 1 "100pF" V 3650 2650 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3600 2800 60  0001 C CNN
-F 3 "" H 3600 2800 60  0001 C CNN
-	1    3600 2800
+P 3550 2800
+F 0 "C37" V 3800 2800 50  0000 C CNN
+F 1 "100pF" V 3700 2800 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 3550 2800 60  0001 C CNN
+F 3 "" H 3550 2800 60  0001 C CNN
+	1    3550 2800
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -883,8 +864,8 @@ $Comp
 L C C39
 U 1 1 A44C037F
 P 2550 4600
-F 0 "C39" V 2600 4750 50  0000 C CNN
-F 1 "1uF" V 2600 4450 50  0000 C CNN
+F 0 "C39" V 2400 4600 50  0000 C CNN
+F 1 "1uF" V 2700 4600 50  0000 C CNN
 F 2 "lib_smd:SM1210L" H 2550 4600 60  0001 C CNN
 F 3 "" H 2550 4600 60  0001 C CNN
 	1    2550 4600
@@ -894,8 +875,8 @@ $Comp
 L C C40
 U 1 1 A44C0384
 P 2550 5400
-F 0 "C40" V 2600 5550 50  0000 C CNN
-F 1 "1uF" V 2600 5250 50  0000 C CNN
+F 0 "C40" V 2400 5400 50  0000 C CNN
+F 1 "1uF" V 2700 5400 50  0000 C CNN
 F 2 "lib_smd:SM1210L" H 2550 5400 60  0001 C CNN
 F 3 "" H 2550 5400 60  0001 C CNN
 	1    2550 5400
@@ -905,8 +886,8 @@ $Comp
 L C C41
 U 1 1 A44C0389
 P 2550 6200
-F 0 "C41" V 2600 6350 50  0000 C CNN
-F 1 "1uF" V 2600 6050 50  0000 C CNN
+F 0 "C41" V 2400 6200 50  0000 C CNN
+F 1 "1uF" V 2700 6200 50  0000 C CNN
 F 2 "lib_smd:SM1210L" H 2550 6200 60  0001 C CNN
 F 3 "" H 2550 6200 60  0001 C CNN
 	1    2550 6200
@@ -915,45 +896,45 @@ $EndComp
 $Comp
 L GND #GND0180
 U 1 1 26FC0C80
-P 6250 2200
-F 0 "#GND0180" H 6250 2300 60  0001 C CNN
-F 1 "GND" H 6250 2100 60  0000 C CNN
-F 2 "" H 6250 2200 60  0001 C CNN
-F 3 "" H 6250 2200 60  0001 C CNN
-	1    6250 2200
+P 6400 2200
+F 0 "#GND0180" H 6400 2300 60  0001 C CNN
+F 1 "GND" H 6400 2100 60  0001 C CNN
+F 2 "" H 6400 2200 60  0001 C CNN
+F 3 "" H 6400 2200 60  0001 C CNN
+	1    6400 2200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CP C52
 U 1 1 84DFB9B9
-P 6050 2200
-F 0 "C52" H 6150 2350 50  0000 C CNN
-F 1 "22uF" H 6150 2050 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 6050 2200 60  0001 C CNN
-F 3 "" H 6050 2200 60  0001 C CNN
-	1    6050 2200
+P 6150 2200
+F 0 "C52" V 6300 2200 50  0000 C CNN
+F 1 "22uF" V 6000 2200 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 6150 2200 60  0001 C CNN
+F 3 "" H 6150 2200 60  0001 C CNN
+	1    6150 2200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CP C51
 U 1 1 28ED6A43
-P 9850 2550
-F 0 "C51" H 9950 2700 50  0000 C CNN
-F 1 "22uF" H 9950 2400 50  0000 C CNN
-F 2 "lib_smd:SM1210L" H 9850 2550 60  0001 C CNN
-F 3 "" H 9850 2550 60  0001 C CNN
-	1    9850 2550
+P 9850 2500
+F 0 "C51" H 10000 2600 50  0000 C CNN
+F 1 "22uF" H 10000 2400 50  0000 C CNN
+F 2 "lib_smd:SM1210L" H 9850 2500 60  0001 C CNN
+F 3 "" H 9850 2500 60  0001 C CNN
+	1    9850 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L5
 U 1 1 84DFBB99
-P 11450 1950
-F 0 "L5" V 11400 1950 40  0000 C CNN
-F 1 "22uH" V 11550 1950 40  0000 C CNN
-F 2 "lib_smd:SM1812" H 11450 1950 60  0001 C CNN
-F 3 "" H 11450 1950 60  0001 C CNN
-	1    11450 1950
+P 12150 1800
+F 0 "L5" H 12350 1850 50  0000 C CNN
+F 1 "22uH" H 12350 1750 50  0000 C CNN
+F 2 "lib_smd:SM1812" H 12150 1800 60  0001 C CNN
+F 3 "" H 12150 1800 60  0001 C CNN
+	1    12150 1800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -970,15 +951,15 @@ $EndComp
 $Comp
 L GND #GND0181
 U 1 1 5D7688FD
-P 3450 3100
-F 0 "#GND0181" H 3450 3200 60  0001 C CNN
-F 1 "GND" H 3450 3000 60  0000 C CNN
-F 2 "" H 3450 3100 60  0001 C CNN
-F 3 "" H 3450 3100 60  0001 C CNN
-	1    3450 3100
+P 3400 3100
+F 0 "#GND0181" H 3400 3200 60  0001 C CNN
+F 1 "GND" H 3400 3000 60  0001 C CNN
+F 2 "" H 3400 3100 60  0001 C CNN
+F 3 "" H 3400 3100 60  0001 C CNN
+	1    3400 3100
 	0    1    1    0   
 $EndComp
-Text Label 10550 2350 0    60   ~ 0
+Text Label 10550 2200 0    60   ~ 0
 VAA
 Text HLabel 13450 3450 2    60   Output ~ 0
 RED
@@ -1023,34 +1004,30 @@ REF+
 $Comp
 L VCC #VCC0182
 U 1 1 4BF036B4
-P 11450 1650
-F 0 "#VCC0182" H 11450 1850 40  0001 C CNN
-F 1 "VCC" H 11450 1800 40  0000 C CNN
-F 2 "" H 11450 1650 60  0001 C CNN
-F 3 "" H 11450 1650 60  0001 C CNN
-	1    11450 1650
+P 12150 1450
+F 0 "#VCC0182" H 12150 1650 40  0001 C CNN
+F 1 "VCC" H 12150 1600 40  0000 C CNN
+F 2 "" H 12150 1450 60  0001 C CNN
+F 3 "" H 12150 1450 60  0001 C CNN
+	1    12150 1450
 	1    0    0    -1  
 $EndComp
-Connection ~ 9850 2350
-Connection ~ 10550 2350
-Connection ~ 11450 2350
-Connection ~ 11650 2350
+Connection ~ 9850 2200
+Connection ~ 10550 2200
+Connection ~ 11450 2200
+Connection ~ 11650 2200
 Connection ~ 10350 2750
 Connection ~ 10450 2750
 Connection ~ 12600 3450
 Connection ~ 12900 3650
 Connection ~ 13150 3850
 Wire Wire Line
-	5550 2200 5850 2200
+	5350 2200 5950 2200
 Wire Wire Line
-	9350 2350 12150 2350
+	9350 2200 12150 2200
 Wire Wire Line
 	10050 2750 10550 2750
 Wire Wire Line
-	12150 2750 11650 2750
-Wire Wire Line
-	11450 2250 11450 2850
-Wire Wire Line
 	11350 3450 13450 3450
 Wire Wire Line
 	3950 3100 4450 3100
@@ -1101,17 +1078,131 @@ Wire Wire Line
 Wire Wire Line
 	4050 7100 4450 7100
 Wire Wire Line
-	1800 4600 1800 5000
-Wire Wire Line
-	1800 5400 1800 5800
-Wire Wire Line
-	1800 6200 1800 6600
-Wire Wire Line
 	2900 4700 2900 5400
 Wire Wire Line
 	3000 4800 3000 6200
 Wire Wire Line
-	10550 2750 10550 2350
+	10550 2750 10550 2200
 Wire Wire Line
 	12600 3250 12600 3450
+Wire Wire Line
+	1750 5400 1750 5800
+Wire Wire Line
+	1750 5800 1800 5800
+Connection ~ 1750 5400
+Wire Wire Line
+	1750 6200 1750 6600
+Wire Wire Line
+	1750 6600 1800 6600
+Connection ~ 1750 6200
+Wire Wire Line
+	1750 4600 1750 5000
+Wire Wire Line
+	1750 5000 1800 5000
+Connection ~ 1750 4600
+Connection ~ 3800 2100
+Connection ~ 3800 2800
+Connection ~ 6550 4600
+Connection ~ 6550 4400
+Connection ~ 6550 4000
+Wire Wire Line
+	12150 2100 12150 2400
+Connection ~ 12150 2200
+Wire Wire Line
+	11450 2200 11450 2900
+Wire Wire Line
+	11650 2900 12150 2900
+Connection ~ 12150 2900
+Wire Wire Line
+	13150 2750 13150 2700
+Wire Wire Line
+	12900 2700 12900 2750
+Wire Wire Line
+	12600 2750 12600 2700
+Wire Wire Line
+	11650 2800 11650 2900
+Wire Wire Line
+	11650 2200 11650 2400
+Wire Wire Line
+	9850 2300 9850 2200
+Wire Wire Line
+	9850 2750 9850 2700
+Wire Wire Line
+	9350 2300 9350 2200
+Wire Wire Line
+	9350 2700 9350 2750
+Wire Wire Line
+	12850 4250 12800 4250
+Wire Wire Line
+	12050 5050 12000 5050
+Wire Wire Line
+	11400 5650 11350 5650
+Wire Wire Line
+	11400 5450 11350 5450
+Wire Wire Line
+	11400 5850 11350 5850
+Wire Wire Line
+	10450 8150 10450 8250
+Wire Wire Line
+	10150 8200 10450 8200
+Wire Wire Line
+	10350 8200 10350 8150
+Connection ~ 10450 8200
+Wire Wire Line
+	10250 8200 10250 8150
+Connection ~ 10350 8200
+Wire Wire Line
+	10150 8200 10150 8150
+Connection ~ 10250 8200
+Wire Wire Line
+	9300 7650 9300 7800
+Wire Wire Line
+	9300 7650 9350 7650
+Wire Wire Line
+	9350 7750 9300 7750
+Connection ~ 9300 7750
+Wire Wire Line
+	9300 7150 9350 7150
+Wire Wire Line
+	9350 7250 9300 7250
+Wire Wire Line
+	5650 8100 5650 8250
+Wire Wire Line
+	5350 8150 5650 8150
+Wire Wire Line
+	5350 8150 5350 8100
+Connection ~ 5650 8150
+Wire Wire Line
+	5450 8100 5450 8150
+Connection ~ 5450 8150
+Wire Wire Line
+	5550 8100 5550 8150
+Connection ~ 5550 8150
+Wire Wire Line
+	2300 6600 2350 6600
+Wire Wire Line
+	2350 5800 2300 5800
+Wire Wire Line
+	2350 5000 2300 5000
+Wire Wire Line
+	3400 3100 3450 3100
+Wire Wire Line
+	3300 2800 3350 2800
+Wire Wire Line
+	3800 2900 3850 2900
+Wire Wire Line
+	3800 1500 3800 1450
+Wire Wire Line
+	5550 2200 5550 2300
+Connection ~ 5650 2200
+Wire Wire Line
+	5450 2200 5450 2300
+Connection ~ 5550 2200
+Wire Wire Line
+	5350 2200 5350 2300
+Connection ~ 5450 2200
+Wire Wire Line
+	6400 2200 6350 2200
+Wire Wire Line
+	12150 1450 12150 1500
 $EndSCHEMATC
diff --git a/demos/video/graphic.sch b/demos/video/graphic.sch
index 010ca41..ba29df5 100644
--- a/demos/video/graphic.sch
+++ b/demos/video/graphic.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 5 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Xilinxs"
@@ -34,8 +34,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 2400 2050 0    60   ~ 0
-PROG*
 Text Label 3100 1900 0    60   ~ 0
 DONE
 Text Label 3050 2000 0    60   ~ 0
@@ -53,20 +51,20 @@ RESERV1
 $Comp
 L GND #PWR057
 U 1 1 34E1752B
-P 4850 950
-F 0 "#PWR057" H 4850 950 40  0001 C CNN
-F 1 "GND" H 4850 880 40  0000 C CNN
-F 2 "" H 4850 950 60  0001 C CNN
-F 3 "" H 4850 950 60  0001 C CNN
-	1    4850 950 
+P 4850 1000
+F 0 "#PWR057" H 4850 1000 40  0001 C CNN
+F 1 "GND" H 4850 930 40  0001 C CNN
+F 2 "" H 4850 1000 60  0001 C CNN
+F 3 "" H 4850 1000 60  0001 C CNN
+	1    4850 1000
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_1 P12
 U 1 1 34E1751D
 P 4850 800
-F 0 "P12" H 4930 800 40  0000 C CNN
-F 1 "CONN_1" H 4800 840 30  0000 C CNN
+F 0 "P12" V 5050 800 50  0000 C CNN
+F 1 "CONN_1" V 4950 800 50  0000 C CNN
 F 2 "connect:TESTPOINT" H 4850 800 60  0001 C CNN
 F 3 "" H 4850 800 60  0001 C CNN
 	1    4850 800 
@@ -83,8 +81,8 @@ $Comp
 L CONN_1 P9
 U 1 1 34E1718B
 P 5850 5500
-F 0 "P9" H 5930 5500 40  0000 C CNN
-F 1 "CONN_1" H 5800 5540 30  0000 C CNN
+F 0 "P9" H 5850 5400 50  0000 C CNN
+F 1 "CONN_1" H 5850 5300 50  0000 C CNN
 F 2 "connect:PINTST" H 5850 5500 60  0001 C CNN
 F 3 "" H 5850 5500 60  0001 C CNN
 	1    5850 5500
@@ -94,8 +92,8 @@ $Comp
 L CONN_1 P11
 U 1 1 4BF036DA
 P 6400 3400
-F 0 "P11" H 6480 3400 40  0000 C CNN
-F 1 "CONN_1" H 6350 3440 30  0000 C CNN
+F 0 "P11" H 6400 3550 50  0000 C CNN
+F 1 "CONN_1" H 6400 3450 50  0000 C CNN
 F 2 "connect:PINTST" H 6400 3400 60  0001 C CNN
 F 3 "" H 6400 3400 60  0001 C CNN
 	1    6400 3400
@@ -105,8 +103,8 @@ $Comp
 L CONN_1 P10
 U 1 1 4BF036D9
 P 6400 2800
-F 0 "P10" H 6480 2800 40  0000 C CNN
-F 1 "CONN_1" H 6350 2840 30  0000 C CNN
+F 0 "P10" H 6400 2950 50  0000 C CNN
+F 1 "CONN_1" H 6400 2850 50  0000 C CNN
 F 2 "connect:PINTST" H 6400 2800 60  0001 C CNN
 F 3 "" H 6400 2800 60  0001 C CNN
 	1    6400 2800
@@ -120,7 +118,7 @@ Wire Wire Line
 	14100 5600 14600 5600
 NoConn ~ 14100 8200
 Wire Wire Line
-	8200 5500 6750 5500
+	8200 5500 6700 5500
 Connection ~ 8200 5500
 Text Label 5600 3500 0    60   ~ 0
 LED
@@ -137,7 +135,7 @@ NoConn ~ 5550 4700
 NoConn ~ 5550 4300
 NoConn ~ 5550 1700
 Wire Wire Line
-	6750 5500 6750 5400
+	6700 5500 6700 5400
 $Comp
 L XC4005-PQ100 U23
 U 1 1 33BA5628
@@ -210,9 +208,9 @@ Wire Wire Line
 Wire Wire Line
 	11300 3600 11900 3600
 Wire Wire Line
-	6750 5400 5550 5400
+	6700 5400 5550 5400
 Wire Wire Line
-	5550 5300 6750 5300
+	5550 5300 6700 5300
 Text Label 5600 5300 0    60   ~ 0
 CLK10MHz
 Text Label 11500 4900 0    60   ~ 0
@@ -254,19 +252,51 @@ Wire Wire Line
 Wire Wire Line
 	5800 10700 5800 10650
 Wire Wire Line
-	6150 10650 6150 10700
+	6150 10700 6150 10650
+Wire Wire Line
+	2750 10700 3100 10700
+Wire Wire Line
+	3100 10700 3500 10700
+Wire Wire Line
+	3500 10700 3850 10700
+Wire Wire Line
+	3850 10700 4200 10700
+Wire Wire Line
+	4200 10700 4550 10700
+Wire Wire Line
+	4550 10700 5100 10700
+Wire Wire Line
+	5100 10700 5450 10700
+Wire Wire Line
+	5450 10700 5800 10700
+Wire Wire Line
+	5800 10700 6150 10700
+Wire Wire Line
+	5100 10200 5100 10250
+Wire Wire Line
+	5450 10200 5450 10250
+Wire Wire Line
+	5800 10200 5800 10250
+Wire Wire Line
+	6150 10200 6150 10250
 Wire Wire Line
-	6150 10700 2750 10700
+	2750 10200 3100 10200
 Wire Wire Line
-	5100 10250 5100 10200
+	3100 10200 3500 10200
 Wire Wire Line
-	5450 10250 5450 10200
+	3500 10200 3850 10200
 Wire Wire Line
-	5800 10250 5800 10200
+	3850 10200 4200 10200
 Wire Wire Line
-	6150 10250 6150 10200
+	4200 10200 4550 10200
 Wire Wire Line
-	6150 10200 2750 10200
+	4550 10200 5100 10200
+Wire Wire Line
+	5100 10200 5450 10200
+Wire Wire Line
+	5450 10200 5800 10200
+Wire Wire Line
+	5800 10200 6150 10200
 Connection ~ 5800 10200
 Connection ~ 5450 10200
 Connection ~ 4550 10200
@@ -279,8 +309,8 @@ $Comp
 L C C73
 U 1 1 33AFD8EF
 P 6150 10450
-F 0 "C73" V 6200 10600 50  0000 C CNN
-F 1 "100nF" V 6200 10300 50  0000 C CNN
+F 0 "C73" H 6300 10550 50  0000 C CNN
+F 1 "100nF" H 6300 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 6150 10450 60  0001 C CNN
 F 3 "" H 6150 10450 60  0001 C CNN
 	1    6150 10450
@@ -290,8 +320,8 @@ $Comp
 L C C72
 U 1 1 33AFD8ED
 P 5800 10450
-F 0 "C72" V 5850 10600 50  0000 C CNN
-F 1 "100nF" V 5850 10300 50  0000 C CNN
+F 0 "C72" H 5950 10550 50  0000 C CNN
+F 1 "100nF" H 5950 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 5800 10450 60  0001 C CNN
 F 3 "" H 5800 10450 60  0001 C CNN
 	1    5800 10450
@@ -301,8 +331,8 @@ $Comp
 L C C71
 U 1 1 33AFD8E9
 P 5450 10450
-F 0 "C71" V 5500 10600 50  0000 C CNN
-F 1 "100nF" V 5500 10300 50  0000 C CNN
+F 0 "C71" H 5600 10550 50  0000 C CNN
+F 1 "100nF" H 5600 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 5450 10450 60  0001 C CNN
 F 3 "" H 5450 10450 60  0001 C CNN
 	1    5450 10450
@@ -312,8 +342,8 @@ $Comp
 L C C70
 U 1 1 33AFD8AF
 P 5100 10450
-F 0 "C70" V 5150 10600 50  0000 C CNN
-F 1 "100nF" V 5150 10300 50  0000 C CNN
+F 0 "C70" H 5250 10550 50  0000 C CNN
+F 1 "100nF" H 5250 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 5100 10450 60  0001 C CNN
 F 3 "" H 5100 10450 60  0001 C CNN
 	1    5100 10450
@@ -517,12 +547,12 @@ ACCES_RAM-
 $Comp
 L GND #PWR058
 U 1 1 33A80097
-P 2800 1150
-F 0 "#PWR058" H 2800 1150 40  0001 C CNN
-F 1 "GND" H 2800 1080 40  0000 C CNN
-F 2 "" H 2800 1150 60  0001 C CNN
-F 3 "" H 2800 1150 60  0001 C CNN
-	1    2800 1150
+P 2800 1200
+F 0 "#PWR058" H 2800 1200 40  0001 C CNN
+F 1 "GND" H 2800 1130 40  0001 C CNN
+F 2 "" H 2800 1200 60  0001 C CNN
+F 3 "" H 2800 1200 60  0001 C CNN
+	1    2800 1200
 	1    0    0    -1  
 $EndComp
 NoConn ~ 3450 2100
@@ -543,36 +573,42 @@ Connection ~ 3450 1600
 $Comp
 L VCC #PWR059
 U 1 1 33A7E12B
-P 4000 1250
-F 0 "#PWR059" H 4000 1450 40  0001 C CNN
-F 1 "VCC" H 4000 1400 40  0000 C CNN
-F 2 "" H 4000 1250 60  0001 C CNN
-F 3 "" H 4000 1250 60  0001 C CNN
-	1    4000 1250
+P 4350 1250
+F 0 "#PWR059" H 4350 1450 40  0001 C CNN
+F 1 "VCC" H 4350 1400 40  0000 C CNN
+F 2 "" H 4350 1250 60  0001 C CNN
+F 3 "" H 4350 1250 60  0001 C CNN
+	1    4350 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR060
 U 1 1 33A7E121
-P 3700 1100
-F 0 "#PWR060" H 3700 1100 40  0001 C CNN
-F 1 "GND" H 3700 1030 40  0000 C CNN
-F 2 "" H 3700 1100 60  0001 C CNN
-F 3 "" H 3700 1100 60  0001 C CNN
-	1    3700 1100
+P 3650 1150
+F 0 "#PWR060" H 3650 1150 40  0001 C CNN
+F 1 "GND" H 3650 1080 40  0001 C CNN
+F 2 "" H 3650 1150 60  0001 C CNN
+F 3 "" H 3650 1150 60  0001 C CNN
+	1    3650 1150
 	1    0    0    -1  
 $EndComp
 Connection ~ 3450 1250
 Wire Wire Line
-	3500 1250 3450 1250
+	3800 1250 3450 1250
+Wire Wire Line
+	3450 1100 3450 1250
 Wire Wire Line
-	3500 1100 3450 1100
+	3450 1250 3450 1500
 Wire Wire Line
-	3450 1100 3450 1700
+	3450 1500 3450 1600
+Wire Wire Line
+	3450 1600 3450 1700
 Wire Wire Line
 	2900 1150 2900 2200
 Wire Wire Line
-	3000 1150 3000 2000
+	3000 1150 3000 1400
+Wire Wire Line
+	3000 1400 3000 2000
 Wire Wire Line
 	3100 1150 3100 1900
 Wire Wire Line
@@ -580,56 +616,52 @@ Wire Wire Line
 $Comp
 L CONN_2 P4
 U 1 1 33A7E0C8
-P 3600 750
-F 0 "P4" V 3550 750 40  0000 C CNN
-F 1 "CONN_2" V 3650 750 40  0000 C CNN
-F 2 "connect:SIL-2" H 3600 750 60  0001 C CNN
-F 3 "" H 3600 750 60  0001 C CNN
-	1    3600 750 
+P 3550 750
+F 0 "P4" V 3500 750 40  0000 C CNN
+F 1 "CONN_2" V 3600 750 40  0000 C CNN
+F 2 "connect:SIL-2" H 3550 750 60  0001 C CNN
+F 3 "" H 3550 750 60  0001 C CNN
+	1    3550 750 
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R48
 U 1 1 33A7E0B2
-P 3750 1250
-F 0 "R48" V 3830 1250 50  0000 C CNN
-F 1 "10K" V 3750 1250 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3750 1250 60  0001 C CNN
-F 3 "" H 3750 1250 60  0001 C CNN
-F 4 "~" V 3750 1170 50  0001 C CNN "Champ7"
-	1    3750 1250
+P 4050 1250
+F 0 "R48" V 4130 1250 50  0000 C CNN
+F 1 "10K" V 4050 1250 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 4050 1250 60  0001 C CNN
+F 3 "" H 4050 1250 60  0001 C CNN
+F 4 "~" V 4050 1170 50  0001 C CNN "Champ7"
+	1    4050 1250
 	0    1    1    0   
 $EndComp
 NoConn ~ 2500 1700
 $Comp
 L VCC #PWR061
 U 1 1 33A7E07A
-P 1000 1200
-F 0 "#PWR061" H 1000 1400 40  0001 C CNN
-F 1 "VCC" H 1000 1350 40  0000 C CNN
-F 2 "" H 1000 1200 60  0001 C CNN
-F 3 "" H 1000 1200 60  0001 C CNN
-	1    1000 1200
+P 950 1150
+F 0 "#PWR061" H 950 1350 40  0001 C CNN
+F 1 "VCC" H 950 1300 40  0000 C CNN
+F 2 "" H 950 1150 60  0001 C CNN
+F 3 "" H 950 1150 60  0001 C CNN
+	1    950  1150
 	1    0    0    -1  
 $EndComp
 Connection ~ 2900 2200
 Connection ~ 3000 1400
-Connection ~ 3200 1800
-Connection ~ 1000 1800
 Wire Wire Line
-	3450 1800 2750 1800
+	2750 1800 3200 1800
 Wire Wire Line
-	2750 1800 2750 2050
+	3200 1800 3450 1800
 Wire Wire Line
-	2750 2050 1000 2050
+	1000 1400 800  1400
 Wire Wire Line
-	1000 2050 1000 1600
+	800  1400 800  2200
 Wire Wire Line
-	1000 1400 850  1400
+	800  2200 2900 2200
 Wire Wire Line
-	850  1400 850  2200
-Wire Wire Line
-	850  2200 3450 2200
+	2900 2200 3450 2200
 Wire Wire Line
 	3000 2000 3450 2000
 Wire Wire Line
@@ -651,61 +683,61 @@ $Comp
 L XC1736APD8 U21
 U 1 1 33A7DDDD
 P 1750 1550
-F 0 "U21" H 1750 1650 70  0000 C CNN
-F 1 "XC1736APD8" H 1750 1450 70  0000 C CNN
+F 0 "U21" H 1750 1950 70  0000 C CNN
+F 1 "XC1736APD8" H 1750 1150 70  0000 C CNN
 F 2 "dip_sockets:DIP-8__300" H 1750 1550 60  0001 C CNN
 F 3 "" H 1750 1550 60  0001 C CNN
 	1    1750 1550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2150 7300 2050 7300
+	2050 7300 1950 7300
 $Comp
 L VCC #PWR062
 U 1 1 33A7DCF3
-P 2050 7300
-F 0 "#PWR062" H 2050 7500 40  0001 C CNN
-F 1 "VCC" H 2050 7450 40  0000 C CNN
-F 2 "" H 2050 7300 60  0001 C CNN
-F 3 "" H 2050 7300 60  0001 C CNN
-	1    2050 7300
+P 1950 7300
+F 0 "#PWR062" H 1950 7500 40  0001 C CNN
+F 1 "VCC" H 1950 7450 40  0000 C CNN
+F 2 "" H 1950 7300 60  0001 C CNN
+F 3 "" H 1950 7300 60  0001 C CNN
+	1    1950 7300
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 33A7DCE3
-P 2400 7300
-F 0 "R1" V 2480 7300 50  0000 C CNN
-F 1 "10" V 2400 7300 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 2400 7300 60  0001 C CNN
-F 3 "" H 2400 7300 60  0001 C CNN
-F 4 "~" V 2400 7220 50  0001 C CNN "Champ7"
-	1    2400 7300
+P 2300 7300
+F 0 "R1" V 2380 7300 50  0000 C CNN
+F 1 "10" V 2300 7300 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2300 7300 60  0001 C CNN
+F 3 "" H 2300 7300 60  0001 C CNN
+F 4 "~" V 2300 7220 50  0001 C CNN "Champ7"
+	1    2300 7300
 	0    1    1    0   
 $EndComp
-Connection ~ 3100 7300
+Connection ~ 3000 7300
 Wire Wire Line
-	3100 7400 3100 7300
+	3000 7300 3000 7400
 $Comp
 L GND #PWR063
 U 1 1 33A7DCA9
-P 3100 7800
-F 0 "#PWR063" H 3100 7800 40  0001 C CNN
-F 1 "GND" H 3100 7730 40  0000 C CNN
-F 2 "" H 3100 7800 60  0001 C CNN
-F 3 "" H 3100 7800 60  0001 C CNN
-	1    3100 7800
+P 3000 7850
+F 0 "#PWR063" H 3000 7850 40  0001 C CNN
+F 1 "GND" H 3000 7780 40  0001 C CNN
+F 2 "" H 3000 7850 60  0001 C CNN
+F 3 "" H 3000 7850 60  0001 C CNN
+	1    3000 7850
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C23
 U 1 1 33A7DC91
-P 3100 7600
-F 0 "C23" V 3150 7750 50  0000 C CNN
-F 1 "100nF" V 3150 7450 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3100 7600 60  0001 C CNN
-F 3 "" H 3100 7600 60  0001 C CNN
-	1    3100 7600
+P 3000 7600
+F 0 "C23" H 3150 7700 50  0000 C CNN
+F 1 "100nF" H 3150 7500 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 3000 7600 60  0001 C CNN
+F 3 "" H 3000 7600 60  0001 C CNN
+	1    3000 7600
 	1    0    0    -1  
 $EndComp
 Text Label 11400 3600 0    60   ~ 0
@@ -854,7 +886,7 @@ Text Label 11500 5700 0    60   ~ 0
 DQ1
 Text Label 11500 5600 0    60   ~ 0
 DQ0
-Text HLabel 1400 650  0    60   3State ~ 0
+Text HLabel 1300 2400 0    60   3State ~ 0
 DQ[0..15]
 Text Label 11400 3700 0    60   ~ 0
 X_CLK
@@ -887,7 +919,7 @@ $Comp
 L R R13
 U 1 1 2D5AA03C
 P 8000 2500
-F 0 "R13" V 8080 2500 50  0000 C CNN
+F 0 "R13" H 7850 2700 50  0000 C CNN
 F 1 "1K" V 8000 2500 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 8000 2500 60  0001 C CNN
 F 3 "" H 8000 2500 60  0001 C CNN
@@ -898,7 +930,7 @@ $Comp
 L LED D6
 U 1 1 2D5AA041
 P 7700 2850
-F 0 "D6" H 7720 3000 60  0000 C CNN
+F 0 "D6" H 7700 2600 60  0000 C CNN
 F 1 "LED" H 7720 2700 60  0000 C CNN
 F 2 "discret:LEDV" H 7700 2850 60  0001 C CNN
 F 3 "" H 7700 2850 60  0001 C CNN
@@ -911,7 +943,7 @@ Text HLabel 2850 3800 0    60   Output ~ 0
 PTRDY-
 Text HLabel 3350 4700 0    60   Input ~ 0
 PTNUM1
-Text HLabel 1550 950  0    60   Input ~ 0
+Text HLabel 1450 2700 0    60   Input ~ 0
 PTBE-[0..3]
 Text HLabel 3150 4400 0    60   Output ~ 0
 PTADR-
@@ -919,7 +951,7 @@ Text HLabel 3150 3500 0    60   Input ~ 0
 PTWR
 Text HLabel 3150 3600 0    60   Input ~ 0
 PTBURST-
-Text HLabel 750  750  2    60   Output ~ 0
+Text HLabel 650  2500 2    60   Output ~ 0
 ADR[2..6]
 Text HLabel 3350 5700 0    60   Output ~ 0
 SELECT-
@@ -933,7 +965,7 @@ Text HLabel 5950 1600 2    60   Input ~ 0
 SYSRST-
 Text HLabel 3350 4800 0    60   Input ~ 0
 PTNUM0
-Text HLabel 750  850  2    60   Output ~ 0
+Text HLabel 650  2600 2    60   Output ~ 0
 BE-[0..3]
 Text Label 3150 3400 0    60   ~ 0
 DQ0
@@ -1212,18 +1244,30 @@ MXA0
 Wire Wire Line
 	3100 10250 3100 10200
 Wire Wire Line
+	2750 10150 2750 10200
+Wire Wire Line
 	2750 10200 2750 10250
 Wire Wire Line
 	8100 5300 8200 5300
 Wire Wire Line
-	7250 5300 7500 5300
+	7200 5300 7300 5300
+Wire Wire Line
+	7300 5300 7400 5300
+Wire Wire Line
+	7400 5300 7500 5300
+Wire Wire Line
+	2550 7300 2700 7300
+Wire Wire Line
+	2700 7300 3000 7300
+Wire Wire Line
+	3000 7300 3350 7300
 Wire Wire Line
-	2650 7300 3350 7300
+	2000 8850 2350 8850
 Wire Wire Line
-	2450 8850 2000 8850
+	2350 8850 2450 8850
 Text Label 2050 8850 0    60   ~ 0
 VOSC
-Text Label 3350 7550 0    60   ~ 0
+Text Label 3350 7300 2    60   ~ 0
 VOSC
 Wire Notes Line
 	850  9650 7200 9650
@@ -1232,7 +1276,7 @@ Wire Notes Line
 Wire Notes Line
 	850  11150 850  9650
 Text Notes 1350 11050 0    60   ~ 0
-Decouplages
+Decoupling
 Wire Notes Line
 	1000 7000 5550 7000
 Wire Notes Line
@@ -1240,26 +1284,24 @@ Wire Notes Line
 Wire Notes Line
 	1000 9500 1000 7000
 Text Notes 1100 9400 0    60   ~ 0
-OSCILLATEURS generation freq echantillonage CAD et CDA
-Text Notes 2950 9250 0    60   ~ 0
-Pour CDA
+OSCILLATOR generates sample clock for DAC and ADC
 $Comp
 L GND #GND065
 U 1 1 B3BF4EE3
-P 7400 6000
-F 0 "#GND065" H 7400 6100 60  0001 C CNN
-F 1 "GND" H 7400 5900 60  0000 C CNN
-F 2 "" H 7400 6000 60  0001 C CNN
-F 3 "" H 7400 6000 60  0001 C CNN
-	1    7400 6000
+P 7400 6050
+F 0 "#GND065" H 7400 6150 60  0001 C CNN
+F 1 "GND" H 7400 5950 60  0000 C CNN
+F 2 "" H 7400 6050 60  0001 C CNN
+F 3 "" H 7400 6050 60  0001 C CNN
+	1    7400 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C49
 U 1 1 B3BF4EDE
 P 7400 5800
-F 0 "C49" V 7450 5950 50  0000 C CNN
-F 1 "22pF" V 7450 5650 50  0000 C CNN
+F 0 "C49" H 7550 5900 50  0000 C CNN
+F 1 "22pF" H 7550 5700 50  0000 C CNN
 F 2 "discret:C1" H 7400 5800 60  0001 C CNN
 F 3 "" H 7400 5800 60  0001 C CNN
 	1    7400 5800
@@ -1269,8 +1311,8 @@ $Comp
 L C C50
 U 1 1 B3BF4EE8
 P 8200 5800
-F 0 "C50" V 8250 5950 50  0000 C CNN
-F 1 "22pF" V 8250 5650 50  0000 C CNN
+F 0 "C50" H 8350 5900 50  0000 C CNN
+F 1 "22pF" H 8350 5700 50  0000 C CNN
 F 2 "discret:C1" H 8200 5800 60  0001 C CNN
 F 3 "" H 8200 5800 60  0001 C CNN
 	1    8200 5800
@@ -1279,12 +1321,12 @@ $EndComp
 $Comp
 L GND #GND066
 U 1 1 B3BF4EED
-P 8200 6000
-F 0 "#GND066" H 8200 6100 60  0001 C CNN
-F 1 "GND" H 8200 5900 60  0000 C CNN
-F 2 "" H 8200 6000 60  0001 C CNN
-F 3 "" H 8200 6000 60  0001 C CNN
-	1    8200 6000
+P 8200 6050
+F 0 "#GND066" H 8200 6150 60  0001 C CNN
+F 1 "GND" H 8200 5950 60  0000 C CNN
+F 2 "" H 8200 6050 60  0001 C CNN
+F 3 "" H 8200 6050 60  0001 C CNN
+	1    8200 6050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1301,23 +1343,23 @@ $EndComp
 $Comp
 L GND #GND067
 U 1 1 B9ED7ABA
-P 1250 10650
-F 0 "#GND067" H 1250 10750 60  0001 C CNN
-F 1 "GND" H 1250 10550 60  0000 C CNN
-F 2 "" H 1250 10650 60  0001 C CNN
-F 3 "" H 1250 10650 60  0001 C CNN
-	1    1250 10650
+P 1250 10700
+F 0 "#GND067" H 1250 10800 60  0001 C CNN
+F 1 "GND" H 1250 10600 60  0001 C CNN
+F 2 "" H 1250 10700 60  0001 C CNN
+F 3 "" H 1250 10700 60  0001 C CNN
+	1    1250 10700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND068
 U 1 1 B9ED7ABF
-P 2050 10650
-F 0 "#GND068" H 2050 10750 60  0001 C CNN
-F 1 "GND" H 2050 10550 60  0000 C CNN
-F 2 "" H 2050 10650 60  0001 C CNN
-F 3 "" H 2050 10650 60  0001 C CNN
-	1    2050 10650
+P 2050 10700
+F 0 "#GND068" H 2050 10800 60  0001 C CNN
+F 1 "GND" H 2050 10600 60  0001 C CNN
+F 2 "" H 2050 10700 60  0001 C CNN
+F 3 "" H 2050 10700 60  0001 C CNN
+	1    2050 10700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1335,8 +1377,8 @@ $Comp
 L C C17
 U 1 1 BF805547
 P 3500 10450
-F 0 "C17" V 3550 10600 50  0000 C CNN
-F 1 "100nF" V 3550 10300 50  0000 C CNN
+F 0 "C17" H 3650 10550 50  0000 C CNN
+F 1 "100nF" H 3650 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 3500 10450 60  0001 C CNN
 F 3 "" H 3500 10450 60  0001 C CNN
 	1    3500 10450
@@ -1346,8 +1388,8 @@ $Comp
 L C C18
 U 1 1 BF80554C
 P 3850 10450
-F 0 "C18" V 3900 10600 50  0000 C CNN
-F 1 "100nF" V 3900 10300 50  0000 C CNN
+F 0 "C18" H 4000 10550 50  0000 C CNN
+F 1 "100nF" H 4000 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 3850 10450 60  0001 C CNN
 F 3 "" H 3850 10450 60  0001 C CNN
 	1    3850 10450
@@ -1357,8 +1399,8 @@ $Comp
 L C C19
 U 1 1 BF805551
 P 3100 10450
-F 0 "C19" V 3150 10600 50  0000 C CNN
-F 1 "100nF" V 3150 10300 50  0000 C CNN
+F 0 "C19" H 3250 10550 50  0000 C CNN
+F 1 "100nF" H 3250 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 3100 10450 60  0001 C CNN
 F 3 "" H 3100 10450 60  0001 C CNN
 	1    3100 10450
@@ -1368,8 +1410,8 @@ $Comp
 L C C20
 U 1 1 BF805556
 P 2750 10450
-F 0 "C20" V 2800 10600 50  0000 C CNN
-F 1 "100nF" V 2800 10300 50  0000 C CNN
+F 0 "C20" H 2900 10550 50  0000 C CNN
+F 1 "100nF" H 2900 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 2750 10450 60  0001 C CNN
 F 3 "" H 2750 10450 60  0001 C CNN
 	1    2750 10450
@@ -1378,20 +1420,20 @@ $EndComp
 $Comp
 L GND #GND069
 U 1 1 BF805565
-P 3850 10800
-F 0 "#GND069" H 3850 10900 60  0001 C CNN
-F 1 "GND" H 3850 10700 60  0000 C CNN
-F 2 "" H 3850 10800 60  0001 C CNN
-F 3 "" H 3850 10800 60  0001 C CNN
-	1    3850 10800
+P 2750 10750
+F 0 "#GND069" H 2750 10850 60  0001 C CNN
+F 1 "GND" H 2750 10650 60  0001 C CNN
+F 2 "" H 2750 10750 60  0001 C CNN
+F 3 "" H 2750 10750 60  0001 C CNN
+	1    2750 10750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C56
 U 1 1 B9ED7AB0
 P 1250 10450
-F 0 "C56" H 1350 10600 50  0000 C CNN
-F 1 "4,7uF" H 1350 10300 50  0000 C CNN
+F 0 "C56" H 1450 10500 50  0000 C CNN
+F 1 "4.7uF" H 1450 10400 50  0000 C CNN
 F 2 "lib_smd:SM1812L" H 1250 10450 60  0001 C CNN
 F 3 "" H 1250 10450 60  0001 C CNN
 	1    1250 10450
@@ -1401,8 +1443,8 @@ $Comp
 L CP C57
 U 1 1 B9ED7AB5
 P 2050 10450
-F 0 "C57" H 2150 10600 50  0000 C CNN
-F 1 "4,7uF" H 2150 10300 50  0000 C CNN
+F 0 "C57" H 2250 10500 50  0000 C CNN
+F 1 "4.7uF" H 2250 10400 50  0000 C CNN
 F 2 "lib_smd:SM1210L" H 2050 10450 60  0001 C CNN
 F 3 "" H 2050 10450 60  0001 C CNN
 	1    2050 10450
@@ -1411,23 +1453,23 @@ $EndComp
 $Comp
 L GND #GND070
 U 1 1 228C46D3
-P 2750 7800
-F 0 "#GND070" H 2750 7900 60  0001 C CNN
-F 1 "GND" H 2750 7700 60  0000 C CNN
-F 2 "" H 2750 7800 60  0001 C CNN
-F 3 "" H 2750 7800 60  0001 C CNN
-	1    2750 7800
+P 2700 7850
+F 0 "#GND070" H 2700 7950 60  0001 C CNN
+F 1 "GND" H 2700 7750 60  0001 C CNN
+F 2 "" H 2700 7850 60  0001 C CNN
+F 3 "" H 2700 7850 60  0001 C CNN
+	1    2700 7850
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C63
 U 1 1 228C4700
-P 2750 7600
-F 0 "C63" H 2850 7750 50  0000 C CNN
-F 1 "47uF" H 2850 7450 50  0000 C CNN
-F 2 "lib_smd:SM1210L" H 2750 7600 60  0001 C CNN
-F 3 "" H 2750 7600 60  0001 C CNN
-	1    2750 7600
+P 2700 7600
+F 0 "C63" H 2800 7750 50  0000 C CNN
+F 1 "47uF" H 2800 7450 50  0000 C CNN
+F 2 "lib_smd:SM1210L" H 2700 7600 60  0001 C CNN
+F 3 "" H 2700 7600 60  0001 C CNN
+	1    2700 7600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1444,12 +1486,12 @@ $EndComp
 $Comp
 L GND #GND071
 U 1 1 2295D397
-P 3350 9050
-F 0 "#GND071" H 3350 9150 60  0001 C CNN
-F 1 "GND" H 3350 8950 60  0000 C CNN
-F 2 "" H 3350 9050 60  0001 C CNN
-F 3 "" H 3350 9050 60  0001 C CNN
-	1    3350 9050
+P 3350 9100
+F 0 "#GND071" H 3350 9200 60  0001 C CNN
+F 1 "GND" H 3350 9000 60  0001 C CNN
+F 2 "" H 3350 9100 60  0001 C CNN
+F 3 "" H 3350 9100 60  0001 C CNN
+	1    3350 9100
 	1    0    0    -1  
 $EndComp
 Text HLabel 11250 5000 0    60   Output ~ 0
@@ -1512,19 +1554,19 @@ $EndComp
 $Comp
 L VCC #VCC075
 U 1 1 4BF0369C
-P 3850 10100
-F 0 "#VCC075" H 3850 10300 40  0001 C CNN
-F 1 "VCC" H 3850 10250 40  0000 C CNN
-F 2 "" H 3850 10100 60  0001 C CNN
-F 3 "" H 3850 10100 60  0001 C CNN
-	1    3850 10100
+P 2750 10150
+F 0 "#VCC075" H 2750 10350 40  0001 C CNN
+F 1 "VCC" H 2750 10300 40  0000 C CNN
+F 2 "" H 2750 10150 60  0001 C CNN
+F 3 "" H 2750 10150 60  0001 C CNN
+	1    2750 10150
 	1    0    0    -1  
 $EndComp
 Connection ~ 11800 2900
 Connection ~ 11800 3000
 Connection ~ 7400 5300
 Connection ~ 8200 5300
-Connection ~ 2750 7300
+Connection ~ 2700 7300
 Connection ~ 3100 10200
 Connection ~ 3500 10200
 Connection ~ 3850 10200
@@ -1542,11 +1584,11 @@ Wire Wire Line
 Wire Wire Line
 	11250 4600 11900 4600
 Wire Wire Line
-	7500 4950 7400 4950
+	7300 4950 7500 4950
 Wire Wire Line
 	8000 4950 8200 4950
 Wire Wire Line
-	11900 3100 11800 3100
+	11800 3100 11900 3100
 Wire Wire Line
 	14100 8500 14750 8500
 Wire Wire Line
@@ -1564,11 +1606,13 @@ Wire Wire Line
 Wire Wire Line
 	2050 10150 2050 10250
 Wire Wire Line
-	2750 7300 2750 7400
+	2700 7300 2700 7400
 Wire Wire Line
 	2350 8850 2350 8650
 Wire Wire Line
-	2750 10700 2750 10650
+	2750 10650 2750 10700
+Wire Wire Line
+	2750 10700 2750 10750
 Wire Wire Line
 	3100 10650 3100 10700
 Wire Wire Line
@@ -1576,15 +1620,17 @@ Wire Wire Line
 Wire Wire Line
 	3500 10650 3500 10700
 Wire Wire Line
-	3850 10100 3850 10250
+	8200 4950 8200 5300
+Wire Wire Line
+	8200 5300 8200 5500
 Wire Wire Line
-	3850 10650 3850 10800
+	8200 5500 8200 5600
 Wire Wire Line
-	7400 4950 7400 5600
+	11800 2800 11800 2900
 Wire Wire Line
-	8200 4950 8200 5600
+	11800 2900 11800 3000
 Wire Wire Line
-	11800 3100 11800 2800
+	11800 3000 11800 3100
 Wire Wire Line
 	3350 7300 3350 8050
 Wire Wire Line
@@ -1601,8 +1647,8 @@ $Comp
 L C C22
 U 1 1 268A4E88
 P 4200 10450
-F 0 "C22" V 4250 10600 50  0000 C CNN
-F 1 "100nF" V 4250 10300 50  0000 C CNN
+F 0 "C22" H 4350 10550 50  0000 C CNN
+F 1 "100nF" H 4350 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 4200 10450 60  0001 C CNN
 F 3 "" H 4200 10450 60  0001 C CNN
 	1    4200 10450
@@ -1612,8 +1658,8 @@ $Comp
 L C C21
 U 1 1 268A4E83
 P 4550 10450
-F 0 "C21" V 4600 10600 50  0000 C CNN
-F 1 "100nF" V 4600 10300 50  0000 C CNN
+F 0 "C21" H 4700 10550 50  0000 C CNN
+F 1 "100nF" H 4700 10350 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 4550 10450 60  0001 C CNN
 F 3 "" H 4550 10450 60  0001 C CNN
 	1    4550 10450
@@ -1629,13 +1675,66 @@ Wire Notes Line
 $Comp
 L R R21
 U 1 1 525FE207
-P 7000 5300
-F 0 "R21" V 7080 5300 50  0000 C CNN
-F 1 "220" V 7000 5300 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 7000 5300 60  0001 C CNN
-F 3 "" H 7000 5300 60  0001 C CNN
-	1    7000 5300
+P 6950 5300
+F 0 "R21" V 7030 5300 50  0000 C CNN
+F 1 "220" V 6950 5300 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 6950 5300 60  0001 C CNN
+F 3 "" H 6950 5300 60  0001 C CNN
+	1    6950 5300
 	0    1    1    0   
 $EndComp
 NoConn ~ 4350 8650
+Text Label 2400 2050 0    60   ~ 0
+PROG*
+Connection ~ 3200 1800
+Wire Wire Line
+	2750 2050 2750 1800
+Wire Wire Line
+	900  2050 2750 2050
+Wire Wire Line
+	1000 1600 900  1600
+Wire Wire Line
+	900  1600 900  1800
+Wire Wire Line
+	900  1800 900  2050
+Wire Wire Line
+	1000 1800 900  1800
+Connection ~ 900  1800
+Connection ~ 2750 10200
+Connection ~ 2750 10700
+Wire Wire Line
+	3850 10650 3850 10700
+Wire Wire Line
+	3850 10250 3850 10200
+Wire Wire Line
+	2050 10700 2050 10650
+Wire Wire Line
+	1250 10700 1250 10650
+Wire Wire Line
+	3350 9050 3350 9100
+Wire Wire Line
+	2700 7850 2700 7800
+Wire Wire Line
+	3000 7850 3000 7800
+Wire Wire Line
+	950  1150 950  1200
+Wire Wire Line
+	950  1200 1000 1200
+Wire Wire Line
+	2800 1200 2800 1150
+Wire Wire Line
+	3650 1150 3650 1100
+Wire Wire Line
+	4350 1250 4300 1250
+Wire Wire Line
+	4850 950  4850 1000
+Wire Wire Line
+	8200 6000 8200 6050
+Wire Wire Line
+	7400 6050 7400 6000
+Wire Wire Line
+	7300 4950 7300 5300
+Connection ~ 7300 5300
+Wire Wire Line
+	7400 5300 7400 5600
 $EndSCHEMATC
diff --git a/demos/video/modul.sch b/demos/video/modul.sch
index 505e509..7842242 100644
--- a/demos/video/modul.sch
+++ b/demos/video/modul.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
@@ -35,913 +35,953 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	6900 1150 7200 1150
+	6900 1200 7300 1200
 $Comp
 L PWR_FLAG #FLG07
 U 1 1 4174D92E
-P 3550 1450
-F 0 "#FLG07" H 3550 1720 30  0001 C CNN
-F 1 "PWR_FLAG" H 3550 1680 30  0000 C CNN
-F 2 "" H 3550 1450 60  0001 C CNN
-F 3 "" H 3550 1450 60  0001 C CNN
-	1    3550 1450
+P 3500 1450
+F 0 "#FLG07" H 3500 1720 30  0001 C CNN
+F 1 "PWR_FLAG" H 3500 1680 30  0000 C CNN
+F 2 "" H 3500 1450 60  0001 C CNN
+F 3 "" H 3500 1450 60  0001 C CNN
+	1    3500 1450
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG08
 U 1 1 4174D923
-P 6900 1150
-F 0 "#FLG08" H 6900 1420 30  0001 C CNN
-F 1 "PWR_FLAG" H 6900 1380 30  0000 C CNN
-F 2 "" H 6900 1150 60  0001 C CNN
-F 3 "" H 6900 1150 60  0001 C CNN
-	1    6900 1150
+P 6900 1200
+F 0 "#FLG08" H 6900 1470 30  0001 C CNN
+F 1 "PWR_FLAG" H 6900 1430 30  0000 C CNN
+F 2 "" H 6900 1200 60  0001 C CNN
+F 3 "" H 6900 1200 60  0001 C CNN
+	1    6900 1200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6000 2350 6950 2350
+	5950 2400 6900 2400
 Wire Wire Line
-	5150 2350 5400 2350
+	5100 2400 5350 2400
 $Comp
 L GND #PWR09
 U 1 1 349FB5CD
-P 5700 2550
-F 0 "#PWR09" H 5700 2550 40  0001 C CNN
-F 1 "GND" H 5700 2480 40  0000 C CNN
-F 2 "" H 5700 2550 60  0001 C CNN
-F 3 "" H 5700 2550 60  0001 C CNN
-	1    5700 2550
+P 5650 2600
+F 0 "#PWR09" H 5650 2600 40  0001 C CNN
+F 1 "GND" H 5650 2530 40  0001 C CNN
+F 2 "" H 5650 2600 60  0001 C CNN
+F 3 "" H 5650 2600 60  0001 C CNN
+	1    5650 2600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4450 2650 6950 2650
+	4400 2700 6900 2700
 $Comp
 L LIGNE_A_RETARD L6
 U 1 1 349FB562
-P 5700 2350
-F 0 "L6" V 5850 2350 70  0000 C CNN
-F 1 "470nS" V 5600 1900 70  0000 C CNN
-F 2 "footprints:LRTDK" H 5700 2350 60  0001 C CNN
-F 3 "" H 5700 2350 60  0001 C CNN
-	1    5700 2350
+P 5650 2400
+F 0 "L6" V 5850 2400 50  0000 C CNN
+F 1 "470ns" V 5750 2400 50  0000 C CNN
+F 2 "footprints:LRTDK" H 5650 2400 60  0001 C CNN
+F 3 "" H 5650 2400 60  0001 C CNN
+	1    5650 2400
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR010
 U 1 1 33CF5737
-P 4450 3750
-F 0 "#PWR010" H 4450 3750 40  0001 C CNN
-F 1 "GND" H 4450 3680 40  0000 C CNN
-F 2 "" H 4450 3750 60  0001 C CNN
-F 3 "" H 4450 3750 60  0001 C CNN
-	1    4450 3750
+P 4450 3800
+F 0 "#PWR010" H 4450 3800 40  0001 C CNN
+F 1 "GND" H 4450 3700 40  0001 C CNN
+F 2 "" H 4450 3800 60  0001 C CNN
+F 3 "" H 4450 3800 60  0001 C CNN
+	1    4450 3800
 	0    -1   -1   0   
 $EndComp
-NoConn ~ 2650 2950
-Text HLabel 1600 3650 0    60   Input ~ 0
-BLEU
-Text HLabel 1600 3550 0    60   Input ~ 0
-VERT
-Text HLabel 1600 3450 0    60   Input ~ 0
-ROUGE
+NoConn ~ 2600 3000
+Text HLabel 1550 3700 0    60   Input ~ 0
+BLUE
+Text HLabel 1550 3600 0    60   Input ~ 0
+GREEN
+Text HLabel 1550 3500 0    60   Input ~ 0
+RED
 Wire Wire Line
-	2150 3650 1600 3650
+	2100 3700 1550 3700
 Wire Wire Line
-	1650 3550 1600 3550
+	1600 3600 1550 3600
 Wire Wire Line
-	2150 3450 1600 3450
+	2100 3500 1550 3500
 Wire Wire Line
-	2650 3650 2550 3650
+	2600 3700 2500 3700
 Wire Wire Line
-	2650 3550 2050 3550
+	2600 3600 2000 3600
 Wire Wire Line
-	2650 3450 2550 3450
+	2600 3500 2500 3500
 Wire Wire Line
-	2550 3250 2650 3250
+	2500 3300 2600 3300
 Wire Wire Line
-	2000 3250 2050 3250
+	1950 3300 2000 3300
 $Comp
 L VCC #PWR011
 U 1 1 33A51A5E
-P 2000 3250
-F 0 "#PWR011" H 2000 3450 40  0001 C CNN
-F 1 "VCC" H 2000 3400 40  0000 C CNN
-F 2 "" H 2000 3250 60  0001 C CNN
-F 3 "" H 2000 3250 60  0001 C CNN
-	1    2000 3250
+P 1950 3300
+F 0 "#PWR011" H 1950 3500 40  0001 C CNN
+F 1 "VCC" V 1950 3450 40  0000 C CNN
+F 2 "" H 1950 3300 60  0001 C CNN
+F 3 "" H 1950 3300 60  0001 C CNN
+	1    1950 3300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R4
 U 1 1 33A51A4E
-P 2300 3250
-F 0 "R4" V 2380 3250 50  0000 C CNN
-F 1 "10K" V 2300 3250 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 2300 3250 60  0001 C CNN
-F 3 "" H 2300 3250 60  0001 C CNN
-F 4 "~" V 2300 3170 50  0001 C CNN "Champ7"
-	1    2300 3250
+P 2250 3300
+F 0 "R4" V 2330 3300 50  0000 C CNN
+F 1 "10K" V 2250 3300 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2250 3300 60  0001 C CNN
+F 3 "" H 2250 3300 60  0001 C CNN
+F 4 "~" V 2250 3220 50  0001 C CNN "Champ7"
+	1    2250 3300
 	0    1    1    0   
 $EndComp
-NoConn ~ 2650 3050
-NoConn ~ 2650 2850
-NoConn ~ 2650 2750
+NoConn ~ 2600 3100
+NoConn ~ 2600 2900
+NoConn ~ 2600 2800
 Wire Wire Line
-	2150 5100 2150 5050
-Text Label 4600 3250 0    60   ~ 0
+	2100 5150 2100 5100
+Text Label 4550 3300 0    60   ~ 0
 CVBS
 Wire Wire Line
-	2550 2300 2550 2550
+	2500 2350 2500 2600
 Wire Wire Line
-	6400 3700 6400 3800
+	6350 3750 6350 3850
 Wire Wire Line
-	6400 3800 6850 3800
+	6350 3850 6800 3850
 Wire Wire Line
-	3550 2200 3550 1450
+	3500 1450 3500 2250
 Wire Wire Line
-	3550 1450 4050 1450
+	3500 1500 4000 1500
 Wire Wire Line
-	1550 3900 1550 3850
+	1500 3950 1500 3900
 Wire Wire Line
-	1550 3850 2650 3850
-Text Notes 1150 4850 0    60   ~ 0
+	1500 3900 2600 3900
+Text Notes 1100 4900 0    60   ~ 0
 NTSC:
-Text Notes 1150 4950 0    60   ~ 0
-3,579545MH
+Text Notes 1100 5000 0    60   ~ 0
+3.579545MHz
 $Comp
 L GND #GND012
 U 1 1 22760F6C
-P 3550 4400
-F 0 "#GND012" H 3550 4500 60  0001 C CNN
-F 1 "GND" H 3550 4300 60  0000 C CNN
-F 2 "" H 3550 4400 60  0001 C CNN
-F 3 "" H 3550 4400 60  0001 C CNN
-	1    3550 4400
+P 3500 4500
+F 0 "#GND012" H 3500 4600 60  0001 C CNN
+F 1 "GND" H 3500 4400 60  0001 C CNN
+F 2 "" H 3500 4500 60  0001 C CNN
+F 3 "" H 3500 4500 60  0001 C CNN
+	1    3500 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND013
 U 1 1 22760F7B
-P 3950 1950
-F 0 "#GND013" H 3950 2050 60  0001 C CNN
-F 1 "GND" H 3950 1850 60  0000 C CNN
-F 2 "" H 3950 1950 60  0001 C CNN
-F 3 "" H 3950 1950 60  0001 C CNN
-	1    3950 1950
+P 3900 2050
+F 0 "#GND013" H 3900 2150 60  0001 C CNN
+F 1 "GND" H 3900 1950 60  0001 C CNN
+F 2 "" H 3900 2050 60  0001 C CNN
+F 3 "" H 3900 2050 60  0001 C CNN
+	1    3900 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND014
 U 1 1 22760F94
-P 1550 4300
-F 0 "#GND014" H 1550 4300 40  0001 C CNN
-F 1 "GND" H 1550 4230 40  0000 C CNN
-F 2 "" H 1550 4300 60  0001 C CNN
-F 3 "" H 1550 4300 60  0001 C CNN
-	1    1550 4300
+P 1500 4400
+F 0 "#GND014" H 1500 4400 40  0001 C CNN
+F 1 "GND" H 1500 4330 40  0001 C CNN
+F 2 "" H 1500 4400 60  0001 C CNN
+F 3 "" H 1500 4400 60  0001 C CNN
+	1    1500 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND015
 U 1 1 22760F9E
-P 1000 3800
-F 0 "#GND015" H 1000 3800 40  0001 C CNN
-F 1 "GND" H 1000 3730 40  0000 C CNN
-F 2 "" H 1000 3800 60  0001 C CNN
-F 3 "" H 1000 3800 60  0001 C CNN
-	1    1000 3800
+P 950 3900
+F 0 "#GND015" H 950 3900 40  0001 C CNN
+F 1 "GND" H 950 3830 40  0001 C CNN
+F 2 "" H 950 3900 60  0001 C CNN
+F 3 "" H 950 3900 60  0001 C CNN
+	1    950  3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND016
 U 1 1 22760FAD
-P 2150 5500
-F 0 "#GND016" H 2150 5600 60  0001 C CNN
-F 1 "GND" H 2150 5400 60  0000 C CNN
-F 2 "" H 2150 5500 60  0001 C CNN
-F 3 "" H 2150 5500 60  0001 C CNN
-	1    2150 5500
+P 2100 5600
+F 0 "#GND016" H 2100 5700 60  0001 C CNN
+F 1 "GND" H 2100 5500 60  0001 C CNN
+F 2 "" H 2100 5600 60  0001 C CNN
+F 3 "" H 2100 5600 60  0001 C CNN
+	1    2100 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND017
 U 1 1 22760FC6
-P 6350 3250
-F 0 "#GND017" H 6350 3350 60  0001 C CNN
-F 1 "GND" H 6350 3150 60  0000 C CNN
-F 2 "" H 6350 3250 60  0001 C CNN
-F 3 "" H 6350 3250 60  0001 C CNN
-	1    6350 3250
+P 6300 3300
+F 0 "#GND017" H 6300 3400 60  0001 C CNN
+F 1 "GND" H 6300 3200 60  0000 C CNN
+F 2 "" H 6300 3300 60  0001 C CNN
+F 3 "" H 6300 3300 60  0001 C CNN
+	1    6300 3300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #GND018
 U 1 1 22760FD0
-P 5250 3450
-F 0 "#GND018" H 5250 3550 60  0001 C CNN
-F 1 "GND" H 5250 3350 60  0000 C CNN
-F 2 "" H 5250 3450 60  0001 C CNN
-F 3 "" H 5250 3450 60  0001 C CNN
-	1    5250 3450
+P 5200 3500
+F 0 "#GND018" H 5200 3600 60  0001 C CNN
+F 1 "GND" H 5050 3450 60  0001 C CNN
+F 2 "" H 5200 3500 60  0001 C CNN
+F 3 "" H 5200 3500 60  0001 C CNN
+	1    5200 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND019
 U 1 1 22760FDA
-P 4550 4350
-F 0 "#GND019" H 4550 4450 60  0001 C CNN
-F 1 "GND" H 4550 4250 60  0000 C CNN
-F 2 "" H 4550 4350 60  0001 C CNN
-F 3 "" H 4550 4350 60  0001 C CNN
-	1    4550 4350
+P 4500 4450
+F 0 "#GND019" H 4500 4550 60  0001 C CNN
+F 1 "GND" H 4500 4350 60  0001 C CNN
+F 2 "" H 4500 4450 60  0001 C CNN
+F 3 "" H 4500 4450 60  0001 C CNN
+	1    4500 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND020
 U 1 1 22760FE9
-P 3250 1750
-F 0 "#GND020" H 3250 1850 60  0001 C CNN
-F 1 "GND" H 3250 1650 60  0000 C CNN
-F 2 "" H 3250 1750 60  0001 C CNN
-F 3 "" H 3250 1750 60  0001 C CNN
-	1    3250 1750
-	0    -1   -1   0   
+P 3300 1850
+F 0 "#GND020" H 3300 1950 60  0001 C CNN
+F 1 "GND" H 3300 1750 60  0001 C CNN
+F 2 "" H 3300 1850 60  0001 C CNN
+F 3 "" H 3300 1850 60  0001 C CNN
+	1    3300 1850
+	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND021
 U 1 1 22761002
-P 5550 5050
-F 0 "#GND021" H 5550 5150 60  0001 C CNN
-F 1 "GND" H 5550 4950 60  0000 C CNN
-F 2 "" H 5550 5050 60  0001 C CNN
-F 3 "" H 5550 5050 60  0001 C CNN
-	1    5550 5050
+P 5500 5150
+F 0 "#GND021" H 5500 5250 60  0001 C CNN
+F 1 "GND" H 5500 5050 60  0001 C CNN
+F 2 "" H 5500 5150 60  0001 C CNN
+F 3 "" H 5500 5150 60  0001 C CNN
+	1    5500 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND022
 U 1 1 22761007
-P 6250 5050
-F 0 "#GND022" H 6250 5150 60  0001 C CNN
-F 1 "GND" H 6250 4950 60  0000 C CNN
-F 2 "" H 6250 5050 60  0001 C CNN
-F 3 "" H 6250 5050 60  0001 C CNN
-	1    6250 5050
+P 6200 5150
+F 0 "#GND022" H 6200 5250 60  0001 C CNN
+F 1 "GND" H 6200 5050 60  0001 C CNN
+F 2 "" H 6200 5150 60  0001 C CNN
+F 3 "" H 6200 5150 60  0001 C CNN
+	1    6200 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND023
 U 1 1 2276104D
-P 9800 2050
-F 0 "#GND023" H 9800 2150 60  0001 C CNN
-F 1 "GND" H 9800 1950 60  0000 C CNN
-F 2 "" H 9800 2050 60  0001 C CNN
-F 3 "" H 9800 2050 60  0001 C CNN
-	1    9800 2050
+P 9800 2150
+F 0 "#GND023" H 9800 2250 60  0001 C CNN
+F 1 "GND" H 9800 2050 60  0001 C CNN
+F 2 "" H 9800 2150 60  0001 C CNN
+F 3 "" H 9800 2150 60  0001 C CNN
+	1    9800 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND024
 U 1 1 2276105C
-P 7100 1650
-F 0 "#GND024" H 7100 1750 60  0001 C CNN
-F 1 "GND" H 7100 1550 60  0000 C CNN
-F 2 "" H 7100 1650 60  0001 C CNN
-F 3 "" H 7100 1650 60  0001 C CNN
-	1    7100 1650
+P 7200 1750
+F 0 "#GND024" H 7200 1850 60  0001 C CNN
+F 1 "GND" H 7200 1650 60  0001 C CNN
+F 2 "" H 7200 1750 60  0001 C CNN
+F 3 "" H 7200 1750 60  0001 C CNN
+	1    7200 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND025
 U 1 1 2276106B
-P 9800 3600
-F 0 "#GND025" H 9800 3700 60  0001 C CNN
-F 1 "GND" H 9800 3500 60  0000 C CNN
-F 2 "" H 9800 3600 60  0001 C CNN
-F 3 "" H 9800 3600 60  0001 C CNN
-	1    9800 3600
+P 9800 3750
+F 0 "#GND025" H 9800 3850 60  0001 C CNN
+F 1 "GND" H 9800 3650 60  0001 C CNN
+F 2 "" H 9800 3750 60  0001 C CNN
+F 3 "" H 9800 3750 60  0001 C CNN
+	1    9800 3750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND026
 U 1 1 22761084
-P 9750 5300
-F 0 "#GND026" H 9750 5400 60  0001 C CNN
-F 1 "GND" H 9750 5200 60  0000 C CNN
-F 2 "" H 9750 5300 60  0001 C CNN
-F 3 "" H 9750 5300 60  0001 C CNN
-	1    9750 5300
+P 9800 5350
+F 0 "#GND026" H 9800 5450 60  0001 C CNN
+F 1 "GND" H 9800 5250 60  0001 C CNN
+F 2 "" H 9800 5350 60  0001 C CNN
+F 3 "" H 9800 5350 60  0001 C CNN
+	1    9800 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND027
 U 1 1 227610A2
-P 6850 3900
-F 0 "#GND027" H 6850 4000 60  0001 C CNN
-F 1 "GND" H 6850 3800 60  0000 C CNN
-F 2 "" H 6850 3900 60  0001 C CNN
-F 3 "" H 6850 3900 60  0001 C CNN
-	1    6850 3900
+P 6800 3950
+F 0 "#GND027" H 6800 4050 60  0001 C CNN
+F 1 "GND" H 6800 3850 60  0001 C CNN
+F 2 "" H 6800 3950 60  0001 C CNN
+F 3 "" H 6800 3950 60  0001 C CNN
+	1    6800 3950
 	1    0    0    -1  
 $EndComp
-Text Label 4550 3350 0    60   ~ 0
+Text Label 4500 3400 0    60   ~ 0
 CHROM
-Text Label 8400 1150 0    60   ~ 0
+Text Label 8400 1200 0    60   ~ 0
 CHROM
-Text Label 4650 3150 0    60   ~ 0
+Text Label 4600 3200 0    60   ~ 0
 LUM
-Text Label 8500 2700 0    60   ~ 0
+Text Label 8500 2800 0    60   ~ 0
 LUM
-Text Label 8450 4400 0    60   ~ 0
+Text Label 8500 4400 0    60   ~ 0
 CVBS
 $Comp
 L VCC #VCC028
 U 1 1 4BF036B3
-P 4750 1450
-F 0 "#VCC028" H 4750 1550 30  0001 C CNN
-F 1 "VCC" H 4750 1550 30  0000 C CNN
-F 2 "" H 4750 1450 60  0001 C CNN
-F 3 "" H 4750 1450 60  0001 C CNN
-	1    4750 1450
+P 4700 1500
+F 0 "#VCC028" H 4700 1600 30  0001 C CNN
+F 1 "VCC" H 4700 1600 30  0000 C CNN
+F 2 "" H 4700 1500 60  0001 C CNN
+F 3 "" H 4700 1500 60  0001 C CNN
+	1    4700 1500
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5F #+029
 U 1 1 4BF036B2
-P 9800 850
-F 0 "#+029" H 9800 1050 40  0001 C CNN
-F 1 "+5F" H 9800 1000 40  0000 C CNN
-F 2 "" H 9800 850 60  0001 C CNN
-F 3 "" H 9800 850 60  0001 C CNN
-	1    9800 850 
+P 9800 900
+F 0 "#+029" H 9800 1100 40  0001 C CNN
+F 1 "+5F" H 9800 1050 40  0000 C CNN
+F 2 "" H 9800 900 60  0001 C CNN
+F 3 "" H 9800 900 60  0001 C CNN
+	1    9800 900 
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5F #+030
 U 1 1 4BF036B1
-P 7100 1050
-F 0 "#+030" H 7100 1250 40  0001 C CNN
-F 1 "+5F" H 7100 1200 40  0000 C CNN
-F 2 "" H 7100 1050 60  0001 C CNN
-F 3 "" H 7100 1050 60  0001 C CNN
-	1    7100 1050
+P 7100 1100
+F 0 "#+030" H 7100 1300 40  0001 C CNN
+F 1 "+5F" H 7100 1250 40  0000 C CNN
+F 2 "" H 7100 1100 60  0001 C CNN
+F 3 "" H 7100 1100 60  0001 C CNN
+	1    7100 1100
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5F #+031
 U 1 1 4BF036B0
-P 9800 2400
-F 0 "#+031" H 9800 2600 40  0001 C CNN
-F 1 "+5F" H 9800 2550 40  0000 C CNN
-F 2 "" H 9800 2400 60  0001 C CNN
-F 3 "" H 9800 2400 60  0001 C CNN
-	1    9800 2400
+P 9800 2500
+F 0 "#+031" H 9800 2700 40  0001 C CNN
+F 1 "+5F" H 9800 2650 40  0000 C CNN
+F 2 "" H 9800 2500 60  0001 C CNN
+F 3 "" H 9800 2500 60  0001 C CNN
+	1    9800 2500
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5F #+032
 U 1 1 4BF0369E
-P 9750 4100
-F 0 "#+032" H 9750 4300 40  0001 C CNN
-F 1 "+5F" H 9750 4250 40  0000 C CNN
-F 2 "" H 9750 4100 60  0001 C CNN
-F 3 "" H 9750 4100 60  0001 C CNN
-	1    9750 4100
+P 9800 4100
+F 0 "#+032" H 9800 4300 40  0001 C CNN
+F 1 "+5F" H 9800 4250 40  0000 C CNN
+F 2 "" H 9800 4100 60  0001 C CNN
+F 3 "" H 9800 4100 60  0001 C CNN
+	1    9800 4100
 	1    0    0    -1  
 $EndComp
-Connection ~ 2550 1750
-Connection ~ 7100 1150
-Connection ~ 6950 2650
-Connection ~ 5250 2950
-Connection ~ 5850 2950
-Connection ~ 6850 3800
-Connection ~ 3950 1450
-Connection ~ 5550 4550
+Connection ~ 2500 1800
+Connection ~ 7100 1200
+Connection ~ 6900 2700
+Connection ~ 5200 3000
+Connection ~ 5800 3000
+Connection ~ 6800 3850
+Connection ~ 3900 1500
+Connection ~ 5500 4600
 Wire Wire Line
-	2450 1750 2750 1750
+	2400 1800 2700 1800
 Wire Wire Line
-	4650 2350 4550 2350
+	4600 2400 4500 2400
 Wire Wire Line
-	4450 2950 6350 2950
+	4400 3000 6300 3000
 Wire Wire Line
-	4450 3150 4950 3150
+	4400 3200 4900 3200
 Wire Wire Line
-	4450 3250 4950 3250
+	4400 3300 4900 3300
 Wire Wire Line
-	8400 1150 8900 1150
+	8400 1200 8900 1200
 Wire Wire Line
-	9400 1150 9500 1150
+	9400 1200 9500 1200
 Wire Wire Line
-	2650 3150 1000 3150
+	2600 3200 950  3200
 Wire Wire Line
-	4450 3350 4950 3350
+	4400 3400 4900 3400
 Wire Wire Line
-	4450 3550 5550 3550
+	4400 3600 5500 3600
 Wire Wire Line
-	9800 1450 10000 1450
+	9800 1500 10000 1500
 Wire Wire Line
-	4450 3650 5550 3650
+	4400 3700 5500 3700
 Wire Wire Line
-	4450 3850 4550 3850
+	4400 3900 4500 3900
 Wire Wire Line
-	2650 4050 2150 4050
+	2600 4100 2100 4100
 Wire Wire Line
-	4650 1450 4750 1450
+	4600 1500 4700 1500
 Wire Wire Line
-	8500 2700 8900 2700
+	8500 2800 8900 2800
 Wire Wire Line
-	9400 2700 9500 2700
+	9400 2800 9500 2800
 Wire Wire Line
-	9800 3000 10000 3000
+	9800 3100 10000 3100
 Wire Wire Line
-	9350 4400 9450 4400
+	9400 4400 9500 4400
 Wire Wire Line
-	9750 4700 9950 4700
+	9800 4700 10000 4700
 Wire Wire Line
-	1000 3150 1000 3400
+	950  3200 950  3450
 Wire Wire Line
-	2150 4050 2150 4450
+	2100 4100 2100 4500
 Wire Wire Line
-	4550 3850 4550 3950
+	4500 3900 4500 4000
 Wire Wire Line
-	5550 4450 5550 4650
+	5500 4500 5500 4700
 Wire Wire Line
-	4550 2350 4550 2550
+	4500 2400 4500 2600
 Wire Wire Line
-	5550 3650 5550 3850
+	5500 3700 5500 3900
 Wire Wire Line
-	6250 4650 6250 4550
+	6200 4700 6200 4600
 Wire Wire Line
-	5850 2950 5850 3250
+	5800 3000 5800 3300
 Wire Wire Line
-	6850 3900 6850 3550
+	6800 3950 6800 3600
 Wire Wire Line
-	6950 2350 6950 2950
+	6900 2400 6900 3000
 Wire Wire Line
-	7100 1050 7100 1250
+	9800 900  9800 1000
 Wire Wire Line
-	9800 850  9800 950 
+	9800 1400 9800 1600
 Wire Wire Line
-	9800 1350 9800 1550
+	9800 2500 9800 2600
 Wire Wire Line
-	9800 2400 9800 2500
+	9800 3000 9800 3200
 Wire Wire Line
-	9800 2900 9800 3100
+	9800 4100 9800 4200
 Wire Wire Line
-	9750 4100 9750 4200
+	9800 4600 9800 4800
 Wire Wire Line
-	9750 4600 9750 4800
+	6200 4600 5500 4600
 Wire Wire Line
-	6250 4550 5550 4550
+	3900 1500 3900 1600
 Wire Wire Line
-	3950 1450 3950 1550
+	2500 2600 2600 2600
 Wire Wire Line
-	2550 2550 2650 2550
+	2500 1800 2500 1950
+Connection ~ 9800 4700
 Wire Wire Line
-	2550 1750 2550 1900
-Connection ~ 9750 4700
-Wire Wire Line
-	6850 3550 6650 3550
+	6800 3600 6600 3600
 $Comp
 L POT POT1
 U 1 1 2276109D
-P 6400 3550
-F 0 "POT1" H 6400 3650 60  0000 C CNN
-F 1 "100K" H 6400 3450 60  0000 C CNN
-F 2 "lib_smd:POT_CMS" H 6400 3550 60  0001 C CNN
-F 3 "" H 6400 3550 60  0001 C CNN
-	1    6400 3550
+P 6350 3600
+F 0 "POT1" H 6150 3750 60  0000 C CNN
+F 1 "100K" H 6350 3500 60  0000 C CNN
+F 2 "lib_smd:POT_CMS" H 6350 3600 60  0001 C CNN
+F 3 "" H 6350 3600 60  0001 C CNN
+	1    6350 3600
 	1    0    0    1   
 $EndComp
 Wire Wire Line
-	6050 3550 6150 3550
+	6000 3600 6100 3600
 Wire Wire Line
-	8350 4400 8850 4400
-Text HLabel 10450 4700 2    60   Output ~ 0
+	8400 4400 8900 4400
+Text HLabel 10600 4700 2    60   Output ~ 0
 CVBSOUT
 Wire Wire Line
-	5250 2950 5250 3050
+	5200 3000 5200 3100
 Wire Wire Line
-	5850 3250 5950 3250
+	5800 3300 5900 3300
 Wire Wire Line
-	6950 2950 6850 2950
+	6900 3000 6800 3000
 Wire Wire Line
-	4550 2550 4450 2550
-Text HLabel 10500 3000 2    60   Output ~ 0
+	4500 2600 4400 2600
+Text HLabel 10600 3100 2    60   Output ~ 0
 YOUT
-Connection ~ 9800 3000
-Text HLabel 10500 1450 2    60   Output ~ 0
+Connection ~ 9800 3100
+Text HLabel 10600 1500 2    60   Output ~ 0
 COUT
 $Comp
 L VCC #VCC033
 U 1 1 4BF0369D
-P 7900 1150
-F 0 "#VCC033" H 7900 1250 30  0001 C CNN
-F 1 "VCC" H 7900 1250 30  0000 C CNN
-F 2 "" H 7900 1150 60  0001 C CNN
-F 3 "" H 7900 1150 60  0001 C CNN
-	1    7900 1150
+P 8000 1200
+F 0 "#VCC033" H 8000 1300 30  0001 C CNN
+F 1 "VCC" H 8000 1300 30  0000 C CNN
+F 2 "" H 8000 1200 60  0001 C CNN
+F 3 "" H 8000 1200 60  0001 C CNN
+	1    8000 1200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7800 1150 7900 1150
+	7900 1200 8000 1200
 $Comp
 L NPN Q1
 U 1 1 22761039
-P 9700 1150
-F 0 "Q1" H 9850 1150 50  0000 C CNN
-F 1 "BC848" H 9600 1300 50  0000 C CNN
-F 2 "lib_smd:SOT23EBC" H 9700 1150 60  0001 C CNN
-F 3 "" H 9700 1150 60  0001 C CNN
-	1    9700 1150
+P 9700 1200
+F 0 "Q1" H 9600 1450 50  0000 C CNN
+F 1 "BC848" H 9600 1350 50  0000 C CNN
+F 2 "lib_smd:SOT23EBC" H 9700 1200 60  0001 C CNN
+F 3 "" H 9700 1200 60  0001 C CNN
+	1    9700 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L NPN Q2
 U 1 1 22761066
-P 9700 2700
-F 0 "Q2" H 9850 2700 50  0000 C CNN
-F 1 "BC848" H 9600 2850 50  0000 C CNN
-F 2 "lib_smd:SOT23EBC" H 9700 2700 60  0001 C CNN
-F 3 "" H 9700 2700 60  0001 C CNN
-	1    9700 2700
+P 9700 2800
+F 0 "Q2" H 9600 3050 50  0000 C CNN
+F 1 "BC848" H 9600 2950 50  0000 C CNN
+F 2 "lib_smd:SOT23EBC" H 9700 2800 60  0001 C CNN
+F 3 "" H 9700 2800 60  0001 C CNN
+	1    9700 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L NPN Q3
 U 1 1 2276107F
-P 9650 4400
-F 0 "Q3" H 9800 4400 50  0000 C CNN
-F 1 "BC848" H 9550 4550 50  0000 C CNN
-F 2 "lib_smd:SOT23EBC" H 9650 4400 60  0001 C CNN
-F 3 "" H 9650 4400 60  0001 C CNN
-	1    9650 4400
+P 9700 4400
+F 0 "Q3" H 9600 4650 50  0000 C CNN
+F 1 "BC848" H 9600 4550 50  0000 C CNN
+F 2 "lib_smd:SOT23EBC" H 9700 4400 60  0001 C CNN
+F 3 "" H 9700 4400 60  0001 C CNN
+	1    9700 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C54
 U 1 1 22760F76
-P 3950 1750
-F 0 "C54" H 4050 1900 50  0000 C CNN
-F 1 "4,7uF" H 4050 1600 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3950 1750 60  0001 C CNN
-F 3 "" H 3950 1750 60  0001 C CNN
-	1    3950 1750
+P 3900 1800
+F 0 "C54" H 4050 1950 50  0000 C CNN
+F 1 "4.7uF" H 4050 1650 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 3900 1800 60  0001 C CNN
+F 3 "" H 3900 1800 60  0001 C CNN
+	1    3900 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R39
 U 1 1 22761048
-P 10250 1450
-F 0 "R39" V 10330 1450 50  0000 C CNN
-F 1 "68" V 10250 1450 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 10250 1450 60  0001 C CNN
-F 3 "" H 10250 1450 60  0001 C CNN
-	1    10250 1450
+P 10250 1500
+F 0 "R39" V 10330 1500 50  0000 C CNN
+F 1 "68" V 10250 1500 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 10250 1500 60  0001 C CNN
+F 3 "" H 10250 1500 60  0001 C CNN
+	1    10250 1500
 	0    1    1    0   
 $EndComp
 $Comp
 L R R16
 U 1 1 2276103E
-P 9150 1150
-F 0 "R16" V 9230 1150 50  0000 C CNN
-F 1 "220" V 9150 1150 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9150 1150 60  0001 C CNN
-F 3 "" H 9150 1150 60  0001 C CNN
-	1    9150 1150
+P 9150 1200
+F 0 "R16" V 9230 1200 50  0000 C CNN
+F 1 "220" V 9150 1200 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9150 1200 60  0001 C CNN
+F 3 "" H 9150 1200 60  0001 C CNN
+	1    9150 1200
 	0    1    1    0   
 $EndComp
 $Comp
 L R R17
 U 1 1 2276107A
-P 9150 2700
-F 0 "R17" V 9230 2700 50  0000 C CNN
-F 1 "220" V 9150 2700 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9150 2700 60  0001 C CNN
-F 3 "" H 9150 2700 60  0001 C CNN
-	1    9150 2700
+P 9150 2800
+F 0 "R17" V 9230 2800 50  0000 C CNN
+F 1 "220" V 9150 2800 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9150 2800 60  0001 C CNN
+F 3 "" H 9150 2800 60  0001 C CNN
+	1    9150 2800
 	0    1    1    0   
 $EndComp
 $Comp
 L R R40
 U 1 1 22761075
-P 10250 3000
-F 0 "R40" H 10250 3100 60  0000 C CNN
-F 1 "68" H 10250 2900 60  0000 C CNN
-F 2 "lib_smd:SM1206" H 10250 3000 60  0001 C CNN
-F 3 "" H 10250 3000 60  0001 C CNN
-	1    10250 3000
+P 10250 3100
+F 0 "R40" V 10350 3100 60  0000 C CNN
+F 1 "68" V 10250 3100 60  0000 C CNN
+F 2 "lib_smd:SM1206" H 10250 3100 60  0001 C CNN
+F 3 "" H 10250 3100 60  0001 C CNN
+	1    10250 3100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R18
 U 1 1 22761093
-P 9100 4400
-F 0 "R18" V 9180 4400 50  0000 C CNN
-F 1 "220" V 9100 4400 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9100 4400 60  0001 C CNN
-F 3 "" H 9100 4400 60  0001 C CNN
-	1    9100 4400
+P 9150 4400
+F 0 "R18" V 9230 4400 50  0000 C CNN
+F 1 "220" V 9150 4400 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9150 4400 60  0001 C CNN
+F 3 "" H 9150 4400 60  0001 C CNN
+	1    9150 4400
 	0    1    1    0   
 $EndComp
 $Comp
 L R R41
 U 1 1 2276108E
-P 10200 4700
-F 0 "R41" V 10280 4700 50  0000 C CNN
-F 1 "68" V 10200 4700 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 10200 4700 60  0001 C CNN
-F 3 "" H 10200 4700 60  0001 C CNN
-	1    10200 4700
+P 10250 4700
+F 0 "R41" V 10330 4700 50  0000 C CNN
+F 1 "68" V 10250 4700 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 10250 4700 60  0001 C CNN
+F 3 "" H 10250 4700 60  0001 C CNN
+	1    10250 4700
 	0    1    1    0   
 $EndComp
-Connection ~ 9800 1450
+Connection ~ 9800 1500
 $Comp
 L R R30
 U 1 1 22760FE4
-P 2200 1750
-F 0 "R30" V 2280 1750 50  0000 C CNN
-F 1 "3,3K" V 2200 1750 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 2200 1750 60  0001 C CNN
-F 3 "" H 2200 1750 60  0001 C CNN
-	1    2200 1750
+P 2150 1800
+F 0 "R30" V 2230 1800 50  0000 C CNN
+F 1 "3,3K" V 2150 1800 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2150 1800 60  0001 C CNN
+F 3 "" H 2150 1800 60  0001 C CNN
+	1    2150 1800
 	0    1    1    0   
 $EndComp
 $Comp
 L R R31
 U 1 1 22760FDF
-P 3000 1750
-F 0 "R31" V 3080 1750 50  0000 C CNN
-F 1 "470" V 3000 1750 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3000 1750 60  0001 C CNN
-F 3 "" H 3000 1750 60  0001 C CNN
-	1    3000 1750
+P 2950 1800
+F 0 "R31" V 3030 1800 50  0000 C CNN
+F 1 "470" V 2950 1800 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2950 1800 60  0001 C CNN
+F 3 "" H 2950 1800 60  0001 C CNN
+	1    2950 1800
 	0    1    1    0   
 $EndComp
 $Comp
 L R R10
 U 1 1 22760F80
-P 4900 2350
-F 0 "R10" V 4980 2350 50  0000 C CNN
-F 1 "1K" V 4900 2350 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 4900 2350 60  0001 C CNN
-F 3 "" H 4900 2350 60  0001 C CNN
-	1    4900 2350
+P 4850 2400
+F 0 "R10" V 4930 2400 50  0000 C CNN
+F 1 "1K" V 4850 2400 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 4850 2400 60  0001 C CNN
+F 3 "" H 4850 2400 60  0001 C CNN
+	1    4850 2400
 	0    1    1    0   
 $EndComp
 $Comp
 L R R11
 U 1 1 22760FBC
-P 6600 2950
-F 0 "R11" V 6680 2950 50  0000 C CNN
-F 1 "1K" V 6600 2950 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 6600 2950 60  0001 C CNN
-F 3 "" H 6600 2950 60  0001 C CNN
-	1    6600 2950
+P 6550 3000
+F 0 "R11" V 6630 3000 50  0000 C CNN
+F 1 "1K" V 6550 3000 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 6550 3000 60  0001 C CNN
+F 3 "" H 6550 3000 60  0001 C CNN
+	1    6550 3000
 	0    1    1    0   
 $EndComp
 $Comp
 L R R9
 U 1 1 22761098
-P 5800 3550
-F 0 "R9" V 5880 3550 50  0000 C CNN
-F 1 "150K" V 5800 3550 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 5800 3550 60  0001 C CNN
-F 3 "" H 5800 3550 60  0001 C CNN
-	1    5800 3550
+P 5750 3600
+F 0 "R9" V 5830 3600 50  0000 C CNN
+F 1 "150K" V 5750 3600 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 5750 3600 60  0001 C CNN
+F 3 "" H 5750 3600 60  0001 C CNN
+	1    5750 3600
 	0    1    1    0   
 $EndComp
 $Comp
 L C C61
 U 1 1 22760F8A
-P 2550 2100
-F 0 "C61" V 2600 2250 50  0000 C CNN
-F 1 "47nF" V 2600 1950 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 2550 2100 60  0001 C CNN
-F 3 "" H 2550 2100 60  0001 C CNN
-	1    2550 2100
+P 2500 2150
+F 0 "C61" H 2600 2250 50  0000 C CNN
+F 1 "47nF" H 2600 2050 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2500 2150 60  0001 C CNN
+F 3 "" H 2500 2150 60  0001 C CNN
+	1    2500 2150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C60
 U 1 1 22760F67
-P 2350 3450
-F 0 "C60" V 2400 3600 50  0000 C CNN
-F 1 "47nF" V 2400 3300 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 2350 3450 60  0001 C CNN
-F 3 "" H 2350 3450 60  0001 C CNN
-	1    2350 3450
+P 2300 3500
+F 0 "C60" V 2350 3650 50  0000 C CNN
+F 1 "47nF" V 2350 3350 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2300 3500 60  0001 C CNN
+F 3 "" H 2300 3500 60  0001 C CNN
+	1    2300 3500
 	0    1    1    0   
 $EndComp
 $Comp
 L C C43
 U 1 1 22760F8F
-P 1550 4100
-F 0 "C43" V 1600 4250 50  0000 C CNN
-F 1 "220nF" V 1600 3950 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 1550 4100 60  0001 C CNN
-F 3 "" H 1550 4100 60  0001 C CNN
-	1    1550 4100
+P 1500 4150
+F 0 "C43" H 1650 4250 50  0000 C CNN
+F 1 "220nF" H 1650 4050 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 1500 4150 60  0001 C CNN
+F 3 "" H 1500 4150 60  0001 C CNN
+	1    1500 4150
 	1    0    0    -1  
 $EndComp
 $Comp
 L CTRIM CV1
 U 1 1 22760FA8
-P 2150 5300
-F 0 "CV1" H 2280 5220 50  0000 C CNN
-F 1 "5/30pF" H 2300 5140 50  0000 C CNN
-F 2 "discret:CV3-30PF" H 2150 5300 60  0001 C CNN
-F 3 "" H 2150 5300 60  0001 C CNN
-	1    2150 5300
+P 2100 5350
+F 0 "CV1" H 2230 5270 50  0000 C CNN
+F 1 "5/30pF" H 2250 5190 50  0000 C CNN
+F 2 "discret:CV3-30PF" H 2100 5350 60  0001 C CNN
+F 3 "" H 2100 5350 60  0001 C CNN
+	1    2100 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C45
 U 1 1 22760FD5
-P 4550 4150
-F 0 "C45" V 4600 4300 50  0000 C CNN
-F 1 "220nF" V 4600 4000 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 4550 4150 60  0001 C CNN
-F 3 "" H 4550 4150 60  0001 C CNN
-	1    4550 4150
+P 4500 4200
+F 0 "C45" H 4650 4300 50  0000 C CNN
+F 1 "220nF" H 4650 4050 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 4500 4200 60  0001 C CNN
+F 3 "" H 4500 4200 60  0001 C CNN
+	1    4500 4200
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C48
 U 1 1 22760FCB
-P 5250 3250
-F 0 "C48" V 5300 3400 50  0000 C CNN
-F 1 "22nF" V 5300 3100 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 5250 3250 60  0001 C CNN
-F 3 "" H 5250 3250 60  0001 C CNN
-	1    5250 3250
+P 5200 3300
+F 0 "C48" H 5100 3200 50  0000 C CNN
+F 1 "22nF" H 5100 3400 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 5200 3300 60  0001 C CNN
+F 3 "" H 5200 3300 60  0001 C CNN
+	1    5200 3300
 	-1   0    0    1   
 $EndComp
 $Comp
 L CP C64
 U 1 1 22760FC1
-P 6150 3250
-F 0 "C64" H 6250 3400 50  0000 C CNN
-F 1 "6,8uF" H 6250 3100 50  0000 C CNN
-F 2 "lib_smd:SM1210L" H 6150 3250 60  0001 C CNN
-F 3 "" H 6150 3250 60  0001 C CNN
-	1    6150 3250
+P 6100 3300
+F 0 "C64" V 6250 3450 50  0000 C CNN
+F 1 "6,8uF" V 6250 3150 50  0000 C CNN
+F 2 "lib_smd:SM1210L" H 6100 3300 60  0001 C CNN
+F 3 "" H 6100 3300 60  0001 C CNN
+	1    6100 3300
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C44
 U 1 1 22760F99
-P 1000 3600
-F 0 "C44" V 1050 3750 50  0000 C CNN
-F 1 "220nF" V 1050 3450 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 1000 3600 60  0001 C CNN
-F 3 "" H 1000 3600 60  0001 C CNN
-	1    1000 3600
+P 950 3650
+F 0 "C44" H 1100 3750 50  0000 C CNN
+F 1 "220nF" H 1100 3550 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 950 3650 60  0001 C CNN
+F 3 "" H 950 3650 60  0001 C CNN
+	1    950  3650
 	1    0    0    -1  
 $EndComp
-Text HLabel 1950 1750 0    60   Input ~ 0
+Text HLabel 1900 1800 0    60   Input ~ 0
 CSYNC-OUT
 $Comp
 L C C53
 U 1 1 22760FF8
-P 5550 4850
-F 0 "C53" H 5600 4950 50  0000 L CNN
-F 1 "330pF" H 5600 4750 50  0000 L CNN
-F 2 "lib_smd:SM1206" H 5550 4850 60  0001 C CNN
-F 3 "" H 5550 4850 60  0001 C CNN
-	1    5550 4850
+P 5500 4900
+F 0 "C53" H 5550 5000 50  0000 L CNN
+F 1 "330pF" H 5550 4800 50  0000 L CNN
+F 2 "lib_smd:SM1206" H 5500 4900 60  0001 C CNN
+F 3 "" H 5500 4900 60  0001 C CNN
+	1    5500 4900
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L1
 U 1 1 22760FF3
-P 5550 4150
-F 0 "L1" V 5500 4150 40  0000 C CNN
-F 1 "2,2uH" V 5650 4150 40  0000 C CNN
-F 2 "lib_smd:SM1812" H 5550 4150 60  0001 C CNN
-F 3 "" H 5550 4150 60  0001 C CNN
-	1    5550 4150
+P 5500 4200
+F 0 "L1" V 5450 4200 40  0000 C CNN
+F 1 "2,2uH" V 5600 4200 40  0000 C CNN
+F 2 "lib_smd:SM1812" H 5500 4200 60  0001 C CNN
+F 3 "" H 5500 4200 60  0001 C CNN
+	1    5500 4200
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L3
 U 1 1 22761052
-P 7500 1150
-F 0 "L3" V 7450 1150 40  0000 C CNN
-F 1 "22uH" V 7600 1150 40  0000 C CNN
-F 2 "lib_smd:SM1812" H 7500 1150 60  0001 C CNN
-F 3 "" H 7500 1150 60  0001 C CNN
-	1    7500 1150
-	0    1    1    0   
+P 7600 1200
+F 0 "L3" V 7800 1200 50  0000 C CNN
+F 1 "22uH" V 7700 1200 50  0000 C CNN
+F 2 "lib_smd:SM1812" H 7600 1200 60  0001 C CNN
+F 3 "" H 7600 1200 60  0001 C CNN
+	1    7600 1200
+	0    1    -1   0   
 $EndComp
 $Comp
 L INDUCTOR L2
 U 1 1 22760F71
-P 4350 1450
-F 0 "L2" V 4300 1450 40  0000 C CNN
-F 1 "22uH" V 4450 1450 40  0000 C CNN
-F 2 "lib_smd:SM1812" H 4350 1450 60  0001 C CNN
-F 3 "" H 4350 1450 60  0001 C CNN
-	1    4350 1450
-	0    1    1    0   
+P 4300 1500
+F 0 "L2" V 4500 1500 50  0000 C CNN
+F 1 "22uH" V 4400 1500 50  0000 C CNN
+F 2 "lib_smd:SM1812" H 4300 1500 60  0001 C CNN
+F 3 "" H 4300 1500 60  0001 C CNN
+	1    4300 1500
+	0    1    -1   0   
 $EndComp
 $Comp
 L TDA8501 U20
 U 1 1 22760F4E
-P 3550 3350
-F 0 "U20" H 3550 3450 60  0000 C CNN
-F 1 "TDA8501" H 3550 3250 60  0000 C CNN
-F 2 "lib_smd:SO24E" H 3550 3350 60  0001 C CNN
-F 3 "" H 3550 3350 60  0001 C CNN
-	1    3550 3350
+P 3500 3400
+F 0 "U20" H 3500 3500 60  0000 C CNN
+F 1 "TDA8501" H 3500 3300 60  0000 C CNN
+F 2 "lib_smd:SO24E" H 3500 3400 60  0001 C CNN
+F 3 "" H 3500 3400 60  0001 C CNN
+	1    3500 3400
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C46
 U 1 1 22760FFD
-P 6250 4850
-F 0 "C46" H 6300 4950 50  0000 L CNN
-F 1 "220pF" H 6300 4750 50  0000 L CNN
-F 2 "lib_smd:SM1206" H 6250 4850 60  0001 C CNN
-F 3 "" H 6250 4850 60  0001 C CNN
-	1    6250 4850
+P 6200 4900
+F 0 "C46" H 6250 5000 50  0000 L CNN
+F 1 "220pF" H 6250 4800 50  0000 L CNN
+F 2 "lib_smd:SM1206" H 6200 4900 60  0001 C CNN
+F 3 "" H 6200 4900 60  0001 C CNN
+	1    6200 4900
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R34
 U 1 1 22761089
-P 9750 5050
-F 0 "R34" V 9830 5050 50  0000 C CNN
-F 1 "470" V 9750 5050 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9750 5050 60  0001 C CNN
-F 3 "" H 9750 5050 60  0001 C CNN
-	1    9750 5050
+P 9800 5050
+F 0 "R34" V 9880 5050 50  0000 C CNN
+F 1 "470" V 9800 5050 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9800 5050 60  0001 C CNN
+F 3 "" H 9800 5050 60  0001 C CNN
+	1    9800 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R33
 U 1 1 22761070
-P 9800 3350
-F 0 "R33" V 9880 3350 50  0000 C CNN
-F 1 "470" V 9800 3350 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9800 3350 60  0001 C CNN
-F 3 "" H 9800 3350 60  0001 C CNN
-	1    9800 3350
+P 9800 3450
+F 0 "R33" V 9880 3450 50  0000 C CNN
+F 1 "470" V 9800 3450 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9800 3450 60  0001 C CNN
+F 3 "" H 9800 3450 60  0001 C CNN
+	1    9800 3450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R32
 U 1 1 22761043
-P 9800 1800
-F 0 "R32" V 9880 1800 50  0000 C CNN
-F 1 "470" V 9800 1800 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 9800 1800 60  0001 C CNN
-F 3 "" H 9800 1800 60  0001 C CNN
-	1    9800 1800
+P 9800 1850
+F 0 "R32" V 9880 1850 50  0000 C CNN
+F 1 "470" V 9800 1850 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 9800 1850 60  0001 C CNN
+F 3 "" H 9800 1850 60  0001 C CNN
+	1    9800 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C55
 U 1 1 22761057
-P 7100 1450
-F 0 "C55" H 7200 1600 50  0000 C CNN
-F 1 "4,7uF" H 7200 1300 50  0000 C CNN
-F 2 "lib_smd:SM1210L" H 7100 1450 60  0001 C CNN
-F 3 "" H 7100 1450 60  0001 C CNN
-	1    7100 1450
+P 7200 1500
+F 0 "C55" H 7350 1600 50  0000 C CNN
+F 1 "4.7uF" H 7350 1400 50  0000 C CNN
+F 2 "lib_smd:SM1210L" H 7200 1500 60  0001 C CNN
+F 3 "" H 7200 1500 60  0001 C CNN
+	1    7200 1500
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C59
 U 1 1 22760F62
-P 1850 3550
-F 0 "C59" V 1900 3700 50  0000 C CNN
-F 1 "47nF" V 1900 3400 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 1850 3550 60  0001 C CNN
-F 3 "" H 1850 3550 60  0001 C CNN
-	1    1850 3550
+P 1800 3600
+F 0 "C59" V 1850 3750 50  0000 C CNN
+F 1 "47nF" V 1850 3450 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 1800 3600 60  0001 C CNN
+F 3 "" H 1800 3600 60  0001 C CNN
+	1    1800 3600
 	0    1    1    0   
 $EndComp
 $Comp
 L C C58
 U 1 1 22760F53
-P 2350 3650
-F 0 "C58" V 2400 3800 50  0000 C CNN
-F 1 "47nF" V 2400 3500 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 2350 3650 60  0001 C CNN
-F 3 "" H 2350 3650 60  0001 C CNN
-	1    2350 3650
+P 2300 3700
+F 0 "C58" V 2350 3850 50  0000 C CNN
+F 1 "47nF" V 2350 3550 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 2300 3700 60  0001 C CNN
+F 3 "" H 2300 3700 60  0001 C CNN
+	1    2300 3700
 	0    1    1    0   
 $EndComp
 $Comp
 L CRYSTAL X3
 U 1 1 22760FA3
-P 2150 4750
-F 0 "X3" H 2150 4850 60  0000 C CNN
-F 1 "4,433618MH" H 2150 4650 60  0000 C CNN
-F 2 "discret:HC-18UH" H 2150 4750 60  0001 C CNN
-F 3 "" H 2150 4750 60  0001 C CNN
-	1    2150 4750
+P 2100 4800
+F 0 "X3" V 2300 4900 60  0000 C CNN
+F 1 "4.433618MHz" V 1900 4450 60  0000 C CNN
+F 2 "discret:HC-18UH" H 2100 4800 60  0001 C CNN
+F 3 "" H 2100 4800 60  0001 C CNN
+	1    2100 4800
 	0    -1   -1   0   
 $EndComp
+Connection ~ 3500 1500
+Wire Wire Line
+	7200 1200 7200 1300
+Connection ~ 7200 1200
+Wire Wire Line
+	7100 1200 7100 1100
+Wire Wire Line
+	3900 2050 3900 2000
+Wire Wire Line
+	3300 1850 3300 1800
+Wire Wire Line
+	3300 1800 3200 1800
+Wire Wire Line
+	1500 4400 1500 4350
+Wire Wire Line
+	950  3900 950  3850
+Wire Wire Line
+	2100 5600 2100 5550
+Wire Wire Line
+	3500 4500 3500 4450
+Wire Wire Line
+	4500 4450 4500 4400
+Wire Wire Line
+	4450 3800 4400 3800
+Wire Wire Line
+	6200 5100 6200 5150
+Wire Wire Line
+	5500 5150 5500 5100
+Wire Wire Line
+	7200 1750 7200 1700
+Wire Wire Line
+	9800 2150 9800 2100
+Wire Wire Line
+	9800 3750 9800 3700
+Wire Wire Line
+	9800 5350 9800 5300
+Wire Wire Line
+	10600 1500 10500 1500
+Wire Wire Line
+	10500 3100 10600 3100
+Wire Wire Line
+	10500 4700 10600 4700
 $EndSCHEMATC
diff --git a/demos/video/muxdata.sch b/demos/video/muxdata.sch
index a295314..3eff0f3 100644
--- a/demos/video/muxdata.sch
+++ b/demos/video/muxdata.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
@@ -34,603 +34,603 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 5050 4500
+NoConn ~ 6100 4800
 Wire Wire Line
-	5050 2100 4550 2100
-Text HLabel 5050 2900 0    60   Input ~ 0
+	6100 2400 5600 2400
+Text HLabel 6100 3200 0    60   Input ~ 0
 CLAMP
-Text HLabel 5050 3100 0    60   Input ~ 0
+Text HLabel 6100 3400 0    60   Input ~ 0
 CSYNC-OUT
-Text HLabel 5050 3000 0    60   Input ~ 0
+Text HLabel 6100 3300 0    60   Input ~ 0
 BLANK-
-Text HLabel 5050 3400 0    60   Input ~ 0
+Text HLabel 6100 3700 0    60   Input ~ 0
 ACQ_ON
-NoConn ~ 6950 4000
-NoConn ~ 6950 3900
-NoConn ~ 5050 2800
+NoConn ~ 8000 4300
+NoConn ~ 8000 4200
+NoConn ~ 6100 3100
 Wire Wire Line
-	5050 4200 4300 4200
-Text Label 4300 4200 0    60   ~ 0
+	6100 4500 5350 4500
+Text Label 5350 4500 0    60   ~ 0
 ACCES_RAM-
-Text HLabel 1350 5400 0    60   Input ~ 0
+Text HLabel 2400 5700 0    60   Input ~ 0
 ACCES_RAM-
-Text HLabel 1350 5300 0    60   Input ~ 0
+Text HLabel 2400 5600 0    60   Input ~ 0
 DATA_WR
-Text HLabel 1300 600  0    60   BiDi ~ 0
+Text HLabel 2350 900  0    60   BiDi ~ 0
 DPC[0..31]
 Wire Wire Line
-	1550 5100 1000 5100
+	2600 5400 2050 5400
 Wire Wire Line
-	1550 5000 1000 5000
+	2600 5300 2050 5300
 Wire Wire Line
-	1550 4900 1000 4900
+	2600 5200 2050 5200
 Wire Wire Line
-	1550 4800 1000 4800
+	2600 5100 2050 5100
 Wire Wire Line
-	1550 4700 1000 4700
+	2600 5000 2050 5000
 Wire Wire Line
-	1550 4600 1000 4600
+	2600 4900 2050 4900
 Wire Wire Line
-	1550 4500 1000 4500
+	2600 4800 2050 4800
 Wire Wire Line
-	1550 4400 1000 4400
+	2600 4700 2050 4700
 Wire Wire Line
-	1550 3900 1000 3900
+	2600 4200 2050 4200
 Wire Wire Line
-	1550 3800 1000 3800
+	2600 4100 2050 4100
 Wire Wire Line
-	1550 3700 1000 3700
+	2600 4000 2050 4000
 Wire Wire Line
-	1550 3600 1000 3600
+	2600 3900 2050 3900
 Wire Wire Line
-	1550 3500 1000 3500
+	2600 3800 2050 3800
 Wire Wire Line
-	1550 3400 1000 3400
+	2600 3700 2050 3700
 Wire Wire Line
-	1550 3300 1000 3300
+	2600 3600 2050 3600
 Wire Wire Line
-	1550 3200 1000 3200
+	2600 3500 2050 3500
 Wire Wire Line
-	1550 2700 1000 2700
+	2600 3000 2050 3000
 Wire Wire Line
-	1550 2600 1000 2600
+	2600 2900 2050 2900
 Wire Wire Line
-	1550 2500 1000 2500
+	2600 2800 2050 2800
 Wire Wire Line
-	1550 2400 1000 2400
+	2600 2700 2050 2700
 Wire Wire Line
-	1550 2300 1000 2300
+	2600 2600 2050 2600
 Wire Wire Line
-	1550 2200 1000 2200
+	2600 2500 2050 2500
 Wire Wire Line
-	1550 2100 1000 2100
+	2600 2400 2050 2400
 Wire Wire Line
-	1550 2000 1000 2000
+	2600 2300 2050 2300
 Wire Wire Line
-	1550 1500 1000 1500
+	2600 1800 2050 1800
 Wire Wire Line
-	1550 1400 1000 1400
+	2600 1700 2050 1700
 Wire Wire Line
-	1550 1300 1000 1300
+	2600 1600 2050 1600
 Wire Wire Line
-	1550 1200 1000 1200
+	2600 1500 2050 1500
 Wire Wire Line
-	1550 1100 1000 1100
+	2600 1400 2050 1400
 Wire Wire Line
-	1550 1000 1000 1000
+	2600 1300 2050 1300
 Wire Wire Line
-	1550 900  1000 900 
+	2600 1200 2050 1200
 Wire Wire Line
-	1550 800  1000 800 
-Text Label 1050 5100 0    60   ~ 0
+	2600 1100 2050 1100
+Text Label 2100 5400 0    60   ~ 0
 DPC31
-Text Label 1050 5000 0    60   ~ 0
+Text Label 2100 5300 0    60   ~ 0
 DPC30
-Text Label 1050 4900 0    60   ~ 0
+Text Label 2100 5200 0    60   ~ 0
 DPC29
-Text Label 1050 4800 0    60   ~ 0
+Text Label 2100 5100 0    60   ~ 0
 DPC28
-Text Label 1050 4700 0    60   ~ 0
+Text Label 2100 5000 0    60   ~ 0
 DPC27
-Text Label 1050 4600 0    60   ~ 0
+Text Label 2100 4900 0    60   ~ 0
 DPC26
-Text Label 1050 4500 0    60   ~ 0
+Text Label 2100 4800 0    60   ~ 0
 DPC25
-Text Label 1050 4400 0    60   ~ 0
+Text Label 2100 4700 0    60   ~ 0
 DPC24
-Text Label 1050 3900 0    60   ~ 0
+Text Label 2100 4200 0    60   ~ 0
 DPC23
-Text Label 1050 3800 0    60   ~ 0
+Text Label 2100 4100 0    60   ~ 0
 DPC22
-Text Label 1050 3700 0    60   ~ 0
+Text Label 2100 4000 0    60   ~ 0
 DPC21
-Text Label 1050 3600 0    60   ~ 0
+Text Label 2100 3900 0    60   ~ 0
 DPC20
-Text Label 1050 3500 0    60   ~ 0
+Text Label 2100 3800 0    60   ~ 0
 DPC19
-Text Label 1050 3400 0    60   ~ 0
+Text Label 2100 3700 0    60   ~ 0
 DPC18
-Text Label 1050 3300 0    60   ~ 0
+Text Label 2100 3600 0    60   ~ 0
 DPC17
-Text Label 1050 3200 0    60   ~ 0
+Text Label 2100 3500 0    60   ~ 0
 DPC16
-Text Label 1050 2700 0    60   ~ 0
+Text Label 2100 3000 0    60   ~ 0
 DPC15
-Text Label 1050 2600 0    60   ~ 0
+Text Label 2100 2900 0    60   ~ 0
 DPC14
-Text Label 1050 2500 0    60   ~ 0
+Text Label 2100 2800 0    60   ~ 0
 DPC13
-Text Label 1050 2400 0    60   ~ 0
+Text Label 2100 2700 0    60   ~ 0
 DPC12
-Text Label 1050 2300 0    60   ~ 0
+Text Label 2100 2600 0    60   ~ 0
 DPC11
-Text Label 1050 2200 0    60   ~ 0
+Text Label 2100 2500 0    60   ~ 0
 DPC10
-Text Label 1050 2100 0    60   ~ 0
+Text Label 2100 2400 0    60   ~ 0
 DPC9
-Text Label 1050 2000 0    60   ~ 0
+Text Label 2100 2300 0    60   ~ 0
 DPC8
-Text Label 1050 1500 0    60   ~ 0
+Text Label 2100 1800 0    60   ~ 0
 DPC7
-Text Label 1050 1400 0    60   ~ 0
+Text Label 2100 1700 0    60   ~ 0
 DPC6
-Text Label 1050 1300 0    60   ~ 0
+Text Label 2100 1600 0    60   ~ 0
 DPC5
-Text Label 1050 1200 0    60   ~ 0
+Text Label 2100 1500 0    60   ~ 0
 DPC4
-Text Label 1050 1100 0    60   ~ 0
+Text Label 2100 1400 0    60   ~ 0
 DPC3
-Text Label 1050 1000 0    60   ~ 0
+Text Label 2100 1300 0    60   ~ 0
 DPC2
-Text Label 1050 900  0    60   ~ 0
+Text Label 2100 1200 0    60   ~ 0
 DPC1
-Text Label 1050 800  0    60   ~ 0
+Text Label 2100 1100 0    60   ~ 0
 DPC0
-Connection ~ 1450 2900
-Connection ~ 1500 3000
-Connection ~ 1500 4200
-Connection ~ 1450 4100
-Connection ~ 1450 5300
-Connection ~ 1500 5400
+Connection ~ 2500 3200
+Connection ~ 2550 3300
+Connection ~ 2550 4500
+Connection ~ 2500 4400
+Connection ~ 2500 5600
+Connection ~ 2550 5700
 Wire Wire Line
-	1550 3000 1500 3000
+	2600 3300 2550 3300
 Wire Wire Line
-	1550 4200 1500 4200
+	2600 4500 2550 4500
 Wire Wire Line
-	1550 5400 1350 5400
+	2600 5700 2400 5700
 Wire Wire Line
-	1500 5400 1500 1800
+	2550 5700 2550 2100
 Wire Wire Line
-	1500 1800 1550 1800
+	2550 2100 2600 2100
 Wire Wire Line
-	1550 2900 1450 2900
+	2600 3200 2500 3200
 Wire Wire Line
-	1550 4100 1450 4100
+	2600 4400 2500 4400
 Wire Wire Line
-	1350 5300 1550 5300
+	2400 5600 2600 5600
 Wire Wire Line
-	1450 5300 1450 1700
+	2500 5600 2500 2000
 Wire Wire Line
-	1450 1700 1550 1700
+	2500 2000 2600 2000
 Wire Wire Line
-	2950 5100 3500 5100
+	4000 5400 4550 5400
 Wire Wire Line
-	2950 5000 3500 5000
+	4000 5300 4550 5300
 Wire Wire Line
-	2950 4900 3500 4900
+	4000 5200 4550 5200
 Wire Wire Line
-	2950 4800 3500 4800
+	4000 5100 4550 5100
 Wire Wire Line
-	2950 4700 3500 4700
+	4000 5000 4550 5000
 Wire Wire Line
-	2950 4600 3500 4600
+	4000 4900 4550 4900
 Wire Wire Line
-	2950 4500 3500 4500
+	4000 4800 4550 4800
 Wire Wire Line
-	2950 4400 3500 4400
+	4000 4700 4550 4700
 Wire Wire Line
-	2950 3900 3500 3900
+	4000 4200 4550 4200
 Wire Wire Line
-	2950 3800 3500 3800
+	4000 4100 4550 4100
 Wire Wire Line
-	2950 3700 3500 3700
+	4000 4000 4550 4000
 Wire Wire Line
-	2950 3600 3500 3600
+	4000 3900 4550 3900
 Wire Wire Line
-	2950 3500 3500 3500
+	4000 3800 4550 3800
 Wire Wire Line
-	2950 3400 3500 3400
+	4000 3700 4550 3700
 Wire Wire Line
-	2950 3300 3500 3300
+	4000 3600 4550 3600
 Wire Wire Line
-	2950 3200 3500 3200
+	4000 3500 4550 3500
 Wire Wire Line
-	2950 2700 3500 2700
+	4000 3000 4550 3000
 Wire Wire Line
-	2950 2600 3500 2600
+	4000 2900 4550 2900
 Wire Wire Line
-	2950 2500 3500 2500
+	4000 2800 4550 2800
 Wire Wire Line
-	2950 2400 3500 2400
+	4000 2700 4550 2700
 Wire Wire Line
-	2950 2300 3500 2300
+	4000 2600 4550 2600
 Wire Wire Line
-	2950 2200 3500 2200
+	4000 2500 4550 2500
 Wire Wire Line
-	2950 2100 3500 2100
+	4000 2400 4550 2400
 Wire Wire Line
-	2950 2000 3500 2000
+	4000 2300 4550 2300
 Wire Wire Line
-	2950 1500 3500 1500
+	4000 1800 4550 1800
 Wire Wire Line
-	2950 1400 3500 1400
+	4000 1700 4550 1700
 Wire Wire Line
-	2950 1300 3500 1300
+	4000 1600 4550 1600
 Wire Wire Line
-	2950 1200 3500 1200
+	4000 1500 4550 1500
 Wire Wire Line
-	2950 1100 3500 1100
+	4000 1400 4550 1400
 Wire Wire Line
-	2950 1000 3500 1000
+	4000 1300 4550 1300
 Wire Wire Line
-	2950 900  3500 900 
+	4000 1200 4550 1200
 Wire Wire Line
-	2950 800  3500 800 
-Text Label 3050 5100 0    60   ~ 0
+	4000 1100 4550 1100
+Text Label 4100 5400 0    60   ~ 0
 VRAM31
-Text Label 3050 5000 0    60   ~ 0
+Text Label 4100 5300 0    60   ~ 0
 VRAM30
-Text Label 3050 4900 0    60   ~ 0
+Text Label 4100 5200 0    60   ~ 0
 VRAM29
-Text Label 3050 4800 0    60   ~ 0
+Text Label 4100 5100 0    60   ~ 0
 VRAM28
-Text Label 3050 4700 0    60   ~ 0
+Text Label 4100 5000 0    60   ~ 0
 VRAM27
-Text Label 3050 4600 0    60   ~ 0
+Text Label 4100 4900 0    60   ~ 0
 VRAM26
-Text Label 3050 4500 0    60   ~ 0
+Text Label 4100 4800 0    60   ~ 0
 VRAM25
-Text Label 3050 4400 0    60   ~ 0
+Text Label 4100 4700 0    60   ~ 0
 VRAM24
-Text Label 3050 3900 0    60   ~ 0
+Text Label 4100 4200 0    60   ~ 0
 VRAM23
-Text Label 3050 3800 0    60   ~ 0
+Text Label 4100 4100 0    60   ~ 0
 VRAM22
-Text Label 3050 3700 0    60   ~ 0
+Text Label 4100 4000 0    60   ~ 0
 VRAM21
-Text Label 3050 3600 0    60   ~ 0
+Text Label 4100 3900 0    60   ~ 0
 VRAM20
-Text Label 3050 3500 0    60   ~ 0
+Text Label 4100 3800 0    60   ~ 0
 VRAM19
-Text Label 3050 3400 0    60   ~ 0
+Text Label 4100 3700 0    60   ~ 0
 VRAM18
-Text Label 3050 3300 0    60   ~ 0
+Text Label 4100 3600 0    60   ~ 0
 VRAM17
-Text Label 3050 3200 0    60   ~ 0
+Text Label 4100 3500 0    60   ~ 0
 VRAM16
-Text Label 3050 2700 0    60   ~ 0
+Text Label 4100 3000 0    60   ~ 0
 VRAM15
-Text Label 3050 2600 0    60   ~ 0
+Text Label 4100 2900 0    60   ~ 0
 VRAM14
-Text Label 3050 2500 0    60   ~ 0
+Text Label 4100 2800 0    60   ~ 0
 VRAM13
-Text Label 3050 2400 0    60   ~ 0
+Text Label 4100 2700 0    60   ~ 0
 VRAM12
-Text Label 3050 2300 0    60   ~ 0
+Text Label 4100 2600 0    60   ~ 0
 VRAM11
-Text Label 3050 2200 0    60   ~ 0
+Text Label 4100 2500 0    60   ~ 0
 VRAM10
-Text Label 3050 2100 0    60   ~ 0
+Text Label 4100 2400 0    60   ~ 0
 VRAM9
-Text Label 3050 2000 0    60   ~ 0
+Text Label 4100 2300 0    60   ~ 0
 VRAM8
-Text Label 3050 1500 0    60   ~ 0
+Text Label 4100 1800 0    60   ~ 0
 VRAM7
-Text Label 3050 1400 0    60   ~ 0
+Text Label 4100 1700 0    60   ~ 0
 VRAM6
-Text Label 3050 1300 0    60   ~ 0
+Text Label 4100 1600 0    60   ~ 0
 VRAM5
-Text Label 3050 1200 0    60   ~ 0
+Text Label 4100 1500 0    60   ~ 0
 VRAM4
-Text Label 3050 1100 0    60   ~ 0
+Text Label 4100 1400 0    60   ~ 0
 VRAM3
-Text Label 3050 1000 0    60   ~ 0
+Text Label 4100 1300 0    60   ~ 0
 VRAM2
-Text Label 3050 900  0    60   ~ 0
+Text Label 4100 1200 0    60   ~ 0
 VRAM1
-Text Label 3050 800  0    60   ~ 0
+Text Label 4100 1100 0    60   ~ 0
 VRAM0
 $Comp
 L 74LS245 U6
 U 1 1 4BF036D5
-P 2250 4900
-F 0 "U6" H 2250 4700 60  0000 C CNN
-F 1 "74LS245" H 2250 4600 60  0000 C CNN
-F 2 "lib_smd:SO20L" H 2250 4900 60  0001 C CNN
-F 3 "" H 2250 4900 60  0001 C CNN
-	1    2250 4900
+P 3300 5200
+F 0 "U6" H 3300 5000 60  0000 C CNN
+F 1 "74LS245" H 3300 4900 60  0000 C CNN
+F 2 "lib_smd:SO20L" H 3300 5200 60  0001 C CNN
+F 3 "" H 3300 5200 60  0001 C CNN
+	1    3300 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74LS245 U5
 U 1 1 4BF036D6
-P 2250 3700
-F 0 "U5" H 2250 3500 60  0000 C CNN
-F 1 "74LS245" H 2250 3400 60  0000 C CNN
-F 2 "lib_smd:SO20L" H 2250 3700 60  0001 C CNN
-F 3 "" H 2250 3700 60  0001 C CNN
-	1    2250 3700
+P 3300 4000
+F 0 "U5" H 3300 3800 60  0000 C CNN
+F 1 "74LS245" H 3300 3700 60  0000 C CNN
+F 2 "lib_smd:SO20L" H 3300 4000 60  0001 C CNN
+F 3 "" H 3300 4000 60  0001 C CNN
+	1    3300 4000
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74LS245 U4
 U 1 1 4BF036D7
-P 2250 2500
-F 0 "U4" H 2250 2300 60  0000 C CNN
-F 1 "74LS245" H 2250 2200 60  0000 C CNN
-F 2 "lib_smd:SO20L" H 2250 2500 60  0001 C CNN
-F 3 "" H 2250 2500 60  0001 C CNN
-	1    2250 2500
+P 3300 2800
+F 0 "U4" H 3300 2600 60  0000 C CNN
+F 1 "74LS245" H 3300 2500 60  0000 C CNN
+F 2 "lib_smd:SO20L" H 3300 2800 60  0001 C CNN
+F 3 "" H 3300 2800 60  0001 C CNN
+	1    3300 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74LS245 U3
 U 1 1 33A7E303
-P 2250 1300
-F 0 "U3" H 2250 1100 60  0000 C CNN
-F 1 "74LS245" H 2250 1000 60  0000 C CNN
-F 2 "lib_smd:SO20L" H 2250 1300 60  0001 C CNN
-F 3 "" H 2250 1300 60  0001 C CNN
-	1    2250 1300
+P 3300 1600
+F 0 "U3" H 3300 1400 60  0000 C CNN
+F 1 "74LS245" H 3300 1300 60  0000 C CNN
+F 2 "lib_smd:SO20L" H 3300 1600 60  0001 C CNN
+F 3 "" H 3300 1600 60  0001 C CNN
+	1    3300 1600
 	1    0    0    -1  
 $EndComp
-NoConn ~ 5050 2000
-NoConn ~ 5050 3700
-NoConn ~ 5050 3600
-NoConn ~ 5050 3500
-NoConn ~ 5050 3200
-NoConn ~ 5050 2700
-NoConn ~ 5050 2600
-NoConn ~ 5050 2500
-NoConn ~ 5050 2300
-Text HLabel 5050 1900 0    60   Input ~ 0
+NoConn ~ 6100 2300
+NoConn ~ 6100 4000
+NoConn ~ 6100 3900
+NoConn ~ 6100 3800
+NoConn ~ 6100 3500
+NoConn ~ 6100 3000
+NoConn ~ 6100 2900
+NoConn ~ 6100 2800
+NoConn ~ 6100 2600
+Text HLabel 6100 2200 0    60   Input ~ 0
 X_DIN
-Text HLabel 4550 2100 0    60   Input ~ 0
+Text HLabel 5600 2400 0    60   Input ~ 0
 X_CLK
 Wire Wire Line
-	6950 3100 7450 3100
-Text HLabel 7450 3100 2    60   Input ~ 0
+	8000 3400 8500 3400
+Text HLabel 8500 3400 2    60   Input ~ 0
 CLKCDA
-Text HLabel 5050 2400 0    60   Input ~ 0
+Text HLabel 6100 2700 0    60   Input ~ 0
 CLKCAD
 Wire Wire Line
-	7550 4300 6950 4300
+	8600 4600 8000 4600
 Wire Wire Line
-	7550 4200 6950 4200
+	8600 4500 8000 4500
 Wire Wire Line
-	7550 5000 6950 5000
+	8600 5300 8000 5300
 Wire Wire Line
-	7550 5800 6950 5800
+	8600 6100 8000 6100
 Wire Wire Line
-	5050 4900 4600 4900
+	6100 5200 5650 5200
 Wire Wire Line
-	7550 1400 6950 1400
+	8600 1700 8000 1700
 Wire Wire Line
-	7550 3000 6950 3000
+	8600 3300 8000 3300
 Wire Wire Line
-	7550 2200 6950 2200
+	8600 2500 8000 2500
 Wire Wire Line
-	7550 4100 6950 4100
+	8600 4400 8000 4400
 Wire Wire Line
-	7550 4900 6950 4900
+	8600 5200 8000 5200
 Wire Wire Line
-	7550 5700 6950 5700
+	8600 6000 8000 6000
 Wire Wire Line
-	5050 5000 4600 5000
+	6100 5300 5650 5300
 Wire Wire Line
-	7550 1300 6950 1300
+	8600 1600 8000 1600
 Wire Wire Line
-	7550 2900 6950 2900
+	8600 3200 8000 3200
 Wire Wire Line
-	7550 2100 6950 2100
-NoConn ~ 6950 3300
+	8600 2400 8000 2400
+NoConn ~ 8000 3600
 Wire Wire Line
-	6950 5100 7400 5100
+	8000 5400 8450 5400
 Wire Wire Line
-	4600 5700 5050 5700
+	5650 6000 6100 6000
 Wire Wire Line
-	4600 4700 5050 4700
+	5650 5000 6100 5000
 Wire Wire Line
-	6950 1500 7400 1500
+	8000 1800 8450 1800
 Wire Wire Line
-	6950 3200 7400 3200
+	8000 3500 8450 3500
 Wire Wire Line
-	6950 2300 7400 2300
+	8000 2600 8450 2600
 Wire Wire Line
-	6950 4400 7400 4400
+	8000 4700 8450 4700
 Wire Wire Line
-	6950 5200 7400 5200
+	8000 5500 8450 5500
 Wire Wire Line
-	4600 5600 5050 5600
+	5650 5900 6100 5900
 Wire Wire Line
-	4600 2200 5050 2200
+	5650 2500 6100 2500
 Wire Wire Line
-	6950 1600 7400 1600
+	8000 1900 8450 1900
 Wire Wire Line
-	6950 3400 7400 3400
+	8000 3700 8450 3700
 Wire Wire Line
-	6950 2400 7400 2400
+	8000 2700 8450 2700
 Wire Wire Line
-	6950 4500 7400 4500
+	8000 4800 8450 4800
 Wire Wire Line
-	6950 5300 7400 5300
+	8000 5600 8450 5600
 Wire Wire Line
-	4600 5400 5050 5400
+	5650 5700 6100 5700
 Wire Wire Line
-	4600 3900 5050 3900
+	5650 4200 6100 4200
 Wire Wire Line
-	6950 1700 7400 1700
+	8000 2000 8450 2000
 Wire Wire Line
-	6950 3500 7400 3500
+	8000 3800 8450 3800
 Wire Wire Line
-	6950 2500 7400 2500
+	8000 2800 8450 2800
 Wire Wire Line
-	6950 4600 7400 4600
+	8000 4900 8450 4900
 Wire Wire Line
-	6950 5400 7400 5400
+	8000 5700 8450 5700
 Wire Wire Line
-	4600 5300 5050 5300
+	5650 5600 6100 5600
 Wire Wire Line
-	4600 4100 5050 4100
+	5650 4400 6100 4400
 Wire Wire Line
-	6950 1800 7400 1800
+	8000 2100 8450 2100
 Wire Wire Line
-	6950 3600 7400 3600
+	8000 3900 8450 3900
 Wire Wire Line
-	6950 2600 7400 2600
+	8000 2900 8450 2900
 Wire Wire Line
-	6950 4700 7400 4700
+	8000 5000 8450 5000
 Wire Wire Line
-	6950 5500 7400 5500
+	8000 5800 8450 5800
 Wire Wire Line
-	4600 5200 5050 5200
+	5650 5500 6100 5500
 Wire Wire Line
-	4600 4000 5050 4000
+	5650 4300 6100 4300
 Wire Wire Line
-	6950 1900 7400 1900
+	8000 2200 8450 2200
 Wire Wire Line
-	6950 3700 7400 3700
+	8000 4000 8450 4000
 Wire Wire Line
-	6950 2700 7400 2700
+	8000 3000 8450 3000
 Wire Wire Line
-	6950 4800 7400 4800
+	8000 5100 8450 5100
 Wire Wire Line
-	6950 5600 7400 5600
+	8000 5900 8450 5900
 Wire Wire Line
-	4600 5100 5050 5100
+	5650 5400 6100 5400
 Wire Wire Line
-	4600 3800 5050 3800
+	5650 4100 6100 4100
 Wire Wire Line
-	6950 2000 7400 2000
+	8000 2300 8450 2300
 Wire Wire Line
-	6950 3800 7400 3800
+	8000 4100 8450 4100
 Wire Wire Line
-	6950 2800 7400 2800
-Text Label 7050 4100 0    60   ~ 0
+	8000 3100 8450 3100
+Text Label 8100 4400 0    60   ~ 0
 VRAM31
-Text Label 7100 4200 0    60   ~ 0
+Text Label 8150 4500 0    60   ~ 0
 VRAM30
-Text Label 7100 4300 0    60   ~ 0
+Text Label 8150 4600 0    60   ~ 0
 VRAM29
-Text Label 7000 4400 0    60   ~ 0
+Text Label 8050 4700 0    60   ~ 0
 VRAM28
-Text Label 7000 4500 0    60   ~ 0
+Text Label 8050 4800 0    60   ~ 0
 VRAM27
-Text Label 7000 4600 0    60   ~ 0
+Text Label 8050 4900 0    60   ~ 0
 VRAM26
-Text Label 7000 4700 0    60   ~ 0
+Text Label 8050 5000 0    60   ~ 0
 VRAM25
-Text Label 7000 4800 0    60   ~ 0
+Text Label 8050 5100 0    60   ~ 0
 VRAM24
-Text Label 7050 4900 0    60   ~ 0
+Text Label 8100 5200 0    60   ~ 0
 VRAM23
-Text Label 7100 5000 0    60   ~ 0
+Text Label 8150 5300 0    60   ~ 0
 VRAM22
-Text Label 7000 5100 0    60   ~ 0
+Text Label 8050 5400 0    60   ~ 0
 VRAM21
-Text Label 7000 5200 0    60   ~ 0
+Text Label 8050 5500 0    60   ~ 0
 VRAM20
-Text Label 7000 5300 0    60   ~ 0
+Text Label 8050 5600 0    60   ~ 0
 VRAM19
-Text Label 7000 5400 0    60   ~ 0
+Text Label 8050 5700 0    60   ~ 0
 VRAM18
-Text Label 7000 5500 0    60   ~ 0
+Text Label 8050 5800 0    60   ~ 0
 VRAM17
-Text Label 7000 5600 0    60   ~ 0
+Text Label 8050 5900 0    60   ~ 0
 VRAM16
-Text Label 7050 5700 0    60   ~ 0
+Text Label 8100 6000 0    60   ~ 0
 VRAM15
-Text Label 7100 5800 0    60   ~ 0
+Text Label 8150 6100 0    60   ~ 0
 VRAM14
-Text Label 4650 5700 0    60   ~ 0
+Text Label 5700 6000 0    60   ~ 0
 VRAM13
-Text Label 4650 5600 0    60   ~ 0
+Text Label 5700 5900 0    60   ~ 0
 VRAM12
-Text Label 4650 5400 0    60   ~ 0
+Text Label 5700 5700 0    60   ~ 0
 VRAM11
-Text Label 4650 5300 0    60   ~ 0
+Text Label 5700 5600 0    60   ~ 0
 VRAM10
-Text Label 4650 5200 0    60   ~ 0
+Text Label 5700 5500 0    60   ~ 0
 VRAM9
-Text Label 4650 5100 0    60   ~ 0
+Text Label 5700 5400 0    60   ~ 0
 VRAM8
-Text Label 4600 5000 0    60   ~ 0
+Text Label 5650 5300 0    60   ~ 0
 VRAM7
-Text Label 4600 4900 0    60   ~ 0
+Text Label 5650 5200 0    60   ~ 0
 VRAM6
-Text Label 4650 4700 0    60   ~ 0
+Text Label 5700 5000 0    60   ~ 0
 VRAM5
-Text Label 4650 2200 0    60   ~ 0
+Text Label 5700 2500 0    60   ~ 0
 VRAM4
-Text Label 4650 3900 0    60   ~ 0
+Text Label 5700 4200 0    60   ~ 0
 VRAM3
-Text Label 4650 4100 0    60   ~ 0
+Text Label 5700 4400 0    60   ~ 0
 VRAM2
-Text Label 4650 4000 0    60   ~ 0
+Text Label 5700 4300 0    60   ~ 0
 VRAM1
-Text Label 4650 3800 0    60   ~ 0
+Text Label 5700 4100 0    60   ~ 0
 VRAM0
-Text Label 7100 1300 0    60   ~ 0
+Text Label 8150 1600 0    60   ~ 0
 TVB7
-Text Label 7100 1400 0    60   ~ 0
+Text Label 8150 1700 0    60   ~ 0
 TVB6
-Text Label 7050 1500 0    60   ~ 0
+Text Label 8100 1800 0    60   ~ 0
 TVB5
-Text Label 7050 1600 0    60   ~ 0
+Text Label 8100 1900 0    60   ~ 0
 TVB4
-Text Label 7050 1700 0    60   ~ 0
+Text Label 8100 2000 0    60   ~ 0
 TVB3
-Text Label 7050 1800 0    60   ~ 0
+Text Label 8100 2100 0    60   ~ 0
 TVB2
-Text Label 7050 1900 0    60   ~ 0
+Text Label 8100 2200 0    60   ~ 0
 TVB1
-Text Label 7050 2000 0    60   ~ 0
+Text Label 8100 2300 0    60   ~ 0
 TVB0
-Text Label 7100 2900 0    60   ~ 0
+Text Label 8150 3200 0    60   ~ 0
 TVG7
-Text Label 7100 3000 0    60   ~ 0
+Text Label 8150 3300 0    60   ~ 0
 TVG6
-Text Label 7050 3200 0    60   ~ 0
+Text Label 8100 3500 0    60   ~ 0
 TVG5
-Text Label 7050 3400 0    60   ~ 0
+Text Label 8100 3700 0    60   ~ 0
 TVG4
-Text Label 7050 3500 0    60   ~ 0
+Text Label 8100 3800 0    60   ~ 0
 TVG3
-Text Label 7050 3600 0    60   ~ 0
+Text Label 8100 3900 0    60   ~ 0
 TVG2
-Text Label 7050 3700 0    60   ~ 0
+Text Label 8100 4000 0    60   ~ 0
 TVG1
-Text Label 7050 3800 0    60   ~ 0
+Text Label 8100 4100 0    60   ~ 0
 TVG0
-Text Label 7100 2100 0    60   ~ 0
+Text Label 8150 2400 0    60   ~ 0
 TVR7
-Text Label 7100 2200 0    60   ~ 0
+Text Label 8150 2500 0    60   ~ 0
 TVR6
-Text Label 7050 2300 0    60   ~ 0
+Text Label 8100 2600 0    60   ~ 0
 TVR5
-Text Label 7050 2400 0    60   ~ 0
+Text Label 8100 2700 0    60   ~ 0
 TVR4
-Text Label 7050 2500 0    60   ~ 0
+Text Label 8100 2800 0    60   ~ 0
 TVR3
-Text Label 7050 2600 0    60   ~ 0
+Text Label 8100 2900 0    60   ~ 0
 TVR2
-Text Label 7050 2700 0    60   ~ 0
+Text Label 8100 3000 0    60   ~ 0
 TVR1
-Text Label 7050 2800 0    60   ~ 0
+Text Label 8100 3100 0    60   ~ 0
 TVR0
-Text HLabel 5050 1800 0    60   Output ~ 0
+Text HLabel 6100 2100 0    60   Output ~ 0
 X_DONE
-Text HLabel 5050 1700 0    60   Input ~ 0
+Text HLabel 6100 2000 0    60   Input ~ 0
 X_PROG-
 Text HLabel 9500 1300 2    60   BiDi ~ 0
 TVB[0..7]
@@ -643,27 +643,27 @@ VRAM[0..31]
 $Comp
 L VCC #PWR06
 U 1 1 33A567E7
-P 5050 1250
-F 0 "#PWR06" H 5050 1450 40  0001 C CNN
-F 1 "VCC" H 5050 1400 40  0000 C CNN
-F 2 "" H 5050 1250 60  0001 C CNN
-F 3 "" H 5050 1250 60  0001 C CNN
-	1    5050 1250
+P 6100 1550
+F 0 "#PWR06" H 6100 1750 40  0001 C CNN
+F 1 "VCC" H 6100 1700 40  0000 C CNN
+F 2 "" H 6100 1550 60  0001 C CNN
+F 3 "" H 6100 1550 60  0001 C CNN
+	1    6100 1550
 	1    0    0    -1  
 $EndComp
-Connection ~ 5050 1400
-Connection ~ 5050 1300
+Connection ~ 6100 1700
+Connection ~ 6100 1600
 Wire Wire Line
-	5050 1500 5050 1250
+	6100 1800 6100 1550
 $Comp
 L XC4003-VQ100 U22
 U 1 1 33A567B8
-P 6000 3550
-F 0 "U22" H 6000 3650 70  0000 C CNN
-F 1 "XC4003-VQ100" H 6000 3450 70  0000 C CNN
-F 2 "lib_smd:VQFP100" H 6000 3550 60  0001 C CNN
-F 3 "" H 6000 3550 60  0001 C CNN
-	1    6000 3550
+P 7050 3850
+F 0 "U22" H 7050 3950 70  0000 C CNN
+F 1 "XC4003-VQ100" H 7050 3750 70  0000 C CNN
+F 2 "lib_smd:VQFP100" H 7050 3850 60  0001 C CNN
+F 3 "" H 7050 3850 60  0001 C CNN
+	1    7050 3850
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/demos/video/pal-ntsc.sch b/demos/video/pal-ntsc.sch
index 6ebdd5c..ef19552 100644
--- a/demos/video/pal-ntsc.sch
+++ b/demos/video/pal-ntsc.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 4 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
@@ -38,11 +38,35 @@ NoConn ~ 10050 8600
 Wire Bus Line
 	10800 4900 10650 4900
 Wire Bus Line
-	10650 4900 10650 5600
+	10650 4900 10650 5000
+Wire Bus Line
+	10650 5000 10650 5100
+Wire Bus Line
+	10650 5100 10650 5200
+Wire Bus Line
+	10650 5200 10650 5300
+Wire Bus Line
+	10650 5300 10650 5400
+Wire Bus Line
+	10650 5400 10650 5500
+Wire Bus Line
+	10650 5500 10650 5600
 Wire Bus Line
 	10800 4000 10650 4000
 Wire Bus Line
-	10650 4000 10650 4700
+	10650 4000 10650 4100
+Wire Bus Line
+	10650 4100 10650 4200
+Wire Bus Line
+	10650 4200 10650 4300
+Wire Bus Line
+	10650 4300 10650 4400
+Wire Bus Line
+	10650 4400 10650 4500
+Wire Bus Line
+	10650 4500 10650 4600
+Wire Bus Line
+	10650 4600 10650 4700
 Entry Wire Line
 	10550 5700 10650 5600
 Entry Wire Line
@@ -94,7 +118,19 @@ Entry Wire Line
 Wire Bus Line
 	10800 3100 10650 3100
 Wire Bus Line
-	10650 3100 10650 3800
+	10650 3100 10650 3200
+Wire Bus Line
+	10650 3200 10650 3300
+Wire Bus Line
+	10650 3300 10650 3400
+Wire Bus Line
+	10650 3400 10650 3500
+Wire Bus Line
+	10650 3500 10650 3600
+Wire Bus Line
+	10650 3600 10650 3700
+Wire Bus Line
+	10650 3700 10650 3800
 Wire Wire Line
 	10050 8500 10150 8500
 Wire Wire Line
@@ -102,7 +138,9 @@ Wire Wire Line
 Wire Wire Line
 	10050 7500 10150 7500
 Wire Wire Line
-	5950 3800 5800 3800
+	5950 3800 5900 3800
+Wire Wire Line
+	5900 3800 5800 3800
 Connection ~ 5900 3800
 Wire Wire Line
 	5950 3900 5900 3900
@@ -130,9 +168,21 @@ Connection ~ 6650 2400
 Connection ~ 6750 2400
 Connection ~ 6850 2400
 Wire Wire Line
-	6350 2400 6950 2400
+	6350 2400 6450 2400
+Wire Wire Line
+	6450 2400 6550 2400
+Wire Wire Line
+	6550 2400 6650 2400
 Wire Wire Line
-	6350 2300 6350 2500
+	6650 2400 6750 2400
+Wire Wire Line
+	6750 2400 6850 2400
+Wire Wire Line
+	6850 2400 6950 2400
+Wire Wire Line
+	6350 2300 6350 2400
+Wire Wire Line
+	6350 2400 6350 2500
 Wire Wire Line
 	6450 2400 6450 2500
 Wire Wire Line
@@ -196,7 +246,9 @@ TVR1
 Text Label 10150 3200 0    60   ~ 0
 TVR0
 Wire Wire Line
-	11950 3600 11950 3450
+	11950 3600 11950 3500
+Wire Wire Line
+	11950 3500 11950 3450
 Wire Wire Line
 	12650 3500 12650 3450
 Wire Wire Line
@@ -234,8 +286,8 @@ $Comp
 L INDUCTOR L4
 U 1 1 811D9080
 P 10150 1800
-F 0 "L4" V 10100 1800 40  0000 C CNN
-F 1 "22uF" V 10250 1800 40  0000 C CNN
+F 0 "L4" V 10350 1800 50  0000 C CNN
+F 1 "22uF" V 10250 1800 50  0000 C CNN
 F 2 "lib_smd:SM1812" H 10150 1800 60  0001 C CNN
 F 3 "" H 10150 1800 60  0001 C CNN
 	1    10150 1800
@@ -244,23 +296,23 @@ $EndComp
 $Comp
 L GND #GND035
 U 1 1 821CDA95
-P 4050 7200
-F 0 "#GND035" H 4050 7300 60  0001 C CNN
-F 1 "GND" H 4050 7100 60  0000 C CNN
-F 2 "" H 4050 7200 60  0001 C CNN
-F 3 "" H 4050 7200 60  0001 C CNN
-	1    4050 7200
+P 4000 7250
+F 0 "#GND035" H 4000 7350 60  0001 C CNN
+F 1 "GND" H 4000 7150 60  0001 C CNN
+F 2 "" H 4000 7250 60  0001 C CNN
+F 3 "" H 4000 7250 60  0001 C CNN
+	1    4000 7250
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND036
 U 1 1 821CDAA4
-P 3250 7000
-F 0 "#GND036" H 3250 7100 60  0001 C CNN
-F 1 "GND" H 3250 6900 60  0000 C CNN
-F 2 "" H 3250 7000 60  0001 C CNN
-F 3 "" H 3250 7000 60  0001 C CNN
-	1    3250 7000
+P 3200 7050
+F 0 "#GND036" H 3200 7150 60  0001 C CNN
+F 1 "GND" H 3200 6950 60  0001 C CNN
+F 2 "" H 3200 7050 60  0001 C CNN
+F 3 "" H 3200 7050 60  0001 C CNN
+	1    3200 7050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -279,7 +331,7 @@ L C C1
 U 1 1 821CDAC2
 P 3500 6500
 F 0 "C1" V 3550 6650 50  0000 C CNN
-F 1 "100nF" V 3550 6350 50  0000 C CNN
+F 1 "100nF" V 3550 6300 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 3500 6500 60  0001 C CNN
 F 3 "" H 3500 6500 60  0001 C CNN
 	1    3500 6500
@@ -290,7 +342,7 @@ L GND #GND037
 U 1 1 A9C8254A
 P 6350 9900
 F 0 "#GND037" H 6350 10000 60  0001 C CNN
-F 1 "GND" H 6350 9800 60  0000 C CNN
+F 1 "GND" H 6350 9800 60  0001 C CNN
 F 2 "" H 6350 9900 60  0001 C CNN
 F 3 "" H 6350 9900 60  0001 C CNN
 	1    6350 9900
@@ -301,7 +353,7 @@ L GND #GND038
 U 1 1 A9C8254F
 P 8950 9900
 F 0 "#GND038" H 8950 10000 60  0001 C CNN
-F 1 "GND" H 8950 9800 60  0000 C CNN
+F 1 "GND" H 8950 9800 60  0001 C CNN
 F 2 "" H 8950 9900 60  0001 C CNN
 F 3 "" H 8950 9900 60  0001 C CNN
 	1    8950 9900
@@ -312,7 +364,7 @@ L GND #GND039
 U 1 1 A9C82559
 P 5950 6200
 F 0 "#GND039" H 5950 6300 60  0001 C CNN
-F 1 "GND" H 5950 6100 60  0000 C CNN
+F 1 "GND" H 5950 6050 60  0001 C CNN
 F 2 "" H 5950 6200 60  0001 C CNN
 F 3 "" H 5950 6200 60  0001 C CNN
 	1    5950 6200
@@ -323,7 +375,7 @@ L GND #GND040
 U 1 1 A9C8255E
 P 5950 6000
 F 0 "#GND040" H 5950 6100 60  0001 C CNN
-F 1 "GND" H 5950 5900 60  0000 C CNN
+F 1 "GND" H 5950 5850 60  0001 C CNN
 F 2 "" H 5950 6000 60  0001 C CNN
 F 3 "" H 5950 6000 60  0001 C CNN
 	1    5950 6000
@@ -334,7 +386,7 @@ L GND #GND041
 U 1 1 A9C82563
 P 5950 6600
 F 0 "#GND041" H 5950 6700 60  0001 C CNN
-F 1 "GND" H 5950 6500 60  0000 C CNN
+F 1 "GND" H 5950 6450 60  0001 C CNN
 F 2 "" H 5950 6600 60  0001 C CNN
 F 3 "" H 5950 6600 60  0001 C CNN
 	1    5950 6600
@@ -345,7 +397,7 @@ L GND #GND042
 U 1 1 A9CA7F70
 P 11950 3600
 F 0 "#GND042" H 11950 3700 60  0001 C CNN
-F 1 "GND" H 11950 3500 60  0000 C CNN
+F 1 "GND" H 11950 3500 60  0001 C CNN
 F 2 "" H 11950 3600 60  0001 C CNN
 F 3 "" H 11950 3600 60  0001 C CNN
 	1    11950 3600
@@ -366,8 +418,8 @@ $Comp
 L C C3
 U 1 1 A9CA7F75
 P 3450 4200
-F 0 "C3" V 3500 4350 50  0000 C CNN
-F 1 "100nF" V 3500 4050 50  0000 C CNN
+F 0 "C3" V 3300 4200 50  0000 C CNN
+F 1 "100nF" V 3600 4200 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 3450 4200 60  0001 C CNN
 F 3 "" H 3450 4200 60  0001 C CNN
 	1    3450 4200
@@ -377,8 +429,8 @@ $Comp
 L C C4
 U 1 1 A9CA7F7A
 P 3450 5100
-F 0 "C4" V 3500 5250 50  0000 C CNN
-F 1 "100nF" V 3500 4950 50  0000 C CNN
+F 0 "C4" V 3300 5100 50  0000 C CNN
+F 1 "100nF" V 3600 5100 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 3450 5100 60  0001 C CNN
 F 3 "" H 3450 5100 60  0001 C CNN
 	1    3450 5100
@@ -387,12 +439,12 @@ $EndComp
 $Comp
 L R R14
 U 1 1 821CDA9A
-P 4050 6950
-F 0 "R14" V 4130 6950 50  0000 C CNN
-F 1 "1M" V 4050 6950 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 4050 6950 60  0001 C CNN
-F 3 "" H 4050 6950 60  0001 C CNN
-	1    4050 6950
+P 4000 6950
+F 0 "R14" H 3900 7150 50  0000 C CNN
+F 1 "1M" V 4000 6950 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 4000 6950 60  0001 C CNN
+F 3 "" H 4000 6950 60  0001 C CNN
+	1    4000 6950
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -432,8 +484,8 @@ $Comp
 L DIODESCH D2
 U 1 1 A9CA7F84
 P 3850 3300
-F 0 "D2" H 3850 3400 50  0000 C CNN
-F 1 "BAT46" H 3850 3200 50  0000 C CNN
+F 0 "D2" H 3850 3200 50  0000 C CNN
+F 1 "BAT46" H 3850 3400 50  0000 C CNN
 F 2 "discret:D3" H 3850 3300 60  0001 C CNN
 F 3 "" H 3850 3300 60  0001 C CNN
 	1    3850 3300
@@ -475,34 +527,34 @@ $EndComp
 $Comp
 L GND #GND044
 U 1 1 A9CA7FA2
-P 3650 3700
-F 0 "#GND044" H 3650 3800 60  0001 C CNN
-F 1 "GND" H 3650 3600 60  0000 C CNN
-F 2 "" H 3650 3700 60  0001 C CNN
-F 3 "" H 3650 3700 60  0001 C CNN
-	1    3650 3700
+P 3600 3700
+F 0 "#GND044" H 3600 3800 60  0001 C CNN
+F 1 "GND" H 3600 3600 60  0001 C CNN
+F 2 "" H 3600 3700 60  0001 C CNN
+F 3 "" H 3600 3700 60  0001 C CNN
+	1    3600 3700
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND045
 U 1 1 A9CA7FBB
-P 5250 6100
-F 0 "#GND045" H 5250 6200 60  0001 C CNN
-F 1 "GND" H 5250 6000 60  0000 C CNN
-F 2 "" H 5250 6100 60  0001 C CNN
-F 3 "" H 5250 6100 60  0001 C CNN
-	1    5250 6100
+P 5200 6100
+F 0 "#GND045" H 5200 6200 60  0001 C CNN
+F 1 "GND" H 5200 6000 60  0001 C CNN
+F 2 "" H 5200 6100 60  0001 C CNN
+F 3 "" H 5200 6100 60  0001 C CNN
+	1    5200 6100
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #GND046
 U 1 1 A9CA7FC0
-P 4700 6400
-F 0 "#GND046" H 4700 6500 60  0001 C CNN
-F 1 "GND" H 4700 6300 60  0000 C CNN
-F 2 "" H 4700 6400 60  0001 C CNN
-F 3 "" H 4700 6400 60  0001 C CNN
-	1    4700 6400
+P 4650 6400
+F 0 "#GND046" H 4650 6500 60  0001 C CNN
+F 1 "GND" H 4650 6300 60  0001 C CNN
+F 2 "" H 4650 6400 60  0001 C CNN
+F 3 "" H 4650 6400 60  0001 C CNN
+	1    4650 6400
 	0    1    1    0   
 $EndComp
 $Comp
@@ -531,8 +583,8 @@ $Comp
 L C C65
 U 1 1 B15DA8C5
 P 4850 1700
-F 0 "C65" V 4900 1850 50  0000 C CNN
-F 1 "22pF" V 4900 1550 50  0000 C CNN
+F 0 "C65" H 5000 1800 50  0000 C CNN
+F 1 "22pF" H 5000 1600 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 4850 1700 60  0001 C CNN
 F 3 "" H 4850 1700 60  0001 C CNN
 	1    4850 1700
@@ -542,8 +594,8 @@ $Comp
 L C C66
 U 1 1 B15DA8CA
 P 5650 1700
-F 0 "C66" V 5700 1850 50  0000 C CNN
-F 1 "22pF" V 5700 1550 50  0000 C CNN
+F 0 "C66" H 5800 1800 50  0000 C CNN
+F 1 "22pF" H 5800 1600 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 5650 1700 60  0001 C CNN
 F 3 "" H 5650 1700 60  0001 C CNN
 	1    5650 1700
@@ -552,23 +604,23 @@ $EndComp
 $Comp
 L GND #GND047
 U 1 1 B15DA8CF
-P 4850 1500
-F 0 "#GND047" H 4850 1600 60  0001 C CNN
-F 1 "GND" H 4850 1400 60  0000 C CNN
-F 2 "" H 4850 1500 60  0001 C CNN
-F 3 "" H 4850 1500 60  0001 C CNN
-	1    4850 1500
+P 4850 1450
+F 0 "#GND047" H 4850 1550 60  0001 C CNN
+F 1 "GND" H 4850 1350 60  0001 C CNN
+F 2 "" H 4850 1450 60  0001 C CNN
+F 3 "" H 4850 1450 60  0001 C CNN
+	1    4850 1450
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #GND048
 U 1 1 B15DA8D4
-P 5650 1500
-F 0 "#GND048" H 5650 1600 60  0001 C CNN
-F 1 "GND" H 5650 1400 60  0000 C CNN
-F 2 "" H 5650 1500 60  0001 C CNN
-F 3 "" H 5650 1500 60  0001 C CNN
-	1    5650 1500
+P 5650 1450
+F 0 "#GND048" H 5650 1550 60  0001 C CNN
+F 1 "GND" H 5650 1350 60  0001 C CNN
+F 2 "" H 5650 1450 60  0001 C CNN
+F 3 "" H 5650 1450 60  0001 C CNN
+	1    5650 1450
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -576,7 +628,7 @@ L GND #GND049
 U 1 1 B175430E
 P 5800 4100
 F 0 "#GND049" H 5800 4200 60  0001 C CNN
-F 1 "GND" H 5800 4000 60  0000 C CNN
+F 1 "GND" H 5800 4000 60  0001 C CNN
 F 2 "" H 5800 4100 60  0001 C CNN
 F 3 "" H 5800 4100 60  0001 C CNN
 	1    5800 4100
@@ -596,20 +648,20 @@ $EndComp
 $Comp
 L R R19
 U 1 1 A9CA7FA7
-P 11000 6200
-F 0 "R19" V 11080 6200 50  0000 C CNN
-F 1 "220" V 11000 6200 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 11000 6200 60  0001 C CNN
-F 3 "" H 11000 6200 60  0001 C CNN
-	1    11000 6200
+P 11050 6200
+F 0 "R19" V 11130 6200 50  0000 C CNN
+F 1 "220" V 11050 6200 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 11050 6200 60  0001 C CNN
+F 3 "" H 11050 6200 60  0001 C CNN
+	1    11050 6200
 	0    1    1    0   
 $EndComp
 $Comp
 L C C5
 U 1 1 A9CA7FAC
 P 11650 6200
-F 0 "C5" V 11700 6350 50  0000 C CNN
-F 1 "100nF" V 11700 6050 50  0000 C CNN
+F 0 "C5" V 11550 6050 50  0000 C CNN
+F 1 "100nF" V 11550 6400 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 11650 6200 60  0001 C CNN
 F 3 "" H 11650 6200 60  0001 C CNN
 	1    11650 6200
@@ -618,20 +670,20 @@ $EndComp
 $Comp
 L R R20
 U 1 1 B176B9C3
-P 11100 5800
-F 0 "R20" V 11180 5800 50  0000 C CNN
-F 1 "220" V 11100 5800 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 11100 5800 60  0001 C CNN
-F 3 "" H 11100 5800 60  0001 C CNN
-	1    11100 5800
+P 11050 5800
+F 0 "R20" V 11130 5800 50  0000 C CNN
+F 1 "220" V 11050 5800 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 11050 5800 60  0001 C CNN
+F 3 "" H 11050 5800 60  0001 C CNN
+	1    11050 5800
 	0    1    1    0   
 $EndComp
 $Comp
 L C C8
 U 1 1 B176B9C8
 P 11650 5800
-F 0 "C8" V 11700 5950 50  0000 C CNN
-F 1 "100nF" V 11700 5650 50  0000 C CNN
+F 0 "C8" V 11550 5650 50  0000 C CNN
+F 1 "100nF" V 11550 6000 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 11650 5800 60  0001 C CNN
 F 3 "" H 11650 5800 60  0001 C CNN
 	1    11650 5800
@@ -641,8 +693,8 @@ $Comp
 L C C6
 U 1 1 A9CA7FB1
 P 5450 6100
-F 0 "C6" V 5500 6250 50  0000 C CNN
-F 1 "100nF" V 5500 5950 50  0000 C CNN
+F 0 "C6" V 5300 6100 50  0000 C CNN
+F 1 "100nF" V 5600 6100 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 5450 6100 60  0001 C CNN
 F 3 "" H 5450 6100 60  0001 C CNN
 	1    5450 6100
@@ -652,8 +704,8 @@ $Comp
 L C C7
 U 1 1 A9CA7FB6
 P 4900 6400
-F 0 "C7" V 4950 6550 50  0000 C CNN
-F 1 "100nF" V 4950 6250 50  0000 C CNN
+F 0 "C7" V 4750 6400 50  0000 C CNN
+F 1 "100nF" V 5050 6400 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 4900 6400 60  0001 C CNN
 F 3 "" H 4900 6400 60  0001 C CNN
 	1    4900 6400
@@ -662,12 +714,12 @@ $EndComp
 $Comp
 L C C47
 U 1 1 821CDABD
-P 3250 6800
-F 0 "C47" V 3300 6950 50  0000 C CNN
-F 1 "220pF" V 3300 6650 50  0000 C CNN
-F 2 "lib_smd:SM1206" H 3250 6800 60  0001 C CNN
-F 3 "" H 3250 6800 60  0001 C CNN
-	1    3250 6800
+P 3200 6800
+F 0 "C47" H 3350 6900 50  0000 C CNN
+F 1 "220pF" H 3350 6700 50  0000 C CNN
+F 2 "lib_smd:SM1206" H 3200 6800 60  0001 C CNN
+F 3 "" H 3200 6800 60  0001 C CNN
+	1    3200 6800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -695,12 +747,12 @@ $EndComp
 $Comp
 L GND #GND050
 U 1 1 BF69A158
-P 10750 2500
-F 0 "#GND050" H 10750 2500 30  0001 C CNN
-F 1 "GND" H 10750 2430 30  0001 C CNN
-F 2 "" H 10750 2500 60  0001 C CNN
-F 3 "" H 10750 2500 60  0001 C CNN
-	1    10750 2500
+P 10750 2550
+F 0 "#GND050" H 10750 2550 30  0001 C CNN
+F 1 "GND" H 10750 2480 30  0001 C CNN
+F 2 "" H 10750 2550 60  0001 C CNN
+F 3 "" H 10750 2550 60  0001 C CNN
+	1    10750 2550
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -783,20 +835,20 @@ $EndComp
 $Comp
 L GND #GND052
 U 1 1 0F47DCBD
-P 10250 9550
-F 0 "#GND052" H 10250 9650 60  0001 C CNN
-F 1 "GND" H 10250 9450 60  0000 C CNN
-F 2 "" H 10250 9550 60  0001 C CNN
-F 3 "" H 10250 9550 60  0001 C CNN
-	1    10250 9550
+P 10250 9600
+F 0 "#GND052" H 10250 9700 60  0001 C CNN
+F 1 "GND" H 10250 9500 60  0001 C CNN
+F 2 "" H 10250 9600 60  0001 C CNN
+F 3 "" H 10250 9600 60  0001 C CNN
+	1    10250 9600
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C16
 U 1 1 0F47DCB8
 P 10250 9350
-F 0 "C16" V 10300 9500 50  0000 C CNN
-F 1 "100nF" V 10300 9200 50  0000 C CNN
+F 0 "C16" H 10400 9450 50  0000 C CNN
+F 1 "100nF" H 10400 9250 50  0000 C CNN
 F 2 "lib_smd:SM1206" H 10250 9350 60  0001 C CNN
 F 3 "" H 10250 9350 60  0001 C CNN
 	1    10250 9350
@@ -833,7 +885,7 @@ Text HLabel 10150 7500 2    60   Output ~ 0
 HD_PAL-
 Text HLabel 10150 7600 2    60   Output ~ 0
 VD_PAL-
-Text Label 10850 1800 0    60   ~ 0
+Text Label 11350 1800 2    60   ~ 0
 VAF
 Text Label 5050 4600 0    60   ~ 0
 Y-VIDEO
@@ -841,13 +893,13 @@ Text Label 5050 4700 0    60   ~ 0
 C-VIDEO
 Text Label 4650 7100 0    60   ~ 0
 VAF
-Text Label 9850 2400 0    60   ~ 0
+Text Label 10150 2400 2    60   ~ 0
 VAF
 Text Label 2050 6500 0    60   ~ 0
 Y_SYNC
 Text Label 10150 6100 0    60   ~ 0
 Y_SYNC
-Text Label 11650 3000 0    60   ~ 0
+Text Label 11550 3000 0    60   ~ 0
 VAF
 Text Label 5450 7300 0    60   ~ 0
 PC_D0
@@ -905,12 +957,12 @@ $EndComp
 $Comp
 L VCC #VCC056
 U 1 1 00000000
-P 3650 3300
-F 0 "#VCC056" H 3650 3500 40  0001 C CNN
-F 1 "VCC" H 3650 3450 40  0000 C CNN
-F 2 "" H 3650 3300 60  0001 C CNN
-F 3 "" H 3650 3300 60  0001 C CNN
-	1    3650 3300
+P 3600 3300
+F 0 "#VCC056" H 3600 3500 40  0001 C CNN
+F 1 "VCC" H 3600 3450 40  0000 C CNN
+F 2 "" H 3600 3300 60  0001 C CNN
+F 3 "" H 3600 3300 60  0001 C CNN
+	1    3600 3300
 	1    0    0    -1  
 $EndComp
 Connection ~ 10750 1800
@@ -949,8 +1001,8 @@ Connection ~ 4450 5100
 Connection ~ 4450 5600
 Connection ~ 5850 6100
 Connection ~ 5150 6400
-Connection ~ 3250 6500
-Connection ~ 4050 6500
+Connection ~ 3200 6500
+Connection ~ 4000 6500
 Connection ~ 5850 6500
 Connection ~ 5850 6900
 Connection ~ 13050 8600
@@ -990,13 +1042,61 @@ Connection ~ 13350 3500
 Wire Wire Line
 	9750 1800 9850 1800
 Wire Wire Line
-	10450 1800 11350 1800
+	10450 1800 10750 1800
+Wire Wire Line
+	10750 1800 11350 1800
 Wire Wire Line
 	4850 2100 4950 2100
 Wire Wire Line
 	5550 2100 5650 2100
 Wire Wire Line
-	10150 2400 7350 2400
+	10150 2400 9650 2400
+Wire Wire Line
+	9650 2400 9550 2400
+Wire Wire Line
+	9550 2400 9450 2400
+Wire Wire Line
+	9450 2400 9350 2400
+Wire Wire Line
+	9350 2400 9250 2400
+Wire Wire Line
+	9250 2400 9150 2400
+Wire Wire Line
+	9150 2400 9050 2400
+Wire Wire Line
+	9050 2400 8950 2400
+Wire Wire Line
+	8950 2400 8850 2400
+Wire Wire Line
+	8850 2400 8750 2400
+Wire Wire Line
+	8750 2400 8650 2400
+Wire Wire Line
+	8650 2400 8550 2400
+Wire Wire Line
+	8550 2400 8450 2400
+Wire Wire Line
+	8450 2400 8350 2400
+Wire Wire Line
+	8350 2400 8250 2400
+Wire Wire Line
+	8250 2400 8150 2400
+Wire Wire Line
+	8150 2400 8050 2400
+Wire Wire Line
+	8050 2400 7950 2400
+Wire Wire Line
+	7950 2400 7850 2400
+Wire Wire Line
+	7850 2400 7750 2400
+Wire Wire Line
+	7750 2400 7650 2400
+Wire Wire Line
+	7650 2400 7550 2400
+Wire Wire Line
+	7550 2400 7450 2400
+Wire Wire Line
+	7450 2400 7350 2400
 Wire Wire Line
 	4850 2600 5050 2600
 Wire Wire Line
@@ -1026,7 +1126,9 @@ Wire Wire Line
 Wire Wire Line
 	10050 3900 10550 3900
 Wire Wire Line
-	5800 4100 5950 4100
+	5800 4100 5900 4100
+Wire Wire Line
+	5900 4100 5950 4100
 Wire Wire Line
 	10050 4100 10550 4100
 Wire Wire Line
@@ -1086,33 +1188,41 @@ Wire Wire Line
 Wire Wire Line
 	11350 5800 11450 5800
 Wire Wire Line
-	11850 5800 12150 5800
+	11850 5800 12100 5800
 Wire Wire Line
 	4250 6000 4450 6000
 Wire Wire Line
-	5650 6100 5950 6100
+	5650 6100 5850 6100
+Wire Wire Line
+	5850 6100 5950 6100
+Wire Wire Line
+	10050 6100 10800 6100
 Wire Wire Line
-	10050 6100 10850 6100
+	10050 6200 10800 6200
 Wire Wire Line
-	10050 6200 10750 6200
+	11300 6200 11450 6200
 Wire Wire Line
-	11250 6200 11450 6200
+	11850 6200 12000 6200
 Wire Wire Line
-	11850 6200 12050 6200
+	5100 6400 5150 6400
 Wire Wire Line
-	5100 6400 5950 6400
+	5150 6400 5950 6400
 Wire Wire Line
-	10050 6400 12150 6400
+	10050 6400 12100 6400
 Wire Wire Line
 	2050 6500 2550 6500
 Wire Wire Line
-	3050 6500 3300 6500
+	3050 6500 3200 6500
 Wire Wire Line
-	3700 6500 4550 6500
+	3200 6500 3300 6500
+Wire Wire Line
+	3700 6500 4000 6500
+Wire Wire Line
+	4000 6500 4550 6500
 Wire Wire Line
 	5850 6500 5950 6500
 Wire Wire Line
-	10050 6500 12050 6500
+	10050 6500 12000 6500
 Wire Wire Line
 	5750 6800 5950 6800
 Wire Wire Line
@@ -1142,41 +1252,127 @@ Wire Wire Line
 Wire Wire Line
 	5450 8300 5950 8300
 Wire Wire Line
-	13050 8600 15150 8600
+	13050 8600 13750 8600
+Wire Wire Line
+	13750 8600 14450 8600
+Wire Wire Line
+	14450 8600 15150 8600
 Wire Wire Line
 	10050 9000 10250 9000
 Wire Wire Line
-	13050 9100 15150 9100
+	13050 9100 13750 9100
+Wire Wire Line
+	13750 9100 14450 9100
+Wire Wire Line
+	14450 9100 15150 9100
+Wire Wire Line
+	14050 3000 13350 3000
+Wire Wire Line
+	13350 3000 12650 3000
+Wire Wire Line
+	12650 3000 11950 3000
+Wire Wire Line
+	11950 3000 11550 3000
+Wire Wire Line
+	6350 9800 6450 9800
+Wire Wire Line
+	6450 9800 6550 9800
+Wire Wire Line
+	6550 9800 6650 9800
+Wire Wire Line
+	6650 9800 6750 9800
+Wire Wire Line
+	6750 9800 6850 9800
+Wire Wire Line
+	6850 9800 6950 9800
+Wire Wire Line
+	6950 9800 7050 9800
+Wire Wire Line
+	7050 9800 7150 9800
+Wire Wire Line
+	8950 9800 8850 9800
+Wire Wire Line
+	8850 9800 8750 9800
+Wire Wire Line
+	8750 9800 8650 9800
+Wire Wire Line
+	8650 9800 8550 9800
+Wire Wire Line
+	8550 9800 8450 9800
+Wire Wire Line
+	8450 9800 8350 9800
+Wire Wire Line
+	8350 9800 8250 9800
+Wire Wire Line
+	8250 9800 8150 9800
+Wire Wire Line
+	8150 9800 8050 9800
+Wire Wire Line
+	8050 9800 7950 9800
+Wire Wire Line
+	7950 9800 7850 9800
+Wire Wire Line
+	7850 9800 7750 9800
+Wire Wire Line
+	7750 9800 7650 9800
 Wire Wire Line
-	14050 3000 11550 3000
+	7650 9800 7550 9800
 Wire Wire Line
-	6350 9800 7150 9800
+	7550 9800 7450 9800
 Wire Wire Line
-	8950 9800 7350 9800
+	7450 9800 7350 9800
 Wire Wire Line
-	14050 3500 11950 3500
+	14050 3500 13350 3500
 Wire Wire Line
-	3250 6500 3250 6600
+	13350 3500 12650 3500
 Wire Wire Line
-	4050 6500 4050 6700
+	12650 3500 11950 3500
 Wire Wire Line
-	4450 4600 4450 3300
+	3200 6500 3200 6600
 Wire Wire Line
-	4450 6000 4450 4700
+	4000 6500 4000 6700
+Wire Wire Line
+	4450 4600 4450 4200
+Wire Wire Line
+	4450 4200 4450 3700
+Wire Wire Line
+	4450 3700 4450 3300
+Wire Wire Line
+	4450 6000 4450 5600
+Wire Wire Line
+	4450 5600 4450 5100
+Wire Wire Line
+	4450 5100 4450 4700
 Wire Wire Line
 	4550 6500 4550 5800
 Wire Wire Line
-	4850 3300 4850 1900
+	4850 3300 4850 2600
+Wire Wire Line
+	4850 2600 4850 2100
+Wire Wire Line
+	4850 2100 4850 1900
 Wire Wire Line
 	5150 6400 5150 6800
 Wire Wire Line
-	5650 3200 5650 1900
+	5650 3200 5650 2600
+Wire Wire Line
+	5650 2600 5650 2100
+Wire Wire Line
+	5650 2100 5650 1900
+Wire Wire Line
+	5900 4300 5900 4200
+Wire Wire Line
+	5900 4200 5900 4100
+Wire Wire Line
+	5850 7100 5850 6900
+Wire Wire Line
+	5850 6900 5850 6500
 Wire Wire Line
-	5900 4300 5900 4100
+	5850 6500 5850 6100
 Wire Wire Line
-	5850 7100 5850 6100
+	6350 9700 6350 9800
 Wire Wire Line
-	6350 9700 6350 9900
+	6350 9800 6350 9900
 Wire Wire Line
 	6450 9700 6450 9800
 Wire Wire Line
@@ -1262,7 +1458,9 @@ Wire Wire Line
 Wire Wire Line
 	8950 2400 8950 2500
 Wire Wire Line
-	8950 9700 8950 9900
+	8950 9700 8950 9800
+Wire Wire Line
+	8950 9800 8950 9900
 Wire Wire Line
 	9050 2400 9050 2500
 Wire Wire Line
@@ -1282,15 +1480,19 @@ Wire Wire Line
 Wire Wire Line
 	10750 1800 10750 2100
 Wire Wire Line
-	10850 6100 10850 5800
+	10800 6100 10800 5800
+Wire Wire Line
+	12000 6500 12000 6200
 Wire Wire Line
-	12050 6500 12050 6200
+	12100 6400 12100 5800
 Wire Wire Line
-	12150 6400 12150 5800
+	13050 8500 13050 8600
 Wire Wire Line
-	13050 8500 13050 8650
+	13050 8600 13050 8650
 Wire Wire Line
-	13050 9050 13050 9200
+	13050 9050 13050 9100
+Wire Wire Line
+	13050 9100 13050 9200
 Wire Wire Line
 	13750 8600 13750 8650
 Wire Wire Line
@@ -1318,4 +1520,24 @@ F 3 "" H 15150 8850 60  0001 C CNN
 	1    15150 8850
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	10250 9600 10250 9550
+Wire Wire Line
+	10750 2550 10750 2500
+Wire Wire Line
+	5650 1450 5650 1500
+Wire Wire Line
+	4850 1500 4850 1450
+Wire Wire Line
+	3600 3300 3650 3300
+Wire Wire Line
+	3600 3700 3650 3700
+Wire Wire Line
+	5200 6100 5250 6100
+Wire Wire Line
+	4650 6400 4700 6400
+Wire Wire Line
+	4000 7200 4000 7250
+Wire Wire Line
+	3200 7000 3200 7050
 $EndSCHEMATC
diff --git a/demos/video/rams.sch b/demos/video/rams.sch
index 3e8a9fb..3360eb5 100644
--- a/demos/video/rams.sch
+++ b/demos/video/rams.sch
@@ -20,13 +20,13 @@ LIBS:philips
 LIBS:cypress
 LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 6 8
 Title "Kicad EDA"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Rams Video"
@@ -35,1028 +35,1028 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	2800 9100 3400 9100
+	4400 9050 5000 9050
 Wire Wire Line
-	2800 9000 3400 9000
+	4400 8950 5000 8950
 Wire Wire Line
-	2800 8900 3400 8900
+	4400 8850 5000 8850
 Wire Wire Line
-	2800 8800 3400 8800
+	4400 8750 5000 8750
 Wire Wire Line
-	2800 8700 3400 8700
+	4400 8650 5000 8650
 Wire Wire Line
-	2800 8600 3400 8600
+	4400 8550 5000 8550
 Wire Wire Line
-	2800 8500 3400 8500
+	4400 8450 5000 8450
 Wire Wire Line
-	2800 8400 3400 8400
+	4400 8350 5000 8350
 Wire Wire Line
-	2800 8200 3400 8200
+	4400 8150 5000 8150
 Wire Wire Line
-	2800 8100 3400 8100
+	4400 8050 5000 8050
 Wire Wire Line
-	2800 8000 3400 8000
+	4400 7950 5000 7950
 Wire Wire Line
-	2800 7900 3400 7900
+	4400 7850 5000 7850
 Wire Wire Line
-	2800 7800 3400 7800
+	4400 7750 5000 7750
 Wire Wire Line
-	2800 7700 3400 7700
+	4400 7650 5000 7650
 Wire Wire Line
-	2800 7600 3400 7600
+	4400 7550 5000 7550
 Wire Wire Line
-	2800 7500 3400 7500
+	4400 7450 5000 7450
 Wire Wire Line
-	2800 7300 3400 7300
+	4400 7250 5000 7250
 Wire Wire Line
-	2800 7200 3400 7200
+	4400 7150 5000 7150
 Wire Wire Line
-	2800 7100 3400 7100
+	4400 7050 5000 7050
 Wire Wire Line
-	2800 7000 3400 7000
+	4400 6950 5000 6950
 Wire Wire Line
-	2800 6900 3400 6900
+	4400 6850 5000 6850
 Wire Wire Line
-	2800 6800 3400 6800
+	4400 6750 5000 6750
 Wire Wire Line
-	2800 6700 3400 6700
+	4400 6650 5000 6650
 Wire Wire Line
-	2800 6600 3400 6600
+	4400 6550 5000 6550
 Wire Wire Line
-	2800 6400 3400 6400
+	4400 6350 5000 6350
 Wire Wire Line
-	2800 6300 3400 6300
+	4400 6250 5000 6250
 Wire Wire Line
-	2800 6200 3400 6200
+	4400 6150 5000 6150
 Wire Wire Line
-	2800 6100 3400 6100
+	4400 6050 5000 6050
 Wire Wire Line
-	2800 6000 3400 6000
+	4400 5950 5000 5950
 Wire Wire Line
-	2800 5900 3400 5900
+	4400 5850 5000 5850
 Wire Wire Line
-	2800 5800 3400 5800
+	4400 5750 5000 5750
 Wire Wire Line
-	2800 5700 3400 5700
+	4400 5650 5000 5650
 Wire Wire Line
-	2800 4650 3400 4650
+	4400 4600 5000 4600
 Wire Wire Line
-	2800 4550 3400 4550
+	4400 4500 5000 4500
 Wire Wire Line
-	2800 4450 3400 4450
+	4400 4400 5000 4400
 Wire Wire Line
-	2800 4350 3400 4350
+	4400 4300 5000 4300
 Wire Wire Line
-	2800 4250 3400 4250
+	4400 4200 5000 4200
 Wire Wire Line
-	2800 4150 3400 4150
+	4400 4100 5000 4100
 Wire Wire Line
-	2800 4050 3400 4050
+	4400 4000 5000 4000
 Wire Wire Line
-	2800 3950 3400 3950
+	4400 3900 5000 3900
 Wire Wire Line
-	2800 3750 3400 3750
+	4400 3700 5000 3700
 Wire Wire Line
-	2800 3650 3400 3650
+	4400 3600 5000 3600
 Wire Wire Line
-	2800 3550 3400 3550
+	4400 3500 5000 3500
 Wire Wire Line
-	2800 3450 3400 3450
+	4400 3400 5000 3400
 Wire Wire Line
-	2800 3350 3400 3350
+	4400 3300 5000 3300
 Wire Wire Line
-	2800 3250 3400 3250
+	4400 3200 5000 3200
 Wire Wire Line
-	2800 3150 3400 3150
+	4400 3100 5000 3100
 Wire Wire Line
-	2800 3050 3400 3050
+	4400 3000 5000 3000
 Wire Wire Line
-	2800 2850 3400 2850
+	4400 2800 5000 2800
 Wire Wire Line
-	2800 2750 3400 2750
+	4400 2700 5000 2700
 Wire Wire Line
-	2800 2650 3400 2650
+	4400 2600 5000 2600
 Wire Wire Line
-	2800 2550 3400 2550
+	4400 2500 5000 2500
 Wire Wire Line
-	2800 2450 3400 2450
+	4400 2400 5000 2400
 Wire Wire Line
-	2800 2350 3400 2350
+	4400 2300 5000 2300
 Wire Wire Line
-	2800 2250 3400 2250
+	4400 2200 5000 2200
 Wire Wire Line
-	2800 2150 3400 2150
+	4400 2100 5000 2100
 Wire Wire Line
-	2800 1950 3400 1950
+	4400 1900 5000 1900
 Wire Wire Line
-	2800 1850 3400 1850
+	4400 1800 5000 1800
 Wire Wire Line
-	2800 1750 3400 1750
+	4400 1700 5000 1700
 Wire Wire Line
-	2800 1650 3400 1650
+	4400 1600 5000 1600
 Wire Wire Line
-	2800 1550 3400 1550
+	4400 1500 5000 1500
 Wire Wire Line
-	2800 1450 3400 1450
+	4400 1400 5000 1400
 Wire Wire Line
-	2800 1350 3400 1350
+	4400 1300 5000 1300
 Wire Wire Line
-	2800 1250 3400 1250
-Text Label 2800 9100 0    60   ~ 0
+	4400 1200 5000 1200
+Text Label 4400 9050 0    60   ~ 0
 TVRAM31
-Text Label 2800 9000 0    60   ~ 0
+Text Label 4400 8950 0    60   ~ 0
 TVRAM30
-Text Label 2800 8900 0    60   ~ 0
+Text Label 4400 8850 0    60   ~ 0
 TVRAM29
-Text Label 2800 8800 0    60   ~ 0
+Text Label 4400 8750 0    60   ~ 0
 TVRAM28
-Text Label 2800 8700 0    60   ~ 0
+Text Label 4400 8650 0    60   ~ 0
 TVRAM27
-Text Label 2800 8600 0    60   ~ 0
+Text Label 4400 8550 0    60   ~ 0
 TVRAM26
-Text Label 2800 8500 0    60   ~ 0
+Text Label 4400 8450 0    60   ~ 0
 TVRAM25
-Text Label 2800 8400 0    60   ~ 0
+Text Label 4400 8350 0    60   ~ 0
 TVRAM24
-Text Label 2800 8200 0    60   ~ 0
+Text Label 4400 8150 0    60   ~ 0
 TVRAM23
-Text Label 2800 8100 0    60   ~ 0
+Text Label 4400 8050 0    60   ~ 0
 TVRAM22
-Text Label 2800 8000 0    60   ~ 0
+Text Label 4400 7950 0    60   ~ 0
 TVRAM21
-Text Label 2800 7900 0    60   ~ 0
+Text Label 4400 7850 0    60   ~ 0
 TVRAM20
-Text Label 2800 7800 0    60   ~ 0
+Text Label 4400 7750 0    60   ~ 0
 TVRAM19
-Text Label 2800 7700 0    60   ~ 0
+Text Label 4400 7650 0    60   ~ 0
 TVRAM18
-Text Label 2800 7600 0    60   ~ 0
+Text Label 4400 7550 0    60   ~ 0
 TVRAM17
-Text Label 2800 7500 0    60   ~ 0
+Text Label 4400 7450 0    60   ~ 0
 TVRAM16
-Text Label 2800 7300 0    60   ~ 0
+Text Label 4400 7250 0    60   ~ 0
 TVRAM15
-Text Label 2800 7200 0    60   ~ 0
+Text Label 4400 7150 0    60   ~ 0
 TVRAM14
-Text Label 2800 7100 0    60   ~ 0
+Text Label 4400 7050 0    60   ~ 0
 TVRAM13
-Text Label 2800 7000 0    60   ~ 0
+Text Label 4400 6950 0    60   ~ 0
 TVRAM12
-Text Label 2800 6900 0    60   ~ 0
+Text Label 4400 6850 0    60   ~ 0
 TVRAM11
-Text Label 2800 6800 0    60   ~ 0
+Text Label 4400 6750 0    60   ~ 0
 TVRAM10
-Text Label 2800 6700 0    60   ~ 0
+Text Label 4400 6650 0    60   ~ 0
 TVRAM9
-Text Label 2800 6600 0    60   ~ 0
+Text Label 4400 6550 0    60   ~ 0
 TVRAM8
-Text Label 2800 6400 0    60   ~ 0
+Text Label 4400 6350 0    60   ~ 0
 TVRAM7
-Text Label 2800 6300 0    60   ~ 0
+Text Label 4400 6250 0    60   ~ 0
 TVRAM6
-Text Label 2800 6200 0    60   ~ 0
+Text Label 4400 6150 0    60   ~ 0
 TVRAM5
-Text Label 2800 6100 0    60   ~ 0
+Text Label 4400 6050 0    60   ~ 0
 TVRAM4
-Text Label 2800 6000 0    60   ~ 0
+Text Label 4400 5950 0    60   ~ 0
 TVRAM3
-Text Label 2800 5900 0    60   ~ 0
+Text Label 4400 5850 0    60   ~ 0
 TVRAM2
-Text Label 2800 5800 0    60   ~ 0
+Text Label 4400 5750 0    60   ~ 0
 TVRAM1
-Text Label 2800 5700 0    60   ~ 0
+Text Label 4400 5650 0    60   ~ 0
 TVRAM0
-Text Label 2800 4650 0    60   ~ 0
+Text Label 4400 4600 0    60   ~ 0
 TVRAM31
-Text Label 2800 4550 0    60   ~ 0
+Text Label 4400 4500 0    60   ~ 0
 TVRAM30
-Text Label 2800 4450 0    60   ~ 0
+Text Label 4400 4400 0    60   ~ 0
 TVRAM29
-Text Label 2800 4350 0    60   ~ 0
+Text Label 4400 4300 0    60   ~ 0
 TVRAM28
-Text Label 2800 4250 0    60   ~ 0
+Text Label 4400 4200 0    60   ~ 0
 TVRAM27
-Text Label 2800 4150 0    60   ~ 0
+Text Label 4400 4100 0    60   ~ 0
 TVRAM26
-Text Label 2800 4050 0    60   ~ 0
+Text Label 4400 4000 0    60   ~ 0
 TVRAM25
-Text Label 2800 3950 0    60   ~ 0
+Text Label 4400 3900 0    60   ~ 0
 TVRAM24
-Text Label 2800 3750 0    60   ~ 0
+Text Label 4400 3700 0    60   ~ 0
 TVRAM23
-Text Label 2800 3650 0    60   ~ 0
+Text Label 4400 3600 0    60   ~ 0
 TVRAM22
-Text Label 2800 3550 0    60   ~ 0
+Text Label 4400 3500 0    60   ~ 0
 TVRAM21
-Text Label 2800 3450 0    60   ~ 0
+Text Label 4400 3400 0    60   ~ 0
 TVRAM20
-Text Label 2800 3350 0    60   ~ 0
+Text Label 4400 3300 0    60   ~ 0
 TVRAM19
-Text Label 2800 3250 0    60   ~ 0
+Text Label 4400 3200 0    60   ~ 0
 TVRAM18
-Text Label 2800 3150 0    60   ~ 0
+Text Label 4400 3100 0    60   ~ 0
 TVRAM17
-Text Label 2800 3050 0    60   ~ 0
+Text Label 4400 3000 0    60   ~ 0
 TVRAM16
-Text Label 2800 2850 0    60   ~ 0
+Text Label 4400 2800 0    60   ~ 0
 TVRAM15
-Text Label 2800 2750 0    60   ~ 0
+Text Label 4400 2700 0    60   ~ 0
 TVRAM14
-Text Label 2800 2650 0    60   ~ 0
+Text Label 4400 2600 0    60   ~ 0
 TVRAM13
-Text Label 2800 2550 0    60   ~ 0
+Text Label 4400 2500 0    60   ~ 0
 TVRAM12
-Text Label 2800 2450 0    60   ~ 0
+Text Label 4400 2400 0    60   ~ 0
 TVRAM11
-Text Label 2800 2350 0    60   ~ 0
+Text Label 4400 2300 0    60   ~ 0
 TVRAM10
-Text Label 2800 2250 0    60   ~ 0
+Text Label 4400 2200 0    60   ~ 0
 TVRAM9
-Text Label 2800 2150 0    60   ~ 0
+Text Label 4400 2100 0    60   ~ 0
 TVRAM8
-Text Label 2800 1950 0    60   ~ 0
+Text Label 4400 1900 0    60   ~ 0
 TVRAM7
-Text Label 2800 1850 0    60   ~ 0
+Text Label 4400 1800 0    60   ~ 0
 TVRAM6
-Text Label 2800 1750 0    60   ~ 0
+Text Label 4400 1700 0    60   ~ 0
 TVRAM5
-Text Label 2800 1650 0    60   ~ 0
+Text Label 4400 1600 0    60   ~ 0
 TVRAM4
-Text Label 2800 1550 0    60   ~ 0
+Text Label 4400 1500 0    60   ~ 0
 TVRAM3
-Text Label 2800 1450 0    60   ~ 0
+Text Label 4400 1400 0    60   ~ 0
 TVRAM2
-Text Label 2800 1350 0    60   ~ 0
+Text Label 4400 1300 0    60   ~ 0
 TVRAM1
-Text Label 2800 1250 0    60   ~ 0
+Text Label 4400 1200 0    60   ~ 0
 TVRAM0
 Wire Wire Line
-	5650 9100 6250 9100
+	7250 9050 7850 9050
 Wire Wire Line
-	5650 9000 6250 9000
+	7250 8950 7850 8950
 Wire Wire Line
-	5650 8900 6250 8900
+	7250 8850 7850 8850
 Wire Wire Line
-	5650 8800 6250 8800
+	7250 8750 7850 8750
 Wire Wire Line
-	5650 8700 6250 8700
+	7250 8650 7850 8650
 Wire Wire Line
-	5650 8600 6250 8600
+	7250 8550 7850 8550
 Wire Wire Line
-	5650 8500 6250 8500
+	7250 8450 7850 8450
 Wire Wire Line
-	5650 8400 6250 8400
+	7250 8350 7850 8350
 Wire Wire Line
-	5650 8200 6250 8200
+	7250 8150 7850 8150
 Wire Wire Line
-	5650 8100 6250 8100
+	7250 8050 7850 8050
 Wire Wire Line
-	5650 8000 6250 8000
+	7250 7950 7850 7950
 Wire Wire Line
-	5650 7900 6250 7900
+	7250 7850 7850 7850
 Wire Wire Line
-	5650 7800 6250 7800
+	7250 7750 7850 7750
 Wire Wire Line
-	5650 7700 6250 7700
+	7250 7650 7850 7650
 Wire Wire Line
-	5650 7600 6250 7600
+	7250 7550 7850 7550
 Wire Wire Line
-	5650 7500 6250 7500
+	7250 7450 7850 7450
 Wire Wire Line
-	5650 7300 6250 7300
+	7250 7250 7850 7250
 Wire Wire Line
-	5650 7200 6250 7200
+	7250 7150 7850 7150
 Wire Wire Line
-	5650 7100 6250 7100
+	7250 7050 7850 7050
 Wire Wire Line
-	5650 7000 6250 7000
+	7250 6950 7850 6950
 Wire Wire Line
-	5650 6900 6250 6900
+	7250 6850 7850 6850
 Wire Wire Line
-	5650 6800 6250 6800
+	7250 6750 7850 6750
 Wire Wire Line
-	5650 6700 6250 6700
+	7250 6650 7850 6650
 Wire Wire Line
-	5650 6600 6250 6600
+	7250 6550 7850 6550
 Wire Wire Line
-	5650 6400 6250 6400
+	7250 6350 7850 6350
 Wire Wire Line
-	5650 6300 6250 6300
+	7250 6250 7850 6250
 Wire Wire Line
-	5650 6200 6250 6200
+	7250 6150 7850 6150
 Wire Wire Line
-	5650 6100 6250 6100
+	7250 6050 7850 6050
 Wire Wire Line
-	5650 6000 6250 6000
+	7250 5950 7850 5950
 Wire Wire Line
-	5650 5900 6250 5900
+	7250 5850 7850 5850
 Wire Wire Line
-	5650 5800 6250 5800
+	7250 5750 7850 5750
 Wire Wire Line
-	5650 5700 6250 5700
-Text Label 5700 9100 0    60   ~ 0
+	7250 5650 7850 5650
+Text Label 7300 9050 0    60   ~ 0
 TVRAM31
-Text Label 5700 9000 0    60   ~ 0
+Text Label 7300 8950 0    60   ~ 0
 TVRAM30
-Text Label 5700 8900 0    60   ~ 0
+Text Label 7300 8850 0    60   ~ 0
 TVRAM29
-Text Label 5700 8800 0    60   ~ 0
+Text Label 7300 8750 0    60   ~ 0
 TVRAM28
-Text Label 5700 8700 0    60   ~ 0
+Text Label 7300 8650 0    60   ~ 0
 TVRAM27
-Text Label 5700 8600 0    60   ~ 0
+Text Label 7300 8550 0    60   ~ 0
 TVRAM26
-Text Label 5700 8500 0    60   ~ 0
+Text Label 7300 8450 0    60   ~ 0
 TVRAM25
-Text Label 5700 8400 0    60   ~ 0
+Text Label 7300 8350 0    60   ~ 0
 TVRAM24
-Text Label 5700 8200 0    60   ~ 0
+Text Label 7300 8150 0    60   ~ 0
 TVRAM23
-Text Label 5700 8100 0    60   ~ 0
+Text Label 7300 8050 0    60   ~ 0
 TVRAM22
-Text Label 5700 8000 0    60   ~ 0
+Text Label 7300 7950 0    60   ~ 0
 TVRAM21
-Text Label 5700 7900 0    60   ~ 0
+Text Label 7300 7850 0    60   ~ 0
 TVRAM20
-Text Label 5700 7800 0    60   ~ 0
+Text Label 7300 7750 0    60   ~ 0
 TVRAM19
-Text Label 5700 7700 0    60   ~ 0
+Text Label 7300 7650 0    60   ~ 0
 TVRAM18
-Text Label 5700 7600 0    60   ~ 0
+Text Label 7300 7550 0    60   ~ 0
 TVRAM17
-Text Label 5700 7500 0    60   ~ 0
+Text Label 7300 7450 0    60   ~ 0
 TVRAM16
-Text Label 5700 7300 0    60   ~ 0
+Text Label 7300 7250 0    60   ~ 0
 TVRAM15
-Text Label 5700 7200 0    60   ~ 0
+Text Label 7300 7150 0    60   ~ 0
 TVRAM14
-Text Label 5700 7100 0    60   ~ 0
+Text Label 7300 7050 0    60   ~ 0
 TVRAM13
-Text Label 5700 7000 0    60   ~ 0
+Text Label 7300 6950 0    60   ~ 0
 TVRAM12
-Text Label 5700 6900 0    60   ~ 0
+Text Label 7300 6850 0    60   ~ 0
 TVRAM11
-Text Label 5700 6800 0    60   ~ 0
+Text Label 7300 6750 0    60   ~ 0
 TVRAM10
-Text Label 5700 6700 0    60   ~ 0
+Text Label 7300 6650 0    60   ~ 0
 TVRAM9
-Text Label 5700 6600 0    60   ~ 0
+Text Label 7300 6550 0    60   ~ 0
 TVRAM8
-Text Label 5700 6400 0    60   ~ 0
+Text Label 7300 6350 0    60   ~ 0
 TVRAM7
-Text Label 5700 6300 0    60   ~ 0
+Text Label 7300 6250 0    60   ~ 0
 TVRAM6
-Text Label 5700 6200 0    60   ~ 0
+Text Label 7300 6150 0    60   ~ 0
 TVRAM5
-Text Label 5700 6100 0    60   ~ 0
+Text Label 7300 6050 0    60   ~ 0
 TVRAM4
-Text Label 5700 6000 0    60   ~ 0
+Text Label 7300 5950 0    60   ~ 0
 TVRAM3
-Text Label 5700 5900 0    60   ~ 0
+Text Label 7300 5850 0    60   ~ 0
 TVRAM2
-Text Label 5700 5800 0    60   ~ 0
+Text Label 7300 5750 0    60   ~ 0
 TVRAM1
-Text Label 5700 5700 0    60   ~ 0
+Text Label 7300 5650 0    60   ~ 0
 TVRAM0
 Wire Wire Line
-	5650 4650 6250 4650
+	7250 4600 7850 4600
 Wire Wire Line
-	5650 4550 6250 4550
+	7250 4500 7850 4500
 Wire Wire Line
-	5650 4450 6250 4450
+	7250 4400 7850 4400
 Wire Wire Line
-	5650 4350 6250 4350
+	7250 4300 7850 4300
 Wire Wire Line
-	5650 4250 6250 4250
+	7250 4200 7850 4200
 Wire Wire Line
-	5650 4150 6250 4150
+	7250 4100 7850 4100
 Wire Wire Line
-	5650 4050 6250 4050
+	7250 4000 7850 4000
 Wire Wire Line
-	5650 3950 6250 3950
+	7250 3900 7850 3900
 Wire Wire Line
-	5650 3750 6250 3750
+	7250 3700 7850 3700
 Wire Wire Line
-	5650 3650 6250 3650
+	7250 3600 7850 3600
 Wire Wire Line
-	5650 3550 6250 3550
+	7250 3500 7850 3500
 Wire Wire Line
-	5650 3450 6250 3450
+	7250 3400 7850 3400
 Wire Wire Line
-	5650 3350 6250 3350
+	7250 3300 7850 3300
 Wire Wire Line
-	5650 3250 6250 3250
+	7250 3200 7850 3200
 Wire Wire Line
-	5650 3150 6250 3150
+	7250 3100 7850 3100
 Wire Wire Line
-	5650 3050 6250 3050
+	7250 3000 7850 3000
 Wire Wire Line
-	5650 2850 6250 2850
+	7250 2800 7850 2800
 Wire Wire Line
-	5650 2750 6250 2750
+	7250 2700 7850 2700
 Wire Wire Line
-	5650 2650 6250 2650
+	7250 2600 7850 2600
 Wire Wire Line
-	5650 2550 6250 2550
+	7250 2500 7850 2500
 Wire Wire Line
-	5650 2450 6250 2450
+	7250 2400 7850 2400
 Wire Wire Line
-	5650 2350 6250 2350
+	7250 2300 7850 2300
 Wire Wire Line
-	5650 2250 6250 2250
+	7250 2200 7850 2200
 Wire Wire Line
-	5650 2150 6250 2150
+	7250 2100 7850 2100
 Wire Wire Line
-	5650 1950 6250 1950
+	7250 1900 7850 1900
 Wire Wire Line
-	5650 1850 6250 1850
+	7250 1800 7850 1800
 Wire Wire Line
-	5650 1750 6250 1750
+	7250 1700 7850 1700
 Wire Wire Line
-	5650 1650 6250 1650
+	7250 1600 7850 1600
 Wire Wire Line
-	5650 1550 6250 1550
+	7250 1500 7850 1500
 Wire Wire Line
-	5650 1450 6250 1450
+	7250 1400 7850 1400
 Wire Wire Line
-	5650 1350 6250 1350
+	7250 1300 7850 1300
 Wire Wire Line
-	5650 1250 6250 1250
-Text Label 5700 4650 0    60   ~ 0
+	7250 1200 7850 1200
+Text Label 7300 4600 0    60   ~ 0
 TVRAM31
-Text Label 5700 4550 0    60   ~ 0
+Text Label 7300 4500 0    60   ~ 0
 TVRAM30
-Text Label 5700 4450 0    60   ~ 0
+Text Label 7300 4400 0    60   ~ 0
 TVRAM29
-Text Label 5700 4350 0    60   ~ 0
+Text Label 7300 4300 0    60   ~ 0
 TVRAM28
-Text Label 5700 4250 0    60   ~ 0
+Text Label 7300 4200 0    60   ~ 0
 TVRAM27
-Text Label 5700 4150 0    60   ~ 0
+Text Label 7300 4100 0    60   ~ 0
 TVRAM26
-Text Label 5700 4050 0    60   ~ 0
+Text Label 7300 4000 0    60   ~ 0
 TVRAM25
-Text Label 5700 3950 0    60   ~ 0
+Text Label 7300 3900 0    60   ~ 0
 TVRAM24
-Text Label 5700 3750 0    60   ~ 0
+Text Label 7300 3700 0    60   ~ 0
 TVRAM23
-Text Label 5700 3650 0    60   ~ 0
+Text Label 7300 3600 0    60   ~ 0
 TVRAM22
-Text Label 5700 3550 0    60   ~ 0
+Text Label 7300 3500 0    60   ~ 0
 TVRAM21
-Text Label 5700 3450 0    60   ~ 0
+Text Label 7300 3400 0    60   ~ 0
 TVRAM20
-Text Label 5700 3350 0    60   ~ 0
+Text Label 7300 3300 0    60   ~ 0
 TVRAM19
-Text Label 5700 3250 0    60   ~ 0
+Text Label 7300 3200 0    60   ~ 0
 TVRAM18
-Text Label 5700 3150 0    60   ~ 0
+Text Label 7300 3100 0    60   ~ 0
 TVRAM17
-Text Label 5700 3050 0    60   ~ 0
+Text Label 7300 3000 0    60   ~ 0
 TVRAM16
-Text Label 5700 2850 0    60   ~ 0
+Text Label 7300 2800 0    60   ~ 0
 TVRAM15
-Text Label 5700 2750 0    60   ~ 0
+Text Label 7300 2700 0    60   ~ 0
 TVRAM14
-Text Label 5700 2650 0    60   ~ 0
+Text Label 7300 2600 0    60   ~ 0
 TVRAM13
-Text Label 5700 2550 0    60   ~ 0
+Text Label 7300 2500 0    60   ~ 0
 TVRAM12
-Text Label 5700 2450 0    60   ~ 0
+Text Label 7300 2400 0    60   ~ 0
 TVRAM11
-Text Label 5700 2350 0    60   ~ 0
+Text Label 7300 2300 0    60   ~ 0
 TVRAM10
-Text Label 5700 2250 0    60   ~ 0
+Text Label 7300 2200 0    60   ~ 0
 TVRAM9
-Text Label 5700 2150 0    60   ~ 0
+Text Label 7300 2100 0    60   ~ 0
 TVRAM8
-Text Label 5700 1950 0    60   ~ 0
+Text Label 7300 1900 0    60   ~ 0
 TVRAM7
-Text Label 5700 1850 0    60   ~ 0
+Text Label 7300 1800 0    60   ~ 0
 TVRAM6
-Text Label 5700 1750 0    60   ~ 0
+Text Label 7300 1700 0    60   ~ 0
 TVRAM5
-Text Label 5700 1650 0    60   ~ 0
+Text Label 7300 1600 0    60   ~ 0
 TVRAM4
-Text Label 5700 1550 0    60   ~ 0
+Text Label 7300 1500 0    60   ~ 0
 TVRAM3
-Text Label 5700 1450 0    60   ~ 0
+Text Label 7300 1400 0    60   ~ 0
 TVRAM2
-Text Label 5700 1350 0    60   ~ 0
+Text Label 7300 1300 0    60   ~ 0
 TVRAM1
-Text Label 5700 1250 0    60   ~ 0
+Text Label 7300 1200 0    60   ~ 0
 TVRAM0
 Wire Wire Line
-	8500 9100 9100 9100
+	10100 9050 10700 9050
 Wire Wire Line
-	8500 9000 9100 9000
+	10100 8950 10700 8950
 Wire Wire Line
-	8500 8900 9100 8900
+	10100 8850 10700 8850
 Wire Wire Line
-	8500 8800 9100 8800
+	10100 8750 10700 8750
 Wire Wire Line
-	8500 8700 9100 8700
+	10100 8650 10700 8650
 Wire Wire Line
-	8500 8600 9100 8600
+	10100 8550 10700 8550
 Wire Wire Line
-	8500 8500 9100 8500
+	10100 8450 10700 8450
 Wire Wire Line
-	8500 8400 9100 8400
+	10100 8350 10700 8350
 Wire Wire Line
-	8500 8200 9100 8200
+	10100 8150 10700 8150
 Wire Wire Line
-	8500 8100 9100 8100
+	10100 8050 10700 8050
 Wire Wire Line
-	8500 8000 9100 8000
+	10100 7950 10700 7950
 Wire Wire Line
-	8500 7900 9100 7900
+	10100 7850 10700 7850
 Wire Wire Line
-	8500 7800 9100 7800
+	10100 7750 10700 7750
 Wire Wire Line
-	8500 7700 9100 7700
+	10100 7650 10700 7650
 Wire Wire Line
-	8500 7600 9100 7600
+	10100 7550 10700 7550
 Wire Wire Line
-	8500 7500 9100 7500
+	10100 7450 10700 7450
 Wire Wire Line
-	8500 7300 9100 7300
+	10100 7250 10700 7250
 Wire Wire Line
-	8500 7200 9100 7200
+	10100 7150 10700 7150
 Wire Wire Line
-	8500 7100 9100 7100
+	10100 7050 10700 7050
 Wire Wire Line
-	8500 7000 9100 7000
+	10100 6950 10700 6950
 Wire Wire Line
-	8500 6900 9100 6900
+	10100 6850 10700 6850
 Wire Wire Line
-	8500 6800 9100 6800
+	10100 6750 10700 6750
 Wire Wire Line
-	8500 6700 9100 6700
+	10100 6650 10700 6650
 Wire Wire Line
-	8500 6600 9100 6600
+	10100 6550 10700 6550
 Wire Wire Line
-	8500 6400 9100 6400
+	10100 6350 10700 6350
 Wire Wire Line
-	8500 6300 9100 6300
+	10100 6250 10700 6250
 Wire Wire Line
-	8500 6200 9100 6200
+	10100 6150 10700 6150
 Wire Wire Line
-	8500 6100 9100 6100
+	10100 6050 10700 6050
 Wire Wire Line
-	8500 6000 9100 6000
+	10100 5950 10700 5950
 Wire Wire Line
-	8500 5900 9100 5900
+	10100 5850 10700 5850
 Wire Wire Line
-	8500 5800 9100 5800
+	10100 5750 10700 5750
 Wire Wire Line
-	8500 5700 9100 5700
-Text Label 8550 9100 0    60   ~ 0
+	10100 5650 10700 5650
+Text Label 10150 9050 0    60   ~ 0
 TVRAM31
-Text Label 8550 9000 0    60   ~ 0
+Text Label 10150 8950 0    60   ~ 0
 TVRAM30
-Text Label 8550 8900 0    60   ~ 0
+Text Label 10150 8850 0    60   ~ 0
 TVRAM29
-Text Label 8550 8800 0    60   ~ 0
+Text Label 10150 8750 0    60   ~ 0
 TVRAM28
-Text Label 8550 8700 0    60   ~ 0
+Text Label 10150 8650 0    60   ~ 0
 TVRAM27
-Text Label 8550 8600 0    60   ~ 0
+Text Label 10150 8550 0    60   ~ 0
 TVRAM26
-Text Label 8550 8500 0    60   ~ 0
+Text Label 10150 8450 0    60   ~ 0
 TVRAM25
-Text Label 8550 8400 0    60   ~ 0
+Text Label 10150 8350 0    60   ~ 0
 TVRAM24
-Text Label 8550 8200 0    60   ~ 0
+Text Label 10150 8150 0    60   ~ 0
 TVRAM23
-Text Label 8550 8100 0    60   ~ 0
+Text Label 10150 8050 0    60   ~ 0
 TVRAM22
-Text Label 8550 8000 0    60   ~ 0
+Text Label 10150 7950 0    60   ~ 0
 TVRAM21
-Text Label 8550 7900 0    60   ~ 0
+Text Label 10150 7850 0    60   ~ 0
 TVRAM20
-Text Label 8550 7800 0    60   ~ 0
+Text Label 10150 7750 0    60   ~ 0
 TVRAM19
-Text Label 8550 7700 0    60   ~ 0
+Text Label 10150 7650 0    60   ~ 0
 TVRAM18
-Text Label 8550 7600 0    60   ~ 0
+Text Label 10150 7550 0    60   ~ 0
 TVRAM17
-Text Label 8550 7500 0    60   ~ 0
+Text Label 10150 7450 0    60   ~ 0
 TVRAM16
-Text Label 8550 7300 0    60   ~ 0
+Text Label 10150 7250 0    60   ~ 0
 TVRAM15
-Text Label 8550 7200 0    60   ~ 0
+Text Label 10150 7150 0    60   ~ 0
 TVRAM14
-Text Label 8550 7100 0    60   ~ 0
+Text Label 10150 7050 0    60   ~ 0
 TVRAM13
-Text Label 8550 7000 0    60   ~ 0
+Text Label 10150 6950 0    60   ~ 0
 TVRAM12
-Text Label 8550 6900 0    60   ~ 0
+Text Label 10150 6850 0    60   ~ 0
 TVRAM11
-Text Label 8550 6800 0    60   ~ 0
+Text Label 10150 6750 0    60   ~ 0
 TVRAM10
-Text Label 8550 6700 0    60   ~ 0
+Text Label 10150 6650 0    60   ~ 0
 TVRAM9
-Text Label 8550 6600 0    60   ~ 0
+Text Label 10150 6550 0    60   ~ 0
 TVRAM8
-Text Label 8550 6400 0    60   ~ 0
+Text Label 10150 6350 0    60   ~ 0
 TVRAM7
-Text Label 8550 6300 0    60   ~ 0
+Text Label 10150 6250 0    60   ~ 0
 TVRAM6
-Text Label 8550 6200 0    60   ~ 0
+Text Label 10150 6150 0    60   ~ 0
 TVRAM5
-Text Label 8550 6100 0    60   ~ 0
+Text Label 10150 6050 0    60   ~ 0
 TVRAM4
-Text Label 8550 6000 0    60   ~ 0
+Text Label 10150 5950 0    60   ~ 0
 TVRAM3
-Text Label 8550 5900 0    60   ~ 0
+Text Label 10150 5850 0    60   ~ 0
 TVRAM2
-Text Label 8550 5800 0    60   ~ 0
+Text Label 10150 5750 0    60   ~ 0
 TVRAM1
-Text Label 8550 5700 0    60   ~ 0
+Text Label 10150 5650 0    60   ~ 0
 TVRAM0
 Wire Wire Line
-	11300 9100 11900 9100
+	12900 9050 13500 9050
 Wire Wire Line
-	11300 9000 11900 9000
+	12900 8950 13500 8950
 Wire Wire Line
-	11300 8900 11900 8900
+	12900 8850 13500 8850
 Wire Wire Line
-	11300 8800 11900 8800
+	12900 8750 13500 8750
 Wire Wire Line
-	11300 8700 11900 8700
+	12900 8650 13500 8650
 Wire Wire Line
-	11300 8600 11900 8600
+	12900 8550 13500 8550
 Wire Wire Line
-	11300 8500 11900 8500
+	12900 8450 13500 8450
 Wire Wire Line
-	11300 8400 11900 8400
+	12900 8350 13500 8350
 Wire Wire Line
-	11300 8200 11900 8200
+	12900 8150 13500 8150
 Wire Wire Line
-	11300 8100 11900 8100
+	12900 8050 13500 8050
 Wire Wire Line
-	11300 8000 11900 8000
+	12900 7950 13500 7950
 Wire Wire Line
-	11300 7900 11900 7900
+	12900 7850 13500 7850
 Wire Wire Line
-	11300 7800 11900 7800
+	12900 7750 13500 7750
 Wire Wire Line
-	11300 7700 11900 7700
+	12900 7650 13500 7650
 Wire Wire Line
-	11300 7600 11900 7600
+	12900 7550 13500 7550
 Wire Wire Line
-	11300 7500 11900 7500
+	12900 7450 13500 7450
 Wire Wire Line
-	11300 7300 11900 7300
+	12900 7250 13500 7250
 Wire Wire Line
-	11300 7200 11900 7200
+	12900 7150 13500 7150
 Wire Wire Line
-	11300 7100 11900 7100
+	12900 7050 13500 7050
 Wire Wire Line
-	11300 7000 11900 7000
+	12900 6950 13500 6950
 Wire Wire Line
-	11300 6900 11900 6900
+	12900 6850 13500 6850
 Wire Wire Line
-	11300 6800 11900 6800
+	12900 6750 13500 6750
 Wire Wire Line
-	11300 6700 11900 6700
+	12900 6650 13500 6650
 Wire Wire Line
-	11300 6600 11900 6600
+	12900 6550 13500 6550
 Wire Wire Line
-	11300 6400 11900 6400
+	12900 6350 13500 6350
 Wire Wire Line
-	11300 6300 11900 6300
+	12900 6250 13500 6250
 Wire Wire Line
-	11300 6200 11900 6200
+	12900 6150 13500 6150
 Wire Wire Line
-	11300 6100 11900 6100
+	12900 6050 13500 6050
 Wire Wire Line
-	11300 6000 11900 6000
+	12900 5950 13500 5950
 Wire Wire Line
-	11300 5900 11900 5900
+	12900 5850 13500 5850
 Wire Wire Line
-	11300 5800 11900 5800
+	12900 5750 13500 5750
 Wire Wire Line
-	11300 5700 11900 5700
-Text Label 11350 9100 0    60   ~ 0
+	12900 5650 13500 5650
+Text Label 12950 9050 0    60   ~ 0
 TVRAM31
-Text Label 11350 9000 0    60   ~ 0
+Text Label 12950 8950 0    60   ~ 0
 TVRAM30
-Text Label 11350 8900 0    60   ~ 0
+Text Label 12950 8850 0    60   ~ 0
 TVRAM29
-Text Label 11350 8800 0    60   ~ 0
+Text Label 12950 8750 0    60   ~ 0
 TVRAM28
-Text Label 11350 8700 0    60   ~ 0
+Text Label 12950 8650 0    60   ~ 0
 TVRAM27
-Text Label 11350 8600 0    60   ~ 0
+Text Label 12950 8550 0    60   ~ 0
 TVRAM26
-Text Label 11350 8500 0    60   ~ 0
+Text Label 12950 8450 0    60   ~ 0
 TVRAM25
-Text Label 11350 8400 0    60   ~ 0
+Text Label 12950 8350 0    60   ~ 0
 TVRAM24
-Text Label 11350 8200 0    60   ~ 0
+Text Label 12950 8150 0    60   ~ 0
 TVRAM23
-Text Label 11350 8100 0    60   ~ 0
+Text Label 12950 8050 0    60   ~ 0
 TVRAM22
-Text Label 11350 8000 0    60   ~ 0
+Text Label 12950 7950 0    60   ~ 0
 TVRAM21
-Text Label 11350 7900 0    60   ~ 0
+Text Label 12950 7850 0    60   ~ 0
 TVRAM20
-Text Label 11350 7800 0    60   ~ 0
+Text Label 12950 7750 0    60   ~ 0
 TVRAM19
-Text Label 11350 7700 0    60   ~ 0
+Text Label 12950 7650 0    60   ~ 0
 TVRAM18
-Text Label 11350 7600 0    60   ~ 0
+Text Label 12950 7550 0    60   ~ 0
 TVRAM17
-Text Label 11350 7500 0    60   ~ 0
+Text Label 12950 7450 0    60   ~ 0
 TVRAM16
-Text Label 11350 7300 0    60   ~ 0
+Text Label 12950 7250 0    60   ~ 0
 TVRAM15
-Text Label 11350 7200 0    60   ~ 0
+Text Label 12950 7150 0    60   ~ 0
 TVRAM14
-Text Label 11350 7100 0    60   ~ 0
+Text Label 12950 7050 0    60   ~ 0
 TVRAM13
-Text Label 11350 7000 0    60   ~ 0
+Text Label 12950 6950 0    60   ~ 0
 TVRAM12
-Text Label 11350 6900 0    60   ~ 0
+Text Label 12950 6850 0    60   ~ 0
 TVRAM11
-Text Label 11350 6800 0    60   ~ 0
+Text Label 12950 6750 0    60   ~ 0
 TVRAM10
-Text Label 11350 6700 0    60   ~ 0
+Text Label 12950 6650 0    60   ~ 0
 TVRAM9
-Text Label 11350 6600 0    60   ~ 0
+Text Label 12950 6550 0    60   ~ 0
 TVRAM8
-Text Label 11350 6400 0    60   ~ 0
+Text Label 12950 6350 0    60   ~ 0
 TVRAM7
-Text Label 11350 6300 0    60   ~ 0
+Text Label 12950 6250 0    60   ~ 0
 TVRAM6
-Text Label 11350 6200 0    60   ~ 0
+Text Label 12950 6150 0    60   ~ 0
 TVRAM5
-Text Label 11350 6100 0    60   ~ 0
+Text Label 12950 6050 0    60   ~ 0
 TVRAM4
-Text Label 11350 6000 0    60   ~ 0
+Text Label 12950 5950 0    60   ~ 0
 TVRAM3
-Text Label 11350 5900 0    60   ~ 0
+Text Label 12950 5850 0    60   ~ 0
 TVRAM2
-Text Label 11350 5800 0    60   ~ 0
+Text Label 12950 5750 0    60   ~ 0
 TVRAM1
-Text Label 11350 5700 0    60   ~ 0
+Text Label 12950 5650 0    60   ~ 0
 TVRAM0
 Wire Wire Line
-	8500 4650 9100 4650
+	10100 4600 10700 4600
 Wire Wire Line
-	8500 4550 9100 4550
+	10100 4500 10700 4500
 Wire Wire Line
-	8500 4450 9100 4450
+	10100 4400 10700 4400
 Wire Wire Line
-	8500 4350 9100 4350
+	10100 4300 10700 4300
 Wire Wire Line
-	8500 4250 9100 4250
+	10100 4200 10700 4200
 Wire Wire Line
-	8500 4150 9100 4150
+	10100 4100 10700 4100
 Wire Wire Line
-	8500 4050 9100 4050
+	10100 4000 10700 4000
 Wire Wire Line
-	8500 3950 9100 3950
+	10100 3900 10700 3900
 Wire Wire Line
-	8500 3750 9100 3750
+	10100 3700 10700 3700
 Wire Wire Line
-	8500 3650 9100 3650
+	10100 3600 10700 3600
 Wire Wire Line
-	8500 3550 9100 3550
+	10100 3500 10700 3500
 Wire Wire Line
-	8500 3450 9100 3450
+	10100 3400 10700 3400
 Wire Wire Line
-	8500 3350 9100 3350
+	10100 3300 10700 3300
 Wire Wire Line
-	8500 3250 9100 3250
+	10100 3200 10700 3200
 Wire Wire Line
-	8500 3150 9100 3150
+	10100 3100 10700 3100
 Wire Wire Line
-	8500 3050 9100 3050
+	10100 3000 10700 3000
 Wire Wire Line
-	8500 2850 9100 2850
+	10100 2800 10700 2800
 Wire Wire Line
-	8500 2750 9100 2750
+	10100 2700 10700 2700
 Wire Wire Line
-	8500 2650 9100 2650
+	10100 2600 10700 2600
 Wire Wire Line
-	8500 2550 9100 2550
+	10100 2500 10700 2500
 Wire Wire Line
-	8500 2450 9100 2450
+	10100 2400 10700 2400
 Wire Wire Line
-	8500 2350 9100 2350
+	10100 2300 10700 2300
 Wire Wire Line
-	8500 2250 9100 2250
+	10100 2200 10700 2200
 Wire Wire Line
-	8500 2150 9100 2150
+	10100 2100 10700 2100
 Wire Wire Line
-	8500 1950 9100 1950
+	10100 1900 10700 1900
 Wire Wire Line
-	8500 1850 9100 1850
+	10100 1800 10700 1800
 Wire Wire Line
-	8500 1750 9100 1750
+	10100 1700 10700 1700
 Wire Wire Line
-	8500 1650 9100 1650
+	10100 1600 10700 1600
 Wire Wire Line
-	8500 1550 9100 1550
+	10100 1500 10700 1500
 Wire Wire Line
-	8500 1450 9100 1450
+	10100 1400 10700 1400
 Wire Wire Line
-	8500 1350 9100 1350
+	10100 1300 10700 1300
 Wire Wire Line
-	8500 1250 9100 1250
-Text Label 8550 4650 0    60   ~ 0
+	10100 1200 10700 1200
+Text Label 10150 4600 0    60   ~ 0
 TVRAM31
-Text Label 8550 4550 0    60   ~ 0
+Text Label 10150 4500 0    60   ~ 0
 TVRAM30
-Text Label 8550 4450 0    60   ~ 0
+Text Label 10150 4400 0    60   ~ 0
 TVRAM29
-Text Label 8550 4350 0    60   ~ 0
+Text Label 10150 4300 0    60   ~ 0
 TVRAM28
-Text Label 8550 4250 0    60   ~ 0
+Text Label 10150 4200 0    60   ~ 0
 TVRAM27
-Text Label 8550 4150 0    60   ~ 0
+Text Label 10150 4100 0    60   ~ 0
 TVRAM26
-Text Label 8550 4050 0    60   ~ 0
+Text Label 10150 4000 0    60   ~ 0
 TVRAM25
-Text Label 8550 3950 0    60   ~ 0
+Text Label 10150 3900 0    60   ~ 0
 TVRAM24
-Text Label 8550 3750 0    60   ~ 0
+Text Label 10150 3700 0    60   ~ 0
 TVRAM23
-Text Label 8550 3650 0    60   ~ 0
+Text Label 10150 3600 0    60   ~ 0
 TVRAM22
-Text Label 8550 3550 0    60   ~ 0
+Text Label 10150 3500 0    60   ~ 0
 TVRAM21
-Text Label 8550 3450 0    60   ~ 0
+Text Label 10150 3400 0    60   ~ 0
 TVRAM20
-Text Label 8550 3350 0    60   ~ 0
+Text Label 10150 3300 0    60   ~ 0
 TVRAM19
-Text Label 8550 3250 0    60   ~ 0
+Text Label 10150 3200 0    60   ~ 0
 TVRAM18
-Text Label 8550 3150 0    60   ~ 0
+Text Label 10150 3100 0    60   ~ 0
 TVRAM17
-Text Label 8550 3050 0    60   ~ 0
+Text Label 10150 3000 0    60   ~ 0
 TVRAM16
-Text Label 8550 2850 0    60   ~ 0
+Text Label 10150 2800 0    60   ~ 0
 TVRAM15
-Text Label 8550 2750 0    60   ~ 0
+Text Label 10150 2700 0    60   ~ 0
 TVRAM14
-Text Label 8550 2650 0    60   ~ 0
+Text Label 10150 2600 0    60   ~ 0
 TVRAM13
-Text Label 8550 2550 0    60   ~ 0
+Text Label 10150 2500 0    60   ~ 0
 TVRAM12
-Text Label 8550 2450 0    60   ~ 0
+Text Label 10150 2400 0    60   ~ 0
 TVRAM11
-Text Label 8550 2350 0    60   ~ 0
+Text Label 10150 2300 0    60   ~ 0
 TVRAM10
-Text Label 8550 2250 0    60   ~ 0
+Text Label 10150 2200 0    60   ~ 0
 TVRAM9
-Text Label 8550 2150 0    60   ~ 0
+Text Label 10150 2100 0    60   ~ 0
 TVRAM8
-Text Label 8550 1950 0    60   ~ 0
+Text Label 10150 1900 0    60   ~ 0
 TVRAM7
-Text Label 8550 1850 0    60   ~ 0
+Text Label 10150 1800 0    60   ~ 0
 TVRAM6
-Text Label 8550 1750 0    60   ~ 0
+Text Label 10150 1700 0    60   ~ 0
 TVRAM5
-Text Label 8550 1650 0    60   ~ 0
+Text Label 10150 1600 0    60   ~ 0
 TVRAM4
-Text Label 8550 1550 0    60   ~ 0
+Text Label 10150 1500 0    60   ~ 0
 TVRAM3
-Text Label 8550 1450 0    60   ~ 0
+Text Label 10150 1400 0    60   ~ 0
 TVRAM2
-Text Label 8550 1350 0    60   ~ 0
+Text Label 10150 1300 0    60   ~ 0
 TVRAM1
-Text Label 8550 1250 0    60   ~ 0
+Text Label 10150 1200 0    60   ~ 0
 TVRAM0
 Wire Wire Line
-	11300 4650 11900 4650
+	12900 4600 13500 4600
 Wire Wire Line
-	11300 4550 11900 4550
+	12900 4500 13500 4500
 Wire Wire Line
-	11300 4450 11900 4450
+	12900 4400 13500 4400
 Wire Wire Line
-	11300 4350 11900 4350
+	12900 4300 13500 4300
 Wire Wire Line
-	11300 4250 11900 4250
+	12900 4200 13500 4200
 Wire Wire Line
-	11300 4150 11900 4150
+	12900 4100 13500 4100
 Wire Wire Line
-	11300 4050 11900 4050
+	12900 4000 13500 4000
 Wire Wire Line
-	11300 3950 11900 3950
+	12900 3900 13500 3900
 Wire Wire Line
-	11300 3750 11900 3750
+	12900 3700 13500 3700
 Wire Wire Line
-	11300 3650 11900 3650
+	12900 3600 13500 3600
 Wire Wire Line
-	11300 3550 11900 3550
+	12900 3500 13500 3500
 Wire Wire Line
-	11300 3450 11900 3450
+	12900 3400 13500 3400
 Wire Wire Line
-	11300 3350 11900 3350
+	12900 3300 13500 3300
 Wire Wire Line
-	11300 3250 11900 3250
+	12900 3200 13500 3200
 Wire Wire Line
-	11300 3150 11900 3150
+	12900 3100 13500 3100
 Wire Wire Line
-	11300 3050 11900 3050
+	12900 3000 13500 3000
 Wire Wire Line
-	11300 2850 11900 2850
+	12900 2800 13500 2800
 Wire Wire Line
-	11300 2750 11900 2750
+	12900 2700 13500 2700
 Wire Wire Line
-	11300 2650 11900 2650
+	12900 2600 13500 2600
 Wire Wire Line
-	11300 2550 11900 2550
+	12900 2500 13500 2500
 Wire Wire Line
-	11300 2450 11900 2450
+	12900 2400 13500 2400
 Wire Wire Line
-	11300 2350 11900 2350
+	12900 2300 13500 2300
 Wire Wire Line
-	11300 2250 11900 2250
+	12900 2200 13500 2200
 Wire Wire Line
-	11300 2150 11900 2150
+	12900 2100 13500 2100
 Wire Wire Line
-	11300 1950 11900 1950
+	12900 1900 13500 1900
 Wire Wire Line
-	11300 1850 11900 1850
+	12900 1800 13500 1800
 Wire Wire Line
-	11300 1750 11900 1750
+	12900 1700 13500 1700
 Wire Wire Line
-	11300 1650 11900 1650
+	12900 1600 13500 1600
 Wire Wire Line
-	11300 1550 11900 1550
+	12900 1500 13500 1500
 Wire Wire Line
-	11300 1450 11900 1450
+	12900 1400 13500 1400
 Wire Wire Line
-	11300 1350 11900 1350
+	12900 1300 13500 1300
 Wire Wire Line
-	11300 1250 11900 1250
-Text Label 11350 4650 0    60   ~ 0
+	12900 1200 13500 1200
+Text Label 12950 4600 0    60   ~ 0
 TVRAM31
-Text Label 11350 4550 0    60   ~ 0
+Text Label 12950 4500 0    60   ~ 0
 TVRAM30
-Text Label 11350 4450 0    60   ~ 0
+Text Label 12950 4400 0    60   ~ 0
 TVRAM29
-Text Label 11350 4350 0    60   ~ 0
+Text Label 12950 4300 0    60   ~ 0
 TVRAM28
-Text Label 11350 4250 0    60   ~ 0
+Text Label 12950 4200 0    60   ~ 0
 TVRAM27
-Text Label 11350 4150 0    60   ~ 0
+Text Label 12950 4100 0    60   ~ 0
 TVRAM26
-Text Label 11350 4050 0    60   ~ 0
+Text Label 12950 4000 0    60   ~ 0
 TVRAM25
-Text Label 11350 3950 0    60   ~ 0
+Text Label 12950 3900 0    60   ~ 0
 TVRAM24
-Text Label 11350 3750 0    60   ~ 0
+Text Label 12950 3700 0    60   ~ 0
 TVRAM23
-Text Label 11350 3650 0    60   ~ 0
+Text Label 12950 3600 0    60   ~ 0
 TVRAM22
-Text Label 11350 3550 0    60   ~ 0
+Text Label 12950 3500 0    60   ~ 0
 TVRAM21
-Text Label 11350 3450 0    60   ~ 0
+Text Label 12950 3400 0    60   ~ 0
 TVRAM20
-Text Label 11350 3350 0    60   ~ 0
+Text Label 12950 3300 0    60   ~ 0
 TVRAM19
-Text Label 11350 3250 0    60   ~ 0
+Text Label 12950 3200 0    60   ~ 0
 TVRAM18
-Text Label 11350 3150 0    60   ~ 0
+Text Label 12950 3100 0    60   ~ 0
 TVRAM17
-Text Label 11350 3050 0    60   ~ 0
+Text Label 12950 3000 0    60   ~ 0
 TVRAM16
-Text Label 11350 2850 0    60   ~ 0
+Text Label 12950 2800 0    60   ~ 0
 TVRAM15
-Text Label 11350 2750 0    60   ~ 0
+Text Label 12950 2700 0    60   ~ 0
 TVRAM14
-Text Label 11350 2650 0    60   ~ 0
+Text Label 12950 2600 0    60   ~ 0
 TVRAM13
-Text Label 11350 2550 0    60   ~ 0
+Text Label 12950 2500 0    60   ~ 0
 TVRAM12
-Text Label 11350 2450 0    60   ~ 0
+Text Label 12950 2400 0    60   ~ 0
 TVRAM11
-Text Label 11350 2350 0    60   ~ 0
+Text Label 12950 2300 0    60   ~ 0
 TVRAM10
-Text Label 11350 2250 0    60   ~ 0
+Text Label 12950 2200 0    60   ~ 0
 TVRAM9
-Text Label 11350 2150 0    60   ~ 0
+Text Label 12950 2100 0    60   ~ 0
 TVRAM8
-Text Label 11350 1950 0    60   ~ 0
+Text Label 12950 1900 0    60   ~ 0
 TVRAM7
-Text Label 11350 1850 0    60   ~ 0
+Text Label 12950 1800 0    60   ~ 0
 TVRAM6
-Text Label 11350 1750 0    60   ~ 0
+Text Label 12950 1700 0    60   ~ 0
 TVRAM5
-Text Label 11350 1650 0    60   ~ 0
+Text Label 12950 1600 0    60   ~ 0
 TVRAM4
-Text Label 11350 1550 0    60   ~ 0
+Text Label 12950 1500 0    60   ~ 0
 TVRAM3
-Text Label 11350 1450 0    60   ~ 0
+Text Label 12950 1400 0    60   ~ 0
 TVRAM2
-Text Label 11350 1350 0    60   ~ 0
+Text Label 12950 1300 0    60   ~ 0
 TVRAM1
-Text Label 11350 1250 0    60   ~ 0
+Text Label 12950 1200 0    60   ~ 0
 TVRAM0
 Text HLabel 2200 10450 0    60   Input ~ 0
 WRAM-
@@ -1086,686 +1086,686 @@ Text HLabel 2200 9950 0    60   Input ~ 0
 CAS0-
 Text HLabel 1300 650  0    60   Input ~ 0
 MXA[0..10]
-Text HLabel 13300 1050 0    60   3State ~ 0
+Text HLabel 14900 1000 0    60   3State ~ 0
 TVRAM[0..31]
 Wire Wire Line
-	9700 6700 9300 6700
+	11300 6650 10900 6650
 Wire Wire Line
-	9700 6600 9300 6600
+	11300 6550 10900 6550
 Wire Wire Line
-	9700 6500 9300 6500
+	11300 6450 10900 6450
 Wire Wire Line
-	9700 6400 9300 6400
+	11300 6350 10900 6350
 Wire Wire Line
-	9700 6300 9300 6300
+	11300 6250 10900 6250
 Wire Wire Line
-	9700 6200 9300 6200
+	11300 6150 10900 6150
 Wire Wire Line
-	9700 6100 9300 6100
+	11300 6050 10900 6050
 Wire Wire Line
-	9700 6000 9300 6000
+	11300 5950 10900 5950
 Wire Wire Line
-	9700 5900 9300 5900
+	11300 5850 10900 5850
 Wire Wire Line
-	9700 5800 9300 5800
+	11300 5750 10900 5750
 Wire Wire Line
-	9700 5700 9300 5700
+	11300 5650 10900 5650
 Wire Wire Line
-	9700 8200 9300 8200
+	11300 8150 10900 8150
 Wire Wire Line
-	9700 8000 9300 8000
+	11300 7950 10900 7950
 Wire Wire Line
-	9700 7900 9300 7900
+	11300 7850 10900 7850
 Wire Wire Line
-	9700 7800 9300 7800
+	11300 7750 10900 7750
 Wire Wire Line
-	9700 7700 9300 7700
+	11300 7650 10900 7650
 Wire Wire Line
-	9300 7200 9700 7200
+	10900 7150 11300 7150
 Wire Wire Line
-	9700 7200 9700 7400
-NoConn ~ 9700 8700
-NoConn ~ 9700 8600
-NoConn ~ 9700 8500
-NoConn ~ 9700 8400
-Text Label 9350 8200 0    60   ~ 0
+	11300 7150 11300 7350
+NoConn ~ 11300 8650
+NoConn ~ 11300 8550
+NoConn ~ 11300 8450
+NoConn ~ 11300 8350
+Text Label 10950 8150 0    60   ~ 0
 WRAM-
-Text Label 9350 8000 0    60   ~ 0
+Text Label 10950 7950 0    60   ~ 0
 CAS3-
-Text Label 9350 7900 0    60   ~ 0
+Text Label 10950 7850 0    60   ~ 0
 CAS2-
-Text Label 9350 7800 0    60   ~ 0
+Text Label 10950 7750 0    60   ~ 0
 CAS1-
-Text Label 9350 7700 0    60   ~ 0
+Text Label 10950 7650 0    60   ~ 0
 CAS0-
-Text Label 9300 7200 0    60   ~ 0
+Text Label 10900 7150 0    60   ~ 0
 RAS7-
-Text Label 9350 6700 0    60   ~ 0
+Text Label 10950 6650 0    60   ~ 0
 MXA10
-Text Label 9350 6600 0    60   ~ 0
+Text Label 10950 6550 0    60   ~ 0
 MXA9
-Text Label 9350 6500 0    60   ~ 0
+Text Label 10950 6450 0    60   ~ 0
 MXA8
-Text Label 9350 6400 0    60   ~ 0
+Text Label 10950 6350 0    60   ~ 0
 MXA7
-Text Label 9350 6300 0    60   ~ 0
+Text Label 10950 6250 0    60   ~ 0
 MXA6
-Text Label 9350 6200 0    60   ~ 0
+Text Label 10950 6150 0    60   ~ 0
 MXA5
-Text Label 9350 6100 0    60   ~ 0
+Text Label 10950 6050 0    60   ~ 0
 MXA4
-Text Label 9350 6000 0    60   ~ 0
+Text Label 10950 5950 0    60   ~ 0
 MXA3
-Text Label 9350 5900 0    60   ~ 0
+Text Label 10950 5850 0    60   ~ 0
 MXA2
-Text Label 9350 5800 0    60   ~ 0
+Text Label 10950 5750 0    60   ~ 0
 MXA1
-Text Label 9350 5700 0    60   ~ 0
+Text Label 10950 5650 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U13
 U 1 1 32FA1E5B
-P 10500 7500
-F 0 "U13" H 10500 8050 70  0000 C CNN
-F 1 "SIM4X32" H 10950 5500 70  0000 C CNN
-F 2 "footprints:sim72" H 10500 7500 60  0001 C CNN
-F 3 "" H 10500 7500 60  0001 C CNN
-	1    10500 7500
+P 12100 7450
+F 0 "U13" H 12100 8000 70  0000 C CNN
+F 1 "SIM4X32" H 12550 5450 70  0000 C CNN
+F 2 "footprints:sim72" H 12100 7450 60  0001 C CNN
+F 3 "" H 12100 7450 60  0001 C CNN
+	1    12100 7450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6900 6700 6500 6700
+	8500 6650 8100 6650
 Wire Wire Line
-	6900 6600 6500 6600
+	8500 6550 8100 6550
 Wire Wire Line
-	6900 6500 6500 6500
+	8500 6450 8100 6450
 Wire Wire Line
-	6900 6400 6500 6400
+	8500 6350 8100 6350
 Wire Wire Line
-	6900 6300 6500 6300
+	8500 6250 8100 6250
 Wire Wire Line
-	6900 6200 6500 6200
+	8500 6150 8100 6150
 Wire Wire Line
-	6900 6100 6500 6100
+	8500 6050 8100 6050
 Wire Wire Line
-	6900 6000 6500 6000
+	8500 5950 8100 5950
 Wire Wire Line
-	6900 5900 6500 5900
+	8500 5850 8100 5850
 Wire Wire Line
-	6900 5800 6500 5800
+	8500 5750 8100 5750
 Wire Wire Line
-	6900 5700 6500 5700
+	8500 5650 8100 5650
 Wire Wire Line
-	6900 8200 6500 8200
+	8500 8150 8100 8150
 Wire Wire Line
-	6900 8000 6500 8000
+	8500 7950 8100 7950
 Wire Wire Line
-	6900 7900 6500 7900
+	8500 7850 8100 7850
 Wire Wire Line
-	6900 7800 6500 7800
+	8500 7750 8100 7750
 Wire Wire Line
-	6900 7700 6500 7700
+	8500 7650 8100 7650
 Wire Wire Line
-	6500 7200 6900 7200
+	8100 7150 8500 7150
 Wire Wire Line
-	6900 7200 6900 7400
-NoConn ~ 6900 8700
-NoConn ~ 6900 8600
-NoConn ~ 6900 8500
-NoConn ~ 6900 8400
-Text Label 6550 8200 0    60   ~ 0
+	8500 7150 8500 7350
+NoConn ~ 8500 8650
+NoConn ~ 8500 8550
+NoConn ~ 8500 8450
+NoConn ~ 8500 8350
+Text Label 8150 8150 0    60   ~ 0
 WRAM-
-Text Label 6550 8000 0    60   ~ 0
+Text Label 8150 7950 0    60   ~ 0
 CAS3-
-Text Label 6550 7900 0    60   ~ 0
+Text Label 8150 7850 0    60   ~ 0
 CAS2-
-Text Label 6550 7800 0    60   ~ 0
+Text Label 8150 7750 0    60   ~ 0
 CAS1-
-Text Label 6550 7700 0    60   ~ 0
+Text Label 8150 7650 0    60   ~ 0
 CAS0-
-Text Label 6500 7200 0    60   ~ 0
+Text Label 8100 7150 0    60   ~ 0
 RAS6-
-Text Label 6550 6700 0    60   ~ 0
+Text Label 8150 6650 0    60   ~ 0
 MXA10
-Text Label 6550 6600 0    60   ~ 0
+Text Label 8150 6550 0    60   ~ 0
 MXA9
-Text Label 6550 6500 0    60   ~ 0
+Text Label 8150 6450 0    60   ~ 0
 MXA8
-Text Label 6550 6400 0    60   ~ 0
+Text Label 8150 6350 0    60   ~ 0
 MXA7
-Text Label 6550 6300 0    60   ~ 0
+Text Label 8150 6250 0    60   ~ 0
 MXA6
-Text Label 6550 6200 0    60   ~ 0
+Text Label 8150 6150 0    60   ~ 0
 MXA5
-Text Label 6550 6100 0    60   ~ 0
+Text Label 8150 6050 0    60   ~ 0
 MXA4
-Text Label 6550 6000 0    60   ~ 0
+Text Label 8150 5950 0    60   ~ 0
 MXA3
-Text Label 6550 5900 0    60   ~ 0
+Text Label 8150 5850 0    60   ~ 0
 MXA2
-Text Label 6550 5800 0    60   ~ 0
+Text Label 8150 5750 0    60   ~ 0
 MXA1
-Text Label 6550 5700 0    60   ~ 0
+Text Label 8150 5650 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U14
 U 1 1 4BF036CF
-P 7700 7500
-F 0 "U14" H 7700 8050 70  0000 C CNN
-F 1 "SIM4X32" H 8150 5500 70  0000 C CNN
-F 2 "footprints:sim72" H 7700 7500 60  0001 C CNN
-F 3 "" H 7700 7500 60  0001 C CNN
-	1    7700 7500
+P 9300 7450
+F 0 "U14" H 9300 8000 70  0000 C CNN
+F 1 "SIM4X32" H 9750 5450 70  0000 C CNN
+F 2 "footprints:sim72" H 9300 7450 60  0001 C CNN
+F 3 "" H 9300 7450 60  0001 C CNN
+	1    9300 7450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4050 6700 3650 6700
+	5650 6650 5250 6650
 Wire Wire Line
-	4050 6600 3650 6600
+	5650 6550 5250 6550
 Wire Wire Line
-	4050 6500 3650 6500
+	5650 6450 5250 6450
 Wire Wire Line
-	4050 6400 3650 6400
+	5650 6350 5250 6350
 Wire Wire Line
-	4050 6300 3650 6300
+	5650 6250 5250 6250
 Wire Wire Line
-	4050 6200 3650 6200
+	5650 6150 5250 6150
 Wire Wire Line
-	4050 6100 3650 6100
+	5650 6050 5250 6050
 Wire Wire Line
-	4050 6000 3650 6000
+	5650 5950 5250 5950
 Wire Wire Line
-	4050 5900 3650 5900
+	5650 5850 5250 5850
 Wire Wire Line
-	4050 5800 3650 5800
+	5650 5750 5250 5750
 Wire Wire Line
-	4050 5700 3650 5700
+	5650 5650 5250 5650
 Wire Wire Line
-	4050 8200 3650 8200
+	5650 8150 5250 8150
 Wire Wire Line
-	4050 8000 3650 8000
+	5650 7950 5250 7950
 Wire Wire Line
-	4050 7900 3650 7900
+	5650 7850 5250 7850
 Wire Wire Line
-	4050 7800 3650 7800
+	5650 7750 5250 7750
 Wire Wire Line
-	4050 7700 3650 7700
+	5650 7650 5250 7650
 Wire Wire Line
-	3650 7200 4050 7200
+	5250 7150 5650 7150
 Wire Wire Line
-	4050 7200 4050 7400
-NoConn ~ 4050 8700
-NoConn ~ 4050 8600
-NoConn ~ 4050 8500
-NoConn ~ 4050 8400
-Text Label 3700 8200 0    60   ~ 0
+	5650 7150 5650 7350
+NoConn ~ 5650 8650
+NoConn ~ 5650 8550
+NoConn ~ 5650 8450
+NoConn ~ 5650 8350
+Text Label 5300 8150 0    60   ~ 0
 WRAM-
-Text Label 3700 8000 0    60   ~ 0
+Text Label 5300 7950 0    60   ~ 0
 CAS3-
-Text Label 3700 7900 0    60   ~ 0
+Text Label 5300 7850 0    60   ~ 0
 CAS2-
-Text Label 3700 7800 0    60   ~ 0
+Text Label 5300 7750 0    60   ~ 0
 CAS1-
-Text Label 3700 7700 0    60   ~ 0
+Text Label 5300 7650 0    60   ~ 0
 CAS0-
-Text Label 3650 7200 0    60   ~ 0
+Text Label 5250 7150 0    60   ~ 0
 RAS5-
-Text Label 3700 6700 0    60   ~ 0
+Text Label 5300 6650 0    60   ~ 0
 MXA10
-Text Label 3700 6600 0    60   ~ 0
+Text Label 5300 6550 0    60   ~ 0
 MXA9
-Text Label 3700 6500 0    60   ~ 0
+Text Label 5300 6450 0    60   ~ 0
 MXA8
-Text Label 3700 6400 0    60   ~ 0
+Text Label 5300 6350 0    60   ~ 0
 MXA7
-Text Label 3700 6300 0    60   ~ 0
+Text Label 5300 6250 0    60   ~ 0
 MXA6
-Text Label 3700 6200 0    60   ~ 0
+Text Label 5300 6150 0    60   ~ 0
 MXA5
-Text Label 3700 6100 0    60   ~ 0
+Text Label 5300 6050 0    60   ~ 0
 MXA4
-Text Label 3700 6000 0    60   ~ 0
+Text Label 5300 5950 0    60   ~ 0
 MXA3
-Text Label 3700 5900 0    60   ~ 0
+Text Label 5300 5850 0    60   ~ 0
 MXA2
-Text Label 3700 5800 0    60   ~ 0
+Text Label 5300 5750 0    60   ~ 0
 MXA1
-Text Label 3700 5700 0    60   ~ 0
+Text Label 5300 5650 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U12
 U 1 1 4BF036CE
-P 4850 7500
-F 0 "U12" H 4850 8050 70  0000 C CNN
-F 1 "SIM4X32" H 5300 5500 70  0000 C CNN
-F 2 "footprints:sim72" H 4850 7500 60  0001 C CNN
-F 3 "" H 4850 7500 60  0001 C CNN
-	1    4850 7500
+P 6450 7450
+F 0 "U12" H 6450 8000 70  0000 C CNN
+F 1 "SIM4X32" H 6900 5450 70  0000 C CNN
+F 2 "footprints:sim72" H 6450 7450 60  0001 C CNN
+F 3 "" H 6450 7450 60  0001 C CNN
+	1    6450 7450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1200 6700 800  6700
+	2800 6650 2400 6650
 Wire Wire Line
-	1200 6600 800  6600
+	2800 6550 2400 6550
 Wire Wire Line
-	1200 6500 800  6500
+	2800 6450 2400 6450
 Wire Wire Line
-	1200 6400 800  6400
+	2800 6350 2400 6350
 Wire Wire Line
-	1200 6300 800  6300
+	2800 6250 2400 6250
 Wire Wire Line
-	1200 6200 800  6200
+	2800 6150 2400 6150
 Wire Wire Line
-	1200 6100 800  6100
+	2800 6050 2400 6050
 Wire Wire Line
-	1200 6000 800  6000
+	2800 5950 2400 5950
 Wire Wire Line
-	1200 5900 800  5900
+	2800 5850 2400 5850
 Wire Wire Line
-	1200 5800 800  5800
+	2800 5750 2400 5750
 Wire Wire Line
-	1200 5700 800  5700
+	2800 5650 2400 5650
 Wire Wire Line
-	1200 8200 800  8200
+	2800 8150 2400 8150
 Wire Wire Line
-	1200 8000 800  8000
+	2800 7950 2400 7950
 Wire Wire Line
-	1200 7900 800  7900
+	2800 7850 2400 7850
 Wire Wire Line
-	1200 7800 800  7800
+	2800 7750 2400 7750
 Wire Wire Line
-	1200 7700 800  7700
+	2800 7650 2400 7650
 Wire Wire Line
-	800  7200 1200 7200
+	2400 7150 2800 7150
 Wire Wire Line
-	1200 7200 1200 7400
-NoConn ~ 1200 8700
-NoConn ~ 1200 8600
-NoConn ~ 1200 8500
-NoConn ~ 1200 8400
-Text Label 850  8200 0    60   ~ 0
+	2800 7150 2800 7350
+NoConn ~ 2800 8650
+NoConn ~ 2800 8550
+NoConn ~ 2800 8450
+NoConn ~ 2800 8350
+Text Label 2450 8150 0    60   ~ 0
 WRAM-
-Text Label 850  8000 0    60   ~ 0
+Text Label 2450 7950 0    60   ~ 0
 CAS3-
-Text Label 850  7900 0    60   ~ 0
+Text Label 2450 7850 0    60   ~ 0
 CAS2-
-Text Label 850  7800 0    60   ~ 0
+Text Label 2450 7750 0    60   ~ 0
 CAS1-
-Text Label 850  7700 0    60   ~ 0
+Text Label 2450 7650 0    60   ~ 0
 CAS0-
-Text Label 800  7200 0    60   ~ 0
+Text Label 2400 7150 0    60   ~ 0
 RAS4-
-Text Label 850  6700 0    60   ~ 0
+Text Label 2450 6650 0    60   ~ 0
 MXA10
-Text Label 850  6600 0    60   ~ 0
+Text Label 2450 6550 0    60   ~ 0
 MXA9
-Text Label 850  6500 0    60   ~ 0
+Text Label 2450 6450 0    60   ~ 0
 MXA8
-Text Label 850  6400 0    60   ~ 0
+Text Label 2450 6350 0    60   ~ 0
 MXA7
-Text Label 850  6300 0    60   ~ 0
+Text Label 2450 6250 0    60   ~ 0
 MXA6
-Text Label 850  6200 0    60   ~ 0
+Text Label 2450 6150 0    60   ~ 0
 MXA5
-Text Label 850  6100 0    60   ~ 0
+Text Label 2450 6050 0    60   ~ 0
 MXA4
-Text Label 850  6000 0    60   ~ 0
+Text Label 2450 5950 0    60   ~ 0
 MXA3
-Text Label 850  5900 0    60   ~ 0
+Text Label 2450 5850 0    60   ~ 0
 MXA2
-Text Label 850  5800 0    60   ~ 0
+Text Label 2450 5750 0    60   ~ 0
 MXA1
-Text Label 850  5700 0    60   ~ 0
+Text Label 2450 5650 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U16
 U 1 1 4BF036D0
-P 2000 7500
-F 0 "U16" H 2000 8050 70  0000 C CNN
-F 1 "SIM4X32" H 2450 5500 70  0000 C CNN
-F 2 "footprints:sim72" H 2000 7500 60  0001 C CNN
-F 3 "" H 2000 7500 60  0001 C CNN
-	1    2000 7500
+P 3600 7450
+F 0 "U16" H 3600 8000 70  0000 C CNN
+F 1 "SIM4X32" H 4050 5450 70  0000 C CNN
+F 2 "footprints:sim72" H 3600 7450 60  0001 C CNN
+F 3 "" H 3600 7450 60  0001 C CNN
+	1    3600 7450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9700 2250 9300 2250
+	11300 2200 10900 2200
 Wire Wire Line
-	9700 2150 9300 2150
+	11300 2100 10900 2100
 Wire Wire Line
-	9700 2050 9300 2050
+	11300 2000 10900 2000
 Wire Wire Line
-	9700 1950 9300 1950
+	11300 1900 10900 1900
 Wire Wire Line
-	9700 1850 9300 1850
+	11300 1800 10900 1800
 Wire Wire Line
-	9700 1750 9300 1750
+	11300 1700 10900 1700
 Wire Wire Line
-	9700 1650 9300 1650
+	11300 1600 10900 1600
 Wire Wire Line
-	9700 1550 9300 1550
+	11300 1500 10900 1500
 Wire Wire Line
-	9700 1450 9300 1450
+	11300 1400 10900 1400
 Wire Wire Line
-	9700 1350 9300 1350
+	11300 1300 10900 1300
 Wire Wire Line
-	9700 1250 9300 1250
+	11300 1200 10900 1200
 Wire Wire Line
-	9700 3750 9300 3750
+	11300 3700 10900 3700
 Wire Wire Line
-	9700 3550 9300 3550
+	11300 3500 10900 3500
 Wire Wire Line
-	9700 3450 9300 3450
+	11300 3400 10900 3400
 Wire Wire Line
-	9700 3350 9300 3350
+	11300 3300 10900 3300
 Wire Wire Line
-	9700 3250 9300 3250
+	11300 3200 10900 3200
 Wire Wire Line
-	9300 2750 9700 2750
+	10900 2700 11300 2700
 Wire Wire Line
-	9700 2750 9700 2950
-NoConn ~ 9700 4250
-NoConn ~ 9700 4150
-NoConn ~ 9700 4050
-NoConn ~ 9700 3950
-Text Label 9350 3750 0    60   ~ 0
+	11300 2700 11300 2900
+NoConn ~ 11300 4200
+NoConn ~ 11300 4100
+NoConn ~ 11300 4000
+NoConn ~ 11300 3900
+Text Label 10950 3700 0    60   ~ 0
 WRAM-
-Text Label 9350 3550 0    60   ~ 0
+Text Label 10950 3500 0    60   ~ 0
 CAS3-
-Text Label 9350 3450 0    60   ~ 0
+Text Label 10950 3400 0    60   ~ 0
 CAS2-
-Text Label 9350 3350 0    60   ~ 0
+Text Label 10950 3300 0    60   ~ 0
 CAS1-
-Text Label 9350 3250 0    60   ~ 0
+Text Label 10950 3200 0    60   ~ 0
 CAS0-
-Text Label 9300 2750 0    60   ~ 0
+Text Label 10900 2700 0    60   ~ 0
 RAS3-
-Text Label 9350 2250 0    60   ~ 0
+Text Label 10950 2200 0    60   ~ 0
 MXA10
-Text Label 9350 2150 0    60   ~ 0
+Text Label 10950 2100 0    60   ~ 0
 MXA9
-Text Label 9350 2050 0    60   ~ 0
+Text Label 10950 2000 0    60   ~ 0
 MXA8
-Text Label 9350 1950 0    60   ~ 0
+Text Label 10950 1900 0    60   ~ 0
 MXA7
-Text Label 9350 1850 0    60   ~ 0
+Text Label 10950 1800 0    60   ~ 0
 MXA6
-Text Label 9350 1750 0    60   ~ 0
+Text Label 10950 1700 0    60   ~ 0
 MXA5
-Text Label 9350 1650 0    60   ~ 0
+Text Label 10950 1600 0    60   ~ 0
 MXA4
-Text Label 9350 1550 0    60   ~ 0
+Text Label 10950 1500 0    60   ~ 0
 MXA3
-Text Label 9350 1450 0    60   ~ 0
+Text Label 10950 1400 0    60   ~ 0
 MXA2
-Text Label 9350 1350 0    60   ~ 0
+Text Label 10950 1300 0    60   ~ 0
 MXA1
-Text Label 9350 1250 0    60   ~ 0
+Text Label 10950 1200 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U15
 U 1 1 4BF036D1
-P 10500 3050
-F 0 "U15" H 10500 3600 70  0000 C CNN
-F 1 "SIM4X32" H 10950 1050 70  0000 C CNN
-F 2 "footprints:sim72" H 10500 3050 60  0001 C CNN
-F 3 "" H 10500 3050 60  0001 C CNN
-	1    10500 3050
+P 12100 3000
+F 0 "U15" H 12100 3550 70  0000 C CNN
+F 1 "SIM4X32" H 12550 1000 70  0000 C CNN
+F 2 "footprints:sim72" H 12100 3000 60  0001 C CNN
+F 3 "" H 12100 3000 60  0001 C CNN
+	1    12100 3000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6900 2250 6500 2250
+	8500 2200 8100 2200
 Wire Wire Line
-	6900 2150 6500 2150
+	8500 2100 8100 2100
 Wire Wire Line
-	6900 2050 6500 2050
+	8500 2000 8100 2000
 Wire Wire Line
-	6900 1950 6500 1950
+	8500 1900 8100 1900
 Wire Wire Line
-	6900 1850 6500 1850
+	8500 1800 8100 1800
 Wire Wire Line
-	6900 1750 6500 1750
+	8500 1700 8100 1700
 Wire Wire Line
-	6900 1650 6500 1650
+	8500 1600 8100 1600
 Wire Wire Line
-	6900 1550 6500 1550
+	8500 1500 8100 1500
 Wire Wire Line
-	6900 1450 6500 1450
+	8500 1400 8100 1400
 Wire Wire Line
-	6900 1350 6500 1350
+	8500 1300 8100 1300
 Wire Wire Line
-	6900 1250 6500 1250
+	8500 1200 8100 1200
 Wire Wire Line
-	6900 3750 6500 3750
+	8500 3700 8100 3700
 Wire Wire Line
-	6900 3550 6500 3550
+	8500 3500 8100 3500
 Wire Wire Line
-	6900 3450 6500 3450
+	8500 3400 8100 3400
 Wire Wire Line
-	6900 3350 6500 3350
+	8500 3300 8100 3300
 Wire Wire Line
-	6900 3250 6500 3250
+	8500 3200 8100 3200
 Wire Wire Line
-	6500 2750 6900 2750
+	8100 2700 8500 2700
 Wire Wire Line
-	6900 2750 6900 2950
-NoConn ~ 6900 4250
-NoConn ~ 6900 4150
-NoConn ~ 6900 4050
-NoConn ~ 6900 3950
-Text Label 6550 3750 0    60   ~ 0
+	8500 2700 8500 2900
+NoConn ~ 8500 4200
+NoConn ~ 8500 4100
+NoConn ~ 8500 4000
+NoConn ~ 8500 3900
+Text Label 8150 3700 0    60   ~ 0
 WRAM-
-Text Label 6550 3550 0    60   ~ 0
+Text Label 8150 3500 0    60   ~ 0
 CAS3-
-Text Label 6550 3450 0    60   ~ 0
+Text Label 8150 3400 0    60   ~ 0
 CAS2-
-Text Label 6550 3350 0    60   ~ 0
+Text Label 8150 3300 0    60   ~ 0
 CAS1-
-Text Label 6550 3250 0    60   ~ 0
+Text Label 8150 3200 0    60   ~ 0
 CAS0-
-Text Label 6500 2750 0    60   ~ 0
+Text Label 8100 2700 0    60   ~ 0
 RAS2-
-Text Label 6550 2250 0    60   ~ 0
+Text Label 8150 2200 0    60   ~ 0
 MXA10
-Text Label 6550 2150 0    60   ~ 0
+Text Label 8150 2100 0    60   ~ 0
 MXA9
-Text Label 6550 2050 0    60   ~ 0
+Text Label 8150 2000 0    60   ~ 0
 MXA8
-Text Label 6550 1950 0    60   ~ 0
+Text Label 8150 1900 0    60   ~ 0
 MXA7
-Text Label 6550 1850 0    60   ~ 0
+Text Label 8150 1800 0    60   ~ 0
 MXA6
-Text Label 6550 1750 0    60   ~ 0
+Text Label 8150 1700 0    60   ~ 0
 MXA5
-Text Label 6550 1650 0    60   ~ 0
+Text Label 8150 1600 0    60   ~ 0
 MXA4
-Text Label 6550 1550 0    60   ~ 0
+Text Label 8150 1500 0    60   ~ 0
 MXA3
-Text Label 6550 1450 0    60   ~ 0
+Text Label 8150 1400 0    60   ~ 0
 MXA2
-Text Label 6550 1350 0    60   ~ 0
+Text Label 8150 1300 0    60   ~ 0
 MXA1
-Text Label 6550 1250 0    60   ~ 0
+Text Label 8150 1200 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U17
 U 1 1 4BF036D2
-P 7700 3050
-F 0 "U17" H 7700 3600 70  0000 C CNN
-F 1 "SIM4X32" H 8150 1050 70  0000 C CNN
-F 2 "footprints:sim72" H 7700 3050 60  0001 C CNN
-F 3 "" H 7700 3050 60  0001 C CNN
-	1    7700 3050
+P 9300 3000
+F 0 "U17" H 9300 3550 70  0000 C CNN
+F 1 "SIM4X32" H 9750 1000 70  0000 C CNN
+F 2 "footprints:sim72" H 9300 3000 60  0001 C CNN
+F 3 "" H 9300 3000 60  0001 C CNN
+	1    9300 3000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4050 2250 3650 2250
+	5650 2200 5250 2200
 Wire Wire Line
-	4050 2150 3650 2150
+	5650 2100 5250 2100
 Wire Wire Line
-	4050 2050 3650 2050
+	5650 2000 5250 2000
 Wire Wire Line
-	4050 1950 3650 1950
+	5650 1900 5250 1900
 Wire Wire Line
-	4050 1850 3650 1850
+	5650 1800 5250 1800
 Wire Wire Line
-	4050 1750 3650 1750
+	5650 1700 5250 1700
 Wire Wire Line
-	4050 1650 3650 1650
+	5650 1600 5250 1600
 Wire Wire Line
-	4050 1550 3650 1550
+	5650 1500 5250 1500
 Wire Wire Line
-	4050 1450 3650 1450
+	5650 1400 5250 1400
 Wire Wire Line
-	4050 1350 3650 1350
+	5650 1300 5250 1300
 Wire Wire Line
-	4050 1250 3650 1250
+	5650 1200 5250 1200
 Wire Wire Line
-	4050 3750 3650 3750
+	5650 3700 5250 3700
 Wire Wire Line
-	4050 3550 3650 3550
+	5650 3500 5250 3500
 Wire Wire Line
-	4050 3450 3650 3450
+	5650 3400 5250 3400
 Wire Wire Line
-	4050 3350 3650 3350
+	5650 3300 5250 3300
 Wire Wire Line
-	4050 3250 3650 3250
+	5650 3200 5250 3200
 Wire Wire Line
-	3650 2750 4050 2750
+	5250 2700 5650 2700
 Wire Wire Line
-	4050 2750 4050 2950
-NoConn ~ 4050 4250
-NoConn ~ 4050 4150
-NoConn ~ 4050 4050
-NoConn ~ 4050 3950
-Text Label 3700 3750 0    60   ~ 0
+	5650 2700 5650 2900
+NoConn ~ 5650 4200
+NoConn ~ 5650 4100
+NoConn ~ 5650 4000
+NoConn ~ 5650 3900
+Text Label 5300 3700 0    60   ~ 0
 WRAM-
-Text Label 3700 3550 0    60   ~ 0
+Text Label 5300 3500 0    60   ~ 0
 CAS3-
-Text Label 3700 3450 0    60   ~ 0
+Text Label 5300 3400 0    60   ~ 0
 CAS2-
-Text Label 3700 3350 0    60   ~ 0
+Text Label 5300 3300 0    60   ~ 0
 CAS1-
-Text Label 3700 3250 0    60   ~ 0
+Text Label 5300 3200 0    60   ~ 0
 CAS0-
-Text Label 3650 2750 0    60   ~ 0
+Text Label 5250 2700 0    60   ~ 0
 RAS1-
-Text Label 3700 2250 0    60   ~ 0
+Text Label 5300 2200 0    60   ~ 0
 MXA10
-Text Label 3700 2150 0    60   ~ 0
+Text Label 5300 2100 0    60   ~ 0
 MXA9
-Text Label 3700 2050 0    60   ~ 0
+Text Label 5300 2000 0    60   ~ 0
 MXA8
-Text Label 3700 1950 0    60   ~ 0
+Text Label 5300 1900 0    60   ~ 0
 MXA7
-Text Label 3700 1850 0    60   ~ 0
+Text Label 5300 1800 0    60   ~ 0
 MXA6
-Text Label 3700 1750 0    60   ~ 0
+Text Label 5300 1700 0    60   ~ 0
 MXA5
-Text Label 3700 1650 0    60   ~ 0
+Text Label 5300 1600 0    60   ~ 0
 MXA4
-Text Label 3700 1550 0    60   ~ 0
+Text Label 5300 1500 0    60   ~ 0
 MXA3
-Text Label 3700 1450 0    60   ~ 0
+Text Label 5300 1400 0    60   ~ 0
 MXA2
-Text Label 3700 1350 0    60   ~ 0
+Text Label 5300 1300 0    60   ~ 0
 MXA1
-Text Label 3700 1250 0    60   ~ 0
+Text Label 5300 1200 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U18
 U 1 1 4BF036D3
-P 4850 3050
-F 0 "U18" H 4850 3600 70  0000 C CNN
-F 1 "SIM4X32" H 5300 1050 70  0000 C CNN
-F 2 "footprints:sim72" H 4850 3050 60  0001 C CNN
-F 3 "" H 4850 3050 60  0001 C CNN
-	1    4850 3050
+P 6450 3000
+F 0 "U18" H 6450 3550 70  0000 C CNN
+F 1 "SIM4X32" H 6900 1000 70  0000 C CNN
+F 2 "footprints:sim72" H 6450 3000 60  0001 C CNN
+F 3 "" H 6450 3000 60  0001 C CNN
+	1    6450 3000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1200 2250 800  2250
+	2800 2200 2400 2200
 Wire Wire Line
-	1200 2150 800  2150
+	2800 2100 2400 2100
 Wire Wire Line
-	1200 2050 800  2050
+	2800 2000 2400 2000
 Wire Wire Line
-	1200 1950 800  1950
+	2800 1900 2400 1900
 Wire Wire Line
-	1200 1850 800  1850
+	2800 1800 2400 1800
 Wire Wire Line
-	1200 1750 800  1750
+	2800 1700 2400 1700
 Wire Wire Line
-	1200 1650 800  1650
+	2800 1600 2400 1600
 Wire Wire Line
-	1200 1550 800  1550
+	2800 1500 2400 1500
 Wire Wire Line
-	1200 1450 800  1450
+	2800 1400 2400 1400
 Wire Wire Line
-	1200 1350 800  1350
+	2800 1300 2400 1300
 Wire Wire Line
-	1200 1250 800  1250
+	2800 1200 2400 1200
 Wire Wire Line
-	1200 3750 800  3750
+	2800 3700 2400 3700
 Wire Wire Line
-	1200 3550 800  3550
+	2800 3500 2400 3500
 Wire Wire Line
-	1200 3450 800  3450
+	2800 3400 2400 3400
 Wire Wire Line
-	1200 3350 800  3350
+	2800 3300 2400 3300
 Wire Wire Line
-	1200 3250 800  3250
+	2800 3200 2400 3200
 Wire Wire Line
-	800  2750 1200 2750
+	2400 2700 2800 2700
 Wire Wire Line
-	1200 2750 1200 2950
-NoConn ~ 1200 4250
-NoConn ~ 1200 4150
-NoConn ~ 1200 4050
-NoConn ~ 1200 3950
-Text Label 850  3750 0    60   ~ 0
+	2800 2700 2800 2900
+NoConn ~ 2800 4200
+NoConn ~ 2800 4100
+NoConn ~ 2800 4000
+NoConn ~ 2800 3900
+Text Label 2450 3700 0    60   ~ 0
 WRAM-
-Text Label 850  3550 0    60   ~ 0
+Text Label 2450 3500 0    60   ~ 0
 CAS3-
-Text Label 850  3450 0    60   ~ 0
+Text Label 2450 3400 0    60   ~ 0
 CAS2-
-Text Label 850  3350 0    60   ~ 0
+Text Label 2450 3300 0    60   ~ 0
 CAS1-
-Text Label 850  3250 0    60   ~ 0
+Text Label 2450 3200 0    60   ~ 0
 CAS0-
-Text Label 800  2750 0    60   ~ 0
+Text Label 2400 2700 0    60   ~ 0
 RAS0-
-Text Label 850  2250 0    60   ~ 0
+Text Label 2450 2200 0    60   ~ 0
 MXA10
-Text Label 850  2150 0    60   ~ 0
+Text Label 2450 2100 0    60   ~ 0
 MXA9
-Text Label 850  2050 0    60   ~ 0
+Text Label 2450 2000 0    60   ~ 0
 MXA8
-Text Label 850  1950 0    60   ~ 0
+Text Label 2450 1900 0    60   ~ 0
 MXA7
-Text Label 850  1850 0    60   ~ 0
+Text Label 2450 1800 0    60   ~ 0
 MXA6
-Text Label 850  1750 0    60   ~ 0
+Text Label 2450 1700 0    60   ~ 0
 MXA5
-Text Label 850  1650 0    60   ~ 0
+Text Label 2450 1600 0    60   ~ 0
 MXA4
-Text Label 850  1550 0    60   ~ 0
+Text Label 2450 1500 0    60   ~ 0
 MXA3
-Text Label 850  1450 0    60   ~ 0
+Text Label 2450 1400 0    60   ~ 0
 MXA2
-Text Label 850  1350 0    60   ~ 0
+Text Label 2450 1300 0    60   ~ 0
 MXA1
-Text Label 850  1250 0    60   ~ 0
+Text Label 2450 1200 0    60   ~ 0
 MXA0
 $Comp
 L SIM4X32 U19
 U 1 1 4BF036D4
-P 2000 3050
-F 0 "U19" H 2000 3600 70  0000 C CNN
-F 1 "SIM4X32" H 2450 1050 70  0000 C CNN
-F 2 "footprints:sim72" H 2000 3050 60  0001 C CNN
-F 3 "" H 2000 3050 60  0001 C CNN
-	1    2000 3050
+P 3600 3000
+F 0 "U19" H 3600 3550 70  0000 C CNN
+F 1 "SIM4X32" H 4050 1000 70  0000 C CNN
+F 2 "footprints:sim72" H 3600 3000 60  0001 C CNN
+F 3 "" H 3600 3000 60  0001 C CNN
+	1    3600 3000
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/demos/video/video.sch b/demos/video/video.sch
index 73166ed..4e0934d 100644
--- a/demos/video/video.sch
+++ b/demos/video/video.sch
@@ -1,1032 +1,1018 @@
 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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
 LIBS:video-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A3 16535 11693
 encoding utf-8
 Sheet 1 8
 Title "Video"
-Date "18 nov 2010"
+Date "Sun 22 Mar 2015"
 Rev "2.0B"
 Comp "Kicad EDA"
-Comment1 "Feuille Principale"
+Comment1 "Main sheet"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	10600 5150 11300 5150
-Text Label 10650 5150 0    60   ~ 0
+	10550 5800 11250 5800
+Text Label 10600 5800 0    60   ~ 0
 CSYNC-OUT
 Wire Wire Line
-	10600 5400 11300 5400
-Text Label 10750 5400 0    60   ~ 0
+	10550 6050 11250 6050
+Text Label 10700 6050 0    60   ~ 0
 CLAMP
-Text Label 10750 5300 0    60   ~ 0
+Text Label 10700 5950 0    60   ~ 0
 BLANK-
 Wire Wire Line
-	10600 5300 11300 5300
+	10550 5950 11250 5950
 Wire Wire Line
-	10700 5000 11300 5000
-Text Label 10800 5000 0    60   ~ 0
+	10650 5650 11250 5650
+Text Label 10750 5650 0    60   ~ 0
 ACQ_ON
 Wire Wire Line
-	3800 7650 4400 7650
-Text Label 3900 7650 0    60   ~ 0
+	3800 8300 4400 8300
+Text Label 3900 8300 0    60   ~ 0
 ACQ_ON
-Text Label 14250 3550 0    60   ~ 0
+Text Label 14250 4150 0    60   ~ 0
 C_OUT
-Text Label 14250 3750 0    60   ~ 0
+Text Label 14250 4350 0    60   ~ 0
 Y_OUT
 Wire Wire Line
-	14900 3750 14200 3750
+	14900 4350 14200 4350
+Wire Wire Line
+	14200 4150 14900 4150
+Connection ~ 14800 4250
+Connection ~ 14800 3950
+Wire Wire Line
+	14900 3950 14800 3950
 Wire Wire Line
-	14200 3550 14900 3550
-Connection ~ 14800 3650
-Connection ~ 14800 3350
+	14900 3750 14800 3750
 Wire Wire Line
-	14900 3350 14800 3350
+	14800 3750 14800 3950
 Wire Wire Line
-	14900 3150 14800 3150
+	14800 3950 14800 4250
 Wire Wire Line
-	14800 3150 14800 4050
-Text Label 14800 1700 0    60   ~ 0
+	14800 4250 14800 4450
+Wire Wire Line
+	14800 4450 14800 4650
+Text Label 14800 2300 0    60   ~ 0
 Y_OUT
-Text Label 14800 1300 0    60   ~ 0
+Text Label 14800 1900 0    60   ~ 0
 C_OUT
 Wire Wire Line
-	1450 7750 2000 7750
+	1450 8400 2000 8400
 Wire Wire Line
-	1450 7650 2000 7650
+	1450 8300 2000 8300
 Wire Wire Line
-	1450 7850 2000 7850
-Text Label 1500 7750 0    60   ~ 0
+	1450 8500 2000 8500
+Text Label 1500 8400 0    60   ~ 0
 IRQ-
-Text Label 1500 7650 0    60   ~ 0
+Text Label 1500 8300 0    60   ~ 0
 X_IRQ
-Text Label 1500 7850 0    60   ~ 0
+Text Label 1500 8500 0    60   ~ 0
 IRQ_SRL
 Wire Wire Line
-	3800 1550 4350 1550
+	3800 2150 4350 2150
 Wire Wire Line
-	3800 1450 4350 1450
+	3800 2050 4350 2050
 Wire Wire Line
-	3800 1350 4350 1350
-Text Label 3850 1550 0    60   ~ 0
+	3800 1950 4350 1950
+Text Label 3850 2150 0    60   ~ 0
 IRQ-
-Text Label 3850 1450 0    60   ~ 0
+Text Label 3850 2050 0    60   ~ 0
 X_IRQ
-Text Label 3850 1350 0    60   ~ 0
+Text Label 3850 1950 0    60   ~ 0
 IRQ_SRL
-Text Label 3900 8650 0    60   ~ 0
+Text Label 3900 9300 0    60   ~ 0
 PCA[0..2]
 Wire Bus Line
-	3800 8650 4600 8650
-Text Label 6200 3800 0    60   ~ 0
+	3800 9300 4600 9300
+Text Label 6200 4450 0    60   ~ 0
 PCA[0..1]
 Wire Bus Line
-	6100 3800 6900 3800
+	6100 4450 6900 4450
 Wire Bus Line
-	3800 5250 4600 5250
-Text Label 3900 5250 0    60   ~ 0
+	3800 5900 4600 5900
+Text Label 3900 5900 0    60   ~ 0
 TVI[0..1]
 Wire Wire Line
-	10500 4700 11300 4700
+	10450 5350 11250 5350
 Wire Wire Line
-	10500 4800 11300 4800
-Text Label 10600 4700 0    60   ~ 0
+	10450 5450 11250 5450
+Text Label 10550 5350 0    60   ~ 0
 ACCES_RAM-
-Text Label 10600 4800 0    60   ~ 0
+Text Label 10550 5450 0    60   ~ 0
 WRITE_RAM
 Wire Wire Line
-	3800 8450 4600 8450
+	3800 9100 4600 9100
 Wire Wire Line
-	3800 8350 4600 8350
-Text Label 3900 8450 0    60   ~ 0
+	3800 9000 4600 9000
+Text Label 3900 9100 0    60   ~ 0
 ACCES_RAM-
-Text Label 3900 8350 0    60   ~ 0
+Text Label 3900 9000 0    60   ~ 0
 WRITE_RAM
-Text Label 10600 4550 0    60   ~ 0
+Text Label 10550 5200 0    60   ~ 0
 DQ[0..31]
 Wire Bus Line
-	10500 4550 11300 4550
+	10450 5200 11250 5200
 Wire Bus Line
-	8800 6000 9750 6000
-Text Label 8900 6000 0    60   ~ 0
+	8800 6600 9750 6600
+Text Label 8900 6600 0    60   ~ 0
 TVRAM[0..31]
 Wire Wire Line
-	10800 4250 11300 4250
+	10750 4900 11250 4900
 Wire Wire Line
-	10800 4350 11300 4350
-Text Label 10850 4350 0    60   ~ 0
+	10750 5000 11250 5000
+Text Label 10800 5000 0    60   ~ 0
 CLKCAD
-Text Label 10850 4250 0    60   ~ 0
+Text Label 10800 4900 0    60   ~ 0
 CLKCDA
 Wire Wire Line
-	10700 3950 11300 3950
+	10650 4600 11250 4600
 Wire Wire Line
-	10700 3850 11300 3850
+	10650 4500 11250 4500
 Wire Wire Line
-	10700 3750 11300 3750
+	10650 4400 11250 4400
 Wire Wire Line
-	10700 3650 11300 3650
-Text Label 10800 3950 0    60   ~ 0
+	10650 4300 11250 4300
+Text Label 10750 4600 0    60   ~ 0
 X_PROG-
-Text Label 10800 3850 0    60   ~ 0
+Text Label 10750 4500 0    60   ~ 0
 X_DONE
-Text Label 10800 3750 0    60   ~ 0
+Text Label 10750 4400 0    60   ~ 0
 X_CLK
-Text Label 10800 3650 0    60   ~ 0
+Text Label 10750 4300 0    60   ~ 0
 X_DATA
 Wire Wire Line
-	3800 8150 4400 8150
+	3800 8800 4400 8800
 Wire Wire Line
-	3800 8050 4400 8050
+	3800 8700 4400 8700
 Wire Wire Line
-	3800 7950 4400 7950
+	3800 8600 4400 8600
 Wire Wire Line
-	3800 7850 4400 7850
-Text Label 3900 8150 0    60   ~ 0
+	3800 8500 4400 8500
+Text Label 3900 8800 0    60   ~ 0
 X_PROG-
-Text Label 3900 8050 0    60   ~ 0
+Text Label 3900 8700 0    60   ~ 0
 X_DONE
-Text Label 3900 7950 0    60   ~ 0
+Text Label 3900 8600 0    60   ~ 0
 X_CLK
-Text Label 3900 7850 0    60   ~ 0
+Text Label 3900 8500 0    60   ~ 0
 X_DATA
 Wire Bus Line
-	12950 3950 13900 3950
+	12900 4600 13850 4600
 Wire Bus Line
-	12950 3850 13900 3850
+	12900 4500 13850 4500
 Wire Bus Line
-	12950 3750 13900 3750
-Text Label 13050 3950 0    60   ~ 0
+	12900 4400 13850 4400
+Text Label 13000 4600 0    60   ~ 0
 TVB[0..7]
-Text Label 13050 3850 0    60   ~ 0
+Text Label 13000 4500 0    60   ~ 0
 TVG[0..7]
-Text Label 13050 3750 0    60   ~ 0
+Text Label 13000 4400 0    60   ~ 0
 TVR[0..7]
 $Sheet
-S 11300 3550 1650 1950
+S 11250 4200 1650 1950
 U 4BF0367D
 F0 "muxdata" 60
 F1 "muxdata.sch" 60
-F2 "X_DIN" I L 11300 3650 60 
-F3 "X_CLK" I L 11300 3750 60 
-F4 "CLKCDA" I L 11300 4250 60 
-F5 "CLKCAD" I L 11300 4350 60 
-F6 "X_DONE" O L 11300 3850 60 
-F7 "X_PROG-" I L 11300 3950 60 
-F8 "TVB[0..7]" B R 12950 3950 60 
-F9 "TVG[0..7]" B R 12950 3850 60 
-F10 "TVR[0..7]" B R 12950 3750 60 
-F11 "VRAM[0..31]" B R 12950 4250 60 
-F12 "DPC[0..31]" B L 11300 4550 60 
-F13 "ACCES_RAM-" I L 11300 4700 60 
-F14 "DATA_WR" I L 11300 4800 60 
-F15 "ACQ_ON" I L 11300 5000 60 
-F16 "CSYNC-OUT" I L 11300 5150 60 
-F17 "BLANK-" I L 11300 5300 60 
-F18 "CLAMP" I L 11300 5400 60 
+F2 "X_DIN" I L 11250 4300 60 
+F3 "X_CLK" I L 11250 4400 60 
+F4 "CLKCDA" I L 11250 4900 60 
+F5 "CLKCAD" I L 11250 5000 60 
+F6 "X_DONE" O L 11250 4500 60 
+F7 "X_PROG-" I L 11250 4600 60 
+F8 "TVB[0..7]" B R 12900 4600 60 
+F9 "TVG[0..7]" B R 12900 4500 60 
+F10 "TVR[0..7]" B R 12900 4400 60 
+F11 "VRAM[0..31]" B R 12900 4900 60 
+F12 "DPC[0..31]" B L 11250 5200 60 
+F13 "ACCES_RAM-" I L 11250 5350 60 
+F14 "DATA_WR" I L 11250 5450 60 
+F15 "ACQ_ON" I L 11250 5650 60 
+F16 "CSYNC-OUT" I L 11250 5800 60 
+F17 "BLANK-" I L 11250 5950 60 
+F18 "CLAMP" I L 11250 6050 60 
 $EndSheet
 Wire Wire Line
-	12600 1850 13300 1850
-Text Label 12650 1850 0    60   ~ 0
+	12600 2450 13300 2450
+Text Label 12650 2450 0    60   ~ 0
 CSYNC-OUT
-Text Label 12600 1500 0    60   ~ 0
+Text Label 12600 2100 0    60   ~ 0
 BLUE_OUT
-Text Label 12600 1400 0    60   ~ 0
+Text Label 12600 2000 0    60   ~ 0
 GREEN_OUT
-Text Label 12600 1300 0    60   ~ 0
+Text Label 12600 1900 0    60   ~ 0
 RED_OUT
 Wire Wire Line
-	12550 1500 13300 1500
+	12550 2100 13300 2100
 Wire Wire Line
-	12550 1400 13300 1400
+	12550 2000 13300 2000
 Wire Wire Line
-	12550 1300 13300 1300
-Text Label 14200 3450 0    60   ~ 0
+	12550 1900 13300 1900
+Text Label 14200 4050 0    60   ~ 0
 BLUE_OUT
-Text Label 14200 3250 0    60   ~ 0
+Text Label 14200 3850 0    60   ~ 0
 GREEN_OUT
-Text Label 14200 3050 0    60   ~ 0
+Text Label 14200 3650 0    60   ~ 0
 RED_OUT
 Wire Wire Line
-	14150 3450 14900 3450
+	14150 4050 14900 4050
 Wire Wire Line
-	14150 3250 14900 3250
+	14150 3850 14900 3850
 Wire Wire Line
-	14150 3050 14900 3050
-Text Label 8900 2350 0    60   ~ 0
+	14150 3650 14900 3650
+Text Label 8900 2950 0    60   ~ 0
 BLUE_OUT
-Text Label 8900 2250 0    60   ~ 0
+Text Label 8900 2850 0    60   ~ 0
 GREEN_OUT
-Text Label 8900 2150 0    60   ~ 0
+Text Label 8900 2750 0    60   ~ 0
 RED_OUT
 Wire Wire Line
-	8850 2350 9500 2350
+	8850 2950 9500 2950
 Wire Wire Line
-	8850 2250 9500 2250
+	8850 2850 9500 2850
 Wire Wire Line
-	8850 2150 9500 2150
+	8850 2750 9500 2750
 $Comp
 L GND #GND01
 U 1 1 84DFBB6C
-P 14800 4050
-F 0 "#GND01" H 14800 4150 60  0001 C CNN
-F 1 "GND" H 14800 3950 60  0000 C CNN
-F 2 "" H 14800 4050 60  0001 C CNN
-F 3 "" H 14800 4050 60  0001 C CNN
-	1    14800 4050
+P 14800 4650
+F 0 "#GND01" H 14800 4750 60  0001 C CNN
+F 1 "GND" H 14800 4550 60  0000 C CNN
+F 2 "" H 14800 4650 60  0001 C CNN
+F 3 "" H 14800 4650 60  0001 C CNN
+	1    14800 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L DB9 J4
 U 1 1 84DFBB8F
-P 15350 3450
-F 0 "J4" H 15350 4000 70  0000 C CNN
-F 1 "DB9FEM" H 15350 2900 70  0000 C CNN
-F 2 "connect:DB9FC" H 15350 3450 60  0001 C CNN
-F 3 "" H 15350 3450 60  0001 C CNN
-	1    15350 3450
+P 15350 4050
+F 0 "J4" H 15350 4600 70  0000 C CNN
+F 1 "DB9FEM" H 15350 3500 70  0000 C CNN
+F 2 "connect:DB9FC" H 15350 4050 60  0001 C CNN
+F 3 "" H 15350 4050 60  0001 C CNN
+	1    15350 4050
 	1    0    0    1   
 $EndComp
-Connection ~ 14800 3850
+Connection ~ 14800 4450
 Wire Wire Line
-	14800 3650 14900 3650
+	14800 4250 14900 4250
 Wire Wire Line
-	14800 3850 14900 3850
+	14800 4450 14900 4450
 Wire Wire Line
-	14650 2100 15200 2100
+	14650 2700 15200 2700
 Wire Wire Line
-	15200 1700 14650 1700
+	15200 2300 14650 2300
 Wire Wire Line
-	14650 1300 15200 1300
+	14650 1900 15200 1900
 $Comp
 L GND #GND02
 U 1 1 30705D34
-P 15350 2300
-F 0 "#GND02" H 15350 2400 60  0001 C CNN
-F 1 "GND" H 15350 2200 60  0000 C CNN
-F 2 "" H 15350 2300 60  0001 C CNN
-F 3 "" H 15350 2300 60  0001 C CNN
-	1    15350 2300
+P 15350 2900
+F 0 "#GND02" H 15350 3000 60  0001 C CNN
+F 1 "GND" H 15350 2800 60  0000 C CNN
+F 2 "" H 15350 2900 60  0001 C CNN
+F 3 "" H 15350 2900 60  0001 C CNN
+	1    15350 2900
 	1    0    0    -1  
 $EndComp
 $Comp
 L BNC P8
 U 1 1 30705D02
-P 15350 2100
-F 0 "P8" H 15360 2220 60  0000 C CNN
-F 1 "BNC" V 15460 2040 40  0000 C CNN
-F 2 "discret:SUBCLICK" H 15350 2100 60  0001 C CNN
-F 3 "" H 15350 2100 60  0001 C CNN
-	1    15350 2100
+P 15350 2700
+F 0 "P8" H 15360 2820 60  0000 C CNN
+F 1 "BNC" V 15460 2640 40  0000 C CNN
+F 2 "discret:SUBCLICK" H 15350 2700 60  0001 C CNN
+F 3 "" H 15350 2700 60  0001 C CNN
+	1    15350 2700
 	1    0    0    -1  
 $EndComp
 $Sheet
-S 13300 1150 1350 1100
+S 13300 1750 1350 1100
 U 4BF0367F
 F0 "modul" 60
 F1 "modul.sch" 60
-F2 "BLEU" I L 13300 1300 60 
-F3 "VERT" I L 13300 1400 60 
-F4 "ROUGE" I L 13300 1500 60 
-F5 "CVBSOUT" O R 14650 2100 60 
-F6 "YOUT" O R 14650 1700 60 
-F7 "COUT" O R 14650 1300 60 
-F8 "CSYNC-OUT" I L 13300 1850 60 
+F2 "BLUE" I L 13300 1900 60 
+F3 "GREEN" I L 13300 2000 60 
+F4 "RED" I L 13300 2100 60 
+F5 "CVBSOUT" O R 14650 2700 60 
+F6 "YOUT" O R 14650 2300 60 
+F7 "COUT" O R 14650 1900 60 
+F8 "CSYNC-OUT" I L 13300 2450 60 
 $EndSheet
 Wire Wire Line
-	9400 4350 8800 4350
+	9400 5000 8800 5000
 Wire Wire Line
-	9400 4450 8800 4450
+	9400 5100 8800 5100
 Wire Wire Line
-	9400 4550 8800 4550
-Text Label 8900 4350 0    60   ~ 0
+	9400 5200 8800 5200
+Text Label 8900 5000 0    60   ~ 0
 F_PALIN
-Text Label 8900 4450 0    60   ~ 0
+Text Label 8900 5100 0    60   ~ 0
 HD_PAL-
-Text Label 8900 4550 0    60   ~ 0
+Text Label 8900 5200 0    60   ~ 0
 VD_PAL-
 Wire Wire Line
-	2000 7500 1400 7500
+	2000 8150 1400 8150
 Wire Wire Line
-	2000 7400 1400 7400
+	2000 8050 1400 8050
 Wire Wire Line
-	2000 7300 1400 7300
-Text Label 1500 7500 0    60   ~ 0
+	2000 7950 1400 7950
+Text Label 1500 8150 0    60   ~ 0
 F_PALIN
-Text Label 1500 7400 0    60   ~ 0
+Text Label 1500 8050 0    60   ~ 0
 HD_PAL-
-Text Label 1500 7300 0    60   ~ 0
+Text Label 1500 7950 0    60   ~ 0
 VD_PAL-
 Wire Wire Line
-	6150 4400 6900 4400
+	6150 5050 6900 5050
 Wire Wire Line
-	6150 4300 6900 4300
-Text Label 6200 4400 0    60   ~ 0
+	6150 4950 6900 4950
+Text Label 6200 5050 0    60   ~ 0
 BT812_WR-
-Text Label 6200 4300 0    60   ~ 0
+Text Label 6200 4950 0    60   ~ 0
 BT812_RD-
 Wire Wire Line
-	3800 7400 4550 7400
+	3800 8050 4550 8050
 Wire Wire Line
-	3800 7300 4550 7300
-Text Label 3850 7400 0    60   ~ 0
+	3800 7950 4550 7950
+Text Label 3850 8050 0    60   ~ 0
 BT812_WR-
-Text Label 3850 7300 0    60   ~ 0
+Text Label 3850 7950 0    60   ~ 0
 BT812_RD-
 Wire Wire Line
-	6300 4950 6900 4950
-Text Label 6350 4950 0    60   ~ 0
+	6300 5600 6900 5600
+Text Label 6350 5600 0    60   ~ 0
 OE_PAL-
 Wire Wire Line
-	8850 2600 9450 2600
-Text Label 8900 2600 0    60   ~ 0
+	8850 3200 9450 3200
+Text Label 8900 3200 0    60   ~ 0
 OE_PAL-
 Wire Wire Line
-	6850 2500 6200 2500
-Text Label 6250 2500 0    60   ~ 0
+	6850 3100 6200 3100
+Text Label 6250 3100 0    60   ~ 0
 BLUE_IN
 Wire Wire Line
-	6850 2400 6200 2400
-Text Label 6250 2400 0    60   ~ 0
+	6850 3000 6200 3000
+Text Label 6250 3000 0    60   ~ 0
 GREEN_IN
 Wire Wire Line
-	6300 2300 6850 2300
-Text Label 6350 2300 0    60   ~ 0
+	6300 2900 6850 2900
+Text Label 6350 2900 0    60   ~ 0
 RED_IN
 Wire Wire Line
-	6900 4000 6250 4000
-Text Label 6300 4000 0    60   ~ 0
+	6900 4650 6250 4650
+Text Label 6300 4650 0    60   ~ 0
 GREEN_IN
 Wire Wire Line
-	6350 4100 6900 4100
-Text Label 6400 4100 0    60   ~ 0
+	6350 4750 6900 4750
+Text Label 6400 4750 0    60   ~ 0
 RED_IN
 Wire Wire Line
-	11950 2800 11300 2800
+	11950 3400 11300 3400
 Wire Wire Line
-	11950 2000 11300 2000
+	11950 2600 11300 2600
 Wire Wire Line
-	11400 1200 11950 1200
-Text Label 11350 2800 0    60   ~ 0
+	11300 1800 11950 1800
+Text Label 11350 3400 0    60   ~ 0
 BLUE_IN
-Text Label 11350 2000 0    60   ~ 0
+Text Label 11350 2600 0    60   ~ 0
 GREEN_IN
-Text Label 11450 1200 0    60   ~ 0
+Text Label 11450 1800 0    60   ~ 0
 RED_IN
 $Comp
 L GND #GND03
 U 1 1 32FA02CD
-P 12100 2200
-F 0 "#GND03" H 12100 2200 40  0001 C CNN
-F 1 "GND" H 12100 2130 40  0000 C CNN
-F 2 "" H 12100 2200 60  0001 C CNN
-F 3 "" H 12100 2200 60  0001 C CNN
-	1    12100 2200
+P 12100 2800
+F 0 "#GND03" H 12100 2800 40  0001 C CNN
+F 1 "GND" H 12100 2730 40  0000 C CNN
+F 2 "" H 12100 2800 60  0001 C CNN
+F 3 "" H 12100 2800 60  0001 C CNN
+	1    12100 2800
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND04
 U 1 1 32FA02C6
-P 12100 3000
-F 0 "#GND04" H 12100 3000 40  0001 C CNN
-F 1 "GND" H 12100 2930 40  0000 C CNN
-F 2 "" H 12100 3000 60  0001 C CNN
-F 3 "" H 12100 3000 60  0001 C CNN
-	1    12100 3000
+P 12100 3600
+F 0 "#GND04" H 12100 3600 40  0001 C CNN
+F 1 "GND" H 12100 3530 40  0000 C CNN
+F 2 "" H 12100 3600 60  0001 C CNN
+F 3 "" H 12100 3600 60  0001 C CNN
+	1    12100 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #GND05
 U 1 1 32FA02C2
-P 12100 1400
-F 0 "#GND05" H 12100 1400 40  0001 C CNN
-F 1 "GND" H 12100 1330 40  0000 C CNN
-F 2 "" H 12100 1400 60  0001 C CNN
-F 3 "" H 12100 1400 60  0001 C CNN
-	1    12100 1400
+P 12100 2000
+F 0 "#GND05" H 12100 2000 40  0001 C CNN
+F 1 "GND" H 12100 1930 40  0000 C CNN
+F 2 "" H 12100 2000 60  0001 C CNN
+F 3 "" H 12100 2000 60  0001 C CNN
+	1    12100 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L BNC P3
 U 1 1 32F9F1AD
-P 12100 2800
-F 0 "P3" H 12110 2920 60  0000 C CNN
-F 1 "BNC" V 12210 2740 40  0000 C CNN
-F 2 "discret:SUBCLICK" H 12100 2800 60  0001 C CNN
-F 3 "" H 12100 2800 60  0001 C CNN
-	1    12100 2800
+P 12100 3400
+F 0 "P3" H 12110 3520 60  0000 C CNN
+F 1 "BNC" V 12210 3340 40  0000 C CNN
+F 2 "discret:SUBCLICK" H 12100 3400 60  0001 C CNN
+F 3 "" H 12100 3400 60  0001 C CNN
+	1    12100 3400
 	1    0    0    -1  
 $EndComp
 $Comp
 L BNC P2
 U 1 1 32F9F1A3
-P 12100 2000
-F 0 "P2" H 12110 2120 60  0000 C CNN
-F 1 "BNC" V 12210 1940 40  0000 C CNN
-F 2 "discret:SUBCLICK" H 12100 2000 60  0001 C CNN
-F 3 "" H 12100 2000 60  0001 C CNN
-	1    12100 2000
+P 12100 2600
+F 0 "P2" H 12110 2720 60  0000 C CNN
+F 1 "BNC" V 12210 2540 40  0000 C CNN
+F 2 "discret:SUBCLICK" H 12100 2600 60  0001 C CNN
+F 3 "" H 12100 2600 60  0001 C CNN
+	1    12100 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L BNC P1
 U 1 1 32F9F198
-P 12100 1200
-F 0 "P1" H 12110 1320 60  0000 C CNN
-F 1 "BNC" V 12210 1140 40  0000 C CNN
-F 2 "discret:SUBCLICK" H 12100 1200 60  0001 C CNN
-F 3 "" H 12100 1200 60  0001 C CNN
-	1    12100 1200
+P 12100 1800
+F 0 "P1" H 12110 1920 60  0000 C CNN
+F 1 "BNC" V 12210 1740 40  0000 C CNN
+F 2 "discret:SUBCLICK" H 12100 1800 60  0001 C CNN
+F 3 "" H 12100 1800 60  0001 C CNN
+	1    12100 1800
 	1    0    0    -1  
 $EndComp
-Text Label 6200 3700 0    60   ~ 0
+Text Label 6200 4350 0    60   ~ 0
 DQ[0..7]
 Wire Bus Line
-	6100 3700 6900 3700
+	6100 4350 6900 4350
 Wire Wire Line
-	6350 3900 6900 3900
-Text Label 6400 3900 0    60   ~ 0
+	6350 4550 6900 4550
+Text Label 6400 4550 0    60   ~ 0
 SYSRST-
 Wire Wire Line
-	3800 3000 4350 3000
+	3800 3600 4350 3600
 Wire Bus Line
-	8800 3950 9750 3950
+	8800 4600 9750 4600
 Wire Bus Line
-	8800 3850 9750 3850
+	8800 4500 9750 4500
 Wire Bus Line
-	8800 3750 9750 3750
-Text Label 8900 3950 0    60   ~ 0
+	8800 4400 9750 4400
+Text Label 8900 4600 0    60   ~ 0
 TVB[0..7]
-Text Label 8900 3850 0    60   ~ 0
+Text Label 8900 4500 0    60   ~ 0
 TVG[0..7]
-Text Label 8900 3750 0    60   ~ 0
+Text Label 8900 4400 0    60   ~ 0
 TVR[0..7]
 $Sheet
-S 6900 3550 1900 1550
+S 6900 4200 1900 1550
 U 4BF03681
 F0 "pal-ntsc.sch" 60
 F1 "pal-ntsc.sch" 60
-F2 "F_PALIN" O R 8800 4350 60 
-F3 "TVR[0..7]" B R 8800 3750 60 
-F4 "PC_D[0..7]" B L 6900 3700 60 
-F5 "PC_A[0..1]" I L 6900 3800 60 
-F6 "RESET-" I L 6900 3900 60 
-F7 "GREEN_IN" I L 6900 4000 60 
-F8 "RED_IN" I L 6900 4100 60 
-F9 "OE_PAL-" I L 6900 4950 60 
-F10 "HD_PAL-" O R 8800 4450 60 
-F11 "VD_PAL-" O R 8800 4550 60 
-F12 "TVB[0..7]" B R 8800 3950 60 
-F13 "TVG[0..7]" B R 8800 3850 60 
-F14 "BT812_WR-" I L 6900 4400 60 
-F15 "BT812_RD-" I L 6900 4300 60 
+F2 "F_PALIN" O R 8800 5000 60 
+F3 "TVR[0..7]" B R 8800 4400 60 
+F4 "PC_D[0..7]" B L 6900 4350 60 
+F5 "PC_A[0..1]" I L 6900 4450 60 
+F6 "RESET-" I L 6900 4550 60 
+F7 "GREEN_IN" I L 6900 4650 60 
+F8 "RED_IN" I L 6900 4750 60 
+F9 "OE_PAL-" I L 6900 5600 60 
+F10 "HD_PAL-" O R 8800 5100 60 
+F11 "VD_PAL-" O R 8800 5200 60 
+F12 "TVB[0..7]" B R 8800 4600 60 
+F13 "TVG[0..7]" B R 8800 4500 60 
+F14 "BT812_WR-" I L 6900 5050 60 
+F15 "BT812_RD-" I L 6900 4950 60 
 $EndSheet
-Text Label 6150 1200 0    60   ~ 0
+Text Label 6150 1800 0    60   ~ 0
 PCA[0..2]
 Wire Bus Line
-	6050 1200 6850 1200
-Text Label 1400 5350 0    60   ~ 0
+	6050 1800 6850 1800
+Text Label 1400 6000 0    60   ~ 0
 RDFIFO-
-Text Label 1400 5250 0    60   ~ 0
+Text Label 1400 5900 0    60   ~ 0
 WRFIFDO-
 Wire Wire Line
-	2000 5350 1400 5350
+	2000 6000 1400 6000
 Wire Wire Line
-	2000 5250 1400 5250
-Text Label 1400 2150 0    60   ~ 0
+	2000 5900 1400 5900
+Text Label 1400 2750 0    60   ~ 0
 RDFIFO-
-Text Label 1400 2050 0    60   ~ 0
+Text Label 1400 2650 0    60   ~ 0
 WRFIFDO-
 Wire Wire Line
-	1950 2150 1350 2150
+	1950 2750 1350 2750
 Wire Wire Line
-	1950 2050 1350 2050
+	1950 2650 1350 2650
 Wire Wire Line
-	3800 2850 4350 2850
+	3800 3450 4350 3450
 Wire Wire Line
-	3800 2750 4350 2750
-Text Label 3900 2850 0    60   ~ 0
+	3800 3350 4350 3350
+Text Label 3900 3450 0    60   ~ 0
 RDEMPTY
-Text Label 3900 2750 0    60   ~ 0
+Text Label 3900 3350 0    60   ~ 0
 WRFULL
 Wire Wire Line
-	1450 7100 2000 7100
+	1450 7750 2000 7750
 Wire Wire Line
-	1450 7000 2000 7000
-Text Label 1500 7100 0    60   ~ 0
+	1450 7650 2000 7650
+Text Label 1500 7750 0    60   ~ 0
 RDEMPTY
-Text Label 1500 7000 0    60   ~ 0
+Text Label 1500 7650 0    60   ~ 0
 WRFULL
-Text Label 1400 5750 0    60   ~ 0
+Text Label 1400 6400 0    60   ~ 0
 PTRDY-
 Wire Wire Line
-	1400 5750 2000 5750
+	1400 6400 2000 6400
 Wire Wire Line
-	1350 6300 2000 6300
-Text Label 1450 6300 0    60   ~ 0
+	1350 6950 2000 6950
+Text Label 1450 6950 0    60   ~ 0
 PTBURST
 Wire Wire Line
-	3800 2350 4450 2350
-Text Label 3900 2350 0    60   ~ 0
+	3800 2950 4450 2950
+Text Label 3900 2950 0    60   ~ 0
 PTBURST
-Text Label 1400 1800 0    60   ~ 0
+Text Label 1400 2400 0    60   ~ 0
 PTRDY-
 Wire Wire Line
-	1350 1800 1950 1800
+	1350 2400 1950 2400
 Wire Wire Line
-	2000 6400 1400 6400
-Text Label 1450 6400 0    60   ~ 0
+	2000 7050 1400 7050
+Text Label 1450 7050 0    60   ~ 0
 SELECT-
 Wire Wire Line
-	1500 6200 2000 6200
-Text Label 1600 6200 0    60   ~ 0
+	1500 6850 2000 6850
+Text Label 1600 6850 0    60   ~ 0
 PTWR
 Wire Wire Line
-	3800 2450 4300 2450
+	3800 3050 4300 3050
 Wire Wire Line
-	1950 1900 1350 1900
-Text Label 3900 2450 0    60   ~ 0
+	1950 2500 1350 2500
+Text Label 3900 3050 0    60   ~ 0
 PTWR
-Text Label 1400 1900 0    60   ~ 0
+Text Label 1400 2500 0    60   ~ 0
 SELECT-
 Wire Wire Line
-	1500 6100 2000 6100
+	1500 6750 2000 6750
 Wire Wire Line
-	1400 5650 2000 5650
-Text Label 1400 5650 0    60   ~ 0
+	1400 6300 2000 6300
+Text Label 1400 6300 0    60   ~ 0
 PTATN-
-Text Label 1550 6100 0    60   ~ 0
+Text Label 1550 6750 0    60   ~ 0
 PTADR-
 Wire Wire Line
-	2000 6500 1500 6500
-Text Label 1500 6500 0    60   ~ 0
+	2000 7150 1500 7150
+Text Label 1500 7150 0    60   ~ 0
 BPCLK
 Wire Wire Line
-	3800 2550 4300 2550
+	3800 3150 4300 3150
 Wire Wire Line
-	3800 2050 4300 2050
+	3800 2650 4300 2650
 Wire Wire Line
-	3800 1950 4300 1950
-Text Label 3900 2550 0    60   ~ 0
+	3800 2550 4300 2550
+Text Label 3900 3150 0    60   ~ 0
 BPCLK
-Text Label 3850 1950 0    60   ~ 0
+Text Label 3850 2550 0    60   ~ 0
 PTATN-
-Text Label 3850 2050 0    60   ~ 0
+Text Label 3850 2650 0    60   ~ 0
 PTADR-
 Wire Bus Line
-	2000 6800 1300 6800
-Text Label 1350 6800 0    60   ~ 0
+	2000 7450 1300 7450
+Text Label 1350 7450 0    60   ~ 0
 BE-[0..3]
 Wire Bus Line
-	3800 2150 4600 2150
-Text Label 3850 2150 0    60   ~ 0
+	3800 2750 4600 2750
+Text Label 3850 2750 0    60   ~ 0
 PTBE-[0..3]
 Wire Bus Line
-	1200 6000 2000 6000
+	1200 6650 2000 6650
 Wire Bus Line
-	1950 1200 1250 1200
-Text Label 1300 1200 0    60   ~ 0
+	1950 1800 1250 1800
+Text Label 1300 1800 0    60   ~ 0
 BE-[0..3]
-Text Label 1250 6000 0    60   ~ 0
+Text Label 1250 6650 0    60   ~ 0
 PTBE-[0..3]
 Wire Wire Line
-	1400 5900 2000 5900
+	1400 6550 2000 6550
 Wire Wire Line
-	1400 6700 2000 6700
-Text Label 1500 6700 0    60   ~ 0
+	1400 7350 2000 7350
+Text Label 1500 7350 0    60   ~ 0
 PTNUM0
-Text Label 1500 5900 0    60   ~ 0
+Text Label 1500 6550 0    60   ~ 0
 PTNUM1
 Wire Wire Line
-	1450 6600 2000 6600
-Text Label 1500 6600 0    60   ~ 0
+	1450 7250 2000 7250
+Text Label 1500 7250 0    60   ~ 0
 SYSRST-
-Text Label 3900 3000 0    60   ~ 0
+Text Label 3900 3600 0    60   ~ 0
 SYSRST-
-Text Label 3900 1850 0    60   ~ 0
+Text Label 3900 2450 0    60   ~ 0
 PTNUM1
-Text Label 3900 1750 0    60   ~ 0
+Text Label 3900 2350 0    60   ~ 0
 PTNUM0
 Wire Wire Line
-	3800 1850 4300 1850
+	3800 2450 4300 2450
 Wire Wire Line
-	3800 1750 4300 1750
-Text Label 1300 4750 0    60   ~ 0
+	3800 2350 4300 2350
+Text Label 1300 5400 0    60   ~ 0
 ADR[2..6]
-Text Label 3950 5050 0    60   ~ 0
+Text Label 3950 5700 0    60   ~ 0
 BLANK-
 Wire Wire Line
-	3800 5050 4350 5050
-Text Label 3850 4750 0    60   ~ 0
+	3800 5700 4350 5700
+Text Label 3850 5400 0    60   ~ 0
 CSYNC-OUT
-Text Label 1400 5500 0    60   ~ 0
+Text Label 1400 6150 0    60   ~ 0
 CSYNCIN-
 Wire Wire Line
-	1400 5500 2000 5500
-Text Label 8950 1800 0    60   ~ 0
+	1400 6150 2000 6150
+Text Label 8950 2400 0    60   ~ 0
 CSYNCIN-
 Wire Wire Line
-	8850 1800 9700 1800
+	8850 2400 9700 2400
 Wire Wire Line
-	6150 2850 6850 2850
+	6150 3450 6850 3450
 Wire Wire Line
-	3800 4750 4500 4750
-Text Label 6200 2850 0    60   ~ 0
+	3800 5400 4500 5400
+Text Label 6200 3450 0    60   ~ 0
 CSYNC-OUT
-Text Label 6450 5950 0    60   ~ 0
+Text Label 6450 6550 0    60   ~ 0
 WRAM-
 Wire Wire Line
-	6450 5950 6950 5950
-Text Label 3900 6300 0    60   ~ 0
+	6450 6550 6950 6550
+Text Label 3900 6950 0    60   ~ 0
 WRAM-
 Wire Wire Line
-	3800 6300 4300 6300
+	3800 6950 4300 6950
 Wire Wire Line
-	6350 1400 6850 1400
+	6350 2000 6850 2000
 Wire Wire Line
-	6350 1500 6850 1500
+	6350 2100 6850 2100
 Wire Wire Line
-	6350 1600 6850 1600
+	6350 2200 6850 2200
 Wire Wire Line
-	6350 1700 6850 1700
-Text Label 6400 1400 0    60   ~ 0
+	6350 2300 6850 2300
+Text Label 6400 2000 0    60   ~ 0
 WRCAD-
-Text Label 6400 1500 0    60   ~ 0
+Text Label 6400 2100 0    60   ~ 0
 RDCAD-
-Text Label 6400 1600 0    60   ~ 0
+Text Label 6400 2200 0    60   ~ 0
 WRCDA-
-Text Label 6400 1700 0    60   ~ 0
+Text Label 6400 2300 0    60   ~ 0
 RDCDA-
 Wire Wire Line
-	3800 7200 4300 7200
+	3800 7850 4300 7850
 Wire Wire Line
-	3800 7100 4300 7100
+	3800 7750 4300 7750
 Wire Wire Line
-	3800 7000 4300 7000
+	3800 7650 4300 7650
 Wire Wire Line
-	3800 6900 4300 6900
-Text Label 3850 7200 0    60   ~ 0
+	3800 7550 4300 7550
+Text Label 3850 7850 0    60   ~ 0
 WRCAD-
-Text Label 3850 7100 0    60   ~ 0
+Text Label 3850 7750 0    60   ~ 0
 RDCAD-
-Text Label 3850 7000 0    60   ~ 0
+Text Label 3850 7650 0    60   ~ 0
 WRCDA-
-Text Label 3850 6900 0    60   ~ 0
+Text Label 3850 7550 0    60   ~ 0
 RDCDA-
-Text Label 6450 7300 0    60   ~ 0
+Text Label 6450 7900 0    60   ~ 0
 RAS7-
-Text Label 6450 7200 0    60   ~ 0
+Text Label 6450 7800 0    60   ~ 0
 RAS6-
-Text Label 6450 7100 0    60   ~ 0
+Text Label 6450 7700 0    60   ~ 0
 RAS5-
-Text Label 6450 7000 0    60   ~ 0
+Text Label 6450 7600 0    60   ~ 0
 RAS4-
-Text Label 6450 6900 0    60   ~ 0
+Text Label 6450 7500 0    60   ~ 0
 RAS3-
-Text Label 6450 6800 0    60   ~ 0
+Text Label 6450 7400 0    60   ~ 0
 RAS2-
-Text Label 6450 6700 0    60   ~ 0
+Text Label 6450 7300 0    60   ~ 0
 RAS1-
-Text Label 6450 6600 0    60   ~ 0
+Text Label 6450 7200 0    60   ~ 0
 RAS0-
 Wire Wire Line
-	6450 7300 6950 7300
+	6450 7900 6950 7900
 Wire Wire Line
-	6450 7200 6950 7200
+	6450 7800 6950 7800
 Wire Wire Line
-	6450 7100 6950 7100
+	6450 7700 6950 7700
 Wire Wire Line
-	6450 7000 6950 7000
+	6450 7600 6950 7600
 Wire Wire Line
-	6450 6900 6950 6900
+	6450 7500 6950 7500
 Wire Wire Line
-	6450 6800 6950 6800
+	6450 7400 6950 7400
 Wire Wire Line
-	6450 6700 6950 6700
+	6450 7300 6950 7300
 Wire Wire Line
-	6450 6600 6950 6600
-Text Label 6450 6400 0    60   ~ 0
+	6450 7200 6950 7200
+Text Label 6450 7000 0    60   ~ 0
 CAS3-
-Text Label 6450 6300 0    60   ~ 0
+Text Label 6450 6900 0    60   ~ 0
 CAS2-
-Text Label 6450 6200 0    60   ~ 0
+Text Label 6450 6800 0    60   ~ 0
 CAS1-
-Text Label 6450 6100 0    60   ~ 0
+Text Label 6450 6700 0    60   ~ 0
 CAS0-
 Wire Wire Line
-	6450 6400 6950 6400
+	6450 7000 6950 7000
 Wire Wire Line
-	6450 6300 6950 6300
+	6450 6900 6950 6900
 Wire Wire Line
-	6450 6200 6950 6200
+	6450 6800 6950 6800
 Wire Wire Line
-	6450 6100 6950 6100
-Text Label 3900 6700 0    60   ~ 0
+	6450 6700 6950 6700
+Text Label 3900 7350 0    60   ~ 0
 CAS3-
-Text Label 3900 6600 0    60   ~ 0
+Text Label 3900 7250 0    60   ~ 0
 CAS2-
-Text Label 3900 6500 0    60   ~ 0
+Text Label 3900 7150 0    60   ~ 0
 CAS1-
-Text Label 3900 6400 0    60   ~ 0
+Text Label 3900 7050 0    60   ~ 0
 CAS0-
-Text Label 3900 6150 0    60   ~ 0
+Text Label 3900 6800 0    60   ~ 0
 RAS7-
-Text Label 3900 6050 0    60   ~ 0
+Text Label 3900 6700 0    60   ~ 0
 RAS6-
-Text Label 3900 5950 0    60   ~ 0
+Text Label 3900 6600 0    60   ~ 0
 RAS5-
-Text Label 3900 5850 0    60   ~ 0
+Text Label 3900 6500 0    60   ~ 0
 RAS4-
-Text Label 3900 5750 0    60   ~ 0
+Text Label 3900 6400 0    60   ~ 0
 RAS3-
-Text Label 3900 5650 0    60   ~ 0
+Text Label 3900 6300 0    60   ~ 0
 RAS2-
-Text Label 3900 5550 0    60   ~ 0
+Text Label 3900 6200 0    60   ~ 0
 RAS1-
-Text Label 3900 5450 0    60   ~ 0
+Text Label 3900 6100 0    60   ~ 0
 RAS0-
 Wire Wire Line
-	3800 6700 4300 6700
+	3800 7350 4300 7350
 Wire Wire Line
-	3800 6600 4300 6600
+	3800 7250 4300 7250
 Wire Wire Line
-	3800 6500 4300 6500
+	3800 7150 4300 7150
 Wire Wire Line
-	3800 6400 4300 6400
+	3800 7050 4300 7050
 Wire Wire Line
-	3800 6150 4300 6150
+	3800 6800 4300 6800
 Wire Wire Line
-	3800 6050 4300 6050
+	3800 6700 4300 6700
 Wire Wire Line
-	3800 5950 4300 5950
+	3800 6600 4300 6600
 Wire Wire Line
-	3800 5850 4300 5850
+	3800 6500 4300 6500
 Wire Wire Line
-	3800 5750 4300 5750
+	3800 6400 4300 6400
 Wire Wire Line
-	3800 5650 4300 5650
+	3800 6300 4300 6300
 Wire Wire Line
-	3800 5550 4300 5550
+	3800 6200 4300 6200
 Wire Wire Line
-	3800 5450 4300 5450
-Text Label 1400 4950 0    60   ~ 0
+	3800 6100 4300 6100
+Text Label 1400 5600 0    60   ~ 0
 /PCWR
-Text Label 1400 5050 0    60   ~ 0
+Text Label 1400 5700 0    60   ~ 0
 /PCRD
 Wire Wire Line
-	1400 4950 2000 4950
+	1400 5600 2000 5600
 Wire Wire Line
-	1400 5050 2000 5050
+	1400 5700 2000 5700
 Wire Bus Line
-	1200 4750 2000 4750
-Text Label 1300 4650 0    60   ~ 0
+	1200 5400 2000 5400
+Text Label 1300 5300 0    60   ~ 0
 DQ[0..15]
 Wire Bus Line
-	1200 4650 2000 4650
+	1200 5300 2000 5300
 Wire Wire Line
-	6150 2750 6850 2750
-Text Label 6300 2750 0    60   ~ 0
+	6150 3350 6850 3350
+Text Label 6300 3350 0    60   ~ 0
 CLAMP
 Wire Wire Line
-	3800 4950 4300 4950
-Text Label 3950 4950 0    60   ~ 0
+	3800 5600 4300 5600
+Text Label 3950 5600 0    60   ~ 0
 CLAMP
 Wire Bus Line
-	6100 7450 6950 7450
-Text Label 6250 7450 0    60   ~ 0
+	6100 8050 6950 8050
+Text Label 6250 8050 0    60   ~ 0
 MXA[0..10]
 Wire Bus Line
-	3800 5350 4600 5350
-Text Label 3900 5350 0    60   ~ 0
+	3800 6000 4600 6000
+Text Label 3900 6000 0    60   ~ 0
 MXA[0..10]
 Wire Wire Line
-	6350 2100 6850 2100
+	6350 2700 6850 2700
 Wire Wire Line
-	6350 2000 6850 2000
-Text Label 6400 2000 0    60   ~ 0
+	6350 2600 6850 2600
+Text Label 6400 2600 0    60   ~ 0
 CLKCAD
-Text Label 6400 2100 0    60   ~ 0
+Text Label 6400 2700 0    60   ~ 0
 CLKCDA
 Wire Wire Line
-	3800 4650 4300 4650
+	3800 5300 4300 5300
 Wire Wire Line
-	3800 4550 4300 4550
-Text Label 3850 4550 0    60   ~ 0
+	3800 5200 4300 5200
+Text Label 3850 5200 0    60   ~ 0
 CLKCAD
-Text Label 3850 4650 0    60   ~ 0
+Text Label 3850 5300 0    60   ~ 0
 CLKCDA
 $Sheet
-S 2000 4350 1800 4650
+S 2000 5000 1800 4650
 U 4BF03683
 F0 "graphic" 60
 F1 "graphic.sch" 60
-F2 "CSYNC-OUT" O R 3800 4750 60 
-F3 "DQ[0..15]" B L 2000 4650 60 
-F4 "ADR[2..6]" O L 2000 4750 60 
-F5 "CADCLK" O R 3800 4550 60 
-F6 "CDACLK" O R 3800 4650 60 
-F7 "CLAMP" O R 3800 4950 60 
-F8 "CSYNCIN-" I L 2000 5500 60 
-F9 "MXA[0..10]" O R 3800 5350 60 
-F10 "RAS7-" O R 3800 6150 60 
-F11 "RAS6-" O R 3800 6050 60 
-F12 "RAS5-" O R 3800 5950 60 
-F13 "RAS4-" O R 3800 5850 60 
-F14 "RAS3-" O R 3800 5750 60 
-F15 "RAS2-" O R 3800 5650 60 
-F16 "RAS1-" O R 3800 5550 60 
-F17 "RAS0-" O R 3800 5450 60 
-F18 "CAS2-" O R 3800 6600 60 
-F19 "CAS1-" O R 3800 6500 60 
-F20 "CAS0-" O R 3800 6400 60 
-F21 "RD-" I L 2000 5050 60 
-F22 "WR-" I L 2000 4950 60 
-F23 "CAS3-" O R 3800 6700 60 
-F24 "RDCDA-" O R 3800 6900 60 
-F25 "WRCDA-" O R 3800 7000 60 
-F26 "RDCAD-" O R 3800 7100 60 
-F27 "WRCAD-" O R 3800 7200 60 
-F28 "WRAM-" O R 3800 6300 60 
-F29 "BLANK-" O R 3800 5050 60 
-F30 "PTATN-" I L 2000 5650 60 
-F31 "PTRDY-" O L 2000 5750 60 
-F32 "PTNUM1" I L 2000 5900 60 
-F33 "PTBE-[0..3]" I L 2000 6000 60 
-F34 "PTADR-" O L 2000 6100 60 
-F35 "PTWR" I L 2000 6200 60 
-F36 "PTBURST-" I L 2000 6300 60 
-F37 "SELECT-" O L 2000 6400 60 
-F38 "BPCLK" I L 2000 6500 60 
-F39 "SYSRST-" I L 2000 6600 60 
-F40 "PTNUM0" I L 2000 6700 60 
-F41 "BE-[0..3]" O L 2000 6800 60 
-F42 "WRFULL" O L 2000 7000 60 
-F43 "RDEMPTY" O L 2000 7100 60 
-F44 "RDFIFO-" O L 2000 5350 60 
-F45 "WRFIFO-" O L 2000 5250 60 
-F46 "BT812_WR-" O R 3800 7400 60 
-F47 "BT812_RD-" O R 3800 7300 60 
-F48 "VD_PAL-" I L 2000 7300 60 
-F49 "HD_PAL-" I L 2000 7400 60 
-F50 "F_PALIN" I L 2000 7500 60 
-F51 "X_DOUT" O R 3800 7850 60 
-F52 "X_CLK" O R 3800 7950 60 
-F53 "X_DONE" O R 3800 8050 60 
-F54 "X_PROG-" O R 3800 8150 60 
-F55 "WRITE_RAM" O R 3800 8350 60 
-F56 "ACCES_RAM-" O R 3800 8450 60 
-F57 "TVI[0..1]" O R 3800 5250 60 
-F58 "PCA[0..2]" O R 3800 8650 60 
-F59 "X_IRQ" B L 2000 7650 60 
-F60 "IRQ-" I L 2000 7750 60 
-F61 "IRQ_SLR" B L 2000 7850 60 
-F62 "ACQ_ON" O R 3800 7650 60 
+F2 "CSYNC-OUT" O R 3800 5400 60 
+F3 "DQ[0..15]" B L 2000 5300 60 
+F4 "ADR[2..6]" O L 2000 5400 60 
+F5 "CADCLK" O R 3800 5200 60 
+F6 "CDACLK" O R 3800 5300 60 
+F7 "CLAMP" O R 3800 5600 60 
+F8 "CSYNCIN-" I L 2000 6150 60 
+F9 "MXA[0..10]" O R 3800 6000 60 
+F10 "RAS7-" O R 3800 6800 60 
+F11 "RAS6-" O R 3800 6700 60 
+F12 "RAS5-" O R 3800 6600 60 
+F13 "RAS4-" O R 3800 6500 60 
+F14 "RAS3-" O R 3800 6400 60 
+F15 "RAS2-" O R 3800 6300 60 
+F16 "RAS1-" O R 3800 6200 60 
+F17 "RAS0-" O R 3800 6100 60 
+F18 "CAS2-" O R 3800 7250 60 
+F19 "CAS1-" O R 3800 7150 60 
+F20 "CAS0-" O R 3800 7050 60 
+F21 "RD-" I L 2000 5700 60 
+F22 "WR-" I L 2000 5600 60 
+F23 "CAS3-" O R 3800 7350 60 
+F24 "RDCDA-" O R 3800 7550 60 
+F25 "WRCDA-" O R 3800 7650 60 
+F26 "RDCAD-" O R 3800 7750 60 
+F27 "WRCAD-" O R 3800 7850 60 
+F28 "WRAM-" O R 3800 6950 60 
+F29 "BLANK-" O R 3800 5700 60 
+F30 "PTATN-" I L 2000 6300 60 
+F31 "PTRDY-" O L 2000 6400 60 
+F32 "PTNUM1" I L 2000 6550 60 
+F33 "PTBE-[0..3]" I L 2000 6650 60 
+F34 "PTADR-" O L 2000 6750 60 
+F35 "PTWR" I L 2000 6850 60 
+F36 "PTBURST-" I L 2000 6950 60 
+F37 "SELECT-" O L 2000 7050 60 
+F38 "BPCLK" I L 2000 7150 60 
+F39 "SYSRST-" I L 2000 7250 60 
+F40 "PTNUM0" I L 2000 7350 60 
+F41 "BE-[0..3]" O L 2000 7450 60 
+F42 "WRFULL" O L 2000 7650 60 
+F43 "RDEMPTY" O L 2000 7750 60 
+F44 "RDFIFO-" O L 2000 6000 60 
+F45 "WRFIFO-" O L 2000 5900 60 
+F46 "BT812_WR-" O R 3800 8050 60 
+F47 "BT812_RD-" O R 3800 7950 60 
+F48 "VD_PAL-" I L 2000 7950 60 
+F49 "HD_PAL-" I L 2000 8050 60 
+F50 "F_PALIN" I L 2000 8150 60 
+F51 "X_DOUT" O R 3800 8500 60 
+F52 "X_CLK" O R 3800 8600 60 
+F53 "X_DONE" O R 3800 8700 60 
+F54 "X_PROG-" O R 3800 8800 60 
+F55 "WRITE_RAM" O R 3800 9000 60 
+F56 "ACCES_RAM-" O R 3800 9100 60 
+F57 "TVI[0..1]" O R 3800 5900 60 
+F58 "PCA[0..2]" O R 3800 9300 60 
+F59 "X_IRQ" B L 2000 8300 60 
+F60 "IRQ-" I L 2000 8400 60 
+F61 "IRQ_SLR" B L 2000 8500 60 
+F62 "ACQ_ON" O R 3800 8300 60 
 $EndSheet
 Wire Bus Line
-	8850 1600 9800 1600
-Text Label 8950 1600 0    60   ~ 0
+	8850 2200 9800 2200
+Text Label 8950 2200 0    60   ~ 0
 TVI[0..1]
 Wire Bus Line
-	12950 4250 13900 4250
-Text Label 13050 4250 0    60   ~ 0
+	12900 4900 13850 4900
+Text Label 13000 4900 0    60   ~ 0
 TVRAM[0..31]
 $Sheet
-S 6950 5850 1850 1700
+S 6950 6450 1850 1700
 U 4BF03685
 F0 "RAMS" 60
 F1 "rams.sch" 60
-F2 "TVRAM[0..31]" T R 8800 6000 60 
-F3 "WRAM-" I L 6950 5950 60 
-F4 "CAS3-" I L 6950 6400 60 
-F5 "RAS7-" I L 6950 7300 60 
-F6 "RAS6-" I L 6950 7200 60 
-F7 "RAS5-" I L 6950 7100 60 
-F8 "RAS4-" I L 6950 7000 60 
-F9 "RAS3-" I L 6950 6900 60 
-F10 "RAS2-" I L 6950 6800 60 
-F11 "RAS1-" I L 6950 6700 60 
-F12 "RAS0-" I L 6950 6600 60 
-F13 "CAS2-" I L 6950 6300 60 
-F14 "CAS1-" I L 6950 6200 60 
-F15 "CAS0-" I L 6950 6100 60 
-F16 "MXA[0..10]" I L 6950 7450 60 
+F2 "TVRAM[0..31]" T R 8800 6600 60 
+F3 "WRAM-" I L 6950 6550 60 
+F4 "CAS3-" I L 6950 7000 60 
+F5 "RAS7-" I L 6950 7900 60 
+F6 "RAS6-" I L 6950 7800 60 
+F7 "RAS5-" I L 6950 7700 60 
+F8 "RAS4-" I L 6950 7600 60 
+F9 "RAS3-" I L 6950 7500 60 
+F10 "RAS2-" I L 6950 7400 60 
+F11 "RAS1-" I L 6950 7300 60 
+F12 "RAS0-" I L 6950 7200 60 
+F13 "CAS2-" I L 6950 6900 60 
+F14 "CAS1-" I L 6950 6800 60 
+F15 "CAS0-" I L 6950 6700 60 
+F16 "MXA[0..10]" I L 6950 8050 60 
 $EndSheet
 Wire Bus Line
-	6850 1300 6000 1300
+	6850 1900 6000 1900
 Wire Bus Line
-	8850 1500 9800 1500
+	8850 2100 9800 2100
 Wire Bus Line
-	8850 1400 9800 1400
+	8850 2000 9800 2000
 Wire Bus Line
-	8850 1300 9800 1300
-Text Label 8950 1500 0    60   ~ 0
+	8850 1900 9800 1900
+Text Label 8950 2100 0    60   ~ 0
 TVB[0..7]
-Text Label 8950 1400 0    60   ~ 0
+Text Label 8950 2000 0    60   ~ 0
 TVG[0..7]
 $Sheet
-S 1950 1000 1850 2400
+S 1950 1600 1850 2400
 U 4BF03687
 F0 "buspci.sch" 60
 F1 "bus_pci.sch" 60
-F2 "WR-" I L 1950 1350 60 
-F3 "RD-" I L 1950 1450 60 
-F4 "DQ[0..31]" B R 3800 1200 60 
-F5 "ADR[2..6]" I L 1950 1600 60 
-F6 "BE-[0..3]" I L 1950 1200 60 
-F7 "IRQ_SRL" B R 3800 1350 60 
-F8 "X_IRQ" B R 3800 1450 60 
-F9 "PTNUM0" O R 3800 1750 60 
-F10 "PTNUM1" O R 3800 1850 60 
-F11 "PTATN-" O R 3800 1950 60 
-F12 "PTRDY-" I L 1950 1800 60 
-F13 "PTBE-[0..3]" O R 3800 2150 60 
-F14 "PTWR" O R 3800 2450 60 
-F15 "PTBURST-" O R 3800 2350 60 
-F16 "SELECT-" I L 1950 1900 60 
-F17 "BPCLK" O R 3800 2550 60 
-F18 "SYSRST-" O R 3800 3000 60 
-F19 "WRFULL" O R 3800 2750 60 
-F20 "RDEMPTY" O R 3800 2850 60 
-F21 "WRFIFO-" I L 1950 2050 60 
-F22 "RDFIFO-" I L 1950 2150 60 
-F23 "IRQ-" O R 3800 1550 60 
-F24 "PTADR-" O R 3800 2050 60 
+F2 "WR-" I L 1950 1950 60 
+F3 "RD-" I L 1950 2050 60 
+F4 "DQ[0..31]" B R 3800 1800 60 
+F5 "ADR[2..6]" I L 1950 2200 60 
+F6 "BE-[0..3]" I L 1950 1800 60 
+F7 "IRQ_SRL" B R 3800 1950 60 
+F8 "X_IRQ" B R 3800 2050 60 
+F9 "PTNUM0" O R 3800 2350 60 
+F10 "PTNUM1" O R 3800 2450 60 
+F11 "PTATN-" O R 3800 2550 60 
+F12 "PTRDY-" I L 1950 2400 60 
+F13 "PTBE-[0..3]" O R 3800 2750 60 
+F14 "PTWR" O R 3800 3050 60 
+F15 "PTBURST-" O R 3800 2950 60 
+F16 "SELECT-" I L 1950 2500 60 
+F17 "BPCLK" O R 3800 3150 60 
+F18 "SYSRST-" O R 3800 3600 60 
+F19 "WRFULL" O R 3800 3350 60 
+F20 "RDEMPTY" O R 3800 3450 60 
+F21 "WRFIFO-" I L 1950 2650 60 
+F22 "RDFIFO-" I L 1950 2750 60 
+F23 "IRQ-" O R 3800 2150 60 
+F24 "PTADR-" O R 3800 2650 60 
 $EndSheet
-Text Label 1250 1600 0    60   ~ 0
+Text Label 1250 2200 0    60   ~ 0
 ADR[2..6]
-Text Label 1400 1350 0    60   ~ 0
+Text Label 1400 1950 0    60   ~ 0
 /PCWR
-Text Label 1400 1450 0    60   ~ 0
+Text Label 1400 2050 0    60   ~ 0
 /PCRD
-Text Label 6150 1300 0    60   ~ 0
+Text Label 6150 1900 0    60   ~ 0
 DQ[0..7]
-Text Label 8950 1300 0    60   ~ 0
+Text Label 8950 1900 0    60   ~ 0
 TVR[0..7]
-Text Label 3900 1200 0    60   ~ 0
+Text Label 3900 1800 0    60   ~ 0
 DQ[0..31]
-Text Label 6300 2650 0    60   ~ 0
+Text Label 6300 3250 0    60   ~ 0
 BLANK-
 Wire Wire Line
-	1250 1350 1950 1350
+	1250 1950 1950 1950
 Wire Wire Line
-	1250 1450 1950 1450
+	1250 2050 1950 2050
 Wire Wire Line
-	6150 2650 6850 2650
+	6150 3250 6850 3250
 Wire Bus Line
-	3800 1200 4600 1200
+	3800 1800 4600 1800
 Wire Bus Line
-	1150 1600 1950 1600
+	1150 2200 1950 2200
 $Sheet
-S 6850 1050 2000 2150
+S 6850 1650 2000 2150
 U 4BF03689
 F0 "ESVIDEO-RVB" 60
 F1 "esvideo.sch" 60
-F2 "DPC[0..7]" B L 6850 1300 60 
-F3 "TVR[0..7]" O R 8850 1300 60 
-F4 "BLANK-" I L 6850 2650 60 
-F5 "TVG[0..7]" O R 8850 1400 60 
-F6 "TVB[0..7]" O R 8850 1500 60 
-F7 "WRCAD-" I L 6850 1400 60 
-F8 "RDCAD-" I L 6850 1500 60 
-F9 "WRCDA-" I L 6850 1600 60 
-F10 "RDCDA-" I L 6850 1700 60 
-F11 "CSYNCIN-" O R 8850 1800 60 
-F12 "CSYNCOUT-" I L 6850 2850 60 
-F13 "CLKCAD" I L 6850 2000 60 
-F14 "CLKCDA" I L 6850 2100 60 
-F15 "TVI[0..1]" O R 8850 1600 60 
-F16 "CLAMP" I L 6850 2750 60 
-F17 "BLUE_IN" I L 6850 2500 60 
-F18 "GREEN_IN" I L 6850 2400 60 
-F19 "RED_IN" I L 6850 2300 60 
-F20 "RED" O R 8850 2150 60 
-F21 "GREEN" O R 8850 2250 60 
-F22 "BLUE" O R 8850 2350 60 
-F23 "PCA[0..2]" I L 6850 1200 60 
-F24 "OE_PAL-" O R 8850 2600 60 
+F2 "DPC[0..7]" B L 6850 1900 60 
+F3 "TVR[0..7]" O R 8850 1900 60 
+F4 "BLANK-" I L 6850 3250 60 
+F5 "TVG[0..7]" O R 8850 2000 60 
+F6 "TVB[0..7]" O R 8850 2100 60 
+F7 "WRCAD-" I L 6850 2000 60 
+F8 "RDCAD-" I L 6850 2100 60 
+F9 "WRCDA-" I L 6850 2200 60 
+F10 "RDCDA-" I L 6850 2300 60 
+F11 "CSYNCIN-" O R 8850 2400 60 
+F12 "CSYNCOUT-" I L 6850 3450 60 
+F13 "CLKCAD" I L 6850 2600 60 
+F14 "CLKCDA" I L 6850 2700 60 
+F15 "TVI[0..1]" O R 8850 2200 60 
+F16 "CLAMP" I L 6850 3350 60 
+F17 "BLUE_IN" I L 6850 3100 60 
+F18 "GREEN_IN" I L 6850 3000 60 
+F19 "RED_IN" I L 6850 2900 60 
+F20 "RED" O R 8850 2750 60 
+F21 "GREEN" O R 8850 2850 60 
+F22 "BLUE" O R 8850 2950 60 
+F23 "PCA[0..2]" I L 6850 1800 60 
+F24 "OE_PAL-" O R 8850 3200 60 
 $EndSheet
 $EndSCHEMATC

Follow ups