From 4946c9c84172619940542008301182fac7e318fd Mon Sep 17 00:00:00 2001
From: phiwan-dev <75113544+phiwan-dev@users.noreply.github.com>
Date: Fri, 10 Apr 2026 17:18:24 +0200
Subject: [PATCH] shield: pcb start wiring

---
 shield/shield.kicad_pcb | 3544 ++++++++++++++++++++++++++-------------
 shield/shield.kicad_pro |    8 +-
 2 files changed, 2426 insertions(+), 1126 deletions(-)

diff --git a/shield/shield.kicad_pcb b/shield/shield.kicad_pcb
index c85c4d6..336e6a4 100644
--- a/shield/shield.kicad_pcb
+++ b/shield/shield.kicad_pcb
@@ -88,35 +88,41 @@
 	(net 8 "key1")
 	(net 9 "key6")
 	(net 10 "key3")
-	(net 11 "+1V8")
-	(net 12 "key15")
-	(net 13 "key21")
-	(net 14 "key22")
-	(net 15 "key13")
-	(net 16 "key16")
-	(net 17 "+3V3")
-	(net 18 "key14")
-	(net 19 "key20")
-	(net 20 "unconnected-(J1-Pin_16-Pad16)")
-	(net 21 "unconnected-(J1-MountPin-PadMP)")
-	(net 22 "unconnected-(J1-MountPin-PadMP)_1")
-	(net 23 "key17")
-	(net 24 "key18")
-	(net 25 "key10")
-	(net 26 "unconnected-(J1-Pin_27-Pad27)")
-	(net 27 "key11")
-	(net 28 "key12")
-	(net 29 "key19")
-	(net 30 "unconnected-(J2-Pin_7-Pad7)")
-	(net 31 "unconnected-(J2-MountPin-PadMP)")
-	(net 32 "unconnected-(J2-MountPin-PadMP)_1")
-	(net 33 "unconnected-(J2-Pin_27-Pad27)")
+	(net 11 "key15")
+	(net 12 "key21")
+	(net 13 "key22")
+	(net 14 "key13")
+	(net 15 "key16")
+	(net 16 "key14")
+	(net 17 "key20")
+	(net 18 "unconnected-(J1-Pin_16-Pad16)")
+	(net 19 "unconnected-(J1-MountPin-PadMP)")
+	(net 20 "unconnected-(J1-MountPin-PadMP)_1")
+	(net 21 "key17")
+	(net 22 "key18")
+	(net 23 "key10")
+	(net 24 "unconnected-(J1-Pin_27-Pad27)")
+	(net 25 "key11")
+	(net 26 "key12")
+	(net 27 "key19")
+	(net 28 "unconnected-(J2-Pin_7-Pad7)")
+	(net 29 "unconnected-(J2-MountPin-PadMP)")
+	(net 30 "unconnected-(J2-MountPin-PadMP)_1")
+	(net 31 "unconnected-(J2-Pin_27-Pad27)")
+	(net 32 "unconnected-(J1-Pin_29-Pad29)")
+	(net 33 "unconnected-(J1-Pin_2-Pad2)")
+	(net 34 "unconnected-(J1-Pin_28-Pad28)")
+	(net 35 "unconnected-(J1-Pin_3-Pad3)")
+	(net 36 "unconnected-(J2-Pin_3-Pad3)")
+	(net 37 "unconnected-(J2-Pin_2-Pad2)")
+	(net 38 "unconnected-(J2-Pin_29-Pad29)")
+	(net 39 "unconnected-(J2-Pin_28-Pad28)")
 	(footprint "phiboard:mx_choc-12_ks33-123_hs"
 		(layer "F.Cu")
 		(uuid "13af5953-cc82-49c6-85a1-154643d58021")
 		(at 115 88)
 		(property "Reference" "SW10"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -129,7 +135,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -172,44 +178,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "d0559b2b-08d8-49b6-9ab7-da973dfcb175")
+			(uuid "e1a3b2a5-72ec-48dc-89ed-5f422c93ddbe")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "950ec5d7-ac45-4710-bc42-08a366a75f81")
+			(uuid "54423034-519d-4bf0-933a-c663ebe14044")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "b7224220-8705-48a7-ba8a-db3295f5dc12")
+			(uuid "84afc0dd-5b09-472b-8dd6-0452bba6b586")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "23c4726b-f373-4845-9262-e388a11dd62d")
@@ -225,51 +228,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "e3e01f9d-0220-47fd-996f-131a718454dc")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "39d9e64b-ce44-4880-b187-b77591caf4ca")
+			(uuid "d9f6dae0-d900-4508-a497-0f19bf26bab1")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "ec908f0e-12f0-44d8-9991-49ad15b1444a")
+			(uuid "ababcc9e-c18d-4ada-bdda-296d3da29dd3")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "9e8f3622-43e4-4281-86c2-c55a31a1a560")
+			(uuid "a2aa8237-71ed-40db-819f-2df4d59ca52b")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "ff96e27f-6153-426b-8309-ffa9b072142e")
+			(uuid "07009745-45c2-4344-9e27-57945ff4ec8f")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "1719ea48-f597-43d3-9dc8-1d1eb5019a80")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "add24b70-4b78-4ad7-9852-3112177ec8c7")
+			(uuid "883761b4-9ead-4cd2-b002-f9ad4482e890")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
@@ -280,26 +283,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "976d4a95-6a2f-4083-900e-a6373acfe4e2")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "99f2374f-61aa-4f20-af2e-9d482daecf5f")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -333,7 +336,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "727ee506-cd94-4065-a595-540d78ee0427")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -341,17 +344,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "3cdd6f50-0ed7-4a9d-b3f2-facde7b82622")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -376,13 +379,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "35d008dc-3cb1-4f90-9290-f25e27e7ca06")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -426,7 +429,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "52dd99ae-8133-4ab9-a5b9-f14240010afa")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -434,10 +437,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "e7dfd3da-9db1-40f2-9b95-680b1e2333cc")
+			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -499,7 +502,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "39444437-837c-43de-8185-5cd91cc9354d")
+			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -529,7 +532,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "59065ab2-7073-40a7-bf4a-07528e18569c")
+			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -541,7 +544,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "18a84a18-e3d7-4d88-a5b1-51c760bf3f05")
+			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -551,7 +554,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "4fd3d091-cdbe-4fb4-9d45-f25a386edac6")
+			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -562,7 +565,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "22028930-5998-4a66-914f-8532edab9a5b")
+			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -572,7 +575,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "bc7c0b2f-30a9-42a3-b253-e03cb6db9125")
+			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
 		)
 		(embedded_fonts no)
 	)
@@ -581,7 +584,7 @@
 		(uuid "18505642-002c-4942-9550-456d2feb20e6")
 		(at 96 116.5)
 		(property "Reference" "SW8"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -594,7 +597,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -637,44 +640,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "d5624eaa-b30c-4d41-8f99-de90cccc5ad4")
+			(uuid "aff0866a-d64e-4bc6-af68-52439a588e3d")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "7a745cd7-e465-4742-b755-282052bb8665")
+			(uuid "ac668415-4c81-4a8e-9d9c-adf494b2187d")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "797e4ed4-a0ed-4e02-9dcf-4257fb2d6460")
+			(uuid "a709c060-36f1-4875-9ed8-c4055539c9e2")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "b2845fb4-5f32-414b-8dc9-6e9a8c18038d")
@@ -690,44 +690,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "16f8c605-9651-44c6-811a-9548cd15c687")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "000df38f-8abe-4843-a60d-b30024000b1f")
+			(uuid "955b3f19-303a-4125-9b1d-248a1ab11ab7")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "30b08722-942c-41c8-af26-6d4d006510f5")
+			(uuid "adb6c545-25cb-42ac-96bb-25c78a79efc7")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "30d3dfd9-7d66-4197-8c1d-4cb62296001d")
+			(uuid "ea25ce7b-6dbc-45d6-8165-60e623d3f1d9")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "b9f6ccd8-0081-4567-ab5f-2a6fdb5c760e")
+			(uuid "8e15fb1c-0b19-491e-868a-34394829b42e")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "2b410d5b-3196-417d-b168-a343220ae8ab")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "890d70da-acfd-404b-9981-08cb058efb89")
+			(uuid "54d6c53c-b8ea-4aa6-b07f-a18ed1b80ae4")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -748,17 +748,17 @@
 			(net 4 "key8")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "29ad4230-749a-4c41-999d-22121d01a395")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 4 "key8")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "5de9c137-1bac-40ef-9b43-7ffed1cef997")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -798,7 +798,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "1d1b006b-fb4e-4056-8935-376bc3dad38b")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -810,10 +810,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "9516d52f-1cd9-435b-9585-fd8b55caecee")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "key8")
@@ -841,7 +841,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "fe7d6482-00c5-449c-9d57-4af397d07ab9")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -891,7 +891,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "79a6f716-1c1c-40ca-83f8-8a11755d35a8")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -902,7 +902,7 @@
 			(net 4 "key8")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "940f4f8b-9ca2-43a8-b741-5b6d508219a6")
+			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -964,7 +964,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "4085b0c2-4f76-40bd-a1d9-48febd7728d8")
+			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -994,7 +994,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "0a7d78dd-1cb0-45e5-837c-9551b85b2f20")
+			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -1006,7 +1006,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "065f00a8-d478-4eb9-9237-47db115646b0")
+			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -1016,7 +1016,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "169af77f-c8b5-43ec-b296-54ed782d3a46")
+			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -1027,7 +1027,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "fbeda46a-b2d9-4197-ad82-3b44469ad0f7")
+			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -1037,7 +1037,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "ccab91e1-5849-4678-ae96-3d2a37afff14")
+			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
 		)
 		(embedded_fonts no)
 	)
@@ -1046,7 +1046,7 @@
 		(uuid "1b8106c2-50a1-43a4-ba3a-597e0112b4d8")
 		(at 77 126)
 		(property "Reference" "SW5"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -1059,7 +1059,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -1102,44 +1102,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "b74c7fda-a29a-4b86-9ce9-0def0e03df61")
+			(uuid "7e455a02-37a0-4c24-9843-787ee04aca97")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "0cba5228-194c-4778-93d4-fda3b3658f9d")
+			(uuid "839a51d1-8d33-4b16-a170-86ec1f241078")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "7792a96e-5c88-4003-84a2-83d858b4e6de")
+			(uuid "913a93d8-0ec9-42d2-ae12-82eb37f5fe57")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "ea581c46-7b7d-426d-a536-9c7c330e315f")
@@ -1155,44 +1152,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "87632838-ecec-459d-9f0c-b702371b650d")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "6bee09ec-ed46-49fd-9c03-5a3f4556bbb1")
+			(uuid "3ea53b12-441a-4a75-b5fa-1a6ce489227c")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "7bcc5545-b14d-475b-bc16-ad5980c33594")
+			(uuid "ccaeef6c-7f97-4404-ad74-63279ecb5d12")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "86cac982-084b-48bb-b612-148f7f8b7459")
+			(uuid "39487f3f-1c1f-4b33-9a2b-71db13f6ac0d")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "e6ba636c-1783-49dc-8261-4c792dd46ba0")
+			(uuid "16e17fce-f27e-413e-8fd3-cd34efc8a7a9")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "08fd850c-41c0-48dc-8cde-b7227fbe355d")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "fb11b70b-c81f-41f6-89a7-9d70f753847f")
+			(uuid "9b4292e4-d228-4c22-9a9b-b9259d0cbc5e")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -1213,17 +1210,17 @@
 			(net 6 "key5")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "f8034db7-420e-47f9-b2b8-c6822a03b775")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 6 "key5")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "35bb3484-b170-4578-8d1a-b44298ccbc96")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -1263,7 +1260,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "ee2e5715-57d1-4f12-ac9f-98caa63646a8")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -1275,10 +1272,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "ae307698-7b42-4332-82d6-ef1efbafc5f4")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 6 "key5")
@@ -1306,7 +1303,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "dfba2c6b-d592-4002-b458-665e28a2240e")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -1356,7 +1353,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "77e45cad-190b-4d83-ac28-925d8b29d80a")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -1367,7 +1364,7 @@
 			(net 6 "key5")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "796fb972-5566-48a6-ad79-9bc91f2f6c1c")
+			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -1429,7 +1426,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "9f1c95c5-3e9c-48d2-b2eb-76a82c535128")
+			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -1459,7 +1456,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "5fcbae94-44a9-4c46-8d9f-d38a4f9c1d0c")
+			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -1471,7 +1468,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "5d74e3ef-4e9f-4cc0-b8d9-c9e4af89e5de")
+			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -1481,7 +1478,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "c654b4fe-f033-4002-99b2-be402fcb13b6")
+			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -1492,7 +1489,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "28c96948-1dbd-419c-8d3a-ec642492a412")
+			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -1502,7 +1499,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "5abaa101-28ed-4732-8141-25e2c3ecc4d3")
+			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
 		)
 		(embedded_fonts no)
 	)
@@ -1511,7 +1508,7 @@
 		(uuid "370dc111-ac8f-4ffb-98e7-9c76ebbc071f")
 		(at 96 78.499999)
 		(property "Reference" "SW6"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -1524,7 +1521,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -1567,44 +1564,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "ad9a9db7-1227-4151-9734-2552c79a8d8c")
+			(uuid "c0056c99-00e3-4764-b4bb-0d49b389c81d")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "1eb51487-683a-4050-849e-f5050eeeab64")
+			(uuid "6a8f5817-4bf2-423d-aafd-b0e0061d77d4")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "7dfb71af-335c-438d-81f2-5ace97130758")
+			(uuid "8f258600-3e82-4a3c-8d52-62d882d1f366")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "c5d98846-711f-4c4a-a03a-e6e5b0b9d122")
@@ -1620,44 +1614,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "8d8c40e7-069e-43e3-94c7-feed62d2f4ca")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "54425072-780a-416d-afed-1a8cf07296c5")
+			(uuid "57dda855-1333-482c-924d-ed90139b7851")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "3c172af6-cbf2-4234-b618-594b8d4ae86e")
+			(uuid "b4518875-e1b7-4484-957d-fba915905a85")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "75564338-95b3-4b3a-a782-bd58d100501a")
+			(uuid "fc49362d-49a4-4757-b32a-f89cbb968af7")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "7397ce19-a9bc-4047-ba44-2e9246c8e1cb")
+			(uuid "72229373-e6c3-4e2c-9f15-eca10150492e")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "c95632c9-d2c3-46b8-b0e4-771d125a2dbe")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "bbb01f7b-0775-445d-a6c5-ac18993d38b0")
+			(uuid "7e895783-8218-4a0e-a29a-4308557d412e")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -1678,17 +1672,17 @@
 			(net 9 "key6")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "1a90aca0-c14c-4f0a-b376-44a85014bfe3")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 9 "key6")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "4c6497c0-7921-4bfd-87a5-0ba3f9a7fb61")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -1728,7 +1722,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "cd147221-a2de-437b-bb91-c50744dea377")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -1740,10 +1734,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "d8f909ea-41f0-4398-8aed-be8707555cd0")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 9 "key6")
@@ -1771,7 +1765,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "4f4c663c-b0fc-4fb7-bec1-4ac0b03a3658")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -1821,7 +1815,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "4c4216f4-26ae-4edd-9497-f9c86c37e1a6")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -1832,7 +1826,7 @@
 			(net 9 "key6")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "0b230f86-7d7d-4add-826e-4924d2b88894")
