diff --git a/demos/complex_hierarchy/ampli_ht.sch b/demos/complex_hierarchy/ampli_ht.sch
index 03340d232d..05d9b58325 100644
--- a/demos/complex_hierarchy/ampli_ht.sch
+++ b/demos/complex_hierarchy/ampli_ht.sch
@@ -4,7 +4,7 @@ EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 3
+Sheet 3 3
 Title "Complex hierarchy: demo"
 Date "2017-01-15"
 Rev "1"
@@ -26,7 +26,7 @@ Wire Wire Line
 Wire Wire Line
 	9800 4450 9600 4450
 Wire Wire Line
-	9800 4150 9800 4450
+	9800 4150 9800 4300
 Wire Wire Line
 	9800 4150 9600 4150
 Wire Wire Line
@@ -36,21 +36,21 @@ Wire Wire Line
 Wire Wire Line
 	6900 5400 7250 5400
 Wire Wire Line
-	2600 2000 3100 2000
+	2600 2000 2850 2000
 Connection ~ 7300 3300
 Wire Wire Line
-	7300 3200 7300 3450
+	7300 3200 7300 3300
 Wire Wire Line
 	5400 6400 5600 6400
 Wire Wire Line
 	4350 2500 4350 3000
 Connection ~ 5450 2400
 Wire Wire Line
-	5450 3000 5450 1600
+	5450 3000 5450 2400
 Wire Wire Line
 	5450 1600 4500 1600
 Wire Wire Line
-	3400 2000 3800 2000
+	3400 2000 3600 2000
 Wire Wire Line
 	7000 5100 7000 5200
 Wire Wire Line
@@ -79,7 +79,7 @@ Wire Wire Line
 Wire Wire Line
 	5850 5500 5900 5500
 Wire Wire Line
-	4350 3000 5450 3000
+	4350 3000 5150 3000
 Wire Wire Line
 	4350 2000 4100 2000
 Wire Wire Line
@@ -107,9 +107,9 @@ Wire Wire Line
 	8100 4800 8100 5100
 Connection ~ 8100 4800
 Wire Wire Line
-	7900 3500 7900 3900
+	7900 3500 7900 3700
 Wire Wire Line
-	7900 4600 7900 4900
+	7900 4600 7900 4800
 Wire Wire Line
 	9800 4300 10400 4300
 Connection ~ 9800 4300
@@ -117,7 +117,7 @@ Wire Wire Line
 	8900 4450 8900 4950
 Connection ~ 8900 4450
 Wire Wire Line
-	8900 5250 8900 6400
+	8900 5250 8900 5400
 Connection ~ 8900 5400
 $Comp
 L complex_hierarchy_schlib:R R26
@@ -125,9 +125,9 @@ U 1 1 4B617B88
 P 9100 5100
 AR Path="/4B3A1333/4B617B88" Ref="R26"  Part="1" 
 AR Path="/4B3A13A4/4B617B88" Ref="R28"  Part="1" 
-F 0 "R28" V 9000 5100 50  0000 C CNN
+F 0 "R26" V 9000 5100 50  0000 C CNN
 F 1 "220K" V 9100 5100 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 8950 5100 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 8950 5100 20  0000 C CNN
 F 3 "" H 9100 5100 60  0001 C CNN
 	1    9100 5100
 	-1   0    0    1   
@@ -138,9 +138,9 @@ U 1 1 4B616B96
 P 9450 4450
 AR Path="/4B3A1333/4B616B96" Ref="R25"  Part="1" 
 AR Path="/4B3A13A4/4B616B96" Ref="R27"  Part="1" 
-F 0 "R27" V 9530 4450 50  0000 C CNN
+F 0 "R25" V 9530 4450 50  0000 C CNN
 F 1 "47" V 9450 4450 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 9600 4450 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 9600 4450 20  0000 C CNN
 F 3 "" H 9450 4450 60  0001 C CNN
 	1    9450 4450
 	0    1    1    0   
@@ -151,9 +151,9 @@ U 1 1 4B616AFA
 P 7900 4000
 AR Path="/4B3A1333/4B616AFA" Ref="D8"  Part="1" 
 AR Path="/4B3A13A4/4B616AFA" Ref="D9"  Part="1" 
-F 0 "D9" V 7850 4200 50  0000 C CNN
+F 0 "D8" V 7850 4200 50  0000 C CNN
 F 1 "1N4148" V 7950 4200 50  0000 C CNN
-F 2 "Discret:D3" H 7901 3929 20  0000 C CNN
+F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 7901 3929 10  0000 C CNN
 F 3 "" H 7900 4000 60  0001 C CNN
 	1    7900 4000
 	0    -1   -1   0   
@@ -164,7 +164,7 @@ U 1 1 4B6168A3
 P 8100 5950
 AR Path="/4B3A13A4/4B6168A3" Ref="#PWR019"  Part="1" 
 AR Path="/4B3A1333/4B6168A3" Ref="#PWR035"  Part="1" 
-F 0 "#PWR019" H 8100 5950 30  0001 C CNN
+F 0 "#PWR035" 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
@@ -177,9 +177,9 @@ 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 "R20" V 8180 5250 50  0000 C CNN
+F 0 "R10" V 8180 5250 50  0000 C CNN
 F 1 "5,6K" V 8100 5250 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 8226 5259 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 8226 5259 20  0000 C CNN
 F 3 "" H 8100 5250 60  0001 C CNN
 	1    8100 5250
 	1    0    0    -1  
@@ -190,7 +190,7 @@ U 1 1 4B4F364A
 P 2850 2450
 AR Path="/4B3A1333/4B4F364A" Ref="#PWR036"  Part="1" 
 AR Path="/4B3A13A4/4B4F364A" Ref="#PWR020"  Part="1" 
-F 0 "#PWR020" H 2850 2450 30  0001 C CNN
+F 0 "#PWR036" 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
@@ -203,9 +203,9 @@ U 1 1 4B4F3641
 P 2850 2250
 AR Path="/4B3A1333/4B4F3641" Ref="C12"  Part="1" 
 AR Path="/4B3A13A4/4B4F3641" Ref="C14"  Part="1" 
-F 0 "C14" H 3000 2300 50  0000 L CNN
+F 0 "C12" H 3000 2300 50  0000 L CNN
 F 1 "150nF" H 3000 2200 50  0000 L CNN
-F 2 "Discret:C2" H 3100 2100 60  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" H 3150 2150 15  0000 C CNN
 F 3 "" H 2850 2250 60  0001 C CNN
 	1    2850 2250
 	1    0    0    -1  
@@ -216,9 +216,9 @@ U 1 1 4B4F363E
 P 2450 2000
 AR Path="/4B3A1333/4B4F363E" Ref="R23"  Part="1" 
 AR Path="/4B3A13A4/4B4F363E" Ref="R24"  Part="1" 
-F 0 "R24" V 2350 2000 50  0000 C CNN
+F 0 "R23" V 2350 2000 50  0000 C CNN
 F 1 "1K" V 2450 2000 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 2300 2000 30  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 2300 2000 15  0000 C CNN
 F 3 "" H 2450 2000 60  0001 C CNN
 	1    2450 2000
 	0    1    1    0   
@@ -229,7 +229,7 @@ U 1 1 4B4B1086
 P 6300 5850
 AR Path="/4B3A13A4/4B4B1086" Ref="#PWR021"  Part="1" 
 AR Path="/4B3A1333/4B4B1086" Ref="#PWR037"  Part="1" 
-F 0 "#PWR021" H 6300 5950 20  0001 C CNN
+F 0 "#PWR037" H 6300 5950 20  0001 C CNN
 F 1 "-VAA" H 6300 5950 40  0000 C CNN
 F 2 "" H 6300 5850 60  0001 C CNN
 F 3 "" H 6300 5850 60  0001 C CNN
@@ -242,7 +242,7 @@ U 1 1 4B4B1080
 P 4750 2850
 AR Path="/4B3A13A4/4B4B1080" Ref="#PWR022"  Part="1" 
 AR Path="/4B3A1333/4B4B1080" Ref="#PWR038"  Part="1" 
-F 0 "#PWR022" H 4750 2950 20  0001 C CNN
+F 0 "#PWR038" H 4750 2950 20  0001 C CNN
 F 1 "-VAA" H 4750 2950 40  0000 C CNN
 F 2 "" H 4750 2850 60  0001 C CNN
 F 3 "" H 4750 2850 60  0001 C CNN
@@ -261,7 +261,7 @@ U 1 1 4B3A137D
 P 8500 3700
 AR Path="/4B3A13A4/4B3A137D" Ref="Q6"  Part="1" 
 AR Path="/4B3A1333/4B3A137D" Ref="Q2"  Part="1" 
-F 0 "Q6" H 8500 3950 50  0000 R CNN
+F 0 "Q2" H 8500 3950 50  0000 R CNN
 F 1 "MPAS42" H 8500 3850 50  0000 R CNN
 F 2 "Discret:TO92-CBE" H 8300 3800 20  0000 C CNN
 F 3 "" H 8500 3700 60  0001 C CNN
@@ -274,7 +274,7 @@ U 1 1 4B3A137C
 P 8500 4800
 AR Path="/4B3A13A4/4B3A137C" Ref="Q7"  Part="1" 
 AR Path="/4B3A1333/4B3A137C" Ref="Q3"  Part="1" 
-F 0 "Q7" H 8500 4650 60  0000 R CNN
+F 0 "Q3" H 8500 4650 60  0000 R CNN
 F 1 "MPAS92" H 8500 4950 60  0000 R CNN
 F 2 "Discret:TO92-CBE" H 8450 5000 20  0000 C CNN
 F 3 "" H 8500 4800 60  0001 C CNN
@@ -287,9 +287,9 @@ U 1 1 4B3A137B
 P 7900 4500
 AR Path="/4B3A13A4/4B3A137B" Ref="D7"  Part="1" 
 AR Path="/4B3A1333/4B3A137B" Ref="D4"  Part="1" 
-F 0 "D7" V 7850 4700 50  0000 C CNN
+F 0 "D4" V 7850 4700 50  0000 C CNN
 F 1 "1N4148" V 7950 4700 50  0000 C CNN
-F 2 "Discret:D3" H 7906 4432 20  0000 C CNN
+F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 7906 4432 10  0000 C CNN
 F 3 "" H 7900 4500 60  0001 C CNN
 	1    7900 4500
 	0    -1   -1   0   
@@ -300,7 +300,7 @@ U 1 1 4B3A137A
 P 8600 5300
 AR Path="/4B3A13A4/4B3A137A" Ref="#PWR023"  Part="1" 
 AR Path="/4B3A1333/4B3A137A" Ref="#PWR039"  Part="1" 
-F 0 "#PWR023" H 8600 5300 30  0001 C CNN
+F 0 "#PWR039" H 8600 5300 30  0001 C CNN
 F 1 "GND" H 8600 5230 30  0001 C CNN
 F 2 "" H 8600 5300 60  0001 C CNN
 F 3 "" H 8600 5300 60  0001 C CNN
@@ -313,7 +313,7 @@ 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 "Q8" H 7800 4950 50  0000 R CNN
+F 0 "Q4" H 7800 4950 50  0000 R CNN
 F 1 "MPAS42" H 7800 5250 50  0000 R CNN
 F 2 "Discret:TO92-CBE" H 7750 4900 20  0000 C CNN
 F 3 "" H 7800 5100 60  0001 C CNN
@@ -326,7 +326,7 @@ U 1 1 4B3A1378
 P 7000 5200
 AR Path="/4B3A13A4/4B3A1378" Ref="#PWR024"  Part="1" 
 AR Path="/4B3A1333/4B3A1378" Ref="#PWR040"  Part="1" 
-F 0 "#PWR024" H 7000 5200 30  0001 C CNN
+F 0 "#PWR040" H 7000 5200 30  0001 C CNN
 F 1 "GND" H 7000 5130 30  0001 C CNN
 F 2 "" H 7000 5200 60  0001 C CNN
 F 3 "" H 7000 5200 60  0001 C CNN
@@ -339,9 +339,9 @@ U 1 1 4B3A1377
 P 7300 3100
 AR Path="/4B3A13A4/4B3A1377" Ref="D6"  Part="1" 
 AR Path="/4B3A1333/4B3A1377" Ref="D3"  Part="1" 
-F 0 "D6" V 7250 3300 50  0000 C CNN
+F 0 "D3" V 7250 3300 50  0000 C CNN
 F 1 "1N4148" V 7350 3300 50  0000 C CNN
-F 2 "Discret:D3" V 7200 3300 20  0000 C CNN
+F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" V 7200 3300 10  0000 C CNN
 F 3 "" H 7300 3100 60  0001 C CNN
 	1    7300 3100
 	0    -1   -1   0   
@@ -352,9 +352,9 @@ U 1 1 4B3A1376
 P 7900 2750
 AR Path="/4B3A13A4/4B3A1376" Ref="R13"  Part="1" 
 AR Path="/4B3A1333/4B3A1376" Ref="R3"  Part="1" 
-F 0 "R13" V 7980 2750 50  0000 C CNN
+F 0 "R3" V 7980 2750 50  0000 C CNN
 F 1 "470" V 7900 2750 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 8031 2758 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 8031 2758 10  0000 C CNN
 F 3 "" H 7900 2750 60  0001 C CNN
 	1    7900 2750
 	1    0    0    -1  
@@ -365,9 +365,9 @@ U 1 1 4B3A1375
 P 7300 2800
 AR Path="/4B3A13A4/4B3A1375" Ref="D5"  Part="1" 
 AR Path="/4B3A1333/4B3A1375" Ref="D2"  Part="1" 
-F 0 "D5" V 7250 3000 50  0000 C CNN
+F 0 "D2" V 7250 3000 50  0000 C CNN
 F 1 "1N4148" V 7350 3000 50  0000 C CNN
-F 2 "Discret:D3" V 7450 3000 20  0000 C CNN
+F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" V 7450 3000 10  0000 C CNN
 F 3 "" H 7300 2800 60  0001 C CNN
 	1    7300 2800
 	0    -1   -1   0   
@@ -378,9 +378,9 @@ U 1 1 4B3A1374
 P 7300 3600
 AR Path="/4B3A13A4/4B3A1374" Ref="R14"  Part="1" 
 AR Path="/4B3A1333/4B3A1374" Ref="R4"  Part="1" 
-F 0 "R14" V 7380 3600 50  0000 C CNN
+F 0 "R4" V 7380 3600 50  0000 C CNN
 F 1 "220K" V 7300 3600 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 7200 3600 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 7200 3600 10  0000 C CNN
 F 3 "" H 7300 3600 60  0001 C CNN
 	1    7300 3600
 	1    0    0    -1  
@@ -391,7 +391,7 @@ U 1 1 4B3A1373
 P 7300 3850
 AR Path="/4B3A13A4/4B3A1373" Ref="#PWR025"  Part="1" 
 AR Path="/4B3A1333/4B3A1373" Ref="#PWR041"  Part="1" 
-F 0 "#PWR025" H 7300 3850 30  0001 C CNN
+F 0 "#PWR041" H 7300 3850 30  0001 C CNN
 F 1 "GND" H 7300 3780 30  0001 C CNN
 F 2 "" H 7300 3850 60  0001 C CNN
 F 3 "" H 7300 3850 60  0001 C CNN
@@ -404,9 +404,9 @@ 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 "R18" V 7150 5100 50  0000 C CNN
+F 0 "R8" V 7150 5100 50  0000 C CNN
 F 1 "1K" V 7250 5100 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 7100 5100 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 7100 5100 20  0000 C CNN
 F 3 "" H 7250 5100 60  0001 C CNN
 	1    7250 5100
 	0    1    1    0   
@@ -417,9 +417,9 @@ U 1 1 4B3A1370
 P 8900 5100
 AR Path="/4B3A13A4/4B3A1370" Ref="R22"  Part="1" 
 AR Path="/4B3A1333/4B3A1370" Ref="R12"  Part="1" 
-F 0 "R22" V 9000 5100 50  0000 C CNN
+F 0 "R12" V 9000 5100 50  0000 C CNN
 F 1 "220K" V 8900 5100 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 9000 5100 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 9000 5100 20  0000 C CNN
 F 3 "" H 8900 5100 60  0001 C CNN
 	1    8900 5100
 	-1   0    0    1   
@@ -430,7 +430,7 @@ U 1 1 4B3A136F
 P 6300 4950
 AR Path="/4B3A13A4/4B3A136F" Ref="#U026"  Part="1" 
 AR Path="/4B3A1333/4B3A136F" Ref="#U042"  Part="1" 
-F 0 "#U026" H 6300 4900 20  0001 C CNN
+F 0 "#U042" H 6300 4900 20  0001 C CNN
 F 1 "+12V" H 6300 5050 40  0000 C CNN
 F 2 "" H 6300 4950 60  0001 C CNN
 F 3 "" H 6300 4950 60  0001 C CNN
@@ -443,9 +443,9 @@ 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 "R19" V 7300 5400 50  0000 C CNN
+F 0 "R9" V 7300 5400 50  0000 C CNN
 F 1 "1K" V 7400 5400 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 7500 5400 30  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 7475 5422 15  0000 C CNN
 F 3 "" H 7400 5400 60  0001 C CNN
 	1    7400 5400
 	0    1    1    0   
@@ -456,7 +456,7 @@ U 1 1 4B3A136C
 P 10750 4400
 AR Path="/4B3A13A4/4B3A136C" Ref="P5"  Part="1" 
 AR Path="/4B3A1333/4B3A136C" Ref="P3"  Part="1" 
-F 0 "P5" V 10700 4400 40  0000 C CNN
+F 0 "P3" V 10700 4400 40  0000 C CNN
 F 1 "CONN_2" V 10800 4400 40  0000 C CNN
 F 2 "Connect:bornier2" H 10750 4200 20  0000 C CNN
 F 3 "" H 10750 4400 60  0001 C CNN
@@ -471,9 +471,9 @@ U 1 1 4B3A136B
 P 3250 2000
 AR Path="/4B3A13A4/4B3A136B" Ref="R16"  Part="1" 
 AR Path="/4B3A1333/4B3A136B" Ref="R6"  Part="1" 
-F 0 "R16" V 3150 2000 50  0000 C CNN
+F 0 "R6" V 3150 2000 50  0000 C CNN
 F 1 "22K" V 3250 2000 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 3100 1950 30  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 3350 2050 15  0000 C CNN
 F 3 "" H 3250 2000 60  0001 C CNN
 	1    3250 2000
 	0    1    1    0   
@@ -484,7 +484,7 @@ U 1 1 4B3A136A
 P 1800 2250
 AR Path="/4B3A13A4/4B3A136A" Ref="#PWR027"  Part="1" 
 AR Path="/4B3A1333/4B3A136A" Ref="#PWR043"  Part="1" 
-F 0 "#PWR027" H 1800 2250 30  0001 C CNN
+F 0 "#PWR043" H 1800 2250 30  0001 C CNN
 F 1 "GND" H 1800 2180 30  0001 C CNN
 F 2 "" H 1800 2250 60  0001 C CNN
 F 3 "" H 1800 2250 60  0001 C CNN
@@ -497,7 +497,7 @@ U 1 1 4B3A1369
 P 4000 2750
 AR Path="/4B3A13A4/4B3A1369" Ref="#PWR028"  Part="1" 
 AR Path="/4B3A1333/4B3A1369" Ref="#PWR044"  Part="1" 
