diff --git a/Watering.kicad_pcb b/Watering.kicad_pcb
index a151e6a..16a3b59 100644
--- a/Watering.kicad_pcb
+++ b/Watering.kicad_pcb
@@ -134,11 +134,11 @@
 	(footprint "Connector_JST:JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical"
 		(layer "F.Cu")
 		(uuid "3c23dbe1-ee0c-4f70-9437-29c8373abcc2")
-		(at 71 56.5 180)
+		(at 57 82.96 90)
 		(descr "JST EH series connector, B2B-EH-A (http://www.jst-mfg.com/product/pdf/eng/eEH.pdf), generated with kicad-footprint-generator")
 		(tags "connector JST EH vertical")
 		(property "Reference" "M1"
-			(at 1.25 -2.8 360)
+			(at 1.25 -2.8 90)
 			(layer "F.SilkS")
 			(uuid "8c19fc6a-5fea-4790-b409-26e88ec83bc7")
 			(effects
@@ -149,7 +149,7 @@
 			)
 		)
 		(property "Value" "Motor_DC"
-			(at 1.25 3.4 360)
+			(at 1.25 3.4 90)
 			(layer "F.Fab")
 			(uuid "0de03fe6-4f33-4226-8ef0-13446e354179")
 			(effects
@@ -160,7 +160,7 @@
 			)
 		)
 		(property "Footprint" "Connector_JST:JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical"
-			(at 0 0 180)
+			(at 0 0 90)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -173,7 +173,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 0 0 180)
+			(at 0 0 90)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -186,7 +186,7 @@
 			)
 		)
 		(property "Description" "DC Motor"
-			(at 0 0 180)
+			(at 0 0 90)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -204,26 +204,6 @@
 		(sheetfile "Watering.kicad_sch")
 		(attr through_hole)
 		(fp_line
-			(start 5.11 2.31)
-			(end 5.11 -1.71)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3a0cd983-d8df-4971-848f-9ee8965c66c3")
-		)
-		(fp_line
-			(start 5.11 0.81)
-			(end 4.11 0.81)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "54607380-91e2-4fb1-abd2-910637d92a5e")
-		)
-		(fp_line
 			(start 5.11 -1.71)
 			(end -2.61 -1.71)
 			(stroke
@@ -234,6 +214,36 @@
 			(uuid "5db46407-fcf3-450c-a420-713c777ec99b")
 		)
 		(fp_line
+			(start -2.61 -1.71)
+			(end -2.61 2.31)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "e7e91682-5043-4a36-8318-b4799fdc448f")
+		)
+		(fp_line
+			(start 4.61 -1.21)
+			(end 4.61 0)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "97e8a372-e5ed-4d09-a4ed-8be4f136ce0d")
+		)
+		(fp_line
+			(start -2.11 -1.21)
+			(end 4.61 -1.21)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "b9a9351e-abfc-4a14-b59d-c53106fb04bb")
+		)
+		(fp_line
 			(start 4.61 0)
 			(end 5.11 0)
 			(stroke
@@ -244,14 +254,44 @@
 			(uuid "e95e9964-599a-48be-9df8-2903f57ee7b5")
 		)
 		(fp_line
-			(start 4.61 -1.21)
-			(end 4.61 0)
+			(start -2.11 0)
+			(end -2.11 -1.21)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "97e8a372-e5ed-4d09-a4ed-8be4f136ce0d")
+			(uuid "f4ac9c96-0705-44e5-a172-572d57d619e5")
+		)
+		(fp_line
+			(start -2.61 0)
+			(end -2.11 0)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "6d6b047f-f529-46dc-b50b-443abdd65fa3")
+		)
+		(fp_line
+			(start -2.91 0.11)
+			(end -2.91 2.61)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "6827f383-624d-469e-ad50-f4a4f952c1c4")
+		)
+		(fp_line
+			(start 5.11 0.81)
+			(end 4.11 0.81)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "54607380-91e2-4fb1-abd2-910637d92a5e")
 		)
 		(fp_line
 			(start 4.11 0.81)
@@ -274,24 +314,24 @@
 			(uuid "93ce87a4-43cc-4a66-9054-c1e49f59a9ec")
 		)
 		(fp_line
-			(start -2.11 0)
-			(end -2.11 -1.21)
+			(start -2.61 0.81)
+			(end -1.61 0.81)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "f4ac9c96-0705-44e5-a172-572d57d619e5")
+			(uuid "131210d8-8ab9-4025-8851-363e8079c412")
 		)
 		(fp_line
-			(start -2.11 -1.21)
-			(end 4.61 -1.21)
+			(start 5.11 2.31)
+			(end 5.11 -1.71)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "b9a9351e-abfc-4a14-b59d-c53106fb04bb")
+			(uuid "3a0cd983-d8df-4971-848f-9ee8965c66c3")
 		)
 		(fp_line
 			(start -2.61 2.31)
@@ -304,36 +344,6 @@
 			(uuid "e5557b44-cb04-4323-bdba-44a3fec9fe31")
 		)
 		(fp_line
-			(start -2.61 0.81)
-			(end -1.61 0.81)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "131210d8-8ab9-4025-8851-363e8079c412")
-		)
-		(fp_line
-			(start -2.61 0)
-			(end -2.11 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6d6b047f-f529-46dc-b50b-443abdd65fa3")
-		)
-		(fp_line
-			(start -2.61 -1.71)
-			(end -2.61 2.31)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e7e91682-5043-4a36-8318-b4799fdc448f")
-		)
-		(fp_line
 			(start -2.91 2.61)
 			(end -0.41 2.61)
 			(stroke
@@ -344,26 +354,6 @@
 			(uuid "af5db4d1-9cd1-4ada-95ac-21978f2c5eaa")
 		)
 		(fp_line
-			(start -2.91 0.11)
-			(end -2.91 2.61)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6827f383-624d-469e-ad50-f4a4f952c1c4")
-		)
-		(fp_line
-			(start 5.5 2.7)
-			(end 5.5 -2.1)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "F.CrtYd")
-			(uuid "ceed186b-4a7d-4039-8ad6-888c8151bd83")
-		)
-		(fp_line
 			(start 5.5 -2.1)
 			(end -3 -2.1)
 			(stroke
@@ -374,16 +364,6 @@
 			(uuid "05174474-ff96-4bff-8cff-aff7404d14e6")
 		)
 		(fp_line
-			(start -3 2.7)
-			(end 5.5 2.7)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "F.CrtYd")
-			(uuid "d07551ad-ba12-4d73-8fbe-e0985bc7fdd1")
-		)
-		(fp_line
 			(start -3 -2.1)
 			(end -3 2.7)
 			(stroke
@@ -394,14 +374,24 @@
 			(uuid "b7757527-dbb2-4b5a-8155-27b916e3f6a6")
 		)
 		(fp_line
-			(start 5 2.2)
-			(end 5 -1.6)
+			(start 5.5 2.7)
+			(end 5.5 -2.1)
 			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(layer "F.Fab")
-			(uuid "299a66a4-f46b-422f-b9a8-48c01416d5b9")
+			(layer "F.CrtYd")
+			(uuid "ceed186b-4a7d-4039-8ad6-888c8151bd83")
+		)
+		(fp_line
+			(start -3 2.7)
+			(end 5.5 2.7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "d07551ad-ba12-4d73-8fbe-e0985bc7fdd1")
 		)
 		(fp_line
 			(start 5 -1.6)
@@ -414,16 +404,6 @@
 			(uuid "91f0c95d-7011-4fa7-86f7-e6e8f1d79c1e")
 		)
 		(fp_line
-			(start -2.5 2.2)
-			(end 5 2.2)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b5dc93b7-b652-4c24-a16c-5f75f9892395")
-		)
-		(fp_line
 			(start -2.5 -1.6)
 			(end -2.5 2.2)
 			(stroke
@@ -434,16 +414,6 @@
 			(uuid "cf4cb1a1-df81-47da-944e-ab548abac5ab")
 		)
 		(fp_line
-			(start -2.91 2.61)
-			(end -0.41 2.61)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f606d564-64d7-4445-9bd9-6ee969ef6242")
-		)
-		(fp_line
 			(start -2.91 0.11)
 			(end -2.91 2.61)
 			(stroke
@@ -453,8 +423,38 @@
 			(layer "F.Fab")
 			(uuid "2fd3542d-d303-40b6-b1ad-697a0b47159e")
 		)
+		(fp_line
+			(start 5 2.2)
+			(end 5 -1.6)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "299a66a4-f46b-422f-b9a8-48c01416d5b9")
+		)
+		(fp_line
+			(start -2.5 2.2)
+			(end 5 2.2)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "b5dc93b7-b652-4c24-a16c-5f75f9892395")
+		)
+		(fp_line
+			(start -2.91 2.61)
+			(end -0.41 2.61)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "f606d564-64d7-4445-9bd9-6ee969ef6242")
+		)
 		(fp_text user "${REFERENCE}"
-			(at 1.25 1.5 360)
+			(at 1.25 1.5 90)
 			(layer "F.Fab")
 			(uuid "038d8b73-309e-44fc-aed1-7dcebef26255")
 			(effects
@@ -465,15 +465,10 @@
 			)
 		)
 		(pad "1" thru_hole roundrect
-			(at 0 0 180)
+			(at 0 0 90)
 			(size 1.7 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(roundrect_rratio 0.147059)
 			(net 45 "Net-(M1-+)")
@@ -482,15 +477,10 @@
 			(uuid "a256a6b4-b287-4413-a86e-8423521302be")
 		)
 		(pad "2" thru_hole oval
-			(at 2.5 0 180)
+			(at 2.5 0 90)
 			(size 1.7 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 46 "Net-(M1--)")
 			(pinfunction "-")
@@ -512,11 +502,11 @@
 	(footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal"
 		(layer "F.Cu")
 		(uuid "4613e042-980c-493e-bfc6-db60fca4675b")
-		(at 114 80.5 -90)
+		(at 120.7 66.75 -90)
 		(descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
 		(tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
 		(property "Reference" "R1"
-			(at 5.08 -2.37 90)
+			(at 5.25 2.7 90)
 			(layer "F.SilkS")
 			(uuid "1a95bc1c-9e99-44d2-a4a7-2411290b1e7e")
 			(effects
@@ -529,6 +519,7 @@
 		(property "Value" "R"
 			(at 5.08 2.37 90)
 			(layer "F.Fab")
+			(hide yes)
 			(uuid "a1511fd1-bf23-4e24-8f1b-e20ff5e7ec7e")
 			(effects
 				(font
@@ -742,7 +733,7 @@
 			(uuid "3716c769-1a2a-487f-8997-852d70636375")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 5.76 13.6 90)
+			(at 5.08 0 90)
 			(layer "F.Fab")
 			(uuid "d9d90f77-c062-4c5c-aa57-226a33296e04")
 			(effects
@@ -756,12 +747,7 @@
 			(at 0 0 270)
 			(size 1.6 1.6)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 3 "Net-(A1-PadA0)")
 			(pintype "passive")
@@ -771,12 +757,7 @@
 			(at 10.16 0 270)
 			(size 1.6 1.6)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 2 "GND")
 			(pintype "passive")
@@ -1194,12 +1175,7 @@
 			(at 7.62 5.08)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 3 "Net-(A1-PadA0)")
 			(pinfunction "A0")
@@ -1210,12 +1186,7 @@
 			(at 7.62 2.54)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 23 "Net-(J1-Pin_2)")
 			(pinfunction "A1")
@@ -1226,12 +1197,7 @@
 			(at 7.62 0)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 41 "unconnected-(A1-PadA2)")
 			(pinfunction "A2")
@@ -1242,12 +1208,7 @@
 			(at 7.62 -2.54)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 28 "unconnected-(A1-PadA3)")
 			(pinfunction "A3")
@@ -1258,12 +1219,7 @@
 			(at 4.6941 -1.3894)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 35 "unconnected-(A1-A4{slash}SDA-PadA4)")
 			(pinfunction "A4/SDA")
@@ -1274,12 +1230,7 @@
 			(at 4.6941 -3.9294)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 24 "unconnected-(A1-A5{slash}SCL-PadA5)")
 			(pinfunction "A5/SCL")
@@ -1290,12 +1241,7 @@
 			(at 4.6941 9.0246)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 27 "unconnected-(A1-PadA6)")
 			(pinfunction "A6")
@@ -1306,12 +1252,7 @@
 			(at 4.6941 6.484)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 22 "unconnected-(A1-PadA7)")
 			(pinfunction "A7")
@@ -1322,12 +1263,7 @@
 			(at -7.62 -10.16)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 39 "unconnected-(A1-D0{slash}RX-PadD0)")
 			(pinfunction "D0/RX")