+			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -1894,7 +1888,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "a93ac468-d3b0-48ce-9ffb-4d8ab84a70ee")
+			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -1924,7 +1918,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "28c6c3d7-b8e4-4be2-b8e4-23ab72286ec2")
+			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -1936,7 +1930,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "104707ad-97f4-4989-8edd-090ad77a5db9")
+			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -1946,7 +1940,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "026f320c-4795-4c59-82c2-d9a77ef208e5")
+			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -1957,7 +1951,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "3855ce23-0811-4419-b5b0-84e9a7c5d4c3")
+			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -1967,7 +1961,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "fd422046-0bd8-4907-a090-0b8674bd34e1")
+			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
 		)
 		(embedded_fonts no)
 	)
@@ -1976,7 +1970,7 @@
 		(uuid "38e652bc-0056-4c83-965a-ee8d3698cf89")
 		(at 153 116.5)
 		(property "Reference" "SW17"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -1989,7 +1983,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2032,44 +2026,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "9ff1ae66-c71e-42fa-8dce-848abceb4fcb")
+			(uuid "a7261020-5f46-4fe0-988c-8c85c41c0546")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "ea819636-100c-4efd-b3be-ea15f6f6564c")
+			(uuid "793ef3a2-46b0-4799-bb35-fda54720abc7")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "934ca90e-6a7d-4c07-9716-f2551bf6c693")
+			(uuid "466107a2-cb4d-449f-8886-fcb2f963763f")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "e491c2c0-6301-4e8b-9316-2af6bf0e108b")
@@ -2085,51 +2076,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "9701d0be-9737-419f-8755-2fbacc182273")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "5f087d0d-439c-4ffb-9133-1aac37d13db9")
+			(uuid "6eae28cd-64db-495d-8fbf-bba41cc75c02")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "6cf40380-2ca0-4663-b8a1-9d39e44fa895")
+			(uuid "8f6aa383-b1d1-4df4-a919-09b03a999ad4")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "1d621ffd-060b-476f-8b32-9c8fe7a13c69")
+			(uuid "677e9db6-060e-4745-9d3a-80d091ec88d0")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "2df8c79d-3164-40a6-90b1-5fd24b9e29a8")
+			(uuid "14813403-f0ae-4220-845e-6440ca473c75")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "2fafee75-c9a1-42c3-875c-15ea8ced4cd4")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "362b4b6f-8bf1-445f-a9dd-950788af78d6")
+			(uuid "7be70c2a-3313-42df-84d7-b78b63253c72")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
@@ -2140,26 +2131,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "738e64c6-14ac-4257-90af-88e86f21f080")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "1a9c3521-6bc8-428d-92e5-b715ea974955")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -2193,7 +2184,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "e01df966-a930-43ef-b1ef-91a245a742d4")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -2201,17 +2192,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "fa131fb8-f5cc-48f8-9af0-e4721b76acc6")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -2236,13 +2227,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "7ab7daf4-2b6b-44a2-a4db-8582fcb284c1")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -2286,7 +2277,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "d5d1e414-210c-42e9-905f-cf4f7dab6fb7")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -2294,10 +2285,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "41eb20aa-3085-44f5-883f-83f6064fb8b1")
+			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -2359,7 +2350,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "ae6e46c4-7cad-4e2b-a9c0-218d0c20d136")
+			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -2389,7 +2380,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "2093fe53-f61a-4cfb-be30-2f359eed22af")
+			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -2401,7 +2392,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "71c572ec-40f7-4eb0-8b29-8cd31c89df56")
+			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -2411,7 +2402,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "b15a8523-818c-4836-8aff-aeca1144b06a")
+			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -2422,7 +2413,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "b783f4b8-18dc-42f8-9b69-10a07556c187")
+			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -2432,7 +2423,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "4e57ef16-d339-4d0e-bf1f-000e427fac16")
+			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
 		)
 		(embedded_fonts no)
 	)
@@ -2441,7 +2432,7 @@
 		(uuid "3955f6b0-4d89-4afe-8a69-5c5f07307ba8")
 		(at 77.000001 107)
 		(property "Reference" "SW4"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -2454,7 +2445,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2497,44 +2488,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "afb92320-5987-4866-ab8e-97801cc2c3c6")
+			(uuid "15279cb2-2715-4922-8282-730e95b5d786")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "789f1fa1-8bc0-4dba-b35d-eead0877e3aa")
+			(uuid "b2c86daf-9495-41c0-96dd-1627f7e66aa3")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "36f2e0be-3311-4c99-a455-6f1a6062b381")
+			(uuid "63066311-39fd-4c1c-9267-4a4b9e364919")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "17aef48d-b543-4eed-8608-3bb01fbd26b1")
@@ -2550,44 +2538,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "53cfd593-c1de-4890-9465-e04b77ea0364")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "d076d40f-dd6d-431e-a90f-d540955dc448")
+			(uuid "257b811b-1349-4b33-8d14-826c50de8fd9")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "723fdcc4-2529-4af6-8d57-2c8125c0d08c")
+			(uuid "dc4a9acf-b31f-468a-ac0c-451ebc73b04e")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "4ac06a84-f4e9-4c44-a90f-0d7f91745169")
+			(uuid "8ab0c6ed-8865-459a-83af-c1f0373df17b")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "1d21cd88-599f-461f-a77b-8f3408acf8bc")
+			(uuid "1ec925d5-5bd6-4fc6-87d4-b18fd9b24a59")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "4d8a2998-0236-401f-bdf8-c84a280c451e")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "d9259657-c8bf-4969-b1ce-52cfa8937a05")
+			(uuid "593e3526-0082-4cf6-a036-10fa50b6eb77")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -2608,17 +2596,17 @@
 			(net 7 "key4")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "3fb2d182-5b7f-4b1e-ab63-cb9190aa0efc")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 7 "key4")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "34729009-96b3-4cec-b3ea-d9e179e930c5")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -2658,7 +2646,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "516ce8c8-21ef-4231-913c-241a2cb6967d")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -2670,10 +2658,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "84a747c8-f0db-42d2-a91d-d093de6586aa")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 7 "key4")
@@ -2701,7 +2689,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "ae9e1d6b-9359-4a66-841e-805c74e7ab61")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -2751,7 +2739,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "72f74ed1-b502-4937-8c85-420081085763")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -2762,7 +2750,7 @@
 			(net 7 "key4")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "26f486a9-8259-485c-a757-d8fa50b2bc7f")
+			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -2824,7 +2812,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "a592148a-0939-4920-ae58-5bddb0b4d208")
+			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -2854,7 +2842,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "905fae56-1a31-42f8-b9f0-bc579e362946")
+			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -2866,7 +2854,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "b6d44fa7-b026-42c4-99a7-e5fdb5dc7d10")
+			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -2876,7 +2864,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "789700f6-931e-49ca-a596-535825713bd4")
+			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -2887,7 +2875,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "f0c3a86f-7941-47a3-8de5-be44c67cfe1b")
+			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -2897,7 +2885,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "8c742f4b-ebb3-48bb-9cbe-a88bf8d1d79e")
+			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
 		)
 		(embedded_fonts no)
 	)
@@ -2920,7 +2908,7 @@
 			)
 		)
 		(property "Value" "Conn_01x30"
-			(at 0.000001 2.6 180)
+			(at 0 2.6 180)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -2963,7 +2951,7 @@
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "ee8adee5-5c9f-4218-83a9-a13445590541")
+			(uuid "e7d4ce2d-ecc5-42c7-8786-aea3fc787a37")
 			(effects
 				(font
 					(size 1 1)
@@ -2978,8 +2966,8 @@
 		(attr smd)
 		(fp_poly
 			(pts
-				(xy -7.6 -2.099999) (xy -8.6 -2.1) (xy -8.6 1.3) (xy -8 1.3) (xy -8 2.3) (xy 8 2.3) (xy 8 1.3) (xy 8.6 1.3)
-				(xy 8.6 -2.1) (xy 7.6 -2.1) (xy 7.6 -2.8) (xy -7.600002 -2.800001)
+				(xy -7.6 -2.1) (xy -8.6 -2.1) (xy -8.6 1.3) (xy -8 1.3) (xy -8 2.3) (xy 8 2.3) (xy 8 1.3) (xy 8.6 1.3)
+				(xy 8.6 -2.1) (xy 7.6 -2.1) (xy 7.6 -2.8) (xy -7.6 -2.8)
 			)
 			(stroke
 				(width 0.05)
@@ -2987,7 +2975,7 @@
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "037d1a85-ecb6-4a5a-8037-c653455b1c22")
+			(uuid "8a03d851-b730-4f1d-910b-1e9f30783400")
 		)
 		(fp_line
 			(start 8.4 -1.9)
@@ -2997,7 +2985,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "0546ba45-a09f-4dbb-9ce2-d867e5d9ae7b")
+			(uuid "d856779e-38f4-4d25-90f6-8ab0e5f32a25")
 		)
 		(fp_line
 			(start 7.8 1.4)
@@ -3007,7 +2995,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "6054917b-8075-4941-99da-de17ce530fe6")
+			(uuid "bae9d6f7-5e1c-4658-bd62-8f3fb2347707")
 		)
 		(fp_line
 			(start 7.8 -0.4)
@@ -3017,7 +3005,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "04d40312-dea0-45b9-915a-92a3fca4d27f")
+			(uuid "8faf1e14-2d40-481b-9513-ecf960c6a4f3")
 		)
 		(fp_line
 			(start -7.8 1.4)
@@ -3027,7 +3015,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "c2c96255-a5ee-4680-ae4d-e1439ce8be4a")
+			(uuid "4f89a255-a9f5-4450-a2e4-dcd2ab8d9c63")
 		)
 		(fp_line
 			(start -8.4 -0.1)
@@ -3037,7 +3025,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "1e6e9831-f529-4564-9075-56855f83396e")
+			(uuid "c8740e79-e964-4fe0-a804-d9293763aac1")
 		)
 		(fp_line
 			(start -8.4 -1.215)
@@ -3047,7 +3035,7 @@
 				(type solid)
 			)
 			(layer "User.1")
-			(uuid "fefb765a-271a-429c-94fe-b86f8a1ab78e")
+			(uuid "d21b5927-a38d-49f5-8b88-c771cf940b38")
 		)
 		(fp_line
 			(start -8.4 -1.9)
@@ -3057,7 +3045,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "e12608f5-53d0-4a70-8273-58f87b65e56d")
+			(uuid "a819fdae-7f6f-40ac-b4f9-7c6f022de944")
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 180)
@@ -3086,9 +3074,9 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 33 "unconnected-(J1-Pin_2-Pad2)")
 			(pinfunction "Pin_2")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "50a19acf-4fa0-4aac-9ee8-cf7ddc9ca511")
 		)
 		(pad "3" smd roundrect
@@ -3096,9 +3084,9 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
+			(net 35 "unconnected-(J1-Pin_3-Pad3)")
 			(pinfunction "Pin_3")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "ce31457c-e6f5-4e7b-8d8d-6c5749521d53")
 		)
 		(pad "4" smd roundrect
@@ -3106,17 +3094,17 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 14 "key22")
+			(net 13 "key22")
 			(pinfunction "Pin_4")
 			(pintype "passive")
 			(uuid "349aaea0-a5af-4176-a43e-c672c8a82160")
 		)
 		(pad "5" smd roundrect
-			(at -5.25 -2.299999 180)
+			(at -5.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 13 "key21")
+			(net 12 "key21")
 			(pinfunction "Pin_5")
 			(pintype "passive")
 			(uuid "29f8a79c-3ddd-45ff-ba4e-e5c5242d4811")
@@ -3126,17 +3114,17 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "Pin_6")
 			(pintype "passive")
 			(uuid "6de2feb6-0d30-4dfb-8ef9-153c535a8799")
 		)
 		(pad "7" smd roundrect
-			(at -4.250001 -2.3 180)
+			(at -4.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "Pin_7")
 			(pintype "passive")
 			(uuid "f6de5f61-02ff-4ab3-99c1-d6e775e76e37")
@@ -3146,17 +3134,17 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "Pin_8")
 			(pintype "passive")
 			(uuid "99f9d54e-0a5f-4bb8-8ab2-25e7026284cf")
 		)
 		(pad "9" smd roundrect
-			(at -3.25 -2.300001 180)
+			(at -3.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "Pin_9")
 			(pintype "passive")
 			(uuid "8bd3c1b4-c9aa-49ac-84aa-552c8d71ae0b")
@@ -3166,7 +3154,7 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "Pin_10")
 			(pintype "passive")
 			(uuid "440a3ae2-7132-4b90-ace4-301e8bed84d3")
@@ -3176,7 +3164,7 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "Pin_11")
 			(pintype "passive")
 			(uuid "1a7e8194-dc9e-438b-a5f3-4272b1f4c34d")
@@ -3186,7 +3174,7 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "Pin_12")
 			(pintype "passive")
 			(uuid "5f0035c8-b4c3-4056-b0db-cb0bea08882d")
@@ -3196,7 +3184,7 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "Pin_13")
 			(pintype "passive")
 			(uuid "43e02490-1bc5-4d76-af4d-09761a3598f3")
@@ -3206,7 +3194,7 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "Pin_14")
 			(pintype "passive")
 			(uuid "e0d31942-386e-4333-bb39-ca4dab7fd242")
@@ -3216,7 +3204,7 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "Pin_15")
 			(pintype "passive")
 			(uuid "de0d6a53-e59c-47ba-b979-7bc06c4a36c4")
@@ -3226,23 +3214,23 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 20 "unconnected-(J1-Pin_16-Pad16)")
+			(net 18 "unconnected-(J1-Pin_16-Pad16)")
 			(pinfunction "Pin_16")
 			(pintype "passive+no_connect")
 			(uuid "70309db7-f3bd-47b7-bc62-c336f58df8f3")
 		)
 		(pad "17" smd roundrect
-			(at 0.750001 -2.3 180)
+			(at 0.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "Pin_17")
 			(pintype "passive")
 			(uuid "a5a4ef83-0620-4a8a-a708-bcb0da081872")
 		)
 		(pad "18" smd roundrect
-			(at 1.249999 -2.3 180)
+			(at 1.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
@@ -3272,7 +3260,7 @@
 			(uuid "b6210b70-049a-4924-9a39-1ff9536bb1a4")
 		)
 		(pad "21" smd roundrect
-			(at 2.750001 -2.3 180)
+			(at 2.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
@@ -3336,19 +3324,19 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 26 "unconnected-(J1-Pin_27-Pad27)")
+			(net 24 "unconnected-(J1-Pin_27-Pad27)")
 			(pinfunction "Pin_27")
 			(pintype "passive+no_connect")
 			(uuid "d63f2cfe-ddc1-42fa-a5a7-d4def27301b0")
 		)
 		(pad "28" smd roundrect
-			(at 6.25 -2.299999 180)
+			(at 6.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
+			(net 34 "unconnected-(J1-Pin_28-Pad28)")
 			(pinfunction "Pin_28")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "52992ed0-c1c6-450b-8686-85bbb921a012")
 		)
 		(pad "29" smd roundrect
@@ -3356,13 +3344,13 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 32 "unconnected-(J1-Pin_29-Pad29)")
 			(pinfunction "Pin_29")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "04729b0c-9776-4cbc-9441-1a9c70bb5c0a")
 		)
 		(pad "30" smd roundrect
-			(at 7.249999 -2.3 180)
+			(at 7.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
@@ -3376,7 +3364,7 @@
 			(size 0.3 1.15)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 21 "unconnected-(J1-MountPin-PadMP)")
+			(net 20 "unconnected-(J1-MountPin-PadMP)_1")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
 			(uuid "734808dc-b215-41e6-b26e-da0c1b7d3f3e")
@@ -3386,10 +3374,10 @@
 			(size 0.3 1.15)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 22 "unconnected-(J1-MountPin-PadMP)_1")