-F 0 "#PWR028" H 4000 2750 30  0001 C CNN
+F 0 "#PWR044" H 4000 2750 30  0001 C CNN
 F 1 "GND" H 4000 2680 30  0001 C CNN
 F 2 "" H 4000 2750 60  0001 C CNN
 F 3 "" H 4000 2750 60  0001 C CNN
@@ -510,9 +510,9 @@ 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 "U4" H 6450 5600 60  0000 C CNN
+F 0 "U3" H 6450 5600 60  0000 C CNN
 F 1 "LM358N" H 6550 5200 50  0000 C CNN
-F 2 "Housings_DIP:DIP-8_W7.62mm_LongPads" H 6650 5150 20  0000 C CNN
+F 2 "Package_DIP:DIP-8_W7.62mm_LongPads" H 6650 5150 20  0000 C CNN
 F 3 "" H 6400 5400 60  0001 C CNN
 	1    6400 5400
 	1    0    0    -1  
@@ -523,9 +523,9 @@ U 1 1 4B3A1367
 P 1350 2100
 AR Path="/4B3A13A4/4B3A1367" Ref="P6"  Part="1" 
 AR Path="/4B3A1333/4B3A1367" Ref="P4"  Part="1" 
-F 0 "P6" V 1300 2100 40  0000 C CNN
+F 0 "P4" V 1300 2100 40  0000 C CNN
 F 1 "CONN_2" V 1400 2100 40  0000 C CNN
-F 2 "Connect:bornier2" H 1300 1900 60  0000 C CNN
+F 2 "Connect:bornier2" H 1300 1900 20  0000 C CNN
 F 3 "" H 1350 2100 60  0001 C CNN
 	1    1350 2100
 	-1   0    0    -1  
@@ -536,9 +536,9 @@ U 1 1 4B3A1366
 P 4000 2550
 AR Path="/4B3A13A4/4B3A1366" Ref="C7"  Part="1" 
 AR Path="/4B3A1333/4B3A1366" Ref="C4"  Part="1" 
-F 0 "C7" H 4100 2650 50  0000 L CNN
+F 0 "C4" H 4100 2650 50  0000 L CNN
 F 1 "4.7nF" H 4100 2450 50  0000 L CNN
-F 2 "Discret:C2" H 4150 2400 30  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" H 4150 2400 10  0000 C CNN
 F 3 "" H 4000 2550 60  0001 C CNN
 	1    4000 2550
 	1    0    0    -1  
@@ -549,9 +549,9 @@ 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 "C8" H 8150 5850 50  0000 L CNN
+F 0 "C5" H 8150 5850 50  0000 L CNN
 F 1 "820pF" H 8150 5650 50  0000 L CNN
-F 2 "Discret:C2" H 8268 5564 30  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" H 8300 5600 15  0000 C CNN
 F 3 "" H 8100 5750 60  0001 C CNN
 	1    8100 5750
 	1    0    0    -1  
@@ -562,9 +562,9 @@ U 1 1 4B3A1364
 P 9450 4150
 AR Path="/4B3A13A4/4B3A1364" Ref="R15"  Part="1" 
 AR Path="/4B3A1333/4B3A1364" Ref="R5"  Part="1" 
-F 0 "R15" V 9530 4150 50  0000 C CNN
+F 0 "R5" V 9530 4150 50  0000 C CNN
 F 1 "47" V 9450 4150 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 9400 4150 20  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 9400 4150 20  0000 C CNN
 F 3 "" H 9450 4150 60  0001 C CNN
 	1    9450 4150
 	0    1    1    0   
@@ -575,7 +575,7 @@ U 1 1 4B3A1363
 P 10250 4550
 AR Path="/4B3A13A4/4B3A1363" Ref="#PWR029"  Part="1" 
 AR Path="/4B3A1333/4B3A1363" Ref="#PWR045"  Part="1" 
-F 0 "#PWR029" H 10250 4550 30  0001 C CNN
+F 0 "#PWR045" H 10250 4550 30  0001 C CNN
 F 1 "GND" H 10250 4480 30  0001 C CNN
 F 2 "" H 10250 4550 60  0001 C CNN
 F 3 "" H 10250 4550 60  0001 C CNN
@@ -588,9 +588,9 @@ U 1 1 4B3A1362
 P 5250 6400
 AR Path="/4B3A13A4/4B3A1362" Ref="R21"  Part="1" 
 AR Path="/4B3A1333/4B3A1362" Ref="R11"  Part="1" 
-F 0 "R21" V 5150 6400 50  0000 C CNN
+F 0 "R11" V 5150 6400 50  0000 C CNN
 F 1 "4,7K" V 5250 6400 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 5100 6400 30  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 5100 6400 15  0000 C CNN
 F 3 "" H 5250 6400 60  0001 C CNN
 	1    5250 6400
 	0    1    1    0   
@@ -601,7 +601,7 @@ U 1 1 4B3A1361
 P 5050 6400
 AR Path="/4B3A13A4/4B3A1361" Ref="#PWR030"  Part="1" 
 AR Path="/4B3A1333/4B3A1361" Ref="#PWR046"  Part="1" 
-F 0 "#PWR030" H 5050 6400 30  0001 C CNN
+F 0 "#PWR046" H 5050 6400 30  0001 C CNN
 F 1 "GND" H 5050 6330 30  0001 C CNN
 F 2 "" H 5050 6400 60  0001 C CNN
 F 3 "" H 5050 6400 60  0001 C CNN
@@ -614,7 +614,7 @@ U 1 1 4B3A1360
 P 7800 3300
 AR Path="/4B3A13A4/4B3A1360" Ref="Q5"  Part="1" 
 AR Path="/4B3A1333/4B3A1360" Ref="Q1"  Part="1" 
-F 0 "Q5" H 7800 3150 60  0000 R CNN
+F 0 "Q1" H 7800 3150 60  0000 R CNN
 F 1 "MPAS92" H 7800 3450 60  0000 R CNN
 F 2 "Discret:TO92-CBE" H 7750 3100 20  0000 C CNN
 F 3 "" H 7800 3300 60  0001 C CNN
@@ -627,7 +627,7 @@ U 1 1 4B3A135F
 P 7300 2650
 AR Path="/4B3A13A4/4B3A135F" Ref="#PWR031"  Part="1" 
 AR Path="/4B3A1333/4B3A135F" Ref="#PWR047"  Part="1" 
-F 0 "#PWR031" H 7300 2770 20  0001 C CNN
+F 0 "#PWR047" H 7300 2770 20  0001 C CNN
 F 1 "HT" H 7300 2740 40  0000 C CNN
 F 2 "" H 7300 2650 60  0001 C CNN
 F 3 "" H 7300 2650 60  0001 C CNN
@@ -640,7 +640,7 @@ U 1 1 4B3A135E
 P 7900 2550
 AR Path="/4B3A13A4/4B3A135E" Ref="#PWR032"  Part="1" 
 AR Path="/4B3A1333/4B3A135E" Ref="#PWR048"  Part="1" 
-F 0 "#PWR032" H 7900 2670 20  0001 C CNN
+F 0 "#PWR048" H 7900 2670 20  0001 C CNN
 F 1 "HT" H 7900 2640 40  0000 C CNN
 F 2 "" H 7900 2550 60  0001 C CNN
 F 3 "" H 7900 2550 60  0001 C CNN
@@ -653,7 +653,7 @@ U 1 1 4B3A135D
 P 8600 3300
 AR Path="/4B3A13A4/4B3A135D" Ref="#PWR033"  Part="1" 
 AR Path="/4B3A1333/4B3A135D" Ref="#PWR049"  Part="1" 
-F 0 "#PWR033" H 8600 3420 20  0001 C CNN
+F 0 "#PWR049" H 8600 3420 20  0001 C CNN
 F 1 "HT" H 8600 3390 40  0000 C CNN
 F 2 "" H 8600 3300 60  0001 C CNN
 F 3 "" H 8600 3300 60  0001 C CNN
@@ -666,9 +666,9 @@ 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 "U4" H 4900 2600 60  0000 C CNN
+F 0 "U3" H 4900 2600 60  0000 C CNN
 F 1 "LM358N" H 5000 2200 50  0000 C CNN
-F 2 "Housings_DIP:DIP-8_W7.62mm_LongPads" H 5100 2150 20  0000 C CNN
+F 2 "Package_DIP:DIP-8_W7.62mm_LongPads" H 5100 2150 20  0000 C CNN
 F 3 "" H 4850 2400 60  0001 C CNN
 	2    4850 2400
 	1    0    0    -1  
@@ -679,7 +679,7 @@ U 1 1 4B3A135B
 P 4750 1950
 AR Path="/4B3A13A4/4B3A135B" Ref="#U034"  Part="1" 
 AR Path="/4B3A1333/4B3A135B" Ref="#U050"  Part="1" 
-F 0 "#U034" H 4750 1900 20  0001 C CNN
+F 0 "#U050" H 4750 1900 20  0001 C CNN
 F 1 "+12V" H 4750 2050 40  0000 C CNN
 F 2 "" H 4750 1950 60  0001 C CNN
 F 3 "" H 4750 1950 60  0001 C CNN
@@ -692,9 +692,9 @@ U 1 1 4B3A1359
 P 3950 2000
 AR Path="/4B3A13A4/4B3A1359" Ref="R17"  Part="1" 
 AR Path="/4B3A1333/4B3A1359" Ref="R7"  Part="1" 
-F 0 "R17" V 3850 2000 50  0000 C CNN
+F 0 "R7" V 3850 2000 50  0000 C CNN
 F 1 "22K" V 3950 2000 50  0000 C CNN
-F 2 "Discret:R3-LARGE_PADS" V 3800 2000 30  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" V 3800 2000 15  0000 C CNN
 F 3 "" H 3950 2000 60  0001 C CNN
 	1    3950 2000
 	0    1    1    0   
@@ -705,9 +705,9 @@ 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 "C6" V 4200 1600 50  0000 C CNN
+F 0 "C3" V 4200 1600 50  0000 C CNN
 F 1 "15nF" V 4500 1600 50  0000 C CNN
-F 2 "Discret:C2" V 4100 1600 60  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" V 4150 1600 15  0000 C CNN
 F 3 "" H 4350 1600 60  0001 C CNN
 	1    4350 1600
 	0    1    1    0   
@@ -720,7 +720,7 @@ 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 "RV2" H 5850 6300 50  0000 C CNN
+F 0 "RV1" H 5850 6300 50  0000 C CNN
 F 1 "4,7K" H 5850 6400 50  0000 C CNN
 F 2 "Discret:RV2" H 5850 6250 30  0000 C CNN
 F 3 "" H 5850 6400 60  0001 C CNN
@@ -730,17 +730,17 @@ $EndComp
 Wire Wire Line
 	7900 4100 7900 4400
 Wire Wire Line
-	8600 4450 9300 4450
+	8600 4450 8900 4450
 Wire Wire Line
 	8600 4450 8600 4600
 Wire Wire Line
-	8600 4150 9300 4150
+	8600 4150 9100 4150
 Wire Wire Line
 	8600 4150 8600 3900
 Wire Wire Line
 	2850 2450 2850 2400
 Wire Wire Line
-	4350 2000 4350 2300
+	4350 2000 4350 2200
 Wire Wire Line
 	4350 2200 4000 2200
 Wire Wire Line
@@ -757,7 +757,7 @@ Wire Wire Line
 Wire Wire Line
 	7900 2550 7900 2600
 Wire Wire Line
-	7900 4800 8300 4800
+	7900 4800 8100 4800
 Connection ~ 7900 4800
 Wire Wire Line
 	8100 5900 8100 5950
@@ -771,4 +771,30 @@ Wire Wire Line
 	7100 5100 7000 5100
 Wire Wire Line
 	7300 3000 7300 2900
+Wire Wire Line
+	9100 4150 9300 4150
+Wire Wire Line
+	7300 3300 7300 3450
+Wire Wire Line
+	5450 2400 5450 1600
+Wire Wire Line
+	7900 3700 7900 3900
+Wire Wire Line
+	3600 2000 3800 2000
+Wire Wire Line
+	2850 2000 3100 2000
+Wire Wire Line
+	5150 3000 5450 3000
+Wire Wire Line
+	8100 4800 8300 4800
+Wire Wire Line
+	9800 4300 9800 4450
+Wire Wire Line
+	8900 4450 9300 4450
+Wire Wire Line
+	8900 5400 8900 6400
+Wire Wire Line
+	4350 2200 4350 2300
+Wire Wire Line
+	7900 4800 7900 4900
 $EndSCHEMATC
diff --git a/demos/complex_hierarchy/complex_hierarchy-cache.lib b/demos/complex_hierarchy/complex_hierarchy-cache.lib
index 623acf4cfe..f671bcaf52 100644
--- a/demos/complex_hierarchy/complex_hierarchy-cache.lib
+++ b/demos/complex_hierarchy/complex_hierarchy-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# +12C
+# complex_hierarchy_schlib:+12C
 #
-DEF +12C #PWR 0 0 Y Y 1 F P
+DEF complex_hierarchy_schlib:+12C #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12C" 0 150 50 H V C CNN
+F1 "complex_hierarchy_schlib:+12C" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -16,11 +16,11 @@ X +12C 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# +12V
+# complex_hierarchy_schlib:+12V
 #
-DEF +12V #PWR 0 0 Y Y 1 F P
+DEF complex_hierarchy_schlib:+12V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12V" 0 140 50 H V C CNN
+F1 "complex_hierarchy_schlib:+12V" 0 140 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -31,11 +31,11 @@ X +12V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# -VAA
+# complex_hierarchy_schlib:-VAA
 #
-DEF -VAA #PWR 0 0 Y Y 1 F P
+DEF complex_hierarchy_schlib:-VAA #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 20 H I C CNN
-F1 "-VAA" 0 100 30 H V C CNN
+F1 "complex_hierarchy_schlib:-VAA" 0 100 30 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -45,11 +45,11 @@ X -VAA 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# 7805
+# complex_hierarchy_schlib:7805
 #
-DEF 7805 U 0 30 N Y 1 F N
+DEF complex_hierarchy_schlib:7805 U 0 30 N Y 1 F N
 F0 "U" 150 -196 60 H V C CNN
-F1 "7805" 0 200 60 H V C CNN
+F1 "complex_hierarchy_schlib:7805" 0 200 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 ALIAS LM7805 LM7812 78L05
@@ -61,11 +61,11 @@ X VO VO 400 50 200 L 40 40 1 1 w
 ENDDRAW
 ENDDEF
 #
-# C
+# complex_hierarchy_schlib:C
 #
-DEF C C 0 10 N Y 1 F N
+DEF complex_hierarchy_schlib:C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
+F1 "complex_hierarchy_schlib:C" 25 -100 50 H V L CNN
 F2 "" 38 -150 30 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -83,11 +83,11 @@ X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_2
+# complex_hierarchy_schlib:CONN_2
 #
-DEF CONN_2 P 0 40 Y N 1 F N
+DEF complex_hierarchy_schlib:CONN_2 P 0 40 Y N 1 F N
 F0 "P" -50 0 40 V V C CNN
-F1 "CONN_2" 50 0 40 V V C CNN
+F1 "complex_hierarchy_schlib:CONN_2" 50 0 40 V V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -97,11 +97,11 @@ X PM 2 -350 -100 250 R 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
-# CP
+# complex_hierarchy_schlib:CP
 #
-DEF CP C 0 10 N Y 1 F N
+DEF complex_hierarchy_schlib:CP C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "CP" 25 -100 50 H V L CNN
+F1 "complex_hierarchy_schlib:CP" 25 -100 50 H V L CNN
 F2 "" 38 -150 30 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -125,11 +125,11 @@ X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Small
+# complex_hierarchy_schlib:D_Small
 #
-DEF D_Small D 0 10 N N 1 F N
+DEF complex_hierarchy_schlib:D_Small D 0 10 N N 1 F N
 F0 "D" -50 80 50 H V L CNN
-F1 "D_Small" -150 -80 50 H V L CNN
+F1 "complex_hierarchy_schlib:D_Small" -150 -80 50 H V L CNN
 F2 "" 0 0 60 V V C CNN
 F3 "" 0 0 60 V V C CNN
 $FPLIST
@@ -147,11 +147,11 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GND
+# complex_hierarchy_schlib:GND
 #
-DEF GND #PWR 0 0 Y Y 1 F P
+DEF complex_hierarchy_schlib:GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "GND" 0 -123 30 H V C CNN
+F1 "complex_hierarchy_schlib:GND" 0 -123 30 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -160,11 +160,11 @@ X GND 1 0 0 0 D 20 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# HT
+# complex_hierarchy_schlib:HT
 #
-DEF HT #PWR 0 0 Y Y 1 F P
+DEF complex_hierarchy_schlib:HT #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 120 50 H I C CNN
-F1 "HT" 0 90 50 H V C CNN
+F1 "complex_hierarchy_schlib:HT" 0 90 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -174,11 +174,11 @@ X HT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# ICL7660
+# complex_hierarchy_schlib:ICL7660
 #
-DEF ICL7660 U 0 40 Y Y 1 F N
+DEF complex_hierarchy_schlib:ICL7660 U 0 40 Y Y 1 F N
 F0 "U" 200 400 70 H V L CNN
-F1 "ICL7660" 50 -450 70 H V L CNN
+F1 "complex_hierarchy_schlib:ICL7660" 50 -450 70 H V L CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -193,11 +193,11 @@ X V+ 8 -50 650 300 D 60 60 1 1 W
 ENDDRAW
 ENDDEF
 #
-# LM358
+# complex_hierarchy_schlib:LM358N
 #
-DEF LM358 U 0 20 Y Y 2 F N
+DEF complex_hierarchy_schlib:LM358N U 0 20 Y Y 2 F N
 F0 "U" -50 200 60 H V L CNN
-F1 "LM358" -50 -250 60 H V L CNN
+F1 "complex_hierarchy_schlib:LM358N" -50 -250 60 H V L CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 ALIAS LMC6062 LMC6082 LM358N TL072 TL082
@@ -214,11 +214,11 @@ X ~ 7 500 0 300 L 40 40 2 1 O
 ENDDRAW
 ENDDEF
 #
-# MPSA42
+# complex_hierarchy_schlib:MPSA42
 #
-DEF MPSA42 Q 0 40 Y N 1 F N
+DEF complex_hierarchy_schlib:MPSA42 Q 0 40 Y N 1 F N
 F0 "Q" 150 -150 60 H V L CNN
-F1 "MPSA42" 150 150 60 H V L CNN
+F1 "complex_hierarchy_schlib:MPSA42" 150 150 60 H V L CNN
 F2 "TO92-CBE" 150 0 30 H I C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -237,11 +237,11 @@ X E E 100 -200 100 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MPSA92
+# complex_hierarchy_schlib:MPSA92
 #
-DEF MPSA92 Q 0 40 Y N 1 F N
+DEF complex_hierarchy_schlib:MPSA92 Q 0 40 Y N 1 F N
 F0 "Q" 150 -150 60 H V L CNN
-F1 "MPSA92" 150 150 60 H V L CNN
+F1 "complex_hierarchy_schlib:MPSA92" 150 150 60 H V L CNN
 F2 "TO92-CBE" 150 0 30 H I C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -260,11 +260,11 @@ X E E 100 -200 100 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# POT
+# complex_hierarchy_schlib:POT
 #