@@ -1338,12 +1274,7 @@
 			(at -7.62 -12.7)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 43 "unconnected-(A1-D1{slash}TX-PadD1)")
 			(pinfunction "D1/TX")
@@ -1354,12 +1285,7 @@
 			(at -7.62 -2.54)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 11 "Net-(A1-D2_INT0)")
 			(pinfunction "D2_INT0")
@@ -1370,12 +1296,7 @@
 			(at -7.62 0)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 7 "Net-(A1-D3_INT1)")
 			(pinfunction "D3_INT1")
@@ -1386,12 +1307,7 @@
 			(at -7.62 2.54)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 32 "Net-(MP1-nSLEEP_HB)")
 			(pinfunction "D4")
@@ -1402,12 +1318,7 @@
 			(at -7.62 5.08)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 34 "Net-(MP1-IN1)")
 			(pinfunction "D5")
@@ -1418,12 +1329,7 @@
 			(at -7.62 7.62)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 21 "Net-(MP1-IN2)")
 			(pinfunction "D6")
@@ -1434,12 +1340,7 @@
 			(at -7.62 10.16)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 4 "unconnected-(A1-PadD7)")
 			(pinfunction "D7")
@@ -1450,12 +1351,7 @@
 			(at -7.62 12.7)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 37 "unconnected-(A1-PadD8)")
 			(pinfunction "D8")