+			(net 19 "unconnected-(J1-MountPin-PadMP)")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "7890a03c-349d-41d7-bdcc-5a089d9f47c5")
+			(uuid "734808dc-b215-41e6-b26e-da0c1b7d3f3e")
 		)
 		(embedded_fonts no)
 	)
@@ -3464,7 +3452,7 @@
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "768c2d5e-c762-47ab-a7b7-f0eb636c4ed0")
+			(uuid "b094bd2e-eb79-4fbf-89e8-3a83eb2293bc")
 		)
 		(fp_poly
 			(pts
@@ -3476,7 +3464,7 @@
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "5144affa-5b7e-4672-97da-c4c8e02e2cf1")
+			(uuid "b341aa06-7a98-4806-93d7-1585d0028a95")
 		)
 		(fp_poly
 			(pts
@@ -3488,7 +3476,7 @@
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "32f5cff9-cef4-447e-9f56-b3aa3791b16e")
+			(uuid "4e48cf76-51d1-4836-84a4-c5468a6cd430")
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 -3.4 345)
@@ -3507,81 +3495,81 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "734621d2-d2bd-4f3b-83c0-72525486bd18")
+			(uuid "60a454b4-ca8e-4319-b5de-d41ba850070f")
 		)
 		(pad "" np_thru_hole circle
-			(at -0.000001 -5.08 255)
+			(at -0.000001 4.7 255)
+			(size 0.2 0.2)
+			(drill oval 1 1.6)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "e9af0bfd-95f5-4824-ba50-5c2bd938f8dd")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 -5.08 255)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "5ba33eed-c451-4d1f-b131-bc68b92f4c7a")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6 255)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "831a2851-4daa-4d66-b024-cb4e410ce74e")
+			(uuid "8bd1408f-0bf1-4429-aec9-2f39cce22138")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0 345)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "eb21fb96-24df-4f39-8563-d11a4d7ffd94")
+			(uuid "4a240579-1c7f-42a9-86ee-55a14d9257a7")
 		)
 		(pad "" np_thru_hole circle
-			(at 0 4.699999 255)
-			(size 0.2 0.2)
-			(drill oval 1 1.6)
+			(at 0 6 255)
+			(size 3 3)
+			(drill 3)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "4b75c364-9c1b-441c-83d1-205dcd5fdbb4")
+			(uuid "1e8c8477-20e0-47b6-9443-aac3dce794c9")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 75)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "46f4d3e4-8ae4-4d15-8cd6-4ebaf8565281")
+			(uuid "6ea91b09-4924-480c-beb1-285bcb032037")
 		)
 		(pad "1" smd roundrect
-			(at -5.750001 -5.05 75)
+			(at -5.75 -5.05 75)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" thru_hole oval
-			(at -5.425001 -2.575002 340)
+			(at -5.425 -2.575 340)
 			(size 4.2 3.5)
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "f59ab0ed-df9e-4ac7-810a-90f58e0500bd")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" smd roundrect
-			(at -5.080001 -4.540001 255)
+			(at -5.08 -4.54 255)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "fd7c0de1-52a2-4bee-b206-3311eafcbe51")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05 345)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -3615,7 +3603,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "f7d4c836-2b53-4ec9-be5e-22cf9b44362d")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81 345)
@@ -3623,17 +3611,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "7be3d516-8c74-42f6-9913-5b331ba0136b")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" smd custom
-			(at 2.737495 6.112499 345)
+			(at 2.737497 6.1125 345)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -3658,13 +3646,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "b1c6ea19-e91d-47b7-90d5-d1483589d96f")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" smd custom
-			(at 4.850001 4.100001 255)
+			(at 4.85 4.1 255)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -3708,21 +3696,21 @@
 					(fill yes)
 				)
 			)
-			(uuid "37a12b47-8ae6-4a89-8ac7-e4d3440a7811")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "1" thru_hole oval
-			(at 4.850001 4.100001 50)
+			(at 4.85 4.1 50)
 			(size 4.2 3.5)
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "d8c77ff3-d2ac-4785-845b-1218f8a2f2b3")
+			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
 		)
 		(pad "2" smd custom
-			(at -4.875003 4.098635 75)
+			(at -4.875001 4.098634 75)
 			(size 2.5 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 1 "GND")
@@ -3773,7 +3761,7 @@
 			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(pad "2" thru_hole oval
-			(at -4.875003 4.098635 280)
+			(at -4.875001 4.098634 280)
 			(size 4.2 3.5)
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
@@ -3781,10 +3769,10 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "49c9ac9f-2474-472e-b77d-e8ccbc1b6357")
+			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(pad "2" smd custom
-			(at -2.787501 6.112501 345)
+			(at -2.7875 6.112501 345)
 			(size 1.975 1.975)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(net 1 "GND")
@@ -3811,7 +3799,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "64001641-7f82-427b-b6e6-1bd995af6073")
+			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81 345)
@@ -3823,7 +3811,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "a2efe1fa-3eb2-40b6-ae5d-94c625159880")
+			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.540001 75)
@@ -3833,10 +3821,10 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "0e009d76-c2d9-4ab9-a0da-a55b948e5399")
+			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(pad "2" thru_hole oval
-			(at 5.421186 -2.575645 350)
+			(at 5.421187 -2.575646 350)
 			(size 4.2 3.5)
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
@@ -3844,17 +3832,17 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "70749e23-e0b9-4995-abb8-e9f19543e5d2")
+			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(pad "2" smd roundrect
-			(at 5.749999 -5.05 255)
+			(at 5.75 -5.05 255)
 			(size 4.9 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "573f28b0-87f4-4164-aaf7-21af8f7f27cc")
+			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
 		)
 		(embedded_fonts no)
 	)
@@ -3921,7 +3909,7 @@
 		(attr through_hole)
 		(fp_poly
 			(pts
-				(xy -7.5 -7.500001) (xy 7.500001 -7.5) (xy 7.5 7.500001) (xy -7.500001 7.5)
+				(xy -7.500001 -7.5) (xy 7.5 -7.500001) (xy 7.500001 7.5) (xy -7.5 7.500001)
 			)
 			(stroke
 				(width 0.05)
@@ -3929,11 +3917,11 @@
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "6bad8754-329b-4253-9de3-bb43e98d51ac")
+			(uuid "90e26622-d6d4-41f7-86a2-7bdf06ccbfcd")
 		)
 		(fp_poly
 			(pts
-				(xy -7.5 -7.500001) (xy 7.500001 -7.5) (xy 7.5 7.500001) (xy -7.500001 7.5)
+				(xy -7.500001 -7.5) (xy 7.5 -7.500001) (xy 7.500001 7.5) (xy -7.5 7.500001)
 			)
 			(stroke
 				(width 0.05)
@@ -3941,7 +3929,7 @@
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "82d89ebd-35a4-4cc2-84c1-fc2f84c6c743")
+			(uuid "4f228776-87e9-43bf-b75f-13e6a68aa1bb")
 		)
 		(fp_poly
 			(pts
@@ -3953,10 +3941,10 @@
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "3aed2aa2-1f96-4c8e-abcb-78c827506a25")
+			(uuid "e314725a-baaa-43c3-9c95-9b795056509e")
 		)
 		(fp_text user "${REFERENCE}"
-			(at -0.000001 -3.399999 330)
+			(at 0 -3.4 330)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "113c3910-0710-4d00-9f78-3b9783d0374f")
@@ -3968,25 +3956,25 @@
 			)
 		)
 		(pad "" np_thru_hole circle
-			(at -5.494065 0.007529 240)
+			(at -5.494064 0.00753 240)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "e893c717-b0b8-4dee-90c8-add55e9af4de")
+			(uuid "3327f96d-6fc8-4e32-9dbc-483895a3ffc1")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 240)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "b19f8adb-d5dc-45a4-a821-8f277726c5f9")
+			(uuid "1c8b4242-9a03-448f-9f35-1ac59248b79f")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0 330)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "28197348-76ff-46c1-9ab1-6ee7f6d5d0d4")
+			(uuid "9d9ffd62-8993-430d-8f08-d52d2e56a976")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 4.7 240)
@@ -3994,7 +3982,7 @@
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "99d1495a-f38d-4d99-a544-9e1e0cd2790c")
+			(uuid "ca0c9450-33e3-42fe-86bb-30b2fe09a386")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 6 240)
@@ -4002,24 +3990,24 @@
 			(drill 3)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "8a526752-70c3-48a6-819f-722b46db3d23")
+			(uuid "d3cda374-4d90-491b-8c75-4f1971b0368b")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 60)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "0bf86486-97e1-4c3c-89d0-e660ad8d088c")
+			(uuid "51a1b33a-f682-44aa-842e-4a40c7a42425")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 60)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "e46b26c6-9352-4430-85cb-9cdceafc0c2a")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" thru_hole oval
 			(at -5.425 -2.575 325)
@@ -4027,26 +4015,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "0bd1f9a6-7443-41c2-af15-d1ee3766bb83")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" smd roundrect
 			(at -5.08 -4.54 240)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "d319e664-dff0-49b9-bfa8-63dd4c4c8e01")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05 330)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -4080,7 +4068,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "12a345d1-6f73-491f-8e7c-737c7ce7e4f3")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" thru_hole circle
 			(at 2.540001 3.81 330)
@@ -4088,17 +4076,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "a5a6acaf-15b0-4ed9-90f2-b77b2bed9df9")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112501 330)
+			(at 2.737497 6.1125 330)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -4123,13 +4111,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "e106f55e-c589-44b4-8ead-7a7c1dcdcbff")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 240)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -4173,7 +4161,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "8563adce-d588-4546-86e9-6ea75b620559")
+			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 35)
@@ -4181,7 +4169,7 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
@@ -4235,7 +4223,7 @@
 					(width 0.5)
 				)
 			)
-			(uuid "44099759-d025-4665-ae21-948913b509c7")
+			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
 		)
 		(pad "2" thru_hole oval
 			(at -4.875001 4.098634 265)
@@ -4246,10 +4234,10 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "2eaafab5-a9a1-4b1f-bcac-dae63e2b4fa2")
+			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
 		)
 		(pad "2" smd custom
-			(at -2.787499 6.112499 330)
+			(at -2.7875 6.1125 330)
 			(size 1.975 1.975)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(net 1 "GND")
@@ -4276,10 +4264,10 @@
 					(width 0.2)
 				)
 			)
-			(uuid "bbe5b3fe-8ad6-461c-85fd-b5660b30264f")
+			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
 		)
 		(pad "2" thru_hole circle
-			(at -2.540001 3.81 330)
+			(at -2.54 3.81 330)
 			(size 3.5 3.5)
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
@@ -4288,20 +4276,20 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "d2f206a9-c3b4-40c5-baf7-d5fdc749a13f")
+			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
 		)
 		(pad "2" smd roundrect
-			(at 5.08 -4.540001 60)
+			(at 5.08 -4.54 60)
 			(size 4 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "0db3ef6b-e9ad-406f-9146-0afe6d75c8f8")
+			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
 		)
 		(pad "2" thru_hole oval
-			(at 5.421187 -2.575647 335)
+			(at 5.421187 -2.575646 335)
 			(size 4.2 3.5)
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
@@ -4309,7 +4297,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "caf46075-5bd0-4e40-b068-8a202db3f1f3")
+			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 240)
@@ -4328,7 +4316,7 @@
 		(uuid "6001269f-c120-4e06-85b5-d2b96c31ba61")
 		(at 115 106.999999)
 		(property "Reference" "SW11"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -4341,7 +4329,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -4384,44 +4372,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "892c8a70-718a-49cd-b7dc-22fa872d4afd")
+			(uuid "b1c4fa8d-8a82-489b-9802-1bab9e0f2125")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "1ff2d065-5ff9-42ab-9a17-9704879f2556")
+			(uuid "73c9ce77-faf2-42b7-b0a5-3654b13fb753")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "88552021-7715-40eb-9b29-905319822d46")
+			(uuid "d5663285-daf8-4014-9d83-daab1fe424ac")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "6d336e98-c866-4d1f-855a-a02f25473194")
@@ -4437,51 +4422,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "17811aae-8930-4cb4-aa2f-79c2c4e0e194")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "365ae36c-8e62-481f-bb4a-9c48cc67af37")
+			(uuid "d3fdd3b4-928a-4139-89ba-f488080930e6")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "363f9343-fa91-4dde-b871-3a5213cafa86")
+			(uuid "9c45731a-aa39-44a2-9fb6-bb8a267cad47")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "ac674cd2-b561-49bc-86c7-43883014b9b1")
+			(uuid "b29bf8ea-dbd6-4845-922e-e89efe2c44cd")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "daed7121-6af6-4b2c-a876-e415946e8d77")
+			(uuid "a1fb1fa9-4578-4d16-b856-527b5f4ce5ae")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "2b76c585-2288-44dd-a86f-9e0857003aa5")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "5913e9be-049a-446e-a281-c8344b53f6d9")
+			(uuid "13d1702d-85fb-4d70-b8ed-b189b4dd9029")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
@@ -4492,26 +4477,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "a4bc9361-27f0-4232-b4c7-7e103ba68c05")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "7d56a623-0aa8-4392-ac1c-1cb33c9e4b01")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -4545,7 +4530,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "a0313610-1bbc-4096-a7d3-65bee50fab5f")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -4553,17 +4538,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "8939f6fa-64f3-477b-af7f-f7c6abd852fc")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -4588,13 +4573,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "f1339017-2d6f-4c6c-8277-1a31cdf7a87f")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -4638,7 +4623,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "293ab73f-795e-416c-8511-ea04c9f2dc86")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -4646,10 +4631,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "25a8b2c9-587d-4547-9216-9c3df6c90fce")
+			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -4711,7 +4696,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "b99960b6-38a1-42fc-a4f7-47a8f5c9a37b")
+			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -4741,7 +4726,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "d0fc4821-e924-43f8-862f-29b3c5bcc8c4")
+			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -4753,7 +4738,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "961bc1a7-585c-4216-ac19-bb6c708b7fb5")
+			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -4763,7 +4748,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "f2af1833-3251-46f1-9f1c-d9bea6301e55")
+			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -4774,7 +4759,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "2bf80081-b0f5-40bf-86b7-bb79750f03c8")
+			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -4784,7 +4769,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "e0e842a1-3a75-40c2-ad38-e0dc0704ae6d")
+			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
 		)
 		(embedded_fonts no)
 	)
@@ -4793,7 +4778,7 @@
 		(uuid "61d4ab2d-4aa0-4781-a514-a978f94ec1ec")
 		(at 134.000001 116.5)
 		(property "Reference" "SW14"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -4806,7 +4791,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -4849,44 +4834,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "bdc529f5-b610-44c9-be35-e96d2c6be029")