-DEF POT RV 0 40 Y N 1 F N
+DEF complex_hierarchy_schlib:POT RV 0 40 Y N 1 F N
 F0 "RV" 0 -100 50 H V C CNN
-F1 "POT" 0 0 50 H V C CNN
+F1 "complex_hierarchy_schlib:POT" 0 0 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -276,11 +276,11 @@ X 3 3 250 0 100 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# PWR_FLAG
+# complex_hierarchy_schlib:PWR_FLAG
 #
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
+DEF complex_hierarchy_schlib:PWR_FLAG #FLG 0 0 N N 1 F P
 F0 "#FLG" 0 95 50 H I C CNN
-F1 "PWR_FLAG" 0 180 50 H V C CNN
+F1 "complex_hierarchy_schlib:PWR_FLAG" 0 180 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -289,11 +289,11 @@ X pwr 1 0 0 0 U 20 20 0 0 w
 ENDDRAW
 ENDDEF
 #
-# R
+# complex_hierarchy_schlib:R
 #
-DEF R R 0 0 N Y 1 F N
+DEF complex_hierarchy_schlib:R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "complex_hierarchy_schlib:R" 0 0 50 V V C CNN
 F2 "" -70 0 30 V V C CNN
 F3 "" 0 0 30 H V C CNN
 $FPLIST
@@ -307,11 +307,11 @@ X ~ 2 0 -150 50 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VCC
+# complex_hierarchy_schlib:VCC
 #
-DEF VCC #PWR 0 0 Y Y 1 F P
+DEF complex_hierarchy_schlib:VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VCC" 0 150 50 H V C CNN
+F1 "complex_hierarchy_schlib:VCC" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
diff --git a/demos/complex_hierarchy/complex_hierarchy.kicad_pcb b/demos/complex_hierarchy/complex_hierarchy.kicad_pcb
index 093e25cdfa..d025d9e153 100644
--- a/demos/complex_hierarchy/complex_hierarchy.kicad_pcb
+++ b/demos/complex_hierarchy/complex_hierarchy.kicad_pcb
@@ -1,9 +1,6 @@
-(kicad_pcb (version 20160815) (host pcbnew "(2017-01-12 revision 9bc2bb2)-master")
+(kicad_pcb (version 20171130) (host pcbnew "(2018-01-12 revision d8e38d6)-master")
 
   (general
-    (links 112)
-    (no_connects 0)
-    (area 88.163399 51.714399 188.696601 131.927601)
     (thickness 1.6002)
     (drawings 6)
     (tracks 360)
@@ -22,6 +19,8 @@
   (layers
     (0 Composant power)
     (31 Cuivre signal)
+    (32 B.Adhes user)
+    (33 F.Adhes user)
     (34 B.Paste user)
     (35 F.Paste user)
     (36 B.SilkS user)
@@ -33,6 +32,10 @@
     (42 Eco1.User user)
     (43 Eco2.User user)
     (44 Edge.Cuts user)
+    (45 Margin user)
+    (47 F.CrtYd user)
+    (48 B.Fab user)
+    (49 F.Fab user)
   )
 
   (setup
@@ -66,6 +69,8 @@
       (layerselection 0x000fc_80000001)
       (usegerberextensions false)
       (usegerberattributes true)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
       (excludeedgelayer false)
       (linewidth 0.150000)
       (plotframeref false)
@@ -135,13 +140,13 @@
   (net 43 VCC)
   (net 44 "Net-(U1-Pad6)")
   (net 45 "Net-(U1-Pad7)")
-  (net 46 +12V)
-  (net 47 "Net-(D2-Pad1)")
-  (net 48 "Net-(D3-Pad1)")
-  (net 49 "Net-(D5-Pad1)")
-  (net 50 "Net-(D6-Pad1)")
-  (net 51 "Net-(D8-Pad2)")
-  (net 52 "Net-(D9-Pad2)")
+  (net 46 "Net-(D2-Pad1)")
+  (net 47 "Net-(D3-Pad1)")
+  (net 48 "Net-(D5-Pad1)")
+  (net 49 "Net-(D6-Pad1)")
+  (net 50 "Net-(D8-Pad2)")
+  (net 51 "Net-(D9-Pad2)")
+  (net 52 +12C)
 
   (net_class Default "Ceci est la Netclass par défaut"
     (clearance 0.3)
@@ -150,7 +155,7 @@
     (via_drill 0.635)
     (uvia_dia 0.508)
     (uvia_drill 0.2032)
-    (add_net +12V)
+    (add_net +12C)
     (add_net /ampli_ht_horizontal/PIEZO_IN)
     (add_net /ampli_ht_horizontal/PIEZO_OUT)
     (add_net /ampli_ht_horizontal/S_OUT+)
@@ -213,6 +218,2016 @@
     (add_net VCC)
   )
 
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A5987A9)
+    (at 145.415 97.536 90)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A13A4/4B616AFA)
+    (fp_text reference D9 (at 3.81 -2.12 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 4.11 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 51 "Net-(D9-Pad2)"))
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 26 "Net-(D7-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A59878B)
+    (at 140.97 123.571 90)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A1333/4B3A137B)
+    (fp_text reference D4 (at 3.81 -2.12 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 4.11 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 23 "Net-(D4-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 24 "Net-(D4-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A59876D)
+    (at 132.715 82.296 180)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A13A4/4B3A1377)
+    (fp_text reference D6 (at 3.81 -2.12 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 4.11 0 180) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 48 "Net-(D5-Pad1)"))
+    (pad 1 thru_hole rect (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 49 "Net-(D6-Pad1)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A59874F)
+    (at 141.605 97.536 90)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A13A4/4B3A137B)
+    (fp_text reference D7 (at 3.81 -2.12 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 4.11 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 25 "Net-(D7-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 26 "Net-(D7-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A598731)
+    (at 127.635 108.966)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A1333/4B3A1377)
+    (fp_text reference D3 (at 3.81 -2.12) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 4.11 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 46 "Net-(D2-Pad1)"))
+    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 47 "Net-(D3-Pad1)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A598713)
+    (at 127.635 106.426)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A1333/4B3A1375)
+    (fp_text reference D2 (at 3.81 -2.12) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 4.11 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_text user K (at 0 -1.8) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 46 "Net-(D2-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 12 HT))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A5986F5)
+    (at 144.78 123.571 90)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A1333/4B616AFA)
+    (fp_text reference D8 (at 3.81 -2.12 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 4.11 0 90) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 50 "Net-(D8-Pad2)"))
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 24 "Net-(D4-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A5986D7)
+    (at 125.095 79.756)
+    (descr "D, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
+    (tags "D DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (path /4B3A13A4/4B3A1375)
+    (fp_text reference D5 (at 3.81 -2.12) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4148 (at 3.81 2.12) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 1.81 -1) (end 1.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.81 1) (end 5.81 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 1) (end 5.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.81 -1) (end 1.81 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.81 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.41 -1) (end 2.41 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.51 -1) (end 2.51 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.31 -1) (end 2.31 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.69 -1.12) (end 1.69 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.12) (end 5.93 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 1.12) (end 5.93 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.93 -1.12) (end 1.69 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.69 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.58 0) (end 5.93 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.41 -1.12) (end 2.41 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.53 -1.12) (end 2.53 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.29 -1.12) (end 2.29 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.4) (end -1.05 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.4) (end 8.7 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.4) (end 8.7 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.4) (end -1.05 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 4.11 0) (layer F.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)))
+    )
+    (fp_text user K (at 0 -1.8) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.8) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 48 "Net-(D5-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 12 HT))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_THT:D_DO-41_SOD81_P12.70mm_Horizontal (layer Composant) (tedit 5A195B5A) (tstamp 5A5986B9)
+    (at 116.078 68.326 180)
+    (descr "D, DO-41_SOD81 series, Axial, Horizontal, pin pitch=12.7mm, , length*diameter=5.2*2.7mm^2, , http://www.diodes.com/_files/packages/DO-41%20(Plastic).pdf")
+    (tags "D DO-41_SOD81 series Axial Horizontal pin pitch 12.7mm  length 5.2mm diameter 2.7mm")
+    (path /4AE172F4)
+    (fp_text reference D1 (at 6.35 -2.47 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1N4007 (at 6.35 2.47 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3.75 -1.35) (end 3.75 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.75 1.35) (end 8.95 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.95 1.35) (end 8.95 -1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.95 -1.35) (end 3.75 -1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 3.75 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 12.7 0) (end 8.95 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.53 -1.35) (end 4.53 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.63 -1.35) (end 4.63 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.43 -1.35) (end 4.43 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.63 -1.47) (end 3.63 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.63 1.47) (end 9.07 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.07 1.47) (end 9.07 -1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.07 -1.47) (end 3.63 -1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.34 0) (end 3.63 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.36 0) (end 9.07 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.53 -1.47) (end 4.53 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.65 -1.47) (end 4.65 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.41 -1.47) (end 4.41 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.35 -1.75) (end -1.35 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.35 1.75) (end 14.05 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 14.05 1.75) (end 14.05 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 14.05 -1.75) (end -1.35 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 6.74 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -2.1 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -2.1 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 180) (size 2.2 2.2) (drill 1.1) (layers *.Cu *.Mask)
+      (net 52 +12C))
+    (pad 2 thru_hole oval (at 12.7 0 180) (size 2.2 2.2) (drill 1.1) (layers *.Cu *.Mask)
+      (net 2 /12Vext))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-41_SOD81_P12.70mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A58833C)
+    (at 118.745 110.236 180)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A1333/4B3A1358)
+    (fp_text reference C3 (at 2.5 -2.56 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 15nF (at 2.5 2.56 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 2.5 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 5 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 17 "Net-(C3-Pad2)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A588328)
+    (at 113.665 112.776)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A1333/4B3A1366)
+    (fp_text reference C4 (at 2.5 -2.56) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 4.7nF (at 2.5 2.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.5 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 18 "Net-(C4-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A588314)
+    (at 113.665 78.486)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A13A4/4B4F3641)
+    (fp_text reference C14 (at 2.5 -2.56) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 150nF (at 2.5 2.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 2.5 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 16 "Net-(C14-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A588300)
+    (at 113.665 107.061)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A1333/4B4F3641)
+    (fp_text reference C12 (at 2.5 -2.56) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 150nF (at 2.5 2.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.5 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 15 "Net-(C12-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A5882EC)
+    (at 138.176 130.048)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A1333/4B3A1365)
+    (fp_text reference C5 (at 2.5 -2.56) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 820pF (at 2.5 2.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 2.5 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 19 "Net-(C5-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A5882D8)
+    (at 118.745 81.026 180)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A13A4/4B3A1358)
+    (fp_text reference C6 (at 2.5 -2.56 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 15nF (at 2.5 2.56 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.5 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
+    (pad 2 thru_hole circle (at 5 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 20 "Net-(C6-Pad2)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A5882C4)
+    (at 113.792 84.836)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A13A4/4B3A1366)
+    (fp_text reference C7 (at 2.5 -2.56) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 4.7nF (at 2.5 2.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 2.5 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 21 "Net-(C7-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer Composant) (tedit 5A142A3B) (tstamp 5A5882B0)
+    (at 138.049 104.14)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /4B3A13A4/4B3A1365)
+    (fp_text reference C8 (at 2.5 -2.56) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 820pF (at 2.5 2.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.06 -1.31) (end 5.06 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 1.31) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 -1.31) (end -0.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.06 0.996) (end -0.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 -1.31) (end 5.06 -0.996) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.06 0.996) (end 5.06 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 6.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.6) (end 6.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.5 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 22 "Net-(C8-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_DIP:DIP-8_W7.62mm_LongPads (layer Composant) (tedit 5A02E8C5) (tstamp 5A587F5F)
+    (at 107.315 124.206 90)
+    (descr "8-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), LongPads")
+    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil LongPads")
+    (path /4B3A1333/4B3A1368)
+    (fp_text reference U3 (at 3.81 -2.33 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value LM358N (at 3.81 9.95 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 3.81 3.81 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 40 "Net-(R9-Pad2)"))
+    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 18 "Net-(C4-Pad1)"))
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 41 "Net-(RV1-Pad2)"))
+    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
+    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 -VAA))
+    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 52 +12C))
+    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-8_W7.62mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_DIP:DIP-8_W7.62mm_LongPads (layer Composant) (tedit 5A02E8C5) (tstamp 5A587F44)
+    (at 145.415 72.136 90)
+    (descr "8-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), LongPads")
+    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil LongPads")
+    (path /4B4B1230)
+    (fp_text reference U1 (at 3.81 -2.33 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value ICL7660 (at 3.81 9.95 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 3.81 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 43 VCC))
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 14 "Net-(C10-Pad2)"))
+    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 45 "Net-(U1-Pad7)"))
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 44 "Net-(U1-Pad6)"))
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 13 "Net-(C10-Pad1)"))
+    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 -VAA))
+    (pad 1 thru_hole rect (at 0 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-8_W7.62mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_DIP:DIP-8_W7.62mm_LongPads (layer Composant) (tedit 5A02E8C5) (tstamp 5A587F29)
+    (at 107.315 96.266 90)
+    (descr "8-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), LongPads")
+    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil LongPads")
+    (path /4B3A13A4/4B3A1368)
+    (fp_text reference U4 (at 3.81 -2.33 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value LM358N (at 3.81 9.95 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 3.81 3.81 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 38 "Net-(R19-Pad2)"))
+    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 21 "Net-(C7-Pad1)"))
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 42 "Net-(RV2-Pad2)"))
+    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
+    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 -VAA))
+    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 52 +12C))
+    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-8_W7.62mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587F13)
+    (at 141.605 101.346 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B61688C)
+    (fp_text reference R20 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5,6K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 22 "Net-(C8-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 25 "Net-(D7-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587EFD)
+    (at 156.845 89.916 270)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1370)
+    (fp_text reference R22 (at 3.81 -1.86 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 220K (at 3.81 1.86 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 5 /ampli_ht_horizontal/S_OUT+))
+    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 34 "Net-(Q7-PadE)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587EE7)
+    (at 109.855 107.061 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B4F363E)
+    (fp_text reference R23 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 7 /ampli_ht_vertical/PIEZO_IN))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 15 "Net-(C12-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587ED1)
+    (at 110.363 78.74 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B4F363E)
+    (fp_text reference R24 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 16 "Net-(C14-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 3 /ampli_ht_horizontal/PIEZO_IN))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587EBB)
+    (at 173.355 122.936 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B616B96)
+    (fp_text reference R25 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 47 (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 29 "Net-(Q3-PadE)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 8 /ampli_ht_vertical/PIEZO_OUT))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587EA5)
+    (at 160.02 116.586 270)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B617B88)
+    (fp_text reference R26 (at 3.81 -1.86 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 220K (at 3.81 1.86 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 9 /ampli_ht_vertical/S_OUT+))
+    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 28 "Net-(Q2-PadE)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E8F)
+    (at 173.355 97.536 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B616B96)
+    (fp_text reference R27 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 47 (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 34 "Net-(Q7-PadE)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 4 /ampli_ht_horizontal/PIEZO_OUT))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E79)
+    (at 161.29 89.916 270)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B617B88)
+    (fp_text reference R28 (at 3.81 -1.86 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 220K (at 3.81 1.86 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 5 /ampli_ht_horizontal/S_OUT+))
+    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 33 "Net-(Q6-PadE)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E63)
+    (at 173.355 119.126 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1364)
+    (fp_text reference R5 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 47 (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 28 "Net-(Q2-PadE)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 8 /ampli_ht_vertical/PIEZO_OUT))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E4D)
+    (at 122.555 115.316 270)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1374)
+    (fp_text reference R4 (at 3.81 -1.86 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 220K (at 3.81 1.86 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 47 "Net-(D3-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E37)
+    (at 146.685 108.966 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1376)
+    (fp_text reference R3 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 470 (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 27 "Net-(Q1-PadE)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 12 HT))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E21)
+    (at 102.235 102.616 90)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1362)
+    (fp_text reference R21 (at 3.81 -1.86 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 4,7K (at 3.81 1.86 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 39 "Net-(R21-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587E0B)
+    (at 102.235 84.836)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1359)
+    (fp_text reference R17 (at 3.81 -1.86) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 22K (at 3.81 1.86) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 20 "Net-(C6-Pad2)"))
+    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 21 "Net-(C7-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587DF5)
+    (at 109.855 112.776 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1359)
+    (fp_text reference R7 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 22K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 18 "Net-(C4-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 17 "Net-(C3-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587DDF)
+    (at 126.365 128.016 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1371)
+    (fp_text reference R8 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 30 "Net-(Q4-PadB)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587DC9)
+    (at 134.493 120.142 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A136D)
+    (fp_text reference R9 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 31 "Net-(Q4-PadE)"))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 40 "Net-(R9-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587DB3)
+    (at 144.399 127.381 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B61688C)
+    (fp_text reference R10 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5,6K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 19 "Net-(C5-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 23 "Net-(D4-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D9D)
+    (at 102.87 126.746 90)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1362)
+    (fp_text reference R11 (at 3.81 -1.86 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 4,7K (at 3.81 1.86 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 37 "Net-(R11-Pad1)"))
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D87)
+    (at 156.21 116.713 270)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A1370)
+    (fp_text reference R12 (at 3.81 -1.86 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 220K (at 3.81 1.86 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 29 "Net-(Q3-PadE)"))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 9 /ampli_ht_vertical/S_OUT+))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D71)
+    (at 145.415 86.106 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1376)
+    (fp_text reference R13 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 470 (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 12 HT))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 32 "Net-(Q5-PadE)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D5B)
+    (at 137.795 81.026)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1374)
+    (fp_text reference R14 (at 3.81 -1.86) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 220K (at 3.81 1.86) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 49 "Net-(D6-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D45)
+    (at 173.355 91.186 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1364)
+    (fp_text reference R15 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 47 (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 4 /ampli_ht_horizontal/PIEZO_OUT))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 33 "Net-(Q6-PadE)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D2F)
+    (at 109.855 82.296 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A136B)
+    (fp_text reference R16 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 22K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 16 "Net-(C14-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 20 "Net-(C6-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D19)
+    (at 125.603 101.346 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A1371)
+    (fp_text reference R18 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 35 "Net-(Q8-PadB)"))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 11 GND))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587D03)
+    (at 109.855 110.236 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A1333/4B3A136B)
+    (fp_text reference R6 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 22K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 15 "Net-(C12-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 17 "Net-(C3-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A587CED)
+    (at 126.111 94.996 180)
+    (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.16666666666666666W = 1/6W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.16666666666666666W = 1/6W length 3.6mm diameter 1.6mm")
+    (path /4B3A13A4/4B3A136D)
+    (fp_text reference R19 (at 3.81 -1.86 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 1.86 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.01 -0.8) (end 2.01 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.01 0.8) (end 5.61 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 0.8) (end 5.61 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.61 -0.8) (end 2.01 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 2.01 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.62 0) (end 5.61 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.95 -0.86) (end 1.95 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.95 0.86) (end 5.67 0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 0.86) (end 5.67 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.67 -0.86) (end 1.95 -0.86) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.88 0) (end 1.95 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.74 0) (end 5.67 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.95 -1.15) (end -0.95 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.95 1.15) (end 8.6 1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 1.15) (end 8.6 -1.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.6 -1.15) (end -0.95 -1.15) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 36 "Net-(Q8-PadE)"))
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 38 "Net-(R19-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module Connect:bornier2 (layer Composant) (tedit 0) (tstamp 5592D05B)
     (at 95.885 87.376 270)
     (descr "Bornier d'alimentation 2 pins")
@@ -375,140 +2390,6 @@
     )
   )
 
-  (module Housings_DIP:DIP-8_W7.62mm_LongPads (layer Composant) (tedit 5878F88D) (tstamp 5592D235)
-    (at 145.415 72.136 90)
-    (descr "8-lead dip package, row spacing 7.62 mm (300 mils), longer pads")
-    (tags "dil dip 2.54 300")
-    (path /4B4B1230)
-    (fp_text reference U1 (at 0 -5.22 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value ICL7660 (at 0 -3.72 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.135 -1.025) (end -1.15 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 9.915) (end 7.485 9.915) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 -2.295) (end 7.485 -2.295) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 9.915) (end 0.135 8.645) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7.485 9.915) (end 7.485 8.645) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7.485 -2.295) (end 7.485 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 -2.295) (end 0.135 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.4 10.1) (end 9 10.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -2.45) (end 9 -2.45) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9 -2.45) (end 9 10.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -2.45) (end -1.4 10.1) (layer F.CrtYd) (width 0.05))
-    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 43 VCC))
-    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 45 "Net-(U1-Pad7)"))
-    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 44 "Net-(U1-Pad6)"))
-    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 1 -VAA))
-    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 14 "Net-(C10-Pad2)"))
-    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 13 "Net-(C10-Pad1)"))
-    (pad 1 thru_hole rect (at 0 0 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS))
-    (model Housings_DIP.3dshapes/DIP-8_W7.62mm_LongPads.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Housings_DIP:DIP-8_W7.62mm_LongPads (layer Composant) (tedit 5878F88D) (tstamp 5592D255)
-    (at 107.315 124.206 90)
-    (descr "8-lead dip package, row spacing 7.62 mm (300 mils), longer pads")
-    (tags "dil dip 2.54 300")
-    (path /4B3A1333/4B3A1368)
-    (fp_text reference U3 (at 0 -5.22 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value LM358N (at 0 -3.72 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.135 -1.025) (end -1.15 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 9.915) (end 7.485 9.915) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 -2.295) (end 7.485 -2.295) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 9.915) (end 0.135 8.645) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7.485 9.915) (end 7.485 8.645) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7.485 -2.295) (end 7.485 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 -2.295) (end 0.135 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.4 10.1) (end 9 10.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -2.45) (end 9 -2.45) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9 -2.45) (end 9 10.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -2.45) (end -1.4 10.1) (layer F.CrtYd) (width 0.05))
-    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 46 +12V))
-    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
-    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
-    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 18 "Net-(C4-Pad1)"))
-    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 1 -VAA))
-    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
-    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 41 "Net-(RV1-Pad2)"))
-    (pad 1 thru_hole rect (at 0 0 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 40 "Net-(R9-Pad2)"))
-    (model Housings_DIP.3dshapes/DIP-8_W7.62mm_LongPads.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Housings_DIP:DIP-8_W7.62mm_LongPads (layer Composant) (tedit 5878F88D) (tstamp 5592D267)
-    (at 107.315 96.266 90)
-    (descr "8-lead dip package, row spacing 7.62 mm (300 mils), longer pads")
-    (tags "dil dip 2.54 300")
-    (path /4B3A13A4/4B3A1368)
-    (fp_text reference U4 (at 0 -5.22 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value LM358N (at 0 -3.72 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.135 -1.025) (end -1.15 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 9.915) (end 7.485 9.915) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 -2.295) (end 7.485 -2.295) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 9.915) (end 0.135 8.645) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7.485 9.915) (end 7.485 8.645) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7.485 -2.295) (end 7.485 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.135 -2.295) (end 0.135 -1.025) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.4 10.1) (end 9 10.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -2.45) (end 9 -2.45) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9 -2.45) (end 9 10.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -2.45) (end -1.4 10.1) (layer F.CrtYd) (width 0.05))
-    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 46 +12V))
-    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
-    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
-    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 21 "Net-(C7-Pad1)"))
-    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 1 -VAA))
-    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
-    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 42 "Net-(RV2-Pad2)"))
-    (pad 1 thru_hole rect (at 0 0 90) (size 2.3 1.6) (drill 0.8) (layers *.Cu *.Mask F.SilkS)
-      (net 38 "Net-(R19-Pad2)"))
-    (model Housings_DIP.3dshapes/DIP-8_W7.62mm_LongPads.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Discret:CP6 (layer Composant) (tedit 0) (tstamp 5592CF06)
     (at 109.855 74.676 180)
     (descr "Condensateur polarise")
@@ -563,7 +2444,7 @@
     (fp_line (start -6.096 1.524) (end 6.604 1.524) (layer F.SilkS) (width 0.15))
     (fp_line (start 6.604 1.524) (end 6.604 0) (layer F.SilkS) (width 0.15))
     (pad 1 thru_hole rect (at -7.62 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 46 +12V))
+      (net 52 +12C))
     (pad 2 thru_hole circle (at 7.62 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 11 GND))
     (model Discret.3dshapes/CP6.wrl
@@ -573,168 +2454,6 @@
     )
   )
 
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF24)
-    (at 116.205 110.236 180)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A1333/4B3A1358)
-    (fp_text reference C3 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 15nF (at 0 0 180) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 10 /ampli_ht_vertical/Vpil_0_3,3V))
-    (pad 2 thru_hole circle (at 2.54 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 17 "Net-(C3-Pad2)"))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF2E)
-    (at 116.205 112.776)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A1333/4B3A1366)
-    (fp_text reference C4 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 4.7nF (at 0 0) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 18 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF38)
-    (at 140.716 130.048)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A1333/4B3A1365)
-    (fp_text reference C5 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 820pF (at 0 0) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 19 "Net-(C5-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF42)
-    (at 116.205 81.026 180)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A13A4/4B3A1358)
-    (fp_text reference C6 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 15nF (at 0 0 180) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
-    (pad 2 thru_hole circle (at 2.54 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 20 "Net-(C6-Pad2)"))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF4C)
-    (at 116.205 84.836)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A13A4/4B3A1366)
-    (fp_text reference C7 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 4.7nF (at 0 0) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 21 "Net-(C7-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF56)
-    (at 140.589 104.14)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A13A4/4B3A1365)
-    (fp_text reference C8 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 820pF (at 0 0) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 22 "Net-(C8-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Discret:CP8 (layer Composant) (tedit 0) (tstamp 5592CF60)
     (at 112.395 60.706 180)
     (descr "Condensateur polarise")
@@ -832,348 +2551,6 @@
     )
   )
 
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF8E)
-    (at 116.205 107.061)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A1333/4B4F3641)
-    (fp_text reference C12 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 150nF (at 0 0) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 15 "Net-(C12-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:C2 (layer Composant) (tedit 54F2ADF4) (tstamp 5592CF98)
-    (at 116.205 78.486)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4B3A13A4/4B4F3641)
-    (fp_text reference C14 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.2)))
-    )
-    (fp_text value 150nF (at 0 0) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 16 "Net-(C14-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/C2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D5 (layer Composant) (tedit 0) (tstamp 5592CFA2)
-    (at 109.855 68.326)
-    (descr "Diode 5 pas")
-    (tags "DIODE DEV")
-    (path /4AE172F4)
-    (fp_text reference D1 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4007 (at -0.254 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 6.35 0) (end 5.08 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5.08 0) (end 5.08 -1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5.08 -1.27) (end -5.08 -1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start -5.08 -1.27) (end -5.08 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -5.08 0) (end -6.35 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -5.08 0) (end -5.08 1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start -5.08 1.27) (end 5.08 1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5.08 1.27) (end 5.08 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 -1.27) (end 3.81 1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start 4.064 -1.27) (end 4.064 1.27) (layer F.SilkS) (width 0.15))
-    (pad 2 thru_hole circle (at -6.35 0) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
-      (net 2 /12Vext))
-    (pad 1 thru_hole rect (at 6.35 0) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
-      (net 46 +12V))
-    (model Discret.3dshapes/D5.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.5 0.5 0.5))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592CFB1)
-    (at 131.445 106.426 180)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A1333/4B3A1375)
-    (fp_text reference D2 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 47 "Net-(D2-Pad1)"))
-    (pad 2 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 12 HT))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592CFC0)
-    (at 131.445 108.966 180)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A1333/4B3A1377)
-    (fp_text reference D3 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 48 "Net-(D3-Pad1)"))
-    (pad 2 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 47 "Net-(D2-Pad1)"))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592CFCF)
-    (at 140.97 119.761 270)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A1333/4B3A137B)
-    (fp_text reference D4 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 23 "Net-(D4-Pad1)"))
-    (pad 2 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 24 "Net-(D4-Pad2)"))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592CFDE)
-    (at 128.905 79.756 180)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A13A4/4B3A1375)
-    (fp_text reference D5 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 49 "Net-(D5-Pad1)"))
-    (pad 2 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 12 HT))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592CFED)
-    (at 128.905 82.296)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A13A4/4B3A1377)
-    (fp_text reference D6 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 50 "Net-(D6-Pad1)"))
-    (pad 2 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 49 "Net-(D5-Pad1)"))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592CFFC)
-    (at 141.605 93.726 270)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A13A4/4B3A137B)
-    (fp_text reference D7 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 25 "Net-(D7-Pad1)"))
-    (pad 2 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 26 "Net-(D7-Pad2)"))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592D00B)
-    (at 144.78 119.761 270)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A1333/4B616AFA)
-    (fp_text reference D8 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 24 "Net-(D4-Pad2)"))
-    (pad 2 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 51 "Net-(D8-Pad2)"))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:D3 (layer Composant) (tedit 0) (tstamp 5592D01A)
-    (at 145.415 93.726 270)
-    (descr "Diode 3 pas")
-    (tags "DIODE DEV")
-    (path /4B3A13A4/4B616AFA)
-    (fp_text reference D9 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1N4148 (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.81 0) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 0) (end 3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 -1.016) (end -3.048 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 -1.016) (end -3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.81 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 0) (end -3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.048 1.016) (end 3.048 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.048 1.016) (end 3.048 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.016) (end 2.54 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.286 1.016) (end 2.286 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 26 "Net-(D7-Pad2)"))
-    (pad 2 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 52 "Net-(D9-Pad2)"))
-    (model Discret.3dshapes/D3.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Discret:TO92-CBE (layer Composant) (tedit 0) (tstamp 5592D065)
     (at 131.445 115.316)
     (descr "Transistor TO92 brochage type BC237")
@@ -1196,9 +2573,9 @@
     (pad E thru_hole rect (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 27 "Net-(Q1-PadE)"))
     (pad B thru_hole circle (at -1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 48 "Net-(D3-Pad1)"))
+      (net 47 "Net-(D3-Pad1)"))
     (pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 51 "Net-(D8-Pad2)"))