@@ -1466,12 +1362,7 @@
 			(at -7.62 15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 16 "Net-(U1-RESET)")
 			(pinfunction "D9")
@@ -1482,12 +1373,7 @@
 			(at 7.62 15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 10 "Net-(A1-D10_CS)")
 			(pinfunction "D10_CS")
@@ -1498,12 +1384,7 @@
 			(at 7.62 12.7)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 12 "Net-(A1-D11_MOSI)")
 			(pinfunction "D11_MOSI")
@@ -1514,12 +1395,7 @@
 			(at 7.62 10.16)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 18 "Net-(A1-D12_MISO)")
 			(pinfunction "D12_MISO")
@@ -1530,12 +1406,7 @@
 			(at 7.62 7.62)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 5 "Net-(A1-D13_SCK)")
 			(pinfunction "D13_SCK")
@@ -1546,12 +1417,7 @@
 			(at 6.35 -15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 29 "unconnected-(A1-~{DTR}-PadDTR)")
 			(pinfunction "~{DTR}")
@@ -1562,12 +1428,7 @@
 			(at -7.62 -5.08)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 2 "GND")
 			(pinfunction "GND")
@@ -1578,12 +1439,7 @@
 			(at 7.62 -10.16)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 40 "unconnected-(A1-GND-PadGND2)")
 			(pinfunction "GND")
@@ -1594,12 +1450,7 @@
 			(at -3.81 -15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 33 "unconnected-(A1-GND-PadGND4)")
 			(pinfunction "GND")
@@ -1610,12 +1461,7 @@
 			(at -6.35 -15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 30 "unconnected-(A1-GND-PadGND5)")
 			(pinfunction "GND")
@@ -1626,12 +1472,7 @@
 			(at 7.62 -12.7)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 31 "+BATT")
 			(pinfunction "RAW")
@@ -1642,12 +1483,7 @@
 			(at -7.62 -7.62)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 42 "unconnected-(A1-RESET-PadRST1)")
 			(pinfunction "RESET")
@@ -1658,12 +1494,7 @@
 			(at 7.62 -7.62)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 36 "unconnected-(A1-RESET-PadRST2)")
 			(pinfunction "RESET")
@@ -1674,12 +1505,7 @@
 			(at 1.27 -15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 38 "unconnected-(A1-PadRXI)")
 			(pinfunction "RXI")
@@ -1690,12 +1516,7 @@
 			(at 3.81 -15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 20 "unconnected-(A1-PadTXO)")
 			(pinfunction "TXO")
@@ -1706,12 +1527,7 @@
 			(at 7.62 -5.08)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 25 "Net-(J1-Pin_1)")
 			(pinfunction "Vcc")
@@ -1722,12 +1538,7 @@
 			(at -1.27 -15.24)
 			(size 1.7272 1.7272)
 			(drill 1.016)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 26 "unconnected-(A1-Vcc-PadVcc2)")
 			(pinfunction "Vcc")
@@ -1738,7 +1549,7 @@
 	(footprint "Connector_JST:JST_EH_B3B-EH-A_1x03_P2.50mm_Vertical"
 		(layer "F.Cu")
 		(uuid "5a481a18-c0df-4f55-9291-9aace9e9a80d")
-		(at 132.5 67 -90)
+		(at 139.2 53.25 -90)
 		(descr "JST EH series connector, B3B-EH-A (http://www.jst-mfg.com/product/pdf/eng/eEH.pdf), generated with kicad-footprint-generator")
 		(tags "connector JST EH vertical")
 		(property "Reference" "J1"
@@ -2072,12 +1883,7 @@
 			(at 0 0 270)
 			(size 1.7 1.95)
 			(drill 0.95)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(roundrect_rratio 0.147059)
 			(net 25 "Net-(J1-Pin_1)")
@@ -2089,12 +1895,7 @@
 			(at 2.5 0 270)
 			(size 1.7 1.95)
 			(drill 0.95)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 23 "Net-(J1-Pin_2)")
 			(pinfunction "Pin_2")
@@ -2105,12 +1906,7 @@
 			(at 5 0 270)
 			(size 1.7 1.95)
 			(drill 0.95)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 2 "GND")
 			(pinfunction "Pin_3")