+			(uuid "32a4f954-e03a-4a8b-90a3-7228eb8ecde7")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "e7e2b1d5-9985-4890-8a79-4e6dbddcf622")
+			(uuid "df4d6f6f-670a-46a7-a852-267f07cc966c")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "652e5023-cf57-4133-8cb9-eb8c41b8b451")
+			(uuid "99fa40b9-4586-4cad-a07f-a1e4608a708b")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "f25ab5d9-a493-45fc-8231-997c53c290a5")
@@ -4902,51 +4884,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "dcc43036-0cb1-453d-8b58-f0e9c758dfa2")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "abebb9a6-c9bb-41bf-90d1-1776653b2a33")
+			(uuid "c47ecb46-8d40-4ef7-9d51-d1c2838d9882")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "a0dd4594-221a-43dc-aa22-fcac20d8c3ae")
+			(uuid "6002b841-efbb-4b4f-8c1c-15e091f3e390")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "27970c22-a7de-4a44-993e-1f636d7652b2")
+			(uuid "71a4e01a-6fa1-4ee7-a671-b68cf4c52e03")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "f9339d9e-2572-43b3-9e69-d8cb5006cab3")
+			(uuid "d6554e8c-b1d3-46a0-98c9-93d4293a6c1e")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "6b83dd00-8e50-4157-8bf0-0954d24a0154")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "d407c49d-a0f5-47b0-9840-f02d548067cb")
+			(uuid "7c068bfd-6aca-451d-a2eb-bd8ccaf3e26b")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
@@ -4957,26 +4939,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "4097e83b-004c-48df-b5e9-a8b266f31d06")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "21943566-e75d-4aa9-ab9c-f1a01b13a065")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -5010,7 +4992,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "8bfab1eb-5b19-47cc-9945-c2d9ba0a0519")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -5018,17 +5000,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "a0d79452-83ca-4353-9d9c-f4bd4eb613c4")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -5053,13 +5035,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "627c8aef-1575-4636-a37c-93881679adbe")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -5103,7 +5085,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "5b34cf8e-3ad1-4400-9250-a36057c786e6")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -5111,10 +5093,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "4311f627-42ae-4cba-a002-9100a75901a9")
+			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -5176,7 +5158,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "fec9fd58-1b21-455c-af24-6da09428f135")
+			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -5206,7 +5188,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "c6a042f3-33a8-4fa1-b72d-94cdac2c63ac")
+			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -5218,7 +5200,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "95552136-d4d3-4d18-8b2b-286880d00296")
+			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -5228,7 +5210,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "1e2daae3-d9e8-4e12-8e94-5af7a2481593")
+			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -5239,7 +5221,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "5c0da690-263a-496f-911a-9addfc0f6564")
+			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -5249,7 +5231,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "b596758e-fa59-49e1-9f0a-7e4da0a709ee")
+			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
 		)
 		(embedded_fonts no)
 	)
@@ -5258,7 +5240,7 @@
 		(uuid "85b267d8-474d-438f-ae82-ff08c8f778e0")
 		(at 58 97.5)
 		(property "Reference" "SW1"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -5271,7 +5253,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -5314,44 +5296,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "f064a414-f39f-4a12-9173-617ef56a6cdc")
+			(uuid "a556d572-1c1f-4606-bb3d-a9bb4a52d4f4")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "4e0a1db0-5ff6-4ee7-8238-b1a240f582d6")
+			(uuid "e7bf102e-f8de-40a3-9bf3-e629f4008d89")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "5dcdc2d1-f5e8-4ef5-ba45-bbf2f27c33b7")
+			(uuid "e5ae63f6-d7ea-4311-9357-cd581223b70a")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "1bcf0f37-2e37-4ff9-8d1c-8040eb0bcc7c")
@@ -5367,44 +5346,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "83c9fd65-2b80-49cb-8894-6c4f76a7c693")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "32260f9a-f0ea-4983-aab3-ae22d7b6e886")
+			(uuid "59275aa5-400b-445f-887d-63fcb0e0774a")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "fe5338ef-827b-4f8a-be0b-d627a927de6a")
+			(uuid "eafb0da1-4d39-474b-a424-f74d199f0811")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "9a71c632-51fd-40d2-8c65-c489a847964d")
+			(uuid "3ea921c4-1dd9-41ae-a4b4-bdc35e6cb8d3")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "bcfa3394-63dc-4276-9ed3-854f062fca29")
+			(uuid "a578eff0-d549-45f3-be3e-3e7af5c82f50")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "0ea112b7-e336-4202-b801-d445097506c4")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "7b126b5f-fc96-4bc8-8eaa-32b391f08c43")
+			(uuid "cd781650-b76b-4dbd-a525-2ecd446c4d67")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -5425,17 +5404,17 @@
 			(net 8 "key1")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "8743fca3-e938-4502-9cc0-5acb29278fb0")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 8 "key1")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "b494d69f-c246-4088-8aa8-a753559b37f5")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -5475,7 +5454,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "9c828ea0-7bf3-4f9a-a647-830a91884757")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -5487,10 +5466,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "9555da55-8cf1-47fe-913e-3b7a8868227c")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 8 "key1")
@@ -5518,7 +5497,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "c44fa8b9-ccc8-4215-bc00-e9f2e64174af")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -5568,7 +5547,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "3bffbcf9-9225-4c92-9560-e39c7f8a58f7")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -5579,7 +5558,7 @@
 			(net 8 "key1")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "e20b70b7-32bc-4ba4-98e4-f03c83a57f4f")
+			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -5641,7 +5620,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "7cddbe9d-f7e6-4698-bf65-0c862acb52ae")
+			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -5671,7 +5650,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "98486360-5917-4907-88e3-29f78c78856f")
+			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -5683,7 +5662,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "521ac086-6063-4a50-89d5-2688b86cae31")
+			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -5693,7 +5672,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "590ffe3e-2f03-4478-bad0-03efac0e00ad")
+			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -5704,7 +5683,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "09a45d3d-8ed2-4aff-a95c-a6ecefadbbb2")
+			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -5714,7 +5693,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "ecae6f72-0cd1-4ad8-a798-20fed843baa4")
+			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
 		)
 		(embedded_fonts no)
 	)
@@ -5723,7 +5702,7 @@
 		(uuid "93680d5b-3a5e-4bd7-a052-6eaea6c3d808")
 		(at 115 69)
 		(property "Reference" "SW9"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -5736,7 +5715,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -5779,44 +5758,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "516811fd-5e82-4f3b-9d7a-8dac032f14a1")
+			(uuid "f07cf45f-0207-4e18-93ea-541ca4527bf2")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "4ef5693b-761e-4403-88ac-048dfd3870db")
+			(uuid "761a1ae3-9963-4a64-91fc-29fe77d65667")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "dc2d86c9-92fe-41a7-99f5-aa62412adfde")
+			(uuid "13bb0cc3-6c35-47f3-b556-b36fc50e07b8")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "8e47eea8-17c8-46de-a4f6-96bf0b6b57b4")
@@ -5832,44 +5808,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "f14b9557-9f0b-468e-bb70-497a5cff194e")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "be6bf327-1f9e-49ff-b55d-e7efddd2cdaa")
+			(uuid "1acced76-df38-47e3-ac98-b450cd524ce1")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "a3692a34-8df7-4394-8e51-ba2d55e34591")
+			(uuid "8f9007d1-c2cb-4462-bcf2-d9c56c370655")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "eb437d78-1be8-476b-a013-ec013bca0358")
+			(uuid "7ca24266-bb82-4e0c-898c-87207a5ae893")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "fab7551a-ce18-4efa-a995-89a641dbec00")
+			(uuid "9964e3af-c751-4c3d-a82e-ce59818353c1")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "0ce4d22e-762d-4526-ab35-063f9f693e38")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "3d3ac6b2-aa04-4730-81de-dee1f6851bd1")
+			(uuid "e12dbae1-c6b1-4c84-ba02-4b73e5c1fc6e")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -5890,17 +5866,17 @@
 			(net 3 "key9")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "7b829688-cca7-4cbc-b466-bf354fd5a19a")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 3 "key9")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "1fa2959a-3334-43a9-9a93-21809409a6f4")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -5940,7 +5916,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "7c41d2ad-8ae9-40f6-a667-94e011ae3278")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -5952,10 +5928,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "aeaec2a1-ac6a-40b1-914e-2d8f556d6584")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 3 "key9")
@@ -5983,7 +5959,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "1ddfb8b8-0f3d-4d9e-85fd-a068ec4f2658")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -6033,7 +6009,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "103766f9-0b70-4948-a2bd-ce736ed5dbd0")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -6044,7 +6020,7 @@
 			(net 3 "key9")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "76a1283d-4bce-4f39-a7f1-c7ffcd0f1ceb")
+			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -6106,7 +6082,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "4db741d5-740c-47f9-936d-f6d2b6b408e8")
+			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -6136,7 +6112,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "45f89654-b463-43e1-ab47-52aa71ae0c0f")
+			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -6148,7 +6124,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "be17b4db-0fc1-4eea-8a7d-7b9827be164f")
+			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -6158,7 +6134,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "0c72e0c4-72c5-40cf-be06-bb6263bfeb53")
+			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -6169,7 +6145,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "af260eed-14f8-4bf4-a89c-2310fb3edc60")
+			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -6179,7 +6155,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "fd980769-759b-4987-8da4-d0745d301ee4")
+			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
 		)
 		(embedded_fonts no)
 	)
@@ -6188,7 +6164,7 @@
 		(uuid "95814d48-c2c9-4ea2-b32d-9416c498c459")
 		(at 77.000001 87.999999)
 		(property "Reference" "SW3"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -6201,7 +6177,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -6244,44 +6220,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "ec04be45-168c-4645-a1c1-09add92e4d27")
+			(uuid "c4038c6e-021a-425b-89a7-de0e610e2ae3")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "de4676e0-5263-4f59-9df3-ed673698cc70")
+			(uuid "c52917ea-85e8-4e37-822b-cd7a72ba0f52")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "0c680a35-684b-454f-a7b4-8b730199b303")
+			(uuid "7c3bc16a-636f-4048-96f4-7659784376db")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "a04661cf-9823-495b-bb63-c206e3c906ee")
@@ -6297,44 +6270,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "b3daddc1-2ca3-4349-b6a5-2f7156c0b9de")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "f2ba9b68-b2df-44d0-9c30-b05a7051dea3")
+			(uuid "3e185fb7-7743-4169-a5cf-86d9ec1b32f2")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "7516b21e-ffa0-4833-8bbe-fc5e18fc8f3d")
+			(uuid "2ea55131-23c1-4ce6-889e-34a521ba1ffd")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "915068f5-312c-4528-8ce8-f339937feddc")
+			(uuid "e0fee845-bd3f-4400-95f8-da2946988871")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "d383df4a-8064-4969-b6ac-c1137f2db534")
+			(uuid "facd0ca9-9d7e-4482-8d0b-2b50b169b6db")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "605e916d-74b3-4d12-a4ef-6cceed76f94e")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "3929f929-651b-40ed-942f-8d36d31ad9d0")
+			(uuid "9c8a13ae-7acd-4131-b4a5-8733c29fb64b")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -6344,7 +6317,7 @@
 			(net 10 "key3")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "bf481d25-60b2-474d-96fd-fc46ff891b75")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" thru_hole oval
 			(at -5.425 -2.575 355)
@@ -6355,17 +6328,17 @@
 			(net 10 "key3")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "7d037c06-b838-461f-a0a7-555e1a6bc86d")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 10 "key3")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "68d93961-3c68-4ce1-a934-17cf47025d4f")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -6405,7 +6378,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "66841845-e6c9-4e7d-8b71-1a077075bb97")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -6417,10 +6390,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "a9bf53c9-c2ac-487c-80c6-95f4a1a1dc80")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "key3")
@@ -6448,7 +6421,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "54992215-3840-4f9a-a1c3-b96666049180")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -6498,7 +6471,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "9cb1c224-6cbf-4047-b093-966ac3f00e29")
+			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -6560,7 +6533,7 @@
 					(width 0.5)
 				)
 			)
-			(uuid "2a6437d5-f869-4a85-95f3-330dea85245e")
+			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
 		)
 		(pad "2" thru_hole oval
 			(at -4.875001 4.098634 295)
@@ -6571,7 +6544,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "5a4b914e-8c5f-45b7-acdb-54baf952aa8b")
+			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -6601,7 +6574,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "429a7ae7-26d9-41e3-87ce-1a1f94f75b04")
+			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -6613,7 +6586,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "eecc4c8d-a3ac-4cdc-9530-485eed2de963")
+			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -6623,7 +6596,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "2a98a241-bfa6-4de9-b3c3-59aa408a8c69")
+			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -6634,7 +6607,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "3a3eb180-b858-4d5e-8f60-c9d25eddffa6")
+			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -6653,7 +6626,7 @@
 		(uuid "9a308736-1751-4b76-bfea-17427da55abd")
 		(at 58.000001 116.499999)
 		(property "Reference" "SW2"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -6666,7 +6639,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -6709,44 +6682,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "859959d0-52d6-4cfb-884a-7fdb6eb3e34f")
+			(uuid "a10021db-d8e3-4431-b771-1c0cbf674990")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "c594be8d-cd82-4e18-a82d-8e4c3beb910e")
+			(uuid "a5ab5a88-5a85-46c1-a8bb-7a9cb263dff5")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "f28ec456-4293-4903-ae84-bdfa0ea308a8")
+			(uuid "c5e049da-4509-4f0f-ad25-7f16c9fab81f")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "b6d00271-e673-4de0-b0cd-e28e0e3bad17")
@@ -6762,44 +6732,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "b69354c4-d6e8-4b90-870f-5b3543e75280")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "2497fa4f-444e-4fe1-87d4-d54c87f5473d")
+			(uuid "38210f25-a8b2-4d09-861b-96b3c6cd8811")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "e6e21c13-5cee-4275-b545-301d13b64479")
+			(uuid "2b6a9934-48db-45d7-b96c-52883bd80486")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "236fc6b6-48fe-4838-9087-26f73f581b2b")
+			(uuid "04c3e9f6-0799-48b1-b209-2b067723455c")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "818355e2-d008-4320-b941-44cee4f999da")
+			(uuid "85b52712-c00f-409e-86bc-bfb0df1112ed")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "89bc9c98-1e21-4dcd-852a-4c43949bf4f3")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "0a1641f0-9abd-439c-afca-5ae1e0a10729")
+			(uuid "adfff780-6b74-4d12-898a-fd8578cfefdd")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -6820,17 +6790,17 @@
 			(net 5 "key2")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "d4ff5bf0-7713-40b6-affa-b4ef4e9409eb")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 5 "key2")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "77b3db0e-70db-4fd5-b96b-44adce3f8bff")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -6870,7 +6840,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "d10bd787-b14f-46d9-862e-7263923670e9")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -6882,10 +6852,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "90661ad2-27ca-4317-a765-66caf3e2b4b9")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 5 "key2")
@@ -6913,7 +6883,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "a0a25e33-c613-435c-bd63-5b151b53565a")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -6963,7 +6933,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "9f2c630f-194b-40fb-a282-5d2db81770e8")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -6974,7 +6944,7 @@
 			(net 5 "key2")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "e600bbf2-6cce-4ea6-b0ac-fefb2a145921")
+			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -7036,7 +7006,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "2ab83374-f456-4ac9-a694-9af1f29402eb")
+			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -7066,7 +7036,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "1e35baf4-19d7-4684-9113-f021870a22b5")
+			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -7078,7 +7048,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "89626ecd-904d-467a-ad7c-9ca0bd0f03d2")
+			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -7088,7 +7058,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "c053c187-e71a-426b-a337-aba48f693b72")
+			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -7099,7 +7069,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "73fc8144-65dd-4f5e-87e0-270bb014ddfa")
+			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -7109,7 +7079,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "872b3fb1-008e-4d06-b82b-cd5d0a5900b6")
+			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
 		)
 		(embedded_fonts no)
 	)
