Converted 0805 resistors to better footprint for high voltage where needed. Converted qfn/dfn packages to sop to reduce assembly costs.
Converted 0805 resistors to better footprint for high voltage where needed. Converted qfn/dfn packages to sop to reduce assembly costs.

--- a/schem/Boards/Single/ESP8266/Dimmer/ESP8266_Dimmer.pcb
+++ b/schem/Boards/Single/ESP8266/Dimmer/ESP8266_Dimmer.pcb
@@ -9,7 +9,7 @@
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[6.00mil 6.00mil 6.00mil 6.00mil 13.00mil 7.00mil]
-Flags("showdrc,nameonpcb,clearnew")
+Flags("showdrc,nameonpcb,clearnew,snappin")
 Groups("1,c:2:3:4:5:6,s:7:8")
 Styles["Signal,10.00mil,36.00mil,20.00mil,10.00mil:Power,0.6000mm,60.00mil,35.00mil,10.00mil:Fat,1.2500mm,60.00mil,35.00mil,10.00mil:Skinny,6.00mil,24.02mil,11.81mil,6.00mil"]
 
@@ -788,40 +788,27 @@
 Attribute("PCB::grid::unit" "mm")
 Attribute("PCB::grid::size" "0.1000mm")
 Via[31.2000mm 35.6000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[29.4000mm 33.9000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[31.6000mm 45.1000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[12.5084mm 50.6084mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[26.4000mm 39.8000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[26.4000mm 41.1000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[24.9000mm 41.2000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[17.6000mm 40.4000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[19.5000mm 40.1000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[12.4000mm 39.3000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[17.8000mm 47.7000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[19.3000mm 47.1000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[23.7000mm 40.9000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[20.7000mm 44.5000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[15.4000mm 48.1000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[17.7000mm 45.4000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-Via[25.8000mm 47.4000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[13.7000mm 40.0000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
 Via[28.0000mm 37.5000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[26.2000mm 49.9000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
-Via[16.5084mm 50.6084mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
-
-Element["onsolder" "0805" "R8" "220" 850.39mil 37.8000mm 2.2999mm 0.7001mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-
-	)
+Via[29.8000mm 34.5000mm 60.00mil 20.00mil 0.0000 35.00mil "" ""]
+Via[20.5000mm 39.0000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[22.5000mm 39.0000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[25.2000mm 39.2000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[24.6000mm 43.5000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[18.8000mm 49.6000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[18.9000mm 42.6000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[14.8000mm 43.7000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[24.7000mm 45.5000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[21.6000mm 43.7000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[23.3000mm 43.6000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[16.8000mm 49.6000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[17.3000mm 39.2000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[30.8000mm 39.7000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[25.9000mm 50.2000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[32.2000mm 39.2000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[23.4000mm 48.5000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[14.6000mm 42.5000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[30.7000mm 40.9000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
+Via[10.8000mm 39.0000mm 36.00mil 20.00mil 0.0000 20.00mil "" ""]
 
 Element["onsolder" "D2PAK" "SCR1" "unknown" 20.7500mm 19.6498mm 6.1998mm 8.3002mm 0 100 "auto"]
 (
@@ -869,17 +856,17 @@
 
 	)
 
-Element["" "0805" "R7" "100k" 18.2000mm 23.3000mm -2.6200mm 0.2200mm 0 100 ""]
+Element["" "0805" "R7" "100k" 17.6999mm 23.4998mm 0.9200mm 2.3798mm 2 100 ""]
 (
 	Attribute("device" "RESISTOR")
 	Attribute("manufacturer" "unknown")
 	Attribute("manufacturer_part_number" "unknown")
 	Attribute("vendor" "unknown")
 	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
 
 	)
 
@@ -943,48 +930,6 @@
 	Attribute("vendor" "unknown")
 	Attribute("vendor_part_number" "unknown")
 	Pin[0.0000 0.0000 5.0000mm 5.0000mm 5.0000mm 3.0000mm "1" "1" ""]
-
-	)
-
-Element["" "0805" "R3" "510k" 13.3000mm 19.7000mm -1.1000mm 1.0000mm 0 100 ""]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-
-	)
-
-Element["" "0805" "R4" "510k" 16.9000mm 20.3000mm -2.0000mm 0.9000mm 0 100 ""]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-
-	)
-
-Element["" "0805" "R2" "200k" 16.6000mm 17.1000mm 2.0000mm -0.8000mm 0 100 ""]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
 
 	)
 
@@ -1018,20 +963,6 @@
 
 	)
 
-Element["onsolder" "0805" "R9" "unknown" 20.7000mm 30.0001mm 1.3999mm 0.7797mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-
-	)
-
 Element["onsolder" "MFP4" "U2" "unknown" 18.0300mm 34.3512mm 2.2140mm 0.6388mm 0 100 "auto"]
 (
 	Attribute("device" "FODM3053V")
@@ -1046,7 +977,7 @@
 
 	)
 
-Element["" "0805" "C4" "10uF" 17.3000mm 32.0000mm -0.8505mm 1.5518mm 0 100 ""]
+Element["" "0805" "C4" "10uF" 24.8000mm 32.8000mm -2.5000mm -2.2000mm 0 100 ""]
 (
 	Attribute("device" "CAPACITOR")
 	Attribute("manufacturer" "unknown")
@@ -1060,7 +991,7 @@
 
 	)
 
-Element["" "0805" "C5" "22uF" 19.3000mm 30.1000mm -0.7309mm 2.2718mm 0 100 ""]
+Element["" "0805" "C5" "10uF" 24.8000mm 29.3000mm -2.4000mm -1.5999mm 0 100 ""]
 (
 	Attribute("device" "CAPACITOR")
 	Attribute("manufacturer" "unknown")
@@ -1088,93 +1019,23 @@
 
 	)
 
-Element["onsolder" "0805" "R16" "unknown" 27.4000mm 43.5999mm -14.50mil -1.7266mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["onsolder" "0805" "R13" "unknown" 22.6000mm 2000.00mil -3.2002mm 1.0000mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["onsolder" "0805" "R12" "unknown" 23.8000mm 43.5999mm -1.1005mm -3.2000mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["onsolder" "0805" "R11" "unknown" 22.0000mm 43.5999mm -1.2401mm -1.6197mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["onsolder" "0805" "R15" "unknown" 25.6000mm 43.5999mm -0.7005mm 3.1002mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["" "FCAPEL" "C3" "470uF" 12.0000mm 29.3000mm -4.6000mm -5.0000mm 0 100 ""]
+Element["" "FCAPEL" "C3" "470uF" 8.9000mm 30.6000mm 5.0000mm -4.6000mm 3 100 ""]
 (
 	Attribute("device" "POLARIZED_CAPACITOR")
 	Attribute("manufacturer" "unknown")
 	Attribute("manufacturer_part_number" "unknown")
 	Attribute("vendor" "unknown")
 	Attribute("vendor_part_number" "unknown")
-	Pad[-180.00mil 0.0000 -80.00mil 0.0000 42.00mil 20.00mil 42.00mil "+" "1" "square"]
-	Pad[80.00mil 0.0000 180.00mil 0.0000 42.00mil 20.00mil 42.00mil "-" "2" "square,edge2"]
-	ElementLine [163.38mil 163.38mil 163.38mil 35.00mil 10.00mil]
-	ElementLine [163.38mil -163.38mil 163.38mil -35.00mil 10.00mil]
-	ElementLine [-163.38mil 80.00mil -163.38mil 35.00mil 10.00mil]
-	ElementLine [-163.38mil -80.00mil -163.38mil -35.00mil 10.00mil]
-	ElementLine [-163.38mil 80.00mil -80.00mil 163.38mil 10.00mil]
-	ElementLine [-163.38mil -80.00mil -80.00mil -163.38mil 10.00mil]
-	ElementLine [-80.00mil 163.38mil 163.38mil 163.38mil 10.00mil]
-	ElementLine [-80.00mil -163.38mil 163.38mil -163.38mil 10.00mil]
+	Pad[0.0000 -180.00mil 0.0000 -80.00mil 42.00mil 20.00mil 42.00mil "+" "1" "square"]
+	Pad[0.0000 80.00mil 0.0000 180.00mil 42.00mil 20.00mil 42.00mil "-" "2" "square,edge2"]
+	ElementLine [-163.38mil 163.38mil -35.00mil 163.38mil 10.00mil]
+	ElementLine [35.00mil 163.38mil 163.38mil 163.38mil 10.00mil]
+	ElementLine [-80.00mil -163.38mil -35.00mil -163.38mil 10.00mil]
+	ElementLine [35.00mil -163.38mil 80.00mil -163.38mil 10.00mil]
+	ElementLine [-80.00mil -163.38mil -163.38mil -80.00mil 10.00mil]
+	ElementLine [80.00mil -163.38mil 163.38mil -80.00mil 10.00mil]
+	ElementLine [-163.38mil -80.00mil -163.38mil 163.38mil 10.00mil]
+	ElementLine [163.38mil -80.00mil 163.38mil 163.38mil 10.00mil]
 
 	)
 
@@ -1194,21 +1055,7 @@
 
 	)
 
-Element["onsolder" "0805" "R10" "unknown" 10.2600mm 28.7001mm -3.6102mm 0.9301mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["" "SOT89" "U4" "unknown" 21.8012mm 29.5506mm -1.0174mm -2.6910mm 0 100 ""]
+Element["" "SOT89" "U4" "unknown" 26.9000mm 29.6000mm -1.0174mm -2.6910mm 0 100 ""]
 (
 	Attribute("device" "AZ1117CR")
 	Attribute("manufacturer" "unknown")
@@ -1226,132 +1073,9 @@
 
 	)
 
-Element["" "0805" "C2" "1uF" 18.5000mm 27.5000mm -1.4999mm -2.4201mm 0 100 ""]
+Element["" "0805" "C2" "1uF" 13.5000mm 23.6000mm -0.5000mm 0.7000mm 0 100 ""]
 (
 	Attribute("device" "CAPACITOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-
-	)
-
-Element["" "0805" "R6" "12k" 24.2999mm 26.4000mm -0.5202mm 0.7199mm 0 100 ""]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-
-	)
-
-Element["onsolder" "DFN8" "U8" "unknown" 22.6000mm 46.6000mm -0.0308mm 2.7487mm 0 100 "auto"]
-(
-	Attribute("device" "ATSHA204A")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[1.2250mm -0.7500mm 1.6750mm -0.7500mm 0.3000mm 0.3000mm 0.3000mm "NC" "1" "onsolder,square,edge2"]
-	Pad[1.2250mm -0.2500mm 1.6750mm -0.2500mm 0.3000mm 0.3000mm 0.3000mm "NC" "2" "onsolder,square,edge2"]
-	Pad[1.2250mm 0.2500mm 1.6750mm 0.2500mm 0.3000mm 0.3000mm 0.3000mm "NC" "3" "onsolder,square,edge2"]
-	Pad[1.2250mm 0.7500mm 1.6750mm 0.7500mm 0.3000mm 0.3000mm 0.3000mm "GND" "4" "onsolder,square,edge2"]
-	Pad[-1.6750mm 0.7500mm -1.2250mm 0.7500mm 0.3000mm 0.3000mm 0.3000mm "SDA" "5" "onsolder,square"]
-	Pad[-1.6750mm 0.2500mm -1.2250mm 0.2500mm 0.3000mm 0.3000mm 0.3000mm "SCL" "6" "onsolder,square"]
-	Pad[-1.6750mm -0.2500mm -1.2250mm -0.2500mm 0.3000mm 0.3000mm 0.3000mm "NC" "7" "onsolder,square"]
-	Pad[-1.6750mm -0.7500mm -1.2250mm -0.7500mm 0.3000mm 0.3000mm 0.3000mm "VCC" "8" "onsolder,square"]
-	Pad[-0.1500mm 0.0000 0.1500mm 0.0000 1.4500mm 1.4500mm 1.4500mm "9" "9" "onsolder,square"]
-	ElementLine [-1.5000mm -1.0000mm 1.5000mm -1.0000mm 6.00mil]
-	ElementLine [-1.5000mm 1.0000mm 1.5000mm 1.0000mm 6.00mil]
-
-	)
-
-Element["onsolder" "QFN16_4_EP" "U1" "unknown" 15.7000mm 42.4000mm -4.2039mm 0.8706mm 0 100 "auto"]
-(
-	Attribute("device" "PIC16LF1554")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-81.29mil 38.38mil -60.43mil 38.38mil 14.56mil 20.00mil 17.56mil "RA5" "1" "onsolder,square"]
-	Pad[-81.29mil 12.79mil -60.43mil 12.79mil 14.56mil 20.00mil 17.56mil "RA4" "2" "onsolder,square"]
-	Pad[-81.29mil -12.79mil -60.43mil -12.79mil 14.56mil 20.00mil 17.56mil "MCLR/VPP/RA3" "3" "onsolder,square"]
-	Pad[-81.29mil -38.38mil -60.43mil -38.38mil 14.56mil 20.00mil 17.56mil "RC5" "4" "onsolder,square"]
-	Pad[-38.38mil -81.29mil -38.38mil -60.43mil 14.56mil 20.00mil 17.56mil "RC4" "5" "onsolder,square,octagon"]
-	Pad[-12.79mil -81.29mil -12.79mil -60.43mil 14.56mil 20.00mil 17.56mil "RC3" "6" "onsolder,square,octagon"]
-	Pad[12.79mil -81.29mil 12.79mil -60.43mil 14.56mil 20.00mil 17.56mil "RC2" "7" "onsolder,square,octagon"]
-	Pad[38.38mil -81.29mil 38.38mil -60.43mil 14.56mil 20.00mil 17.56mil "RC1" "8" "onsolder,square,octagon"]
-	Pad[60.43mil -38.38mil 81.29mil -38.38mil 14.56mil 20.00mil 17.56mil "RC0" "9" "onsolder,square,edge2"]
-	Pad[60.43mil -12.79mil 81.29mil -12.79mil 14.56mil 20.00mil 17.56mil "RA2" "10" "onsolder,square,edge2"]
-	Pad[60.43mil 12.79mil 81.29mil 12.79mil 14.56mil 20.00mil 17.56mil "RA1" "11" "onsolder,square,edge2"]
-	Pad[60.43mil 38.38mil 81.29mil 38.38mil 14.56mil 20.00mil 17.56mil "RA0" "12" "onsolder,square,edge2"]
-	Pad[38.38mil 60.43mil 38.38mil 81.29mil 14.56mil 20.00mil 17.56mil "VSS" "13" "onsolder,square,octagon,edge2"]
-	Pad[12.79mil 60.43mil 12.79mil 81.29mil 14.56mil 20.00mil 17.56mil "NC" "14" "onsolder,square,octagon,edge2"]
-	Pad[-12.79mil 60.43mil -12.79mil 81.29mil 14.56mil 20.00mil 17.56mil "NC" "15" "onsolder,square,octagon,edge2"]
-	Pad[-38.38mil 60.43mil -38.38mil 81.29mil 14.56mil 20.00mil 17.56mil "VDD" "16" "onsolder,square,octagon,edge2"]
-	Pad[0.0000 0.0000 0.0000 0.0000 82.67mil 0.0000 86.67mil "17" "17" "onsolder,square,edge2"]
-	ElementLine [98.58mil -98.58mil 98.58mil 98.58mil 10.00mil]
-	ElementLine [98.58mil 98.58mil -98.58mil 98.58mil 10.00mil]
-	ElementLine [-98.58mil 98.58mil -98.58mil -98.58mil 10.00mil]
-	ElementLine [-98.58mil -98.58mil 98.58mil -98.58mil 10.00mil]
-	ElementLine [-98.58mil 98.58mil -113.58mil 113.58mil 10.00mil]
-
-	)
-
-Element["onsolder" "0805" "R17" "unknown" 29.2000mm 43.5999mm 0.9802mm 0.8799mm 0 100 "auto"]
-(
-	Attribute("device" "RESISTOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["onsolder" "0805" "C7" "100nF" 15.6001mm 46.1000mm -3.2999mm 0.7052mm 0 100 "auto"]
-(
-	Attribute("device" "CAPACITOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-
-	)
-
-Element["onsolder" "0805" "C8" "100nF" 795.28mil 48.5000mm -3.1802mm 1.6801mm 0 100 "auto"]
-(
-	Attribute("device" "CAPACITOR")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
-	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
-
-	)
-
-Element["" "0805" "R1" "200k" 13.4000mm 17.1000mm 0.8000mm -2.4000mm 0 100 ""]
-(
-	Attribute("device" "RESISTOR")
 	Attribute("manufacturer" "unknown")
 	Attribute("manufacturer_part_number" "unknown")
 	Attribute("vendor" "unknown")
@@ -1393,34 +1117,251 @@
 
 	)
 
-Element["" "SIP2" "SW" "unknown" 29.8600mm 51.9000mm 2.1840mm -3.1940mm 0 100 ""]
-(
-	Attribute("device" "CONNECTOR_2")
-	Attribute("manufacturer" "unknown")
-	Attribute("manufacturer_part_number" "unknown")
-	Attribute("vendor" "unknown")
-	Attribute("vendor_part_number" "unknown")
-	Pin[0.0000 0.0000 60.00mil 30.00mil 66.00mil 28.00mil "1" "1" "square,edge2"]
-	Pin[100.00mil 0.0000 60.00mil 30.00mil 66.00mil 28.00mil "2" "2" "edge2"]
-	ElementLine [0.0000 50.00mil 100.00mil 50.00mil 0.3080mm]
-	ElementLine [0.0000 -50.00mil 100.00mil -50.00mil 0.3080mm]
-	ElementLine [50.00mil -50.00mil 50.00mil 50.00mil 10.00mil]
-	ElementArc [0.0000 0.0000 50.00mil 50.00mil 270 180 0.3080mm]
-	ElementArc [100.00mil 0.0000 50.00mil 50.00mil 90 180 0.3080mm]
-
-	)
-
-Element["" "0805" "C6" "100nF" 30.9000mm 48.8999mm -0.7003mm -3.3000mm 0 100 ""]
+Element["" "0805_fit" "R4" "510k" 16.5000mm 19.7000mm -2.3000mm 0.8000mm 0 100 ""]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[1.0000mm -0.2000mm 1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "square"]
+	Pad[-1.0000mm -0.2000mm -1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "square"]
+
+	)
+
+Element["" "0805_fit" "R2" "200k" 16.5000mm 17.6000mm 1.6000mm -2.1000mm 0 100 ""]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[1.0000mm -0.2000mm 1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "square"]
+	Pad[-1.0000mm -0.2000mm -1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "square"]
+
+	)
+
+Element["" "0805_fit" "R1" "200k" 13.5000mm 17.6000mm 0.1000mm -2.3000mm 0 100 ""]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[1.0000mm -0.2000mm 1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "square"]
+	Pad[-1.0000mm -0.2000mm -1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "square"]
+
+	)
+
+Element["" "0805_fit" "R3" "510k" 13.5000mm 19.7000mm -1.3000mm 0.7000mm 0 100 ""]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[1.0000mm -0.2000mm 1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "square"]
+	Pad[-1.0000mm -0.2000mm -1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "square"]
+
+	)
+
+Element["" "FCAPEL" "C9" "470uF" 17.7000mm 30.6000mm 50.00mil 60.00mil 3 100 ""]
+(
+	Attribute("device" "POLARIZED_CAPACITOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[0.0000 -180.00mil 0.0000 -80.00mil 42.00mil 20.00mil 42.00mil "+" "1" "square"]
+	Pad[0.0000 80.00mil 0.0000 180.00mil 42.00mil 20.00mil 42.00mil "-" "2" "square,edge2"]
+	ElementLine [-163.38mil 163.38mil -35.00mil 163.38mil 10.00mil]
+	ElementLine [35.00mil 163.38mil 163.38mil 163.38mil 10.00mil]
+	ElementLine [-80.00mil -163.38mil -35.00mil -163.38mil 10.00mil]
+	ElementLine [35.00mil -163.38mil 80.00mil -163.38mil 10.00mil]
+	ElementLine [-80.00mil -163.38mil -163.38mil -80.00mil 10.00mil]
+	ElementLine [80.00mil -163.38mil 163.38mil -80.00mil 10.00mil]
+	ElementLine [-163.38mil -80.00mil -163.38mil 163.38mil 10.00mil]
+	ElementLine [163.38mil -80.00mil 163.38mil 163.38mil 10.00mil]
+
+	)
+
+Element["" "0805" "R6" "10k" 24.2999mm 26.4000mm -3.5999mm -0.7000mm 0 100 ""]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+
+	)
+
+Element["onsolder" "SO14" "U1" "unknown" 14.2035mm 44.8100mm -3.7035mm -4.6100mm 0 100 "auto"]
+(
+	Attribute("device" "PIC16F1503")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-135.00mil 150.00mil -70.00mil 150.00mil 20.00mil 10.00mil 30.00mil "VCC" "1" "onsolder,square"]
+	Pad[-135.00mil 100.00mil -70.00mil 100.00mil 20.00mil 10.00mil 30.00mil "RA5" "2" "onsolder,square"]
+	Pad[-135.00mil 50.00mil -70.00mil 50.00mil 20.00mil 10.00mil 30.00mil "RA4" "3" "onsolder,square"]
+	Pad[-135.00mil 0.0000 -70.00mil 0.0000 20.00mil 10.00mil 30.00mil "RA3" "4" "onsolder,square"]
+	Pad[-135.00mil -50.00mil -70.00mil -50.00mil 20.00mil 10.00mil 30.00mil "RC5" "5" "onsolder,square"]
+	Pad[-135.00mil -100.00mil -70.00mil -100.00mil 20.00mil 10.00mil 30.00mil "RC4" "6" "onsolder,square"]
+	Pad[-135.00mil -150.00mil -70.00mil -150.00mil 20.00mil 10.00mil 30.00mil "RC3" "7" "onsolder,square"]
+	Pad[70.00mil -150.00mil 135.00mil -150.00mil 20.00mil 10.00mil 30.00mil "RC2" "8" "onsolder,square,edge2"]
+	Pad[70.00mil -100.00mil 135.00mil -100.00mil 20.00mil 10.00mil 30.00mil "RC1" "9" "onsolder,square,edge2"]
+	Pad[70.00mil -50.00mil 135.00mil -50.00mil 20.00mil 10.00mil 30.00mil "RC0" "10" "onsolder,square,edge2"]
+	Pad[70.00mil 0.0000 135.00mil 0.0000 20.00mil 10.00mil 30.00mil "RA2" "11" "onsolder,square,edge2"]
+	Pad[70.00mil 50.00mil 135.00mil 50.00mil 20.00mil 10.00mil 30.00mil "RA1" "12" "onsolder,square,edge2"]
+	Pad[70.00mil 100.00mil 135.00mil 100.00mil 20.00mil 10.00mil 30.00mil "RA0" "13" "onsolder,square,edge2"]
+	Pad[70.00mil 150.00mil 135.00mil 150.00mil 20.00mil 10.00mil 30.00mil "VSS" "14" "onsolder,square,edge2"]
+	ElementLine [-155.00mil 170.00mil -155.00mil -170.00mil 10.00mil]
+	ElementLine [-155.00mil -170.00mil 155.00mil -170.00mil 10.00mil]
+	ElementLine [155.00mil -170.00mil 155.00mil 170.00mil 10.00mil]
+	ElementLine [-155.00mil 170.00mil -25.00mil 170.00mil 10.00mil]
+	ElementLine [155.00mil 170.00mil 25.00mil 170.00mil 10.00mil]
+	ElementArc [0.0000 170.00mil 25.00mil 25.00mil 180 180 10.00mil]
+
+	)
+
+Element["onsolder" "0805" "C8" "100nF" 17.6999mm 51.1000mm -0.8871mm 2.4748mm 0 100 "auto"]
 (
 	Attribute("device" "CAPACITOR")
 	Attribute("manufacturer" "unknown")
 	Attribute("manufacturer_part_number" "unknown")
 	Attribute("vendor" "unknown")
 	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "square"]
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+
+	)
+
+Element["onsolder" "SO8" "U8" "unknown" 23.9000mm 47.4000mm -3.8000mm 4.2000mm 0 100 "auto"]
+(
+	Attribute("device" "ATSHA204A")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-135.00mil 75.00mil -70.00mil 75.00mil 20.00mil 10.00mil 30.00mil "NC" "1" "onsolder,square"]
+	Pad[-135.00mil 25.00mil -70.00mil 25.00mil 20.00mil 10.00mil 30.00mil "NC" "2" "onsolder,square"]
+	Pad[-135.00mil -25.00mil -70.00mil -25.00mil 20.00mil 10.00mil 30.00mil "NC" "3" "onsolder,square"]
+	Pad[-135.00mil -75.00mil -70.00mil -75.00mil 20.00mil 10.00mil 30.00mil "GND" "4" "onsolder,square"]
+	Pad[70.00mil -75.00mil 135.00mil -75.00mil 20.00mil 10.00mil 30.00mil "SDA" "5" "onsolder,square,edge2"]
+	Pad[70.00mil -25.00mil 135.00mil -25.00mil 20.00mil 10.00mil 30.00mil "SCL" "6" "onsolder,square,edge2"]
+	Pad[70.00mil 25.00mil 135.00mil 25.00mil 20.00mil 10.00mil 30.00mil "NC" "7" "onsolder,square,edge2"]
+	Pad[70.00mil 75.00mil 135.00mil 75.00mil 20.00mil 10.00mil 30.00mil "VCC" "8" "onsolder,square,edge2"]
+	ElementLine [-155.00mil 95.00mil -155.00mil -95.00mil 10.00mil]
+	ElementLine [-155.00mil -95.00mil 155.00mil -95.00mil 10.00mil]
+	ElementLine [155.00mil -95.00mil 155.00mil 95.00mil 10.00mil]
+	ElementLine [-155.00mil 95.00mil -25.00mil 95.00mil 10.00mil]
+	ElementLine [155.00mil 95.00mil 25.00mil 95.00mil 10.00mil]
+	ElementArc [0.0000 95.00mil 25.00mil 25.00mil 180 180 10.00mil]
+
+	)
+
+Element["onsolder" "0805" "R17" "10k" 25.2000mm 41.3001mm -0.8000mm -2.6001mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
 	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
+
+	)
+
+Element["onsolder" "0805" "R15" "10k" 20.6000mm 41.2999mm -1.9000mm 122.05mil 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
 	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
+	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
+
+	)
+
+Element["onsolder" "0805" "R13" "10k" 22.7000mm 41.2999mm -0.8000mm -2.4999mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
+	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
+
+	)
+
+Element["onsolder" "0805" "R12" "2.2k" 28.6000mm 43.8000mm -0.2000mm 2.4000mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+
+	)
+
+Element["onsolder" "0805" "R11" "2.2k" 27.9000mm 41.8000mm -1.2916mm -1.2932mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+
+	)
+
+Element["onsolder" "0805" "C7" "100nF" 12.2999mm 50.1000mm 0.2001mm 2.2000mm 0 100 "auto"]
+(
+	Attribute("device" "CAPACITOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+
+	)
+
+Element["onsolder" "0805" "R8" "220" 14.4999mm 39.3000mm -11.81mil -0.9000mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
 
 	)
 
@@ -1463,60 +1404,128 @@
 
 	)
 
-Element["onsolder" "0805" "R14" "unknown" 24.4000mm 2000.00mil 1.0399mm 1.4802mm 0 100 "auto"]
+Element["onsolder" "0805_fit" "R19" "220" 22.5000mm 32.1000mm 1.8733mm 0.8050mm 0 100 "auto"]
 (
 	Attribute("device" "RESISTOR")
 	Attribute("manufacturer" "unknown")
 	Attribute("manufacturer_part_number" "unknown")
 	Attribute("vendor" "unknown")
 	Attribute("vendor_part_number" "unknown")
-	Pad[-3.93mil -35.43mil 3.93mil -35.43mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
-	Pad[-3.93mil 35.43mil 3.93mil 35.43mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
-	ElementLine [-27.55mil -3.93mil -27.55mil 3.93mil 8.00mil]
-	ElementLine [27.55mil -3.93mil 27.55mil 3.93mil 8.00mil]
-
-	)
-
-Element["onsolder" "TP_1MM" "" "" 19.0000mm 43.5000mm -146.72mil 169.49mil 0 100 "auto"]
-(
-	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,octagon"]
-
-	)
-
-Element["onsolder" "TP_1MM" "" "" 19.0000mm 42.3000mm -146.72mil 169.49mil 0 100 "auto"]
-(
-	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,octagon"]
-
-	)
-
-Element["onsolder" "TP_1MM" "" "" 12.5000mm 43.2000mm -146.72mil 169.49mil 0 100 "auto"]
-(
-	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,octagon"]
-
-	)
-
-Element["onsolder" "TP_1MM" "" "" 28.3000mm 49.1000mm -146.72mil 169.49mil 0 100 "auto"]
-(
-	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,octagon"]
-
-	)
-
-Element["onsolder" "TP_1MM" "" "" 27.9000mm 47.4000mm -146.72mil 169.49mil 0 100 "auto"]
-(
-	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,octagon"]
+	Pad[1.0000mm -0.2000mm 1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "onsolder,square"]
+	Pad[-1.0000mm -0.2000mm -1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "onsolder,square"]
+
+	)
+
+Element["onsolder" "0805_fit" "R18" "100k" 10.3000mm 12.8000mm -3.2000mm 0.9000mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-0.2000mm -1.0000mm 0.2000mm -1.0000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "onsolder,square"]
+	Pad[-0.2000mm 1.0000mm 0.2000mm 1.0000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "onsolder,square"]
+
+	)
+
+Element["onsolder" "0805_fit" "R10" "100k" 10.7000mm 28.6000mm -3.4000mm 0.9000mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[-0.2000mm -1.0000mm 0.2000mm -1.0000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "onsolder,square"]
+	Pad[-0.2000mm 1.0000mm 0.2000mm 1.0000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "onsolder,square"]
+
+	)
+
+Element["onsolder" "0805_fit" "R9" "220" 22.5000mm 29.7000mm 2.1733mm 1.1050mm 0 100 "auto"]
+(
+	Attribute("device" "RESISTOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[1.0000mm -0.2000mm 1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "1" "1" "onsolder,square"]
+	Pad[-1.0000mm -0.2000mm -1.0000mm 0.2000mm 0.8000mm 0.8000mm 0.8000mm "2" "2" "onsolder,square"]
+
+	)
+
+Element["onsolder" "TP_1MM" "" "" 9.8000mm 44.8000mm -146.72mil 169.49mil 0 100 "auto"]
+(
+	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,warn,octagon"]
+
+	)
+
+Element["onsolder" "TP_1MM" "" "" 18.6000mm 47.2000mm -146.72mil 169.49mil 0 100 "auto"]
+(
+	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,warn,octagon"]
+
+	)
+
+Element["onsolder" "TP_1MM" "" "" 18.6000mm 48.4000mm -146.72mil 169.49mil 0 100 "auto"]
+(
+	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,warn,octagon"]
+
+	)
+
+Element["onsolder" "TP_1MM" "" "" 32.4000mm 1500.00mil -146.72mil 169.49mil 0 100 "auto"]
+(
+	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,warn,octagon"]
+
+	)
+
+Element["onsolder" "TP_1MM" "" "" 29.4000mm 37.5000mm -146.72mil 169.49mil 0 100 "auto"]
+(
+	Pad[0.0000 0.0000 0.0000 0.0000 1.0000mm 1.0000mm 1.0000mm "" "1" "onsolder,warn,octagon"]
+
+	)
+
+Element["" "GSIP5_NS" "CHAIN" "unknown" 34.2700mm 53.1500mm -3.8700mm -8.1500mm 1 100 ""]
+(
+	Attribute("device" "CONNECTOR_5")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pin[-50.00mil -50.00mil 70.00mil 30.00mil 76.00mil 38.00mil "1" "1" "square"]
+	Pin[-50.00mil -150.00mil 70.00mil 30.00mil 76.00mil 38.00mil "2" "2" ""]
+	Pin[-50.00mil -250.00mil 70.00mil 30.00mil 76.00mil 38.00mil "3" "3" ""]
+	Pin[-50.00mil -350.00mil 70.00mil 30.00mil 76.00mil 38.00mil "4" "4" ""]
+	Pin[-50.00mil -450.00mil 70.00mil 30.00mil 76.00mil 38.00mil "5" "5" ""]
+
+	)
+
+Element["" "GSIP3_NS" "SW" "unknown" 31.9000mm 53.2000mm -3.6000mm -0.2000mm 1 100 ""]
+(
+	Attribute("device" "CONNECTOR_3")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pin[-50.00mil -50.00mil 70.00mil 30.00mil 76.00mil 38.00mil "1" "1" "square"]
+	Pin[-50.00mil -150.00mil 70.00mil 30.00mil 76.00mil 38.00mil "2" "2" ""]
+	Pin[-50.00mil -250.00mil 70.00mil 30.00mil 76.00mil 38.00mil "3" "3" ""]
+
+	)
+
+Element["onsolder" "0805" "C6" "100nF" 22.9999mm 2000.00mil -0.5000mm 2.2000mm 0 100 "auto"]
+(
+	Attribute("device" "CAPACITOR")
+	Attribute("manufacturer" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("vendor_part_number" "unknown")
+	Pad[35.43mil -3.93mil 35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "1" "1" "onsolder,square"]
+	Pad[-35.43mil -3.93mil -35.43mil 3.93mil 51.18mil 20.00mil 57.18mil "2" "2" "onsolder,square"]
+	ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+	ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
 
 	)
 Layer(1 "top")
 (
 	Line[818.76mil 22.0650mm 19.7350mm 22.0650mm 10.00mil 20.00mil "clearline"]
-	Line[19.7350mm 22.0650mm 19.3000mm 22.5000mm 10.00mil 20.00mil "clearline"]
-	Line[19.3000mm 22.5000mm 18.2999mm 22.5000mm 10.00mil 20.00mil "clearline"]
-	Line[18.2999mm 22.5000mm 18.2000mm 22.4001mm 10.00mil 20.00mil "clearline"]
-	Line[17.7999mm 20.3000mm 20.3015mm 20.3000mm 10.00mil 20.00mil "clearline"]
-	Line[20.3015mm 20.3000mm 818.76mil 20.7950mm 10.00mil 20.00mil "clearline"]
-	Line[14.1999mm 19.7000mm 15.4001mm 19.7000mm 10.00mil 20.00mil "clearline"]
-	Line[15.4001mm 19.7000mm 16.0001mm 20.3000mm 10.00mil 20.00mil "clearline"]
-	Line[14.2999mm 17.1000mm 15.7001mm 17.1000mm 10.00mil 20.00mil "clearline"]
 	Line[7.7000mm 7.3000mm 12.1000mm 7.3000mm 0.6000mm 20.00mil "clearline"]
 	Line[12.1000mm 7.3000mm 12.5000mm 6.9000mm 0.6000mm 20.00mil "clearline"]
 	Line[13.0000mm 9.1000mm 13.0000mm 8.2000mm 0.6000mm 20.00mil "clearline"]
@@ -1531,112 +1540,22 @@
 	Line[17.4999mm 15.4998mm 17.0000mm 14.9999mm 0.6000mm 20.00mil "clearline"]
 	Line[22.6000mm 23.3000mm 20.8315mm 23.3000mm 0.6000mm 20.00mil "clearline"]
 	Line[20.8315mm 23.3000mm 818.76mil 23.3350mm 0.6000mm 20.00mil "clearline"]
-	Line[818.76mil 23.3350mm 19.7650mm 23.3350mm 0.6000mm 20.00mil "clearline"]
-	Line[19.7650mm 23.3350mm 19.1000mm 24.0000mm 0.6000mm 20.00mil "clearline"]
-	Line[19.1000mm 24.0000mm 18.3999mm 24.0000mm 0.6000mm 20.00mil "clearline"]
-	Line[18.3999mm 24.0000mm 18.2000mm 24.1999mm 0.6000mm 20.00mil "clearline"]
 	Line[26.0035mm 23.3350mm 28.1350mm 23.3350mm 10.00mil 20.00mil "clearline"]
 	Line[26.0035mm 22.0650mm 28.3352mm 22.0650mm 10.00mil 20.00mil "clearline"]
 	Line[28.3352mm 22.0650mm 28.5000mm 21.9002mm 10.00mil 20.00mil "clearline"]
 	Line[26.0035mm 24.6050mm 26.0035mm 1008.00mil 10.00mil 20.00mil "clearline"]
 	Line[26.0035mm 1008.00mil 26.8002mm 26.4000mm 10.00mil 20.00mil "clearline"]
-	Line[29.5000mm 20.1000mm 26.6985mm 20.1000mm 10.00mil 20.00mil "clearline"]
-	Line[26.6985mm 20.1000mm 26.0035mm 20.7950mm 10.00mil 20.00mil "clearline"]
-	Line[19.3000mm 30.9999mm 21.7011mm 30.9999mm 0.6000mm 20.00mil "clearline"]
-	Line[21.7011mm 30.9999mm 21.8012mm 31.1000mm 0.6000mm 20.00mil "clearline"]
-	Line[17.3000mm 32.8999mm 21.5507mm 32.8999mm 0.6000mm 20.00mil "clearline"]
-	Line[21.5507mm 32.8999mm 21.8012mm 32.6494mm 0.6000mm 20.00mil "clearline"]
-	Line[15.3020mm 29.3000mm 19.2000mm 29.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[19.2000mm 29.3000mm 19.3000mm 29.2001mm 0.6000mm 20.00mil "clearline"]
-	Line[19.3000mm 29.2001mm 19.3000mm 27.5999mm 0.6000mm 20.00mil "clearline"]
-	Line[19.3000mm 27.5999mm 19.3999mm 27.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[19.3999mm 27.5000mm 19.3999mm 26.3999mm 0.6000mm 20.00mil "clearline"]
-	Line[19.3999mm 26.3999mm 18.2000mm 25.2000mm 0.6000mm 20.00mil "clearline"]
-	Line[18.2000mm 25.2000mm 18.2000mm 24.1999mm 0.6000mm 20.00mil "clearline"]
-	Line[17.3000mm 31.1001mm 17.3000mm 29.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[15.0000mm 32.9000mm 17.2999mm 32.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[17.2999mm 32.9000mm 17.3000mm 32.8999mm 0.6000mm 20.00mil "clearline"]
-	Line[19.4500mm 27.4500mm 21.1500mm 27.4500mm 0.6000mm 20.00mil "clearline"]
-	Line[21.1500mm 27.4500mm 21.6000mm 27.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.0000mm 27.8000mm 28.6000mm 26.4000mm 10.00mil 20.00mil "clearline"]
 	Line[28.6000mm 26.4000mm 28.6000mm 23.8000mm 10.00mil 20.00mil "clearline"]
 	Line[28.1350mm 23.3350mm 28.6000mm 23.8000mm 10.00mil 20.00mil "clearline"]
-	Line[23.4000mm 26.4000mm 22.9000mm 26.4000mm 10.00mil 20.00mil "clearline"]
-	Line[22.9000mm 26.4000mm 21.5000mm 27.8000mm 10.00mil 20.00mil "clearline"]
 	Line[25.1998mm 26.4000mm 25.2035mm 26.4000mm 10.00mil 20.00mil "clearline"]
 	Line[25.2035mm 26.4000mm 26.0035mm 25.6000mm 10.00mil 20.00mil "clearline"]
-	Line[21.7500mm 28.0500mm 26.1500mm 28.0500mm 0.6000mm 20.00mil "clearline"]
-	Line[27.3000mm 34.8000mm 30.9000mm 38.4000mm 10.00mil 20.00mil "clearline"]
 	Line[30.9000mm 38.4000mm 32.4000mm 38.4000mm 10.00mil 20.00mil "clearline"]
 	Line[32.4000mm 38.4000mm 33.3000mm 37.5000mm 10.00mil 20.00mil "clearline"]
 	Line[33.3000mm 37.5000mm 33.3000mm 23.9000mm 10.00mil 20.00mil "clearline"]
-	Line[33.3000mm 23.9000mm 29.5000mm 20.1000mm 10.00mil 20.00mil "clearline"]
 	Line[27.8000mm 34.2000mm 31.1000mm 37.5000mm 10.00mil 20.00mil "clearline"]
 	Line[31.1000mm 37.5000mm 32.1000mm 37.5000mm 10.00mil 20.00mil "clearline"]
 	Line[32.1000mm 37.5000mm 32.6000mm 37.0000mm 10.00mil 20.00mil "clearline"]
 	Line[32.6000mm 37.0000mm 32.6000mm 30.4000mm 10.00mil 20.00mil "clearline"]
-	Line[32.6000mm 30.4000mm 29.9500mm 27.7500mm 10.00mil 20.00mil "clearline"]
-	Line[31.2000mm 35.6000mm 31.2000mm 33.1000mm 0.6000mm 20.00mil "clearline"]
-	Line[31.2000mm 33.1000mm 26.1500mm 28.0500mm 0.6000mm 20.00mil "clearline"]
-	Line[21.8012mm 31.1000mm 26.6000mm 31.1000mm 0.6000mm 20.00mil "clearline"]
-	Line[26.6000mm 31.1000mm 29.4000mm 33.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[21.8012mm 29.5506mm 21.8012mm 28.1012mm 0.6000mm 20.00mil "clearline"]
-	Line[21.8012mm 28.1012mm 21.8000mm 28.1000mm 0.6000mm 20.00mil "clearline"]
-	Line[16.5084mm 52.3068mm 16.5084mm 50.6084mm 10.00mil 20.00mil "clearline"]
-	Line[16.5084mm 50.6084mm 16.5000mm 50.6000mm 10.00mil 20.00mil "clearline"]
-	Line[12.5084mm 52.3068mm 12.5084mm 50.6084mm 10.00mil 20.00mil "clearline"]
-	Line[12.5084mm 50.6084mm 12.5000mm 50.6000mm 10.00mil 20.00mil "clearline"]
-	Line[16.5000mm 1469.10mil 16.5084mm 37.3068mm 10.00mil 20.00mil "clearline"]
-	Line[24.5084mm 37.3068mm 24.5084mm 38.4084mm 10.00mil 20.00mil "clearline"]
-	Line[24.5084mm 38.4084mm 25.0000mm 38.9000mm 10.00mil 20.00mil "clearline"]
-	Line[25.0000mm 38.9000mm 25.5000mm 38.9000mm 10.00mil 20.00mil "clearline"]
-	Line[25.5000mm 38.9000mm 26.4000mm 39.8000mm 10.00mil 20.00mil "clearline"]
-	Line[22.5084mm 37.3068mm 22.5084mm 38.4084mm 10.00mil 20.00mil "clearline"]
-	Line[22.5084mm 38.4084mm 23.5500mm 39.4500mm 10.00mil 20.00mil "clearline"]
-	Line[23.5500mm 39.4500mm 25.1500mm 39.4500mm 10.00mil 20.00mil "clearline"]
-	Line[25.1500mm 39.4500mm 25.5000mm 39.8000mm 10.00mil 20.00mil "clearline"]
-	Line[25.5000mm 39.8000mm 25.5000mm 40.2000mm 10.00mil 20.00mil "clearline"]
-	Line[25.5000mm 40.2000mm 26.4000mm 41.1000mm 10.00mil 20.00mil "clearline"]
-	Line[20.5084mm 37.3068mm 20.5084mm 38.6084mm 10.00mil 20.00mil "clearline"]
-	Line[20.5084mm 38.6084mm 21.1000mm 39.2000mm 10.00mil 20.00mil "clearline"]
-	Line[21.1000mm 39.2000mm 22.5000mm 39.2000mm 10.00mil 20.00mil "clearline"]
-	Line[22.5000mm 39.2000mm 23.3000mm 40.0000mm 10.00mil 20.00mil "clearline"]
-	Line[23.3000mm 40.0000mm 24.9000mm 40.0000mm 10.00mil 20.00mil "clearline"]
-	Line[24.9000mm 40.0000mm 24.9000mm 41.2000mm 10.00mil 20.00mil "clearline"]
-	Line[18.5084mm 37.3068mm 18.5084mm 38.8084mm 10.00mil 20.00mil "clearline"]
-	Line[18.5084mm 38.8084mm 19.2000mm 39.5000mm 10.00mil 20.00mil "clearline"]
-	Line[19.2000mm 39.5000mm 20.5000mm 39.5000mm 10.00mil 20.00mil "clearline"]
-	Line[20.5000mm 39.5000mm 20.8000mm 39.8000mm 10.00mil 20.00mil "clearline"]
-	Line[20.8000mm 39.8000mm 22.1000mm 39.8000mm 10.00mil 20.00mil "clearline"]
-	Line[16.5576mm 37.4000mm 16.5576mm 38.4576mm 10.00mil 20.00mil "clearline"]
-	Line[16.5576mm 38.4576mm 17.5000mm 39.4000mm 10.00mil 20.00mil "clearline"]
-	Line[17.5000mm 39.4000mm 17.5000mm 40.4000mm 10.00mil 20.00mil "clearline"]
-	Line[19.5000mm 40.1000mm 19.5000mm 39.5000mm 10.00mil 20.00mil "clearline"]
-	Line[12.4000mm 39.3000mm 12.4000mm 39.2000mm 10.00mil 20.00mil "clearline"]
-	Line[12.4000mm 39.3000mm 12.8000mm 39.3000mm 10.00mil 20.00mil "clearline"]
-	Line[12.8000mm 39.3000mm 13.2000mm 38.9000mm 10.00mil 20.00mil "clearline"]
-	Line[13.2000mm 38.9000mm 14.4000mm 38.9000mm 10.00mil 20.00mil "clearline"]
-	Line[14.4000mm 38.9000mm 17.2000mm 41.7000mm 10.00mil 20.00mil "clearline"]
-	Line[25.8000mm 47.4000mm 25.8000mm 48.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[25.8000mm 48.3000mm 24.5000mm 49.6000mm 0.6000mm 20.00mil "clearline"]
-	Line[24.5000mm 49.6000mm 19.7000mm 49.6000mm 0.6000mm 20.00mil "clearline"]
-	Line[19.7000mm 49.6000mm 17.8000mm 47.7000mm 0.6000mm 20.00mil "clearline"]
-	Line[18.5084mm 52.3068mm 18.5084mm 51.4084mm 10.00mil 20.00mil "clearline"]
-	Line[18.5084mm 51.4084mm 16.8500mm 49.7500mm 10.00mil 20.00mil "clearline"]
-	Line[16.8500mm 49.7500mm 13.9500mm 49.7500mm 10.00mil 20.00mil "clearline"]
-	Line[13.9500mm 49.7500mm 13.7000mm 49.5000mm 10.00mil 20.00mil "clearline"]
-	Line[22.1000mm 39.8000mm 22.9000mm 40.6000mm 10.00mil 20.00mil "clearline"]
-	Line[22.9000mm 40.6000mm 23.4000mm 40.6000mm 10.00mil 20.00mil "clearline"]
-	Line[23.4000mm 40.6000mm 23.7000mm 40.9000mm 10.00mil 20.00mil "clearline"]
-	Line[15.4000mm 48.1000mm 15.6000mm 48.1000mm 10.00mil 20.00mil "clearline"]
-	Line[15.6000mm 48.1000mm 17.4000mm 46.3000mm 10.00mil 20.00mil "clearline"]
-	Line[17.4000mm 46.3000mm 18.9000mm 46.3000mm 10.00mil 20.00mil "clearline"]
-	Line[18.9000mm 46.3000mm 20.7000mm 44.5000mm 10.00mil 20.00mil "clearline"]
-	Line[17.7000mm 45.4000mm 17.7000mm 42.2000mm 10.00mil 20.00mil "clearline"]
-	Line[17.7000mm 42.2000mm 17.1500mm 41.6500mm 10.00mil 20.00mil "clearline"]
-	Line[19.3000mm 47.1000mm 20.3000mm 47.1000mm 10.00mil 20.00mil "clearline"]
-	Line[20.3000mm 47.1000mm 23.7000mm 43.7000mm 10.00mil 20.00mil "clearline"]
-	Line[23.7000mm 43.7000mm 23.7000mm 40.9000mm 10.00mil 20.00mil "clearline"]
 	Line[17.5000mm 17.0000mm 23.7000mm 17.0000mm 0.6000mm 20.00mil "clearline"]
 	Line[23.7000mm 17.0000mm 24.3000mm 17.6000mm 0.6000mm 20.00mil "clearline"]
 	Line[24.3000mm 17.6000mm 24.3000mm 22.9000mm 0.6000mm 20.00mil "clearline"]
@@ -1645,41 +1564,153 @@
 	Line[12.5000mm 15.5000mm 13.0000mm 15.0000mm 0.6000mm 20.00mil "clearline"]
 	Line[12.5000mm 17.0000mm 8.5000mm 17.0000mm 0.6000mm 20.00mil "clearline"]
 	Line[8.5000mm 17.0000mm 8.0000mm 17.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[12.5000mm 15.5000mm 12.5000mm 19.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[27.8000mm 34.2000mm 23.3518mm 34.2000mm 10.00mil 20.00mil "clearline"]
-	Line[23.3518mm 34.2000mm 21.8012mm 32.6494mm 10.00mil 20.00mil "clearline"]
 	Line[10.2860mm 23.0642mm 10.2860mm 24.5860mm 0.6000mm 20.00mil "clearline"]
-	Line[10.2860mm 24.5860mm 12.0000mm 26.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[12.0000mm 26.3000mm 12.0000mm 29.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[12.0000mm 29.9000mm 15.0000mm 32.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[17.6001mm 27.5000mm 12.0000mm 27.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[8.6980mm 29.3000mm 12.0000mm 29.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[13.7000mm 49.5000mm 13.7000mm 40.0000mm 10.00mil 20.00mil "clearline"]
-	Line[27.3000mm 34.8000mm 22.9000mm 34.8000mm 10.00mil 20.00mil "clearline"]
-	Line[22.9000mm 34.8000mm 22.2000mm 34.1000mm 10.00mil 20.00mil "clearline"]
-	Line[22.2000mm 34.1000mm 14.4000mm 34.1000mm 10.00mil 20.00mil "clearline"]
-	Line[14.4000mm 34.1000mm 11.3000mm 31.0000mm 10.00mil 20.00mil "clearline"]
-	Line[11.3000mm 31.0000mm 6.9000mm 31.0000mm 10.00mil 20.00mil "clearline"]
-	Line[6.9000mm 31.0000mm 5.7000mm 29.8000mm 10.00mil 20.00mil "clearline"]
-	Line[5.7000mm 29.8000mm 5.7000mm 23.0782mm 10.00mil 20.00mil "clearline"]
-	Line[5.7000mm 23.0782mm 5.7140mm 23.0642mm 10.00mil 20.00mil "clearline"]
 	Line[26.5084mm 37.3068mm 27.8068mm 37.3068mm 0.6000mm 20.00mil "clearline"]
 	Line[27.8068mm 37.3068mm 28.0000mm 37.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[28.0000mm 37.5000mm 29.0000mm 37.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[29.0000mm 37.5000mm 30.0000mm 38.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.0000mm 38.5000mm 30.0000mm 47.1000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.0000mm 47.1000mm 30.9000mm 48.0000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.9000mm 49.7998mm 32.2002mm 49.7998mm 0.6000mm 20.00mil "clearline"]
-	Line[32.2002mm 49.7998mm 32.3000mm 49.7000mm 0.6000mm 20.00mil "clearline"]
-	Line[32.3000mm 49.7000mm 32.3000mm 45.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[32.3000mm 45.8000mm 31.6000mm 45.1000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.0000mm 43.9000mm 32.7000mm 43.9000mm 10.00mil 20.00mil "clearline"]
-	Line[32.7000mm 43.9000mm 33.3000mm 44.5000mm 10.00mil 20.00mil "clearline"]
-	Line[33.3000mm 44.5000mm 33.3000mm 51.0000mm 10.00mil 20.00mil "clearline"]
-	Line[33.3000mm 51.0000mm 32.4000mm 51.9000mm 10.00mil 20.00mil "clearline"]
-	Line[26.5084mm 52.3068mm 26.5084mm 51.1084mm 0.6000mm 20.00mil "clearline"]
-	Line[26.5084mm 51.1084mm 26.2000mm 2000.00mil 0.6000mm 20.00mil "clearline"]
-	Line[26.2000mm 2000.00mil 26.2000mm 49.9000mm 0.6000mm 20.00mil "clearline"]
+	Line[28.6000mm 26.4000mm 32.3000mm 26.4000mm 10.00mil 20.00mil "clearline"]
+	Line[32.3000mm 26.4000mm 32.6000mm 26.7000mm 10.00mil 20.00mil "clearline"]
+	Line[32.6000mm 26.7000mm 32.6000mm 30.5000mm 10.00mil 20.00mil "clearline"]
+	Line[31.2000mm 35.6000mm 31.2000mm 34.9000mm 0.6000mm 20.00mil "clearline"]
+	Line[31.2000mm 34.9000mm 31.8000mm 34.3000mm 0.6000mm 20.00mil "clearline"]
+	Line[31.8000mm 34.3000mm 31.8000mm 28.1000mm 0.6000mm 20.00mil "clearline"]
+	Line[1250.00mil 28.0500mm 31.8000mm 28.1000mm 0.6000mm 20.00mil "clearline"]
+	Line[26.9000mm 31.1494mm 29.9988mm 31.1494mm 0.6000mm 20.00mil "clearline"]
+	Line[26.9000mm 29.6000mm 26.9000mm 28.0500mm 0.6000mm 20.00mil "clearline"]
+	Line[24.8000mm 31.8000mm 23.5000mm 31.8000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.5000mm 31.8000mm 23.0000mm 31.3000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.0000mm 31.3000mm 23.0000mm 28.1000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.5000mm 33.7000mm 25.9000mm 33.7000mm 0.6000mm 20.00mil "clearline"]
+	Line[25.9000mm 33.7000mm 26.9000mm 32.7000mm 0.6000mm 20.00mil "clearline"]
+	Line[27.8000mm 34.2000mm 27.8000mm 33.6000mm 10.00mil 20.00mil "clearline"]
+	Line[27.8000mm 33.6000mm 26.9000mm 32.7000mm 10.00mil 20.00mil "clearline"]
+	Line[24.8000mm 30.2000mm 1000.00mil 30.2000mm 0.6000mm 20.00mil "clearline"]
+	Line[1000.00mil 30.2000mm 26.2000mm 31.0000mm 0.6000mm 20.00mil "clearline"]
+	Line[26.2000mm 31.0000mm 26.8000mm 31.0000mm 0.6000mm 20.00mil "clearline"]
+	Line[26.8000mm 31.0000mm 26.9000mm 31.1000mm 0.6000mm 20.00mil "clearline"]
+	Line[12.5000mm 15.5000mm 12.5000mm 17.0000mm 0.6000mm 20.00mil "clearline"]
+	Line[14.5000mm 17.6000mm 15.5000mm 17.6000mm 10.00mil 20.00mil "clearline"]
+	Line[12.5000mm 17.7000mm 12.5000mm 16.9000mm 10.00mil 20.00mil "clearline"]
+	Line[12.5000mm 19.8000mm 12.5000mm 17.8000mm 10.00mil 20.00mil "clearline"]
+	Line[14.5000mm 19.7000mm 15.5000mm 19.7000mm 10.00mil 20.00mil "clearline"]
+	Line[17.5000mm 19.7000mm 19.9000mm 19.7000mm 10.00mil 20.00mil "clearline"]
+	Line[19.9000mm 19.7000mm 21.0000mm 20.8000mm 10.00mil 20.00mil "clearline"]
+	Line[12.6000mm 23.6000mm 10.3000mm 23.6000mm 0.6000mm 20.00mil "clearline"]
+	Line[26.0000mm 20.8000mm 30.2000mm 20.8000mm 10.00mil 20.00mil "clearline"]
+	Line[30.2000mm 20.8000mm 33.3000mm 23.9000mm 10.00mil 20.00mil "clearline"]
+	Line[10.2860mm 24.6000mm 10.2860mm 25.9120mm 0.6000mm 20.00mil "clearline"]
+	Line[10.2860mm 25.9120mm 8.9000mm 27.2980mm 0.6000mm 20.00mil "clearline"]
+	Line[10.2860mm 25.9000mm 16.3020mm 25.9000mm 0.6000mm 20.00mil "clearline"]
+	Line[16.3020mm 25.9000mm 17.7000mm 27.2980mm 0.6000mm 20.00mil "clearline"]
+	Line[19.7650mm 22.0650mm 17.2350mm 22.0650mm 10.00mil 20.00mil "clearline"]
+	Line[17.2350mm 22.0650mm 16.8000mm 22.5000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 22.5000mm 16.8000mm 23.4998mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 23.4998mm 16.8002mm 23.5000mm 10.00mil 20.00mil "clearline"]
+	Line[818.76mil 23.3350mm 18.7647mm 23.3350mm 0.6000mm 20.00mil "clearline"]
+	Line[18.7647mm 23.3350mm 18.5998mm 23.4998mm 0.6000mm 20.00mil "clearline"]
+	Line[14.3999mm 23.6000mm 14.3999mm 956.69mil 0.6000mm 20.00mil "clearline"]
+	Line[14.3999mm 956.69mil 14.9000mm 24.8000mm 0.6000mm 20.00mil "clearline"]
+	Line[14.9000mm 24.8000mm 18.2000mm 24.8000mm 0.6000mm 20.00mil "clearline"]
+	Line[18.2000mm 24.8000mm 18.6000mm 24.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[18.6000mm 24.4000mm 18.6000mm 23.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[1250.00mil 28.0500mm 23.1500mm 28.0500mm 0.6000mm 20.00mil "clearline"]
+	Line[23.1500mm 28.0500mm 23.0000mm 28.2000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.4000mm 26.4000mm 23.4000mm 28.0500mm 0.6000mm 20.00mil "clearline"]
+	Line[23.4000mm 28.0500mm 23.4000mm 28.0500mm 0.6000mm 20.00mil "clearline"]
+	Line[23.4000mm 23.3000mm 23.4000mm 26.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.4000mm 26.4000mm 23.4000mm 26.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[8.9000mm 33.9020mm 19.1020mm 33.9020mm 0.6000mm 20.00mil "clearline"]
+	Line[19.1020mm 33.9020mm 20.6000mm 35.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[20.6000mm 35.4000mm 26.1000mm 35.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[26.1000mm 35.4000mm 26.5000mm 35.8000mm 0.6000mm 20.00mil "clearline"]
+	Line[26.5000mm 35.8000mm 26.5000mm 37.2984mm 0.6000mm 20.00mil "clearline"]
+	Line[26.5000mm 37.2984mm 26.5084mm 37.3068mm 0.6000mm 20.00mil "clearline"]
+	Line[17.7000mm 27.2980mm 19.9980mm 27.2980mm 0.6000mm 20.00mil "clearline"]
+	Line[19.9980mm 27.2980mm 21.6000mm 28.9000mm 0.6000mm 20.00mil "clearline"]
+	Line[21.6000mm 28.9000mm 21.6000mm 31.8000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.5000mm 33.7000mm 21.6000mm 31.8000mm 0.6000mm 20.00mil "clearline"]
+	Line[30.9000mm 38.4000mm 27.2000mm 34.7000mm 10.00mil 20.00mil "clearline"]
+	Line[27.2000mm 34.7000mm 23.0000mm 34.7000mm 10.00mil 20.00mil "clearline"]
+	Line[23.0000mm 34.7000mm 18.9000mm 30.6000mm 10.00mil 20.00mil "clearline"]
+	Line[18.9000mm 30.6000mm 6.7000mm 30.6000mm 10.00mil 20.00mil "clearline"]
+	Line[6.7000mm 30.6000mm 5.7000mm 29.6000mm 10.00mil 20.00mil "clearline"]
+	Line[5.7140mm 23.0642mm 5.7140mm 29.5860mm 10.00mil 20.00mil "clearline"]
+	Line[5.7140mm 29.5860mm 5.7000mm 29.6000mm 10.00mil 20.00mil "clearline"]
+	Line[29.8000mm 34.5000mm 29.8000mm 31.3482mm 0.6000mm 20.00mil "clearline"]
+	Line[29.8000mm 31.3482mm 29.9988mm 31.1494mm 0.6000mm 20.00mil "clearline"]
+	Line[20.5000mm 39.0000mm 20.5000mm 1469.10mil 10.00mil 20.00mil "clearline"]
+	Line[20.5000mm 1469.10mil 20.5084mm 37.3068mm 10.00mil 20.00mil "clearline"]
+	Line[22.5000mm 1469.10mil 22.5084mm 37.3068mm 10.00mil 20.00mil "clearline"]
+	Line[26.5000mm 42.9000mm 26.5000mm 37.4068mm 10.00mil 20.00mil "clearline"]
+	Line[26.5000mm 37.4068mm 26.4000mm 37.3068mm 10.00mil 20.00mil "clearline"]
+	Line[18.5000mm 52.2984mm 18.5084mm 52.3068mm 10.00mil 20.00mil "clearline"]
+	Line[25.9000mm 50.3000mm 26.0000mm 50.3000mm 10.00mil 20.00mil "clearline"]
+	Line[26.0000mm 50.3000mm 26.4000mm 50.7000mm 10.00mil 20.00mil "clearline"]
+	Line[26.4000mm 50.7000mm 26.4000mm 52.1984mm 10.00mil 20.00mil "clearline"]
+	Line[18.5084mm 37.3068mm 18.5084mm 38.6084mm 10.00mil 20.00mil "clearline"]
+	Line[18.5084mm 38.6084mm 18.9000mm 39.0000mm 10.00mil 20.00mil "clearline"]
+	Line[18.9000mm 39.0000mm 18.9000mm 42.6000mm 10.00mil 20.00mil "clearline"]
+	Line[22.5000mm 1469.10mil 22.5000mm 44.5000mm 10.00mil 20.00mil "clearline"]
+	Line[22.5000mm 44.5000mm 22.3000mm 44.7000mm 10.00mil 20.00mil "clearline"]
+	Line[22.3000mm 44.7000mm 19.8000mm 44.7000mm 10.00mil 20.00mil "clearline"]
+	Line[19.8000mm 44.7000mm 19.1000mm 45.4000mm 10.00mil 20.00mil "clearline"]
+	Line[23.3000mm 43.6000mm 23.3000mm 44.1000mm 10.00mil 20.00mil "clearline"]
+	Line[23.3000mm 44.1000mm 24.7000mm 45.5000mm 10.00mil 20.00mil "clearline"]
+	Line[21.6000mm 43.7000mm 20.1000mm 43.7000mm 10.00mil 20.00mil "clearline"]
+	Line[20.1000mm 43.7000mm 18.9000mm 42.5000mm 10.00mil 20.00mil "clearline"]
+	Line[25.9000mm 43.5000mm 25.9000mm 46.0000mm 10.00mil 20.00mil "clearline"]
+	Line[17.7000mm 33.9020mm 17.7000mm 35.6000mm 10.00mil 20.00mil "clearline"]
+	Line[17.7000mm 35.6000mm 17.5000mm 35.8000mm 10.00mil 20.00mil "clearline"]
+	Line[17.5000mm 35.8000mm 17.5000mm 39.0000mm 10.00mil 20.00mil "clearline"]
+	Line[17.5000mm 39.0000mm 17.3000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[15.5000mm 50.2000mm 15.5000mm 49.0000mm 10.00mil 20.00mil "clearline"]
+	Line[15.5000mm 49.0000mm 19.3000mm 45.2000mm 10.00mil 20.00mil "clearline"]
+	Line[16.5084mm 52.3068mm 16.5084mm 51.2084mm 10.00mil 20.00mil "clearline"]
+	Line[16.5084mm 51.2084mm 15.5000mm 50.2000mm 10.00mil 20.00mil "clearline"]
+	Line[15.5000mm 50.2000mm 13.1000mm 50.2000mm 10.00mil 20.00mil "clearline"]
+	Line[13.1000mm 50.2000mm 12.5000mm 2000.00mil 10.00mil 20.00mil "clearline"]
+	Line[12.5000mm 2000.00mil 12.5000mm 52.2984mm 10.00mil 20.00mil "clearline"]
+	Line[12.5000mm 52.2984mm 12.5084mm 52.3068mm 10.00mil 20.00mil "clearline"]
+	Line[18.5000mm 50.3000mm 18.5000mm 52.2984mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 49.6000mm 16.8000mm 48.7000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 48.7000mm 17.0000mm 48.5000mm 10.00mil 20.00mil "clearline"]
+	Line[17.0000mm 48.5000mm 23.4000mm 48.5000mm 10.00mil 20.00mil "clearline"]
+	Line[23.4000mm 48.5000mm 25.9000mm 46.0000mm 10.00mil 20.00mil "clearline"]
+	Line[18.5000mm 50.4000mm 18.5000mm 49.9000mm 10.00mil 20.00mil "clearline"]
+	Line[18.5000mm 49.9000mm 18.8000mm 49.6000mm 10.00mil 20.00mil "clearline"]
+	Line[24.6000mm 43.5000mm 25.9000mm 43.5000mm 10.00mil 20.00mil "clearline"]
+	Line[25.8000mm 43.5000mm 26.4000mm 43.5000mm 10.00mil 20.00mil "clearline"]
+	Line[26.4000mm 43.5000mm 26.5000mm 43.4000mm 10.00mil 20.00mil "clearline"]
+	Line[26.5000mm 43.4000mm 26.5000mm 42.8000mm 10.00mil 20.00mil "clearline"]
+	Line[24.5084mm 37.3068mm 24.5084mm 38.5084mm 10.00mil 20.00mil "clearline"]
+	Line[24.5084mm 38.5084mm 25.2000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[26.4000mm 52.1984mm 1078.80mil 53.2000mm 10.00mil 20.00mil "clearline"]
+	Line[1078.80mil 53.2000mm 32.7000mm 53.2000mm 10.00mil 20.00mil "clearline"]
+	Line[32.7000mm 53.2000mm 33.0000mm 52.9000mm 10.00mil 20.00mil "clearline"]
+	Line[33.0000mm 52.9000mm 33.0000mm 51.8800mm 10.00mil 20.00mil "clearline"]
+	Line[32.8800mm 41.6000mm 33.0000mm 41.7200mm 10.00mil 20.00mil "clearline"]
+	Line[30.6300mm 46.8500mm 26.7500mm 46.8500mm 10.00mil 20.00mil "clearline"]
+	Line[26.7500mm 46.8500mm 25.9000mm 46.0000mm 10.00mil 20.00mil "clearline"]
+	Line[32.2000mm 39.2000mm 31.7000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[31.7000mm 39.2000mm 31.4000mm 38.9000mm 10.00mil 20.00mil "clearline"]
+	Line[31.4000mm 38.9000mm 30.3000mm 38.9000mm 10.00mil 20.00mil "clearline"]
+	Line[30.3000mm 38.9000mm 29.9000mm 39.3000mm 10.00mil 20.00mil "clearline"]
+	Line[29.9000mm 39.3000mm 29.9000mm 43.2000mm 10.00mil 20.00mil "clearline"]
+	Line[29.9000mm 43.2000mm 31.8000mm 45.1000mm 10.00mil 20.00mil "clearline"]
+	Line[31.8000mm 45.1000mm 31.8000mm 47.8000mm 10.00mil 20.00mil "clearline"]
+	Line[31.8000mm 47.8000mm 31.5000mm 48.1000mm 10.00mil 20.00mil "clearline"]
+	Line[31.5000mm 48.1000mm 30.2000mm 48.1000mm 10.00mil 20.00mil "clearline"]
+	Line[30.2000mm 48.1000mm 29.5000mm 48.8000mm 10.00mil 20.00mil "clearline"]
+	Line[29.5000mm 48.8000mm 26.2000mm 48.8000mm 10.00mil 20.00mil "clearline"]
+	Line[26.2000mm 48.8000mm 25.9000mm 49.1000mm 10.00mil 20.00mil "clearline"]
+	Line[25.9000mm 49.1000mm 25.9000mm 50.2000mm 10.00mil 20.00mil "clearline"]
+	Line[30.8000mm 39.7000mm 30.9800mm 39.7000mm 10.00mil 20.00mil "clearline"]
+	Line[30.9800mm 39.7000mm 33.0000mm 41.7200mm 10.00mil 20.00mil "clearline"]
+	Line[16.5000mm 37.2000mm 16.5000mm 42.0000mm 10.00mil 20.00mil "clearline"]
+	Line[16.5000mm 42.0000mm 14.8000mm 43.7000mm 10.00mil 20.00mil "clearline"]
+	Line[30.7000mm 40.9000mm 30.7000mm 41.9600mm 10.00mil 20.00mil "clearline"]
+	Line[30.7000mm 41.9600mm 33.0000mm 44.2600mm 10.00mil 20.00mil "clearline"]
+	Line[10.8000mm 39.0000mm 11.1000mm 39.0000mm 10.00mil 20.00mil "clearline"]
+	Line[11.1000mm 39.0000mm 14.6000mm 42.5000mm 10.00mil 20.00mil "clearline"]
 )
 Layer(2 "ground")
 (
@@ -1698,145 +1729,184 @@
 	Line[31.1000mm 7.5000mm 28.4000mm 7.5000mm 1.2500mm 20.00mil "clearline"]
 	Line[31.1000mm 14.3000mm 31.1000mm 20.2000mm 1.2500mm 20.00mil "clearline"]
 	Line[31.1000mm 20.2000mm 25.5000mm 25.8000mm 1.2500mm 20.00mil "clearline"]
-	Line[10.2600mm 1094.50mil 10.2600mm 9.8600mm 10.00mil 20.00mil "clearline"]
 	Line[10.2600mm 9.8600mm 7.7000mm 7.3000mm 10.00mil 20.00mil "clearline"]
 	Line[13.3000mm 31.5000mm 13.3000mm 22.6000mm 10.00mil 20.00mil "clearline"]
-	Line[20.7000mm 30.9000mm 19.5000mm 30.9000mm 10.00mil 20.00mil "clearline"]
-	Line[19.5000mm 30.9000mm 19.3000mm 31.1000mm 10.00mil 20.00mil "clearline"]
-	Line[10.2600mm 29.6000mm 10.2600mm 31.0000mm 10.00mil 20.00mil "clearline"]
-	Line[10.2600mm 31.0000mm 10.7600mm 31.5000mm 10.00mil 20.00mil "clearline"]
 	Line[20.7000mm 25.7999mm 20.7000mm 15.2000mm 1.2500mm 20.00mil "clearline"]
 	Line[16.7600mm 31.1000mm 16.7600mm 27.1897mm 10.00mil 20.00mil "clearline"]
 	Line[16.7600mm 27.1897mm 18.1498mm 25.7999mm 10.00mil 20.00mil "clearline"]
-	Line[20.7000mm 25.7999mm 20.7000mm 29.1002mm 10.00mil 20.00mil "clearline"]
 	Line[25.5000mm 25.8000mm 23.2500mm 25.8000mm 1.2500mm 20.00mil "clearline"]
 	Line[23.2500mm 25.8000mm 915.35mil 25.7999mm 1.2500mm 20.00mil "clearline"]
-	Line[13.3000mm 37.4000mm 16.5576mm 37.4000mm 10.00mil 20.00mil "clearline"]
-	Line[16.5576mm 37.4000mm 16.7600mm 37.6024mm 10.00mil 20.00mil "clearline"]
-	Line[19.3000mm 37.6024mm 20.5024mm 37.6024mm 10.00mil 20.00mil "clearline"]
-	Line[20.5024mm 37.6024mm 20.7000mm 37.8000mm 10.00mil 20.00mil "clearline"]
-	Line[885.82mil 37.8000mm 885.82mil 38.3002mm 10.00mil 20.00mil "clearline"]
-	Line[26.4000mm 39.8000mm 28.5000mm 39.8000mm 10.00mil 20.00mil "clearline"]
-	Line[28.5000mm 39.8000mm 29.2000mm 40.5000mm 10.00mil 20.00mil "clearline"]
-	Line[29.2000mm 40.5000mm 29.2000mm 42.7000mm 10.00mil 20.00mil "clearline"]
-	Line[27.1000mm 41.1000mm 27.4000mm 41.4000mm 10.00mil 20.00mil "clearline"]
-	Line[27.4000mm 41.4000mm 27.4000mm 42.7000mm 10.00mil 20.00mil "clearline"]
-	Line[25.6000mm 42.7000mm 25.6000mm 41.9000mm 10.00mil 20.00mil "clearline"]
-	Line[25.6000mm 41.9000mm 24.9000mm 41.2000mm 10.00mil 20.00mil "clearline"]
-	Line[27.4000mm 44.4998mm 22.0000mm 44.4998mm 10.00mil 20.00mil "clearline"]
-	Line[23.7000mm 42.6000mm 23.8000mm 42.7000mm 10.00mil 20.00mil "clearline"]
-	Line[579.73mil 44.1998mm 579.73mil 46.0750mm 10.00mil 20.00mil "clearline"]
-	Line[579.73mil 46.0750mm 14.7002mm 46.1000mm 10.00mil 20.00mil "clearline"]
-	Line[656.49mil 44.1998mm 656.49mil 45.9251mm 10.00mil 20.00mil "clearline"]
-	Line[27.1000mm 41.1000mm 26.2000mm 41.1000mm 10.00mil 20.00mil "clearline"]
-	Line[885.82mil 37.6998mm 885.82mil 38.8002mm 10.00mil 20.00mil "clearline"]
-	Line[885.82mil 38.8002mm 22.2000mm 39.1000mm 10.00mil 20.00mil "clearline"]
-	Line[15.4000mm 39.3000mm 15.4000mm 40.5753mm 10.00mil 20.00mil "clearline"]
-	Line[15.4000mm 40.5753mm 605.32mil 40.6002mm 10.00mil 20.00mil "clearline"]
-	Line[17.5000mm 40.4000mm 17.5000mm 41.4000mm 10.00mil 20.00mil "clearline"]
-	Line[17.5000mm 41.4000mm 17.5251mm 41.4251mm 10.00mil 20.00mil "clearline"]
-	Line[29.2002mm 44.5000mm 29.2000mm 44.4998mm 0.6000mm 20.00mil "clearline"]
-	Line[28.0000mm 37.5000mm 31.2500mm 37.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[22.2000mm 39.1000mm 19.9000mm 39.1000mm 10.00mil 20.00mil "clearline"]
-	Line[19.9000mm 39.1000mm 19.4000mm 38.6000mm 10.00mil 20.00mil "clearline"]
-	Line[19.4000mm 38.6000mm 16.1000mm 38.6000mm 10.00mil 20.00mil "clearline"]
-	Line[16.1000mm 38.6000mm 15.4000mm 39.3000mm 10.00mil 20.00mil "clearline"]
-	Line[656.49mil 40.6002mm 656.49mil 39.4251mm 10.00mil 20.00mil "clearline"]
-	Line[656.49mil 39.4251mm 16.9000mm 39.2000mm 10.00mil 20.00mil "clearline"]
-	Line[16.9000mm 39.2000mm 18.6000mm 39.2000mm 10.00mil 20.00mil "clearline"]
-	Line[18.6000mm 39.2000mm 19.5000mm 40.1000mm 10.00mil 20.00mil "clearline"]
-	Line[13.3000mm 37.4000mm 13.3000mm 38.4000mm 10.00mil 20.00mil "clearline"]
-	Line[13.3000mm 38.4000mm 12.4000mm 39.3000mm 10.00mil 20.00mil "clearline"]
-	Line[29.2000mm 44.4998mm 29.2000mm 46.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[29.2000mm 46.8000mm 28.6000mm 47.4000mm 0.6000mm 20.00mil "clearline"]
-	Line[28.6000mm 47.4000mm 25.2000mm 47.4000mm 0.6000mm 20.00mil "clearline"]
-	Line[24.0500mm 47.3500mm 25.0500mm 47.3500mm 10.00mil 20.00mil "clearline"]
-	Line[25.0500mm 47.3500mm 25.1000mm 47.4000mm 10.00mil 20.00mil "clearline"]
-	Line[10.7600mm 37.4000mm 10.7600mm 39.9600mm 10.00mil 20.00mil "clearline"]
-	Line[10.7600mm 39.9600mm 11.5500mm 40.7500mm 10.00mil 20.00mil "clearline"]
-	Line[11.5500mm 40.7500mm 14.5753mm 40.7500mm 10.00mil 20.00mil "clearline"]
-	Line[14.5753mm 40.7500mm 579.73mil 40.6002mm 10.00mil 20.00mil "clearline"]
-	Line[21.1000mm 46.8000mm 21.1500mm 46.8500mm 10.00mil 20.00mil "clearline"]
-	Line[21.1500mm 46.8500mm 20.3500mm 46.8500mm 10.00mil 20.00mil "clearline"]
-	Line[21.1500mm 47.3500mm 19.5500mm 47.3500mm 10.00mil 20.00mil "clearline"]
-	Line[19.5500mm 47.3500mm 19.3000mm 47.1000mm 10.00mil 20.00mil "clearline"]
-	Line[21.1500mm 45.8500mm 21.1500mm 45.3498mm 10.00mil 20.00mil "clearline"]
-	Line[21.1500mm 45.3498mm 22.0000mm 44.4998mm 10.00mil 20.00mil "clearline"]
-	Line[579.73mil 46.1251mm 579.73mil 47.3251mm 0.6000mm 20.00mil "clearline"]
-	Line[12.5084mm 50.6084mm 590.22mil 50.6084mm 10.00mil 20.00mil "clearline"]
-	Line[590.22mil 50.6084mm 15.8500mm 49.7500mm 10.00mil 20.00mil "clearline"]
-	Line[15.8500mm 49.7500mm 16.8500mm 49.7500mm 10.00mil 20.00mil "clearline"]
-	Line[16.9000mm 48.8000mm 16.2000mm 48.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[579.73mil 47.3251mm 16.2000mm 48.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[23.7000mm 40.9000mm 23.7000mm 42.6000mm 10.00mil 20.00mil "clearline"]
-	Line[23.7000mm 42.6000mm 23.7500mm 42.6500mm 10.00mil 20.00mil "clearline"]
-	Line[20.7000mm 44.5000mm 22.0000mm 44.5000mm 10.00mil 20.00mil "clearline"]
-	Line[22.0000mm 44.5000mm 866.15mil 44.4998mm 10.00mil 20.00mil "clearline"]
-	Line[17.7000mm 45.4000mm 16.7000mm 45.4000mm 10.00mil 20.00mil "clearline"]
-	Line[16.7000mm 45.4000mm 656.49mil 45.4251mm 10.00mil 20.00mil "clearline"]
 	Line[13.3000mm 22.6000mm 20.7000mm 15.2000mm 10.00mil 20.00mil "clearline"]
 	Line[28.4000mm 7.5000mm 20.7000mm 15.2000mm 1.2500mm 20.00mil "clearline"]
-	Line[17.5251mm 41.4251mm 21.6251mm 41.4251mm 10.00mil 20.00mil "clearline"]
-	Line[21.6251mm 41.4251mm 22.0000mm 41.8000mm 10.00mil 20.00mil "clearline"]
-	Line[22.0000mm 41.8000mm 22.0000mm 42.7000mm 10.00mil 20.00mil "clearline"]
-	Line[20.3500mm 46.8500mm 19.9000mm 46.4000mm 10.00mil 20.00mil "clearline"]
-	Line[19.9000mm 46.4000mm 19.9000mm 41.4251mm 10.00mil 20.00mil "clearline"]
-	Line[15.4000mm 39.8000mm 13.9000mm 39.8000mm 10.00mil 20.00mil "clearline"]
-	Line[13.9000mm 39.8000mm 13.7000mm 40.0000mm 10.00mil 20.00mil "clearline"]
-	Line[31.2000mm 35.6000mm 31.2000mm 38.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[31.2000mm 38.8000mm 30.7000mm 39.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.7000mm 39.3000mm 30.7000mm 44.0000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.7000mm 44.0000mm 30.2000mm 44.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.2000mm 44.5000mm 29.2002mm 44.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[29.2002mm 44.5000mm 29.2001mm 44.4999mm 0.6000mm 20.00mil "clearline"]
-	Line[29.4000mm 33.9000mm 31.6000mm 33.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[32.1000mm 39.7000mm 32.1000mm 36.8000mm 0.6000mm 20.00mil "clearline"]
 	Line[32.1000mm 36.8000mm 32.6000mm 36.3000mm 0.6000mm 20.00mil "clearline"]
-	Line[32.6000mm 36.3000mm 32.6000mm 34.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[32.6000mm 34.9000mm 31.6000mm 33.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[32.1000mm 39.7000mm 31.6000mm 40.2000mm 0.6000mm 20.00mil "clearline"]
-	Line[31.6000mm 40.2000mm 31.6000mm 44.6000mm 0.6000mm 20.00mil "clearline"]
-	Line[31.6000mm 44.6000mm 30.3000mm 45.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[30.3000mm 45.9000mm 30.3000mm 47.2000mm 0.6000mm 20.00mil "clearline"]
-	Line[12.0000mm 51.7000mm 11.5000mm 51.2000mm 10.00mil 20.00mil "clearline"]
-	Line[11.5000mm 51.2000mm 11.5000mm 42.8000mm 10.00mil 20.00mil "clearline"]
-	Line[11.5000mm 42.8000mm 12.9000mm 41.4000mm 10.00mil 20.00mil "clearline"]
-	Line[12.9000mm 41.4000mm 13.9000mm 41.4000mm 10.00mil 20.00mil "clearline"]
-	Line[16.5000mm 46.1000mm 16.5000mm 46.4000mm 0.6000mm 20.00mil "clearline"]
-	Line[16.5000mm 46.4000mm 17.8000mm 47.7000mm 0.6000mm 20.00mil "clearline"]
-	Line[26.2000mm 49.9000mm 27.6000mm 49.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[27.6000mm 49.9000mm 30.3000mm 47.2000mm 0.6000mm 20.00mil "clearline"]
-	Line[26.1000mm 49.9000mm 18.0000mm 49.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[18.0000mm 49.9000mm 16.9000mm 48.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[21.1000mm 48.5000mm 21.1000mm 49.9000mm 0.6000mm 20.00mil "clearline"]
-	Line[759.85mil 48.5000mm 18.6000mm 48.5000mm 0.6000mm 20.00mil "clearline"]
-	Line[18.6000mm 48.5000mm 17.9000mm 47.8000mm 0.6000mm 20.00mil "clearline"]
-	Line[16.8500mm 49.7500mm 17.7000mm 50.6000mm 10.00mil 20.00mil "clearline"]
-	Line[17.7000mm 50.6000mm 20.5000mm 50.6000mm 10.00mil 20.00mil "clearline"]
-	Line[20.5000mm 50.6000mm 21.6000mm 51.7000mm 10.00mil 20.00mil "clearline"]
-	Line[21.6000mm 51.7000mm 22.5998mm 51.7000mm 10.00mil 20.00mil "clearline"]
-	Line[22.5998mm 51.7000mm 22.6000mm 51.6998mm 10.00mil 20.00mil "clearline"]
-	Line[16.5084mm 50.6084mm 17.0084mm 50.6084mm 10.00mil 20.00mil "clearline"]
-	Line[17.0084mm 50.6084mm 17.5000mm 51.1000mm 10.00mil 20.00mil "clearline"]
-	Line[17.5000mm 51.1000mm 20.3000mm 51.1000mm 10.00mil 20.00mil "clearline"]
-	Line[20.3000mm 51.1000mm 21.3000mm 52.1000mm 10.00mil 20.00mil "clearline"]
-	Line[21.3000mm 52.1000mm 21.3000mm 52.4000mm 10.00mil 20.00mil "clearline"]
-	Line[21.3000mm 52.4000mm 21.6000mm 52.7000mm 10.00mil 20.00mil "clearline"]
-	Line[21.6000mm 52.7000mm 24.2000mm 52.7000mm 10.00mil 20.00mil "clearline"]
-	Line[24.2000mm 52.7000mm 24.4000mm 52.5000mm 10.00mil 20.00mil "clearline"]
-	Line[24.4000mm 52.5000mm 24.4000mm 51.6998mm 10.00mil 20.00mil "clearline"]
-	Line[12.0000mm 51.7000mm 19.4000mm 51.7000mm 10.00mil 20.00mil "clearline"]
-	Line[19.4000mm 51.7000mm 20.9000mm 53.2000mm 10.00mil 20.00mil "clearline"]
-	Line[20.9000mm 53.2000mm 28.5600mm 53.2000mm 10.00mil 20.00mil "clearline"]
-	Line[28.5600mm 53.2000mm 29.8600mm 51.9000mm 10.00mil 20.00mil "clearline"]
-	Line[547.25mil 1656.50mil 13.1249mm 1656.50mil 10.00mil 20.00mil "clearline"]
-	Line[13.1249mm 1656.50mil 12.6000mm 42.6000mm 10.00mil 20.00mil "clearline"]
-	Line[12.6000mm 42.6000mm 12.6000mm 43.1000mm 10.00mil 20.00mil "clearline"]
-	Line[12.6000mm 43.1000mm 12.5000mm 43.2000mm 10.00mil 20.00mil "clearline"]
-	Line[688.97mil 42.7249mm 18.5751mm 42.7249mm 10.00mil 20.00mil "clearline"]
-	Line[18.5751mm 42.7249mm 19.0000mm 42.3000mm 10.00mil 20.00mil "clearline"]
-	Line[688.97mil 43.3749mm 18.8749mm 43.3749mm 10.00mil 20.00mil "clearline"]
-	Line[18.8749mm 43.3749mm 19.0000mm 43.5000mm 10.00mil 20.00mil "clearline"]
+	Line[29.8000mm 34.5000mm 30.0000mm 34.5000mm 0.6000mm 20.00mil "clearline"]
+	Line[30.0000mm 34.5000mm 30.5000mm 34.0000mm 0.6000mm 20.00mil "clearline"]
+	Line[30.5000mm 34.0000mm 31.5000mm 34.0000mm 0.6000mm 20.00mil "clearline"]
+	Line[31.5000mm 34.0000mm 32.6000mm 35.1000mm 0.6000mm 20.00mil "clearline"]
+	Line[32.6000mm 35.1000mm 32.6000mm 36.3000mm 0.6000mm 20.00mil "clearline"]
+	Line[22.5000mm 39.0000mm 22.5000mm 40.2000mm 10.00mil 20.00mil "clearline"]
+	Line[22.5000mm 40.2000mm 22.7000mm 40.4000mm 10.00mil 20.00mil "clearline"]
+	Line[20.5000mm 39.0000mm 20.5000mm 40.3000mm 10.00mil 20.00mil "clearline"]
+	Line[20.5000mm 40.3000mm 20.6000mm 40.4000mm 10.00mil 20.00mil "clearline"]
+	Line[16.7600mm 37.6024mm 13.5024mm 37.6024mm 10.00mil 20.00mil "clearline"]
+	Line[13.5024mm 37.6024mm 13.3000mm 37.4000mm 10.00mil 20.00mil "clearline"]
+	Line[23.9650mm 46.7650mm 23.3000mm 46.1000mm 10.00mil 20.00mil "clearline"]
+	Line[23.3000mm 46.1000mm 19.6000mm 46.1000mm 10.00mil 20.00mil "clearline"]
+	Line[19.6000mm 46.1000mm 19.1000mm 45.6000mm 10.00mil 20.00mil "clearline"]
+	Line[21.2965mm 45.4950mm 22.6050mm 45.4950mm 10.00mil 20.00mil "clearline"]
+	Line[22.6050mm 45.4950mm 24.7000mm 43.4000mm 10.00mil 20.00mil "clearline"]
+	Line[24.7000mm 43.4000mm 24.7000mm 42.1998mm 10.00mil 20.00mil "clearline"]
+	Line[24.7000mm 45.5000mm 26.5000mm 45.5000mm 10.00mil 20.00mil "clearline"]
+	Line[26.5000mm 45.5000mm 26.5050mm 45.4950mm 10.00mil 20.00mil "clearline"]
+	Line[21.6000mm 43.7000mm 23.2000mm 43.7000mm 10.00mil 20.00mil "clearline"]
+	Line[23.2000mm 43.7000mm 23.3000mm 43.6000mm 10.00mil 20.00mil "clearline"]
+	Line[17.3000mm 39.2000mm 17.1000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[17.1000mm 39.2000mm 16.8000mm 38.9000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 38.9000mm 16.8000mm 37.6024mm 10.00mil 20.00mil "clearline"]
+	Line[25.9000mm 1964.90mil 26.5035mm 49.3050mm 10.00mil 20.00mil "clearline"]
+	Line[31.2000mm 35.6000mm 31.2000mm 39.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[31.2000mm 39.4000mm 30.9000mm 39.7000mm 0.6000mm 20.00mil "clearline"]
+	Line[15.5000mm 39.5000mm 15.7000mm 39.5000mm 10.00mil 20.00mil "clearline"]
+	Line[15.7000mm 39.5000mm 16.3000mm 40.1000mm 10.00mil 20.00mil "clearline"]
+	Line[11.4000mm 48.8200mm 11.6000mm 48.6200mm 10.00mil 20.00mil "clearline"]
+	Line[13.1998mm 50.1000mm 16.8000mm 50.1000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 51.1000mm 16.8000mm 48.6270mm 10.00mil 20.00mil "clearline"]
+	Line[16.8000mm 48.6270mm 16.8070mm 48.6200mm 10.00mil 20.00mil "clearline"]
+	Line[15.6000mm 52.3000mm 14.7000mm 51.4000mm 10.00mil 20.00mil "clearline"]
+	Line[14.7000mm 51.4000mm 11.7000mm 51.4000mm 10.00mil 20.00mil "clearline"]
+	Line[11.7000mm 51.4000mm 11.4000mm 51.1000mm 10.00mil 20.00mil "clearline"]
+	Line[11.4000mm 48.8200mm 11.4000mm 51.1000mm 10.00mil 20.00mil "clearline"]
+	Line[18.5998mm 51.1000mm 18.5998mm 52.2998mm 10.00mil 20.00mil "clearline"]
+	Line[18.5998mm 52.2998mm 18.6000mm 52.3000mm 10.00mil 20.00mil "clearline"]
+	Line[15.3000mm 52.8000mm 14.4000mm 51.9000mm 10.00mil 20.00mil "clearline"]
+	Line[14.4000mm 51.9000mm 10.8000mm 51.9000mm 10.00mil 20.00mil "clearline"]
+	Line[10.8000mm 51.9000mm 10.1000mm 51.2000mm 10.00mil 20.00mil "clearline"]
+	Line[10.1000mm 51.2000mm 10.1000mm 47.7000mm 10.00mil 20.00mil "clearline"]
+	Line[10.1000mm 47.7000mm 10.4000mm 47.4000mm 10.00mil 20.00mil "clearline"]
+	Line[10.4000mm 47.4000mm 11.5500mm 47.4000mm 10.00mil 20.00mil "clearline"]
+	Line[11.5500mm 47.4000mm 11.6000mm 47.3500mm 10.00mil 20.00mil "clearline"]
+	Line[15.0000mm 53.3000mm 14.1000mm 52.4000mm 10.00mil 20.00mil "clearline"]
+	Line[14.1000mm 52.4000mm 10.5000mm 52.4000mm 10.00mil 20.00mil "clearline"]
+	Line[10.5000mm 52.4000mm 9.6000mm 51.5000mm 10.00mil 20.00mil "clearline"]
+	Line[9.6000mm 51.5000mm 9.6000mm 46.4000mm 10.00mil 20.00mil "clearline"]
+	Line[9.6000mm 46.4000mm 9.9000mm 46.1000mm 10.00mil 20.00mil "clearline"]
+	Line[9.9000mm 46.1000mm 11.5800mm 46.1000mm 10.00mil 20.00mil "clearline"]
+	Line[11.5800mm 46.1000mm 11.6000mm 46.0800mm 10.00mil 20.00mil "clearline"]
+	Line[19.1000mm 45.6000mm 19.1000mm 44.1000mm 10.00mil 20.00mil "clearline"]
+	Line[19.1000mm 44.1000mm 18.6000mm 43.6000mm 10.00mil 20.00mil "clearline"]
+	Line[18.6000mm 43.6000mm 16.8670mm 43.6000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8670mm 43.6000mm 16.8070mm 43.5400mm 10.00mil 20.00mil "clearline"]
+	Line[16.8070mm 42.2700mm 18.5700mm 42.2700mm 10.00mil 20.00mil "clearline"]
+	Line[18.5700mm 42.2700mm 18.9000mm 42.6000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8070mm 43.5400mm 14.9600mm 43.5400mm 10.00mil 20.00mil "clearline"]
+	Line[14.9600mm 43.5400mm 14.8000mm 43.7000mm 10.00mil 20.00mil "clearline"]
+	Line[20.6000mm 42.1998mm 23.8002mm 42.1998mm 10.00mil 20.00mil "clearline"]
+	Line[23.8002mm 42.1998mm 24.0000mm 42.0000mm 10.00mil 20.00mil "clearline"]
+	Line[24.0000mm 42.0000mm 24.0000mm 38.3000mm 10.00mil 20.00mil "clearline"]
+	Line[24.0000mm 38.3000mm 24.4000mm 37.9000mm 10.00mil 20.00mil "clearline"]
+	Line[24.4000mm 37.9000mm 1000.00mil 37.9000mm 10.00mil 20.00mil "clearline"]
+	Line[1000.00mil 37.9000mm 26.7000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[26.7000mm 39.2000mm 28.0000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[25.2000mm 40.4002mm 25.2000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[10.2600mm 9.8600mm 10.2600mm 11.7600mm 10.00mil 20.00mil "clearline"]
+	Line[10.2600mm 11.7600mm 10.3000mm 11.8000mm 10.00mil 20.00mil "clearline"]
+	Line[10.3000mm 13.8000mm 10.3000mm 25.9000mm 10.00mil 20.00mil "clearline"]
+	Line[10.3000mm 25.9000mm 10.6000mm 26.2000mm 10.00mil 20.00mil "clearline"]
+	Line[10.6000mm 26.2000mm 10.6000mm 27.5000mm 10.00mil 20.00mil "clearline"]
+	Line[10.6000mm 27.5000mm 10.7000mm 27.6000mm 10.00mil 20.00mil "clearline"]
+	Line[10.7000mm 29.6000mm 10.7000mm 31.4400mm 10.00mil 20.00mil "clearline"]
+	Line[10.7000mm 31.4400mm 10.7600mm 31.5000mm 10.00mil 20.00mil "clearline"]
+	Line[20.7000mm 26.2000mm 20.7000mm 28.9000mm 10.00mil 20.00mil "clearline"]
+	Line[20.7000mm 28.9000mm 21.5000mm 29.7000mm 10.00mil 20.00mil "clearline"]
+	Line[23.5000mm 29.7000mm 23.5000mm 32.1000mm 10.00mil 20.00mil "clearline"]
+	Line[21.5000mm 32.1000mm 20.3000mm 32.1000mm 10.00mil 20.00mil "clearline"]
+	Line[20.3000mm 32.1000mm 19.3000mm 31.1000mm 10.00mil 20.00mil "clearline"]
+	Line[18.2000mm 45.5000mm 19.4000mm 46.7000mm 10.00mil 20.00mil "clearline"]
+	Line[19.4000mm 46.7000mm 19.4000mm 49.0000mm 10.00mil 20.00mil "clearline"]
+	Line[19.4000mm 49.0000mm 18.8000mm 49.6000mm 10.00mil 20.00mil "clearline"]
+	Line[18.8000mm 46.1000mm 19.4000mm 46.7000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8070mm 47.3500mm 17.5500mm 47.3500mm 10.00mil 20.00mil "clearline"]
+	Line[17.5500mm 47.3500mm 18.6000mm 48.4000mm 10.00mil 20.00mil "clearline"]
+	Line[16.8070mm 46.0800mm 17.4800mm 46.0800mm 10.00mil 20.00mil "clearline"]
+	Line[17.4800mm 46.0800mm 18.6000mm 47.2000mm 10.00mil 20.00mil "clearline"]
+	Line[11.6000mm 44.8100mm 9.8100mm 44.8100mm 10.00mil 20.00mil "clearline"]
+	Line[9.8100mm 44.8100mm 9.8000mm 44.8000mm 10.00mil 20.00mil "clearline"]
+	Line[29.5000mm 43.8000mm 29.5000mm 42.5000mm 10.00mil 20.00mil "clearline"]
+	Line[29.5000mm 42.5000mm 28.8000mm 41.8000mm 10.00mil 20.00mil "clearline"]
+	Line[28.8000mm 41.8000mm 28.8000mm 41.5000mm 10.00mil 20.00mil "clearline"]
+	Line[26.5000mm 45.5000mm 26.5000mm 44.9000mm 10.00mil 20.00mil "clearline"]
+	Line[26.5000mm 44.9000mm 27.7000mm 43.7000mm 10.00mil 20.00mil "clearline"]
+	Line[27.0000mm 41.7000mm 27.0000mm 42.4000mm 10.00mil 20.00mil "clearline"]
+	Line[27.0000mm 42.4000mm 25.0000mm 44.4000mm 10.00mil 20.00mil "clearline"]
+	Line[25.0000mm 44.4000mm 24.5000mm 44.4000mm 10.00mil 20.00mil "clearline"]
+	Line[24.5000mm 44.4000mm 23.3000mm 45.6000mm 10.00mil 20.00mil "clearline"]
+	Line[23.3000mm 45.6000mm 23.3000mm 46.1000mm 10.00mil 20.00mil "clearline"]
+	Line[23.9650mm 46.7650mm 23.9000mm 46.7000mm 10.00mil 20.00mil "clearline"]
+	Line[26.5650mm 46.7650mm 23.9650mm 46.7650mm 10.00mil 20.00mil "clearline"]
+	Line[23.9650mm 46.7650mm 23.8500mm 46.6500mm 10.00mil 20.00mil "clearline"]
+	Line[28.0000mm 37.5000mm 31.1000mm 37.5000mm 0.6000mm 20.00mil "clearline"]
+	Line[31.1000mm 37.5000mm 31.2000mm 37.4000mm 0.6000mm 20.00mil "clearline"]
+	Line[15.0000mm 53.3000mm 29.2600mm 53.3000mm 10.00mil 20.00mil "clearline"]
+	Line[29.2600mm 53.3000mm 30.6300mm 51.9300mm 10.00mil 20.00mil "clearline"]
+	Line[15.3000mm 52.8000mm 27.2200mm 52.8000mm 10.00mil 20.00mil "clearline"]
+	Line[27.2200mm 52.8000mm 30.6300mm 49.3900mm 10.00mil 20.00mil "clearline"]
+	Line[32.1000mm 36.8000mm 32.1000mm 39.1000mm 0.6000mm 20.00mil "clearline"]
+	Line[32.1000mm 39.1000mm 32.2000mm 39.2000mm 0.6000mm 20.00mil "clearline"]
+	Line[23.9650mm 46.7650mm 28.0650mm 46.7650mm 10.00mil 20.00mil "clearline"]
+	Line[28.0650mm 46.7650mm 29.4000mm 48.1000mm 10.00mil 20.00mil "clearline"]
+	Line[29.4000mm 48.1000mm 31.7600mm 48.1000mm 10.00mil 20.00mil "clearline"]
+	Line[31.7600mm 48.1000mm 33.0800mm 49.4200mm 10.00mil 20.00mil "clearline"]
+	Line[26.5050mm 45.4950mm 31.6950mm 45.4950mm 10.00mil 20.00mil "clearline"]
+	Line[31.6950mm 45.4950mm 33.0000mm 46.8000mm 10.00mil 20.00mil "clearline"]
+	Line[15.6000mm 52.3000mm 25.5000mm 52.3000mm 10.00mil 20.00mil "clearline"]
+	Line[25.5000mm 52.3000mm 25.9000mm 51.9000mm 10.00mil 20.00mil "clearline"]
+	Line[25.9000mm 51.9000mm 25.9000mm 50.2000mm 10.00mil 20.00mil "clearline"]
+	Line[22.1000mm 2000.00mil 22.1000mm 52.3000mm 10.00mil 20.00mil "clearline"]
+	Line[23.8998mm 2000.00mil 23.8998mm 48.9998mm 10.00mil 20.00mil "clearline"]
+	Line[23.8998mm 48.9998mm 23.4000mm 48.5000mm 10.00mil 20.00mil "clearline"]
+	Line[14.6000mm 42.7000mm 14.6000mm 42.1000mm 10.00mil 20.00mil "clearline"]
+	Line[14.6000mm 42.1000mm 15.0000mm 41.7000mm 10.00mil 20.00mil "clearline"]
+	Line[19.3000mm 37.6024mm 19.1976mm 37.6024mm 10.00mil 20.00mil "clearline"]
+	Line[19.1976mm 37.6024mm 18.3000mm 38.5000mm 10.00mil 20.00mil "clearline"]
+	Line[18.3000mm 38.5000mm 18.3000mm 39.6000mm 10.00mil 20.00mil "clearline"]
+	Line[18.3000mm 39.6000mm 17.8000mm 40.1000mm 10.00mil 20.00mil "clearline"]
+	Line[17.8000mm 40.1000mm 16.3000mm 40.1000mm 10.00mil 20.00mil "clearline"]
+	Line[15.0000mm 41.7000mm 18.3000mm 41.7000mm 10.00mil 20.00mil "clearline"]
+	Line[18.3000mm 41.7000mm 19.2000mm 40.8000mm 10.00mil 20.00mil "clearline"]
+	Line[19.2000mm 40.8000mm 19.2000mm 39.1000mm 10.00mil 20.00mil "clearline"]
+	Line[19.2000mm 39.1000mm 20.3000mm 38.0000mm 10.00mil 20.00mil "clearline"]
+	Line[20.3000mm 38.0000mm 23.2000mm 38.0000mm 10.00mil 20.00mil "clearline"]
+	Line[23.2000mm 38.0000mm 23.9000mm 37.3000mm 10.00mil 20.00mil "clearline"]
+	Line[23.9000mm 37.3000mm 25.9000mm 37.3000mm 10.00mil 20.00mil "clearline"]
+	Line[25.9000mm 37.3000mm 27.2000mm 38.6000mm 10.00mil 20.00mil "clearline"]
+	Line[27.2000mm 38.6000mm 28.6000mm 38.6000mm 10.00mil 20.00mil "clearline"]
+	Line[28.6000mm 38.6000mm 29.7000mm 39.7000mm 10.00mil 20.00mil "clearline"]
+	Line[28.8000mm 41.8000mm 28.8000mm 40.0000mm 10.00mil 20.00mil "clearline"]
+	Line[28.8000mm 40.0000mm 28.0000mm 39.2000mm 10.00mil 20.00mil "clearline"]
+	Line[32.2500mm 39.2500mm 32.2500mm 40.4500mm 10.00mil 20.00mil "clearline"]
+	Line[32.2500mm 40.4500mm 31.4000mm 41.3000mm 10.00mil 20.00mil "clearline"]
+	Line[31.4000mm 41.3000mm 31.4000mm 41.7000mm 10.00mil 20.00mil "clearline"]
+	Line[31.4000mm 41.7000mm 31.3000mm 41.8000mm 10.00mil 20.00mil "clearline"]
+	Line[31.3000mm 41.8000mm 28.7999mm 41.8000mm 10.00mil 20.00mil "clearline"]
+	Line[29.6500mm 39.6500mm 29.6500mm 40.6500mm 10.00mil 20.00mil "clearline"]
+	Line[29.6500mm 40.6500mm 29.9000mm 40.9000mm 10.00mil 20.00mil "clearline"]
+	Line[29.9000mm 40.9000mm 30.7000mm 40.9000mm 10.00mil 20.00mil "clearline"]
+	Line[10.7600mm 37.4000mm 10.7600mm 38.9600mm 10.00mil 20.00mil "clearline"]
+	Line[10.7600mm 38.9600mm 10.8000mm 39.0000mm 10.00mil 20.00mil "clearline"]
+	Line[14.6000mm 42.5000mm 14.5000mm 42.5000mm 10.00mil 20.00mil "clearline"]
+	Line[14.5000mm 42.5000mm 13.9000mm 43.1000mm 10.00mil 20.00mil "clearline"]
+	Line[13.9000mm 43.1000mm 13.9000mm 43.9000mm 10.00mil 20.00mil "clearline"]
+	Line[13.9000mm 43.9000mm 14.8000mm 44.8000mm 10.00mil 20.00mil "clearline"]
+	Line[14.8000mm 44.8000mm 16.7970mm 44.8000mm 10.00mil 20.00mil "clearline"]
+	Line[16.7970mm 44.8000mm 16.8070mm 44.8100mm 10.00mil 20.00mil "clearline"]
+	Line[18.2000mm 45.5000mm 14.7000mm 45.5000mm 10.00mil 20.00mil "clearline"]
+	Line[14.7000mm 45.5000mm 13.2000mm 44.0000mm 10.00mil 20.00mil "clearline"]
+	Line[13.2000mm 44.0000mm 13.2000mm 41.7000mm 10.00mil 20.00mil "clearline"]
+	Line[13.2000mm 41.7000mm 13.6000mm 41.3000mm 10.00mil 20.00mil "clearline"]
+	Line[13.6000mm 41.3000mm 13.6000mm 39.3000mm 10.00mil 20.00mil "clearline"]
+	Line[13.6000mm 39.3000mm 13.6000mm 39.3000mm 10.00mil 20.00mil "clearline"]
+	Line[11.6000mm 42.2700mm 13.1700mm 42.2700mm 10.00mil 20.00mil "clearline"]
+	Line[13.1700mm 42.2700mm 13.2000mm 42.3000mm 10.00mil 20.00mil "clearline"]
 )
 Layer(7 "outline")
 (
@@ -1850,104 +1920,96 @@
 )
 Layer(9 "silk")
 (
-	Text[5.5140mm 22.6642mm 0 122 "Dr" "clearline,onsolder"]
-	Text[9.5000mm 21.8000mm 0 122 "erzinia" "clearline,onsolder"]
-	Text[5.2000mm 53.2000mm 0 122 "ESP8266" "clearline,onsolder"]
-	Text[5.1000mm 51.4000mm 0 122 "Switch" "clearline,onsolder"]
-	Text[5.1000mm 49.5000mm 0 122 "r1" "clearline,onsolder"]
+	Text[6.2000mm 22.3000mm 0 122 "Dr" "clearline,onsolder"]
+	Text[4.8000mm 53.8000mm 0 122 "ESP8266" "clearline,onsolder"]
+	Text[4.8000mm 52.0000mm 0 122 "Switch" "clearline,onsolder"]
+	Text[4.8000mm 50.3000mm 0 122 "r1" "clearline,onsolder"]
+	Text[9.9000mm 21.9000mm 0 122 "erzinia" "clearline,onsolder"]
 	Polygon("clearpoly")
 	(
-		[39.3936mm 47.6813mm] [39.4109mm 47.6623mm] [39.4297mm 47.6389mm] [39.4444mm 47.6084mm] [39.4505mm 47.5675mm] 
-		[39.4467mm 47.5403mm] [39.4363mm 47.5076mm] [39.4218mm 47.4728mm] [39.4045mm 47.4390mm] [39.3870mm 47.4095mm] 
-		[39.3710mm 47.3877mm] [39.3583mm 47.3765mm] [39.3509mm 47.3795mm] [39.3387mm 47.4250mm] [39.3176mm 47.5030mm] 
-		[39.2900mm 47.5861mm] [39.2216mm 47.6991mm] [39.2138mm 47.7306mm] [1544.40mil 47.7456mm] [39.2564mm 47.7471mm] 
-		[1547.00mil 47.7382mm] [39.3336mm 47.7222mm] [39.3690mm 47.7024mm] 
+		[7.5432mm 24.4677mm] [7.5183mm 24.4618mm] [7.5011mm 24.4479mm] [7.5092mm 24.4131mm] [7.5377mm 24.3211mm] 
+		[7.5841mm 24.1779mm] [7.6464mm 23.9899mm] [7.7693mm 24.0430mm] [7.7403mm 24.1372mm] [7.7563mm 24.1703mm] 
+		[7.7965mm 24.1951mm] [7.8483mm 24.2106mm] [7.8991mm 24.2160mm] [7.9519mm 24.2005mm] [8.0932mm 24.1570mm] 
+		[8.3096mm 24.0897mm] [8.5890mm 24.0024mm] [8.9187mm 23.8990mm] [9.2862mm 23.7834mm] [9.6789mm 23.6597mm] 
+		[397.02mil 23.5319mm] [10.4894mm 23.4039mm] [10.8823mm 23.2795mm] [11.2504mm 23.1626mm] [11.5806mm 23.0575mm] 
+		[11.8605mm 22.9678mm] [12.0779mm 22.8975mm] [12.2199mm 22.8507mm] [12.2742mm 22.8312mm] [12.3078mm 22.7867mm] 
+		[12.3151mm 22.7397mm] [12.2966mm 22.6912mm] [12.2529mm 22.6435mm] [12.2135mm 22.6257mm] [12.1429mm 22.5942mm] 
+		[12.0517mm 22.5538mm] [11.9496mm 22.5093mm] [11.8470mm 22.4659mm] [462.76mil 22.4286mm] [11.6806mm 22.4016mm] 
+		[11.6372mm 22.3905mm] [11.5468mm 22.3872mm] [451.63mil 22.3851mm] [11.3769mm 22.3989mm] [11.2290mm 22.4431mm] 
+		[11.1127mm 22.4819mm] [11.0111mm 22.5139mm] [10.9349mm 22.5358mm] [10.8955mm 22.5436mm] [10.8511mm 22.5180mm] 
+		[10.8023mm 22.4344mm] [10.7452mm 22.3356mm] [10.6761mm 22.2622mm] [10.5920mm 22.2109mm] [10.4889mm 22.1791mm] 
+		[408.63mil 22.1520mm] [405.13mil 22.1228mm] [10.2237mm 22.0880mm] [10.1678mm 22.0476mm] [10.1203mm 22.0024mm] 
+		[394.15mil 22.1207mm] [9.9316mm 22.1997mm] [9.8656mm 22.2437mm] [9.8049mm 22.2561mm] [9.7406mm 22.2414mm] 
+		[9.6740mm 22.2170mm] [9.6187mm 22.2017mm] [9.5724mm 22.1967mm] [9.5328mm 22.2025mm] [9.4978mm 22.2195mm] 
+		[9.4653mm 22.2490mm] [9.4327mm 22.2909mm] [9.3982mm 22.3463mm] [9.3616mm 22.4001mm] [9.3060mm 22.4718mm] 
+		[9.2387mm 22.5520mm] [9.1671mm 22.6315mm] [9.0779mm 22.7316mm] [9.0081mm 22.8233mm] [8.9474mm 22.9206mm] 
+		[8.8861mm 23.0377mm] [8.8071mm 23.1875mm] [8.7449mm 23.2825mm] [8.6969mm 23.3249mm] [8.6611mm 23.3181mm] 
+		[8.6504mm 23.2914mm] [8.6387mm 23.2363mm] [8.6278mm 23.1609mm] [8.6189mm 23.0732mm] [8.5940mm 22.8909mm] 
+		[8.5529mm 22.7542mm] [8.4919mm 22.6556mm] [8.4084mm 22.5886mm] [8.3581mm 22.5586mm] [8.3245mm 22.5446mm] 
+		[8.2989mm 22.5571mm] [8.2732mm 22.6061mm] [8.2395mm 22.7021mm] [8.1889mm 22.8558mm] [8.1135mm 23.0773mm] 
+		[8.0053mm 23.3770mm] [7.8963mm 23.6737mm] [7.8193mm 23.8921mm] [7.7693mm 24.0430mm] [7.6464mm 23.9899mm] 
+		[7.7226mm 23.7636mm] [307.50mil 23.5050mm] [7.9077mm 23.2203mm] [8.0129mm 22.9160mm] [8.5374mm 21.4027mm] 
+		[8.0771mm 19.8284mm] [8.2679mm 19.7943mm] [8.2717mm 19.8624mm] [8.3040mm 20.0036mm] [8.3624mm 20.2109mm] 
+		[8.4434mm 20.4768mm] [8.4825mm 20.3463mm] [8.5189mm 20.2607mm] [8.5491mm 20.1931mm] [8.5704mm 20.1182mm] 
+		[8.5623mm 20.0278mm] [8.5232mm 19.9368mm] [8.4777mm 19.8479mm] [8.4503mm 19.7641mm] [8.4239mm 19.7634mm] 
+		[8.3649mm 19.7646mm] [8.3030mm 19.7733mm] [8.2679mm 19.7943mm] [8.0771mm 19.8284mm] [8.0055mm 19.8375mm] 
+		[7.9514mm 19.8474mm] [7.8991mm 19.8520mm] [7.8536mm 19.8362mm] [7.8204mm 19.7849mm] [7.8168mm 19.7242mm] 
+		[7.8458mm 19.6854mm] [7.8920mm 19.6615mm] [7.9395mm 19.6463mm] [8.1696mm 19.5952mm] [8.3969mm 19.5368mm] 
+		[8.3847mm 19.5030mm] [8.3738mm 19.4756mm] [8.3657mm 19.4509mm] [8.3616mm 19.4263mm] [8.3629mm 19.3986mm] 
+		[8.3710mm 19.3643mm] [8.3875mm 19.3209mm] [8.4140mm 19.2647mm] [8.4975mm 19.0410mm] [8.5250mm 18.8578mm] 
+		[8.5222mm 18.7217mm] [8.5156mm 18.6389mm] [8.5046mm 18.6351mm] [8.4731mm 18.6513mm] [8.4261mm 18.5322mm] 
+		[8.4617mm 18.5094mm] [8.5021mm 18.4697mm] [8.5206mm 18.4431mm] [8.5402mm 18.4034mm] [8.5636mm 18.3432mm] 
+		[8.5938mm 18.2546mm] [8.6466mm 18.1223mm] [8.6812mm 17.9927mm] [8.6832mm 17.8782mm] [8.6659mm 17.7882mm] 
+		[8.6199mm 17.6966mm] [8.5364mm 17.5774mm] [8.5034mm 17.5292mm] [8.4724mm 17.4766mm] [8.4465mm 17.4266mm] 
+		[8.4300mm 17.3849mm] [8.3967mm 17.2932mm] [8.3576mm 17.2160mm] [8.3047mm 17.1421mm] [8.2316mm 17.0595mm] 
+		[8.1678mm 16.9912mm] [8.1229mm 16.9417mm] [8.0886mm 16.9061mm] [8.0571mm 16.8792mm] [8.0210mm 16.8550mm] 
+		[7.9725mm 16.8291mm] [7.9037mm 16.7956mm] [7.8069mm 16.7491mm] [7.7025mm 16.7049mm] [7.6324mm 16.6846mm] 
+		[7.5887mm 16.6785mm] [7.5636mm 16.6770mm] [7.5488mm 16.6694mm] [7.5364mm 16.6465mm] [7.5183mm 16.5983mm] 
+		[7.4866mm 16.5144mm] [7.3245mm 16.1837mm] [7.1031mm 15.8807mm] [7.0464mm 15.8164mm] [6.9969mm 15.7636mm] 
+		[6.9601mm 15.7278mm] [6.9410mm 15.7146mm] [6.9291mm 15.7212mm] [6.9151mm 15.7456mm] [6.9032mm 15.7959mm] 
+		[6.8983mm 15.8794mm] [6.8933mm 16.0405mm] [6.8780mm 16.1479mm] [6.8519mm 16.2040mm] [6.8143mm 16.2101mm] 
+		[6.7241mm 16.1830mm] [6.6553mm 16.1685mm] [6.6034mm 16.1677mm] [6.5638mm 16.1802mm] [6.5316mm 16.2071mm] 
+		[6.5021mm 16.2482mm] [6.4711mm 16.3039mm] [6.4335mm 16.3747mm] [6.4627mm 16.4034mm] [6.5295mm 16.4748mm] 
+		[6.6281mm 16.5830mm] [6.7533mm 16.7217mm] [6.8999mm 16.8853mm] [7.0622mm 17.0671mm] [7.2349mm 17.2615mm] 
+		[7.4127mm 17.4621mm] [7.5905mm 17.6628mm] [7.7624mm 17.8576mm] [7.9235mm 18.0405mm] [8.0680mm 18.2051mm] 
+		[8.1907mm 18.3455mm] [8.2864mm 18.4558mm] [8.3499mm 18.5297mm] [8.3753mm 18.5607mm] [8.3969mm 18.5467mm] 
+		[8.4261mm 18.5322mm] [8.4731mm 18.6513mm] [8.4246mm 18.6854mm] [8.3616mm 18.7362mm] [8.2997mm 18.7865mm] 
+		[8.2450mm 18.8276mm] [8.2034mm 18.8556mm] [8.1810mm 18.8657mm] [8.1536mm 18.8581mm] [8.1394mm 18.8370mm] 
+		[8.1389mm 18.8055mm] [8.1531mm 18.7672mm] [8.1683mm 18.7166mm] [8.1373mm 18.6681mm] [8.0957mm 18.6206mm] 
+		[8.0223mm 18.5353mm] [7.9212mm 18.4172mm] [7.7970mm 18.2721mm] [7.6545mm 18.1050mm] [7.4978mm 17.9211mm] 
+		[7.3317mm 17.7260mm] [7.1602mm 17.5251mm] [6.9888mm 17.3234mm] [6.8209mm 17.1263mm] [6.6616mm 16.9391mm] 
+		[6.5156mm 16.7674mm] [6.3868mm 16.6163mm] [6.2801mm 16.4911mm] [6.1998mm 16.3971mm] [6.1511mm 16.3397mm] 
+		[6.0548mm 16.2300mm] [5.9420mm 16.1045mm] [5.8272mm 15.9790mm] [5.7236mm 15.8688mm] [5.5115mm 15.6257mm] 
+		[5.3726mm 15.4118mm] [5.2966mm 15.2081mm] [5.2738mm 14.9950mm] [5.3009mm 14.8076mm] [5.3774mm 14.6493mm] 
+		[5.4965mm 14.5297mm] [5.6522mm 14.4573mm] [5.8199mm 14.4403mm] [5.9971mm 14.4741mm] [6.1813mm 14.5579mm] 
+		[6.3687mm 14.6900mm] [6.4274mm 14.7453mm] [6.5135mm 14.8342mm] [6.6151mm 14.9445mm] [6.7210mm 15.0636mm] 
+		[6.8376mm 15.1962mm] [6.9679mm 15.3415mm] [7.0962mm 15.4827mm] [7.2067mm 15.6016mm] [7.3030mm 15.7057mm] 
+		[7.3880mm 15.8025mm] [7.4709mm 15.9003mm] [7.5595mm 16.0075mm] [7.6626mm 16.1319mm] [7.7884mm 16.2825mm] 
+		[7.9451mm 16.4672mm] [8.1412mm 16.6943mm] [8.4693mm 17.0702mm] [8.7248mm 17.3610mm] [8.9141mm 17.5744mm] 
+		[9.0441mm 17.7174mm] [9.0982mm 17.7740mm] [9.1325mm 17.8009mm] [9.1584mm 17.8037mm] [9.1876mm 17.7882mm] 
+		[9.2311mm 17.7689mm] [9.2610mm 17.7811mm] [9.2821mm 17.8167mm] [9.2743mm 17.8599mm] [9.2344mm 17.9178mm] 
+		[9.1587mm 17.9981mm] [9.0881mm 18.0704mm] [9.0484mm 18.1238mm] [9.0284mm 18.1779mm] [9.0169mm 18.2526mm] 
+		[9.0015mm 18.5038mm] [9.0175mm 18.7209mm] [9.0657mm 18.9074mm] [9.1467mm 19.0669mm] [9.1902mm 19.1317mm] 
+		[9.2250mm 19.1812mm] [9.2537mm 19.2165mm] [9.2781mm 19.2401mm] [9.3007mm 19.2531mm] [9.3238mm 19.2579mm] 
+		[9.3497mm 19.2556mm] [9.3802mm 19.2482mm] [9.4538mm 19.2373mm] [9.5112mm 19.2599mm] [9.5554mm 19.3112mm] 
+		[9.5537mm 19.3676mm] [9.5100mm 19.4189mm] [9.4292mm 19.4545mm] [9.3878mm 19.4687mm] [9.3708mm 19.4822mm] 
+		[9.3913mm 19.5627mm] [9.4449mm 19.7514mm] [9.5211mm 20.0118mm] [9.6090mm 20.3074mm] [9.6977mm 20.6021mm] 
+		[9.7762mm 20.8594mm] [9.8336mm 21.0430mm] [9.8592mm 21.1159mm] [9.8907mm 21.1355mm] [9.9745mm 21.1837mm] 
+		[10.1043mm 21.2576mm] [404.52mil 21.3539mm] [10.4802mm 21.4695mm] [10.7149mm 21.6010mm] [10.9730mm 21.7453mm] 
+		[11.2488mm 21.8992mm] [453.76mil 22.0539mm] [11.7853mm 22.1997mm] [12.0233mm 22.3338mm] [12.2328mm 22.4527mm] 
+		[12.4086mm 22.5533mm] [12.5445mm 22.6318mm] [12.6349mm 22.6854mm] [12.6738mm 22.7103mm] [12.7116mm 22.7527mm] 
+		[12.7279mm 22.7890mm] [12.7147mm 22.8169mm] [12.6644mm 22.8515mm] [12.5605mm 22.8980mm] [12.3865mm 22.9622mm] 
+		[12.1264mm 23.0501mm] [463.13mil 23.1675mm] [444.15mil 23.3199mm] [10.6641mm 23.5132mm] [10.1086mm 23.6864mm] 
+		[9.5600mm 23.8563mm] [9.0383mm 24.0173mm] [8.5636mm 24.1629mm] [8.1567mm 24.2871mm] [7.8374mm 24.3834mm] 
+		[7.6260mm 24.4456mm] 
 	)
 	Polygon("clearpoly")
 	(
-		[281.23mil 24.5677mm] [280.25mil 967.00mil] [279.57mil 24.5479mm] [7.1092mm 24.5131mm] [281.01mil 24.4211mm] 
-		[282.84mil 24.2779mm] [285.29mil 24.0899mm] [7.3693mm 24.1430mm] [288.99mil 954.22mil] [289.62mil 24.2703mm] 
-		[291.20mil 956.50mil] [7.4483mm 957.11mil] [7.4991mm 24.3160mm] [297.32mil 24.3005mm] [302.88mil 955.00mil] 
-		[311.40mil 952.35mil] [322.40mil 24.1024mm] [335.38mil 23.9990mm] [349.85mil 23.8834mm] [365.31mil 23.7597mm] 
-		[381.27mil 930.39mil] [397.22mil 925.35mil] [412.69mil 23.3795mm] [427.18mil 915.85mil] [440.18mil 23.1575mm] 
-		[451.20mil 23.0678mm] [459.76mil 22.9975mm] [465.35mil 22.9507mm] [467.49mil 22.9312mm] [468.81mil 22.8867mm] 
-		[469.10mil 22.8397mm] [468.37mil 22.7912mm] [466.65mil 22.7435mm] [465.10mil 22.7257mm] [462.32mil 22.6942mm] 
-		[458.73mil 22.6538mm] [454.71mil 890.13mil] [11.4470mm 22.5659mm] [11.3541mm 22.5286mm] [444.12mil 885.89mil] 
-		[442.41mil 22.4905mm] [438.85mil 22.4872mm] [435.88mil 885.24mil] [432.16mil 22.4989mm] [10.8290mm 22.5431mm] 
-		[421.76mil 22.5819mm] [417.76mil 22.6139mm] [414.76mil 22.6358mm] [413.21mil 891.48mil] [411.46mil 22.6180mm] 
-		[409.54mil 22.5344mm] [407.29mil 22.4356mm] [404.57mil 22.3622mm] [10.1920mm 22.3109mm] [397.20mil 877.13mil] 
-		[392.88mil 22.2520mm] [389.38mil 22.2228mm] [9.8237mm 22.1880mm] [384.56mil 22.1476mm] [382.69mil 22.1024mm] 
-		[378.40mil 22.2207mm] [9.5316mm 22.2997mm] [372.66mil 22.3437mm] [370.27mil 22.3561mm] [9.3406mm 22.3414mm] 
-		[365.12mil 22.3170mm] [362.94mil 878.02mil] [361.12mil 22.2967mm] [359.56mil 22.3025mm] [358.18mil 878.72mil] 
-		[356.90mil 22.3490mm] [355.62mil 22.3909mm] [8.9982mm 22.4463mm] [352.82mil 22.5001mm] [8.9060mm 22.5718mm] 
-		[347.98mil 22.6520mm] [345.16mil 22.7315mm] [341.65mil 22.8316mm] [338.90mil 22.9233mm] [336.51mil 23.0206mm] 
-		[334.10mil 23.1377mm] [330.99mil 23.2875mm] [328.54mil 23.3825mm] [326.65mil 922.24mil] [8.2611mm 23.4181mm] 
-		[324.82mil 23.3914mm] [324.36mil 23.3363mm] [323.93mil 23.2609mm] [323.58mil 23.1732mm] [322.60mil 22.9909mm] 
-		[320.98mil 22.8542mm] [318.58mil 895.89mil] [315.29mil 22.6886mm] [313.31mil 22.6586mm] [311.99mil 891.52mil] 
-		[310.98mil 22.6571mm] [309.97mil 22.7061mm] [308.64mil 897.72mil] [306.65mil 22.9558mm] [303.68mil 23.1773mm] 
-		[299.42mil 23.4770mm] [7.4963mm 23.7737mm] [292.10mil 23.9921mm] [7.3693mm 24.1430mm] [285.29mil 24.0899mm] 
-		[288.29mil 23.8636mm] [291.75mil 23.6050mm] [295.58mil 23.3203mm] [299.72mil 23.0160mm] [8.1374mm 21.5027mm] 
-		[302.25mil 19.9284mm] [7.8679mm 783.24mil] [309.91mil 19.9624mm] [311.18mil 791.48mil] [313.48mil 20.3109mm] 
-		[316.67mil 810.11mil] [318.21mil 20.4463mm] [319.64mil 20.3607mm] [320.83mil 20.2931mm] [321.67mil 20.2182mm] 
-		[321.35mil 20.1278mm] [319.81mil 788.85mil] [8.0777mm 785.35mil] [316.94mil 19.8641mm] [315.90mil 19.8634mm] 
-		[313.58mil 19.8646mm] [311.14mil 19.8733mm] [7.8679mm 783.24mil] [302.25mil 19.9284mm] [299.43mil 19.9375mm] 
-		[297.30mil 19.9474mm] [7.4991mm 19.9520mm] [293.45mil 784.89mil] [292.14mil 782.87mil] [292.00mil 780.48mil] 
-		[293.14mil 19.7854mm] [294.96mil 19.7615mm] [296.83mil 19.7463mm] [7.7696mm 19.6952mm] [314.84mil 19.6368mm] 
-		[314.36mil 19.6030mm] [313.93mil 19.5756mm] [313.61mil 769.72mil] [313.45mil 19.5263mm] [313.50mil 19.4986mm] 
-		[313.82mil 19.4643mm] [314.47mil 19.4209mm] [315.51mil 762.39mil] [318.80mil 19.1410mm] [319.88mil 746.37mil] 
-		[319.77mil 18.8217mm] [319.51mil 18.7389mm] [319.08mil 18.7351mm] [317.84mil 738.24mil] [315.99mil 18.6322mm] 
-		[8.0617mm 18.6094mm] [318.98mil 18.5697mm] [319.71mil 18.5431mm] [320.48mil 728.48mil] [321.40mil 726.11mil] 
-		[322.59mil 18.3546mm] [324.67mil 18.2223mm] [326.03mil 18.0927mm] [326.11mil 17.9782mm] [325.43mil 704.26mil] 
-		[323.62mil 17.7966mm] [320.33mil 17.6774mm] [319.03mil 17.6292mm] [317.81mil 17.5766mm] [316.79mil 17.5266mm] 
-		[316.14mil 17.4849mm] [314.83mil 17.3932mm] [313.29mil 17.3160mm] [311.21mil 17.2421mm] [308.33mil 17.1595mm] 
-		[305.82mil 17.0912mm] [304.05mil 17.0417mm] [302.70mil 17.0061mm] [301.46mil 16.9792mm] [300.04mil 16.9550mm] 
-		[7.5725mm 666.50mil] [295.42mil 16.8956mm] [291.61mil 663.35mil] [287.50mil 661.61mil] [7.2324mm 16.7846mm] 
-		[7.1887mm 16.7785mm] [282.03mil 16.7770mm] [281.45mil 16.7694mm] [280.96mil 16.7465mm] [280.25mil 16.6983mm] 
-		[279.00mil 654.11mil] [272.62mil 16.2837mm] [263.90mil 15.9807mm] [261.67mil 626.63mil] [259.72mil 15.8636mm] 
-		[258.27mil 15.8278mm] [6.5410mm 15.8146mm] [257.05mil 15.8212mm] [256.50mil 15.8456mm] [256.03mil 15.8959mm] 
-		[255.84mil 629.11mil] [255.64mil 16.1405mm] [255.04mil 16.2479mm] [254.01mil 16.3040mm] [252.53mil 642.13mil] 
-		[248.98mil 16.2830mm] [246.27mil 16.2685mm] [244.23mil 16.2677mm] [242.67mil 16.2802mm] [241.40mil 16.3071mm] 
-		[6.1021mm 643.63mil] [6.0711mm 16.4039mm] [237.54mil 648.61mil] [238.69mil 649.74mil] [241.32mil 16.5748mm] 
-		[245.20mil 16.6830mm] [6.3533mm 16.8217mm] [255.90mil 16.9853mm] [262.29mil 675.87mil] [269.09mil 17.3615mm] 
-		[276.09mil 17.5621mm] [283.09mil 17.7628mm] [289.86mil 17.9576mm] [296.20mil 18.1405mm] [7.6680mm 18.3051mm] 
-		[306.72mil 18.4455mm] [310.49mil 18.5558mm] [312.99mil 18.6297mm] [313.99mil 18.6607mm] [314.84mil 18.6467mm] 
-		[315.99mil 18.6322mm] [317.84mil 738.24mil] [315.93mil 18.7854mm] [313.45mil 18.8362mm] [311.01mil 18.8865mm] 
-		[308.86mil 18.9276mm] [307.22mil 18.9556mm] [306.34mil 18.9657mm] [7.7536mm 18.9581mm] [304.70mil 18.9370mm] 
-		[304.68mil 18.9055mm] [7.7531mm 18.8672mm] [305.84mil 18.8166mm] [304.62mil 18.7681mm] [302.98mil 18.7206mm] 
-		[300.09mil 18.6353mm] [296.11mil 18.5172mm] [291.22mil 18.3721mm] [285.61mil 18.2050mm] [279.44mil 18.0211mm] 
-		[272.90mil 17.8260mm] [266.15mil 17.6251mm] [259.40mil 17.4234mm] [252.79mil 17.2263mm] [6.2616mm 17.0391mm] 
-		[240.77mil 16.8674mm] [235.70mil 16.7163mm] [231.50mil 16.5911mm] [228.34mil 16.4971mm] [226.42mil 16.4397mm] 
-		[5.6548mm 16.3300mm] [218.19mil 16.2045mm] [213.67mil 16.0790mm] [209.59mil 15.9688mm] [5.1115mm 15.7257mm] 
-		[195.77mil 15.5118mm] [192.78mil 15.3081mm] [191.88mil 15.0950mm] [192.95mil 14.9076mm] [195.96mil 14.7493mm] 
-		[200.65mil 14.6297mm] [206.78mil 14.5573mm] [213.38mil 14.5403mm] [220.36mil 14.5741mm] [227.61mil 14.6579mm] 
-		[234.99mil 14.7900mm] [237.30mil 14.8453mm] [240.69mil 14.9342mm] [244.69mil 15.0445mm] [248.86mil 15.1636mm] 
-		[253.45mil 15.2962mm] [258.58mil 15.4415mm] [6.6962mm 15.5827mm] [267.98mil 15.7016mm] [271.77mil 15.8057mm] 
-		[275.12mil 15.9025mm] [278.38mil 16.0003mm] [7.1595mm 16.1075mm] [285.93mil 16.2319mm] [290.88mil 644.98mil] 
-		[297.05mil 16.5672mm] [304.77mil 16.7943mm] [317.69mil 17.1702mm] [327.75mil 17.4610mm] [335.20mil 17.6744mm] 
-		[340.32mil 17.8174mm] [342.45mil 17.8740mm] [343.80mil 704.76mil] [344.82mil 704.87mil] [345.97mil 704.26mil] 
-		[347.68mil 703.50mil] [348.86mil 703.98mil] [349.69mil 17.9167mm] [349.38mil 17.9599mm] [347.81mil 18.0178mm] 
-		[344.83mil 18.0981mm] [342.05mil 715.37mil] [340.49mil 18.2238mm] [339.70mil 18.2779mm] [339.25mil 18.3526mm] 
-		[338.64mil 18.6038mm] [339.27mil 740.98mil] [341.17mil 19.0074mm] [344.36mil 19.1669mm] [346.07mil 19.2317mm] 
-		[347.44mil 19.2812mm] [348.57mil 19.3165mm] [349.53mil 19.3401mm] [350.42mil 19.3531mm] [351.33mil 19.3579mm] 
-		[352.35mil 19.3556mm] [353.55mil 761.74mil] [356.45mil 19.3373mm] [358.71mil 19.3599mm] [360.45mil 764.22mil] 
-		[360.38mil 19.4676mm] [358.66mil 19.5189mm] [355.48mil 19.5545mm] [353.85mil 19.5687mm] [353.18mil 19.5822mm] 
-		[353.99mil 19.6627mm] [356.10mil 19.8514mm] [359.10mil 20.1118mm] [362.56mil 20.4074mm] [366.05mil 20.7021mm] 
-		[369.14mil 20.9594mm] [371.40mil 21.1430mm] [372.41mil 21.2159mm] [373.65mil 21.2355mm] [376.95mil 21.2837mm] 
-		[382.06mil 840.85mil] [388.77mil 21.4539mm] [396.86mil 21.5695mm] [406.10mil 21.7010mm] [10.5730mm 21.8453mm] 
-		[427.12mil 866.11mil] [438.01mil 22.1539mm] [448.24mil 22.2997mm] [457.61mil 883.22mil] [465.86mil 22.5527mm] 
-		[472.78mil 22.6533mm] [478.13mil 22.7318mm] [481.69mil 22.7854mm] [483.22mil 22.8103mm] [484.71mil 22.8527mm] 
-		[485.35mil 22.8890mm] [484.83mil 902.24mil] [482.85mil 22.9515mm] [478.76mil 22.9980mm] [471.91mil 23.0622mm] 
-		[461.67mil 23.1501mm] [447.38mil 23.2675mm] [428.40mil 23.4199mm] [404.10mil 23.6132mm] [382.23mil 23.7864mm] 
-		[9.1600mm 23.9563mm] [340.09mil 949.50mil] [321.40mil 24.2629mm] [305.38mil 24.3871mm] [292.81mil 24.4834mm] 
-		[284.49mil 24.5456mm] 
-	)
-	Polygon("clearpoly")
-	(
-		[8.2064mm 23.8813mm] [8.1891mm 23.8622mm] [8.1703mm 23.8389mm] [8.1556mm 23.8084mm] [8.1495mm 23.7675mm] 
-		[8.1533mm 23.7403mm] [8.1637mm 933.37mil] [8.1782mm 932.00mil] [8.1955mm 23.6390mm] [8.2130mm 23.6095mm] 
-		[8.2290mm 928.65mil] [8.2417mm 23.5765mm] [8.2491mm 23.5795mm] [8.2613mm 23.6250mm] [8.2824mm 23.7030mm] 
-		[8.3100mm 23.7860mm] [8.3428mm 938.89mil] [8.3784mm 23.8991mm] [8.3862mm 942.15mil] [8.3723mm 942.74mil] 
-		[8.3436mm 23.9471mm] [8.3062mm 23.9382mm] [8.2663mm 23.9222mm] [8.2310mm 23.9024mm] 
+		[8.5064mm 23.7813mm] [8.4891mm 935.52mil] [8.4703mm 23.7389mm] [8.4556mm 23.7084mm] [8.4495mm 23.6675mm] 
+		[8.4533mm 930.72mil] [8.4637mm 23.6076mm] [8.4782mm 23.5728mm] [8.4955mm 23.5390mm] [8.5130mm 23.5095mm] 
+		[8.5290mm 23.4877mm] [8.5417mm 23.4765mm] [8.5491mm 924.39mil] [8.5613mm 23.5250mm] [8.5824mm 23.6030mm] 
+		[8.6100mm 23.6860mm] [8.6428mm 23.7478mm] [8.6784mm 23.7991mm] [8.6862mm 23.8306mm] [8.6723mm 23.8456mm] 
+		[8.6436mm 23.8471mm] [8.6062mm 23.8382mm] [8.5663mm 23.8222mm] [8.5310mm 23.8024mm] 
 	)
 )
 Layer(10 "silk")
@@ -1961,14 +2023,13 @@
 		Connect("C6-2")
 		Connect("C7-2")
 		Connect("C8-2")
+		Connect("CHAIN-1")
 		Connect("Prog-1")
 		Connect("R11-1")
 		Connect("R12-1")
 		Connect("R13-2")
-		Connect("R14-1")
 		Connect("R15-2")
-		Connect("R16-2")
-		Connect("U1-16")
+		Connect("U1-1")
 		Connect("U4-2")
 		Connect("U4-4")
 		Connect("U6-8")
@@ -1976,13 +2037,16 @@
 	)
 	Net("DetectLV" "(unknown)")
 	(
-		Connect("U1-5")
+		Connect("CHAIN-4")
+		Connect("U1-11")
 		Connect("U7-4")
 	)
 	Net("ESP_EN" "(unknown)")
 	(
-		Connect("R14-2")
+		Connect("R13-1")
+		Connect("U6-1")
 		Connect("U6-3")
+		Connect("U6-17")
 	)
 	Net("ESP_GPIO0" "(unknown)")
 	(
@@ -1990,23 +2054,10 @@
 		Connect("R15-1")
 		Connect("U6-18")
 	)
-	Net("ESP_GPIO2" "(unknown)")
-	(
-		Connect("Prog-9")
-		Connect("R16-1")
-		Connect("U6-17")
-	)
 	Net("ESP_GPIO15" "(unknown)")
 	(
-		Connect("Prog-10")
 		Connect("R17-1")
 		Connect("U6-16")
-	)
-	Net("ESP_RST" "(unknown)")
-	(
-		Connect("Prog-8")
-		Connect("R13-1")
-		Connect("U6-1")
 	)
 	Net("GND" "(unknown)")
 	(
@@ -2017,13 +2068,15 @@
 		Connect("C6-1")
 		Connect("C7-1")
 		Connect("C8-1")
-		Connect("Prog-12")
+		Connect("C9-2")
+		Connect("CHAIN-5")
+		Connect("Prog-8")
 		Connect("R2-1")
 		Connect("R6-1")
 		Connect("R7-1")
 		Connect("R17-2")
-		Connect("SW-2")
-		Connect("U1-13")
+		Connect("SW-3")
+		Connect("U1-14")
 		Connect("U2-2")
 		Connect("U3-4")
 		Connect("U4-1")
@@ -2048,17 +2101,17 @@
 	Net("ICPC" "(unknown)")
 	(
 		Connect("Prog-4")
-		Connect("U1-11")
+		Connect("U1-12")
 	)
 	Net("ICPD" "(unknown)")
 	(
 		Connect("Prog-3")
-		Connect("U1-12")
+		Connect("U1-13")
 	)
 	Net("Neutral" "(unknown)")
 	(
 		Connect("N-1")
-		Connect("R10-1")
+		Connect("R18-1")
 		Connect("U3-2")
 		Connect("V1-1")
 	)
@@ -2067,10 +2120,21 @@
 		Connect("Prog-6")
 		Connect("U6-21")
 	)
+	Net("s1" "(unknown)")
+	(
+		Connect("SW-1")
+		Connect("U1-3")
+	)
+	Net("s2" "(unknown)")
+	(
+		Connect("SW-2")
+		Connect("U1-2")
+	)
 	Net("SCL" "(unknown)")
 	(
+		Connect("CHAIN-2")
 		Connect("R11-2")
-		Connect("U1-9")
+		Connect("U1-10")
 		Connect("U6-20")
 		Connect("U8-6")
 	)
@@ -2082,15 +2146,11 @@
 	)
 	Net("SDA" "(unknown)")
 	(
+		Connect("CHAIN-3")
 		Connect("R12-2")
-		Connect("U1-8")
+		Connect("U1-9")
 		Connect("U6-19")
 		Connect("U8-5")
-	)
-	Net("Switch" "(unknown)")
-	(
-		Connect("SW-1")
-		Connect("U1-4")
 	)
 	Net("TX" "(unknown)")
 	(
@@ -2153,7 +2213,7 @@
 	)
 	Net("unnamed_net11" "(unknown)")
 	(
-		Connect("R9-1")
+		Connect("R19-2")
 		Connect("U2-4")
 	)
 	Net("unnamed_net12" "(unknown)")
@@ -2163,13 +2223,23 @@
 	)
 	Net("unnamed_net13" "(unknown)")
 	(
+		Connect("R9-1")
+		Connect("R19-1")
+	)
+	Net("unnamed_net14" "(unknown)")
+	(
 		Connect("R10-2")
 		Connect("U7-1")
 	)
+	Net("unnamed_net15" "(unknown)")
+	(
+		Connect("R10-1")
+		Connect("R18-2")
+	)
 	Net("VPP" "(unknown)")
 	(
 		Connect("Prog-2")
-		Connect("U1-3")
+		Connect("U1-4")
 	)
 	Net("VUreg" "(unknown)")
 	(
@@ -2177,6 +2247,7 @@
 		Connect("C2-2")
 		Connect("C3-1")
 		Connect("C4-2")
+		Connect("C9-1")
 		Connect("Q1-3")
 		Connect("R5-2")
 		Connect("U4-3")

--- a/schem/Boards/Single/ESP8266/Dimmer/ESP8266_Dimmer.sch
+++ b/schem/Boards/Single/ESP8266/Dimmer/ESP8266_Dimmer.sch
@@ -47,7 +47,7 @@
 T 49900 40200 5 10 1 1 0 0 1
 value=200k
 T 49900 40000 5 10 1 1 0 0 1
-footprint=0805
+footprint=0805_fit
 }
 C 50600 38700 1 90 0 resistor-1.sym
 {
@@ -58,7 +58,7 @@
 T 49900 39200 5 10 1 1 0 0 1
 value=200k
 T 49900 39000 5 10 1 1 0 0 1
-footprint=0805
+footprint=0805_fit
 }
 C 51600 38700 1 90 0 resistor-1.sym
 {
@@ -69,7 +69,7 @@
 T 50900 39100 5 10 1 1 0 0 1
 value=510k
 T 50900 38900 5 10 1 1 0 0 1
-footprint=0805
+footprint=0805_fit
 }
 C 51600 39800 1 90 0 resistor-1.sym
 {
@@ -80,7 +80,7 @@
 T 50900 40200 5 10 1 1 0 0 1
 value=510k
 T 50900 40000 5 10 1 1 0 0 1
-footprint=0805
+footprint=0805_fit
 }
 C 50500 36000 1 90 0 resistor-1.sym
 {
@@ -111,7 +111,7 @@
 T 55700 37200 5 10 1 1 0 0 1
 refdes=R6
 T 55700 37000 5 10 1 1 0 0 1
-value=12k
+value=10k
 T 55700 36800 5 10 1 1 0 0 1
 footprint=0805
 }
@@ -249,13 +249,13 @@
 T 51500 47800 5 10 1 1 0 0 1
 footprint=D2PAK
 }
-C 47900 48100 1 0 0 FODM3053V.sym
-{
-T 48695 49200 5 10 1 1 0 0 1
+C 47000 48100 1 0 0 FODM3053V.sym
+{
+T 47795 49200 5 10 1 1 0 0 1
 device=FODM3053V
-T 48295 49200 5 10 1 1 0 0 1
+T 47395 49200 5 10 1 1 0 0 1
 refdes=U2
-T 48295 48100 5 10 1 1 0 0 1
+T 47395 48100 5 10 1 1 0 0 1
 footprint=MFP4
 }
 C 50300 48800 1 0 0 resistor-1.sym
@@ -264,17 +264,19 @@
 device=RESISTOR
 T 50200 49000 5 10 1 1 0 0 1
 refdes=R9
-T 50500 49100 5 10 1 1 0 0 1
-footprint=0805
-}
-N 50100 48900 50300 48900 4
+T 50600 49100 5 10 1 1 0 0 1
+footprint=0805_fit
+T 50600 48600 5 10 1 1 0 0 1
+value=220
+}
+N 50200 48900 50300 48900 4
 N 51400 48700 51400 49500 4
 N 51400 48900 51200 48900 4
 N 51000 48000 50600 48000 4
 N 50600 48000 50600 48500 4
-N 50600 48500 50100 48500 4
-C 47600 48000 1 0 0 gnd-1.sym
-N 47700 48500 47900 48500 4
+N 50600 48500 49200 48500 4
+C 46700 48000 1 0 0 gnd-1.sym
+N 46800 48500 47000 48500 4
 N 51400 47600 51500 47600 4
 {
 T 51800 47500 5 10 1 1 0 0 1
@@ -286,24 +288,24 @@
 T 50900 49400 5 10 1 1 0 6 1
 netname=HotIn
 }
-N 46600 48900 46800 48900 4
-{
-T 46300 48800 5 10 1 1 0 6 1
+N 45800 48900 45900 48900 4
+{
+T 45500 48800 5 10 1 1 0 6 1
 netname=SCRCntl
 }
-N 47700 48300 47700 48500 4
-C 47700 48800 1 0 1 resistor-1.sym
-{
-T 47400 49200 5 10 0 0 0 6 1
-device=RESISTOR
-T 47000 49000 5 10 1 1 0 6 1
+N 46800 48300 46800 48500 4
+C 46800 48800 1 0 1 resistor-1.sym
+{
+T 46500 49200 5 10 0 0 0 6 1
+device=RESISTOR
+T 46100 49000 5 10 1 1 0 6 1
 refdes=R8
-T 47100 49100 5 10 1 1 0 0 1
-footprint=0805
-T 47600 49000 5 10 1 1 0 0 1
+T 46200 49100 5 10 1 1 0 0 1
+footprint=0805
+T 46200 48600 5 10 1 1 0 0 1
 value=220
 }
-N 47700 48900 47900 48900 4
+N 46800 48900 47000 48900 4
 C 51200 49500 1 90 0 busripper-2.sym
 {
 T 50800 49500 5 8 0 0 90 0 1
@@ -314,138 +316,139 @@
 T 51900 47600 5 8 0 0 90 2 1
 device=none
 }
-C 46600 48900 1 90 0 busripper-2.sym
-{
-T 46200 48900 5 8 0 0 90 0 1
-device=none
-}
-B 45300 47300 7300 2600 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+C 45800 48900 1 90 0 busripper-2.sym
+{
+T 45400 48900 5 8 0 0 90 0 1
+device=none
+}
+B 44600 47300 8000 2600 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 B 45300 41800 5600 5500 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-C 54500 49200 1 180 1 resistor-1.sym
-{
-T 54800 48800 5 10 0 0 180 6 1
-device=RESISTOR
-T 54300 49400 5 10 1 1 180 6 1
+C 54900 49200 1 180 1 resistor-1.sym
+{
+T 55200 48800 5 10 0 0 180 6 1
+device=RESISTOR
+T 54600 49400 5 10 1 1 180 6 1
 refdes=R10
-T 54700 49400 5 10 1 1 180 6 1
-footprint=0805
-}
-N 55400 49100 55500 49100 4
-N 54300 49100 54500 49100 4
-{
-T 54000 49200 5 10 1 1 180 0 1
+T 55100 49400 5 10 1 1 180 6 1
+footprint=0805_fit
+T 55100 48800 5 10 1 1 0 0 1
+value=100k
+}
+N 55800 49100 55900 49100 4
+N 53800 49100 53900 49100 4
+{
+T 53500 49200 5 10 1 1 180 0 1
 netname=Neutral
 }
-C 57700 48500 1 90 0 gnd-1.sym
-N 57300 48600 57400 48600 4
-C 57400 49100 1 270 1 busripper-2.sym
-{
-T 57800 49100 5 8 0 0 90 2 1
-device=none
-}
-N 57400 49100 57300 49100 4
-{
-T 57700 49000 5 10 1 1 0 0 1
+C 58100 48500 1 90 0 gnd-1.sym
+N 57700 48600 57800 48600 4
+C 57800 49100 1 270 1 busripper-2.sym
+{
+T 58200 49100 5 8 0 0 90 2 1
+device=none
+}
+N 57800 49100 57700 49100 4
+{
+T 58100 49000 5 10 1 1 0 0 1
 netname=DetectLV
 }
 B 52600 47300 6400 2600 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-C 48600 43000 1 180 1 busripper-2.sym
-{
-T 48600 42600 5 8 0 0 0 2 1
-device=none
-}
-N 48600 43100 48600 43000 4
-{
-T 48500 42700 5 10 1 1 270 0 1
+C 49500 44000 1 270 1 busripper-2.sym
+{
+T 49900 44000 5 8 0 0 90 2 1
+device=none
+}
+N 49400 44000 49500 44000 4
+{
+T 49800 43900 5 10 1 1 0 0 1
 netname=SDA
 }
-C 47200 46800 1 0 0 3.3V-plus-1.sym
-N 47100 46600 47400 46600 4
-N 47400 46300 47400 46800 4
-C 48700 46700 1 180 0 gnd-1.sym
-N 48600 46400 48600 46300 4
-C 46200 46400 1 0 0 capacitor-1.sym
-{
-T 46400 47100 5 10 0 0 0 0 1
+C 46900 46200 1 0 0 3.3V-plus-1.sym
+N 46800 46000 47300 46000 4
+C 49800 45900 1 90 0 gnd-1.sym
+N 49500 46000 49400 46000 4
+C 45900 45800 1 0 0 capacitor-1.sym
+{
+T 46100 46500 5 10 0 0 0 0 1
 device=CAPACITOR
-T 46400 47300 5 10 0 0 0 0 1
+T 46100 46700 5 10 0 0 0 0 1
 symversion=0.1
-T 46200 46700 5 10 1 1 0 0 1
+T 45900 46100 5 10 1 1 0 0 1
 refdes=C7
-T 46800 46400 5 10 1 1 0 0 1
-footprint=0805
-T 46800 46700 5 10 1 1 0 0 1
+T 46500 45800 5 10 1 1 0 0 1
+footprint=0805
+T 46500 46100 5 10 1 1 0 0 1
 value=100nF
 }
-C 46000 46200 1 0 0 gnd-1.sym
-N 46100 46600 46200 46600 4
-N 46100 46500 46100 46600 4
-N 55400 48600 55500 48600 4
-{
-T 55100 48700 5 10 1 1 180 0 1
+C 45700 45600 1 0 0 gnd-1.sym
+N 45800 46000 45900 46000 4
+N 45800 45900 45800 46000 4
+N 55800 48600 55900 48600 4
+{
+T 55500 48700 5 10 1 1 180 0 1
 netname=HotIn
 }
-C 55400 48600 1 90 1 busripper-2.sym
-{
-T 55000 48600 5 8 0 0 270 2 1
-device=none
-}
-C 47400 43000 1 180 0 busripper-2.sym
-{
-T 47400 42600 5 8 0 0 180 0 1
-device=none
-}
-N 47400 43000 47400 43100 4
-{
-T 47500 42700 5 10 1 1 90 6 1
+C 55800 48600 1 90 1 busripper-2.sym
+{
+T 55400 48600 5 8 0 0 270 2 1
+device=none
+}
+C 49500 44800 1 270 1 busripper-2.sym
+{
+T 49900 44800 5 8 0 0 90 2 1
+device=none
+}
+N 49500 44800 49400 44800 4
+{
+T 49800 44700 5 10 1 1 0 0 1
 netname=DetectLV
 }
-N 47800 43000 47800 43100 4
-{
-T 47900 42700 5 10 1 1 90 6 1
+N 47200 44000 47300 44000 4
+{
+T 46900 43900 5 10 1 1 0 6 1
 netname=SCRCntl
 }
-C 47800 43000 1 180 0 busripper-2.sym
-{
-T 47800 42600 5 8 0 0 180 0 1
-device=none
-}
-N 46300 44100 46400 44100 4
-{
-T 46000 44000 5 10 1 1 0 6 1
-netname=Switch
-}
-C 46300 44100 1 90 0 busripper-2.sym
-{
-T 45900 44100 5 8 0 0 90 0 1
-device=none
-}
-C 54300 49100 1 90 1 busripper-2.sym
-{
-T 53900 49100 5 8 0 0 270 2 1
-device=none
-}
-T 45400 47400 9 10 1 0 0 0 1
+C 47200 44000 1 90 0 busripper-2.sym
+{
+T 46800 44000 5 8 0 0 90 0 1
+device=none
+}
+N 47200 45600 47300 45600 4
+{
+T 46900 45500 5 10 1 1 0 6 1
+netname=s2
+}
+C 47200 45600 1 90 0 busripper-2.sym
+{
+T 46800 45600 5 8 0 0 90 0 1
+device=none
+}
+C 53800 49100 1 90 1 busripper-2.sym
+{
+T 53400 49100 5 8 0 0 270 2 1
+device=none
+}
+T 44600 47400 9 10 1 0 0 0 1
 AC Control
 T 45400 41900 9 10 1 0 0 0 1
 Controller
 T 52700 47400 9 10 1 0 0 0 1
 Optoisolator Zero Crossing Detection
-C 55500 48200 1 0 0 HCPL-354.sym
-{
-T 57100 49400 5 10 0 0 0 0 1
+C 55900 48200 1 0 0 HCPL-354.sym
+{
+T 57500 49400 5 10 0 0 0 0 1
 device=DIODE
-T 57300 48800 5 10 0 0 0 0 1
+T 57700 48800 5 10 0 0 0 0 1
 device=DIODE
-T 56600 48900 5 10 0 0 0 0 1
+T 57000 48900 5 10 0 0 0 0 1
 device=NPN_TRANSISTOR
-T 57425 48850 5 10 0 0 0 0 1
+T 57825 48850 5 10 0 0 0 0 1
 device=NPN_TRANSISTOR
-T 57100 49400 5 10 1 1 0 6 1
+T 57500 49400 5 10 1 1 0 6 1
 device=HCPL-354
-T 55900 49400 5 10 1 1 0 0 1
+T 56300 49400 5 10 1 1 0 0 1
 refdes=U7
-T 55900 48200 5 10 1 1 0 0 1
+T 56300 48200 5 10 1 1 0 0 1
 footprint=4_MINIFLAT_1
 }
 C 52700 42400 1 0 0 ESP_12E.sym
@@ -457,23 +460,14 @@
 T 56700 46900 5 10 1 1 0 6 1
 footprint=ESP_12E
 }
-C 46400 43100 1 0 0 PIC16LF1554_IML.sym
-{
-T 46800 46000 5 10 1 1 0 0 1
-refdes=U1
-T 47400 45200 5 10 1 1 0 0 1
-device=PIC16LF1554
-T 47400 45000 5 10 1 1 0 0 1
-footprint=QFN16_4_EP
-}
-C 49600 44100 1 270 1 busripper-2.sym
-{
-T 50000 44100 5 8 0 0 90 2 1
-device=none
-}
-N 49500 44100 49600 44100 4
-{
-T 49900 44000 5 10 1 1 0 0 1
+C 49500 44400 1 270 1 busripper-2.sym
+{
+T 49900 44400 5 8 0 0 90 2 1
+device=none
+}
+N 49400 44400 49500 44400 4
+{
+T 49800 44300 5 10 1 1 0 0 1
 netname=SCL
 }
 B 50900 41800 8100 5500 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
@@ -510,34 +504,34 @@
 T 57500 45100 5 10 1 1 0 0 1
 netname=SDA
 }
-C 46300 44500 1 90 0 busripper-2.sym
-{
-T 45900 44500 5 8 0 0 90 0 1
-device=none
-}
-N 46400 44500 46300 44500 4
-{
-T 46000 44400 5 10 1 1 0 6 1
+C 47200 44800 1 90 0 busripper-2.sym
+{
+T 46800 44800 5 8 0 0 90 0 1
+device=none
+}
+N 47300 44800 47200 44800 4
+{
+T 46900 44700 5 10 1 1 0 6 1
 netname=VPP
 }
-C 49600 45300 1 270 1 busripper-2.sym
-{
-T 50000 45300 5 8 0 0 90 2 1
-device=none
-}
-N 49500 45300 49600 45300 4
-{
-T 49900 45200 5 10 1 1 0 0 1
+C 49500 45600 1 270 1 busripper-2.sym
+{
+T 49900 45600 5 8 0 0 90 2 1
+device=none
+}
+N 49400 45600 49500 45600 4
+{
+T 49800 45500 5 10 1 1 0 0 1
 netname=ICPD
 }
-C 49600 44900 1 270 1 busripper-2.sym
-{
-T 50000 44900 5 8 0 0 90 2 1
-device=none
-}
-N 49500 44900 49600 44900 4
-{
-T 49900 44800 5 10 1 1 0 0 1
+C 49500 45200 1 270 1 busripper-2.sym
+{
+T 49900 45200 5 8 0 0 90 2 1
+device=none
+}
+N 49400 45200 49500 45200 4
+{
+T 49800 45100 5 10 1 1 0 0 1
 netname=ICPC
 }
 C 57500 43500 1 90 0 gnd-1.sym
@@ -608,6 +602,8 @@
 refdes=R11
 T 60500 46200 5 10 1 1 0 0 1
 footprint=0805
+T 61000 46600 5 10 1 1 0 0 1
+value=2.2k
 }
 C 61600 45900 1 180 0 resistor-1.sym
 {
@@ -617,11 +613,13 @@
 refdes=R12
 T 60500 45600 5 10 1 1 0 0 1
 footprint=0805
+T 61000 46000 5 10 1 1 0 0 1
+value=2.2k
 }
 C 61900 46600 1 0 1 3.3V-plus-1.sym
 N 61700 46400 61600 46400 4
 N 61600 45800 61700 45800 4
-N 61700 43400 61700 46600 4
+N 61700 44600 61700 46600 4
 C 55900 41000 1 0 1 busripper-2.sym
 {
 T 55900 41400 5 8 0 0 180 2 1
@@ -668,7 +666,7 @@
 T 48200 36500 5 10 1 1 0 0 1
 refdes=C5
 T 48200 36300 5 10 1 1 0 0 1
-value=22uF
+value=10uF
 T 48200 36100 5 10 1 1 0 0 1
 footprint=0805
 }
@@ -694,55 +692,39 @@
 N 47600 37100 47900 37100 4
 N 47900 37100 47900 36900 4
 N 48900 38000 48900 36900 4
+C 60700 44500 1 0 0 resistor-1.sym
+{
+T 61000 44900 5 10 0 0 0 0 1
+device=RESISTOR
+T 60500 44700 5 10 1 1 0 0 1
+refdes=R13
+T 60500 44400 5 10 1 1 0 0 1
+footprint=0805
+T 61000 44800 5 10 1 1 0 0 1
+value=10k
+}
+N 61600 44600 61700 44600 4
 C 60700 45100 1 0 0 resistor-1.sym
 {
 T 61000 45500 5 10 0 0 0 0 1
 device=RESISTOR
 T 60500 45300 5 10 1 1 0 0 1
-refdes=R13
+refdes=R15
 T 60500 45000 5 10 1 1 0 0 1
 footprint=0805
-}
-C 61600 44700 1 180 0 resistor-1.sym
-{
-T 61300 44300 5 10 0 0 180 0 1
-device=RESISTOR
-T 60500 44700 5 10 1 1 0 0 1
-refdes=R14
-T 60500 44400 5 10 1 1 0 0 1
-footprint=0805
+T 61000 45400 5 10 1 1 0 0 1
+value=10k
+}
+N 60600 45200 60700 45200 4
+{
+T 60300 45100 5 10 1 1 0 6 1
+netname=ESP_GPIO0
 }
 N 61600 45200 61700 45200 4
-N 61600 44600 61700 44600 4
-C 60700 43900 1 0 0 resistor-1.sym
-{
-T 61000 44300 5 10 0 0 0 0 1
-device=RESISTOR
-T 60500 44100 5 10 1 1 0 0 1
-refdes=R15
-T 60500 43800 5 10 1 1 0 0 1
-footprint=0805
-}
-N 60600 44000 60700 44000 4
-{
-T 60300 43900 5 10 1 1 0 6 1
-netname=ESP_GPIO0
-}
-N 61600 44000 61700 44000 4
-N 60600 43400 60700 43400 4
-{
-T 60300 43300 5 10 1 1 0 6 1
+N 60500 43600 60600 43600 4
+{
+T 60200 43500 5 10 1 1 0 6 1
 netname=ESP_GPIO2
-}
-N 61600 43400 61700 43400 4
-C 60700 43300 1 0 0 resistor-1.sym
-{
-T 61000 43700 5 10 0 0 0 0 1
-device=RESISTOR
-T 60500 43500 5 10 1 1 0 0 1
-refdes=R16
-T 60500 43200 5 10 1 1 0 0 1
-footprint=0805
 }
 C 60700 42700 1 0 0 resistor-1.sym
 {
@@ -752,6 +734,8 @@
 refdes=R17
 T 60500 42600 5 10 1 1 0 0 1
 footprint=0805
+T 61000 43000 5 10 1 1 0 0 1
+value=10k
 }
 N 60600 42800 60700 42800 4
 {
@@ -768,7 +752,7 @@
 T 59800 47900 5 10 1 1 0 0 1
 device=ATSHA204A
 T 60800 49500 5 10 1 1 0 6 1
-footprint=DFN8
+footprint=SO8
 }
 C 61300 48600 1 270 1 busripper-2.sym
 {
@@ -848,14 +832,14 @@
 T 52300 45500 5 10 1 1 0 6 1
 netname=ESP_EN
 }
-C 60600 44000 1 90 0 busripper-2.sym
-{
-T 60200 44000 5 8 0 0 90 0 1
-device=none
-}
-C 60600 43400 1 90 0 busripper-2.sym
-{
-T 60200 43400 5 8 0 0 90 0 1
+C 60600 45200 1 90 0 busripper-2.sym
+{
+T 60200 45200 5 8 0 0 90 0 1
+device=none
+}
+C 60500 43600 1 90 0 busripper-2.sym
+{
+T 60100 43600 5 8 0 0 90 0 1
 device=none
 }
 C 60600 42800 1 90 0 busripper-2.sym
@@ -863,14 +847,14 @@
 T 60200 42800 5 8 0 0 90 0 1
 device=none
 }
-C 60600 45200 1 90 0 busripper-2.sym
-{
-T 60200 45200 5 8 0 0 90 0 1
-device=none
-}
-C 60600 44600 1 90 0 busripper-2.sym
-{
-T 60200 44600 5 8 0 0 90 0 1
+C 60500 44600 1 90 0 busripper-2.sym
+{
+T 60100 44600 5 8 0 0 90 0 1
+device=none
+}
+C 60500 44100 1 90 0 busripper-2.sym
+{
+T 60100 44100 5 8 0 0 90 0 1
 device=none
 }
 C 58100 40400 1 0 0 connector1-2.sym
@@ -900,13 +884,6 @@
 T 58100 37200 5 10 1 1 0 0 1
 footprint=TERM_3MM
 }
-C 61100 35800 1 0 0 connector12-2.sym
-{
-T 61700 41200 5 10 1 1 0 6 1
-refdes=Prog
-T 61400 41050 5 10 0 0 0 0 1
-device=CONNECTOR_12
-}
 N 58000 40800 58100 40800 4
 {
 T 57700 40700 5 10 1 1 0 6 1
@@ -937,9 +914,9 @@
 T 57600 37800 5 8 0 0 90 0 1
 device=none
 }
-N 61000 36200 61100 36200 4
-C 60900 35800 1 0 0 gnd-1.sym
-N 61000 36100 61000 36200 4
+N 61000 37800 61100 37800 4
+C 60900 37400 1 0 0 gnd-1.sym
+N 61000 37700 61000 37800 4
 C 60800 40700 1 0 0 3.3V-plus-1.sym
 N 61000 40700 61000 40600 4
 N 61000 40600 61100 40600 4
@@ -1003,44 +980,14 @@
 T 60700 38100 5 10 1 1 0 6 1
 netname=ESP_GPIO0
 }
-C 61000 37400 1 90 0 busripper-2.sym
-{
-T 60600 37400 5 8 0 0 90 0 1
-device=none
-}
-N 61100 37400 61000 37400 4
-{
-T 60700 37300 5 10 1 1 0 6 1
-netname=ESP_GPIO2
-}
-C 61000 37000 1 90 0 busripper-2.sym
-{
-T 60600 37000 5 8 0 0 90 0 1
-device=none
-}
-N 61100 37000 61000 37000 4
-{
-T 60700 36900 5 10 1 1 0 6 1
-netname=ESP_GPIO15
-}
-C 61000 37800 1 90 0 busripper-2.sym
-{
-T 60600 37800 5 8 0 0 90 0 1
-device=none
-}
-N 61100 37800 61000 37800 4
-{
-T 60700 37700 5 10 1 1 0 6 1
-netname=ESP_RST
-}
-N 60700 44600 60600 44600 4
-{
-T 60300 44500 5 10 1 1 0 6 1
+N 60600 44100 60500 44100 4
+{
+T 60200 44000 5 10 1 1 0 6 1
 netname=ESP_EN
 }
-N 60700 45200 60600 45200 4
-{
-T 60300 45100 5 10 1 1 0 6 1
+N 60700 44600 60500 44600 4
+{
+T 60200 44500 5 10 1 1 0 6 1
 netname=ESP_RST
 }
 C 62700 48200 1 90 0 capacitor-1.sym
@@ -1060,25 +1007,156 @@
 N 62500 49100 62500 49400 4
 C 62400 47700 1 0 0 gnd-1.sym
 N 62500 48000 62500 48200 4
-C 58100 35500 1 0 0 connector2-2.sym
-{
-T 58700 36800 5 10 1 1 0 6 1
+C 59900 36700 1 270 0 capacitor-2.sym
+{
+T 60600 36500 5 10 0 0 270 0 1
+device=POLARIZED_CAPACITOR
+T 60800 36500 5 10 0 0 270 0 1
+symversion=0.1
+T 59200 36300 5 10 1 1 0 0 1
+refdes=C9
+T 59200 36100 5 10 1 1 0 0 1
+value=470uF
+T 59200 35900 5 10 1 1 0 0 1
+footprint=FCAPEL
+}
+N 60100 36700 60100 37000 4
+{
+T 59800 37300 5 10 1 1 0 0 1
+netname=VUreg
+}
+C 60000 35300 1 0 0 gnd-1.sym
+N 60100 35600 60100 35800 4
+C 60100 37000 1 0 1 busripper-2.sym
+{
+T 60100 37400 5 8 0 0 180 2 1
+device=none
+}
+C 61100 37400 1 0 0 connector8-2.sym
+{
+T 61800 41100 5 10 1 1 0 6 1
+refdes=Prog
+T 61400 41050 5 10 0 0 0 0 1
+device=CONNECTOR_8
+T 61400 41250 5 10 0 0 0 0 1
+footprint=SIP8N
+}
+N 60600 43600 60600 44600 4
+C 58000 34800 1 0 0 connector3-2.sym
+{
+T 58700 36500 5 10 1 1 0 6 1
 refdes=SW
-T 58400 36750 5 10 0 0 0 0 1
-device=CONNECTOR_2
-T 58400 35250 5 10 1 1 0 0 1
-footprint=SIP2
-}
-C 57700 36000 1 270 0 gnd-1.sym
-N 58100 35900 58000 35900 4
-N 58000 36300 58100 36300 4
-{
-T 57700 36200 5 10 1 1 0 6 1
-netname=Switch
-}
-C 58000 36300 1 90 0 busripper-2.sym
-{
-T 57600 36300 5 8 0 0 90 0 1
-device=none
-}
+T 58300 36450 5 10 0 0 0 0 1
+device=CONNECTOR_3
+T 58300 34550 5 10 1 1 0 0 1
+footprint=GSIP3_NS
+}
+C 57600 35300 1 270 0 gnd-1.sym
+N 58000 35200 57900 35200 4
+N 57900 35600 58000 35600 4
+{
+T 57600 35500 5 10 1 1 0 6 1
+netname=s2
+}
+C 57900 35600 1 90 0 busripper-2.sym
+{
+T 57500 35600 5 8 0 0 90 0 1
+device=none
+}
+N 57900 36000 58000 36000 4
+{
+T 57600 35900 5 10 1 1 0 6 1
+netname=s1
+}
+C 57900 36000 1 90 0 busripper-2.sym
+{
+T 57500 36000 5 8 0 0 90 0 1
+device=none
+}
+N 47200 45200 47300 45200 4
+{
+T 46900 45100 5 10 1 1 0 6 1
+netname=s1
+}
+C 47200 45200 1 90 0 busripper-2.sym
+{
+T 46800 45200 5 8 0 0 90 0 1
+device=none
+}
+C 47300 43200 1 0 0 PIC16F1613.sym
+{
+T 47700 46300 5 10 1 1 0 0 1
+refdes=U1
+T 47700 43200 5 10 1 1 0 0 1
+device=PIC16F1503
+T 49000 46300 5 10 1 1 0 6 1
+footprint=SO14
+}
+N 47100 46200 47100 46000 4
+C 53900 49200 1 180 1 resistor-1.sym
+{
+T 54200 48800 5 10 0 0 180 6 1
+device=RESISTOR
+T 53700 49400 5 10 1 1 180 6 1
+refdes=R18
+T 53800 49600 5 10 1 1 180 6 1
+footprint=0805_fit
+T 54100 48800 5 10 1 1 0 0 1
+value=100k
+}
+N 54800 49100 54900 49100 4
+C 50200 48800 1 0 1 resistor-1.sym
+{
+T 49900 49200 5 10 0 0 0 6 1
+device=RESISTOR
+T 49500 49000 5 10 1 1 0 6 1
+refdes=R19
+T 49600 49000 5 10 1 1 0 0 1
+footprint=0805_fit
+T 49600 48600 5 10 1 1 0 0 1
+value=220
+}
+N 49200 48900 49300 48900 4
+C 62100 34200 1 0 0 connector5-2.sym
+{
+T 62800 36700 5 10 1 1 0 6 1
+refdes=CHAIN
+T 62400 36650 5 10 0 0 0 0 1
+device=CONNECTOR_5
+T 62200 33850 5 10 1 1 0 0 1
+footprint=GSIP5_NS
+}
+C 62000 35400 1 90 0 busripper-2.sym
+{
+T 61600 35400 5 8 0 0 90 0 1
+device=none
+}
+N 62100 35400 62000 35400 4
+{
+T 61700 35300 5 10 1 1 0 6 1
+netname=SDA
+}
+C 62000 35800 1 90 0 busripper-2.sym
+{
+T 61600 35800 5 8 0 0 90 0 1
+device=none
+}
+N 62100 35800 62000 35800 4
+{
+T 61700 35700 5 10 1 1 0 6 1
+netname=SCL
+}
+C 61700 34700 1 270 0 gnd-1.sym
+N 62000 34600 62100 34600 4
+C 62000 35000 1 90 0 busripper-2.sym
+{
+T 61600 35000 5 8 0 0 90 0 1
+device=none
+}
+N 62000 35000 62100 35000 4
+{
+T 61700 34800 5 10 1 1 0 6 1
+netname=DetectLV
+}
+C 62100 36000 1 90 0 3.3V-plus-1.sym
 

--- /dev/null
+++ b/schem/fp/0805_fit.fp
@@ -1,1 +1,6 @@
+Element[0x0 "0805_fit" "" "" 0 0 -14672 -16949 0 100 0x0]
+(
+   Pad[ 1mm 0.2mm  1mm -0.2mm 0.8mm 0.8mm 0.8mm "" "1" 0x0100]
+   Pad[-1mm 0.2mm -1mm -0.2mm 0.8mm 0.8mm 0.8mm "" "2" 0x0100]
+)
 

--- /dev/null
+++ b/schem/fp/GSIP3_NS.fp
@@ -1,1 +1,7 @@
+Element(0x00 "Single in line package" "" "SIP5" 160 10 3 100 0x00)
+(
+	Pin(50 50 70 38 "1" 0x101)
+	Pin(50 150 70 38 "2" 0x01)
+	Pin(50 250 70 38 "3" 0x01)
+)
 

--- /dev/null
+++ b/schem/fp/GSIP5_NS.fp
@@ -1,1 +1,9 @@
+Element(0x00 "Single in line package" "" "SIP5" 160 10 3 100 0x00)
+(
+	Pin(50 50 70 38 "1" 0x101)
+	Pin(50 150 70 38 "2" 0x01)
+	Pin(50 250 70 38 "3" 0x01)
+	Pin(50 350 70 38 "4" 0x01)
+	Pin(50 450 70 38 "5" 0x01)
+)