@@ -2132,7 +1928,7 @@
 	(footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal"
 		(layer "F.Cu")
 		(uuid "65e7e811-967d-4591-83af-2507ee1ee43e")
-		(at 114 77.58 90)
+		(at 120.7 63.83 90)
 		(descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
 		(tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
 		(property "Reference" "R2"
@@ -2149,6 +1945,7 @@
 		(property "Value" "R"
 			(at 5.08 2.37 90)
 			(layer "F.Fab")
+			(hide yes)
 			(uuid "01212d8d-db83-4190-b904-f161a6a72d88")
 			(effects
 				(font
@@ -2376,12 +2173,7 @@
 			(at 0 0 90)
 			(size 1.6 1.6)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 3 "Net-(A1-PadA0)")
 			(pintype "passive")
@@ -2391,12 +2183,7 @@
 			(at 10.16 0 90)
 			(size 1.6 1.6)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 31 "+BATT")
 			(pintype "passive")
@@ -2417,11 +2204,11 @@
 	(footprint "Connector_JST:JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical"
 		(layer "F.Cu")
 		(uuid "9a7bfd8e-88ca-44fc-9667-708fe5ea9d72")
-		(at 122.5 82)
+		(at 139 76 -90)
 		(descr "JST EH series connector, B2B-EH-A (http://www.jst-mfg.com/product/pdf/eng/eEH.pdf), generated with kicad-footprint-generator")
 		(tags "connector JST EH vertical")
 		(property "Reference" "SC1"
-			(at 1.25 -2.8 0)
+			(at 1.25 -2.8 90)
 			(layer "F.SilkS")
 			(uuid "e6b2d972-c0a0-4392-a09b-99a2d428977d")
 			(effects
@@ -2432,7 +2219,7 @@
 			)
 		)
 		(property "Value" "Solar_Cell"
-			(at 1.25 3.4 0)
+			(at 1.25 3.4 90)
 			(layer "F.Fab")
 			(uuid "679fc4fa-5ec5-4625-b9a0-de1e6a341b4a")
 			(effects
@@ -2443,7 +2230,7 @@
 			)
 		)
 		(property "Footprint" "Connector_JST:JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical"
-			(at 0 0 0)
+			(at 0 0 -90)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2456,7 +2243,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 0 0 0)
+			(at 0 0 -90)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2469,7 +2256,7 @@
 			)
 		)
 		(property "Description" "Single solar cell"
-			(at 0 0 0)
+			(at 0 0 -90)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2486,16 +2273,6 @@
 		(sheetfile "Watering.kicad_sch")
 		(attr through_hole)
 		(fp_line
-			(start -2.91 0.11)
-			(end -2.91 2.61)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d7df1cf3-5650-4eae-b57b-f526e0131832")
-		)
-		(fp_line
 			(start -2.91 2.61)
 			(end -0.41 2.61)
 			(stroke
@@ -2506,36 +2283,6 @@
 			(uuid "91279564-335c-4208-98b1-8f91d2349056")
 		)
 		(fp_line
-			(start -2.61 -1.71)
-			(end -2.61 2.31)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "84511a70-b422-4d53-995c-e9a276665074")
-		)
-		(fp_line
-			(start -2.61 0)
-			(end -2.11 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "11a33836-a4c3-47b5-a7ad-ba42a196eea1")
-		)
-		(fp_line
-			(start -2.61 0.81)
-			(end -1.61 0.81)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bfcd0519-bd00-4044-832d-ceda8fc98ac6")
-		)
-		(fp_line
 			(start -2.61 2.31)
 			(end 5.11 2.31)
 			(stroke
@@ -2546,24 +2293,24 @@
 			(uuid "43131bb7-442b-4d25-a5a1-2db2fb5acd6e")
 		)
 		(fp_line
-			(start -2.11 -1.21)
-			(end 4.61 -1.21)
+			(start 5.11 2.31)
+			(end 5.11 -1.71)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "57ac73a7-7f04-473d-9ae3-deee54948ad9")
+			(uuid "1c2eed5c-2f9e-4b5d-8a87-7a3fb6f2975b")
 		)
 		(fp_line
-			(start -2.11 0)
-			(end -2.11 -1.21)
+			(start -2.61 0.81)
+			(end -1.61 0.81)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "f21cabfb-426a-4351-8d0b-29ca66fb0ba1")
+			(uuid "bfcd0519-bd00-4044-832d-ceda8fc98ac6")
 		)
 		(fp_line
 			(start -1.61 0.81)
@@ -2586,14 +2333,44 @@
 			(uuid "d3f7941f-8dcf-4662-8a57-b7c521b5bcd0")
 		)
 		(fp_line
-			(start 4.61 -1.21)
-			(end 4.61 0)
+			(start 5.11 0.81)
+			(end 4.11 0.81)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "f13aaf4a-3fe8-4380-bf72-39a9a1f20c84")
+			(uuid "1ef22178-4cd0-4b10-839c-8bc4895a0db8")
+		)
+		(fp_line
+			(start -2.91 0.11)
+			(end -2.91 2.61)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "d7df1cf3-5650-4eae-b57b-f526e0131832")
+		)
+		(fp_line
+			(start -2.61 0)
+			(end -2.11 0)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "11a33836-a4c3-47b5-a7ad-ba42a196eea1")
+		)
+		(fp_line
+			(start -2.11 0)
+			(end -2.11 -1.21)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "f21cabfb-426a-4351-8d0b-29ca66fb0ba1")
 		)
 		(fp_line
 			(start 4.61 0)
@@ -2606,6 +2383,36 @@
 			(uuid "55036f67-06e5-4b66-b78d-f84a872fd540")
 		)
 		(fp_line
+			(start -2.11 -1.21)
+			(end 4.61 -1.21)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "57ac73a7-7f04-473d-9ae3-deee54948ad9")
+		)
+		(fp_line
+			(start 4.61 -1.21)
+			(end 4.61 0)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "f13aaf4a-3fe8-4380-bf72-39a9a1f20c84")
+		)
+		(fp_line
+			(start -2.61 -1.71)
+			(end -2.61 2.31)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "84511a70-b422-4d53-995c-e9a276665074")
+		)
+		(fp_line
 			(start 5.11 -1.71)
 			(end -2.61 -1.71)
 			(stroke
@@ -2616,36 +2423,6 @@
 			(uuid "fa882a17-f62f-4084-8536-39db76c51bef")
 		)
 		(fp_line
-			(start 5.11 0.81)
-			(end 4.11 0.81)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1ef22178-4cd0-4b10-839c-8bc4895a0db8")
-		)
-		(fp_line
-			(start 5.11 2.31)
-			(end 5.11 -1.71)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1c2eed5c-2f9e-4b5d-8a87-7a3fb6f2975b")
-		)
-		(fp_line
-			(start -3 -2.1)
-			(end -3 2.7)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "F.CrtYd")
-			(uuid "17e2a8de-139e-46d5-a9bf-c9846c83b460")
-		)
-		(fp_line
 			(start -3 2.7)
 			(end 5.5 2.7)
 			(stroke
@@ -2656,16 +2433,6 @@
 			(uuid "72980128-179e-4c12-9b68-5a2e53eb6e94")
 		)
 		(fp_line
-			(start 5.5 -2.1)
-			(end -3 -2.1)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "F.CrtYd")
-			(uuid "38515ccd-d7c0-44f0-a0c0-680f607415c2")
-		)
-		(fp_line
 			(start 5.5 2.7)
 			(end 5.5 -2.1)
 			(stroke
@@ -2676,14 +2443,24 @@
 			(uuid "547b5023-72e7-425d-989d-a354da3a98c7")
 		)
 		(fp_line
-			(start -2.91 0.11)
-			(end -2.91 2.61)
+			(start -3 -2.1)
+			(end -3 2.7)
 			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(layer "F.Fab")
-			(uuid "0470c482-c019-4b57-b8ac-27b8674f0de9")
+			(layer "F.CrtYd")
+			(uuid "17e2a8de-139e-46d5-a9bf-c9846c83b460")
+		)
+		(fp_line
+			(start 5.5 -2.1)
+			(end -3 -2.1)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "38515ccd-d7c0-44f0-a0c0-680f607415c2")
 		)
 		(fp_line
 			(start -2.91 2.61)
@@ -2696,16 +2473,6 @@
 			(uuid "f2877123-e047-4764-8559-2f166727e3cf")
 		)
 		(fp_line
-			(start -2.5 -1.6)
-			(end -2.5 2.2)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e630f027-108c-4de2-ac64-3560e95a7f0d")
-		)
-		(fp_line
 			(start -2.5 2.2)
 			(end 5 2.2)
 			(stroke
@@ -2716,16 +2483,6 @@
 			(uuid "cf4ac299-b7d6-4ed1-a301-e7e675dfe7f0")
 		)
 		(fp_line
-			(start 5 -1.6)
-			(end -2.5 -1.6)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "171adea2-0fe4-47c6-9a7d-1f3624a96875")
-		)
-		(fp_line
 			(start 5 2.2)
 			(end 5 -1.6)
 			(stroke
@@ -2735,8 +2492,38 @@
 			(layer "F.Fab")
 			(uuid "e0bd6607-3a2d-4c07-a8bf-b1ccba7ef7f6")
 		)
+		(fp_line
+			(start -2.91 0.11)
+			(end -2.91 2.61)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "0470c482-c019-4b57-b8ac-27b8674f0de9")
+		)
+		(fp_line
+			(start -2.5 -1.6)
+			(end -2.5 2.2)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "e630f027-108c-4de2-ac64-3560e95a7f0d")
+		)
+		(fp_line
+			(start 5 -1.6)
+			(end -2.5 -1.6)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "171adea2-0fe4-47c6-9a7d-1f3624a96875")
+		)
 		(fp_text user "${REFERENCE}"
-			(at 1.25 1.5 0)
+			(at 1.25 1.5 90)
 			(layer "F.Fab")
 			(uuid "57b77f3b-3492-418f-9777-d6d88529e88b")
 			(effects
@@ -2747,15 +2534,10 @@
 			)
 		)
 		(pad "1" thru_hole roundrect
-			(at 0 0)
+			(at 0 0 270)
 			(size 1.7 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(roundrect_rratio 0.147059)
 			(net 1 "Net-(D1-A)")
@@ -2764,15 +2546,10 @@
 			(uuid "a990148c-c3f6-41f3-9bd5-4067ce7386c3")
 		)
 		(pad "2" thru_hole oval
-			(at 2.5 0)
+			(at 2.5 0 270)
 			(size 1.7 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 2 "GND")
 			(pinfunction "-")
@@ -2794,11 +2571,11 @@
 	(footprint "RF_Module:HOPERF_RFM9XW_THT"
 		(layer "F.Cu")
 		(uuid "a40c2e5d-c40a-4323-903a-603ab316e245")
-		(at 104.2075 113.9075 180)
+		(at 118 84)
 		(descr "Low Power Long Range Transceiver Module THT-16 (https://www.hoperf.com/data/upload/portal/20181127/5bfcbea20e9ef.pdf)")
 		(tags "Low Power Long Range Transceiver Module LoRa")
 		(property "Reference" "U1"
-			(at -11.2925 0.4075 0)
+			(at -11.2925 0.4075 360)
 			(layer "F.SilkS")
 			(hide yes)
 			(uuid "80cb6bc7-7e53-432c-8828-20b4bb0357b9")
@@ -2810,7 +2587,7 @@
 			)
 		)
 		(property "Value" "RFM95W-868S2"
-			(at 6.8 16.36 0)
+			(at 6.8 16.36 360)
 			(layer "F.Fab")
 			(uuid "49c2228a-6770-4758-bdf1-b4d49f4db0e6")
 			(effects
@@ -2821,7 +2598,7 @@
 			)
 		)
 		(property "Footprint" "RF_Module:HOPERF_RFM9XW_THT"
-			(at 0 0 180)
+			(at 0 0 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2834,7 +2611,7 @@
 			)
 		)
 		(property "Datasheet" "https://www.hoperf.com/data/upload/portal/20181127/5bfcbea20e9ef.pdf"
-			(at 0 0 180)
+			(at 0 0 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2847,7 +2624,7 @@
 			)
 		)
 		(property "Description" "Low power long range transceiver module, SPI and parallel interface, 868 MHz, spreading factor 6 to12, bandwidth 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16"
-			(at 0 0 180)
+			(at 0 0 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2865,44 +2642,14 @@
 		(sheetfile "Watering.kicad_sch")
 		(attr through_hole)
 		(fp_line
-			(start 14.925 15.125)
-			(end -1.325 15.125)
+			(start -1.6 -1.4)
+			(end 0.7 -1.4)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "1729c322-2c97-420e-8159-f8f3d8f259d6")
-		)
-		(fp_line
-			(start 14.925 -1.125)
-			(end 14.925 15.125)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "730cdcbc-5319-4576-8c98-c044a60e68a8")
-		)
-		(fp_line
-			(start -1.325 15.125)
-			(end -1.325 -1.125)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "87a6ddc9-1b9b-406b-a413-3c26258daff4")
-		)
-		(fp_line
-			(start -1.325 -1.125)
-			(end 14.925 -1.125)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "73bbe9e0-0c67-490a-b811-958a160b0f5d")
+			(uuid "1e904258-735a-4cc1-b150-1c51b81958ce")
 		)
 		(fp_line
 			(start -1.6 0.7)
@@ -2915,44 +2662,44 @@
 			(uuid "477abf38-e3a4-4f02-bfb9-a96b752a0ce3")
 		)
 		(fp_line
-			(start -1.6 -1.4)
-			(end 0.7 -1.4)
+			(start -1.325 -1.125)
+			(end 14.925 -1.125)
 			(stroke
 				(width 0.12)
 				(type solid)
 			)
 			(layer "F.SilkS")
-			(uuid "1e904258-735a-4cc1-b150-1c51b81958ce")
+			(uuid "73bbe9e0-0c67-490a-b811-958a160b0f5d")
 		)
 		(fp_line
-			(start 15.05 15.25)
-			(end -1.45 15.25)
+			(start -1.325 15.125)
+			(end -1.325 -1.125)
 			(stroke
-				(width 0.05)
+				(width 0.12)
 				(type solid)
 			)
-			(layer "F.CrtYd")
-			(uuid "390053c5-e2f2-4d87-9e07-697fbcb802d5")
+			(layer "F.SilkS")
+			(uuid "87a6ddc9-1b9b-406b-a413-3c26258daff4")
 		)
 		(fp_line
-			(start 15.05 -1.25)
-			(end 15.05 15.25)
+			(start 14.925 -1.125)
+			(end 14.925 15.125)
 			(stroke
-				(width 0.05)
+				(width 0.12)
 				(type solid)
 			)
-			(layer "F.CrtYd")
-			(uuid "97da258c-3a55-4d29-9c0a-98a7a71c8ba3")
+			(layer "F.SilkS")
+			(uuid "730cdcbc-5319-4576-8c98-c044a60e68a8")
 		)
 		(fp_line
-			(start -1.45 15.25)
-			(end -1.45 -1.25)
+			(start 14.925 15.125)
+			(end -1.325 15.125)
 			(stroke
-				(width 0.05)
+				(width 0.12)
 				(type solid)
 			)
-			(layer "F.CrtYd")
-			(uuid "70c22f18-f433-43c7-9d79-6a6ae0349026")
+			(layer "F.SilkS")
+			(uuid "1729c322-2c97-420e-8159-f8f3d8f259d6")
 		)
 		(fp_line
 			(start -1.45 -1.25)
@@ -2965,34 +2712,44 @@
 			(uuid "6fad0020-6c58-4445-b09f-04a0b63c8331")
 		)
 		(fp_line
-			(start 14.8 15)
-			(end -1.2 15)
+			(start -1.45 15.25)
+			(end -1.45 -1.25)
 			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(layer "F.Fab")
-			(uuid "4f200a1d-c725-42bc-8ab8-c1d2ae1bdeeb")
+			(layer "F.CrtYd")
+			(uuid "70c22f18-f433-43c7-9d79-6a6ae0349026")
 		)
 		(fp_line
-			(start 14.8 -1)
-			(end 14.8 15)
+			(start 15.05 -1.25)
+			(end 15.05 15.25)
 			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(layer "F.Fab")
-			(uuid "776ba8b6-325d-4248-aafe-bdd17593ea21")
+			(layer "F.CrtYd")
+			(uuid "97da258c-3a55-4d29-9c0a-98a7a71c8ba3")
 		)
 		(fp_line
-			(start -0.2 -1)
-			(end 14.8 -1)
+			(start 15.05 15.25)
+			(end -1.45 15.25)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "390053c5-e2f2-4d87-9e07-697fbcb802d5")
+		)
+		(fp_line
+			(start -1.2 0)
+			(end -0.2 -1)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "5b8251c3-fbc3-46ad-b6e9-97f5f86aaaf9")
+			(uuid "d1463b70-f24c-4eae-9d9f-11325fbddd0e")
 		)
 		(fp_line
 			(start -1.2 15)
@@ -3005,25 +2762,40 @@
 			(uuid "a207eee1-628a-4f27-9be3-6d2c01bbe881")
 		)
 		(fp_line
-			(start -1.2 0)
-			(end -0.2 -1)
+			(start -0.2 -1)
+			(end 14.8 -1)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "d1463b70-f24c-4eae-9d9f-11325fbddd0e")
+			(uuid "5b8251c3-fbc3-46ad-b6e9-97f5f86aaaf9")
+		)
+		(fp_line
+			(start 14.8 -1)
+			(end 14.8 15)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "776ba8b6-325d-4248-aafe-bdd17593ea21")
+		)
+		(fp_line
+			(start 14.8 15)
+			(end -1.2 15)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "4f200a1d-c725-42bc-8ab8-c1d2ae1bdeeb")
 		)
 		(pad "1" thru_hole rect
-			(at 0 0 180)
+			(at 0 0)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 13 "unconnected-(U1-GND-Pad1)")
 			(pinfunction "GND")