@@ -7118,7 +7088,7 @@
 		(uuid "a5d8097d-619b-4747-be0d-8ea550c6aa03")
 		(at 96 97.5)
 		(property "Reference" "SW7"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -7131,7 +7101,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -7174,44 +7144,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "7ec36838-0dde-46d7-a739-97260c95c6c0")
+			(uuid "03899a10-a703-424f-9312-099d6fbbb060")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "879c0978-f37f-4b9b-aa8d-e4c124c37554")
+			(uuid "6ddffa31-8863-4430-9238-a60d19877172")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "b412fb6e-3f2b-418b-a779-1d1b0eaa9484")
+			(uuid "bd053f74-76a6-4f49-83b8-700f05304795")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "2f1dcf3a-2727-49aa-a6ea-3c14f5f8afd6")
@@ -7227,44 +7194,44 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "3a471113-ac17-411c-899f-868dbe82dce2")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "1eb64b01-f3a3-4f36-aa6b-f8e1d0f7cc4d")
+			(uuid "101dc444-6b28-45fc-9949-7c3d78b18640")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "8489b1d0-0092-4f14-9f59-8ae09800160c")
+			(uuid "35b3d3f8-6a8c-410a-8adf-e34c8fe0e943")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "112c10b3-d162-4a14-9180-4fe7f294cce9")
+			(uuid "5c8c44c1-2b58-4f9c-b9e5-22c45b35712d")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "5b679ebe-2210-40f6-9076-5fc1b8aeb7b1")
+			(uuid "b3622a48-1fb7-4363-8674-4c85a44fb271")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "4210c23e-e879-4fde-8449-ef77bfbe041c")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "1b5aabbb-a781-487b-9319-0173c3777f27")
+			(uuid "dca60129-38ad-40df-a811-e61e1f2eb606")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
@@ -7285,17 +7252,17 @@
 			(net 2 "key7")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "8da990ac-9d87-42af-a0e4-ac76e8ecfacd")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
 			(net 2 "key7")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "c7697a32-6454-40a3-8960-a39cc1239578")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
@@ -7335,7 +7302,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "a12d650a-a7d7-4448-a7f0-f8975044ff83")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -7347,10 +7314,10 @@
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "a76535db-1572-4a28-8f77-0e67750b3e4a")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 2 "key7")
@@ -7378,7 +7345,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "1c075aad-71f8-47c6-986d-9b2263cd9ee3")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
@@ -7428,7 +7395,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "4bc07219-2c23-47dc-89be-e907ad8609ad")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -7439,7 +7406,7 @@
 			(net 2 "key7")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "4b79a450-8882-4edf-883b-d3d8aaf80691")
+			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -7501,7 +7468,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "0bb154e9-b91f-40a5-b446-d3868d1fae64")
+			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -7531,7 +7498,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "1a2c7863-aee9-4ba6-8081-494a80c8d874")
+			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -7543,7 +7510,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "e4b9061b-1700-41ef-8ce8-d5cda978e84d")
+			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -7553,7 +7520,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "08b0bc0e-b0fc-4806-94b8-74095bf5364c")
+			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -7564,7 +7531,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "a6ff9e70-98a8-499a-b516-91f957c4c3b0")
+			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -7574,7 +7541,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "67076723-5f30-49ea-852d-e79960b93810")
+			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
 		)
 		(embedded_fonts no)
 	)
@@ -7583,7 +7550,7 @@
 		(uuid "aa7a95b7-e67e-40e0-94b2-81e6e3f5b51d")
 		(at 153.000001 78.5)
 		(property "Reference" "SW15"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -7596,7 +7563,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -7639,44 +7606,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "ef859ef6-5d8a-463a-adf0-ae45d7cd506d")
+			(uuid "7a993582-a62e-43b8-bace-124ab6433db0")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "17127d53-4d3f-4eb7-b89b-00e52fd3438a")
+			(uuid "b62cbef9-74b3-4e49-a72a-7468dd4ff87b")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "c914ee6a-3f5b-4a9d-8f92-669a20dbe9e8")
+			(uuid "84a97c7e-d41d-4b60-9859-848ea53ed283")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "1ec54fec-3801-491d-910f-1039b9cd90b5")
@@ -7692,51 +7656,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "c643eb76-5a35-4a4f-9ecb-a9a18d6bc6e5")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "4c5e2ffc-92d8-4797-920d-57ad1e8002dd")
+			(uuid "16eee985-4b54-4aec-b441-545eefc90763")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "643a3c5b-be9b-4e51-97ad-abe604459aa7")
+			(uuid "b86b8221-2a34-4e6f-ad07-7b445867b51c")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "f75c9dc2-61ff-49b6-94b0-5d8cf7070572")
+			(uuid "2a3ee0b8-39d8-4aa9-a777-d7514a5aba00")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "cabd6d5b-36bd-45b4-ba47-4c3526c16817")
+			(uuid "9f0b487d-3303-4cee-a77b-5e241cdf2e4a")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "6c152476-47fd-4aa4-8f3c-7d8be54885de")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "77f146f3-1cb8-46c4-88c0-bbc2de6bd881")
+			(uuid "67f179ba-8e25-4f56-9a93-38a2d24e6ac5")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
@@ -7747,26 +7711,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "3281cfff-f772-4c87-a61d-58b217aaee67")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "2e912e98-e4c1-4141-923d-d6b5170e5119")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -7800,7 +7764,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "ad06fda4-dda3-4119-9dab-d3e24832f221")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -7808,17 +7772,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "1b078787-4b5d-48bb-9ca1-c4f78860fa4e")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -7843,13 +7807,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "0a93ff0a-ae77-42b6-95d3-bb015f95f7a5")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -7893,7 +7857,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "71c52a76-7867-4344-82f0-08e8547cd0d9")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -7901,10 +7865,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "5f9499e1-7b88-40cc-9514-5c3436e61c9a")
+			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -7966,7 +7930,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "f12de39c-873b-475d-8a6a-fc9ff72f2e4d")
+			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -7996,7 +7960,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "00c007db-21f0-413e-9bef-745ca9479ac3")
+			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -8008,7 +7972,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "dbe0df3d-7feb-4af2-acae-5e954b90d22b")
+			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -8018,7 +7982,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "dfa3b5c9-3e4e-4996-af3f-97ceec776580")
+			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -8029,7 +7993,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "ac2e4be1-08ba-4fab-90c8-31d17b8fe0d0")
+			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -8039,7 +8003,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "170b7465-0f90-4f27-b9dd-61eac20485ab")
+			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
 		)
 		(embedded_fonts no)
 	)
@@ -8048,7 +8012,7 @@
 		(uuid "b12b21e7-345e-4b80-afc3-804a10169d3f")
 		(at 124.500001 135.499998)
 		(property "Reference" "SW18"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -8061,7 +8025,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -8104,44 +8068,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "13af6c80-f617-416c-8f54-45b1f46ff48b")
+			(uuid "5a54dc34-5b3f-4f4c-83be-1260ed345401")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "d9cd4ded-7ea6-4f0e-92f9-bc16e46b3488")
+			(uuid "da6d1f1a-6b01-4db9-b300-6b094b836795")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "3f897329-ba91-408e-b01c-278dfc89e7bd")
+			(uuid "45460912-7fa8-4c26-a87a-9afe3df6e04c")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "baa91011-ba07-4d0e-ac14-1c1a66155542")
@@ -8157,51 +8118,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "acaccac1-f611-40c5-9997-89e5351da7ee")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "9b17bd04-fa34-48ed-bd7c-29b7f2f62f0b")
+			(uuid "53fd4ed6-3a1e-4d33-9475-650d612ff855")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "a47f5137-45ff-4fa7-bf8e-6d7430a0fb1c")
+			(uuid "475c6900-81ad-4035-a8fc-c870c5aa6dda")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "6d391c3f-6aba-49c1-b251-ee1544b03752")
+			(uuid "8e041a17-30dc-4617-a234-f145fe2a21eb")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "02c27522-7c86-4e49-9709-7bf08b8545dd")
+			(uuid "043e8cd4-764e-4bfe-b33e-9b073aa27294")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "e5e5ad98-f9af-4ac0-8a25-5fcdadd8604b")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "19dd2ff3-3d9b-4b45-85b3-73bdc730af2e")
+			(uuid "b70aa456-8e47-497a-9fbe-3918e9dec9e5")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
@@ -8212,26 +8173,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "15b94e74-d7a7-4b9c-88b5-5ab8f808fec0")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "80dc7d73-8f82-4d99-b8d5-4403782ee20d")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -8265,7 +8226,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "03ec9121-115c-4c42-b0c2-4bb6ea5aeb42")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -8273,17 +8234,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "e29c7928-45b4-4cbd-9703-4fe360675c09")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -8308,13 +8269,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "f2f04aa0-9104-41cd-9195-0fcdd018380b")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -8358,7 +8319,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "a2e54c88-f3e4-4693-8307-02affa49c79f")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -8366,10 +8327,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "6612d725-286d-4cd1-b6d8-5bdbcc195b27")
+			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -8431,7 +8392,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "e79e426e-d2b7-4d83-8f7b-843ddc77c15a")
+			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -8461,7 +8422,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "bed19286-5540-4bcc-b606-176f368d1749")
+			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -8473,7 +8434,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "b92e2ab9-177d-46e2-a9cf-412415b03103")
+			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -8483,7 +8444,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "a475e650-837a-4dae-935d-2074a7c9e506")
+			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -8494,7 +8455,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "6fb9a718-512a-4546-ac13-b622d9972b12")
+			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -8504,7 +8465,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "1d0a4b45-df4f-499e-b998-4129513b8c97")
+			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
 		)
 		(embedded_fonts no)
 	)
@@ -8513,7 +8474,7 @@
 		(uuid "b8267111-697a-4730-ba45-d6a52adb8d9a")
 		(at 134.000001 97.5)
 		(property "Reference" "SW13"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -8526,7 +8487,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -8569,44 +8530,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "9f664a10-2b5c-4b2c-b4eb-c5f939745ec5")
+			(uuid "36b80587-0765-4d65-8839-34f1efc5a3a3")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "123da601-c9e7-4608-94bd-5bc6ffd8f489")
+			(uuid "d8d87eaf-e9f1-4f01-bc07-5adedfdd33dc")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "a7afb9cc-ffbf-4099-925a-45a7736ab2b4")
+			(uuid "fda03471-7e8f-46f2-a33c-216aad290b62")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "870fe2df-f6a2-47df-b38e-bff7af262d6b")
@@ -8622,51 +8580,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "d1ba3c2f-fbcc-4df6-b849-d2dd26f54152")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "a37c1a95-fb17-492f-b511-25f6ddc2cc72")
+			(uuid "452e0b3c-b751-41aa-bdc1-54014a3fc29f")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "ef1b2b8f-89b7-4059-8ad8-b792e4a0ddd9")
+			(uuid "39cf3212-3fe2-483c-9e76-17c7541fb92f")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "96faedc2-26f4-4e78-a26e-b773a3c64210")
+			(uuid "81dbd6a1-6b0a-4850-81f4-38beb34b5a98")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "71fd6917-fd8f-4cd3-aba2-2bc0cf7cbf7a")
+			(uuid "c9b81936-2fec-4af4-93b8-94b2a2b3e7df")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "b8d6515b-590a-4d83-9b41-31d82707bc74")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "f3ac6cef-9abf-4a7d-838e-6118136897c0")
+			(uuid "c0ae8e85-91a8-4afb-98a5-6b7f6a732f36")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
@@ -8677,26 +8635,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "0063582c-65d0-4755-8fe0-ac53858427b5")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "ab80e50c-cc53-4db0-8e2f-62eeb2ff31f7")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -8730,7 +8688,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "c59bf713-09ff-4558-9c8c-5eceedfae2df")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -8738,17 +8696,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "1f2922b3-e557-4c5d-ac66-965892528616")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -8773,13 +8731,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "6e401dfd-5b3c-4cc1-b0a8-8d750624bf84")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -8823,7 +8781,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "1b565511-101c-4653-b2a3-074a4ff166ea")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -8831,10 +8789,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "f0c0aba5-3474-47ae-90ed-4d54f5c875ac")
+			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -8896,7 +8854,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "af6348e4-32e9-445d-a7c5-710ed281b56e")
+			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -8926,7 +8884,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "dc9fac4d-379d-4013-9851-e03dfacf76a3")
+			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -8938,7 +8896,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "9798fd87-9208-4e89-af27-ee00bf4ca0fd")
+			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -8948,7 +8906,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "b1bc44d9-464e-43fb-b5d9-615279ca3ea2")
+			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -8959,7 +8917,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "e828d91a-47a6-477a-aaec-54c67c5616d3")
+			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -8969,7 +8927,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "e1ee95d3-3a6e-4ca1-b5c0-e5156f905e2b")
+			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
 		)
 		(embedded_fonts no)
 	)
@@ -8978,7 +8936,7 @@
 		(uuid "c6b3fc26-321b-4a08-8117-842fad0f4314")
 		(at 153 97.499999)
 		(property "Reference" "SW16"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -8991,7 +8949,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -9034,44 +8992,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "b8d803e6-8b70-4f4f-adf5-73b3658bd21a")
+			(uuid "1deba965-360f-426c-bf18-87df644be8f9")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "7ae1bdc1-7e56-412d-8a30-f58ba2ab7485")
+			(uuid "3e5edc2b-1d4c-4cf8-91e5-ac865abd4479")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "fe8301d0-d6c9-4572-88e3-6edff4cbf2a6")
+			(uuid "5f82311b-ffd5-4e68-be1b-fa52e5b5346a")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "8f2ed470-2272-4308-80df-e2d90e1e78bc")
@@ -9087,51 +9042,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "b90369c2-2c6a-4ca8-a16c-d00ccfc53052")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "1bbe67c0-3fac-4097-878f-0d80d9abe28d")
+			(uuid "04099f68-476d-4abc-aee9-7bdc4775e93d")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "552b0eb9-cf93-4f82-8f2b-3ce34ae8c541")
+			(uuid "e0fd91d6-e36e-412b-a67f-3a0a04f0487e")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "1da42b84-841a-49e5-b97a-8c45657f9e2c")
+			(uuid "131aa478-faa5-40be-98c5-50c8c9942317")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "bbbff944-282b-4272-a1e9-b06308c2396e")
+			(uuid "2dcd12eb-2d58-4ff0-99b1-9fa8f872c2f2")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "4f85af07-4b59-4c54-b44b-647832d53d12")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "714bbe32-ae1a-4fa7-9f2c-c529c760057d")
+			(uuid "a1e2a2dd-f60b-46c6-abff-3bfdebb9aaeb")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
@@ -9142,26 +9097,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "7d7b5328-fd32-45dc-91b9-051dc810437a")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "4f44fcd9-e2aa-47e8-a234-853145f37a46")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -9195,7 +9150,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "9b78e3d5-2efd-4585-af7b-cb6b81ae32d0")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -9203,17 +9158,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "58584713-30c1-4824-88f8-c0876f04e934")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -9238,13 +9193,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "9661971e-1251-4c0f-b0c2-37e3c5f2ab87")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -9288,7 +9243,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "17673da0-cc43-400e-ad73-8d16e53f3562")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -9296,10 +9251,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "521728a5-4edc-42c3-af8f-63394b566751")
+			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -9361,7 +9316,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "cb214c46-167e-48b5-be8f-df325b2ff180")
+			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -9391,7 +9346,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "e74bf017-1fd1-41d6-9a81-ad9ff06cfec2")
+			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -9403,7 +9358,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "db72c702-da72-45ef-9626-75036d0ab639")
+			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -9413,7 +9368,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "61154deb-4b50-480d-9565-59f213bb9cc8")
+			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -9424,7 +9379,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "91b6f40a-d894-45d9-aea6-d1ece334851d")
+			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -9434,7 +9389,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "5a1eb187-f03b-4843-89b0-80e30d0e0c76")
+			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
 		)
 		(embedded_fonts no)
 	)