+      (net 50 "Net-(D8-Pad2)"))
     (model Discret.3dshapes/TO92.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1228,7 +2605,7 @@
     (pad E thru_hole rect (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 28 "Net-(Q2-PadE)"))
     (pad B thru_hole circle (at -1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 51 "Net-(D8-Pad2)"))
+      (net 50 "Net-(D8-Pad2)"))
     (pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 12 HT))
     (model Discret.3dshapes/TO92.wrl
@@ -1324,9 +2701,9 @@
     (pad E thru_hole rect (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 32 "Net-(Q5-PadE)"))
     (pad B thru_hole circle (at -1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 50 "Net-(D6-Pad1)"))
+      (net 49 "Net-(D6-Pad1)"))
     (pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 52 "Net-(D9-Pad2)"))
+      (net 51 "Net-(D9-Pad2)"))
     (model Discret.3dshapes/TO92.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1356,7 +2733,7 @@
     (pad E thru_hole rect (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 33 "Net-(Q6-PadE)"))
     (pad B thru_hole circle (at -1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 52 "Net-(D9-Pad2)"))
+      (net 51 "Net-(D9-Pad2)"))
     (pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 12 HT))
     (model Discret.3dshapes/TO92.wrl
@@ -1430,786 +2807,6 @@
     )
   )
 
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D0D5)
-    (at 142.875 108.966 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1376)
-    (fp_text reference R3 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 470 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 12 HT))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 27 "Net-(Q1-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D0E2)
-    (at 122.555 119.126 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1374)
-    (fp_text reference R4 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 220K (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 48 "Net-(D3-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D0EF)
-    (at 169.545 119.126 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1364)
-    (fp_text reference R5 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 47 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 8 /ampli_ht_vertical/PIEZO_OUT))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 28 "Net-(Q2-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D0FC)
-    (at 106.045 110.236 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A136B)
-    (fp_text reference R6 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 22K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 17 "Net-(C3-Pad2)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 15 "Net-(C12-Pad1)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D109)
-    (at 106.045 112.776 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1359)
-    (fp_text reference R7 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 22K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 18 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 17 "Net-(C3-Pad2)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D116)
-    (at 122.555 128.016 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1371)
-    (fp_text reference R8 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 30 "Net-(Q4-PadB)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D123)
-    (at 130.683 120.142 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A136D)
-    (fp_text reference R9 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 31 "Net-(Q4-PadE)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 40 "Net-(R9-Pad2)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D130)
-    (at 140.589 127.381 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B61688C)
-    (fp_text reference R10 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 5,6K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 23 "Net-(D4-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 19 "Net-(C5-Pad1)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D13D)
-    (at 102.87 122.936 90)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1362)
-    (fp_text reference R11 (at 0 0 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 4,7K (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 90) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 37 "Net-(R11-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 90) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D14A)
-    (at 156.21 120.396 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B3A1370)
-    (fp_text reference R12 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 220K (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 9 /ampli_ht_vertical/S_OUT+))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 29 "Net-(Q3-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D157)
-    (at 141.605 86.106 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1376)
-    (fp_text reference R13 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 470 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 12 HT))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 32 "Net-(Q5-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D164)
-    (at 141.605 81.026)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1374)
-    (fp_text reference R14 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 220K (at 0 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 50 "Net-(D6-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D171)
-    (at 169.545 91.186 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1364)
-    (fp_text reference R15 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 47 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 4 /ampli_ht_horizontal/PIEZO_OUT))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 33 "Net-(Q6-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D17E)
-    (at 106.045 82.296 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A136B)
-    (fp_text reference R16 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 22K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 20 "Net-(C6-Pad2)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 16 "Net-(C14-Pad1)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D18B)
-    (at 106.045 84.836)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1359)
-    (fp_text reference R17 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 22K (at 0 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 21 "Net-(C7-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 20 "Net-(C6-Pad2)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D198)
-    (at 121.793 101.346 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1371)
-    (fp_text reference R18 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 35 "Net-(Q8-PadB)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1A5)
-    (at 122.301 94.996 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A136D)
-    (fp_text reference R19 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 36 "Net-(Q8-PadE)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 38 "Net-(R19-Pad2)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1B2)
-    (at 137.795 101.346 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B61688C)
-    (fp_text reference R20 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 5,6K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 25 "Net-(D7-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 22 "Net-(C8-Pad1)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1BF)
-    (at 102.235 98.806 90)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1362)
-    (fp_text reference R21 (at 0 0 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 4,7K (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 90) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 39 "Net-(R21-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 90) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 11 GND))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1CC)
-    (at 156.845 93.726 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B3A1370)
-    (fp_text reference R22 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 220K (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 5 /ampli_ht_horizontal/S_OUT+))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 34 "Net-(Q7-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1D9)
-    (at 106.045 107.061 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B4F363E)
-    (fp_text reference R23 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 15 "Net-(C12-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 7 /ampli_ht_vertical/PIEZO_IN))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1E6)
-    (at 106.553 78.74 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B4F363E)
-    (fp_text reference R24 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 16 "Net-(C14-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 3 /ampli_ht_horizontal/PIEZO_IN))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D1F3)
-    (at 169.545 122.936 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B616B96)
-    (fp_text reference R25 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 47 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 8 /ampli_ht_vertical/PIEZO_OUT))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 29 "Net-(Q3-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D200)
-    (at 160.02 120.396 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A1333/4B617B88)
-    (fp_text reference R26 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 220K (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 9 /ampli_ht_vertical/S_OUT+))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 28 "Net-(Q2-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D20D)
-    (at 169.545 97.536 180)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B616B96)
-    (fp_text reference R27 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 47 (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 4 /ampli_ht_horizontal/PIEZO_OUT))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 34 "Net-(Q7-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Discret:R3-LARGE_PADS (layer Composant) (tedit 0) (tstamp 5592D21A)
-    (at 161.29 93.726 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4B3A13A4/4B617B88)
-    (fp_text reference R28 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 220K (at 0 0 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 5 /ampli_ht_horizontal/S_OUT+))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.651 1.651) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 33 "Net-(Q6-PadE)"))
-    (model Discret.3dshapes/R3-LARGE_PADS.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Discret:RV2 (layer Composant) (tedit 0) (tstamp 5592D227)
     (at 95.885 124.206)
     (descr "Resistance variable / potentiometre")
@@ -2280,7 +2877,7 @@
     (fp_line (start -3.81 1.27) (end -2.54 2.54) (layer F.SilkS) (width 0.3048))
     (fp_line (start -2.54 2.54) (end -1.27 2.54) (layer F.SilkS) (width 0.3048))
     (pad VI thru_hole circle (at 1.27 -1.27 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 46 +12V))
+      (net 52 +12C))
     (pad GND thru_hole rect (at -1.27 -1.27 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 11 GND))
     (pad VO thru_hole circle (at -1.27 1.27 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
@@ -2605,64 +3202,64 @@
   (segment (start 117.475 74.676) (end 125.73 74.676) (width 0.6096) (layer Cuivre) (net 43) (status 800))
   (segment (start 133.35 70.866) (end 139.7 64.516) (width 0.6096) (layer Cuivre) (net 43))
   (segment (start 139.7 64.516) (end 145.415 64.516) (width 0.6096) (layer Cuivre) (net 43) (status 400))
-  (segment (start 116.205 70.03542) (end 109.27842 76.962) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 116.205 68.326) (end 116.205 70.03542) (width 0.6096) (layer Cuivre) (net 46) (status 800))
-  (segment (start 116.205 68.326) (end 117.91442 68.326) (width 0.6096) (layer Cuivre) (net 46) (status 800))
-  (segment (start 117.91442 68.326) (end 122.4915 63.74892) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 122.4915 63.74892) (end 123.825 63.74892) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 100.838 76.962) (end 109.27842 76.962) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 123.825 63.74892) (end 136.78916 63.74892) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 99.568 78.232) (end 100.838 76.962) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 136.78916 63.74892) (end 139.83208 60.706) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 95.25 78.232) (end 99.568 78.232) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 107.315 116.586) (end 97.54108 116.586) (width 0.6096) (layer Cuivre) (net 46) (status 800))
-  (segment (start 97.54108 116.586) (end 94.68866 113.73358) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 94.68866 113.73358) (end 92.64904 113.73358) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 92.64904 113.73358) (end 91.6686 112.75314) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 91.6686 87.249) (end 91.6686 85.4837) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 91.6686 112.75314) (end 91.6686 87.249) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 141.605 60.706) (end 139.83208 60.706) (width 0.6096) (layer Cuivre) (net 46) (status 800))
-  (segment (start 123.825 68.326) (end 123.825 63.74892) (width 0.6096) (layer Cuivre) (net 46) (status 800))
-  (segment (start 91.6686 81.8134) (end 95.25 78.232) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 91.6686 85.4837) (end 91.6686 81.8134) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 98.298 87.249) (end 99.695 88.646) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 99.695 88.646) (end 107.315 88.646) (width 0.6096) (layer Cuivre) (net 46) (status 400))
-  (segment (start 91.6686 87.249) (end 98.298 87.249) (width 0.6096) (layer Cuivre) (net 46))
-  (segment (start 127.635 106.426) (end 128.83642 106.426) (width 0.4318) (layer Cuivre) (net 47) (status 800))
-  (segment (start 131.37642 108.966) (end 128.83642 106.426) (width 0.4318) (layer Cuivre) (net 47))
-  (segment (start 135.255 108.966) (end 131.37642 108.966) (width 0.4318) (layer Cuivre) (net 47) (status 800))
-  (segment (start 127.635 108.966) (end 127.635 110.16742) (width 0.4318) (layer Cuivre) (net 48) (status 800))
-  (segment (start 127.635 110.16742) (end 130.175 112.70742) (width 0.4318) (layer Cuivre) (net 48))
-  (segment (start 122.555 115.24742) (end 127.635 110.16742) (width 0.4318) (layer Cuivre) (net 48))
-  (segment (start 130.175 112.70742) (end 130.175 114.046) (width 0.4318) (layer Cuivre) (net 48) (status 400))
-  (segment (start 122.555 115.316) (end 122.555 115.24742) (width 0.4318) (layer Cuivre) (net 48) (status 800))
-  (segment (start 125.095 79.756) (end 125.095 82.296) (width 0.4318) (layer Cuivre) (net 49) (status C00))
-  (segment (start 130.175 79.756) (end 132.715 82.296) (width 0.4318) (layer Cuivre) (net 50) (status 400))
-  (segment (start 130.175 79.121) (end 130.175 79.756) (width 0.4318) (layer Cuivre) (net 50))
-  (segment (start 132.08 82.296) (end 130.175 84.201) (width 0.4318) (layer Cuivre) (net 50))
-  (segment (start 132.715 82.296) (end 132.08 82.296) (width 0.4318) (layer Cuivre) (net 50) (status 800))
-  (segment (start 131.445 77.851) (end 130.175 79.121) (width 0.4318) (layer Cuivre) (net 50))
-  (segment (start 135.89 77.851) (end 131.445 77.851) (width 0.4318) (layer Cuivre) (net 50))
-  (segment (start 137.795 79.756) (end 135.89 77.851) (width 0.4318) (layer Cuivre) (net 50))
-  (segment (start 130.175 84.201) (end 130.175 87.376) (width 0.4318) (layer Cuivre) (net 50) (status 400))
-  (segment (start 137.795 81.026) (end 137.795 79.756) (width 0.4318) (layer Cuivre) (net 50) (status 800))
-  (segment (start 144.78 113.411) (end 144.78 112.776) (width 0.4318) (layer Cuivre) (net 51))
-  (segment (start 144.78 115.951) (end 144.78 113.411) (width 0.4318) (layer Cuivre) (net 51) (status 800))
-  (segment (start 147.32 113.411) (end 144.78 113.411) (width 0.4318) (layer Cuivre) (net 51))
-  (segment (start 144.78 112.776) (end 144.145 112.141) (width 0.4318) (layer Cuivre) (net 51))
-  (segment (start 144.145 112.141) (end 138.43 112.141) (width 0.4318) (layer Cuivre) (net 51))
-  (segment (start 138.43 112.141) (end 136.525 114.046) (width 0.4318) (layer Cuivre) (net 51))
-  (segment (start 136.525 114.046) (end 132.715 114.046) (width 0.4318) (layer Cuivre) (net 51) (status 400))
-  (segment (start 149.225 115.316) (end 147.32 113.411) (width 0.4318) (layer Cuivre) (net 51) (status 800))
-  (segment (start 145.415 89.916) (end 145.415 88.646) (width 0.4318) (layer Cuivre) (net 52) (status 800))
-  (segment (start 145.415 88.646) (end 144.78 88.011) (width 0.4318) (layer Cuivre) (net 52))
-  (segment (start 144.78 88.011) (end 143.51 88.011) (width 0.4318) (layer Cuivre) (net 52))
-  (segment (start 143.51 88.011) (end 139.7 84.201) (width 0.4318) (layer Cuivre) (net 52))
-  (segment (start 145.415 88.646) (end 149.225 88.646) (width 0.4318) (layer Cuivre) (net 52) (status 400))
-  (segment (start 135.94334 84.14766) (end 132.715 87.376) (width 0.4318) (layer Cuivre) (net 52) (status 400))
-  (segment (start 138.37666 84.14766) (end 135.94334 84.14766) (width 0.4318) (layer Cuivre) (net 52))
-  (segment (start 139.7 84.201) (end 138.43 84.201) (width 0.4318) (layer Cuivre) (net 52))
-  (segment (start 138.43 84.201) (end 138.37666 84.14766) (width 0.4318) (layer Cuivre) (net 52))
+  (segment (start 116.205 70.03542) (end 109.27842 76.962) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 116.205 68.326) (end 116.205 70.03542) (width 0.6096) (layer Cuivre) (net 52) (status 800))
+  (segment (start 116.205 68.326) (end 117.91442 68.326) (width 0.6096) (layer Cuivre) (net 52) (status 800))
+  (segment (start 117.91442 68.326) (end 122.4915 63.74892) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 122.4915 63.74892) (end 123.825 63.74892) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 100.838 76.962) (end 109.27842 76.962) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 123.825 63.74892) (end 136.78916 63.74892) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 99.568 78.232) (end 100.838 76.962) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 136.78916 63.74892) (end 139.83208 60.706) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 95.25 78.232) (end 99.568 78.232) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 107.315 116.586) (end 97.54108 116.586) (width 0.6096) (layer Cuivre) (net 52) (status 800))
+  (segment (start 97.54108 116.586) (end 94.68866 113.73358) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 94.68866 113.73358) (end 92.64904 113.73358) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 92.64904 113.73358) (end 91.6686 112.75314) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 91.6686 87.249) (end 91.6686 85.4837) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 91.6686 112.75314) (end 91.6686 87.249) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 141.605 60.706) (end 139.83208 60.706) (width 0.6096) (layer Cuivre) (net 52) (status 800))
+  (segment (start 123.825 68.326) (end 123.825 63.74892) (width 0.6096) (layer Cuivre) (net 52) (status 800))
+  (segment (start 91.6686 81.8134) (end 95.25 78.232) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 91.6686 85.4837) (end 91.6686 81.8134) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 98.298 87.249) (end 99.695 88.646) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 99.695 88.646) (end 107.315 88.646) (width 0.6096) (layer Cuivre) (net 52) (status 400))
+  (segment (start 91.6686 87.249) (end 98.298 87.249) (width 0.6096) (layer Cuivre) (net 52))
+  (segment (start 127.635 106.426) (end 128.83642 106.426) (width 0.4318) (layer Cuivre) (net 46) (status 800))
+  (segment (start 131.37642 108.966) (end 128.83642 106.426) (width 0.4318) (layer Cuivre) (net 46))
+  (segment (start 135.255 108.966) (end 131.37642 108.966) (width 0.4318) (layer Cuivre) (net 46) (status 800))
+  (segment (start 127.635 108.966) (end 127.635 110.16742) (width 0.4318) (layer Cuivre) (net 47) (status 800))
+  (segment (start 127.635 110.16742) (end 130.175 112.70742) (width 0.4318) (layer Cuivre) (net 47))
+  (segment (start 122.555 115.24742) (end 127.635 110.16742) (width 0.4318) (layer Cuivre) (net 47))
+  (segment (start 130.175 112.70742) (end 130.175 114.046) (width 0.4318) (layer Cuivre) (net 47) (status 400))
+  (segment (start 122.555 115.316) (end 122.555 115.24742) (width 0.4318) (layer Cuivre) (net 47) (status 800))
+  (segment (start 125.095 79.756) (end 125.095 82.296) (width 0.4318) (layer Cuivre) (net 48) (status C00))
+  (segment (start 130.175 79.756) (end 132.715 82.296) (width 0.4318) (layer Cuivre) (net 49) (status 400))
+  (segment (start 130.175 79.121) (end 130.175 79.756) (width 0.4318) (layer Cuivre) (net 49))
+  (segment (start 132.08 82.296) (end 130.175 84.201) (width 0.4318) (layer Cuivre) (net 49))
+  (segment (start 132.715 82.296) (end 132.08 82.296) (width 0.4318) (layer Cuivre) (net 49) (status 800))
+  (segment (start 131.445 77.851) (end 130.175 79.121) (width 0.4318) (layer Cuivre) (net 49))
+  (segment (start 135.89 77.851) (end 131.445 77.851) (width 0.4318) (layer Cuivre) (net 49))
+  (segment (start 137.795 79.756) (end 135.89 77.851) (width 0.4318) (layer Cuivre) (net 49))
+  (segment (start 130.175 84.201) (end 130.175 87.376) (width 0.4318) (layer Cuivre) (net 49) (status 400))
+  (segment (start 137.795 81.026) (end 137.795 79.756) (width 0.4318) (layer Cuivre) (net 49) (status 800))
+  (segment (start 144.78 113.411) (end 144.78 112.776) (width 0.4318) (layer Cuivre) (net 50))
+  (segment (start 144.78 115.951) (end 144.78 113.411) (width 0.4318) (layer Cuivre) (net 50) (status 800))
+  (segment (start 147.32 113.411) (end 144.78 113.411) (width 0.4318) (layer Cuivre) (net 50))
+  (segment (start 144.78 112.776) (end 144.145 112.141) (width 0.4318) (layer Cuivre) (net 50))
+  (segment (start 144.145 112.141) (end 138.43 112.141) (width 0.4318) (layer Cuivre) (net 50))
+  (segment (start 138.43 112.141) (end 136.525 114.046) (width 0.4318) (layer Cuivre) (net 50))
+  (segment (start 136.525 114.046) (end 132.715 114.046) (width 0.4318) (layer Cuivre) (net 50) (status 400))
+  (segment (start 149.225 115.316) (end 147.32 113.411) (width 0.4318) (layer Cuivre) (net 50) (status 800))
+  (segment (start 145.415 89.916) (end 145.415 88.646) (width 0.4318) (layer Cuivre) (net 51) (status 800))
+  (segment (start 145.415 88.646) (end 144.78 88.011) (width 0.4318) (layer Cuivre) (net 51))
+  (segment (start 144.78 88.011) (end 143.51 88.011) (width 0.4318) (layer Cuivre) (net 51))
+  (segment (start 143.51 88.011) (end 139.7 84.201) (width 0.4318) (layer Cuivre) (net 51))
+  (segment (start 145.415 88.646) (end 149.225 88.646) (width 0.4318) (layer Cuivre) (net 51) (status 400))
+  (segment (start 135.94334 84.14766) (end 132.715 87.376) (width 0.4318) (layer Cuivre) (net 51) (status 400))
+  (segment (start 138.37666 84.14766) (end 135.94334 84.14766) (width 0.4318) (layer Cuivre) (net 51))
+  (segment (start 139.7 84.201) (end 138.43 84.201) (width 0.4318) (layer Cuivre) (net 51))
+  (segment (start 138.43 84.201) (end 138.37666 84.14766) (width 0.4318) (layer Cuivre) (net 51))
 
   (zone (net 11) (net_name GND) (layer Cuivre) (tstamp 4AE6D930) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
diff --git a/demos/complex_hierarchy/complex_hierarchy.sch b/demos/complex_hierarchy/complex_hierarchy.sch
index f01aacf4c2..a9dfdef0a9 100644
--- a/demos/complex_hierarchy/complex_hierarchy.sch
+++ b/demos/complex_hierarchy/complex_hierarchy.sch
@@ -32,9 +32,9 @@ Connection ~ 2500 1300
 Wire Wire Line
 	8300 1300 9200 1300
 Wire Wire Line
-	2800 2500 3800 2500
+	2800 2500 3000 2500
 Wire Wire Line
-	2500 1250 2500 1350
+	2500 1250 2500 1300
 Wire Wire Line
 	3800 2500 3800 2450
 Wire Wire Line
@@ -61,10 +61,10 @@ Wire Wire Line
 Wire Wire Line
 	9200 1750 9200 1800
 Wire Wire Line
-	9200 1250 9200 1450
+	9200 1250 9200 1300
 Connection ~ 9200 1300
 Wire Wire Line
-	2200 1650 2200 1750
+	2200 1650 2200 1700
 Wire Wire Line
 	2500 1650 2500 1700
 Wire Wire Line
@@ -76,7 +76,7 @@ Wire Wire Line
 Wire Wire Line
 	7050 2650 7100 2650
 Wire Wire Line
-	8800 2750 9350 2750
+	8800 2750 9200 2750
 $Comp
 L complex_hierarchy_schlib:CP C10
 U 1 1 4B4B15E7
@@ -172,7 +172,7 @@ U 1 1 4B4B1230
 P 7950 2900
 F 0 "U1" H 7400 3300 70  0000 L CNN
 F 1 "ICL7660" H 8500 2450 70  0000 R CNN
-F 2 "Housings_DIP:DIP-8_W7.62mm_LongPads" H 8950 2300 60  0000 C CNN
+F 2 "Package_DIP:DIP-8_W7.62mm_LongPads" H 8950 2300 60  0000 C CNN
 F 3 "" H 7950 2900 60  0001 C CNN
 	1    7950 2900
 	1    0    0    -1  
@@ -373,7 +373,7 @@ U 1 1 4AE172F4
 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 "Discret:D5" H 2700 2350 30  0000 C CNN
+F 2 "Diode_THT:D_DO-41_SOD81_P12.70mm_Horizontal" H 2700 2350 30  0000 C CNN
 F 3 "" H 2700 2500 60  0001 C CNN
 	1    2700 2500
 	-1   0    0    -1  
@@ -404,7 +404,7 @@ Wire Wire Line
 	2200 1250 2200 1300
 Connection ~ 2200 1300
 Wire Wire Line
-	2000 1300 2500 1300
+	2000 1300 2200 1300
 Wire Wire Line
 	2000 1500 2100 1500
 Wire Wire Line
@@ -422,4 +422,20 @@ Wire Wire Line
 	7900 1650 7900 1600
 Wire Wire Line
 	7900 3600 7900 3550
+Wire Wire Line
+	9200 2750 9350 2750
+Wire Wire Line
+	2500 1300 2500 1350
+Wire Wire Line
+	3200 2500 3550 2500
+Wire Wire Line
+	3550 2500 3800 2500
+Wire Wire Line
+	3000 2500 3200 2500
+Wire Wire Line
+	9200 1300 9200 1450
+Wire Wire Line
+	2200 1300 2500 1300
+Wire Wire Line
+	2200 1700 2200 1750
 $EndSCHEMATC
diff --git a/demos/complex_hierarchy/fp-lib-table b/demos/complex_hierarchy/fp-lib-table
index 8840e11962..74b88b767e 100644
--- a/demos/complex_hierarchy/fp-lib-table
+++ b/demos/complex_hierarchy/fp-lib-table
@@ -1,5 +1,5 @@
 (fp_lib_table
-  (lib (name Housings_DIP)(type KiCad)(uri "$(KISYSMOD)\\Housings_DIP.pretty")(options "")(descr ""))
-  (lib (name Connect)(type KiCad)(uri "$(KISYSMOD)\\Connect.pretty")(options "")(descr ""))
-  (lib (name Discret)(type KiCad)(uri "$(KISYSMOD)\\Discret.pretty")(options "")(descr ""))
+  (lib (name Package_DIP)(type KiCad)(uri "$(KISYSMOD)/Package_DIP.pretty")(options "")(descr ""))
+  (lib (name Capacitor_THT)(type KiCad)(uri "$(KISYSMOD)/Capacitor_THT.pretty")(options "")(descr ""))
+  (lib (name Resistor_THT)(type KiCad)(uri "$(KISYSMOD)/Resistor_THT.pretty")(options "")(descr ""))
 )
diff --git a/demos/interf_u/interf_u.kicad_pcb b/demos/interf_u/interf_u.kicad_pcb
index 5dff83d08b..5aa88a085e 100644
--- a/demos/interf_u/interf_u.kicad_pcb
+++ b/demos/interf_u/interf_u.kicad_pcb
@@ -1,4 +1,4 @@
-(kicad_pcb (version 20171130) (host pcbnew "(2017-12-28 revision 70b3e58)-master")
+(kicad_pcb (version 20171130) (host pcbnew "(2018-01-12 revision d8e38d6)-master")
 
   (general
     (thickness 1.6002)
@@ -464,6 +464,211 @@
     (add_net VCC)
   )
 
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A59C0B8)
+    (at 117.475 99.06 90)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /32307EA1)
+    (fp_text reference R1 (at 3.81 -2.31 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100K (at 3.81 2.31 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 102 "Net-(C2-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 103 "Net-(C3-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A59C0A2)
+    (at 127.635 91.44 270)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /32307EAA)
+    (fp_text reference R2 (at 3.81 -2.31 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1K (at 3.81 2.31 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 103 "Net-(C3-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 /8MH-OUT))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A59C08C)
+    (at 92.075 57.15 180)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /324002E6)
+    (fp_text reference R3 (at 3.81 -2.31 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 10K (at 3.81 2.31 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 101 VCC))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 104 "Net-(R3-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A43D0CE)
+    (at 151.765 41.91 180)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /322D3295)
+    (fp_text reference R4 (at 3.81 -2.31 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 330 (at 3.81 2.31 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 28 /LED1))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 109 "Net-(D1-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 322D32A0)
+    (at 171.958 42.037)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /322D32A0)
+    (fp_text reference R5 (at 3.81 -2.31) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 330 (at 3.81 2.31) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3.81 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 29 /LED2))
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 110 "Net-(D2-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module interf_u:BUS_PC (layer Composant) (tedit 5A437129) (tstamp 5A44ECAC)
     (at 131.445 138.43)
     (descr "Connecteur Bus PC 8 bits")
@@ -1113,88 +1318,6 @@
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 5A43D0CE)
-    (at 151.765 41.91 180)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /322D3295)
-    (fp_text reference R4 (at 3.81 -2.31 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330 (at 3.81 2.31 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 3.81 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 109 "Net-(D1-Pad2)"))
-    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 28 /LED1))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.39 0.39 0.39))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5A14249F) (tstamp 322D32A0)
-    (at 171.958 42.037)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /322D32A0)
-    (fp_text reference R5 (at 3.81 -2.31) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330 (at 3.81 2.31) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 3.81 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 29 /LED2))
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 110 "Net-(D2-Pad2)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.39 0.39 0.39))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module LOGO locked (layer Composant) (tedit 5A0B1289) (tstamp 5A0C956E)
     (at 88.646 98.425)
     (fp_text reference G1 (at 0.3 2.9) (layer F.SilkS) hide
@@ -1675,120 +1798,6 @@
     )
   )
 