@@ -3031,15 +2803,10 @@
 			(uuid "9a41d952-eeae-49bd-af34-51916643c44f")
 		)
 		(pad "2" thru_hole circle
-			(at 0 2 180)
+			(at 0 2)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 18 "Net-(A1-D12_MISO)")
 			(pinfunction "MISO")
@@ -3047,15 +2814,10 @@
 			(uuid "8d9c90d4-2452-4294-94e3-6d6c0a449f5f")
 		)
 		(pad "3" thru_hole circle
-			(at 0 4 180)
+			(at 0 4)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 12 "Net-(A1-D11_MOSI)")
 			(pinfunction "MOSI")
@@ -3063,15 +2825,10 @@
 			(uuid "eaa2c154-328f-4612-bd72-0d8a2c44516b")
 		)
 		(pad "4" thru_hole circle
-			(at 0 6 180)
+			(at 0 6)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 5 "Net-(A1-D13_SCK)")
 			(pinfunction "SCK")
@@ -3079,15 +2836,10 @@
 			(uuid "448244f3-6131-4d09-a7c3-d9a592f9f7cc")
 		)
 		(pad "5" thru_hole circle
-			(at 0 8 180)
+			(at 0 8)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 10 "Net-(A1-D10_CS)")
 			(pinfunction "NSS")