@@ -9443,7 +9398,7 @@
 		(uuid "f93692e4-e471-44fa-b6ef-44eb669546f8")
 		(at 134 78.5)
 		(property "Reference" "SW12"
-			(at 0.000001 -0.5 0)
+			(at 0 -0.5 0)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
@@ -9456,7 +9411,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 0 10.999999 0)
+			(at 0 11 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -9499,44 +9454,41 @@
 		(sheetfile "shield.kicad_sch")
 		(clearance 0)
 		(attr through_hole)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "e4ec3fe4-5f2f-45b3-96f1-0bb91e70ed3f")
+			(uuid "20397255-c4f9-4965-9ebd-790b3304f6e8")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(fp_rect
+			(start -7.5 -7.5)
+			(end 7.5 7.5)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "16b9a9f8-e604-43c7-a650-42315933eb1e")
+			(uuid "272bc1df-b5a7-4e54-81d7-92d27eff4ba9")
 		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
+		(fp_rect
+			(start -9.5 -9.5)
+			(end 9.5 9.5)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
 			(fill no)
 			(layer "User.1")
-			(uuid "c90f7933-2af8-4dd2-9528-19ac01a8c02f")
+			(uuid "0208bd46-db9c-466b-bf93-21abe6ec1cbe")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.399999 0)
+			(at 0 -3.4 0)
 			(unlocked yes)
 			(layer "F.Fab")
 			(uuid "e53ca692-7cb2-421c-a965-6aaeb1340925")
@@ -9552,51 +9504,51 @@
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "fe133e9c-d403-449c-93eb-f002c6c6bec2")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 6.000001 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "950c3987-8d5f-426d-bca9-d39da7bcc0f1")
+			(uuid "875e92e8-ce36-4b85-a9cb-7461493b062e")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 -5.08 270)
 			(size 1.75 1.75)
 			(drill 1.75)
 			(layers "*.Mask")
-			(uuid "2b357c7a-ed4e-45fe-be3e-80b44a46e554")
+			(uuid "ad8e21d4-e30c-4361-ad67-6e2d860a7d1c")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
 			(size 5.05 5.05)
 			(drill 5.05)
 			(layers "*.Mask")
-			(uuid "78183abb-44c3-4071-8659-7f906a2219e3")
+			(uuid "870ae247-29de-4c8a-8309-225381b9e495")
 		)
 		(pad "" np_thru_hole circle
-			(at 0.000001 4.7 270)
+			(at 0 4.7 270)
 			(size 0.2 0.2)
 			(drill oval 1 1.6)
 			(layers "*.Mask")
 			(clearance 0)
-			(uuid "26140161-8e9e-4137-95c2-b90d014ec598")
+			(uuid "433f4836-e3cb-4f3a-be69-e3b47e9d0710")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 6 270)
+			(size 3 3)
+			(drill 3)
+			(layers "*.Mask")
+			(clearance 0)
+			(uuid "745671bc-116b-4ac2-8225-8dc75150994d")
 		)
 		(pad "" np_thru_hole circle
 			(at 5.494064 0.00753 90)
 			(size 1.9 1.9)
 			(drill 1.9)
 			(layers "*.Mask")
-			(uuid "658fa969-5b95-4487-b69a-6ffa65026ccd")
+			(uuid "d6b5c49f-ea96-4513-9b29-0c35b1056d5a")
 		)
 		(pad "1" smd roundrect
 			(at -5.75 -5.05 90)
 			(size 4.9 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.1)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
 			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
@@ -9607,26 +9559,26 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "422d61ed-4de3-4dc9-81ae-b0d8acfff886")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "1" smd roundrect
-			(at -5.08 -4.540001 270)
+			(at -5.08 -4.54 270)
 			(size 4 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.1)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "6b98761a-dc3e-4797-b540-7393ac5998b6")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "1" smd custom
 			(at 2.25 2.05)
 			(size 0.2 0.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -9660,7 +9612,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "b8e0d3d8-9a26-4c86-87fd-9cfc7942d521")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "1" thru_hole circle
 			(at 2.54 3.81)
@@ -9668,17 +9620,17 @@
 			(drill 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "b6571b40-314a-4012-a5e6-d7d26202c574")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "1" smd custom
-			(at 2.737496 6.112499)
+			(at 2.737497 6.1125)
 			(size 2.074994 2.074994)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
 			(clearance 0)
@@ -9703,13 +9655,13 @@
 					(width 0.2)
 				)
 			)
-			(uuid "86b27bb1-4079-40b3-9104-947de6022d1e")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "1" smd custom
 			(at 4.85 4.1 270)
 			(size 2.5 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
 			(thermal_bridge_angle 90)
@@ -9753,7 +9705,7 @@
 					(fill yes)
 				)
 			)
-			(uuid "ce8cb1f1-cae1-4518-8ddb-c236a1f28a8d")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "1" thru_hole oval
 			(at 4.85 4.1 65)
@@ -9761,10 +9713,10 @@
 			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "1")
 			(pintype "passive")
-			(uuid "0362241a-a02c-476c-88c3-8d1cbd7978bf")
+			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
 		)
 		(pad "2" smd custom
 			(at -4.875001 4.098634 90)
@@ -9826,7 +9778,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "d7a946b5-302a-4746-b5aa-419f91e0f6b5")
+			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
 		)
 		(pad "2" smd custom
 			(at -2.7875 6.1125)
@@ -9856,7 +9808,7 @@
 					(width 0.2)
 				)
 			)
-			(uuid "9e90d3f5-48d8-4bb6-a2d3-70060f86ae0b")
+			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
 		)
 		(pad "2" thru_hole circle
 			(at -2.54 3.81)
@@ -9868,7 +9820,7 @@
 			(pinfunction "2")
 			(pintype "passive")
 			(clearance 0)
-			(uuid "73a6bf9e-c53c-47c5-aee9-8553c80e48b5")
+			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
 		)
 		(pad "2" smd roundrect
 			(at 5.08 -4.54 90)
@@ -9878,7 +9830,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "9ed33ed6-2095-479f-a659-7ccbaaa9c4ff")
+			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
 		)
 		(pad "2" thru_hole oval
 			(at 5.421187 -2.575646 5)
@@ -9889,7 +9841,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "1712dc9f-7310-4b70-870e-e64c0c86e92c")
+			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
 		)
 		(pad "2" smd roundrect
 			(at 5.75 -5.05 270)
@@ -9899,7 +9851,7 @@
 			(net 1 "GND")
 			(pinfunction "2")
 			(pintype "passive")
-			(uuid "92565c74-412c-4652-8655-fd1e57ca5a95")
+			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
 		)
 		(embedded_fonts no)
 	)
@@ -9923,7 +9875,7 @@
 			)
 		)
 		(property "Value" "Conn_01x30"
-			(at -0.000001 -2.6 180)
+			(at 0 -2.6 180)
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
@@ -9965,11 +9917,11 @@
 			)
 		)
 		(property "LCSC PN" "C283129"
-			(at 0 0 180)
+			(at 0 0 0)
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "6b15aed1-3921-44e1-8895-66f2745c7b98")
+			(uuid "9566aaf9-dc69-4187-8395-249c6c5e4442")
 			(effects
 				(font
 					(size 1 1)
@@ -9986,7 +9938,7 @@
 		(fp_poly
 			(pts
 				(xy -7.6 2.1) (xy -8.6 2.1) (xy -8.6 -1.3) (xy -8 -1.3) (xy -8 -2.3) (xy 8 -2.3) (xy 8 -1.3) (xy 8.6 -1.3)
-				(xy 8.6 2.1) (xy 7.6 2.099999) (xy 7.600002 2.800001) (xy -7.6 2.8)
+				(xy 8.6 2.1) (xy 7.6 2.1) (xy 7.6 2.8) (xy -7.6 2.8)
 			)
 			(stroke
 				(width 0.05)
@@ -9994,7 +9946,7 @@
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "77bdd54d-3760-4681-925e-142f65098830")
+			(uuid "7a430875-6049-4090-a5b3-dbdb4a2b900d")
 		)
 		(fp_line
 			(start -8.4 0.1)
@@ -10004,7 +9956,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "1a6013ea-bdae-4282-b800-491630b1693b")
+			(uuid "3259c620-3112-443d-98e0-3167932ee052")
 		)
 		(fp_line
 			(start -8.4 1.215)
@@ -10014,7 +9966,7 @@
 				(type solid)
 			)
 			(layer "User.1")
-			(uuid "c6151744-190c-4e1d-9b96-44916cb428cf")
+			(uuid "06363a6f-8d26-4c31-9863-53fe71ee8b98")
 		)
 		(fp_line
 			(start -8.4 1.9)
@@ -10024,7 +9976,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "aa0196e2-89cd-45e8-888c-c529f9556006")
+			(uuid "16733267-1549-417c-a0af-0e684818c6da")
 		)
 		(fp_line
 			(start -7.8 -1.4)
@@ -10034,7 +9986,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "6552ead8-0e15-4697-b1df-82ed51eaf234")
+			(uuid "b011686b-1dfc-4a0b-a5f5-1f9411e3b523")
 		)
 		(fp_line
 			(start 7.8 -1.4)
@@ -10044,7 +9996,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "76ebe8c8-34a3-4912-9538-960c40197d34")
+			(uuid "395d3fdb-1cb2-4f90-9d76-ebfb66d02e97")
 		)
 		(fp_line
 			(start 7.8 0.4)
@@ -10054,7 +10006,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "1c6afd6f-2d8b-41b5-b8f4-02f298085518")
+			(uuid "a778d128-7617-45f5-981a-afa1879a847d")
 		)
 		(fp_line
 			(start 8.4 1.9)
@@ -10064,7 +10016,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "6db66e99-2734-4227-bf6d-06836355c97c")
+			(uuid "ff8ccf0c-5390-4673-b647-fd8ba7ecb827")
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 180)
@@ -10080,7 +10032,7 @@
 			)
 		)
 		(pad "1" smd roundrect
-			(at -7.249999 2.3)
+			(at -7.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
@@ -10094,19 +10046,19 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 37 "unconnected-(J2-Pin_2-Pad2)")
 			(pinfunction "Pin_2")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "869eafd3-d99b-433e-96ca-0adf99ea7ffc")
 		)
 		(pad "3" smd roundrect
-			(at -6.25 2.299999)
+			(at -6.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
+			(net 36 "unconnected-(J2-Pin_3-Pad3)")
 			(pinfunction "Pin_3")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "196c1663-4aa5-410b-9a68-f7c6482dcb74")
 		)
 		(pad "4" smd roundrect
@@ -10144,7 +10096,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 30 "unconnected-(J2-Pin_7-Pad7)")
+			(net 28 "unconnected-(J2-Pin_7-Pad7)")
 			(pinfunction "Pin_7")
 			(pintype "passive+no_connect")
 			(uuid "37937f41-eb9c-470b-9505-d01b67f3de18")
@@ -10170,7 +10122,7 @@
 			(uuid "3a403cf6-d2c5-4cba-a3fd-c363ed868903")
 		)
 		(pad "10" smd roundrect
-			(at -2.750001 2.3)
+			(at -2.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
@@ -10200,7 +10152,7 @@
 			(uuid "6b412fd8-e911-47e6-b170-83cd41a5acf9")
 		)
 		(pad "13" smd roundrect
-			(at -1.249999 2.3)
+			(at -1.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
@@ -10210,11 +10162,11 @@
 			(uuid "6b510b5b-6a64-403e-a4b7-36f45be96c2e")
 		)
 		(pad "14" smd roundrect
-			(at -0.750001 2.3)
+			(at -0.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 25 "key10")
+			(net 23 "key10")
 			(pinfunction "Pin_14")
 			(pintype "passive")
 			(uuid "dba921d0-7c65-4cd1-a453-07bc4a9c61ee")
@@ -10224,7 +10176,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 27 "key11")
+			(net 25 "key11")
 			(pinfunction "Pin_15")
 			(pintype "passive")
 			(uuid "b5b2a591-795d-4647-a6bf-0bbbf888f976")
@@ -10234,7 +10186,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 28 "key12")
+			(net 26 "key12")
 			(pinfunction "Pin_16")
 			(pintype "passive")
 			(uuid "d5dfe253-6bca-44bd-9939-ad861cc8774b")
@@ -10244,7 +10196,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 15 "key13")
+			(net 14 "key13")
 			(pinfunction "Pin_17")
 			(pintype "passive")
 			(uuid "53980ac4-e07b-41c4-8ebb-0abdd691a4a8")
@@ -10254,7 +10206,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 18 "key14")
+			(net 16 "key14")
 			(pinfunction "Pin_18")
 			(pintype "passive")
 			(uuid "a1d718e0-6358-42b4-ae38-bf84826ccd6d")
@@ -10264,7 +10216,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "Pin_19")
 			(pintype "passive")
 			(uuid "5ab55cf2-f687-44d8-a7b7-2d406ea36de9")
@@ -10274,7 +10226,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 16 "key16")
+			(net 15 "key16")
 			(pinfunction "Pin_20")
 			(pintype "passive")
 			(uuid "91445780-7190-408c-8b64-8a9045afcf75")
@@ -10284,17 +10236,17 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 23 "key17")
+			(net 21 "key17")
 			(pinfunction "Pin_21")
 			(pintype "passive")
 			(uuid "a5f3ce6a-e821-49d4-9a6c-69f6f603048a")
 		)
 		(pad "22" smd roundrect
-			(at 3.25 2.300001)
+			(at 3.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 24 "key18")
+			(net 22 "key18")
 			(pinfunction "Pin_22")
 			(pintype "passive")
 			(uuid "88ee911c-f2a0-4555-b391-f5fea06cd7a6")
@@ -10304,17 +10256,17 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 29 "key19")
+			(net 27 "key19")
 			(pinfunction "Pin_23")
 			(pintype "passive")
 			(uuid "c2096ad9-86cf-4cbf-909a-9bcc052a8d60")
 		)
 		(pad "24" smd roundrect
-			(at 4.250001 2.3)
+			(at 4.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 19 "key20")
+			(net 17 "key20")
 			(pinfunction "Pin_24")
 			(pintype "passive")
 			(uuid "b04335cb-b611-461f-b2ec-a85cc1a4d312")
@@ -10324,17 +10276,17 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 13 "key21")
+			(net 12 "key21")
 			(pinfunction "Pin_25")
 			(pintype "passive")
 			(uuid "e9229856-585e-4371-97a0-1631528c4d94")
 		)
 		(pad "26" smd roundrect
-			(at 5.25 2.299999)
+			(at 5.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 14 "key22")
+			(net 13 "key22")
 			(pinfunction "Pin_26")
 			(pintype "passive")
 			(uuid "23389430-5175-4ab2-b75e-65b02da12bea")
@@ -10344,7 +10296,7 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 33 "unconnected-(J2-Pin_27-Pad27)")
+			(net 31 "unconnected-(J2-Pin_27-Pad27)")
 			(pinfunction "Pin_27")
 			(pintype "passive+no_connect")
 			(uuid "f2c26d4c-7305-4626-a3be-6d48fc973aa1")