-  (module Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5874F706) (tstamp 32307EAA)
-    (at 127.635 91.44 270)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /32307EAA)
-    (fp_text reference R2 (at 3.81 -2.31 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1K (at 3.81 2.31 270) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 /8MH-OUT))
-    (pad 2 thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 103 "Net-(C3-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.393701 0.393701 0.393701))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5874F706) (tstamp 32307EA1)
-    (at 117.475 99.06 90)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /32307EA1)
-    (fp_text reference R1 (at 3.81 -2.31 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100K (at 3.81 2.31 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 103 "Net-(C3-Pad1)"))
-    (pad 2 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 102 "Net-(C2-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.393701 0.393701 0.393701))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer Composant) (tedit 5874F706) (tstamp 324002E6)
-    (at 92.075 57.15 180)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /324002E6)
-    (fp_text reference R3 (at 3.81 -2.31) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10K (at 3.81 2.31) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 0.66 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.62 0) (end 6.96 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.05 -1.6) (end -1.05 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.6) (end 8.7 1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 1.6) (end 8.7 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 -1.6) (end -1.05 -1.6) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 104 "Net-(R3-Pad1)"))
-    (pad 2 thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 101 VCC))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.393701 0.393701 0.393701))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Capacitor_THT:C_Disc_D3.0mm_W2.0mm_P2.50mm (layer Composant) (tedit 597BC7C2) (tstamp 32307ED4)
     (at 121.305 99.06)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3*2mm^2, Capacitor")