@@ -3095,15 +2847,10 @@
 			(uuid "8239ae63-7e05-43b1-8677-2cbea400439f")
 		)
 		(pad "6" thru_hole circle
-			(at 0 10 180)
+			(at 0 10)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 16 "Net-(U1-RESET)")
 			(pinfunction "RESET")
@@ -3111,15 +2858,10 @@
 			(uuid "c3f1e5c2-e1e5-428e-9bad-cdcd10551882")
 		)
 		(pad "7" thru_hole circle
-			(at 0 12 180)
+			(at 0 12)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 17 "unconnected-(U1-DIO5-Pad7)")
 			(pinfunction "DIO5")
@@ -3127,15 +2869,10 @@
 			(uuid "d94dcaff-c85b-4f9a-ae11-c9651a64260c")
 		)
 		(pad "8" thru_hole circle
-			(at 0 14 180)
+			(at 0 14)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 6 "unconnected-(U1-GND-Pad8)")
 			(pinfunction "GND")
@@ -3143,15 +2880,10 @@
 			(uuid "57508d8a-ea51-4a9c-8166-1429339a36a0")
 		)
 		(pad "9" thru_hole circle
-			(at 13.6 14 180)
+			(at 13.6 14)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 44 "Net-(AE1-A)")
 			(pinfunction "ANT")
@@ -3159,15 +2891,10 @@
 			(uuid "04b78bec-fb97-4d1a-9a2f-bd8ae3d76338")
 		)
 		(pad "10" thru_hole circle
-			(at 13.6 12 180)
+			(at 13.6 12)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 14 "unconnected-(U1-GND-Pad10)")
 			(pinfunction "GND")
@@ -3175,15 +2902,10 @@
 			(uuid "9b50ac56-3e4a-41c6-80b7-ea62aaabd97b")
 		)
 		(pad "11" thru_hole circle
-			(at 13.6 10 180)
+			(at 13.6 10)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 8 "unconnected-(U1-DIO3-Pad11)")
 			(pinfunction "DIO3")
@@ -3191,15 +2913,10 @@
 			(uuid "659f1bff-05dd-4fd2-b9d7-722dec3ebe91")
 		)
 		(pad "12" thru_hole circle
-			(at 13.6 8 180)
+			(at 13.6 8)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 19 "unconnected-(U1-DIO4-Pad12)")
 			(pinfunction "DIO4")
@@ -3207,15 +2924,10 @@
 			(uuid "f7875210-5473-4162-9c55-9ad7d44c18f8")
 		)
 		(pad "13" thru_hole circle
-			(at 13.6 6 180)
+			(at 13.6 6)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 9 "unconnected-(U1-3.3V-Pad13)")
 			(pinfunction "3.3V")
@@ -3223,15 +2935,10 @@
 			(uuid "6a4fc26a-a8c8-4942-8290-628895319636")
 		)
 		(pad "14" thru_hole circle
-			(at 13.6 4 180)
+			(at 13.6 4)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 11 "Net-(A1-D2_INT0)")
 			(pinfunction "DIO0")
@@ -3239,15 +2946,10 @@
 			(uuid "8d568b14-68b9-452e-8149-f47cf706b914")
 		)
 		(pad "15" thru_hole circle
-			(at 13.6 2 180)
+			(at 13.6 2)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 7 "Net-(A1-D3_INT1)")
 			(pinfunction "DIO1")