@@ -10354,9 +10306,9 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
+			(net 39 "unconnected-(J2-Pin_28-Pad28)")
 			(pinfunction "Pin_28")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "d94ae8fe-0ecc-4159-b9f2-98888c25d8f3")
 		)
 		(pad "29" smd roundrect
@@ -10364,9 +10316,9 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 38 "unconnected-(J2-Pin_29-Pad29)")
 			(pinfunction "Pin_29")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "caf65fab-5f98-413c-aee6-7af3fd8d3ab7")
 		)
 		(pad "30" smd roundrect
@@ -10384,7 +10336,7 @@
 			(size 0.3 1.15)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 32 "unconnected-(J2-MountPin-PadMP)_1")
+			(net 29 "unconnected-(J2-MountPin-PadMP)")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
 			(uuid "d475158f-b364-49c4-9775-8463ce144fd2")
@@ -10394,10 +10346,10 @@
 			(size 0.3 1.15)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 31 "unconnected-(J2-MountPin-PadMP)")
+			(net 30 "unconnected-(J2-MountPin-PadMP)_1")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "966abb1c-adbe-4323-aa2a-9fd9ee1d00eb")
+			(uuid "d475158f-b364-49c4-9775-8463ce144fd2")
 		)
 		(embedded_fonts no)
 	)
@@ -11043,5 +10995,1349 @@
 		(layer "User.3")
 		(uuid "efbd7937-a955-4354-b0a3-be59db0f6cf9")
 	)