diff --git a/demos/interf_u/interf_u.net b/demos/interf_u/interf_u.net
index b6c8379f1d..405caa6c46 100644
--- a/demos/interf_u/interf_u.net
+++ b/demos/interf_u/interf_u.net
@@ -1,8 +1,8 @@
 (export (version D)
   (design
     (source F:\kicad-launchpad\git_testing\demos\interf_u\interf_u.sch)
-    (date "14/11/2017 16:07:41")
-    (tool "Eeschema (2017-11-14 revision 1b57196)-master")
+    (date "12/01/2018 13:12:20")
+    (tool "Eeschema (2018-01-12 revision d8e38d6)-master")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "UNIVERSAL INTERFACE")
@@ -17,7 +17,7 @@
   (components
     (comp (ref U3)
       (value 74LS541)
-      (footprint Housings_DIP:DIP-20_W7.62mm)
+      (footprint Package_DIP:DIP-20_W7.62mm)
       (libsource (lib interf_u_schlib) (part 74LS541))
       (sheetpath (names /) (tstamps /))
       (tstamp 4A087146))
@@ -29,133 +29,133 @@
       (tstamp 32568D1E))
     (comp (ref RR1)
       (value 9x1K)
-      (footprint Discret:r_pack9)
+      (footprint Resistor_THT:R_Array_SIP10)
       (libsource (lib interf_u_schlib) (part RR9))
       (sheetpath (names /) (tstamps /))
       (tstamp 325679C1))
     (comp (ref P1)
       (value DB25FEMELLE)
-      (footprint Connectors:DB25FC)
+      (footprint Connector_Dsub:DSUB-25_Female_Horizontal_P2.77x2.84mm_EdgePinOffset9.90mm_Housed_MountingHolesOffset11.32mm)
       (libsource (lib interf_u_schlib) (part DB25_Female))
       (sheetpath (names /) (tstamps /))
       (tstamp 3256759C))
     (comp (ref R3)
       (value 10K)
-      (footprint Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
+      (footprint Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
       (libsource (lib interf_u_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 324002E6))
     (comp (ref U5)
       (value 628128)
-      (footprint Housings_DIP:DIP-32_W15.24mm)
+      (footprint Package_DIP:DIP-32_W15.24mm)
       (libsource (lib interf_u_schlib) (part 628128))
       (sheetpath (names /) (tstamps /))
       (tstamp 3240023F))
     (comp (ref C3)
       (value 47pF)
-      (footprint Capacitors_THT:C_Disc_D3.0mm_W2.0mm_P2.50mm)
+      (footprint Capacitor_THT:C_Disc_D3.0mm_W2.0mm_P2.50mm)
       (libsource (lib interf_u_schlib) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307ED4))
     (comp (ref C2)
       (value 47pF)
-      (footprint Capacitors_THT:C_Disc_D3.0mm_W2.0mm_P2.50mm)
+      (footprint Capacitor_THT:C_Disc_D3.0mm_W2.0mm_P2.50mm)
       (libsource (lib interf_u_schlib) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307ECF))
     (comp (ref X1)
       (value 8MHz)
-      (footprint Discret:HC-18UH)
+      (footprint Crystal:Crystal_HC18-U_Horizontal)
       (libsource (lib device) (part Crystal))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307EC0))
     (comp (ref R2)
       (value 1K)
-      (footprint Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
+      (footprint Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
       (libsource (lib interf_u_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307EAA))
     (comp (ref R1)
       (value 100K)
-      (footprint Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
+      (footprint Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
       (libsource (lib interf_u_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307EA1))
     (comp (ref C1)
       (value 47uF)
-      (footprint Discret:CP6)
+      (footprint Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal)
       (libsource (lib interf_u_schlib) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307DE2))
     (comp (ref C4)
       (value 47uF)
-      (footprint Discret:CP6)
+      (footprint Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal)
       (libsource (lib interf_u_schlib) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307DCF))
     (comp (ref C5)
       (value 47uF)
-      (footprint Discret:CP6)
+      (footprint Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal)
       (libsource (lib interf_u_schlib) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307DCA))
     (comp (ref C6)
       (value 47uF)
-      (footprint Discret:CP6)
+      (footprint Capacitor_THT:CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal)
       (libsource (lib interf_u_schlib) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 32307DC0))
     (comp (ref U2)
       (value 74LS688)
-      (footprint Housings_DIP:DIP-20_W7.62mm)
+      (footprint Package_DIP:DIP-20_W7.62mm)
       (libsource (lib interf_u_schlib) (part 74LS688))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D35B4))
     (comp (ref U9)
       (value 4003APG120)
-      (footprint Sockets_PGA:PGA120)
+      (footprint interf_u:PGA120)
       (libsource (lib interf_u_schlib) (part 4003APG120))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D32FA))
     (comp (ref D2)
       (value LED)
-      (footprint LEDs:LED-5MM)
+      (footprint LED_THT:LED_D5.0mm)
       (libsource (lib interf_u_schlib) (part LED))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D32BE))
     (comp (ref D1)
       (value LED)
-      (footprint LEDs:LED-5MM)
+      (footprint LED_THT:LED_D5.0mm)
       (libsource (lib interf_u_schlib) (part LED))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D32AC))
     (comp (ref R5)
       (value 330)
-      (footprint Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
+      (footprint Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
       (libsource (lib interf_u_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D32A0))
     (comp (ref R4)
       (value 330)
-      (footprint Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
+      (footprint Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
       (libsource (lib interf_u_schlib) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D3295))
     (comp (ref U8)
       (value EP600)
-      (footprint Housings_DIP:DIP-24_W7.62mm)
+      (footprint Package_DIP:DIP-24_W7.62mm)
       (libsource (lib interf_u_schlib) (part EP600))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D321C))
     (comp (ref U1)
       (value 74LS245)
-      (footprint Housings_DIP:DIP-20_W7.62mm)
+      (footprint Package_DIP:DIP-20_W7.62mm)
       (libsource (lib interf_u_schlib) (part 74LS245))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D31F4))
     (comp (ref BUS1)
       (value BUSPC)
-      (footprint BUS_PC)
+      (footprint interf_u:BUS_PC)
       (libsource (lib interf_u_schlib) (part Bus_ISA_8bit))
       (sheetpath (names /) (tstamps /))
       (tstamp 322D3011)))
@@ -633,553 +633,553 @@
         (pin (num 10) (name 10) (type passive)))))
   (libraries
     (library (logical device)
-      (uri E:\kicad\share\kicad\library\/device.lib))
+      (uri E:\kicad\share\kicad\library/device.lib))
     (library (logical interf_u_schlib)
       (uri F:\kicad-launchpad\git_testing\demos\interf_u/interf_u_schlib.lib)))
   (nets
-    (net (code 1) (name "Net-(BUS1-Pad9)")
-      (node (ref BUS1) (pin 9)))
-    (net (code 2) (name "Net-(BUS1-Pad48)")
-      (node (ref BUS1) (pin 48)))
-    (net (code 3) (name "Net-(BUS1-Pad49)")
-      (node (ref BUS1) (pin 49)))
-    (net (code 4) (name "Net-(BUS1-Pad50)")
-      (node (ref BUS1) (pin 50)))
-    (net (code 5) (name "Net-(BUS1-Pad4)")
-      (node (ref BUS1) (pin 4)))
-    (net (code 6) (name "Net-(BUS1-Pad5)")
-      (node (ref BUS1) (pin 5)))
-    (net (code 7) (name "Net-(BUS1-Pad6)")
-      (node (ref BUS1) (pin 6)))
-    (net (code 8) (name "Net-(BUS1-Pad7)")
-      (node (ref BUS1) (pin 7)))
-    (net (code 9) (name "Net-(BUS1-Pad8)")
-      (node (ref BUS1) (pin 8)))
-    (net (code 10) (name "Net-(BUS1-Pad47)")
-      (node (ref BUS1) (pin 47)))
-    (net (code 11) (name "Net-(BUS1-Pad10)")
-      (node (ref BUS1) (pin 10)))
-    (net (code 12) (name "Net-(BUS1-Pad11)")
-      (node (ref BUS1) (pin 11)))
-    (net (code 13) (name "Net-(BUS1-Pad12)")
-      (node (ref BUS1) (pin 12)))
-    (net (code 14) (name "Net-(BUS1-Pad15)")
-      (node (ref BUS1) (pin 15)))
-    (net (code 15) (name "Net-(BUS1-Pad16)")
-      (node (ref BUS1) (pin 16)))
-    (net (code 16) (name "Net-(BUS1-Pad17)")
+    (net (code 1) (name "Net-(C3-Pad1)")
+      (node (ref R2) (pin 2))
+      (node (ref C3) (pin 1))
+      (node (ref X1) (pin 2))
+      (node (ref R1) (pin 1)))
+    (net (code 2) (name GND)
+      (node (ref C5) (pin 2))
+      (node (ref U5) (pin 16))
+      (node (ref U9) (pin L7))
+      (node (ref U9) (pin G2))
+      (node (ref U9) (pin G11))
+      (node (ref U9) (pin K3))
+      (node (ref U9) (pin K11))
+      (node (ref U1) (pin 10))
+      (node (ref BUS1) (pin 1))
+      (node (ref D2) (pin 1))
+      (node (ref U8) (pin 1))
+      (node (ref D1) (pin 1))
+      (node (ref U8) (pin 12))
+      (node (ref BUS1) (pin 31))
+      (node (ref P1) (pin 23))
+      (node (ref U3) (pin 1))
+      (node (ref U3) (pin 10))
+      (node (ref U3) (pin 19))
+      (node (ref P1) (pin 24))
+      (node (ref P1) (pin 25))
+      (node (ref P1) (pin 22))
+      (node (ref P1) (pin 18))
+      (node (ref P1) (pin 19))
+      (node (ref P1) (pin 20))
+      (node (ref P1) (pin 21))
+      (node (ref JP1) (pin 7))
+      (node (ref JP1) (pin 5))
+      (node (ref JP1) (pin 3))
+      (node (ref JP1) (pin 15))
+      (node (ref JP1) (pin 13))
+      (node (ref JP1) (pin 11))
+      (node (ref JP1) (pin 1))
+      (node (ref JP1) (pin 9))
+      (node (ref C2) (pin 2))
+      (node (ref U9) (pin C4))
+      (node (ref C6) (pin 2))
+      (node (ref U9) (pin B7))
+      (node (ref C3) (pin 2))
+      (node (ref U9) (pin C10))
+      (node (ref C1) (pin 2))
+      (node (ref U2) (pin 10))
+      (node (ref C4) (pin 2)))
+    (net (code 3) (name "Net-(BUS1-Pad17)")
       (node (ref BUS1) (pin 17)))
-    (net (code 17) (name "Net-(BUS1-Pad18)")
+    (net (code 4) (name "Net-(BUS1-Pad7)")
+      (node (ref BUS1) (pin 7)))
+    (net (code 5) (name "Net-(BUS1-Pad8)")
+      (node (ref BUS1) (pin 8)))
+    (net (code 6) (name "Net-(BUS1-Pad9)")
+      (node (ref BUS1) (pin 9)))
+    (net (code 7) (name "Net-(BUS1-Pad10)")
+      (node (ref BUS1) (pin 10)))
+    (net (code 8) (name "Net-(BUS1-Pad11)")
+      (node (ref BUS1) (pin 11)))
+    (net (code 9) (name "Net-(BUS1-Pad12)")
+      (node (ref BUS1) (pin 12)))
+    (net (code 10) (name "Net-(BUS1-Pad15)")
+      (node (ref BUS1) (pin 15)))
+    (net (code 11) (name "Net-(BUS1-Pad16)")
+      (node (ref BUS1) (pin 16)))
+    (net (code 12) (name "Net-(BUS1-Pad6)")
+      (node (ref BUS1) (pin 6)))
+    (net (code 13) (name "Net-(BUS1-Pad18)")
       (node (ref BUS1) (pin 18)))
-    (net (code 18) (name "Net-(BUS1-Pad19)")
+    (net (code 14) (name "Net-(BUS1-Pad19)")
       (node (ref BUS1) (pin 19)))
-    (net (code 19) (name "Net-(BUS1-Pad46)")
-      (node (ref BUS1) (pin 46)))
+    (net (code 15) (name "Net-(BUS1-Pad20)")
+      (node (ref BUS1) (pin 20)))
+    (net (code 16) (name "Net-(BUS1-Pad21)")
+      (node (ref BUS1) (pin 21)))
+    (net (code 17) (name "Net-(BUS1-Pad22)")
+      (node (ref BUS1) (pin 22)))
+    (net (code 18) (name "Net-(BUS1-Pad23)")
+      (node (ref BUS1) (pin 23)))
+    (net (code 19) (name "Net-(BUS1-Pad24)")
+      (node (ref BUS1) (pin 24)))
     (net (code 20) (name "Net-(BUS1-Pad45)")
       (node (ref BUS1) (pin 45)))
-    (net (code 21) (name "Net-(BUS1-Pad44)")
-      (node (ref BUS1) (pin 44)))
-    (net (code 22) (name "Net-(BUS1-Pad43)")
-      (node (ref BUS1) (pin 43)))
+    (net (code 21) (name "Net-(BUS1-Pad30)")
+      (node (ref BUS1) (pin 30)))
+    (net (code 22) (name "Net-(BUS1-Pad32)")
+      (node (ref BUS1) (pin 32)))
     (net (code 23) (name "Net-(BUS1-Pad41)")
       (node (ref BUS1) (pin 41)))
-    (net (code 24) (name "Net-(BUS1-Pad32)")
-      (node (ref BUS1) (pin 32)))
-    (net (code 25) (name "Net-(BUS1-Pad30)")
-      (node (ref BUS1) (pin 30)))
-    (net (code 26) (name "Net-(BUS1-Pad28)")
-      (node (ref BUS1) (pin 28)))
-    (net (code 27) (name "Net-(BUS1-Pad27)")
-      (node (ref BUS1) (pin 27)))
-    (net (code 28) (name "Net-(BUS1-Pad26)")
-      (node (ref BUS1) (pin 26)))
-    (net (code 29) (name "Net-(BUS1-Pad25)")
-      (node (ref BUS1) (pin 25)))
-    (net (code 30) (name "Net-(BUS1-Pad24)")
-      (node (ref BUS1) (pin 24)))
-    (net (code 31) (name "Net-(BUS1-Pad23)")
-      (node (ref BUS1) (pin 23)))
-    (net (code 32) (name "Net-(BUS1-Pad22)")
-      (node (ref BUS1) (pin 22)))
-    (net (code 33) (name "Net-(BUS1-Pad21)")
-      (node (ref BUS1) (pin 21)))
-    (net (code 34) (name "Net-(BUS1-Pad20)")
-      (node (ref BUS1) (pin 20)))
-    (net (code 35) (name "Net-(U9-PadA3)")
-      (node (ref U9) (pin A3)))
-    (net (code 36) (name "Net-(U9-PadA2)")
-      (node (ref U9) (pin A2)))
-    (net (code 37) (name "Net-(U9-PadA1)")
-      (node (ref U9) (pin A1)))
-    (net (code 38) (name "Net-(U9-PadB1)")
-      (node (ref U9) (pin B1)))
-    (net (code 39) (name "Net-(U9-PadB10)")
-      (node (ref U9) (pin B10)))
-    (net (code 40) (name "Net-(U9-PadB13)")
-      (node (ref U9) (pin B13)))
-    (net (code 41) (name "Net-(U9-PadB4)")
-      (node (ref U9) (pin B4)))
-    (net (code 42) (name "Net-(U9-PadB5)")
-      (node (ref U9) (pin B5)))
-    (net (code 43) (name VCC)
-      (node (ref U9) (pin D11))
-      (node (ref U9) (pin C3))
-      (node (ref U9) (pin L10))
-      (node (ref U3) (pin 20))
-      (node (ref U9) (pin L3))
-      (node (ref U9) (pin M7))
-      (node (ref R3) (pin 2))
-      (node (ref U9) (pin C11))
+    (net (code 24) (name "Net-(BUS1-Pad43)")
+      (node (ref BUS1) (pin 43)))
+    (net (code 25) (name "Net-(BUS1-Pad44)")
+      (node (ref BUS1) (pin 44)))
+    (net (code 26) (name "Net-(BUS1-Pad46)")
+      (node (ref BUS1) (pin 46)))
+    (net (code 27) (name "Net-(BUS1-Pad47)")
+      (node (ref BUS1) (pin 47)))
+    (net (code 28) (name "Net-(BUS1-Pad48)")
+      (node (ref BUS1) (pin 48)))
+    (net (code 29) (name "Net-(BUS1-Pad49)")
+      (node (ref BUS1) (pin 49)))
+    (net (code 30) (name "Net-(BUS1-Pad50)")
+      (node (ref BUS1) (pin 50)))
+    (net (code 31) (name "Net-(BUS1-Pad4)")
+      (node (ref BUS1) (pin 4)))
+    (net (code 32) (name "Net-(BUS1-Pad5)")
+      (node (ref BUS1) (pin 5)))
+    (net (code 33) (name VCC)
+      (node (ref U9) (pin B11))
       (node (ref U1) (pin 20))
       (node (ref U8) (pin 23))
       (node (ref U8) (pin 24))
-      (node (ref U9) (pin G12))
       (node (ref BUS1) (pin 3))
       (node (ref BUS1) (pin 29))
-      (node (ref U9) (pin B11))
-      (node (ref C4) (pin 1))
-      (node (ref RR1) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref C6) (pin 1))
-      (node (ref U9) (pin B12))
+      (node (ref U9) (pin L3))
+      (node (ref U9) (pin D11))
+      (node (ref U9) (pin C11))
+      (node (ref U9) (pin G12))
+      (node (ref U9) (pin M7))
+      (node (ref U9) (pin L10))
       (node (ref U2) (pin 20))
+      (node (ref U9) (pin B12))
+      (node (ref U9) (pin C3))
+      (node (ref C6) (pin 1))
+      (node (ref U3) (pin 20))
+      (node (ref C1) (pin 1))
+      (node (ref RR1) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref R3) (pin 2))
+      (node (ref C4) (pin 1))
       (node (ref U5) (pin 32)))
-    (net (code 44) (name /MA2)
-      (node (ref U5) (pin 10))
-      (node (ref U9) (pin D3)))
-    (net (code 45) (name /MA1)
-      (node (ref U9) (pin B2))
-      (node (ref U5) (pin 11)))
-    (net (code 46) (name /MA0)
-      (node (ref U5) (pin 12))
-      (node (ref U9) (pin A11)))
-    (net (code 47) (name /MA10)
-      (node (ref U9) (pin C9))
-      (node (ref U5) (pin 23)))
-    (net (code 48) (name /MA11)
-      (node (ref U9) (pin D2))
-      (node (ref U5) (pin 25)))
-    (net (code 49) (name /MD6)
-      (node (ref U9) (pin A9))
-      (node (ref U5) (pin 20)))
-    (net (code 50) (name /WR-)
-      (node (ref U5) (pin 29))
-      (node (ref U9) (pin A13)))
-    (net (code 51) (name /MD7)
-      (node (ref U5) (pin 21))
-      (node (ref U9) (pin B8)))
-    (net (code 52) (name /MA9)
-      (node (ref U9) (pin A4))
-      (node (ref U5) (pin 26)))
-    (net (code 53) (name /MD5)
-      (node (ref U5) (pin 19))
-      (node (ref U9) (pin A8)))
-    (net (code 54) (name /MD4)
-      (node (ref U5) (pin 18))
-      (node (ref U9) (pin A7)))
-    (net (code 55) (name /MD3)
-      (node (ref U5) (pin 17))
-      (node (ref U9) (pin A6)))
-    (net (code 56) (name /MD2)
-      (node (ref U5) (pin 15))
-      (node (ref U9) (pin B6)))
-    (net (code 57) (name /MD1)
-      (node (ref U9) (pin A5))
-      (node (ref U5) (pin 14)))
-    (net (code 58) (name /MD0)
-      (node (ref U9) (pin C6))
-      (node (ref U5) (pin 13)))
-    (net (code 59) (name /OE-)
-      (node (ref U9) (pin B9))
-      (node (ref U5) (pin 24)))
-    (net (code 60) (name /CS1-)
-      (node (ref U5) (pin 22))
-      (node (ref U9) (pin A10)))
-    (net (code 61) (name /MA16)
-      (node (ref U5) (pin 2))
-      (node (ref U9) (pin C8)))
-    (net (code 62) (name /PC-IOW)
-      (node (ref U3) (pin 6))
-      (node (ref BUS1) (pin 13)))
-    (net (code 63) (name /PC-IOR)
-      (node (ref BUS1) (pin 14))
-      (node (ref U3) (pin 7)))
-    (net (code 64) (name /MATCHL)
-      (node (ref U2) (pin 19))
-      (node (ref U8) (pin 2)))
-    (net (code 65) (name "Net-(U3-Pad11)")
-      (node (ref U3) (pin 11)))
-    (net (code 66) (name /PC-RD)
-      (node (ref U9) (pin M8))
-      (node (ref U8) (pin 14))
-      (node (ref U3) (pin 13)))
-    (net (code 67) (name /RSTL)
-      (node (ref U8) (pin 11))
-      (node (ref U3) (pin 12)))
-    (net (code 68) (name /PC-AEN)
-      (node (ref U2) (pin 1))
-      (node (ref BUS1) (pin 42))
-      (node (ref U9) (pin N10)))
-    (net (code 69) (name /MA8)
-      (node (ref U9) (pin G1))
-      (node (ref U5) (pin 27)))
-    (net (code 70) (name /MA13)
-      (node (ref U5) (pin 28))
-      (node (ref U9) (pin C1)))
-    (net (code 71) (name /MA14)
-      (node (ref U9) (pin D1))
-      (node (ref U5) (pin 3)))
-    (net (code 72) (name "Net-(R3-Pad1)")
-      (node (ref U5) (pin 30))
-      (node (ref R3) (pin 1)))
-    (net (code 73) (name /MA12)
-      (node (ref U5) (pin 4))
-      (node (ref U9) (pin F3)))
-    (net (code 74) (name /MA7)
-      (node (ref U9) (pin B3))
-      (node (ref U5) (pin 5)))
-    (net (code 75) (name /MA6)
+    (net (code 34) (name /AUTOFD-)
+      (node (ref U9) (pin C12))
+      (node (ref P1) (pin 14)))
+    (net (code 35) (name "Net-(U9-PadC5)")
+      (node (ref U9) (pin C5)))
+    (net (code 36) (name "Net-(U9-PadE3)")
+      (node (ref U9) (pin E3)))
+    (net (code 37) (name "Net-(U9-PadE2)")
+      (node (ref U9) (pin E2)))
+    (net (code 38) (name "Net-(U9-PadE11)")
+      (node (ref U9) (pin E11)))
+    (net (code 39) (name "Net-(U9-PadB5)")
+      (node (ref U9) (pin B5)))
+    (net (code 40) (name /STROBE)
+      (node (ref P1) (pin 1))
+      (node (ref U9) (pin A12)))
+    (net (code 41) (name "Net-(U9-PadA1)")
+      (node (ref U9) (pin A1)))
+    (net (code 42) (name "Net-(U9-PadB4)")
+      (node (ref U9) (pin B4)))
+    (net (code 43) (name "Net-(U9-PadB13)")
+      (node (ref U9) (pin B13)))
+    (net (code 44) (name "Net-(U9-PadB10)")
+      (node (ref U9) (pin B10)))
+    (net (code 45) (name "Net-(U9-PadB1)")
+      (node (ref U9) (pin B1)))
+    (net (code 46) (name "Net-(BUS1-Pad25)")
+      (node (ref BUS1) (pin 25)))
+    (net (code 47) (name "Net-(U9-PadA3)")
+      (node (ref U9) (pin A3)))
+    (net (code 48) (name "Net-(U9-PadA2)")
+      (node (ref U9) (pin A2)))
+    (net (code 49) (name /MA14)
+      (node (ref U5) (pin 3))
+      (node (ref U9) (pin D1)))
+    (net (code 50) (name /MA6)
       (node (ref U5) (pin 6))
       (node (ref U9) (pin F2)))
-    (net (code 76) (name /MA5)
+    (net (code 51) (name /MA7)
+      (node (ref U9) (pin B3))
+      (node (ref U5) (pin 5)))
+    (net (code 52) (name /MA8)
+      (node (ref U5) (pin 27))
+      (node (ref U9) (pin G1)))
+    (net (code 53) (name /MA9)
+      (node (ref U9) (pin A4))
+      (node (ref U5) (pin 26)))
+    (net (code 54) (name /MA10)
+      (node (ref U9) (pin C9))
+      (node (ref U5) (pin 23)))
+    (net (code 55) (name /MA11)
+      (node (ref U9) (pin D2))
+      (node (ref U5) (pin 25)))
+    (net (code 56) (name /MA12)
+      (node (ref U9) (pin F3))
+      (node (ref U5) (pin 4)))
+    (net (code 57) (name /MA13)
+      (node (ref U9) (pin C1))
+      (node (ref U5) (pin 28)))
+    (net (code 58) (name /MA5)
       (node (ref U9) (pin C13))
       (node (ref U5) (pin 7)))
-    (net (code 77) (name /MA4)
-      (node (ref U9) (pin E1))
-      (node (ref U5) (pin 8)))
-    (net (code 78) (name /MA3)
+    (net (code 59) (name /MA15)
+      (node (ref U5) (pin 31))
+      (node (ref U9) (pin F1)))
+    (net (code 60) (name /MA16)
+      (node (ref U9) (pin C8))
+      (node (ref U5) (pin 2)))
+    (net (code 61) (name /CS1-)
+      (node (ref U9) (pin A10))
+      (node (ref U5) (pin 22)))
+    (net (code 62) (name /OE-)
+      (node (ref U9) (pin B9))
+      (node (ref U5) (pin 24)))
+    (net (code 63) (name /WR-)
+      (node (ref U9) (pin A13))
+      (node (ref U5) (pin 29)))
+    (net (code 64) (name "Net-(R3-Pad1)")
+      (node (ref U5) (pin 30))
+      (node (ref R3) (pin 1)))
+    (net (code 65) (name /MA0)
+      (node (ref U5) (pin 12))
+      (node (ref U9) (pin A11)))
+    (net (code 66) (name /MA1)
+      (node (ref U5) (pin 11))
+      (node (ref U9) (pin B2)))
+    (net (code 67) (name /MA2)
+      (node (ref U5) (pin 10))
+      (node (ref U9) (pin D3)))
+    (net (code 68) (name /MA3)
       (node (ref U9) (pin C2))
       (node (ref U5) (pin 9)))
-    (net (code 79) (name "Net-(U8-Pad10)")
-      (node (ref U8) (pin 10)))
-    (net (code 80) (name "Net-(U8-Pad9)")
-      (node (ref U8) (pin 9)))
-    (net (code 81) (name "Net-(U8-Pad8)")
-      (node (ref U8) (pin 8)))
-    (net (code 82) (name /PC-RST)
-      (node (ref U3) (pin 8))
-      (node (ref U3) (pin 9))
-      (node (ref BUS1) (pin 2)))
-    (net (code 83) (name GND)
-      (node (ref U8) (pin 12))
-      (node (ref U8) (pin 1))
-      (node (ref P1) (pin 25))
-      (node (ref C1) (pin 2))
-      (node (ref BUS1) (pin 1))
-      (node (ref P1) (pin 24))
-      (node (ref P1) (pin 23))
-      (node (ref P1) (pin 22))
-      (node (ref D2) (pin 1))
-      (node (ref P1) (pin 21))
-      (node (ref D1) (pin 1))
-      (node (ref P1) (pin 20))
-      (node (ref P1) (pin 18))
-      (node (ref P1) (pin 19))
-      (node (ref U5) (pin 16))
-      (node (ref U9) (pin B7))
-      (node (ref U1) (pin 10))
-      (node (ref U3) (pin 1))
-      (node (ref U2) (pin 10))
-      (node (ref C5) (pin 2))
-      (node (ref BUS1) (pin 31))
-      (node (ref C6) (pin 2))
-      (node (ref U9) (pin L7))
-      (node (ref U3) (pin 10))
-      (node (ref C4) (pin 2))
-      (node (ref C3) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref JP1) (pin 13))
-      (node (ref U9) (pin G11))
-      (node (ref JP1) (pin 3))
-      (node (ref JP1) (pin 11))
-      (node (ref U9) (pin K11))
-      (node (ref U3) (pin 19))
-      (node (ref U9) (pin G2))
-      (node (ref JP1) (pin 15))
-      (node (ref JP1) (pin 5))
-      (node (ref JP1) (pin 9))
-      (node (ref JP1) (pin 7))
-      (node (ref U9) (pin C4))
-      (node (ref U9) (pin K3))
-      (node (ref U9) (pin C10))
-      (node (ref JP1) (pin 1)))
-    (net (code 84) (name /D3)
-      (node (ref U9) (pin M9))
-      (node (ref U1) (pin 15)))
-    (net (code 85) (name /D4)
-      (node (ref U1) (pin 14))
-      (node (ref U9) (pin M10)))
-    (net (code 86) (name /D5)
-      (node (ref U1) (pin 13))
-      (node (ref U9) (pin N11)))
-    (net (code 87) (name /D6)
-      (node (ref U9) (pin M11))
-      (node (ref U1) (pin 12)))
-    (net (code 88) (name /D7)
-      (node (ref U9) (pin L12))
-      (node (ref U1) (pin 11)))
-    (net (code 89) (name /DIR)
-      (node (ref U1) (pin 1))
-      (node (ref U8) (pin 17)))
-    (net (code 90) (name /D2)
-      (node (ref U1) (pin 16))
-      (node (ref U9) (pin N9)))
-    (net (code 91) (name /PC-WR)
-      (node (ref U9) (pin N6))
-      (node (ref U8) (pin 7))
-      (node (ref U3) (pin 14)))
-    (net (code 92) (name "Net-(U3-Pad15)")
-      (node (ref U3) (pin 15))
-      (node (ref U8) (pin 6)))
-    (net (code 93) (name "Net-(U3-Pad16)")
-      (node (ref U3) (pin 16))
-      (node (ref U8) (pin 5)))
-    (net (code 94) (name "Net-(U3-Pad17)")
-      (node (ref U3) (pin 17))
-      (node (ref U8) (pin 4)))
-    (net (code 95) (name "Net-(U3-Pad18)")
-      (node (ref U8) (pin 3))
-      (node (ref U3) (pin 18)))
-    (net (code 96) (name /D1)
-      (node (ref U1) (pin 17))
-      (node (ref U9) (pin N8)))
-    (net (code 97) (name /ENBBUF)
-      (node (ref U1) (pin 19))
-      (node (ref U8) (pin 22)))
-    (net (code 98) (name /PC-DB0)
-      (node (ref BUS1) (pin 40))
-      (node (ref U1) (pin 2)))
-    (net (code 99) (name /PC-DB1)
-      (node (ref U1) (pin 3))
-      (node (ref BUS1) (pin 39)))
-    (net (code 100) (name /PC-DB2)
-      (node (ref U1) (pin 4))
-      (node (ref BUS1) (pin 38)))
-    (net (code 101) (name /PC-DB3)
-      (node (ref U1) (pin 5))
-      (node (ref BUS1) (pin 37)))
-    (net (code 102) (name /PC-DB4)
-      (node (ref BUS1) (pin 36))
-      (node (ref U1) (pin 6)))
-    (net (code 103) (name /PC-DB5)
-      (node (ref U1) (pin 7))
-      (node (ref BUS1) (pin 35)))
-    (net (code 104) (name /PC-DB6)
-      (node (ref BUS1) (pin 34))
-      (node (ref U1) (pin 8)))
-    (net (code 105) (name /PC-DB7)
-      (node (ref BUS1) (pin 33))
-      (node (ref U1) (pin 9)))
-    (net (code 106) (name /PC-A5)
-      (node (ref U9) (pin J2))
-      (node (ref BUS1) (pin 57))
-      (node (ref U2) (pin 2)))
-    (net (code 107) (name /PC-A11)
+    (net (code 69) (name /MA4)
+      (node (ref U9) (pin E1))
+      (node (ref U5) (pin 8)))
+    (net (code 70) (name /PC-A11)
       (node (ref U2) (pin 8))
       (node (ref BUS1) (pin 51)))
-    (net (code 108) (name /PC-A10)
-      (node (ref U9) (pin L8))
+    (net (code 71) (name /PC-A10)
       (node (ref U2) (pin 11))
+      (node (ref U9) (pin L8))
       (node (ref BUS1) (pin 52)))
-    (net (code 109) (name /PC-A9)
-      (node (ref BUS1) (pin 53))
+    (net (code 72) (name "Net-(BUS1-Pad26)")
+      (node (ref BUS1) (pin 26)))
+    (net (code 73) (name "Net-(BUS1-Pad27)")
+      (node (ref BUS1) (pin 27)))
+    (net (code 74) (name "Net-(BUS1-Pad28)")
+      (node (ref BUS1) (pin 28)))
+    (net (code 75) (name /PC-A9)
       (node (ref U2) (pin 6))
+      (node (ref BUS1) (pin 53))
       (node (ref U9) (pin N7)))
-    (net (code 110) (name /PC-A8)
+    (net (code 76) (name "Net-(U3-Pad11)")
+      (node (ref U3) (pin 11)))
+    (net (code 77) (name "Net-(U8-Pad8)")
+      (node (ref U8) (pin 8)))
+    (net (code 78) (name "Net-(U8-Pad9)")
+      (node (ref U8) (pin 9)))
+    (net (code 79) (name "Net-(U8-Pad10)")
+      (node (ref U8) (pin 10)))
+    (net (code 80) (name /PC-IOR)
+      (node (ref U3) (pin 7))
+      (node (ref BUS1) (pin 14)))
+    (net (code 81) (name /PC-IOW)
+      (node (ref BUS1) (pin 13))
+      (node (ref U3) (pin 6)))
+    (net (code 82) (name /PC-AEN)
+      (node (ref U9) (pin N10))
+      (node (ref U2) (pin 1))
+      (node (ref BUS1) (pin 42)))
+    (net (code 83) (name /PC-A8)
       (node (ref BUS1) (pin 54))
-      (node (ref U2) (pin 4))
-      (node (ref U9) (pin H1)))
-    (net (code 111) (name /PC-A7)
-      (node (ref BUS1) (pin 55))
-      (node (ref U9) (pin H2))
-      (node (ref U2) (pin 13)))
-    (net (code 112) (name /PC-A6)
-      (node (ref U2) (pin 15))
-      (node (ref U9) (pin J1))
-      (node (ref BUS1) (pin 56)))
-    (net (code 113) (name /PC-A4)
-      (node (ref U2) (pin 17))
-      (node (ref U9) (pin H3))
-      (node (ref BUS1) (pin 58)))
-    (net (code 114) (name /PC-A3)
-      (node (ref U3) (pin 5))
-      (node (ref BUS1) (pin 59))
-      (node (ref U9) (pin K2)))
-    (net (code 115) (name /PC-A2)
+      (node (ref U9) (pin H1))
+      (node (ref U2) (pin 4)))
+    (net (code 84) (name /PC-A1)
+      (node (ref U3) (pin 2))
+      (node (ref BUS1) (pin 61))
+      (node (ref U9) (pin N4)))
+    (net (code 85) (name /PC-A2)
       (node (ref U9) (pin M5))
       (node (ref U3) (pin 4))
       (node (ref BUS1) (pin 60)))
-    (net (code 116) (name /PC-A1)
-      (node (ref U9) (pin N4))
-      (node (ref U3) (pin 2))
-      (node (ref BUS1) (pin 61)))
-    (net (code 117) (name /PC-A0)
+    (net (code 86) (name /PC-A3)
+      (node (ref U9) (pin K2))
+      (node (ref BUS1) (pin 59))
+      (node (ref U3) (pin 5)))
+    (net (code 87) (name /PC-A4)
+      (node (ref BUS1) (pin 58))
+      (node (ref U2) (pin 17))
+      (node (ref U9) (pin H3)))
+    (net (code 88) (name /PC-A5)
+      (node (ref U9) (pin J2))
+      (node (ref BUS1) (pin 57))
+      (node (ref U2) (pin 2)))
+    (net (code 89) (name /PC-A6)
+      (node (ref U2) (pin 15))
+      (node (ref U9) (pin J1))
+      (node (ref BUS1) (pin 56)))
+    (net (code 90) (name /PC-A7)
+      (node (ref U2) (pin 13))
+      (node (ref U9) (pin H2))
+      (node (ref BUS1) (pin 55)))
+    (net (code 91) (name /PC-A0)
       (node (ref U3) (pin 3))
       (node (ref BUS1) (pin 62))
       (node (ref U9) (pin M6)))
-    (net (code 118) (name /MA15)
-      (node (ref U9) (pin F1))
-      (node (ref U5) (pin 31)))
-    (net (code 119) (name "Net-(U9-PadJ11)")
-      (node (ref U9) (pin J11)))
-    (net (code 120) (name "Net-(U9-PadJ3)")
-      (node (ref U9) (pin J3)))
-    (net (code 121) (name "Net-(U9-PadK12)")
-      (node (ref U9) (pin K12)))
-    (net (code 122) (name "Net-(U9-PadC5)")
-      (node (ref U9) (pin C5)))
-    (net (code 123) (name "Net-(U9-PadE11)")
-      (node (ref U9) (pin E11)))
-    (net (code 124) (name "Net-(U9-PadE2)")
-      (node (ref U9) (pin E2)))
-    (net (code 125) (name "Net-(U9-PadE3)")
-      (node (ref U9) (pin E3)))
-    (net (code 126) (name /LED2)
-      (node (ref U9) (pin F13))
-      (node (ref R5) (pin 2)))
-    (net (code 127) (name "Net-(D2-Pad2)")
-      (node (ref R5) (pin 1))
-      (node (ref D2) (pin 2)))
-    (net (code 128) (name "Net-(D1-Pad2)")
-      (node (ref D1) (pin 2))
-      (node (ref R4) (pin 1)))
-    (net (code 129) (name "Net-(U9-PadN5)")
-      (node (ref U9) (pin N5)))
-    (net (code 130) (name "Net-(U9-PadN3)")
-      (node (ref U9) (pin N3)))
-    (net (code 131) (name /D0)
-      (node (ref U1) (pin 18))
-      (node (ref U9) (pin N2))
-      (node (ref U8) (pin 21)))
-    (net (code 132) (name "Net-(U9-PadN12)")
+    (net (code 92) (name /PC-DB1)
+      (node (ref BUS1) (pin 39))
+      (node (ref U1) (pin 3)))
+    (net (code 93) (name /PC-DB0)
+      (node (ref U1) (pin 2))
+      (node (ref BUS1) (pin 40)))
+    (net (code 94) (name /PC-DB2)
+      (node (ref BUS1) (pin 38))
+      (node (ref U1) (pin 4)))
+    (net (code 95) (name /PC-DB3)
+      (node (ref BUS1) (pin 37))
+      (node (ref U1) (pin 5)))
+    (net (code 96) (name /PC-DB4)
+      (node (ref BUS1) (pin 36))
+      (node (ref U1) (pin 6)))
+    (net (code 97) (name /PC-DB5)
+      (node (ref U1) (pin 7))
+      (node (ref BUS1) (pin 35)))
+    (net (code 98) (name /PC-DB6)
+      (node (ref U1) (pin 8))
+      (node (ref BUS1) (pin 34)))
+    (net (code 99) (name /PC-DB7)
+      (node (ref U1) (pin 9))
+      (node (ref BUS1) (pin 33)))
+    (net (code 100) (name "Net-(U9-PadM1)")
+      (node (ref U9) (pin M1)))
+    (net (code 101) (name "Net-(U9-PadL9)")
+      (node (ref U9) (pin L9)))
+    (net (code 102) (name "Net-(U9-PadL6)")
+      (node (ref U9) (pin L6)))
+    (net (code 103) (name "Net-(U9-PadL5)")
+      (node (ref U9) (pin L5)))
+    (net (code 104) (name "Net-(U9-PadN12)")
       (node (ref U9) (pin N12)))
-    (net (code 133) (name /LED1)
+    (net (code 105) (name "Net-(U9-PadN1)")
+      (node (ref U9) (pin N1)))
+    (net (code 106) (name "Net-(C2-Pad1)")
+      (node (ref R1) (pin 2))
+      (node (ref X1) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref U9) (pin L1)))
+    (net (code 107) (name "Net-(U9-PadM2)")
+      (node (ref U9) (pin M2)))
+    (net (code 108) (name "Net-(U9-PadJ3)")
+      (node (ref U9) (pin J3)))
+    (net (code 109) (name "Net-(U9-PadK12)")
+      (node (ref U9) (pin K12)))
+    (net (code 110) (name "Net-(U9-PadJ11)")
+      (node (ref U9) (pin J11)))
+    (net (code 111) (name /D1)
+      (node (ref U1) (pin 17))
+      (node (ref U9) (pin N8)))
+    (net (code 112) (name /D2)
+      (node (ref U1) (pin 16))
+      (node (ref U9) (pin N9)))
+    (net (code 113) (name /D3)
+      (node (ref U1) (pin 15))
+      (node (ref U9) (pin M9)))
+    (net (code 114) (name /D4)
+      (node (ref U1) (pin 14))
+      (node (ref U9) (pin M10)))
+    (net (code 115) (name /D5)
+      (node (ref U9) (pin N11))
+      (node (ref U1) (pin 13)))
+    (net (code 116) (name /D6)
+      (node (ref U1) (pin 12))
+      (node (ref U9) (pin M11)))
+    (net (code 117) (name /D7)
+      (node (ref U9) (pin L12))
+      (node (ref U1) (pin 11)))
+    (net (code 118) (name /PC-WR)
+      (node (ref U3) (pin 14))
+      (node (ref U9) (pin N6))
+      (node (ref U8) (pin 7)))
+    (net (code 119) (name "Net-(U3-Pad15)")
+      (node (ref U8) (pin 6))
+      (node (ref U3) (pin 15)))
+    (net (code 120) (name "Net-(U3-Pad16)")
+      (node (ref U8) (pin 5))
+      (node (ref U3) (pin 16)))
+    (net (code 121) (name "Net-(U3-Pad17)")
+      (node (ref U3) (pin 17))
+      (node (ref U8) (pin 4)))
+    (net (code 122) (name "Net-(U3-Pad18)")
+      (node (ref U3) (pin 18))
+      (node (ref U8) (pin 3)))
+    (net (code 123) (name /LED1)
       (node (ref R4) (pin 2))
       (node (ref U9) (pin M3)))
-    (net (code 134) (name /SEL_LPT)
-      (node (ref U8) (pin 18))
-      (node (ref U9) (pin L2)))
-    (net (code 135) (name "Net-(U9-PadL9)")
-      (node (ref U9) (pin L9)))
-    (net (code 136) (name /DONE)
-      (node (ref U9) (pin L11))
-      (node (ref U8) (pin 20)))
-    (net (code 137) (name /CLKLCA)
-      (node (ref U8) (pin 16))
+    (net (code 124) (name "Net-(D1-Pad2)")
+      (node (ref R4) (pin 1))
+      (node (ref D1) (pin 2)))
+    (net (code 125) (name "Net-(D2-Pad2)")
+      (node (ref D2) (pin 2))
+      (node (ref R5) (pin 1)))
+    (net (code 126) (name "Net-(U9-PadN5)")
+      (node (ref U9) (pin N5)))
+    (net (code 127) (name "Net-(U9-PadN3)")
+      (node (ref U9) (pin N3)))
+    (net (code 128) (name /MD0)
+      (node (ref U5) (pin 13))
+      (node (ref U9) (pin C6)))
+    (net (code 129) (name /PC-RD)
+      (node (ref U3) (pin 13))
+      (node (ref U8) (pin 14))
+      (node (ref U9) (pin M8)))
+    (net (code 130) (name /WR_REG)
+      (node (ref U8) (pin 15))
+      (node (ref U8) (pin 13)))
+    (net (code 131) (name /CLKLCA)
+      (node (ref U9) (pin M4))
       (node (ref U9) (pin L4))
-      (node (ref U9) (pin M4)))
-    (net (code 138) (name "Net-(U9-PadL5)")
-      (node (ref U9) (pin L5)))
-    (net (code 139) (name "Net-(U9-PadL6)")
-      (node (ref U9) (pin L6)))
-    (net (code 140) (name "Net-(U9-PadM1)")
-      (node (ref U9) (pin M1)))
-    (net (code 141) (name /PROG-)
+      (node (ref U8) (pin 16)))
+    (net (code 132) (name /DIR)
+      (node (ref U1) (pin 1))
+      (node (ref U8) (pin 17)))
+    (net (code 133) (name /SEL_LPT)
+      (node (ref U9) (pin L2))
+      (node (ref U8) (pin 18)))
+    (net (code 134) (name /PROG-)
       (node (ref U8) (pin 19))
       (node (ref U9) (pin M12)))
-    (net (code 142) (name "Net-(U9-PadM2)")
-      (node (ref U9) (pin M2)))
-    (net (code 143) (name "Net-(U9-PadN1)")
-      (node (ref U9) (pin N1)))
-    (net (code 144) (name "Net-(C2-Pad1)")
-      (node (ref U9) (pin L1))
-      (node (ref C2) (pin 1))
-      (node (ref X1) (pin 1))
-      (node (ref R1) (pin 2)))
-    (net (code 145) (name "Net-(C3-Pad1)")
-      (node (ref X1) (pin 2))
-      (node (ref R2) (pin 2))
-      (node (ref R1) (pin 1))
-      (node (ref C3) (pin 1)))
-    (net (code 146) (name /WR_REG)
-      (node (ref U8) (pin 13))
-      (node (ref U8) (pin 15)))
-    (net (code 147) (name /SLCTIN-)
-      (node (ref U9) (pin F11))
-      (node (ref P1) (pin 17)))
-    (net (code 148) (name /ERROR-)
-      (node (ref P1) (pin 15))
-      (node (ref U9) (pin D13)))
-    (net (code 149) (name /INIT-)
-      (node (ref P1) (pin 16))
-      (node (ref U9) (pin E12)))
-    (net (code 150) (name /BIT0)
-      (node (ref U9) (pin D12))
-      (node (ref P1) (pin 2)))
+    (net (code 135) (name /MATCHL)
+      (node (ref U8) (pin 2))
+      (node (ref U2) (pin 19)))
+    (net (code 136) (name /DONE)
+      (node (ref U8) (pin 20))
+      (node (ref U9) (pin L11)))
+    (net (code 137) (name /D0)
+      (node (ref U9) (pin N2))
+      (node (ref U1) (pin 18))
+      (node (ref U8) (pin 21)))
+    (net (code 138) (name /ENBBUF)
+      (node (ref U1) (pin 19))
+      (node (ref U8) (pin 22)))
+    (net (code 139) (name /PC-RST)
+      (node (ref U3) (pin 9))
+      (node (ref U3) (pin 8))
+      (node (ref BUS1) (pin 2)))
+    (net (code 140) (name /RSTL)
+      (node (ref U3) (pin 12))
+      (node (ref U8) (pin 11)))
+    (net (code 141) (name /SLCT+)
+      (node (ref U9) (pin N13))
+      (node (ref P1) (pin 13)))
+    (net (code 142) (name /PE+)
+      (node (ref P1) (pin 12))
+      (node (ref U9) (pin L13)))
+    (net (code 143) (name /BUST+)
+      (node (ref P1) (pin 11))
+      (node (ref U9) (pin J12)))
+    (net (code 144) (name /ACK)
+      (node (ref P1) (pin 10))
+      (node (ref U9) (pin K13)))
+    (net (code 145) (name /BIT7)
+      (node (ref U9) (pin H11))
+      (node (ref P1) (pin 9)))
+    (net (code 146) (name /BIT5)
+      (node (ref P1) (pin 7))
+      (node (ref U9) (pin H12)))
+    (net (code 147) (name /BIT6)
+      (node (ref U9) (pin J13))
+      (node (ref P1) (pin 8)))
+    (net (code 148) (name /BIT4)
+      (node (ref U9) (pin H13))
+      (node (ref P1) (pin 6)))
+    (net (code 149) (name /BIT3)
+      (node (ref P1) (pin 5))
+      (node (ref U9) (pin G13)))
+    (net (code 150) (name /BIT2)
+      (node (ref U9) (pin F12))
+      (node (ref P1) (pin 4)))
     (net (code 151) (name /BIT1)
       (node (ref P1) (pin 3))
       (node (ref U9) (pin E13)))
-    (net (code 152) (name /BIT2)
-      (node (ref P1) (pin 4))
-      (node (ref U9) (pin F12)))
-    (net (code 153) (name /BIT3)
-      (node (ref U9) (pin G13))
-      (node (ref P1) (pin 5)))
-    (net (code 154) (name /BIT4)
-      (node (ref U9) (pin H13))
-      (node (ref P1) (pin 6)))
-    (net (code 155) (name /BIT6)
-      (node (ref P1) (pin 8))
-      (node (ref U9) (pin J13)))
-    (net (code 156) (name /BIT5)
-      (node (ref P1) (pin 7))
-      (node (ref U9) (pin H12)))
-    (net (code 157) (name /BIT7)
-      (node (ref U9) (pin H11))
-      (node (ref P1) (pin 9)))
-    (net (code 158) (name /ACK)
-      (node (ref P1) (pin 10))
-      (node (ref U9) (pin K13)))
-    (net (code 159) (name /BUST+)
-      (node (ref U9) (pin J12))
-      (node (ref P1) (pin 11)))
-    (net (code 160) (name /PE+)
-      (node (ref P1) (pin 12))
-      (node (ref U9) (pin L13)))
-    (net (code 161) (name /SLCT+)
-      (node (ref P1) (pin 13))
-      (node (ref U9) (pin N13)))
-    (net (code 162) (name /AUTOFD-)
-      (node (ref P1) (pin 14))
-      (node (ref U9) (pin C12)))
-    (net (code 163) (name /STROBE)
-      (node (ref U9) (pin A12))
-      (node (ref P1) (pin 1)))
-    (net (code 164) (name /REF5)
-      (node (ref RR1) (pin 2))
-      (node (ref U2) (pin 3))
-      (node (ref JP1) (pin 16)))
-    (net (code 165) (name /REF4)
-      (node (ref RR1) (pin 3))
-      (node (ref JP1) (pin 14))
-      (node (ref U2) (pin 18)))
-    (net (code 166) (name /REF8)
-      (node (ref U2) (pin 5))
-      (node (ref RR1) (pin 4))
-      (node (ref JP1) (pin 12)))
-    (net (code 167) (name /REF6)
-      (node (ref JP1) (pin 10))
-      (node (ref RR1) (pin 5))
-      (node (ref U2) (pin 16)))
-    (net (code 168) (name /REF9)
-      (node (ref RR1) (pin 6))
-      (node (ref JP1) (pin 8))
-      (node (ref U2) (pin 7)))
-    (net (code 169) (name /8MH-OUT)
-      (node (ref R2) (pin 1))
-      (node (ref U9) (pin K1)))
-    (net (code 170) (name "Net-(RR1-Pad10)")
+    (net (code 152) (name /SLCTIN-)
+      (node (ref P1) (pin 17))
+      (node (ref U9) (pin F11)))
+    (net (code 153) (name /ERROR-)
+      (node (ref P1) (pin 15))
+      (node (ref U9) (pin D13)))
+    (net (code 154) (name /INIT-)
+      (node (ref U9) (pin E12))
+      (node (ref P1) (pin 16)))
+    (net (code 155) (name /BIT0)
+      (node (ref U9) (pin D12))
+      (node (ref P1) (pin 2)))
+    (net (code 156) (name /MD1)
+      (node (ref U5) (pin 14))
+      (node (ref U9) (pin A5)))
+    (net (code 157) (name /MD2)
+      (node (ref U9) (pin B6))
+      (node (ref U5) (pin 15)))
+    (net (code 158) (name /MD3)
+      (node (ref U9) (pin A6))
+      (node (ref U5) (pin 17)))
+    (net (code 159) (name /MD4)
+      (node (ref U5) (pin 18))
+      (node (ref U9) (pin A7)))
+    (net (code 160) (name /MD5)
+      (node (ref U5) (pin 19))
+      (node (ref U9) (pin A8)))
+    (net (code 161) (name /MD6)
+      (node (ref U5) (pin 20))
+      (node (ref U9) (pin A9)))
+    (net (code 162) (name /MD7)
+      (node (ref U5) (pin 21))
+      (node (ref U9) (pin B8)))
+    (net (code 163) (name /LED2)
+      (node (ref R5) (pin 2))
+      (node (ref U9) (pin F13)))
+    (net (code 164) (name "Net-(RR1-Pad10)")
       (node (ref RR1) (pin 10)))
-    (net (code 171) (name /REF10)
-      (node (ref U2) (pin 12))
-      (node (ref RR1) (pin 9))
-      (node (ref JP1) (pin 2)))
-    (net (code 172) (name /REF11)
+    (net (code 165) (name /8MH-OUT)
+      (node (ref U9) (pin K1))
+      (node (ref R2) (pin 1)))
+    (net (code 166) (name /REF9)
+      (node (ref U2) (pin 7))
+      (node (ref JP1) (pin 8))
+      (node (ref RR1) (pin 6)))
+    (net (code 167) (name /REF7)
+      (node (ref U2) (pin 14))
+      (node (ref JP1) (pin 6))
+      (node (ref RR1) (pin 7)))
+    (net (code 168) (name /REF11)
       (node (ref U2) (pin 9))
       (node (ref JP1) (pin 4))
       (node (ref RR1) (pin 8)))
-    (net (code 173) (name /REF7)
-      (node (ref U2) (pin 14))
-      (node (ref RR1) (pin 7))
-      (node (ref JP1) (pin 6)))))
\ No newline at end of file
+    (net (code 169) (name /REF10)
+      (node (ref JP1) (pin 2))
+      (node (ref U2) (pin 12))
+      (node (ref RR1) (pin 9)))
+    (net (code 170) (name /REF6)
+      (node (ref RR1) (pin 5))
+      (node (ref U2) (pin 16))
+      (node (ref JP1) (pin 10)))
+    (net (code 171) (name /REF8)
+      (node (ref U2) (pin 5))
+      (node (ref RR1) (pin 4))
+      (node (ref JP1) (pin 12)))
+    (net (code 172) (name /REF4)
+      (node (ref JP1) (pin 14))
+      (node (ref U2) (pin 18))
+      (node (ref RR1) (pin 3)))
+    (net (code 173) (name /REF5)
+      (node (ref U2) (pin 3))
+      (node (ref JP1) (pin 16))
+      (node (ref RR1) (pin 2)))))
\ No newline at end of file
diff --git a/demos/interf_u/interf_u.sch b/demos/interf_u/interf_u.sch
index d04e90f0cd..be424d2b07 100644
--- a/demos/interf_u/interf_u.sch
+++ b/demos/interf_u/interf_u.sch
@@ -2301,7 +2301,7 @@ U 1 1 324002E6
 P 6450 9900
 F 0 "R3" V 6530 9900 50  0000 C CNN
 F 1 "10K" V 6450 9900 50  0000 C CNN
-F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 6566 9807 15  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 6566 9807 15  0000 C CNN
 F 3 "" H 6450 9900 60  0001 C CNN
 	1    6450 9900
 	0    1    1    0   
@@ -2628,7 +2628,7 @@ U 1 1 32307EAA
 P 14800 3700
 F 0 "R2" V 14700 3700 50  0000 C CNN
 F 1 "1K" V 14800 3700 50  0000 C CNN
-F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 14900 3700 15  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 14900 3700 15  0000 C CNN
 F 3 "" H 14800 3700 60  0001 C CNN
 	1    14800 3700
 	0    1    1    0   
@@ -2639,7 +2639,7 @@ U 1 1 32307EA1
 P 13950 3700
 F 0 "R1" V 13850 3700 50  0000 C CNN
 F 1 "100K" V 13950 3700 50  0000 C CNN
-F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 14050 3700 15  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 14050 3700 15  0000 C CNN
 F 3 "" H 13950 3700 60  0001 C CNN
 	1    13950 3700
 	0    1    1    0   
diff --git a/demos/sonde xilinx/sonde xilinx.kicad_pcb b/demos/sonde xilinx/sonde xilinx.kicad_pcb
index 483d7598ba..e71f591a73 100644
--- a/demos/sonde xilinx/sonde xilinx.kicad_pcb	
+++ b/demos/sonde xilinx/sonde xilinx.kicad_pcb	
@@ -31,6 +31,11 @@
     (42 Eco1.User user)
     (43 Eco2.User user)
     (44 Edge.Cuts user)
+    (45 Margin user)
+    (46 B.CrtYd user)
+    (47 F.CrtYd user)
+    (48 B.Fab user)
+    (49 F.Fab user)
   )
 
   (setup