@@ -3255,15 +2957,10 @@
 			(uuid "5c1d5c16-f2a2-474e-b79f-1d53f846c9de")
 		)
 		(pad "16" thru_hole circle
-			(at 13.6 0 180)
+			(at 13.6 0)
 			(size 1.35 1.35)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 15 "unconnected-(U1-DIO2-Pad16)")
 			(pinfunction "DIO2")
@@ -3285,7 +2982,7 @@
 	(footprint "watering:MP6550"
 		(layer "F.Cu")
 		(uuid "a98fc9de-6c53-459a-b167-4e19f2784570")
-		(at 70 76.5 -90)
+		(at 71.92 81.65 90)
 		(property "Reference" "MP1"
 			(at -8.45 0 360)
 			(layer "F.SilkS")
@@ -3349,64 +3046,14 @@
 		(sheetfile "Watering.kicad_sch")
 		(attr through_hole)
 		(fp_line
-			(start -7.45 6.58)
-			(end 7.45 6.58)
+			(start 7.45 -6.58)
+			(end -7.45 -6.58)
 			(stroke
 				(width 0.12)
 				(type default)
 			)
 			(layer "F.SilkS")
-			(uuid "c075a4d1-c522-4208-8570-2ee068ff7132")
-		)
-		(fp_line
-			(start 7.45 6.58)
-			(end 7.45 -6.58)
-			(stroke
-				(width 0.12)
-				(type default)
-			)
-			(layer "F.SilkS")
-			(uuid "30b5549b-a59f-430e-ba33-31697db5d1cd")
-		)
-		(fp_line
-			(start -7.45 2.193333)
-			(end -7.45 6.58)
-			(stroke
-				(width 0.12)
-				(type default)
-			)
-			(layer "F.SilkS")
-			(uuid "39eed5d0-6b74-463d-9d0b-f4b2c4f07222")
-		)
-		(fp_line
-			(start -7.09 2.193333)
-			(end -7.45 2.193333)
-			(stroke
-				(width 0.12)
-				(type default)
-			)
-			(layer "F.SilkS")
-			(uuid "1ea257a1-88d7-4796-9393-a1ada7d87473")
-		)
-		(fp_line
-			(start -7.45 -2.193333)
-			(end -7.09 -2.193333)
-			(stroke
-				(width 0.12)
-				(type default)
-			)
-			(layer "F.SilkS")
-			(uuid "67555a9a-10ac-4ea3-96fe-2e276ea7632b")
-		)
-		(fp_line
-			(start -7.09 -2.193333)
-			(end -7.09 2.193333)
-			(stroke
-				(width 0.12)
-				(type default)
-			)
-			(layer "F.SilkS")
-			(uuid "006d65c0-8b2d-4553-9c45-fd52c40fa662")
+			(uuid "bb73be2d-3d58-4c92-b8a5-bd026fd41718")
 		)
 		(fp_line
 			(start -7.45 -6.58)
@@ -3419,34 +3066,74 @@
 			(uuid "32e54e89-04d0-46f3-8238-b3e2744771b7")
 		)
 		(fp_line
-			(start 7.45 -6.58)
-			(end -7.45 -6.58)
+			(start -7.09 -2.193333)
+			(end -7.09 2.193333)
 			(stroke
 				(width 0.12)
 				(type default)
 			)
 			(layer "F.SilkS")
-			(uuid "bb73be2d-3d58-4c92-b8a5-bd026fd41718")
+			(uuid "006d65c0-8b2d-4553-9c45-fd52c40fa662")
 		)
 		(fp_line
-			(start -7.2 6.33)
-			(end -7.2 -6.33)
+			(start -7.45 -2.193333)
+			(end -7.09 -2.193333)
+			(stroke
+				(width 0.12)
+				(type default)
+			)
+			(layer "F.SilkS")
+			(uuid "67555a9a-10ac-4ea3-96fe-2e276ea7632b")
+		)
+		(fp_line
+			(start -7.09 2.193333)
+			(end -7.45 2.193333)
+			(stroke
+				(width 0.12)
+				(type default)
+			)
+			(layer "F.SilkS")
+			(uuid "1ea257a1-88d7-4796-9393-a1ada7d87473")
+		)
+		(fp_line
+			(start -7.45 2.193333)
+			(end -7.45 6.58)
+			(stroke
+				(width 0.12)
+				(type default)
+			)
+			(layer "F.SilkS")
+			(uuid "39eed5d0-6b74-463d-9d0b-f4b2c4f07222")
+		)
+		(fp_line
+			(start 7.45 6.58)
+			(end 7.45 -6.58)
+			(stroke
+				(width 0.12)
+				(type default)
+			)
+			(layer "F.SilkS")
+			(uuid "30b5549b-a59f-430e-ba33-31697db5d1cd")
+		)
+		(fp_line
+			(start -7.45 6.58)
+			(end 7.45 6.58)
+			(stroke
+				(width 0.12)
+				(type default)
+			)
+			(layer "F.SilkS")
+			(uuid "c075a4d1-c522-4208-8570-2ee068ff7132")
+		)
+		(fp_line
+			(start 7.2 -6.33)
+			(end 7.2 6.33)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(layer "F.CrtYd")
-			(uuid "4aa1b387-792b-4818-8025-0c369cac64aa")
-		)
-		(fp_line
-			(start 7.2 6.33)
-			(end -7.2 6.33)
-			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(layer "F.CrtYd")
-			(uuid "a8509d30-ce8d-43e7-90f3-feb6a354bf5b")
+			(uuid "bbfd54b1-9ce7-465f-9c52-d06030e24642")
 		)
 		(fp_line
 			(start -7.2 -6.33)
@@ -3459,25 +3146,30 @@
 			(uuid "6cd7adad-ebcb-40ce-92e9-2c5918c07c83")
 		)
 		(fp_line
-			(start 7.2 -6.33)
-			(end 7.2 6.33)
+			(start 7.2 6.33)
+			(end -7.2 6.33)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(layer "F.CrtYd")
-			(uuid "bbfd54b1-9ce7-465f-9c52-d06030e24642")
+			(uuid "a8509d30-ce8d-43e7-90f3-feb6a354bf5b")
+		)
+		(fp_line
+			(start -7.2 6.33)
+			(end -7.2 -6.33)
+			(stroke
+				(width 0.05)
+				(type default)
+			)
+			(layer "F.CrtYd")
+			(uuid "4aa1b387-792b-4818-8025-0c369cac64aa")
 		)
 		(pad "1" thru_hole oval
-			(at -6.35 5.08 270)
+			(at -6.35 5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 48 "unconnected-(MP1-VM-Pad1)")
 			(pinfunction "VM")
@@ -3486,15 +3178,10 @@
 			(uuid "5f8fceaf-c45a-4d21-92a2-c8c3a69e5679")
 		)
 		(pad "2" thru_hole oval
-			(at -3.81 5.08 270)
+			(at -3.81 5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 2 "GND")
 			(pinfunction "GND")
@@ -3503,15 +3190,10 @@
 			(uuid "5e83c962-5e36-4757-8b69-a4e25ffd8d7d")
 		)
 		(pad "3" thru_hole oval
-			(at -1.27 5.08 270)
+			(at -1.27 5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 21 "Net-(MP1-IN2)")
 			(pinfunction "IN2")
@@ -3520,15 +3202,10 @@
 			(uuid "4e55b259-6735-4092-b497-8694016946eb")
 		)
 		(pad "4" thru_hole oval
-			(at 1.27 5.08 270)
+			(at 1.27 5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 34 "Net-(MP1-IN1)")
 			(pinfunction "IN1")
@@ -3537,15 +3214,10 @@
 			(uuid "2c107436-b308-4639-966a-68ea7e6a84ae")
 		)
 		(pad "5" thru_hole oval
-			(at 3.81 5.08 270)
+			(at 3.81 5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 49 "unconnected-(MP1-VISEN-Pad5)")
 			(pinfunction "VISEN")
@@ -3554,15 +3226,10 @@
 			(uuid "aa5cb064-71f2-46ab-b7c8-c5530ccdbd7c")
 		)
 		(pad "6" thru_hole oval
-			(at 6.35 5.08 270)
+			(at 6.35 5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 32 "Net-(MP1-nSLEEP_HB)")
 			(pinfunction "nSLEEP_HB")
@@ -3571,15 +3238,10 @@
 			(uuid "bf640629-fca7-4cf8-8eec-a4c985f56dea")
 		)
 		(pad "7" thru_hole oval
-			(at 6.35 -5.08 270)
+			(at 6.35 -5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 51 "unconnected-(MP1-V3P3-Pad7)")
 			(pinfunction "V3P3")
@@ -3588,15 +3250,10 @@
 			(uuid "b697a1fa-fb5c-4d50-9047-d2de08b02fbf")
 		)
 		(pad "8" thru_hole oval
-			(at 3.81 -5.08 270)
+			(at 3.81 -5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 50 "unconnected-(MP1-ISET-Pad8)")
 			(pinfunction "ISET")
@@ -3605,15 +3262,10 @@
 			(uuid "b50c192d-4ccf-428e-a259-f57d693a671c")
 		)
 		(pad "9" thru_hole oval
-			(at 1.27 -5.08 270)
+			(at 1.27 -5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 46 "Net-(M1--)")
 			(pinfunction "OUT1")
@@ -3622,15 +3274,10 @@
 			(uuid "4e726511-2953-4f98-a597-289b1a392e59")
 		)
 		(pad "10" thru_hole oval
-			(at -1.27 -5.08 270)
+			(at -1.27 -5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 45 "Net-(M1-+)")
 			(pinfunction "OUT2")
@@ -3639,15 +3286,10 @@
 			(uuid "13d0781f-9ec7-4793-bd17-d7386b86db08")
 		)
 		(pad "11" thru_hole oval
-			(at -3.81 -5.08 270)
+			(at -3.81 -5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 47 "unconnected-(MP1-GND-Pad11)")
 			(pinfunction "GND")
@@ -3656,15 +3298,10 @@
 			(uuid "1ef8466b-d6b4-4a1d-a35e-ca3d0d4dac24")
 		)
 		(pad "12" thru_hole oval
-			(at -6.35 -5.08 270)
+			(at -6.35 -5.08 90)
 			(size 1.2 2)
 			(drill 0.8)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 31 "+BATT")
 			(pinfunction "VIN")
@@ -3676,7 +3313,7 @@
 	(footprint "Diode_THT:D_T-1_P10.16mm_Horizontal"
 		(layer "F.Cu")
 		(uuid "b8c11c30-da3c-4ec6-9aa0-3c6613ea839b")
-		(at 123 67.42 -90)
+		(at 129.7 65.84 -90)
 		(descr "Diode, T-1 series, Axial, Horizontal, pin pitch=10.16mm, , length*diameter=3.2*2.6mm^2, , http://www.diodes.com/_files/packages/T-1.pdf")
 		(tags "Diode T-1 series Axial Horizontal pin pitch 10.16mm  length 3.2mm diameter 2.6mm")
 		(property "Reference" "D1"
@@ -4028,12 +3665,7 @@
 			(at 0 0 270)
 			(size 2 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 31 "+BATT")
 			(pinfunction "K")
@@ -4044,12 +3676,7 @@
 			(at 10.16 0 270)
 			(size 2 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 1 "Net-(D1-A)")
 			(pinfunction "A")
@@ -4071,7 +3698,7 @@
 	(footprint "Connector_PinSocket_2.54mm:PinSocket_1x01_P2.54mm_Vertical"
 		(layer "F.Cu")
 		(uuid "f229ba1c-1bbe-47bd-8c13-f55e356fb641")
-		(at 72 100)
+		(at 155 98)
 		(descr "Through hole straight socket strip, 1x01, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
 		(tags "Through hole socket strip THT 1x01 2.54mm single row")
 		(property "Reference" "AE1"
@@ -4294,12 +3921,7 @@
 			(at 0 0)
 			(size 1.7 1.7)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 44 "Net-(AE1-A)")
 			(pinfunction "A")
@@ -4321,7 +3943,7 @@
 	(footprint "Connector_JST:JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical"
 		(layer "F.Cu")
 		(uuid "fb72d073-7fa5-41ea-bae4-ad59ac0a9a16")
-		(at 132.3 79.25 -90)
+		(at 139 65.5 -90)
 		(descr "JST EH series connector, B2B-EH-A (http://www.jst-mfg.com/product/pdf/eng/eEH.pdf), generated with kicad-footprint-generator")
 		(tags "connector JST EH vertical")
 		(property "Reference" "BT1"
@@ -4654,12 +4276,7 @@
 			(at 0 0 270)
 			(size 1.7 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(roundrect_rratio 0.147059)
 			(net 31 "+BATT")
@@ -4671,12 +4288,7 @@
 			(at 2.5 0 270)
 			(size 1.7 2)
 			(drill 1)
-			(layers "*.Cu" "*.Mask" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu"
-				"In7.Cu" "In8.Cu" "In9.Cu" "In10.Cu" "In11.Cu" "In12.Cu" "In13.Cu" "In14.Cu"
-				"In15.Cu" "In16.Cu" "In17.Cu" "In18.Cu" "In19.Cu" "In20.Cu" "In21.Cu"
-				"In22.Cu" "In23.Cu" "In24.Cu" "In25.Cu" "In26.Cu" "In27.Cu" "In28.Cu"
-				"In29.Cu" "In30.Cu"
-			)
+			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
 			(net 2 "GND")
 			(pinfunction "-")