+	(segment
+		(start 90.25 89.35)
+		(end 90.25 92.45)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "00d7b974-52f7-4012-8979-177b94e3489e")
+	)
+	(segment
+		(start 86.5 88)
+		(end 87.5 89)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "12be1984-72bb-404f-b41e-6042bcd8af97")
+	)
+	(segment
+		(start 87.5 89)
+		(end 89.9 89)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "43e2a040-4506-433a-8ac3-ae2b8860a93e")
+	)
+	(segment
+		(start 88.2 71.6)
+		(end 88.2 79.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "4b6bec2f-a1a4-4fef-91f0-8cb4a09efae3")
+	)
+	(segment
+		(start 89.9 89)
+		(end 90.25 89.35)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "64f329b5-6ad7-4b85-a0a2-405690396c1c")
+	)
+	(segment
+		(start 91.500001 65.700001)
+		(end 91.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "652e59ee-01f8-43df-9abb-4a2046d750bf")
+	)
+	(segment
+		(start 91.500001 68.299999)
+		(end 88.2 71.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "ac2b2f6c-aedb-4ad5-8df5-dd2f543e3902")
+	)
+	(segment
+		(start 91.500001 66.799999)
+		(end 91.500001 65.700001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "cdc34109-f30f-4045-bbc5-5e5f2f9fc2cd")
+	)
+	(segment
+		(start 88.2 79.5)
+		(end 86.5 81.2)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "dadfba51-1aef-4bc3-9712-2556b074d19b")
+	)
+	(segment
+		(start 91.500001 66.799999)
+		(end 91.500001 68.299999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "f8224a2a-2105-41da-8a70-b7cfac7a51c5")
+	)
+	(segment
+		(start 86.5 81.2)
+		(end 86.5 88)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 2)
+		(uuid "fd1b7a78-c15f-4bbd-a962-5eaa112b5e1f")
+	)
+	(via
+		(at 91.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 2)
+		(uuid "d77970a9-4d63-454e-97fb-1b3b9a309289")
+	)
+	(segment
+		(start 91.500001 65.700001)
+		(end 91.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 2)
+		(uuid "8513cc30-9f9b-421b-beae-cd171ccefc11")
+	)
+	(segment
+		(start 91.5 65.7)
+		(end 91.500001 65.700001)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 2)
+		(uuid "f3b8ac4d-89e0-4f84-9e89-406369a28942")
+	)
+	(segment
+		(start 92.500001 66.799999)
+		(end 92.500001 65.700001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 3)
+		(uuid "999b52f4-715f-4460-8f14-eae0f7eadd4d")
+	)
+	(segment
+		(start 92.500001 65.700001)
+		(end 92.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 3)
+		(uuid "b32860f6-414c-4347-8606-80a9d843d170")
+	)
+	(via
+		(at 92.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 3)
+		(uuid "513c4fcf-1abc-4721-92f4-0f796a2233ad")
+	)
+	(segment
+		(start 92.500001 65.700001)
+		(end 92.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 3)
+		(uuid "21109609-c443-4ed7-8d40-010cc3f6a514")
+	)
+	(segment
+		(start 92.5 65.7)
+		(end 92.500001 65.700001)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 3)
+		(uuid "e6059772-8892-4c37-b5bf-7728277cb0df")
+	)
+	(segment
+		(start 92.000001 66.799999)
+		(end 92.000001 67.899999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 4)
+		(uuid "0760040a-4756-45b4-8c80-00e483b3bbef")
+	)
+	(segment
+		(start 92 67.9)
+		(end 92 68.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 4)
+		(uuid "2a79da80-7159-4aa9-a309-90e189a182bd")
+	)
+	(segment
+		(start 92 68.5)
+		(end 90.5 70)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 4)
+		(uuid "3a71315b-9da7-47e0-913e-ceeb88993fa2")
+	)
+	(segment
+		(start 92.000001 67.899999)
+		(end 92 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 4)
+		(uuid "a3cb874c-2c92-4195-ab36-c2533f86ea15")
+	)
+	(via
+		(at 92 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 4)
+		(uuid "4ac3e681-2b50-49a2-b984-a63492aeeb99")
+	)
+	(segment
+		(start 92.000001 67.899999)
+		(end 92.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 4)
+		(uuid "7e44f4e4-6234-44fc-872a-252033e89eb3")
+	)
+	(segment
+		(start 92 67.9)
+		(end 92.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 4)
+		(uuid "dc0f4966-dbe8-4441-b0a3-279051fa2feb")
+	)
+	(segment
+		(start 52.250001 108.749999)
+		(end 53 108)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "15c2eb32-02da-4dfa-bf0f-d542f879e0f1")
+	)
+	(segment
+		(start 52.250001 111.449999)
+		(end 52.250001 108.749999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "462fb170-de00-4a9e-8faa-6f2a652c4521")
+	)
+	(segment
+		(start 66.5 108)
+		(end 67.5 107)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "4ddf24f0-e748-4408-96f3-4526968cce78")
+	)
+	(segment
+		(start 68.9 88.2)
+		(end 68.9 80.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "545668e5-b8ba-42fd-a9a2-1cf8abb736ac")
+	)
+	(segment
+		(start 84.8 79.9)
+		(end 85.7 79)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "8876b5b6-ddff-4e28-817f-206474adaa54")
+	)
+	(segment
+		(start 85.7 79)
+		(end 85.7 70.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "97a21e86-f611-44b7-8566-7c21b56d55f5")
+	)
+	(segment
+		(start 85.7 70.7)
+		(end 88.5 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "a9566240-a310-4fc9-8ac4-cb942554d3ef")
+	)
+	(segment
+		(start 69.7 79.9)
+		(end 84.8 79.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "c12ecf60-43ea-4937-80de-a83f1fc527d2")
+	)
+	(segment
+		(start 89.000001 67.399999)
+		(end 88.5 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "c5da98b9-1145-4757-97a9-45b68e273ea4")
+	)
+	(segment
+		(start 68.9 80.7)
+		(end 69.7 79.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "d0d9673d-82c0-4bd1-a573-af270f25e852")
+	)
+	(segment
+		(start 53 108)
+		(end 66.5 108)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "d3ec9a29-8e02-430c-b831-4fac12fce796")
+	)
+	(segment
+		(start 89.000001 66.799999)
+		(end 89.000001 67.399999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "d936d9b0-8d12-406c-af33-d8f93cf5f81e")
+	)
+	(segment
+		(start 67.5 107)
+		(end 67.5 89.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "d9392004-a162-4bc8-94c9-ff8d9fd5d56a")
+	)
+	(segment
+		(start 67.5 89.6)
+		(end 68.9 88.2)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 5)
+		(uuid "f553487d-337a-481c-a16c-b53a56943b86")
+	)
+	(via
+		(at 88.5 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 5)
+		(uuid "a3cfeccd-4942-47a6-bf27-b3b4dbe9b33c")
+	)
+	(segment
+		(start 88.5 67.9)
+		(end 88.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 5)
+		(uuid "94b77d45-20ba-4bf4-8087-905fe001dd7a")
+	)
+	(segment
+		(start 90.500001 65.700001)
+		(end 90.500001 66.799999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "313cf753-b43a-4e88-985b-6d7a77336f0e")
+	)
+	(segment
+		(start 87.2 71.408521)
+		(end 90.500001 68.10852)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "4c16db3c-f58b-4364-9f4a-e99035b71fd6")
+	)
+	(segment
+		(start 85.7 80.9)
+		(end 87.2 79.4)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "52033605-4306-4d10-8efe-8cc09bf8e30f")
+	)
+	(segment
+		(start 90.5 65.7)
+		(end 90.500001 65.700001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "5fadcdbc-d64a-43fa-be45-9e0b6abf25ab")
+	)
+	(segment
+		(start 85.7 116.8)
+		(end 85.7 80.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "63e118af-324a-4794-9230-c0064cfbebf5")
+	)
+	(segment
+		(start 87.2 79.4)
+		(end 87.2 71.408521)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "83f1b163-a392-44c9-b7aa-1935fe8286ba")
+	)
+	(segment
+		(start 71.25 118.25)
+		(end 72 117.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "8d3b54dd-31af-4ed9-bf8e-08b579a96708")
+	)
+	(segment
+		(start 90.500001 68.10852)
+		(end 90.500001 66.799999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "9c200c79-dafc-473d-ba98-ee3f862c4d97")
+	)
+	(segment
+		(start 71.25 120.95)
+		(end 71.25 118.25)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "9fbacd6c-f601-4e58-9ddc-c6442cb12ece")
+	)
+	(segment
+		(start 85 117.5)
+		(end 85.7 116.8)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "ceb531dd-6a2c-4e59-84d6-bc081a297ce9")
+	)
+	(segment
+		(start 72 117.5)
+		(end 85 117.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 6)
+		(uuid "d67b424f-d729-4da2-9e2b-7b5665678df0")
+	)
+	(via
+		(at 90.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 6)
+		(uuid "4265dfc2-fcd0-4c4a-93e4-d59d993c9d97")
+	)
+	(segment
+		(start 90.500001 65.700001)
+		(end 90.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 6)
+		(uuid "0575b627-4535-4bc5-8684-c4ff07a72c11")
+	)
+	(segment
+		(start 90.5 65.7)
+		(end 90.500001 65.700001)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 6)
+		(uuid "bc81c05d-0262-4035-86cb-fabd2734e746")
+	)
+	(segment
+		(start 71.250001 101.95)
+		(end 71.250001 99.249999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "07c2fea5-eaa3-4816-b9aa-2ffef12be8a8")
+	)
+	(segment
+		(start 72 98.5)
+		(end 84.4 98.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "3c05edd0-42cb-4d71-8fb6-2621de84af12")
+	)
+	(segment
+		(start 71.250001 99.249999)
+		(end 72 98.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "496fdb4f-45a3-4981-93be-0c66a9573887")
+	)
+	(segment
+		(start 90.000001 67.899999)
+		(end 90 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "926dddc1-62e1-4215-b455-edce7aa90763")
+	)
+	(segment
+		(start 86.7 71.2)
+		(end 90 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "9566d52e-8074-4687-afda-1135e8b5efc6")
+	)
+	(segment
+		(start 85.3 80.7)
+		(end 86.7 79.3)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "b64c9570-aaa1-48e3-b823-935908d6f7f8")
+	)
+	(segment
+		(start 90.000001 66.799999)
+		(end 90.000001 67.899999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "b818e8d1-b044-4984-ad87-ce184509ed52")
+	)
+	(segment
+		(start 86.7 79.3)
+		(end 86.7 71.2)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "bd888829-3c29-46c6-bf81-e7a486ce3786")
+	)
+	(segment
+		(start 85.3 97.6)
+		(end 85.3 80.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "dcbb9a8c-3d08-411a-9a99-b730281f331f")
+	)
+	(segment
+		(start 84.4 98.5)
+		(end 85.3 97.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 7)
+		(uuid "f029b22c-e4d2-4ea7-a2a4-8b56c28af0cd")
+	)
+	(via
+		(at 90 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 7)
+		(uuid "5da0411a-be68-449a-94e6-57518d04518f")
+	)
+	(segment
+		(start 90.000001 67.899999)
+		(end 90.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 7)
+		(uuid "d74dd9ca-c762-4326-9380-046d59893c0a")
+	)
+	(segment
+		(start 90 67.9)
+		(end 90.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 7)
+		(uuid "e5eeb252-a962-4375-a898-2cf85c21c78f")
+	)
+	(segment
+		(start 52.25 89.55)
+		(end 52.8 89)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "19e0299a-9089-428c-8009-621a8879b1f5")
+	)
+	(segment
+		(start 68.5 80.5)
+		(end 69.5 79.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "3c2ec8ec-9661-49ed-8d96-7074de1047c2")
+	)
+	(segment
+		(start 52.8 89)
+		(end 67.5 89)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "4f13e0a1-aa68-43df-a7b1-dcba2453917d")
+	)
+	(segment
+		(start 69.5 79.5)
+		(end 84.6 79.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "4f457b15-30de-4c92-8319-c69c1ccdff39")
+	)
+	(segment
+		(start 88.500001 66.200001)
+		(end 88 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "52eb45c8-20f8-44fb-bb84-b99d2a994d50")
+	)
+	(segment
+		(start 85.3 70.391479)
+		(end 88.500001 67.191478)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "64998379-655c-479e-a08d-f5b2763b5f96")
+	)
+	(segment
+		(start 88.500001 66.799999)
+		(end 88.500001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "6eecd0cf-1c30-43bb-9586-26b1d9baf7f3")
+	)
+	(segment
+		(start 88.500001 67.191478)
+		(end 88.500001 66.799999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "7905b889-d5ae-4f2e-8ab5-e969c7f71587")
+	)
+	(segment
+		(start 67.5 89)
+		(end 68.5 88)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "8b5e098e-14f9-42a9-ad4a-ed1d5e8b8ad3")
+	)
+	(segment
+		(start 68.5 88)
+		(end 68.5 80.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "8e58f862-3ff8-4f0a-a7dc-d494a84c1811")
+	)
+	(segment
+		(start 52.25 92.45)
+		(end 52.25 89.55)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "a06c553f-22bc-4153-b4b2-e09244b4f15c")
+	)
+	(segment
+		(start 85.3 78.8)
+		(end 85.3 70.391479)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "b2f7b3ba-65c5-410a-b55d-7894cf7b42cf")
+	)
+	(segment
+		(start 84.6 79.5)
+		(end 85.3 78.8)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 8)
+		(uuid "e78bea0f-7391-48ba-bbee-7a97d3c2f2ca")
+	)
+	(via
+		(at 88 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 8)
+		(uuid "e9e24ad3-8a17-4baf-9809-5ef06eaf21c2")
+	)
+	(segment
+		(start 88 65.7)
+		(end 88.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 8)
+		(uuid "beb80985-50bf-4215-b012-a648ef62fe08")
+	)
+	(segment
+		(start 86.1 81.1)
+		(end 86.1 107.1)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "058ae097-b600-4739-af2c-51f8b0ce6ffb")
+	)
+	(segment
+		(start 91.000001 67.899999)
+		(end 91 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "191e2344-f3ff-4891-ab2e-2cd3f7eef831")
+	)
+	(segment
+		(start 87.7 71.5)
+		(end 87.7 79.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "486f41d6-68a1-45f4-ba63-8b744d3f5af3")
+	)
+	(segment
+		(start 87.7 79.5)
+		(end 86.1 81.1)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "4905629a-7a54-40de-b9f0-446ac2a8ac50")
+	)
+	(segment
+		(start 91 67.9)
+		(end 91 68.2)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "521f88dc-5609-4671-9168-9d0ca1a34aca")
+	)
+	(segment
+		(start 89.9 108)
+		(end 90.2 108.3)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "b4c234ca-85aa-4b3b-a841-3a75fe25f345")
+	)
+	(segment
+		(start 91 68.2)
+		(end 87.7 71.5)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "b97e272c-c838-48d5-800c-78b49d7fcac5")
+	)
+	(segment
+		(start 87 108)
+		(end 89.9 108)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "d7503119-8661-4acd-b2cb-c331c929a1c5")
+	)
+	(segment
+		(start 91.000001 66.799999)
+		(end 91.000001 67.899999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "dc5ebc38-b6be-4ff5-bb51-492e7d20dd12")
+	)
+	(segment
+		(start 86.1 107.1)
+		(end 87 108)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 9)
+		(uuid "e11d7a6b-8e96-48ce-aec5-d022488391b6")
+	)
+	(via
+		(at 91 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 9)
+		(uuid "4ee958ee-9d10-4f0e-be9e-f4a9dfe7f1d2")
+	)
+	(segment
+		(start 91 67.9)
+		(end 91.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 9)
+		(uuid "0bd0a58b-7dc6-425e-98d9-308721332be7")
+	)
+	(segment
+		(start 91.000001 67.899999)
+		(end 91.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 9)
+		(uuid "d4474585-cb3c-4319-bb36-e1512cace4ec")
+	)
+	(segment
+		(start 89 65.7)
+		(end 89.500001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "16ba09a5-1e73-4a81-bcdf-d73c1b51f9ee")
+	)
+	(segment
+		(start 89.500001 67.699999)
+		(end 89.500001 66.799999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "1f7e9c6e-86ba-4f77-b104-293bcd45e7a3")
+	)
+	(segment
+		(start 71.4 80.3)
+		(end 85 80.3)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "359cddbf-5563-4b0d-a104-99a51b73e8e9")
+	)
+	(segment
+		(start 71.250001 82.949999)
+		(end 71.250001 80.449999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "3ebdff25-3657-45e8-831d-c232b1fec86b")
+	)
+	(segment
+		(start 86.2 71)
+		(end 89.500001 67.699999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "9105bcdf-800f-46fb-8b83-5c0462378feb")
+	)
+	(segment
+		(start 86.2 79.1)
+		(end 86.2 71)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "c5eb5a92-cbfd-4936-b8cf-60f5954ddf53")
+	)
+	(segment
+		(start 85 80.3)
+		(end 86.2 79.1)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "d2e909e9-b7fb-48db-b5c4-521111b84ca2")
+	)
+	(segment
+		(start 89.500001 66.200001)
+		(end 89.500001 66.799999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "d30c484c-b640-4541-96cb-eaeb89226996")
+	)
+	(segment
+		(start 71.250001 80.449999)
+		(end 71.4 80.3)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 10)
+		(uuid "f0661e1b-96e2-472b-a94b-ae3ce19bc528")
+	)
+	(via
+		(at 89 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 10)
+		(uuid "d09fad0d-a10f-49bd-814d-ee88e22bba06")
+	)
+	(segment
+		(start 89.000001 65.700001)
+		(end 89.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 10)
+		(uuid "7218e195-e969-4d91-9ac1-0090fb1954f2")
+	)
+	(segment
+		(start 89 65.7)
+		(end 89.000001 65.700001)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 10)
+		(uuid "dc1933a3-39ed-492f-bed7-49645b726f0f")
+	)
+	(segment
+		(start 96.000001 66.200001)
+		(end 95.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 11)
+		(uuid "71c8089a-5965-47b5-8f46-6fa84433176e")
+	)
+	(segment
+		(start 96.000001 66.799999)
+		(end 96.000001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 11)
+		(uuid "c22e7489-b39a-4e67-abdd-221f829ebb62")
+	)
+	(via
+		(at 95.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 11)
+		(uuid "e7493866-84fc-4a42-91a3-56e8b60a78fb")
+	)
+	(segment
+		(start 95.5 65.7)
+		(end 95.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 11)
+		(uuid "8b5a9098-4d5c-49ca-b693-4a370a045071")
+	)
+	(segment
+		(start 99.000001 66.799999)
+		(end 99.000001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 12)
+		(uuid "1309f218-3d39-4eaf-9198-a9364c8011e3")
+	)
+	(segment
+		(start 99.000001 66.200001)
+		(end 98.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 12)
+		(uuid "b941123a-311d-4e31-b021-780d5b093281")
+	)
+	(via
+		(at 98.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 12)
+		(uuid "d4d77241-24f9-4a16-bc66-949fc1f090c2")
+	)
+	(segment
+		(start 98.5 65.7)
+		(end 98.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 12)
+		(uuid "e570d4be-5fde-4cf4-920a-34ecfea93a41")
+	)
+	(segment
+		(start 99 67.6)
+		(end 99 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 13)
+		(uuid "44671367-2004-47f7-9158-f67dd8b07f32")
+	)
+	(segment
+		(start 99.500001 67.099999)
+		(end 99 67.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 13)
+		(uuid "556d4e5d-5d43-476e-9ae3-e584488a06b8")
+	)
+	(segment
+		(start 99.500001 66.799999)
+		(end 99.500001 67.099999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 13)
+		(uuid "a6c070f9-c5c4-4f28-9dfb-84fe0202a6e5")
+	)
+	(via
+		(at 99 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 13)
+		(uuid "fbaec0ed-6235-45e7-bb98-643c162b86fd")
+	)
+	(segment
+		(start 99 67.8)
+		(end 99.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 13)
+		(uuid "708f3c7a-6780-400c-afa9-3508db32c7c7")
+	)
+	(segment
+		(start 95.000001 66.799999)
+		(end 95.000001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 14)
+		(uuid "1684d2bf-68e3-40f4-9a77-d34f695ae668")
+	)
+	(segment
+		(start 95.000001 66.200001)
+		(end 94.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 14)
+		(uuid "ae53d150-a6f6-478e-808f-688120295917")
+	)
+	(via
+		(at 94.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 14)
+		(uuid "252336e8-68f9-4df2-aa5a-f8a7c50ad8d5")
+	)
+	(segment
+		(start 94.5 65.7)
+		(end 94.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 14)
+		(uuid "5d1122de-4bb0-40af-aabe-27301dc76096")
+	)
+	(segment
+		(start 96.500001 67.099999)
+		(end 96 67.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 15)
+		(uuid "234abc23-b89e-4800-bf14-504b886ed64f")
+	)
+	(segment
+		(start 96 67.6)
+		(end 96 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 15)
+		(uuid "a75f4cd0-e2a8-40cb-8985-77fed10a1cd7")
+	)
+	(segment
+		(start 96.500001 66.799999)
+		(end 96.500001 67.099999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 15)
+		(uuid "c9bb0c02-4ade-4647-a331-15e6585a6aa9")
+	)
+	(via
+		(at 96 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 15)
+		(uuid "7ec8fec2-bb29-42df-9655-c0331ac117b5")
+	)
+	(segment
+		(start 96.000001 67.899999)
+		(end 96.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 15)
+		(uuid "2e843b32-4e4a-4ae3-8c7a-6f443d56dbaf")
+	)
+	(segment
+		(start 96 67.9)
+		(end 96.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 15)
+		(uuid "a013dbe0-ef01-47c7-97ae-21877a7e03ad")
+	)
+	(segment
+		(start 95.500001 67.099999)
+		(end 95 67.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 16)
+		(uuid "375fc77d-59da-46a0-ae08-bdd4473ecddc")
+	)
+	(segment
+		(start 95.500001 66.799999)
+		(end 95.500001 67.099999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 16)
+		(uuid "5b9ba284-0555-439d-bb25-7dfcc0fa2a7b")
+	)
+	(segment
+		(start 95 67.6)
+		(end 95 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 16)
+		(uuid "df646b4e-10a6-4180-92b0-61d687118500")
+	)
+	(via
+		(at 95 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 16)
+		(uuid "cb416bda-7057-4158-afa8-3b903d9484c8")
+	)
+	(segment
+		(start 95 67.9)
+		(end 95.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 16)
+		(uuid "08532dbc-9eef-49d8-b0ac-5f77b014c6f1")
+	)
+	(segment
+		(start 95.000001 67.899999)
+		(end 95.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 16)
+		(uuid "9acb54ef-c080-415b-a7b4-50acbdbd3756")
+	)
+	(segment
+		(start 98.500001 66.799999)
+		(end 98.500001 67.099999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 17)
+		(uuid "5f272aa1-5ed7-4dc5-a749-19b624a6868b")
+	)
+	(segment
+		(start 98 67.6)
+		(end 98 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 17)
+		(uuid "99630fb8-52bb-4c61-bf9d-1693f7914bfe")
+	)
+	(segment
+		(start 98.500001 67.099999)
+		(end 98 67.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 17)
+		(uuid "aea020c4-6a77-4784-8f84-6db3c76d5b18")
+	)
+	(via
+		(at 98 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 17)
+		(uuid "f157cdd1-a340-4b8b-8532-92ae2febce29")
+	)
+	(segment
+		(start 98 67.8)
+		(end 98.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 17)
+		(uuid "a357c904-7074-404c-a0c3-58c697c862ec")
+	)
+	(segment
+		(start 97.000001 66.200001)
+		(end 96.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 21)
+		(uuid "a0ed8d7e-05eb-47c7-9910-2da75695e67e")
+	)
+	(segment
+		(start 97.000001 66.799999)
+		(end 97.000001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 21)
+		(uuid "dec8e5b5-d794-49ba-bb49-328e3bcef84c")
+	)
+	(via
+		(at 96.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 21)
+		(uuid "8514ef0b-d844-4d1c-9b82-cc4824a9cca5")
+	)
+	(segment
+		(start 96.5 65.7)
+		(end 96.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 21)
+		(uuid "8890bd83-beda-47b4-964c-a141fdfbcb47")
+	)
+	(segment
+		(start 97.500001 66.799999)
+		(end 97.500001 67.099999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 22)
+		(uuid "66639bf2-56d1-46a1-abe2-e79fce23130d")
+	)
+	(segment
+		(start 97.500001 67.099999)
+		(end 97 67.6)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 22)
+		(uuid "6aff1ed3-f970-4af5-a036-8e4c1b0f26ef")
+	)
+	(segment
+		(start 97 67.6)
+		(end 97 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 22)
+		(uuid "bbf84dfe-f271-41e5-b9f1-125bb31b9d61")
+	)
+	(via
+		(at 97 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 22)
+		(uuid "9b59b011-fddc-467a-8724-5c670f278da9")
+	)
+	(segment
+		(start 97 67.8)
+		(end 97.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 22)
+		(uuid "7677c5b7-52bf-421c-ad49-0eafc0a71057")
+	)
+	(segment
+		(start 93.000001 67.899999)
+		(end 93 67.9)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 23)
+		(uuid "e29e9241-1983-447b-bddb-b21833278581")
+	)
+	(segment
+		(start 93.000001 66.799999)
+		(end 93.000001 67.899999)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 23)
+		(uuid "f9b1f5ca-3fb5-4fb8-8869-6f7ec53e744b")
+	)
+	(via
+		(at 93 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 23)
+		(uuid "032a5546-75eb-445b-bdac-d69f446acb85")
+	)
+	(segment
+		(start 93.000001 67.899999)
+		(end 93.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 23)
+		(uuid "9f1ada93-b9e1-4496-a4d9-f8e62e77d155")
+	)
+	(segment
+		(start 93 67.9)
+		(end 93.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 23)
+		(uuid "a8f5e188-ac6e-4e2a-89a4-212029c529cc")
+	)
+	(segment
+		(start 94.000001 66.200001)
+		(end 93.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 25)
+		(uuid "c30c8749-97bb-417c-8e82-e4dfee5316c4")
+	)
+	(segment
+		(start 94.000001 66.799999)
+		(end 94.000001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 25)
+		(uuid "e44c9ca9-e237-4df4-8192-a5a0f5528b11")
+	)
+	(via
+		(at 93.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 25)
+		(uuid "7c16fe7f-8b0c-4cbf-a8e7-d35aa8377fbc")
+	)
+	(segment
+		(start 93.5 65.7)
+		(end 93.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 25)
+		(uuid "3444a201-5352-4158-ac00-2c95c6e6c350")
+	)
+	(via
+		(at 94 67.9)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 26)
+		(uuid "4ff573a9-af4f-466f-8a51-9584856fab24")
+	)
+	(segment
+		(start 94 67.9)
+		(end 94.000001 67.899999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 26)
+		(uuid "0147590b-a8c1-4c60-9735-5fe65b6e0001")
+	)
+	(segment
+		(start 94.000001 67.899999)
+		(end 94.000001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 26)
+		(uuid "6d3b7bc2-6bc1-4562-b611-4f821bcff8f8")
+	)
+	(segment
+		(start 98.000001 66.799999)
+		(end 98.000001 66.200001)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 27)
+		(uuid "9289aa4a-cfff-4ca7-bcda-746daa4e29da")
+	)
+	(segment
+		(start 98.000001 66.200001)
+		(end 97.5 65.7)
+		(width 0.2)
+		(layer "F.Cu")
+		(net 27)
+		(uuid "c53d23b8-5f41-42f7-8f41-8f73dee7f4e2")
+	)
+	(via
+		(at 97.5 65.7)
+		(size 0.6)
+		(drill 0.3)
+		(layers "F.Cu" "B.Cu")
+		(net 27)
+		(uuid "be05f70d-4c5f-4e10-8734-e566571ef52b")
+	)
+	(segment
+		(start 97.5 65.7)
+		(end 97.500001 66.799999)
+		(width 0.2)
+		(layer "B.Cu")
+		(net 27)
+		(uuid "0177d94d-2bcb-4d78-bca5-f729fb8dd442")
+	)
 	(embedded_fonts no)
 )
diff --git a/shield/shield.kicad_pro b/shield/shield.kicad_pro
index 95c6e4b..4db3887 100644
--- a/shield/shield.kicad_pro
+++ b/shield/shield.kicad_pro
@@ -123,7 +123,7 @@
       },
       "rules": {
         "max_error": 0.005,
-        "min_clearance": 0.0,
+        "min_clearance": 0.1,
         "min_connection": 0.0,
         "min_copper_edge_clearance": 0.0,
         "min_groove_width": 0.0,
@@ -219,6 +219,10 @@
         {
           "diameter": 0.0,
           "drill": 0.0
+        },
+        {
+          "diameter": 0.45,
+          "drill": 0.3
         }
       ],
       "zones_allow_external_fillets": false
@@ -471,7 +475,7 @@
     "classes": [
       {
         "bus_width": 12,
-        "clearance": 0.2,
+        "clearance": 0.1,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
         "diff_pair_width": 0.2,