diff --git a/shield/shield.kicad_pcb b/shield/shield.kicad_pcb
index a6c46ed..5766b11 100644
--- a/shield/shield.kicad_pcb
+++ b/shield/shield.kicad_pcb
@@ -78,83 +78,64 @@
 		)
 	)
 	(net 0 "")
-	(net 1 "GND")
-	(net 2 "key7")
-	(net 3 "key9")
-	(net 4 "key8")
-	(net 5 "key2")
-	(net 6 "key5")
-	(net 7 "key4")
-	(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 34 "key23")
+	(net 1 "key21")
+	(net 2 "GND")
+	(net 3 "key10")
+	(net 4 "key7")
+	(net 5 "unconnected-(J1-Pin_16-Pad16)")
+	(net 6 "key16")
+	(net 7 "key9")
+	(net 8 "key19")
+	(net 9 "key8")
+	(net 10 "key18")
+	(net 11 "key15")
+	(net 12 "key22")
+	(net 13 "key11")
+	(net 14 "key2")
+	(net 15 "key5")
+	(net 16 "+3V3")
+	(net 17 "key23")
+	(net 18 "unconnected-(J1-MountPin-PadMP)")
+	(net 19 "unconnected-(J1-MountPin-PadMP)_1")
+	(net 20 "key4")
+	(net 21 "key14")
+	(net 22 "key12")
+	(net 23 "key1")
+	(net 24 "key20")
+	(net 25 "+1V8")
+	(net 26 "key6")
+	(net 27 "key17")
+	(net 28 "key3")
+	(net 29 "unconnected-(J1-Pin_27-Pad27)")
+	(net 30 "key13")
+	(net 31 "unconnected-(J2-Pin_27-Pad27)")
+	(net 32 "unconnected-(J2-Pin_7-Pad7)")
+	(net 33 "unconnected-(J2-MountPin-PadMP)")
+	(net 34 "unconnected-(J2-MountPin-PadMP)_1")
 	(net 35 "vbat")
 	(net 36 "scs")
-	(net 37 "sclk")
-	(net 38 "si")
-	(net 39 "swd_clk")
-	(net 40 "usbd+")
-	(net 41 "usbd-")
-	(net 42 "nreset")
-	(net 43 "swd_data")
-	(net 44 "Net-(D2-A)")
+	(net 37 "si")
+	(net 38 "usbd-")
+	(net 39 "usbd+")
+	(net 40 "sclk")
+	(net 41 "Net-(D1-A)")
+	(net 42 "Net-(D2-A)")
+	(net 43 "Net-(J3-CC1)")
+	(net 44 "Net-(J3-CC2)")
 	(net 45 "Net-(J3-SHIELD)")
-	(net 46 "Net-(J3-CC1)")
-	(net 47 "Net-(J3-CC2)")
-	(net 48 "Net-(D1-A)")
-	(net 49 "unconnected-(J6-Pin_1-Pad1)")
-	(net 50 "unconnected-(J3-SBU1-PadA8)")
-	(net 51 "unconnected-(J3-SBU2-PadB8)")
-	(net 52 "unconnected-(J4-MountPin-PadMP)")
-	(net 53 "unconnected-(J4-MountPin-PadMP)_1")
-	(net 54 "unconnected-(J1-Pin_7-Pad7)")
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
+	(net 46 "unconnected-(J4-MountPin-PadMP)")
+	(net 47 "unconnected-(J4-MountPin-PadMP)_1")
+	(net 48 "unconnected-(J3-SBU1-PadA8)")
+	(net 49 "unconnected-(J3-SBU2-PadB8)")
+	(footprint "PCM_marbastlib-xp-gateron_lp:SW_KS33_HS_KS-2P02B01-02_HS_1u"
 		(layer "F.Cu")
-		(uuid "13af5953-cc82-49c6-85a1-154643d58021")
-		(at 107 90.5)
-		(property "Reference" "SW10"
-			(at 0 -0.5 0)
-			(unlocked yes)
+		(uuid "0e60566a-bf7a-43d2-adfb-8228fca4d5f8")
+		(at 220.5 146.2)
+		(descr "Hotswap footprint for Gateron KS33 switches")
+		(property "Reference" "REF**"
+			(at -4.155 2.4 180)
 			(layer "F.SilkS")
-			(hide yes)
-			(uuid "03d525b2-9b2f-4e88-ba51-3b28b850d540")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "72ca7305-8430-4bd4-9f86-0a583ba8213e")
+			(uuid "2737468b-540d-47f6-a281-e6f6754fa170")
 			(effects
 				(font
 					(size 1 1)
@@ -162,75 +143,1031 @@
 				)
 			)
 		)
-		(property "Datasheet" "~"
+		(property "Value" "KS-2P02B01-02"
+			(at 0 0 180)
+			(layer "F.Fab")
+			(uuid "17eae6f1-f260-4ae4-974f-42aaaf56e717")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Datasheet" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "a2386824-712c-4899-a82f-7c0f4d00ca48")
+			(uuid "f2c701d9-ece4-40f9-97b4-1c974ff81ab8")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+		(property "Description" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "1907f0a7-d1a4-424a-9cac-a56528c78f82")
+			(uuid "ace85d44-5804-4513-816f-fcebc110f277")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(path "/0b2dbf0c-2b52-4b7b-9d0d-a109665c5cd5")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
+		(attr smd)
+		(fp_line
+			(start -5.096509 3.528462)
+			(end -5.096509 4.25)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "ae99d302-fe23-4354-a58c-3c9dfe24da35")
+		)
+		(fp_line
+			(start -5.096509 7.771538)
+			(end -5.096509 7.25)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "53f6daf1-ce3f-4723-aa03-a31883dfbd30")
+		)
+		(fp_line
+			(start -4.871538 3.303491)
+			(end 1.160763 3.303491)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "b7bf429b-f889-406d-8c64-cca9962353e5")
+		)
+		(fp_line
+			(start -0.696525 7.997359)
+			(end -4.871547 7.996509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "4590cafe-fb66-4e30-88ae-4b8ecb0c17bb")
+		)
+		(fp_line
+			(start -0.471517 7.666366)
+			(end -0.471517 7.772359)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "c39d0b7a-c11c-4140-affb-1047130f9e46")
+		)
+		(fp_line
+			(start 0.803483 7.591366)
+			(end -0.396517 7.591366)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "204e1547-f62a-470b-80c6-35d81be24640")
+		)
+		(fp_line
+			(start 0.878483 7.771509)
+			(end 0.878483 7.666366)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "7fffe281-0571-4593-8c8d-f4e007583a9e")
+		)
+		(fp_line
+			(start 1.131159 7.996509)
+			(end 1.103483 7.996509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "2fb8a95a-da17-435f-993f-87548a270154")
+		)
+		(fp_line
+			(start 1.623227 3.179574)
+			(end 2.63142 2.597493)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "70e7adc6-f2c6-4a6c-a778-9ec7fe19237c")
+		)
+		(fp_line
+			(start 3.023183 7.070426)
+			(end 1.66858 7.852507)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "93a81314-4224-4399-addf-0702dd1bdb6c")
+		)
+		(fp_line
+			(start 3.168841 2.453491)
+			(end 6.671525 2.453491)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "f697d321-3c1c-469e-b844-5d297b112af5")
+		)
+		(fp_line
+			(start 6.671538 6.946509)
+			(end 3.485647 6.946509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "d2e5b832-e10f-4341-b171-2e110b10f42f")
+		)
+		(fp_line
+			(start 6.896509 2.678462)
+			(end 6.896509 3.2)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "035c5eb8-9cb4-476a-9be7-dce17116837e")
+		)
+		(fp_line
+			(start 6.896509 6.721538)
+			(end 6.896509 6.2)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "9ddcdff0-9016-4c2c-9cf4-90216cdea047")
+		)
+		(fp_arc
+			(start -5.096509 3.528462)
+			(mid -5.030608 3.369392)
+			(end -4.871538 3.303491)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "b5267570-3015-47f8-8a2e-007ad866aff3")
+		)
+		(fp_arc
+			(start -4.871547 7.996509)
+			(mid -5.030611 7.930605)
+			(end -5.096509 7.771538)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "12588190-df95-465c-a03b-9b18236aeb33")
+		)
+		(fp_arc
+			(start -0.471517 7.666366)
+			(mid -0.44955 7.613333)
+			(end -0.396517 7.591366)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "3d44a76f-498c-4ac3-8d69-cb58da91e3cc")
+		)
+		(fp_arc
+			(start -0.471517 7.772359)
+			(mid -0.537421 7.931461)
+			(end -0.696525 7.997359)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "33ae678d-e7ff-4267-aa1e-93014beeb43d")
+		)
+		(fp_arc
+			(start 0.803483 7.591366)
+			(mid 0.856515 7.613334)
+			(end 0.878483 7.666366)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "6373289c-3586-4463-9180-9be2a79c8477")
+		)
+		(fp_arc
+			(start 1.103483 7.996509)
+			(mid 0.944382 7.930609)
+			(end 0.878483 7.771509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "0de2662e-b9d4-45e1-9064-e7d53fe5f706")
+		)
+		(fp_arc
+			(start 1.623227 3.179574)
+			(mid 1.400151 3.271972)
+			(end 1.160763 3.303491)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "06e2fe8a-62a6-490e-9fb3-4413e12271fd")
+		)
+		(fp_arc
+			(start 1.66858 7.852507)
+			(mid 1.409348 7.959882)
+			(end 1.131159 7.996509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "eefa5266-d575-488e-b76b-b98c371c29ba")
+		)
+		(fp_arc
+			(start 2.63142 2.597493)
+			(mid 2.890652 2.490118)
+			(end 3.168841 2.453491)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "d4393dcc-0302-40a1-96d6-a19a8138f341")
+		)
+		(fp_arc
+			(start 3.023183 7.070426)
+			(mid 3.246257 6.978019)
+			(end 3.485647 6.946509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "66f4cc24-e217-4896-a0dc-35fffdc82f0f")
+		)
+		(fp_arc
+			(start 6.671525 2.453491)
+			(mid 6.830601 2.51939)
+			(end 6.896509 2.678462)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "673ad212-aefe-4894-8a8b-173d4aba4eab")
+		)
+		(fp_arc
+			(start 6.896509 6.721538)
+			(mid 6.830605 6.880605)
+			(end 6.671538 6.946509)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "23492463-602a-448a-998f-666ee25cefb7")
+		)
 		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+			(start -9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Dwgs.User")
+			(uuid "3aa2c18e-5a79-42eb-8f4f-f3f429d0bca3")
+		)
+		(fp_rect
+			(start 3.2 -6.3)
+			(end -1.8 -4.05)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Cmts.User")
+			(uuid "ba7f9610-8480-4ebd-8c21-ba1392560be2")
+		)
+		(fp_line
+			(start -7 6.5)
+			(end -7 -6.5)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "885efd64-9321-40f8-aa81-512333047cbf")
+		)
+		(fp_line
+			(start -6.5 -7)
+			(end 6.5 -7)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "413974f8-99b1-4af5-850e-3fd00dcc7759")
+		)
+		(fp_line
+			(start 6.5 7)
+			(end -6.5 7)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "a5e9192f-e0ff-478f-bb57-35147ba6aba3")
+		)
+		(fp_line
+			(start 7 -6.5)
+			(end 7 6.5)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "422099ca-f620-4266-b3c5-c46435930aec")
+		)
+		(fp_arc
+			(start -7 -6.5)
+			(mid -6.853553 -6.853553)
+			(end -6.5 -7)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "1e785a95-2fd4-455e-9bf0-8faffb3629e1")
+		)
+		(fp_arc
+			(start -6.5 7)
+			(mid -6.853553 6.853553)
+			(end -7 6.5)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "ccfe85a1-7597-4553-bbd2-29d242e9ac29")
+		)
+		(fp_arc
+			(start 6.5 -7)
+			(mid 6.853553 -6.853553)
+			(end 7 -6.5)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "01af008d-b19e-4964-9f26-05245eeff276")
+		)
+		(fp_arc
+			(start 7 6.5)
+			(mid 6.853553 6.853553)
+			(end 6.5 7)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "Eco2.User")
+			(uuid "e47a1c53-8e81-4b01-8d02-63d57c93a753")
+		)
+		(fp_rect
+			(start -7 -7)
+			(end 7 7)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "d0559b2b-08d8-49b6-9ab7-da973dfcb175")
+			(uuid "2bbcd71c-4a9a-4ef3-ba14-df92dd3e30c3")
 		)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start -7.245 4.45)
+			(end -5.096509 4.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "0f1102b9-5801-4464-a635-4273e675858f")
+		)
+		(fp_line
+			(start -7.245 7.05)
+			(end -7.245 4.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "9eb453c9-b6ed-430e-8148-3f03995bfd93")
+		)
+		(fp_line
+			(start -5.096509 4.45)
+			(end -5.096509 3.528462)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
-			(fill no)
 			(layer "F.CrtYd")
-			(uuid "950ec5d7-ac45-4710-bc42-08a366a75f81")
+			(uuid "0fd00e1b-ec49-4ff4-9999-f8df3622ec03")
 		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
+		(fp_line
+			(start -5.096509 7.05)
+			(end -7.245 7.05)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f55e0dbe-e68b-46c9-a8fe-13563902ae26")
+		)
+		(fp_line
+			(start -5.096509 7.771538)
+			(end -5.096509 7.05)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "824f79c6-d859-4fef-9a36-39dcc0f9f3ec")
+		)
+		(fp_line
+			(start -4.871538 3.303491)
+			(end 1.160763 3.303491)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f0b4ad77-62b7-439d-a5e7-8bf08310f602")
+		)
+		(fp_line
+			(start -0.696525 7.997359)
+			(end -4.871547 7.996509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "d286a65e-4dec-4638-9dc2-1aee1e13c337")
+		)
+		(fp_line
+			(start -0.471517 7.666366)
+			(end -0.471517 7.772359)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "83e3954b-989b-4d27-8615-2bc74719a6a6")
+		)
+		(fp_line
+			(start 0.803483 7.591366)
+			(end -0.396517 7.591366)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "c88fdec8-708c-4f73-8a5c-6001d7b33976")
+		)
+		(fp_line
+			(start 0.878483 7.771509)
+			(end 0.878483 7.666366)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "19643fd5-0600-48cc-9c21-489381936408")
+		)
+		(fp_line
+			(start 1.131159 7.996509)
+			(end 1.103483 7.996509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "b21bb842-b10e-4e63-b091-1d942ae17bd8")
+		)
+		(fp_line
+			(start 1.623227 3.179574)
+			(end 2.63142 2.597493)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "95e02c49-841b-4531-93d5-47f5cefadb79")
+		)
+		(fp_line
+			(start 3.023183 7.070426)
+			(end 1.66858 7.852507)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "7d589a16-5f52-4372-b745-5de7604c97f7")
+		)
+		(fp_line
+			(start 3.168841 2.453491)
+			(end 6.671525 2.453491)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "c59982af-1fd8-45f2-bfde-43adc3f62366")
+		)
+		(fp_line
+			(start 6.671538 6.946509)
+			(end 3.485647 6.946509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "60a3ad7f-27ae-4757-a612-803a5a7c254d")
+		)
+		(fp_line
+			(start 6.896509 2.678462)
+			(end 6.896509 3.4)
+			(stroke
+				(width 0.05)
+				(type default)
+			)
+			(layer "F.CrtYd")
+			(uuid "530f41db-3728-47e3-aa8e-5dd96ada332d")
+		)
+		(fp_line
+			(start 6.896509 3.4)
+			(end 9.045 3.4)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "cf74466b-c0d2-47e1-ab6b-cd5586f93738")
+		)
+		(fp_line
+			(start 6.896509 6.721538)
+			(end 6.896509 6)
+			(stroke
+				(width 0.05)
+				(type default)
+			)
+			(layer "F.CrtYd")
+			(uuid "9bbd89ee-0bd3-46f0-9386-575c740bdfd6")
+		)
+		(fp_line
+			(start 9.045 3.4)
+			(end 9.045 6)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "9aa9f138-6a16-4eb2-b920-77442fbc9ee6")
+		)
+		(fp_line
+			(start 9.045 6)
+			(end 6.896509 6)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "b10eeb1b-e0d0-4d5a-965e-b8b1788c3eda")
+		)
+		(fp_arc
+			(start -5.096509 3.528462)
+			(mid -5.030608 3.369392)
+			(end -4.871538 3.303491)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "0743b218-ce0e-4d80-89d8-410e5a6029c5")
+		)
+		(fp_arc
+			(start -4.871547 7.996509)
+			(mid -5.030611 7.930605)
+			(end -5.096509 7.771538)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "3ee70c36-206f-40c8-8af4-82c8bbbfdf0a")
+		)
+		(fp_arc
+			(start -0.471517 7.666366)
+			(mid -0.44955 7.613333)
+			(end -0.396517 7.591366)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "40efae7b-10f5-4393-ae45-73af515ebb1e")
+		)
+		(fp_arc
+			(start -0.471517 7.772359)
+			(mid -0.537421 7.931461)
+			(end -0.696525 7.997359)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "4c59b139-8ef6-489d-a832-c3c2242346cb")
+		)
+		(fp_arc
+			(start 0.803483 7.591366)
+			(mid 0.856515 7.613334)
+			(end 0.878483 7.666366)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5c13c5ec-4460-43fb-b5cd-1af5413b3f00")
+		)
+		(fp_arc
+			(start 1.103483 7.996509)
+			(mid 0.944382 7.930609)
+			(end 0.878483 7.771509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "de16a369-33e2-4b8e-bacc-4cdf7aa9f818")
+		)
+		(fp_arc
+			(start 1.623227 3.179574)
+			(mid 1.400151 3.271972)
+			(end 1.160763 3.303491)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "7bf7244a-d1a7-4e6a-9236-5163f32e04c3")
+		)
+		(fp_arc
+			(start 1.66858 7.852507)
+			(mid 1.409348 7.959882)
+			(end 1.131159 7.996509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "38bac813-c972-4dd3-a0b8-19118c2f7b2a")
+		)
+		(fp_arc
+			(start 2.63142 2.597493)
+			(mid 2.890652 2.490118)
+			(end 3.168841 2.453491)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "20266fe7-2c49-49d8-8414-2ebc59ca4279")
+		)
+		(fp_arc
+			(start 3.023183 7.070426)
+			(mid 3.246257 6.978019)
+			(end 3.485647 6.946509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "22be4239-5660-4498-897a-7de1b3bab49b")
+		)
+		(fp_arc
+			(start 6.671525 2.453491)
+			(mid 6.830601 2.51939)
+			(end 6.896509 2.678462)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "27532c71-179d-4d86-af6b-1695089c4ebf")
+		)
+		(fp_arc
+			(start 6.896509 6.721538)
+			(mid 6.830605 6.880605)
+			(end 6.671538 6.946509)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "d8066790-97a5-4b16-b070-79468a7c6f47")
+		)
+		(fp_line
+			(start -5.096509 7.771538)
+			(end -5.096509 3.528462)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "b7224220-8705-48a7-ba8a-db3295f5dc12")
+			(layer "F.Fab")
+			(uuid "657e54b8-aeb2-4ad8-bb92-8aeaa8f502c2")
+		)
+		(fp_line
+			(start -4.871538 3.303491)
+			(end 1.160763 3.303491)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "73e0ae51-dc22-4fef-99d0-cdf713576c79")
+		)
+		(fp_line
+			(start -0.696525 7.997359)
+			(end -4.871547 7.996509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "2d6017f2-c910-4364-a094-805bd91696ec")
+		)
+		(fp_line
+			(start -0.471517 7.666366)
+			(end -0.471517 7.772359)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "a366625d-8736-4d4d-8cba-e0f56c975cac")
+		)
+		(fp_line
+			(start 0.803483 7.591366)
+			(end -0.396517 7.591366)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "b4bf16cb-4773-4f81-89a5-72238c7f62e3")
+		)
+		(fp_line
+			(start 0.878483 7.771509)
+			(end 0.878483 7.666366)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "5537fafa-c287-4cd3-b901-8d498c9036f4")
+		)
+		(fp_line
+			(start 1.131159 7.996509)
+			(end 1.103483 7.996509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "88fae747-6ba7-4ad8-a64b-e5ec28268573")
+		)
+		(fp_line
+			(start 1.623227 3.179574)
+			(end 2.63142 2.597493)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "072222ec-2413-41d2-9c91-21781b5f752e")
+		)
+		(fp_line
+			(start 3.023183 7.070426)
+			(end 1.66858 7.852507)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "2b886ff4-5884-4efe-980e-b9a538f958f1")
+		)
+		(fp_line
+			(start 3.168841 2.453491)
+			(end 6.671525 2.453491)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "9d19e672-f09f-48a1-8a9a-285bfbfe8cc4")
+		)
+		(fp_line
+			(start 6.671538 6.946509)
+			(end 3.485647 6.946509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "698ecad0-b10e-4287-b159-10bee6ecb3a2")
+		)
+		(fp_line
+			(start 6.896509 2.678462)
+			(end 6.896509 6.721538)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "c132d0ca-f223-4c40-9bee-f46f38ed3f2f")
+		)
+		(fp_arc
+			(start -5.096509 3.528462)
+			(mid -5.030608 3.369392)
+			(end -4.871538 3.303491)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "9fbb23f3-ea3f-4925-9df3-287fd4aae8da")
+		)
+		(fp_arc
+			(start -4.871547 7.996509)
+			(mid -5.030611 7.930605)
+			(end -5.096509 7.771538)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "12956866-cf33-4d8e-92e8-d352a5a491f3")
+		)
+		(fp_arc
+			(start -0.471517 7.666366)
+			(mid -0.44955 7.613333)
+			(end -0.396517 7.591366)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "803e264e-44d6-4b63-94a0-0956bd639376")
+		)
+		(fp_arc
+			(start -0.471517 7.772359)
+			(mid -0.537421 7.931461)
+			(end -0.696525 7.997359)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "36b32eee-d3d8-4324-b304-86d2d58f9675")
+		)
+		(fp_arc
+			(start 0.803483 7.591366)
+			(mid 0.856515 7.613334)
+			(end 0.878483 7.666366)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "bb94f364-86e2-4280-9b5d-4892ba142b27")
+		)
+		(fp_arc
+			(start 1.103483 7.996509)
+			(mid 0.944382 7.930609)
+			(end 0.878483 7.771509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "bebcedb4-e96e-4dab-922e-1c75c524a458")
+		)
+		(fp_arc
+			(start 1.623227 3.179574)
+			(mid 1.400151 3.271972)
+			(end 1.160763 3.303491)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "5b5b0540-a652-4555-85e3-6b340a63e716")
+		)
+		(fp_arc
+			(start 1.66858 7.852507)
+			(mid 1.409348 7.959882)
+			(end 1.131159 7.996509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "217b219a-6c2d-4d47-9c48-e2c1872008ae")
+		)
+		(fp_arc
+			(start 2.63142 2.597493)
+			(mid 2.890652 2.490118)
+			(end 3.168841 2.453491)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "99cc9eac-f038-44b4-96d0-7df5b8b4b3c1")
+		)
+		(fp_arc
+			(start 3.023183 7.070426)
+			(mid 3.246257 6.978019)
+			(end 3.485647 6.946509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "30f07775-6c18-4e22-801f-3d8739749bfa")
+		)
+		(fp_arc
+			(start 6.671525 2.453491)
+			(mid 6.830601 2.51939)
+			(end 6.896509 2.678462)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "ec901511-0e54-4afb-83b6-3b8db4a8bb9c")
+		)
+		(fp_arc
+			(start 6.896509 6.721538)
+			(mid 6.830605 6.880605)
+			(end 6.671538 6.946509)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "0399757c-effa-49f2-a3ce-905578f2af31")
+		)
+		(fp_text user "LED"
+			(at 0.7 -5.175 0)
+			(unlocked yes)
+			(layer "Cmts.User")
+			(uuid "a0a63d3f-a1d6-4b5e-b5ae-0c912f6eaadc")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
+			(at 0 1.5 0)
 			(layer "F.Fab")
-			(uuid "23c4726b-f373-4845-9262-e388a11dd62d")
+			(uuid "04a4eccf-83c4-47f4-a209-93a47910a0cb")
 			(effects
 				(font
 					(size 1 1)
@@ -239,384 +1176,386 @@
 			)
 		)
 		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "e3e01f9d-0220-47fd-996f-131a718454dc")
+			(at 0 0 180)
+			(size 5.25 5.25)
+			(drill 5.25)
+			(layers "*.Cu" "*.Mask")
+			(uuid "9aec4f82-4e92-46dd-abf7-58f2e295e098")
+		)
+		(pad "1" thru_hole circle
+			(at 4.4 4.7)
+			(size 3.3 3.3)
+			(drill 3)
+			(property pad_prop_mechanical)
+			(layers "*.Cu" "F.Mask")
+			(remove_unused_layers no)
+			(uuid "aa76c4ea-3f3a-4c16-b4a3-3350dd23b441")
+		)
+		(pad "1" smd rect
+			(at 5.95 4.7)
+			(size 1.2 2.55)
+			(layers "F.Cu")
+			(uuid "94d471ab-784e-4a98-8140-d49d578c80b4")
+		)
+		(pad "1" smd roundrect
+			(at 7.645 4.7)
+			(size 2.65 2.55)
+			(layers "F.Cu" "F.Mask" "F.Paste")
+			(roundrect_rratio 0.1)
+			(uuid "59ef05fd-22c9-43f7-ab9b-beb6737c2198")
+		)
+		(pad "2" smd roundrect
+			(at -5.845 5.75)
+			(size 2.65 2.55)
+			(layers "F.Cu" "F.Mask" "F.Paste")
+			(roundrect_rratio 0.1)
+			(uuid "cc1cfb84-11a5-413a-97c5-c9c3376a6655")
+		)
+		(pad "2" smd rect
+			(at -4.15 5.75 180)
+			(size 1.2 2.55)
+			(layers "F.Cu")
+			(uuid "2a06523b-074d-499e-9fa3-335ab4733d47")
+		)
+		(pad "2" thru_hole circle
+			(at -2.6 5.75)
+			(size 3.3 3.3)
+			(drill 3)
+			(property pad_prop_mechanical)
+			(layers "*.Cu" "F.Mask")
+			(remove_unused_layers no)
+			(uuid "e287b535-dd84-4497-b0af-a6759e11a69d")
+		)
+		(embedded_fonts no)
+		(model "${KICAD8_3RD_PARTY}/3dmodels/com_github_ebastler_marbastlib/HS_KS-2P02B01-02_KS33.step"
+			(offset
+				(xyz 0 0 0)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 0 0 0)
+			)
+		)
+	)
+	(footprint "PCM_marbastlib-xp-choc:SW_choc_MxCombo_1u"
+		(layer "F.Cu")
+		(uuid "16fb69da-42ec-4065-bcfc-e46eee9d5ed1")
+		(at 270.5 96.2)
+		(descr "Combined footprint for Kailh Choc and Cherry MX style switches")
+		(property "Reference" "REF**"
+			(at 0 -2.75 180)
+			(layer "Dwgs.User")
+			(hide yes)
+			(uuid "d9126a18-8979-4beb-ac8d-927c06b36afb")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Value" "SW_choc_MxCombo"
+			(at 0 0 180)
+			(layer "F.Fab")
+			(uuid "8216bb3d-a7a3-496a-af4c-415089682b69")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Datasheet" ""
+			(at 0 0 0)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "5333fabf-0b0a-44e4-b203-9a448c28a1cd")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Description" ""
+			(at 0 0 0)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "a211e330-1299-4810-b94c-cec72704e286")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(attr through_hole exclude_from_pos_files exclude_from_bom)
+		(fp_line
+			(start -9.525 -9.525)
+			(end -9.525 9.525)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "Eco1.User")
+			(uuid "536ea7a8-47c3-4ae7-896a-1d4341206754")
+		)
+		(fp_line
+			(start -9.525 9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "Eco1.User")
+			(uuid "c77d1722-2f9c-4cb6-bd90-63376684cedc")
+		)
+		(fp_line
+			(start 9.525 -9.525)
+			(end -9.525 -9.525)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "Eco1.User")
+			(uuid "1307dbdd-ed0c-491a-bd8c-b264251a2033")
+		)
+		(fp_line
+			(start 9.525 9.525)
+			(end 9.525 -9.525)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "Eco1.User")
+			(uuid "bb838faf-1ad8-4e75-bcd2-f2116da6c6c6")
+		)
+		(fp_line
+			(start -6.95 6.45)
+			(end -6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "8c08369e-1363-4692-9da9-f1915aedc0e5")
+		)
+		(fp_line
+			(start -6.45 -6.95)
+			(end 6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "43b830db-fb41-4820-b4b4-f08cd87c9425")
+		)
+		(fp_line
+			(start 6.45 6.95)
+			(end -6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "eb01bfd2-c306-4172-b2f7-9aeaa5164eca")
+		)
+		(fp_line
+			(start 6.95 -6.45)
+			(end 6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "491e1388-e960-4b45-b84d-642004815911")
+		)
+		(fp_arc
+			(start -6.95 -6.45)
+			(mid -6.803553 -6.803553)
+			(end -6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "f5ff600d-507e-4009-83d5-77d938373845")
+		)
+		(fp_arc
+			(start -6.45 6.95)
+			(mid -6.803553 6.803553)
+			(end -6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "f99b5829-9bf9-4ea5-8e3c-9496f30905bd")
+		)
+		(fp_arc
+			(start 6.45 -6.95)
+			(mid 6.803553 -6.803553)
+			(end 6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "d9d35e92-29cd-48af-93c2-cb160fcf52f9")
+		)
+		(fp_arc
+			(start 6.95 6.45)
+			(mid 6.803553 6.803553)
+			(end 6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "708453f9-2874-4694-abc6-f93a0df47f1f")
+		)
+		(fp_line
+			(start -7 -7)
+			(end 7 -7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "fa34698f-2a80-48cb-a790-c2791b4d90f5")
+		)
+		(fp_line
+			(start -7 7)
+			(end -7 -7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "3487b5f2-cfc5-4818-85fb-8c62d0937007")
+		)
+		(fp_line
+			(start 7 -7)
+			(end 7 7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "9ab304be-8592-4e2d-aa80-435fdb8b3a27")
+		)
+		(fp_line
+			(start 7 7)
+			(end -7 7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "4e8bc584-4c97-4257-bde8-83ae5f848b82")
+		)
+		(fp_text user "19.05 spacing"
+			(at 0 -8.7 180)
+			(layer "Eco1.User")
+			(uuid "83108c7b-9cbe-4132-90da-4ed64437bf4c")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(fp_text user "${REFERENCE}"
+			(at 0 1.5 0)
+			(layer "F.Fab")
+			(uuid "e46ededb-c8aa-4469-b5ff-1a930671f61c")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
 		)
 		(pad "" np_thru_hole circle
-			(at 0 -5.08 270)
+			(at -5.5 0 180)
+			(size 1.7 1.7)
+			(drill 1.7)
+			(layers "*.Cu" "*.Mask")
+			(uuid "19860f73-f018-4492-9f74-c73a9d796566")
+		)
+		(pad "" np_thru_hole circle
+			(at -5.08 0)
 			(size 1.75 1.75)
 			(drill 1.75)
-			(layers "*.Mask")
-			(uuid "ec908f0e-12f0-44d8-9991-49ad15b1444a")
+			(layers "*.Cu" "*.Mask")
+			(uuid "a909af8d-6b8f-4f4e-9d3b-0c172529aa74")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "9e8f3622-43e4-4281-86c2-c55a31a1a560")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "39d9e64b-ce44-4880-b187-b77591caf4ca")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "684eb4af-55a4-4c7d-bdf7-4549ad0a3579")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
+			(size 3.9878 3.9878)
+			(drill 3.9878)
 			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 25 "key10")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "976d4a95-6a2f-4083-900e-a6373acfe4e2")
+			(uuid "7ba225d6-bb1e-4b64-8d7e-cdc6dc5eef88")
 		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 25 "key10")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "99f2374f-61aa-4f20-af2e-9d482daecf5f")
+		(pad "" np_thru_hole circle
+			(at 5.08 0)
+			(size 1.75 1.75)
+			(drill 1.75)
+			(layers "*.Cu" "*.Mask")
+			(uuid "55e8e793-a3df-4d72-89d9-57336f252311")
 		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "key10")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "727ee506-cd94-4065-a595-540d78ee0427")
+		(pad "" np_thru_hole circle
+			(at 5.5 0 180)
+			(size 1.7 1.7)
+			(drill 1.7)
+			(layers "*.Cu" "*.Mask")
+			(uuid "557ee459-3096-4732-b77c-f49cd475431b")
 		)
 		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
+			(at -3.81 -2.54)
+			(size 2.3 2.3)
+			(drill 1.524)
+			(layers "*.Cu" "B.Mask")
 			(remove_unused_layers no)
-			(net 25 "key10")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "3cdd6f50-0ed7-4a9d-b3f2-facde7b82622")
+			(uuid "9635601c-e239-463e-a20a-b2cb94907bc0")
 		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "key10")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "35d008dc-3cb1-4f90-9290-f25e27e7ca06")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "52dd99ae-8133-4ab9-a5b9-f14240010afa")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
+		(pad "1" thru_hole circle
+			(at 0 -5.9)
+			(size 2 2)
+			(drill 1.2)
+			(layers "*.Cu" "B.Mask")
 			(remove_unused_layers no)
-			(net 25 "key10")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "e7dfd3da-9db1-40f2-9b95-680b1e2333cc")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "861f3855-ee34-4b0c-949c-e289729d0f2e")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "39444437-837c-43de-8185-5cd91cc9354d")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "59065ab2-7073-40a7-bf4a-07528e18569c")
+			(uuid "44c0a010-4c09-4dd7-803a-14fe63d4c77f")
 		)
 		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
+			(at 2.54 -5.08)
+			(size 2.3 2.3)
+			(drill 1.524)
+			(layers "*.Cu" "B.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "18a84a18-e3d7-4d88-a5b1-51c760bf3f05")
+			(uuid "bca837f6-2959-4dfe-984b-ee938724544e")
 		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "4fd3d091-cdbe-4fb4-9d45-f25a386edac6")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
+		(pad "2" thru_hole circle
+			(at 5 -3.8)
+			(size 2 2)
+			(drill 1.2)
+			(layers "*.Cu" "B.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "22028930-5998-4a66-914f-8532edab9a5b")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "bc7c0b2f-30a9-42a3-b253-e03cb6db9125")
+			(uuid "2b3f8a88-f514-4a09-97b7-1af52c3adcf9")
 		)
 		(embedded_fonts no)
 	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
+	(footprint "PCM_marbastlib-choc:SW_choc_v1_HS_CPG135001S30_1u"
 		(layer "F.Cu")
-		(uuid "18505642-002c-4942-9550-456d2feb20e6")
-		(at 88 119)
-		(property "Reference" "SW8"
-			(at 0 -0.5 0)
-			(unlocked yes)
+		(uuid "1b7d4009-c73e-45a1-86a5-8be68e317f84")
+		(at 220.5 121.2)
+		(descr "Hotswap footprint for Kailh Choc style switches")
+		(property "Reference" "REF**"
+			(at 5 7.4 180)
 			(layer "F.SilkS")
-			(hide yes)
-			(uuid "d90c4ca7-ad87-4025-96a9-6fa4bd8e312b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "4974bae2-85a6-403b-9c66-d7161d2b3803")
+			(uuid "80ea42bc-46b4-43da-95bc-3f0c264f6ffd")
 			(effects
 				(font
 					(size 1 1)
@@ -624,75 +1563,623 @@
 				)
 			)
 		)
-		(property "Datasheet" "~"
+		(property "Value" "CPG135001S30"
+			(at 0 0 180)
+			(layer "F.Fab")
+			(uuid "b2ce9208-6e27-40d0-8064-60843eaca856")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Datasheet" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "87b82109-5355-4c5b-8cda-ebb28dfdce46")
+			(uuid "0fe76f63-fb6f-4eb2-9a85-24ef4344c4c5")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+		(property "Description" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "b96fb8dc-bfd0-4e1b-b00c-2d179f368e77")
+			(uuid "cc22fb2f-1870-4dd2-a885-ff90e1319fdb")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(path "/2fe645b4-f92d-49d8-abdd-ebc8bbf525fe")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
+		(attr smd)
+		(fp_line
+			(start -2.3 7.475)
+			(end -1.5 8.275)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "666eced1-7089-415c-a43b-33146e56e69a")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end -2.3 4.425)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "169eddc6-550e-4dea-b4e1-1e60b6c97cd2")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end -0.5 3.625)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "72ef98a4-2dd1-45ef-b2cc-9023d098a958")
+		)
+		(fp_line
+			(start -1.5 8.275)
+			(end -0.5 8.275)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "866ac5ce-4a02-44ae-9d07-df213251853e")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 6.504 1.475)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "a726ec79-7266-4073-a68a-fc994355252c")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 7.504 2.175)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "fbdaa979-2c0d-4da5-86cf-e886ac9cbdc3")
+		)
+		(fp_arc
+			(start 7.25 5.325)
+			(mid 7.015685 5.890685)
+			(end 6.45 6.125)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "4bd55afc-f137-46d0-93da-5b60aa08c8ba")
+		)
 		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+			(start -9 -8.5)
+			(end 9 8.5)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Dwgs.User")
+			(uuid "5e97a6c0-c859-4f47-97d4-7fdf6ea17ad2")
+		)
+		(fp_rect
+			(start -2.5 -6.275)
+			(end 2.5 -3.125)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Cmts.User")
+			(uuid "e5fdfe5b-40c9-464e-b13b-900f2b5eb789")
+		)
+		(fp_rect
+			(start -9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Eco1.User")
+			(uuid "9f3b8101-02c9-4836-8190-f88f28e65955")
+		)
+		(fp_line
+			(start -6.95 -6.45)
+			(end -6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "288af9cd-f7c4-421c-9629-f7a817cb5538")
+		)
+		(fp_line
+			(start -6.45 6.95)
+			(end 6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "40bbc672-9791-4b73-9b59-d85a778b21ac")
+		)
+		(fp_line
+			(start 6.45 -6.95)
+			(end -6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "b2b1277a-5f6a-479f-b61c-c7e522b558f2")
+		)
+		(fp_line
+			(start 6.95 6.45)
+			(end 6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "c13f76e9-f799-48c9-9dba-33f8d58a8576")
+		)
+		(fp_arc
+			(start -6.95 -6.45)
+			(mid -6.803553 -6.803553)
+			(end -6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "0efe6607-7acf-48b4-9281-8a0b27d07aba")
+		)
+		(fp_arc
+			(start -6.45 6.95)
+			(mid -6.803553 6.803553)
+			(end -6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "ad3ba034-4118-4fbd-b009-345adc084e8b")
+		)
+		(fp_arc
+			(start 6.45 -6.95)
+			(mid 6.803553 -6.803553)
+			(end 6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "b5892d26-85d1-4ce8-a8f2-71454258a0d7")
+		)
+		(fp_arc
+			(start 6.95 6.45)
+			(mid 6.803553 6.803553)
+			(end 6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "caa7a2fe-ebab-4c5d-afe2-6fe84daea419")
+		)
+		(fp_rect
+			(start -7 -7)
+			(end 7 7)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "d5624eaa-b30c-4d41-8f99-de90cccc5ad4")
+			(uuid "c73c6151-a53a-4e30-ae27-74c4899b57c0")
 		)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start -4.104 4.975)
+			(end -4.104 6.925)
 			(stroke
 				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "F.CrtYd")
-			(uuid "7a745cd7-e465-4742-b755-282052bb8665")
-		)
-		(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")
+			(layer "F.CrtYd")
+			(uuid "0e6fed04-48a0-4ad7-a0b3-b7fbbd70cc8c")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
+		(fp_line
+			(start -4.104 4.975)
+			(end -2.3 4.975)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f4b051ec-7fcf-49a7-b263-d0c5378589d9")
+		)
+		(fp_line
+			(start -4.104 6.925)
+			(end -2.3 6.925)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "a7c0db54-22a2-4739-9bf1-e01424cb8752")
+		)
+		(fp_line
+			(start -2.3 4.975)
+			(end -2.3 4.425)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "25789803-4aa7-4b8e-a8ad-2e07f6007570")
+		)
+		(fp_line
+			(start -2.3 7.475)
+			(end -2.3 6.925)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "ebf1b2e9-a4d3-46fc-8b38-beb276c8873d")
+		)
+		(fp_line
+			(start -2.3 7.475)
+			(end -1.5 8.275)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "149dafdf-8659-48be-84d6-484f4d457dfb")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end -2.3 4.425)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "ea5dfc87-a0e0-41dd-94c8-caeed1008727")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end 0.3 3.625)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "6d8d2937-059c-4260-9948-c2fec8b62cc4")
+		)
+		(fp_line
+			(start -1.5 8.275)
+			(end 1.65 8.275)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "fb3987f4-9b7c-46b7-ad25-26adfd85284c")
+		)
+		(fp_line
+			(start 2.45 7.475)
+			(end 1.65 8.275)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "8813e075-5ee4-4e94-be24-e727e067c8f6")
+		)
+		(fp_line
+			(start 2.45 7.475)
+			(end 2.45 7.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "fe8acc6e-7ba6-4998-8fb5-95c08b9756ed")
+		)
+		(fp_line
+			(start 3.45 6.125)
+			(end 6.45 6.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "4111ed66-fd95-4c87-bf52-00a52fe01c7d")
+		)
+		(fp_line
+			(start 7.25 4.725)
+			(end 9.104 4.725)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "e8d00612-68fc-40a8-88bd-f014824353f6")
+		)
+		(fp_line
+			(start 7.25 5.325)
+			(end 7.25 4.725)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "83c24685-1d08-4b62-9048-0ad8b31f7e21")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 3.4 1.475)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "95a6c423-b05f-4a1c-b973-3aa39801e2d8")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 7.504 2.175)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5042b0dc-7730-4143-bdb0-3711b0d546b8")
+		)
+		(fp_line
+			(start 7.504 2.175)
+			(end 7.504 2.775)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "1f234a87-d39c-4b23-9630-08a9653a50e4")
+		)
+		(fp_line
+			(start 9.104 2.775)
+			(end 7.504 2.775)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "741ae69c-b227-4946-acc2-6d74477d1fdc")
+		)
+		(fp_line
+			(start 9.104 4.725)
+			(end 9.104 2.775)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "01e312de-a02e-44e6-aa99-3e9f13eca0d3")
+		)
+		(fp_arc
+			(start 2.45 7.125)
+			(mid 2.742893 6.417893)
+			(end 3.45 6.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "d072b177-4511-4a5b-a20f-c3ea1a0919e3")
+		)
+		(fp_arc
+			(start 2.455444 2.13293)
+			(mid 1.577272 3.167235)
+			(end 0.299999 3.624999)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "228aa2f8-e838-49f9-88d6-190063cfc494")
+		)
+		(fp_arc
+			(start 2.460307 2.13298)
+			(mid 2.826423 1.655848)
+			(end 3.4 1.475)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "ec80f6c3-3297-4ef9-8ffa-936b09ca91f4")
+		)
+		(fp_arc
+			(start 7.25 5.325)
+			(mid 7.015685 5.890685)
+			(end 6.45 6.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "1cc5dfb9-73f0-4ebf-99be-55102b1ee229")
+		)
+		(fp_line
+			(start -2.304 7.5)
+			(end -2.304 4.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
 			(layer "F.Fab")
-			(uuid "b2845fb4-5f32-414b-8dc9-6e9a8c18038d")
+			(uuid "b9d9d8d2-9610-4a0c-9ba9-090a52473c25")
+		)
+		(fp_line
+			(start -2.304 7.5)
+			(end -1.504 8.3)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "4df1589c-cd6a-44bf-aa23-33001410cb2d")
+		)
+		(fp_line
+			(start -1.504 3.65)
+			(end -2.304 4.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "878a22b0-1f80-4bc8-b4a7-609c3d0e4c02")
+		)
+		(fp_line
+			(start -1.504 3.65)
+			(end 0.296 3.65)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "74261af8-c5f6-45cc-b4ee-2f375bdbb8e6")
+		)
+		(fp_line
+			(start -1.504 8.3)
+			(end 1.646 8.3)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "ccc8062c-817e-4e9d-ac6b-9ead58b0fe55")
+		)
+		(fp_line
+			(start 2.446 7.5)
+			(end 1.646 8.3)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "f9d4774e-a071-471f-a56e-b9af75216c18")
+		)
+		(fp_line
+			(start 2.446 7.5)
+			(end 2.446 7.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "507d1edc-9d8f-44fc-a542-d09d747f32ad")
+		)
+		(fp_line
+			(start 3.446 6.15)
+			(end 6.446 6.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "7afc29cb-0bf7-46a1-9875-871aa4e251ce")
+		)
+		(fp_line
+			(start 7.246 1.5)
+			(end 3.396 1.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "13dda373-796f-4f18-bd9d-aa31244655a5")
+		)
+		(fp_line
+			(start 7.246 5.35)
+			(end 7.246 1.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "bd5c4265-8d5d-4c42-aa2a-770dc2ba4dfd")
+		)
+		(fp_arc
+			(start 2.446 7.15)
+			(mid 2.738893 6.442893)
+			(end 3.446 6.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "25ba8f7f-7c80-457e-a6ff-3ead7651a123")
+		)
+		(fp_arc
+			(start 2.451444 2.15793)
+			(mid 1.573272 3.192235)
+			(end 0.295999 3.649999)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "3b81475d-2b43-4383-b0e2-b1f780a5a294")
+		)
+		(fp_arc
+			(start 2.456307 2.15798)
+			(mid 2.822423 1.680848)
+			(end 3.396 1.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "b8c48514-9403-4b41-8e50-b0a4795b3a8a")
+		)
+		(fp_arc
+			(start 7.246 5.35)
+			(mid 7.011685 5.915685)
+			(end 6.446 6.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "fdc28d7a-b081-4841-9940-eff28d8aa196")
+		)
+		(fp_text user "18x17 spacing"
+			(at 0 -7.6 180)
+			(layer "Dwgs.User")
+			(uuid "2f26a3c0-184b-4051-a084-ecee8b599777")
 			(effects
 				(font
 					(size 1 1)
@@ -700,385 +2187,127 @@
 				)
 			)
 		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "16f8c605-9651-44c6-811a-9548cd15c687")
+		(fp_text user "LED"
+			(at 0 -4.7 0)
+			(unlocked yes)
+			(layer "Cmts.User")
+			(uuid "0c38138f-55cd-4de6-9533-f07ae15d8b9c")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(fp_text user "19.05 spacing"
+			(at 0 -8.7 180)
+			(layer "Eco1.User")
+			(uuid "db30125e-27f1-4cf1-9893-8036ec590fb6")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(fp_text user "${REFERENCE}"
+			(at 2.496 5.025 0)
+			(layer "F.Fab")
+			(uuid "90f31968-9823-4298-b8cf-355f2fe139b2")
+			(effects
+				(font
+					(size 0.8 0.8)
+					(thickness 0.12)
+				)
+			)
 		)
 		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "30d3dfd9-7d66-4197-8c1d-4cb62296001d")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "000df38f-8abe-4843-a60d-b30024000b1f")
-		)
-		(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")
-		)
-		(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 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "a5205bd7-2c0e-4b74-b6fb-2867cb7b16ad")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
+			(at -5.5 0 180)
+			(size 1.7 1.7)
+			(drill 1.7)
 			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "29ad4230-749a-4c41-999d-22121d01a395")
+			(uuid "5a35c2cd-06dd-4b57-accf-2ace0ebd39c7")
 		)
-		(pad "1" smd roundrect
-			(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")
+		(pad "" np_thru_hole circle
+			(at 0 0 180)
+			(size 3.4 3.4)
+			(drill 3.4)
+			(layers "*.Cu" "*.Mask")
+			(uuid "cbefa594-ae2c-490f-b893-a22b4c0a6875")
 		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "1d1b006b-fb4e-4056-8935-376bc3dad38b")
+		(pad "" np_thru_hole circle
+			(at 5.5 0 180)
+			(size 1.7 1.7)
+			(drill 1.7)
+			(layers "*.Cu" "*.Mask")
+			(uuid "238b274b-fcf4-49eb-a2ba-2b610e51fde9")
 		)
 		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
+			(at 5 3.75)
+			(size 3.3 3.3)
 			(drill 3)
-			(layers "*.Cu" "*.Mask")
+			(property pad_prop_mechanical)
+			(layers "*.Cu" "F.Mask")
 			(remove_unused_layers no)
-			(net 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "9516d52f-1cd9-435b-9585-fd8b55caecee")
+			(uuid "86f77bce-d27d-484b-91ba-72055962ff37")
 		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
+		(pad "1" smd rect
+			(at 6.55 3.75)
+			(size 1.2 2.6)
+			(layers "F.Cu")
+			(uuid "94a27bda-6e22-4161-9c1d-3e8e325ea06a")
+		)
+		(pad "1" smd roundrect
+			(at 8.245 3.75)
+			(size 2.65 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "fe7d6482-00c5-449c-9d57-4af397d07ab9")
+			(roundrect_rratio 0.1)
+			(uuid "2749b974-0d35-4938-9a03-fb247430c17c")
 		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "79a6f716-1c1c-40ca-83f8-8a11755d35a8")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 4 "key8")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "940f4f8b-9ca2-43a8-b741-5b6d508219a6")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
+		(pad "2" smd roundrect
+			(at -3.245 5.95)
+			(size 2.65 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "e1c63852-b4fa-4488-acc7-ba5131ba00f5")
+			(roundrect_rratio 0.1)
+			(uuid "666250c8-23b6-41ac-9834-333313164505")
 		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "4085b0c2-4f76-40bd-a1d9-48febd7728d8")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "0a7d78dd-1cb0-45e5-837c-9551b85b2f20")
+		(pad "2" smd rect
+			(at -1.55 5.95 180)
+			(size 1.2 2.6)
+			(layers "F.Cu")
+			(uuid "f4a75aad-d531-47b5-b9ec-6e6e2c74e448")
 		)
 		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
+			(at 0 5.95)
+			(size 3.3 3.3)
 			(drill 3)
-			(layers "*.Cu" "*.Mask")
+			(property pad_prop_mechanical)
+			(layers "*.Cu" "F.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "065f00a8-d478-4eb9-9237-47db115646b0")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "169af77f-c8b5-43ec-b296-54ed782d3a46")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "fbeda46a-b2d9-4197-ad82-3b44469ad0f7")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "ccab91e1-5849-4678-ae96-3d2a37afff14")
+			(uuid "f6828e4e-6a90-470c-97bd-5ae57e58e923")
 		)
 		(embedded_fonts no)
+		(model "${KICAD8_3RD_PARTY}/3dmodels/com_github_ebastler_marbastlib/HS_CPG135001S30_Choc.step"
+			(offset
+				(xyz -5 -3.75 0.12)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 90 0 180)
+			)
+		)
 	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
+	(footprint "PCM_marbastlib-mx:SW_MX_HS_CPG151101S11_1u"
 		(layer "F.Cu")
-		(uuid "1b8106c2-50a1-43a4-ba3a-597e0112b4d8")
-		(at 69 128.5)
-		(property "Reference" "SW5"
-			(at 0 -0.5 0)
-			(unlocked yes)
+		(uuid "2bd28ad5-3191-4524-becb-fb91abe1e4a5")
+		(at 220.5 96.2)
+		(descr "Footprint for Cherry MX style switches with Kailh hotswap socket")
+		(property "Reference" "REF**"
+			(at -4.25 -1.75 0)
 			(layer "F.SilkS")
-			(hide yes)
-			(uuid "080bc680-267e-44a4-91e2-052978c9d5a7")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "3ef12d1f-262a-4ac6-ab1f-4242ee916e90")
+			(uuid "27a83811-74b6-4bb0-ba54-fd9796259eb6")
 			(effects
 				(font
 					(size 1 1)
@@ -1086,12 +2315,10 @@
 				)
 			)
 		)
-		(property "Datasheet" "~"
+		(property "Value" "CPG151101S11"
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
-			(hide yes)
-			(uuid "d6427ddd-e6cf-417e-b040-4e6f5dd06baf")
+			(uuid "b81e6048-cc12-42ff-a895-87bfb2c5ed39")
 			(effects
 				(font
 					(size 1 1)
@@ -1099,1822 +2326,564 @@
 				)
 			)
 		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+		(property "Datasheet" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "c4ecff1d-f3b7-45df-b597-f94fcaeeff88")
+			(uuid "15b36330-930d-4498-aae7-43336e4fed49")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(path "/a206fdcd-54ff-4dcc-8db2-e213dbb4b523")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
+		(property "Description" ""
+			(at 0 0 0)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "e5702890-032e-4ac6-9854-e93621933a48")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(attr smd)
+		(fp_line
+			(start -4.864824 -6.75022)
+			(end -4.864824 -6.52022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "0b2ad0db-fdde-4492-8f3c-2d8276a97a96")
+		)
+		(fp_line
+			(start -4.864824 -3.67022)
+			(end -4.864824 -3.20022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "459594d7-8a4a-4df8-b804-ff975cd2cd5d")
+		)
+		(fp_line
+			(start -4.364824 -2.70022)
+			(end 0.2 -2.70022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "820ed680-080a-4387-8ad3-2696306ea280")
+		)
+		(fp_line
+			(start -3.314824 -6.75022)
+			(end -4.864824 -6.75022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "4cdd600d-329c-48f0-9b50-92213c48b023")
+		)
+		(fp_line
+			(start 4.085176 -6.75022)
+			(end -1.814824 -6.75022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "abac3913-546d-44c7-bdc0-ea7fa7951187")
+		)
+		(fp_line
+			(start 6.085176 -3.95022)
+			(end 6.085176 -4.75022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "b0fd2365-58b7-4ad1-a31a-ead24a414bbf")
+		)
+		(fp_line
+			(start 6.085176 -1.10022)
+			(end 6.085176 -0.86022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "861c4a5f-1161-47a4-9796-30b06f9693c2")
+		)
+		(fp_arc
+			(start -4.364824 -2.70022)
+			(mid -4.718377 -2.846667)
+			(end -4.864824 -3.20022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "7bab6798-2ea5-4367-a3fc-0ee7b15d98f1")
+		)
+		(fp_arc
+			(start 0.2 -2.70022)
+			(mid 1.670693 -2.183637)
+			(end 2.494322 -0.86022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "cee481d8-b157-4111-af5e-085121a2ce70")
+		)
+		(fp_arc
+			(start 4.085176 -6.75022)
+			(mid 5.49939 -6.164434)
+			(end 6.085176 -4.75022)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "ec943c61-0b2a-4d51-8e09-c2ad2ca34a2a")
+		)
 		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+			(start -9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Dwgs.User")
+			(uuid "8b646abe-9efc-4888-9d4c-fdacefad8502")
+		)
+		(fp_line
+			(start -7 -6.5)
+			(end -7 6.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "5ae96622-b9c3-4322-bbf1-df28c4c0dc7d")
+		)
+		(fp_line
+			(start -6.5 7)
+			(end 6.5 7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "e3551473-7f79-45d3-8db2-43c16ededceb")
+		)
+		(fp_line
+			(start 6.5 -7)
+			(end -6.5 -7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "0635e739-8b77-487c-9b0f-b4eb78f6baea")
+		)
+		(fp_line
+			(start 7 6.5)
+			(end 7 -6.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "e07c548d-7c88-4fa3-9275-8597cb6ab318")
+		)
+		(fp_arc
+			(start -7 -6.5)
+			(mid -6.853553 -6.853553)
+			(end -6.5 -7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "cdc71a72-1190-4fd8-9dad-23401fe223f5")
+		)
+		(fp_arc
+			(start -6.497236 6.998884)
+			(mid -6.850789 6.852437)
+			(end -6.997236 6.498884)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "bdfea855-0373-4cb5-ba7f-546cb09d6ac2")
+		)
+		(fp_arc
+			(start 6.5 -7)
+			(mid 6.853553 -6.853553)
+			(end 7 -6.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "1e728be2-efb6-4e9c-a817-2203f2c9c4cb")
+		)
+		(fp_arc
+			(start 7 6.5)
+			(mid 6.853553 6.853553)
+			(end 6.5 7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "e51a9ece-7dc3-4352-b8d7-4ab7cb07e40a")
+		)
+		(fp_rect
+			(start -7 -7)
+			(end 7 7)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "b74c7fda-a29a-4b86-9ce9-0def0e03df61")
+			(uuid "4f3b48c0-5ce1-4a06-a66b-400f829739ba")
 		)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start -7.414824 -6.32022)
+			(end -4.864824 -6.32022)
 			(stroke
 				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "F.CrtYd")
-			(uuid "0cba5228-194c-4778-93d4-fda3b3658f9d")
-		)
-		(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")
+			(layer "F.CrtYd")
+			(uuid "270ad58d-d600-4761-8694-f2d21b72a33e")
+		)
+		(fp_line
+			(start -7.414824 -3.87022)
+			(end -7.414824 -6.32022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "7013dc65-2bbd-4cb3-b847-6efef5639c20")
+		)
+		(fp_line
+			(start -4.864824 -6.75022)
+			(end -4.864824 -6.32022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "7baec3c9-9d80-4581-a3ff-c4687faa4504")
+		)
+		(fp_line
+			(start -4.864824 -3.87022)
+			(end -7.414824 -3.87022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5823565f-0cf3-4761-ae72-f2e1bdfc127c")
+		)
+		(fp_line
+			(start -4.864824 -3.87022)
+			(end -4.864824 -2.70022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f227d6be-84ea-41aa-8d84-de2008eacc6a")
+		)
+		(fp_line
+			(start -4.864824 -2.70022)
+			(end 0.2 -2.70022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "754beb0c-c0db-44bd-baba-75d2c640bfbd")
+		)
+		(fp_line
+			(start 4.085176 -6.75022)
+			(end -4.864824 -6.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "4b90ccc2-b9ae-4a9b-98d1-f0b9f9918053")
+		)
+		(fp_line
+			(start 6.085176 -3.75022)
+			(end 6.085176 -4.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "e707ceb2-159a-4a11-ba1c-3de70e16f6e0")
+		)
+		(fp_line
+			(start 6.085176 -3.75022)
+			(end 8.685176 -3.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "a7ebabd9-3fbf-48b1-9423-7991bf4f54ae")
+		)
+		(fp_line
+			(start 6.085176 -1.30022)
+			(end 6.085176 -0.86022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "410c6f0e-06bf-4da4-aa1c-f536083e4007")
+		)
+		(fp_line
+			(start 6.085176 -0.86022)
+			(end 2.494322 -0.86022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "86541f23-d947-4521-82af-d3c2d19ad0a6")
+		)
+		(fp_line
+			(start 8.685176 -3.75022)
+			(end 8.685176 -1.30022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "14edc2d2-703e-4eb2-bf14-b57361ffc30b")
+		)
+		(fp_line
+			(start 8.685176 -1.30022)
+			(end 6.085176 -1.30022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5cb89901-9754-41b7-a5f2-321ac0934654")
+		)
+		(fp_arc
+			(start 0.2 -2.70022)
+			(mid 1.670503 -2.183399)
+			(end 2.494322 -0.86022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "a1c4720f-8131-44ef-873b-5d58747e054e")
+		)
+		(fp_arc
+			(start 4.085176 -6.75022)
+			(mid 5.49939 -6.164434)
+			(end 6.085176 -4.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "3b89ad29-3bfc-4a45-8e91-eee780e60996")
+		)
+		(fp_line
+			(start -4.864824 -6.75022)
+			(end -4.864824 -2.70022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "ba5d3847-8b78-4322-8a12-999db7336488")
+		)
+		(fp_line
+			(start -4.864824 -2.70022)
+			(end 0.2 -2.70022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "68d77f03-0746-4e60-b508-e52630cc2b91")
+		)
+		(fp_line
+			(start 4.085176 -6.75022)
+			(end -4.864824 -6.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "2cc7186d-7077-45da-a8b7-ed33676cd6ad")
+		)
+		(fp_line
+			(start 6.085176 -0.86022)
+			(end 2.494322 -0.86022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "b6a81217-5de4-4e83-b94d-b2c47bed375d")
+		)
+		(fp_line
+			(start 6.085176 -0.86022)
+			(end 6.085176 -4.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "7d3b8541-a4b4-4b00-8a54-f9c410cc891c")
+		)
+		(fp_arc
+			(start 0.2 -2.70022)
+			(mid 1.670503 -2.183399)
+			(end 2.494322 -0.86022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "cc80fb92-43ae-4fb5-b153-c20b8cf0704c")
+		)
+		(fp_arc
+			(start 4.085176 -6.75022)
+			(mid 5.49939 -6.164434)
+			(end 6.085176 -4.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "20e920cd-c492-4437-8445-b22dd182a9f6")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
+			(at 0.5 -4.5 0)
 			(layer "F.Fab")
-			(uuid "ea581c46-7b7d-426d-a536-9c7c330e315f")
+			(uuid "45616dee-5e35-4c40-87d5-f91a487a8569")
 			(effects
 				(font
-					(size 1 1)
-					(thickness 0.15)
+					(size 0.8 0.8)
+					(thickness 0.12)
 				)
 			)
 		)
 		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "87632838-ecec-459d-9f0c-b702371b650d")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 -5.08 270)
+			(at -5.08 0)
 			(size 1.75 1.75)
 			(drill 1.75)
-			(layers "*.Mask")
-			(uuid "7bcc5545-b14d-475b-bc16-ad5980c33594")
+			(layers "*.Cu" "*.Mask")
+			(uuid "37cca8c7-939c-4538-8a16-fb10c31776f5")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "86cac982-084b-48bb-b612-148f7f8b7459")
+			(size 3.9878 3.9878)
+			(drill 3.9878)
+			(layers "*.Cu" "*.Mask")
+			(uuid "8fb12a09-493a-447a-ace1-730b81f2f217")
 		)
 		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "6bee09ec-ed46-49fd-9c03-5a3f4556bbb1")
-		)
-		(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")
-		)
-		(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 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "2e145538-3f3e-47fa-909f-c0dc92708f02")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "f8034db7-420e-47f9-b2b8-c6822a03b775")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "ee2e5715-57d1-4f12-ac9f-98caa63646a8")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "ae307698-7b42-4332-82d6-ef1efbafc5f4")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "dfba2c6b-d592-4002-b458-665e28a2240e")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "77e45cad-190b-4d83-ac28-925d8b29d80a")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 6 "key5")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "796fb972-5566-48a6-ad79-9bc91f2f6c1c")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "e1a800ff-a350-4940-bbc7-2a6da908bf18")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "9f1c95c5-3e9c-48d2-b2eb-76a82c535128")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "5fcbae94-44a9-4c46-8d9f-d38a4f9c1d0c")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "5d74e3ef-4e9f-4cc0-b8d9-c9e4af89e5de")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "c654b4fe-f033-4002-99b2-be402fcb13b6")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "28c96948-1dbd-419c-8d3a-ec642492a412")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "5abaa101-28ed-4732-8141-25e2c3ecc4d3")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "370dc111-ac8f-4ffb-98e7-9c76ebbc071f")
-		(at 88 81)
-		(property "Reference" "SW6"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "0ffab622-1d69-43a2-8b7d-3baea26b0647")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "b7157dda-42fc-480c-86c1-588812349908")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "547f4223-59b5-4b92-a68c-235c7b844263")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "e4ca2e66-a1c7-47f4-becd-88a6a22a0125")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/71593c22-9c71-498f-8264-c3e21440f9eb")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "c5d98846-711f-4c4a-a03a-e6e5b0b9d122")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "8d8c40e7-069e-43e3-94c7-feed62d2f4ca")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 -5.08 270)
+			(at 5.08 0)
 			(size 1.75 1.75)
 			(drill 1.75)
-			(layers "*.Mask")
-			(uuid "3c172af6-cbf2-4234-b618-594b8d4ae86e")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "75564338-95b3-4b3a-a782-bd58d100501a")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "54425072-780a-416d-afed-1a8cf07296c5")
-		)
-		(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")
-		)
-		(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 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "b7c9716b-2085-4919-875c-c890fb4871ff")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "1a90aca0-c14c-4f0a-b376-44a85014bfe3")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "cd147221-a2de-437b-bb91-c50744dea377")
+			(uuid "a12a6c06-afcb-4e22-b78d-500deb9f242a")
 		)
 		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
+			(at 3.81 -2.54)
+			(size 3.3 3.3)
 			(drill 3)
+			(property pad_prop_mechanical)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "d8f909ea-41f0-4398-8aed-be8707555cd0")
+			(uuid "d72ed21c-5fe4-4e8c-b70d-c40eebc38b70")
 		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
+		(pad "1" smd rect
+			(at 5.635 -2.54 180)
+			(size 1.65 2.5)
+			(layers "F.Cu")
+			(uuid "aa893b38-2463-4eee-97ab-371447ed0042")
+		)
+		(pad "1" smd roundrect
+			(at 7.36 -2.54)
+			(size 2.55 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "4f4c663c-b0fc-4fb7-bec1-4ac0b03a3658")
+			(roundrect_rratio 0.1)
+			(uuid "63011bcf-b9e3-4a91-85f1-3d02fa821fda")
 		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "4c4216f4-26ae-4edd-9497-f9c86c37e1a6")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 9 "key6")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "0b230f86-7d7d-4add-826e-4924d2b88894")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
+		(pad "2" smd roundrect
+			(at -6.09 -5.08)
+			(size 2.55 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "f96d4691-c575-4b02-a7dd-73703e4eb29d")
+			(roundrect_rratio 0.1)
+			(uuid "fea03ec5-78ab-438e-a721-1e3b8a2091e6")
 		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "a93ac468-d3b0-48ce-9ffb-4d8ab84a70ee")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "28c6c3d7-b8e4-4be2-b8e4-23ab72286ec2")
+		(pad "2" smd rect
+			(at -4.34 -5.08)
+			(size 1.65 2.5)
+			(layers "F.Cu")
+			(uuid "489e54c4-1f9a-4d3c-9deb-67863aeef100")
 		)
 		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
+			(at -2.54 -5.08)
+			(size 3.3 3.3)
 			(drill 3)
+			(property pad_prop_mechanical)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "104707ad-97f4-4989-8edd-090ad77a5db9")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "026f320c-4795-4c59-82c2-d9a77ef208e5")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "3855ce23-0811-4419-b5b0-84e9a7c5d4c3")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "fd422046-0bd8-4907-a090-0b8674bd34e1")
+			(uuid "2d4df77a-5cf1-4d93-890d-9d6c74ee3567")
 		)
 		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "38e652bc-0056-4c83-965a-ee8d3698cf89")
-		(at 145 119)
-		(property "Reference" "SW17"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "16e4d2fa-45e0-4153-977a-421312f6de8b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
+		(model "${KICAD8_3RD_PARTY}/3dmodels/com_github_ebastler_marbastlib/HS_CPG151101S11_MX.step"
+			(offset
+				(xyz -4.82 6.74 1.82)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 180 0 0)
 			)
 		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "19faf83f-31ec-448f-aa6d-9695d85c659e")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "76793aef-e3c8-4fdd-b7e6-c5ac9b216074")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "66aaf8ae-1307-4949-84a7-33ce65d9a297")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/a1c19ee4-ccd2-4131-97c0-a5d37db3a297")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "e491c2c0-6301-4e8b-9316-2af6bf0e108b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "9701d0be-9737-419f-8755-2fbacc182273")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "1d621ffd-060b-476f-8b32-9c8fe7a13c69")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "5f087d0d-439c-4ffb-9133-1aac37d13db9")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "28203157-7f0c-4795-8e98-f828c4501e83")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 23 "key17")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "738e64c6-14ac-4257-90af-88e86f21f080")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 23 "key17")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "1a9c3521-6bc8-428d-92e5-b715ea974955")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "key17")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "e01df966-a930-43ef-b1ef-91a245a742d4")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 23 "key17")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "fa131fb8-f5cc-48f8-9af0-e4721b76acc6")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "key17")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "7ab7daf4-2b6b-44a2-a4db-8582fcb284c1")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "d5d1e414-210c-42e9-905f-cf4f7dab6fb7")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 23 "key17")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "41eb20aa-3085-44f5-883f-83f6064fb8b1")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "0c40b5fb-195b-41d7-b8f8-da62e3d22bc7")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "ae6e46c4-7cad-4e2b-a9c0-218d0c20d136")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "2093fe53-f61a-4cfb-be30-2f359eed22af")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "71c572ec-40f7-4eb0-8b29-8cd31c89df56")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "b15a8523-818c-4836-8aff-aeca1144b06a")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "b783f4b8-18dc-42f8-9b69-10a07556c187")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "4e57ef16-d339-4d0e-bf1f-000e427fac16")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "3955f6b0-4d89-4afe-8a69-5c5f07307ba8")
-		(at 69 109.5)
-		(property "Reference" "SW4"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "5ca07ee6-da80-47bd-a315-f76d4b3c1f68")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "88a3e531-2e43-4a2a-9e65-febb5d3ffbe7")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "920a1d49-1448-4d28-bd30-b4dd53c20c6d")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "9aef6ec3-6d3b-4e88-83f0-4ca52c016cfc")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/d22f8a47-d1cf-47e8-9c9f-02de0c1cc10d")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "17aef48d-b543-4eed-8608-3bb01fbd26b1")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "53cfd593-c1de-4890-9465-e04b77ea0364")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "4ac06a84-f4e9-4c44-a90f-0d7f91745169")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "d076d40f-dd6d-431e-a90f-d540955dc448")
-		)
-		(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")
-		)
-		(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 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "3a3d0a41-0115-410f-99c4-62a3c11cac43")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "3fb2d182-5b7f-4b1e-ab63-cb9190aa0efc")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "516ce8c8-21ef-4231-913c-241a2cb6967d")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "84a747c8-f0db-42d2-a91d-d093de6586aa")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "ae9e1d6b-9359-4a66-841e-805c74e7ab61")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "72f74ed1-b502-4937-8c85-420081085763")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 7 "key4")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "26f486a9-8259-485c-a757-d8fa50b2bc7f")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "0f7c3563-e835-45e8-a2b5-f4ab6d6c46b9")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "a592148a-0939-4920-ae58-5bddb0b4d208")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "905fae56-1a31-42f8-b9f0-bc579e362946")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "b6d44fa7-b026-42c4-99a7-e5fdb5dc7d10")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "789700f6-931e-49ca-a596-535825713bd4")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "f0c3a86f-7941-47a3-8de5-be44c67cfe1b")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "8c742f4b-ebb3-48bb-9cbe-a88bf8d1d79e")
-		)
-		(embedded_fonts no)
 	)
 	(footprint "phiboard:THD_0510-30CL-GF"
 		(layer "F.Cu")
-		(uuid "4d4f6e05-9cdb-414b-a02a-b9ca80c6cd3c")
-		(at 85.75 67 180)
+		(uuid "386a9131-f66d-4a52-9cb4-e5fdab63a430")
+		(at 110.8 18.1 180)
 		(descr "FFC FPC 1x30")
 		(property "Reference" "J1"
 			(at 0 -0.1 180)
 			(unlocked yes)
 			(layer "F.SilkS")
 			(hide yes)
-			(uuid "6312adbf-3643-43f8-93c6-51da7b32fd48")
+			(uuid "04f13016-0d5a-4e25-95e2-847243a2f60d")
 			(effects
 				(font
 					(size 1 1)
@@ -2927,7 +2896,7 @@
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "5a98b399-ff58-42bc-a081-7f4175b2f274")
+			(uuid "a2ce0b73-d090-461a-97e4-f0727e81847d")
 			(effects
 				(font
 					(size 1 1)
@@ -2940,7 +2909,7 @@
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "172e3747-e2ad-41d4-820b-4693325ef67d")
+			(uuid "8355f5b4-55b4-4b96-8e30-3f367370dfad")
 			(effects
 				(font
 					(size 1 1)
@@ -2953,7 +2922,7 @@
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "84d8bd14-fc98-4388-8b96-40a80d674989")
+			(uuid "6acc7db8-56fa-4c58-b5d9-a43924920eb1")
 			(effects
 				(font
 					(size 1 1)
@@ -2966,7 +2935,7 @@
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "ee8adee5-5c9f-4218-83a9-a13445590541")
+			(uuid "9f868c6e-b969-432b-9d4d-28ae69b6e5ff")
 			(effects
 				(font
 					(size 1 1)
@@ -2990,7 +2959,7 @@
 			)
 			(fill no)
 			(layer "F.CrtYd")
-			(uuid "037d1a85-ecb6-4a5a-8037-c653455b1c22")
+			(uuid "997c5671-e7ee-4c6d-bbba-a55639b86dae")
 		)
 		(fp_line
 			(start 8.4 -1.9)
@@ -3000,7 +2969,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "0546ba45-a09f-4dbb-9ce2-d867e5d9ae7b")
+			(uuid "22ba30ba-4b56-46a5-932b-c8c1d43ef4c7")
 		)
 		(fp_line
 			(start 7.8 1.4)
@@ -3010,7 +2979,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "6054917b-8075-4941-99da-de17ce530fe6")
+			(uuid "c67c0d6e-001b-43f2-8391-8bf9c4168e40")
 		)
 		(fp_line
 			(start 7.8 -0.4)
@@ -3020,7 +2989,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "04d40312-dea0-45b9-915a-92a3fca4d27f")
+			(uuid "1e7f7ae8-4b57-4bbc-8c69-e6b77391b8ed")
 		)
 		(fp_line
 			(start -7.8 1.4)
@@ -3030,7 +2999,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "c2c96255-a5ee-4680-ae4d-e1439ce8be4a")
+			(uuid "b9927e97-4991-4d13-baaf-bffc651a9afc")
 		)
 		(fp_line
 			(start -8.4 -0.1)
@@ -3040,7 +3009,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "1e6e9831-f529-4564-9075-56855f83396e")
+			(uuid "47232470-d9fa-410a-b2c7-efc6f3c391a2")
 		)
 		(fp_line
 			(start -8.4 -1.215)
@@ -3050,7 +3019,7 @@
 				(type solid)
 			)
 			(layer "User.1")
-			(uuid "fefb765a-271a-429c-94fe-b86f8a1ab78e")
+			(uuid "9587b991-4039-42bd-aef7-0bc20f348f70")
 		)
 		(fp_line
 			(start -8.4 -1.9)
@@ -3060,13 +3029,13 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "e12608f5-53d0-4a70-8273-58f87b65e56d")
+			(uuid "5ac68321-bff5-48ff-ae78-a19c509fa393")
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 180)
 			(unlocked yes)
 			(layer "F.Fab")
-			(uuid "ed124f6d-fb15-4a55-9102-0f0994fe4984")
+			(uuid "10c3ca01-7839-4661-80d1-e217e21cb7ff")
 			(effects
 				(font
 					(size 1 1)
@@ -3079,346 +3048,333 @@
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 1 "GND")
+			(net 2 "GND")
 			(pinfunction "Pin_1")
 			(pintype "passive")
-			(uuid "c37ef55d-77df-49cf-be7b-0a43a395308c")
+			(uuid "1db4dc8b-2991-4293-90b7-6a44516de11a")
 		)
 		(pad "2" smd roundrect
 			(at -6.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 25 "+1V8")
 			(pinfunction "Pin_2")
 			(pintype "passive")
-			(uuid "50a19acf-4fa0-4aac-9ee8-cf7ddc9ca511")
+			(uuid "d82f580b-2aca-4381-b317-59b4e2ed150e")
 		)
 		(pad "3" smd roundrect
 			(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 16 "+3V3")
 			(pinfunction "Pin_3")
 			(pintype "passive")
-			(uuid "ce31457c-e6f5-4e7b-8d8d-6c5749521d53")
+			(uuid "a1b1e053-2c68-47a5-a8ad-b9a72d63f86c")
 		)
 		(pad "4" smd roundrect
 			(at -5.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 14 "key22")
+			(net 23 "key1")
 			(pinfunction "Pin_4")
 			(pintype "passive")
-			(uuid "349aaea0-a5af-4176-a43e-c672c8a82160")
+			(uuid "cafaa91d-5ca3-4370-8ec8-94158ba2ac10")
 		)
 		(pad "5" smd roundrect
 			(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 14 "key2")
 			(pinfunction "Pin_5")
 			(pintype "passive")
-			(uuid "29f8a79c-3ddd-45ff-ba4e-e5c5242d4811")
+			(uuid "89abcdfb-9357-4460-a33d-3f28cc620079")
 		)
 		(pad "6" smd roundrect
 			(at -4.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 19 "key20")
+			(net 28 "key3")
 			(pinfunction "Pin_6")
 			(pintype "passive")
-			(uuid "6de2feb6-0d30-4dfb-8ef9-153c535a8799")
+			(uuid "e7270e65-5833-450f-a77b-a2bd200dea32")
 		)
 		(pad "7" smd roundrect
 			(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 20 "key4")
 			(pinfunction "Pin_7")
 			(pintype "passive")
-			(uuid "f6de5f61-02ff-4ab3-99c1-d6e775e76e37")
+			(uuid "c43a3fb8-2674-499c-9de0-d8dfbb5925ce")
 		)
 		(pad "8" smd roundrect
 			(at -3.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 24 "key18")
+			(net 15 "key5")
 			(pinfunction "Pin_8")
 			(pintype "passive")
-			(uuid "99f9d54e-0a5f-4bb8-8ab2-25e7026284cf")
+			(uuid "8f965b26-2b8b-4166-aa47-e4343310944e")
 		)
 		(pad "9" smd roundrect
 			(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 26 "key6")
 			(pinfunction "Pin_9")
 			(pintype "passive")
-			(uuid "8bd3c1b4-c9aa-49ac-84aa-552c8d71ae0b")
+			(uuid "dccfc796-1815-4f0b-8b15-6baf116c41fd")
 		)
 		(pad "10" smd roundrect
 			(at -2.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 16 "key16")
+			(net 4 "key7")
 			(pinfunction "Pin_10")
 			(pintype "passive")
-			(uuid "440a3ae2-7132-4b90-ace4-301e8bed84d3")
+			(uuid "31df7407-2a2f-4302-9652-4a13c0ba92a3")
 		)
 		(pad "11" smd roundrect
 			(at -2.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 12 "key15")
+			(net 9 "key8")
 			(pinfunction "Pin_11")
 			(pintype "passive")
-			(uuid "1a7e8194-dc9e-438b-a5f3-4272b1f4c34d")
+			(uuid "69ce095c-6b96-450f-8010-333bd70dbcc3")
 		)
 		(pad "12" smd roundrect
 			(at -1.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 18 "key14")
+			(net 7 "key9")
 			(pinfunction "Pin_12")
 			(pintype "passive")
-			(uuid "5f0035c8-b4c3-4056-b0db-cb0bea08882d")
+			(uuid "5aabb174-5b30-4d9d-a9e9-a83168814ced")
 		)
 		(pad "13" smd roundrect
 			(at -1.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 15 "key13")
+			(net 3 "key10")
 			(pinfunction "Pin_13")
 			(pintype "passive")
-			(uuid "43e02490-1bc5-4d76-af4d-09761a3598f3")
+			(uuid "2b4d4346-ce42-4cbf-bac2-4717ca452b40")
 		)
 		(pad "14" smd roundrect
 			(at -0.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 28 "key12")
+			(net 13 "key11")
 			(pinfunction "Pin_14")
 			(pintype "passive")
-			(uuid "e0d31942-386e-4333-bb39-ca4dab7fd242")
+			(uuid "897651e7-4b00-4578-af57-3021b96f3b71")
 		)
 		(pad "15" smd roundrect
 			(at -0.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 27 "key11")
+			(net 22 "key12")
 			(pinfunction "Pin_15")
 			(pintype "passive")
-			(uuid "de0d6a53-e59c-47ba-b979-7bc06c4a36c4")
+			(uuid "c9d21ad6-aa5d-4cea-8c40-64826813b6fe")
 		)
 		(pad "16" smd roundrect
 			(at 0.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 20 "unconnected-(J1-Pin_16-Pad16)")
+			(net 5 "unconnected-(J1-Pin_16-Pad16)")
 			(pinfunction "Pin_16")
 			(pintype "passive+no_connect")
-			(uuid "70309db7-f3bd-47b7-bc62-c336f58df8f3")
+			(uuid "40012daf-dd76-4477-a49f-280943d71326")
 		)
 		(pad "17" smd roundrect
 			(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 21 "key14")
 			(pinfunction "Pin_17")
 			(pintype "passive")
-			(uuid "a5a4ef83-0620-4a8a-a708-bcb0da081872")
+			(uuid "c4a4d8a5-6b0d-4988-8231-e25f96e33b85")
 		)
 		(pad "18" smd roundrect
 			(at 1.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 3 "key9")
+			(net 11 "key15")
 			(pinfunction "Pin_18")
 			(pintype "passive")
-			(uuid "889eaee9-133f-4f50-a353-bcad0d0ca7fe")
+			(uuid "72468949-9014-4dd5-a9c7-ee78866756c2")
 		)
 		(pad "19" smd roundrect
 			(at 1.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 4 "key8")
+			(net 6 "key16")
 			(pinfunction "Pin_19")
 			(pintype "passive")
-			(uuid "27270b4b-559c-4e38-821e-63b851ac668b")
+			(uuid "5681926f-eba6-479d-99ed-9f69bc7ee8ae")
 		)
 		(pad "20" smd roundrect
 			(at 2.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 2 "key7")
+			(net 27 "key17")
 			(pinfunction "Pin_20")
 			(pintype "passive")
-			(uuid "b6210b70-049a-4924-9a39-1ff9536bb1a4")
+			(uuid "e6316f71-6f04-413d-a2cb-6bb1cb28c309")
 		)
 		(pad "21" smd roundrect
 			(at 2.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 9 "key6")
+			(net 10 "key18")
 			(pinfunction "Pin_21")
 			(pintype "passive")
-			(uuid "04a9a1d6-223d-4635-9c6d-4fe182c003bd")
+			(uuid "6cc88fe0-0932-4491-926c-1671cc2d0d79")
 		)
 		(pad "22" smd roundrect
 			(at 3.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 6 "key5")
+			(net 8 "key19")
 			(pinfunction "Pin_22")
 			(pintype "passive")
-			(uuid "30b06604-eba9-4fe1-8485-c88eb29f6375")
+			(uuid "6061091e-98e6-47ff-b260-eee9330775f0")
 		)
 		(pad "23" smd roundrect
 			(at 3.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 7 "key4")
+			(net 24 "key20")
 			(pinfunction "Pin_23")
 			(pintype "passive")
-			(uuid "a8f5c40d-63fd-4884-9003-8da1f404cc5c")
+			(uuid "cb596769-e8ec-497d-9f28-8c233321ae58")
 		)
 		(pad "24" smd roundrect
 			(at 4.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 10 "key3")
+			(net 1 "key21")
 			(pinfunction "Pin_24")
 			(pintype "passive")
-			(uuid "ca9bd288-2437-473d-ba8f-4662d564dcac")
+			(uuid "0236ef8e-1a3f-4966-a01a-8f9747e88e00")
 		)
 		(pad "25" smd roundrect
 			(at 4.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 5 "key2")
+			(net 12 "key22")
 			(pinfunction "Pin_25")
 			(pintype "passive")
-			(uuid "b06ec2ca-14a6-4a1c-9060-1fb273018710")
+			(uuid "731d15b1-f918-42fb-8ac6-4939d697aa41")
 		)
 		(pad "26" smd roundrect
 			(at 5.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 8 "key1")
+			(net 17 "key23")
 			(pinfunction "Pin_26")
 			(pintype "passive")
-			(uuid "a46bb13b-b222-4fb2-a04d-e81825535347")
+			(uuid "a23665e8-94df-400b-bc99-0106f4363771")
 		)
 		(pad "27" smd roundrect
 			(at 5.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 26 "unconnected-(J1-Pin_27-Pad27)")
+			(net 29 "unconnected-(J1-Pin_27-Pad27)")
 			(pinfunction "Pin_27")
 			(pintype "passive+no_connect")
-			(uuid "d63f2cfe-ddc1-42fa-a5a7-d4def27301b0")
+			(uuid "f15b0e29-a3d9-4aa3-bfc8-36095bc8639e")
 		)
 		(pad "28" smd roundrect
 			(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 16 "+3V3")
 			(pinfunction "Pin_28")
 			(pintype "passive")
-			(uuid "52992ed0-c1c6-450b-8686-85bbb921a012")
+			(uuid "cc987f6f-f2c5-4feb-ac7e-6d6be81acead")
 		)
 		(pad "29" smd roundrect
 			(at 6.75 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 25 "+1V8")
 			(pinfunction "Pin_29")
 			(pintype "passive")
-			(uuid "04729b0c-9776-4cbc-9441-1a9c70bb5c0a")
+			(uuid "e83b63f0-5cc0-430d-8cf5-7e71ddd8d4d3")
 		)
 		(pad "30" smd roundrect
 			(at 7.25 -2.3 180)
 			(size 0.3 0.65)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 1 "GND")
+			(net 2 "GND")
 			(pinfunction "Pin_30")
 			(pintype "passive")
-			(uuid "ecc05119-8c78-45e2-a1e0-7f6079ad4c78")
+			(uuid "03cdcf92-6bc2-4936-ad1e-4c72078f27cf")
 		)
 		(pad "MP" smd roundrect
 			(at -8.135 0.51 180)
 			(size 0.3 1.15)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 21 "unconnected-(J1-MountPin-PadMP)")
+			(net 19 "unconnected-(J1-MountPin-PadMP)_1")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "734808dc-b215-41e6-b26e-da0c1b7d3f3e")
+			(uuid "b74996c7-1e22-4f29-873e-cb3f38d45f1f")
 		)
 		(pad "MP" smd roundrect
 			(at 8.135 0.51 180)
 			(size 0.3 1.15)
 			(layers "F.Cu" "F.Mask" "F.Paste")
 			(roundrect_rratio 0.15)
-			(net 22 "unconnected-(J1-MountPin-PadMP)_1")
+			(net 18 "unconnected-(J1-MountPin-PadMP)")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "7890a03c-349d-41d7-bdcc-5a089d9f47c5")
+			(uuid "a6e1942d-ae50-4841-a739-6c1e1bb346f9")
 		)
 		(embedded_fonts no)
 	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
+	(footprint "PCM_marbastlib-xp-choc:SW_choc_Reversible_1u"
 		(layer "F.Cu")
-		(uuid "52c94450-58f5-442b-b95b-a152d6d5bdac")
-		(at 138.1852 140.906903 -15)
-		(property "Reference" "SW19"
-			(at -0.000001 -0.5 345)
-			(unlocked yes)
-			(layer "F.SilkS")
+		(uuid "5cfc4685-cbfd-45c3-9099-73c8d179da2e")
+		(at 270.5 121.2)
+		(descr "Reversible dootprint for Kailh Choc style switches")
+		(property "Reference" "REF**"
+			(at 0 -2.75 180)
+			(layer "Dwgs.User")
 			(hide yes)
-			(uuid "589529b8-2723-408f-8cb4-23093d072412")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at -0.000001 11 345)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "6e5fc9c1-8da5-41ab-8bb3-b2d3ce56fbbc")
+			(uuid "a53de513-2ee8-4f2c-a7f2-347e4430996e")
 			(effects
 				(font
 					(size 1 1)
@@ -3426,12 +3382,10 @@
 				)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 0 0 345)
-			(unlocked yes)
+		(property "Value" "SW_choc_Reversible"
+			(at 0 0 180)
 			(layer "F.Fab")
-			(hide yes)
-			(uuid "1b64f827-deb2-42aa-aeb3-61a4aa7e368f")
+			(uuid "04db0397-84a0-4230-93bd-6703dd6255cb")
 			(effects
 				(font
 					(size 1 1)
@@ -3439,3302 +3393,261 @@
 				)
 			)
 		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 345)
-			(unlocked yes)
+		(property "Datasheet" ""
+			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "7f7d91bb-4064-420c-9e38-cf56423ee460")
+			(uuid "860a3ac1-f160-4688-9e8c-f22eac84ac30")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(path "/496c9716-8427-4670-8210-7b397d0fbb0f")
-		(sheetname "/")
-		(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)
+		(property "Description" ""
+			(at 0 0 0)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "baa78740-b242-4563-9155-087b63988ee0")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
 			)
-			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "768c2d5e-c762-47ab-a7b7-f0eb636c4ed0")
 		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.5) (xy 7.5 -7.5) (xy 7.5 7.5) (xy -7.5 7.5)
-			)
+		(attr through_hole exclude_from_pos_files exclude_from_bom)
+		(fp_line
+			(start -9 -8.5)
+			(end 9 -8.5)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "F.CrtYd")
-			(uuid "5144affa-5b7e-4672-97da-c4c8e02e2cf1")
-		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "32f5cff9-cef4-447e-9f56-b3aa3791b16e")
+			(layer "Dwgs.User")
+			(uuid "1927b7d3-a3fc-4dbe-9197-0587ae0be61e")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 345)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "99572736-210a-41a6-b138-8c88ce7fa41a")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 255)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "734621d2-d2bd-4f3b-83c0-72525486bd18")
-		)
-		(pad "" np_thru_hole circle
-			(at -0.000001 -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")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 4.699999 255)
-			(size 0.2 0.2)
-			(drill oval 1 1.6)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "4b75c364-9c1b-441c-83d1-205dcd5fdbb4")
-		)
-		(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")
-		)
-		(pad "1" smd roundrect
-			(at -5.750001 -5.05 75)
-			(size 4.9 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "3eb153d9-4081-4010-9dd7-fa29f1c5bdce")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425001 -2.575001 340)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "f59ab0ed-df9e-4ac7-810a-90f58e0500bd")
-		)
-		(pad "1" smd roundrect
-			(at -5.080001 -4.540001 255)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "fd7c0de1-52a2-4bee-b206-3311eafcbe51")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "f7d4c836-2b53-4ec9-be5e-22cf9b44362d")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81 345)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "7be3d516-8c74-42f6-9913-5b331ba0136b")
-		)
-		(pad "1" smd custom
-			(at 2.737496 6.1125 345)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "b1c6ea19-e91d-47b7-90d5-d1483589d96f")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.100001 255)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "37a12b47-8ae6-4a89-8ac7-e4d3440a7811")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.100001 50)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 29 "key19")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "d8c77ff3-d2ac-4785-845b-1218f8a2f2b3")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098635 75)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "8e8577b7-0452-4e7f-8988-8bb76a47cc23")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098635 280)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "49c9ac9f-2474-472e-b77d-e8ccbc1b6357")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.112501 345)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "64001641-7f82-427b-b6e6-1bd995af6073")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81 345)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "a2efe1fa-3eb2-40b6-ae5d-94c625159880")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 75)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "0e009d76-c2d9-4ab9-a0da-a55b948e5399")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421186 -2.575645 350)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "70749e23-e0b9-4995-abb8-e9f19543e5d2")
-		)
-		(pad "2" smd roundrect
-			(at 5.749999 -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")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "5fbe9f21-aa9b-4e56-ae1c-acbcfe0606c3")
-		(at 158.410688 149.442515 -30)
-		(property "Reference" "SW20"
-			(at 0 -0.5 330)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "63d19a03-468c-49f3-a17c-57b5b0625a84")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 330)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "bb53e42c-fe3d-43e3-b69d-7bee00ebce98")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 330)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "873794b1-c81a-4314-b5fd-48900ca19448")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 330)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "764a9176-1133-4d45-af51-3f5ecb44d77b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/bbc6d698-8230-47bf-9b84-fe883ee0f4b5")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(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)
-			)
+		(fp_line
+			(start -9 8.5)
+			(end -9 -8.5)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "6bad8754-329b-4253-9de3-bb43e98d51ac")
-		)
-		(fp_poly
-			(pts
-				(xy -7.5 -7.500001) (xy 7.500001 -7.5) (xy 7.5 7.500001) (xy -7.500001 7.5)
-			)
-			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "F.CrtYd")
-			(uuid "82d89ebd-35a4-4cc2-84c1-fc2f84c6c743")
-		)
-		(fp_poly
-			(pts
-				(xy -9.5 -9.5) (xy 9.5 -9.5) (xy 9.5 9.5) (xy -9.5 9.5)
-			)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "3aed2aa2-1f96-4c8e-abcb-78c827506a25")
+			(layer "Dwgs.User")
+			(uuid "0dee5e31-b2c6-4756-bf59-e4f4bbce784c")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 330)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "113c3910-0710-4d00-9f78-3b9783d0374f")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 240)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "e893c717-b0b8-4dee-90c8-add55e9af4de")
-		)
-		(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")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 4.7 240)
-			(size 0.2 0.2)
-			(drill oval 1 1.6)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "99d1495a-f38d-4d99-a544-9e1e0cd2790c")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 240)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "8a526752-70c3-48a6-819f-722b46db3d23")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "e46b26c6-9352-4430-85cb-9cdceafc0c2a")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 325)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 19 "key20")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "0bd1f9a6-7443-41c2-af15-d1ee3766bb83")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "d319e664-dff0-49b9-bfa8-63dd4c4c8e01")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "12a345d1-6f73-491f-8e7c-737c7ce7e4f3")
-		)
-		(pad "1" thru_hole circle
-			(at 2.540001 3.81 330)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 19 "key20")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "a5a6acaf-15b0-4ed9-90f2-b77b2bed9df9")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125 330)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 19 "key20")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "e106f55e-c589-44b4-8ead-7a7c1dcdcbff")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "8563adce-d588-4546-86e9-6ea75b620559")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 35)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 19 "key20")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "ea3fac7c-d64c-458b-ad9f-72785196b7f5")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 60)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "44099759-d025-4665-ae21-948913b509c7")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 265)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "2eaafab5-a9a1-4b1f-bcac-dae63e2b4fa2")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125 330)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "bbe5b3fe-8ad6-461c-85fd-b5660b30264f")
-		)
-		(pad "2" thru_hole circle
-			(at -2.540001 3.81 330)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "d2f206a9-c3b4-40c5-baf7-d5fdc749a13f")
-		)
-		(pad "2" smd roundrect
-			(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")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 335)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "caf46075-5bd0-4e40-b068-8a202db3f1f3")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 240)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "cfcc1bf9-1fb1-40a7-bfe7-9865eaa96156")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "6001269f-c120-4e06-85b5-d2b96c31ba61")
-		(at 107 109.5)
-		(property "Reference" "SW11"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "11322011-7d44-4229-9eed-3a33127962d9")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "2e153f85-af2f-4eb6-8d0e-dd4579f38ea5")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "aafd80d7-bf06-44b8-8837-b5b9725dd014")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "cc775f60-b493-4409-ba49-d511f35b8d43")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/890593d8-39f1-41ba-ac6e-14883614078b")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start 9 -8.5)
+			(end 9 8.5)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "892c8a70-718a-49cd-b7dc-22fa872d4afd")
-		)
-		(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")
-		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "88552021-7715-40eb-9b29-905319822d46")
+			(layer "Dwgs.User")
+			(uuid "b7f56fe7-cfe7-45c6-b8a6-dfab9e37d834")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "6d336e98-c866-4d1f-855a-a02f25473194")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "17811aae-8930-4cb4-aa2f-79c2c4e0e194")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "ac674cd2-b561-49bc-86c7-43883014b9b1")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "365ae36c-8e62-481f-bb4a-9c48cc67af37")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "dbe462ea-4d38-472f-a646-b1e4279ba383")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 27 "key11")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "a4bc9361-27f0-4232-b4c7-7e103ba68c05")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 27 "key11")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "7d56a623-0aa8-4392-ac1c-1cb33c9e4b01")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 27 "key11")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "a0313610-1bbc-4096-a7d3-65bee50fab5f")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 27 "key11")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "8939f6fa-64f3-477b-af7f-f7c6abd852fc")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 27 "key11")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "f1339017-2d6f-4c6c-8277-1a31cdf7a87f")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "293ab73f-795e-416c-8511-ea04c9f2dc86")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 27 "key11")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "25a8b2c9-587d-4547-9216-9c3df6c90fce")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "11fcf076-4f44-4e3b-810e-270f3420b17e")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "b99960b6-38a1-42fc-a4f7-47a8f5c9a37b")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "d0fc4821-e924-43f8-862f-29b3c5bcc8c4")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "961bc1a7-585c-4216-ac19-bb6c708b7fb5")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "f2af1833-3251-46f1-9f1c-d9bea6301e55")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "2bf80081-b0f5-40bf-86b7-bb79750f03c8")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "e0e842a1-3a75-40c2-ad38-e0dc0704ae6d")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "61d4ab2d-4aa0-4781-a514-a978f94ec1ec")
-		(at 126 119)
-		(property "Reference" "SW14"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "f03f53f8-925f-45e4-b20d-fcfaaff88f03")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "da549122-1de0-4256-b8cc-eeb0dd3b522f")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "a37b92d4-b305-47e2-bc4d-da38063dbd32")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "739673fc-1b5c-46d5-819a-76e65e6ec69d")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/36601408-3130-4d02-8aca-f76200b6be08")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start 9 8.5)
+			(end -9 8.5)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "bdc529f5-b610-44c9-be35-e96d2c6be029")
-		)
-		(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")
-		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "652e5023-cf57-4133-8cb9-eb8c41b8b451")
+			(layer "Dwgs.User")
+			(uuid "0a7b12be-95df-44fd-b2ae-42a141b60fe8")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "f25ab5d9-a493-45fc-8231-997c53c290a5")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "dcc43036-0cb1-453d-8b58-f0e9c758dfa2")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "27970c22-a7de-4a44-993e-1f636d7652b2")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "abebb9a6-c9bb-41bf-90d1-1776653b2a33")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "80644ee6-63ef-42e4-abeb-58900ceb2358")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 18 "key14")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "4097e83b-004c-48df-b5e9-a8b266f31d06")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 18 "key14")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "21943566-e75d-4aa9-ab9c-f1a01b13a065")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 18 "key14")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "8bfab1eb-5b19-47cc-9945-c2d9ba0a0519")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 18 "key14")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "a0d79452-83ca-4353-9d9c-f4bd4eb613c4")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 18 "key14")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "627c8aef-1575-4636-a37c-93881679adbe")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "5b34cf8e-3ad1-4400-9250-a36057c786e6")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 18 "key14")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "4311f627-42ae-4cba-a002-9100a75901a9")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "2b0ebbec-3089-4896-ba01-8cdc8f5b22b0")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "fec9fd58-1b21-455c-af24-6da09428f135")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "c6a042f3-33a8-4fa1-b72d-94cdac2c63ac")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "95552136-d4d3-4d18-8b2b-286880d00296")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "1e2daae3-d9e8-4e12-8e94-5af7a2481593")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "5c0da690-263a-496f-911a-9addfc0f6564")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "b596758e-fa59-49e1-9f0a-7e4da0a709ee")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "85b267d8-474d-438f-ae82-ff08c8f778e0")
-		(at 50 100)
-		(property "Reference" "SW1"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "775494af-5167-487a-9654-86ffeaa84a53")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "9f22cf3d-4b91-4ca1-b94b-7090fa83cde9")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "3f1b7dd2-ca43-434e-8cea-2ec59eabcebd")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "97279259-fcf4-4ba6-aa84-8e18bcbb4691")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/d6e47454-4530-4260-bdb6-dae123da9493")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start -9.525 -9.525)
+			(end -9.525 9.525)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "f064a414-f39f-4a12-9173-617ef56a6cdc")
-		)
-		(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")
-		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "5dcdc2d1-f5e8-4ef5-ba45-bbf2f27c33b7")
+			(layer "Eco1.User")
+			(uuid "b5f79aaf-8c9e-45fd-bff5-d21ed74944b7")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "1bcf0f37-2e37-4ff9-8d1c-8040eb0bcc7c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "83c9fd65-2b80-49cb-8894-6c4f76a7c693")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "9a71c632-51fd-40d2-8c65-c489a847964d")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "32260f9a-f0ea-4983-aab3-ae22d7b6e886")
-		)
-		(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")
-		)
-		(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 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "96108941-e806-451c-ab8c-ca8026ed322e")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "8743fca3-e938-4502-9cc0-5acb29278fb0")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "9c828ea0-7bf3-4f9a-a647-830a91884757")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "9555da55-8cf1-47fe-913e-3b7a8868227c")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "c44fa8b9-ccc8-4215-bc00-e9f2e64174af")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "3bffbcf9-9225-4c92-9560-e39c7f8a58f7")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 8 "key1")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "e20b70b7-32bc-4ba4-98e4-f03c83a57f4f")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "43fec43c-6bc8-4118-8f67-c3b256c82347")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "7cddbe9d-f7e6-4698-bf65-0c862acb52ae")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "98486360-5917-4907-88e3-29f78c78856f")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "521ac086-6063-4a50-89d5-2688b86cae31")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "590ffe3e-2f03-4478-bad0-03efac0e00ad")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "09a45d3d-8ed2-4aff-a95c-a6ecefadbbb2")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "ecae6f72-0cd1-4ad8-a798-20fed843baa4")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "93680d5b-3a5e-4bd7-a052-6eaea6c3d808")
-		(at 107 71.5)
-		(property "Reference" "SW9"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "f980f77b-c69c-4ddc-a01f-95eda15f9b04")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "9c3ebd35-3988-45f8-aa22-7c3bfa0416bb")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "d91e2b91-88b6-46dd-80a5-49fea046dcdf")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "8c4541ea-90a0-4351-91c2-c329bac1b24c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/1dc30b32-59fc-4f41-8ab6-efe7d035b10a")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start -9.525 9.525)
+			(end 9.525 9.525)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "516811fd-5e82-4f3b-9d7a-8dac032f14a1")
-		)
-		(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")
-		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "dc2d86c9-92fe-41a7-99f5-aa62412adfde")
+			(layer "Eco1.User")
+			(uuid "06352bfe-21d0-4f08-bd17-1a07eb164a88")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "8e47eea8-17c8-46de-a4f6-96bf0b6b57b4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "f14b9557-9f0b-468e-bb70-497a5cff194e")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "eb437d78-1be8-476b-a013-ec013bca0358")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "be6bf327-1f9e-49ff-b55d-e7efddd2cdaa")
-		)
-		(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")
-		)
-		(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 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "5baf4166-ec42-4dd4-a757-dfb6af762bfc")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "7b829688-cca7-4cbc-b466-bf354fd5a19a")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "7c41d2ad-8ae9-40f6-a667-94e011ae3278")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "aeaec2a1-ac6a-40b1-914e-2d8f556d6584")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "1ddfb8b8-0f3d-4d9e-85fd-a068ec4f2658")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "103766f9-0b70-4948-a2bd-ce736ed5dbd0")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 3 "key9")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "76a1283d-4bce-4f39-a7f1-c7ffcd0f1ceb")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "4f6a0511-5b19-4502-86fa-f3fb6e6e90d7")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "4db741d5-740c-47f9-936d-f6d2b6b408e8")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "45f89654-b463-43e1-ab47-52aa71ae0c0f")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "be17b4db-0fc1-4eea-8a7d-7b9827be164f")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "0c72e0c4-72c5-40cf-be06-bb6263bfeb53")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "af260eed-14f8-4bf4-a89c-2310fb3edc60")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "fd980769-759b-4987-8da4-d0745d301ee4")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "95814d48-c2c9-4ea2-b32d-9416c498c459")
-		(at 69 90.5)
-		(property "Reference" "SW3"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "2355bceb-2f33-4b1f-afe9-67ccb4447b3e")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "e650705c-ca56-48af-a557-e503bb51b398")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "471f008b-eb5f-462d-bc94-9d6023eafe13")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "1056d5af-204c-47ef-899e-f6eb2d9ec92a")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/5b5f16e9-a0aa-4aae-bb41-88808b7226cc")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start 9.525 -9.525)
+			(end -9.525 -9.525)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "ec04be45-168c-4645-a1c1-09add92e4d27")
-		)
-		(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")
-		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "0c680a35-684b-454f-a7b4-8b730199b303")
+			(layer "Eco1.User")
+			(uuid "55b0cd4c-e340-4ef3-bfe9-48e3b9b59cad")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "a04661cf-9823-495b-bb63-c206e3c906ee")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "b3daddc1-2ca3-4349-b6a5-2f7156c0b9de")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "915068f5-312c-4528-8ce8-f339937feddc")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "f2ba9b68-b2df-44d0-9c30-b05a7051dea3")
-		)
-		(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")
-		)
-		(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 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "bf481d25-60b2-474d-96fd-fc46ff891b75")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "7d037c06-b838-461f-a0a7-555e1a6bc86d")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "66841845-e6c9-4e7d-8b71-1a077075bb97")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "a9bf53c9-c2ac-487c-80c6-95f4a1a1dc80")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "54992215-3840-4f9a-a1c3-b96666049180")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "9cb1c224-6cbf-4047-b093-966ac3f00e29")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 10 "key3")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "24aba175-d318-4f83-a16d-f898d36da121")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "2a6437d5-f869-4a85-95f3-330dea85245e")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "5a4b914e-8c5f-45b7-acdb-54baf952aa8b")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "429a7ae7-26d9-41e3-87ce-1a1f94f75b04")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "eecc4c8d-a3ac-4cdc-9530-485eed2de963")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "2a98a241-bfa6-4de9-b3c3-59aa408a8c69")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "3a3eb180-b858-4d5e-8f60-c9d25eddffa6")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "eb838432-1ad6-41cd-89c8-97a57b8b0671")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "9a308736-1751-4b76-bfea-17427da55abd")
-		(at 50 119)
-		(property "Reference" "SW2"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "d0f33b97-637a-47b1-b09e-c66e671b06e4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "e5c4eefc-f029-4ea0-95f7-ac9fa1c40a1c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "b2794329-f312-4af0-bdac-20d1676be3c2")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "e166fa7b-15ca-4261-9339-0668cba5e325")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/6aea912b-c273-4986-bace-9455f840bead")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start 9.525 9.525)
+			(end 9.525 -9.525)
 			(stroke
-				(width 0.05)
-				(type default)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "859959d0-52d6-4cfb-884a-7fdb6eb3e34f")
-		)
-		(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")
-		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
-			(stroke
-				(width 0.1)
+				(width 0.12)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "f28ec456-4293-4903-ae84-bdfa0ea308a8")
+			(layer "Eco1.User")
+			(uuid "3a6c7f96-9943-4d84-abf5-9242401b5a96")
+		)
+		(fp_line
+			(start -6.95 6.45)
+			(end -6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "e6d2c546-a3f4-4188-9048-efc1f5ba5fd8")
+		)
+		(fp_line
+			(start -6.45 -6.95)
+			(end 6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "29db1b01-0c89-44df-8110-fa0c371c165a")
+		)
+		(fp_line
+			(start 6.45 6.95)
+			(end -6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "71c08ee8-b33d-4d5c-9b05-c7fee6928358")
+		)
+		(fp_line
+			(start 6.95 -6.45)
+			(end 6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "e35b6a67-6eab-4abe-892c-1734cf05e6d7")
+		)
+		(fp_arc
+			(start -6.95 -6.45)
+			(mid -6.803553 -6.803553)
+			(end -6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "54453a33-8877-4eef-a5b2-bc75ba714d16")
+		)
+		(fp_arc
+			(start -6.45 6.95)
+			(mid -6.803553 6.803553)
+			(end -6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "a8aff68a-8834-4ef4-ab6c-0e946436e735")
+		)
+		(fp_arc
+			(start 6.45 -6.95)
+			(mid 6.803553 -6.803553)
+			(end 6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "65da854b-4979-40d9-9cd8-2f9db2aa93a2")
+		)
+		(fp_arc
+			(start 6.95 6.45)
+			(mid 6.803553 6.803553)
+			(end 6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "c6f86e4d-ec0f-46b5-ae47-9a6f9e49c684")
+		)
+		(fp_line
+			(start -7 -7)
+			(end 7 -7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "55e4883e-aecb-4baa-8fd0-7b8878696572")
+		)
+		(fp_line
+			(start -7 7)
+			(end -7 -7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "6f36c38d-6f0f-4af9-bfe7-ecf1048cc5b5")
+		)
+		(fp_line
+			(start 7 -7)
+			(end 7 7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f0f31a67-4dab-4a03-b5d2-11b5ef550617")
+		)
+		(fp_line
+			(start 7 7)
+			(end -7 7)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "3f5b8e31-f09e-44a0-88a3-fc57cabca195")
+		)
+		(fp_text user "18x17 spacing"
+			(at 0 -7.6 180)
+			(layer "Dwgs.User")
+			(uuid "7bbd3863-e313-4388-87f2-7a38df427b7b")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(fp_text user "19.05 spacing"
+			(at 0 -8.7 180)
+			(layer "Eco1.User")
+			(uuid "cea221ca-72fa-44fa-ad0a-a9592b694d8e")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
+			(at 0 1.5 0)
 			(layer "F.Fab")
-			(uuid "b6d00271-e673-4de0-b0cd-e28e0e3bad17")
+			(uuid "43832e00-42b6-4246-b756-ae3162d5b2ac")
 			(effects
 				(font
 					(size 1 1)
@@ -6743,386 +3656,61 @@
 			)
 		)
 		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "b69354c4-d6e8-4b90-870f-5b3543e75280")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "236fc6b6-48fe-4838-9087-26f73f581b2b")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "2497fa4f-444e-4fe1-87d4-d54c87f5473d")
-		)
-		(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")
-		)
-		(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 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "c033d51d-6ef9-41fe-ad06-b225e1ac47a6")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
+			(at -5.5 0 180)
+			(size 1.7 1.7)
+			(drill 1.7)
 			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "d4ff5bf0-7713-40b6-affa-b4ef4e9409eb")
+			(uuid "1cb7a61d-459b-458b-bfa9-6fabdf3f4a57")
 		)
-		(pad "1" smd roundrect
-			(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")
+		(pad "" np_thru_hole circle
+			(at 0 0 180)
+			(size 3.4 3.4)
+			(drill 3.4)
+			(layers "*.Cu" "*.Mask")
+			(uuid "aca53bf2-b781-4115-8dbe-1a9ed7fca0a7")
 		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "d10bd787-b14f-46d9-862e-7263923670e9")
+		(pad "" np_thru_hole circle
+			(at 5.5 0 180)
+			(size 1.7 1.7)
+			(drill 1.7)
+			(layers "*.Cu" "*.Mask")
+			(uuid "320948dc-bf55-452b-87a8-f26bfaa3167f")
 		)
 		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
+			(at -5 3.8 180)
+			(size 2 2)
+			(drill 1.2)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "90661ad2-27ca-4317-a765-66caf3e2b4b9")
+			(uuid "ac1158fd-bbfb-4861-9d04-ac9e8fefb339")
 		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "a0a25e33-c613-435c-bd63-5b151b53565a")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "9f2c630f-194b-40fb-a282-5d2db81770e8")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
+		(pad "1" thru_hole circle
+			(at 5 3.8)
+			(size 2 2)
+			(drill 1.2)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 5 "key2")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "e600bbf2-6cce-4ea6-b0ac-fefb2a145921")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "d85955f4-0f83-4c8e-a3c4-6d0c2504505d")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "2ab83374-f456-4ac9-a694-9af1f29402eb")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "1e35baf4-19d7-4684-9113-f021870a22b5")
+			(uuid "81a21fc3-7bbc-4bf6-bd3a-ea54de7eb25d")
 		)
 		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
+			(at 0 5.9 180)
+			(size 2 2)
+			(drill 1.2)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "89626ecd-904d-467a-ad7c-9ca0bd0f03d2")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "c053c187-e71a-426b-a337-aba48f693b72")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "73fc8144-65dd-4f5e-87e0-270bb014ddfa")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "872b3fb1-008e-4d06-b82b-cd5d0a5900b6")
+			(uuid "f7f22ebf-b498-490c-a94b-0af09aef1119")
 		)
 		(embedded_fonts no)
 	)
-	(footprint "phiboard:THD_0510-30CL-GF"
-		(locked yes)
+	(footprint "PCM_marbastlib-xp-mx:SW_MX_HS_KS-2P02B01-01_1u"
 		(layer "F.Cu")
-		(uuid "9e97d06d-dfb2-4d9c-beda-f0c061d5075b")
-		(at 85.75 62.4)
-		(descr "FFC FPC 1x30")
-		(property "Reference" "J1"
-			(at 0 -0.1 0)
-			(unlocked yes)
+		(uuid "801a38bc-1649-4f19-b3c1-36ec78a1a1be")
+		(at 245.5 96.2)
+		(descr "Footprint for Cherry MX style switches with Gateron KS-2P02B01-01 hotswap socket")
+		(property "Reference" "REF**"
+			(at -4.25 -1.6 0)
 			(layer "F.SilkS")
-			(hide yes)
-			(uuid "975b389f-9956-4f75-ab76-aa100913ce3d")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "Conn_01x30"
-			(at 0 2.6 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "f4a0dd13-1cfc-45bd-a3b4-3db3e1b03948")
+			(uuid "69789448-b8d3-43ad-b7c8-7a85938561aa")
 			(effects
 				(font
 					(size 1 1)
@@ -7130,12 +3718,10 @@
 				)
 			)
 		)
-		(property "Datasheet" "~"
+		(property "Value" "KS-2P02B01-01"
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
-			(hide yes)
-			(uuid "0aee20b4-f00a-45c6-9c13-631d6c704cd8")
+			(uuid "c26b2bc9-e5e0-404d-9386-e193b5aa0444")
 			(effects
 				(font
 					(size 1 1)
@@ -7143,3467 +3729,971 @@
 				)
 			)
 		)
-		(property "Description" "Generic connectable mounting pin connector, single row, 01x30, script generated (kicad-library-utils/schlib/autogen/connector/)"
+		(property "Datasheet" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "7ad68c3b-0329-4153-b960-0cea43af8367")
+			(uuid "51fd3106-1e7b-4bcf-b0eb-52046cdef636")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
-		(property "LCSC PN" "C283129"
+		(property "Description" ""
 			(at 0 0 0)
-			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "4e51cb89-98ae-4ba2-9e32-4a22ba1df688")
+			(uuid "49631d43-6a37-4181-9814-814b92275580")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
 			)
 		)
 		(attr smd)
-		(fp_poly
+		(fp_line
+			(start -5.038879 -7.086025)
+			(end -5.038879 -6.58)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "bb0411a3-236f-4417-86fb-b6fbc33a17a6")
+		)
+		(fp_line
+			(start -5.038879 -2.674721)
+			(end -5.038879 -3.58)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "a94502ad-6a76-4fd3-8533-168b1eb885e0")
+		)
+		(fp_line
+			(start -4.813902 -2.449741)
+			(end 0.239066 -2.449741)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "2e7d2840-8662-43eb-8492-0358faedbc24")
+		)
+		(fp_line
+			(start -0.870659 -7.311006)
+			(end -4.813902 -7.311006)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "57aa1afd-0b0b-4421-9b46-e8d30ef27c6e")
+		)
+		(fp_line
+			(start 0.953718 -6.539103)
+			(end 0.316284 -6.539103)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "3ced65f3-39cb-4abe-87ec-a9935cc582ca")
+		)
+		(fp_line
+			(start 1.436576 -6.861005)
+			(end 1.845965 -6.860996)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "9844fe77-4f4a-4f3f-933a-fafd124019f8")
+		)
+		(fp_line
+			(start 2.997274 -0.419747)
+			(end 4 -0.419747)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "c109250d-baa0-43fd-9ba6-4f0649c17e2e")
+		)
+		(fp_line
+			(start 6.085672 -5.281006)
+			(end 4.774564 -5.281006)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "b820a423-ed6e-47ef-bbd5-ff6f2a270f2c")
+		)
+		(fp_line
+			(start 6.310649 -5.056028)
+			(end 6.310649 -4.04)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "3ab628b1-faa4-403e-8bb0-e34af13378e9")
+		)
+		(fp_line
+			(start 6.310649 -0.644724)
+			(end 6.310649 -1.04)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "421ead41-750c-486b-b1a4-45d42e60477f")
+		)
+		(fp_arc
+			(start -0.870659 -7.311006)
+			(mid -0.404802 -7.177082)
+			(end -0.081188 -6.816204)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "4072cbdd-e516-4f85-ab7a-29d80e70a2a4")
+		)
+		(fp_arc
+			(start 0.239066 -2.449741)
+			(mid 1.301345 -1.970299)
+			(end 2.018091 -1.051291)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "fb9067a5-075c-405f-9016-1d2b69cb4711")
+		)
+		(fp_arc
+			(start 0.316284 -6.539103)
+			(mid 0.075462 -6.617285)
+			(end -0.081188 -6.816204)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "c7b1bcdb-f1a8-41ba-aabd-cdb1ebcaca65")
+		)
+		(fp_arc
+			(start 1.344869 -6.800882)
+			(mid 1.1877 -6.612605)
+			(end 0.953718 -6.539103)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "396ac361-e9f8-4beb-89c9-1b886c703293")
+		)
+		(fp_arc
+			(start 1.344869 -6.800882)
+			(mid 1.381745 -6.844643)
+			(end 1.436576 -6.861005)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "1e72ca37-aba8-49e6-aefa-393d554a05a5")
+		)
+		(fp_arc
+			(start 1.845965 -6.860996)
+			(mid 2.356288 -6.732106)
+			(end 2.744226 -6.376372)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "e8e5ff6b-4336-496b-b61a-da98782a66b7")
+		)
+		(fp_arc
+			(start 2.997274 -0.419747)
+			(mid 2.414853 -0.591219)
+			(end 2.018265 -1.05093)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "e4174bd9-fc7d-411a-8a5e-c26abf100f38")
+		)
+		(fp_arc
+			(start 4.774564 -5.281006)
+			(mid 3.62108 -5.572312)
+			(end 2.744226 -6.376372)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "31db3519-2eeb-4bf8-be90-6d131b4053e5")
+		)
+		(fp_curve
 			(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.1) (xy 7.6 -2.8) (xy -7.6 -2.8)
+				(xy -5.038879 -2.674721) (xy -5.038879 -2.556922) (xy -4.931702 -2.449741) (xy -4.813902 -2.449741)
 			)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "fe80e36e-24c1-4bbf-ba9e-fbdd7012460e")
+		)
+		(fp_curve
+			(pts
+				(xy -4.813902 -7.311006) (xy -4.931702 -7.311006) (xy -5.038879 -7.203825) (xy -5.038879 -7.086025)
+			)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "da51661a-d668-4b05-9b59-d75e0424d7d2")
+		)
+		(fp_curve
+			(pts
+				(xy 6.085672 -0.419747) (xy 6.203471 -0.419747) (xy 6.310649 -0.526925) (xy 6.310649 -0.644724)
+			)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "608d372a-7b77-4166-af1b-4afd342914c9")
+		)
+		(fp_curve
+			(pts
+				(xy 6.310649 -5.056028) (xy 6.310649 -5.173827) (xy 6.203471 -5.281006) (xy 6.085672 -5.281006)
+			)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "7e10cc13-aea5-4bb8-b53a-70215a3ff354")
+		)
+		(fp_rect
+			(start -9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Dwgs.User")
+			(uuid "0889fe7c-25e2-480a-8455-25223ff16ca0")
+		)
+		(fp_line
+			(start -7 -6.5)
+			(end -7 6.5)
 			(stroke
 				(width 0.05)
 				(type solid)
 			)
-			(fill no)
-			(layer "F.CrtYd")
-			(uuid "d77987f9-f236-4710-926e-d114aabedafd")
+			(layer "Eco2.User")
+			(uuid "6e7d0bba-5479-4f64-9c15-5467847f8c44")
 		)
 		(fp_line
-			(start -8.4 -1.9)
-			(end 8.4 -1.9)
+			(start -6.5 7)
+			(end 6.5 7)
 			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "26522049-4933-4d5f-afb2-5cc93d057ca3")
-		)
-		(fp_line
-			(start -8.4 -1.215)
-			(end 8.4 -1.215)
-			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(layer "User.1")
-			(uuid "269fbd98-fc8e-4892-a6f4-a8905845f99f")
+			(layer "Eco2.User")
+			(uuid "936198ab-6bf0-40ea-8ded-79034d4ce206")
 		)
 		(fp_line
-			(start -8.4 -0.1)
-			(end -8.4 -1.9)
+			(start 6.5 -7)
+			(end -6.5 -7)
 			(stroke
-				(width 0.1)
-				(type default)
+				(width 0.05)
+				(type solid)
 			)
-			(layer "User.1")
-			(uuid "2e623c3e-51e7-4fac-91b9-da011a0b8754")
+			(layer "Eco2.User")
+			(uuid "41b7bd6c-f6b1-400b-9c3d-c61eac702d0e")
 		)
 		(fp_line
-			(start -7.8 1.4)
-			(end -7.8 -0.4)
+			(start 7 6.5)
+			(end 7 -6.5)
 			(stroke
-				(width 0.1)
-				(type default)
+				(width 0.05)
+				(type solid)
 			)
-			(layer "User.1")
-			(uuid "d622ce7e-c1ff-4145-a48a-1954db5c18af")
+			(layer "Eco2.User")
+			(uuid "bb8dfb14-ef58-4612-bc39-fd94ffd1c1f9")
 		)
-		(fp_line
-			(start 7.8 -0.4)
-			(end 7.8 1.4)
+		(fp_arc
+			(start -7 -6.5)
+			(mid -6.853553 -6.853553)
+			(end -6.5 -7)
 			(stroke
-				(width 0.1)
-				(type default)
+				(width 0.05)
+				(type solid)
 			)
-			(layer "User.1")
-			(uuid "c8f0a26f-a8fb-4ca7-a3bf-57043e670ab8")
+			(layer "Eco2.User")
+			(uuid "c04433c5-5ae2-425b-9731-b0c50203a58b")
 		)
-		(fp_line
-			(start 7.8 1.4)
-			(end -7.8 1.4)
+		(fp_arc
+			(start -6.497236 6.998884)
+			(mid -6.850789 6.852437)
+			(end -6.997236 6.498884)
 			(stroke
-				(width 0.1)
-				(type default)
+				(width 0.05)
+				(type solid)
 			)
-			(layer "User.1")
-			(uuid "e6899333-c62a-43b1-91a5-b1ac37f265eb")
+			(layer "Eco2.User")
+			(uuid "6db8b38f-5736-4b81-b296-1d249af94635")
 		)
-		(fp_line
-			(start 8.4 -1.9)
-			(end 8.4 -0.1)
+		(fp_arc
+			(start 6.5 -7)
+			(mid 6.853553 -6.853553)
+			(end 7 -6.5)
 			(stroke
-				(width 0.1)
-				(type default)
+				(width 0.05)
+				(type solid)
 			)
-			(layer "User.1")
-			(uuid "70b28122-30b7-40d0-aef2-1aace89779a9")
+			(layer "Eco2.User")
+			(uuid "11471a2e-5305-47e3-a4db-c78468ca2359")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "63ab54c8-47b4-46b3-a58a-6b88b59fcba7")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
+		(fp_arc
+			(start 7 6.5)
+			(mid 6.853553 6.853553)
+			(end 6.5 7)
+			(stroke
+				(width 0.05)
+				(type solid)
 			)
+			(layer "Eco2.User")
+			(uuid "b6392b2a-6e13-413b-9a46-4b778bfb6769")
 		)
-		(pad "1" smd roundrect
-			(at -7.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 1 "GND")
-			(pinfunction "Pin_1")
-			(pintype "passive")
-			(uuid "60518af2-6c2c-41c6-8eb9-7df2c32e0c4b")
-		)
-		(pad "2" smd roundrect
-			(at -6.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
-			(pinfunction "Pin_2")
-			(pintype "passive")
-			(uuid "7fac1d06-8110-4e15-b21b-44b2316f57d9")
-		)
-		(pad "3" smd roundrect
-			(at -6.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
-			(pinfunction "Pin_3")
-			(pintype "passive")
-			(uuid "bb69a5b4-b334-4e32-bcd0-810d4cc2441e")
-		)
-		(pad "4" smd roundrect
-			(at -5.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 34 "key23")
-			(pinfunction "Pin_4")
-			(pintype "passive")
-			(uuid "2d65b5af-27cd-4bcd-9fff-89405bc9a016")
-		)
-		(pad "5" smd roundrect
-			(at -5.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 14 "key22")
-			(pinfunction "Pin_5")
-			(pintype "passive")
-			(uuid "4b382443-6ceb-4c84-8d4e-6a6d90010b66")
-		)
-		(pad "6" smd roundrect
-			(at -4.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 13 "key21")
-			(pinfunction "Pin_6")
-			(pintype "passive")
-			(uuid "b1602bdc-6ac1-4284-92ba-87412140d114")
-		)
-		(pad "7" smd roundrect
-			(at -4.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 54 "unconnected-(J1-Pin_7-Pad7)")
-			(pinfunction "Pin_7")
-			(pintype "passive+no_connect")
-			(uuid "3403d968-10da-4a6a-a733-f45717a8851b")
-		)
-		(pad "8" smd roundrect
-			(at -3.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 29 "key19")
-			(pinfunction "Pin_8")
-			(pintype "passive")
-			(uuid "595d53f3-b55a-4be4-919a-85a651373913")
-		)
-		(pad "9" smd roundrect
-			(at -3.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 24 "key18")
-			(pinfunction "Pin_9")
-			(pintype "passive")
-			(uuid "c5a7b91e-b061-40e7-8df2-913de81b6c31")
-		)
-		(pad "10" smd roundrect
-			(at -2.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 23 "key17")
-			(pinfunction "Pin_10")
-			(pintype "passive")
-			(uuid "1ce8e5f1-02d6-455c-a8dc-da4cf1065d6b")
-		)
-		(pad "11" smd roundrect
-			(at -2.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 16 "key16")
-			(pinfunction "Pin_11")
-			(pintype "passive")
-			(uuid "3a1cd131-da7f-4f8f-9c27-4513b9093c49")
-		)
-		(pad "12" smd roundrect
-			(at -1.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 12 "key15")
-			(pinfunction "Pin_12")
-			(pintype "passive")
-			(uuid "bd280951-593f-4c1a-8b60-555a9d730726")
-		)
-		(pad "13" smd roundrect
-			(at -1.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 18 "key14")
-			(pinfunction "Pin_13")
-			(pintype "passive")
-			(uuid "4b2a5f74-0ca6-4798-82c7-d144f27569bd")
-		)
-		(pad "14" smd roundrect
-			(at -0.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 15 "key13")
-			(pinfunction "Pin_14")
-			(pintype "passive")
-			(uuid "aefdd399-1302-42a3-9d70-e705d058313f")
-		)
-		(pad "15" smd roundrect
-			(at -0.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 28 "key12")
-			(pinfunction "Pin_15")
-			(pintype "passive")
-			(uuid "125b175b-30f3-464b-a9a1-4d45e0c0016b")
-		)
-		(pad "16" smd roundrect
-			(at 0.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 27 "key11")
-			(pinfunction "Pin_16")
-			(pintype "passive")
-			(uuid "f87e2eda-e62b-4446-85f0-8a839e98af62")
-		)
-		(pad "17" smd roundrect
-			(at 0.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 25 "key10")
-			(pinfunction "Pin_17")
-			(pintype "passive")
-			(uuid "baa2c36a-e072-4193-a040-5e8ad61d2bf8")
-		)
-		(pad "18" smd roundrect
-			(at 1.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 3 "key9")
-			(pinfunction "Pin_18")
-			(pintype "passive")
-			(uuid "3f089e86-1185-4edb-902b-b32b40f3f720")
-		)
-		(pad "19" smd roundrect
-			(at 1.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 4 "key8")
-			(pinfunction "Pin_19")
-			(pintype "passive")
-			(uuid "3cc1b2c9-cd0d-4a27-b278-389a6e0ff00d")
-		)
-		(pad "20" smd roundrect
-			(at 2.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 2 "key7")
-			(pinfunction "Pin_20")
-			(pintype "passive")
-			(uuid "ba56897e-fe74-4c0c-984f-566dabbfa080")
-		)
-		(pad "21" smd roundrect
-			(at 2.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 9 "key6")
-			(pinfunction "Pin_21")
-			(pintype "passive")
-			(uuid "eb030241-e7f9-41a8-b662-05625af255d2")
-		)
-		(pad "22" smd roundrect
-			(at 3.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 6 "key5")
-			(pinfunction "Pin_22")
-			(pintype "passive")
-			(uuid "ceed5ed9-1b92-444e-87df-9e23bedfd01f")
-		)
-		(pad "23" smd roundrect
-			(at 3.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 7 "key4")
-			(pinfunction "Pin_23")
-			(pintype "passive")
-			(uuid "ff698ecf-1358-432b-b799-d289c7731be4")
-		)
-		(pad "24" smd roundrect
-			(at 4.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 10 "key3")
-			(pinfunction "Pin_24")
-			(pintype "passive")
-			(uuid "62129ff7-0a54-4f80-855f-61c7caa2674e")
-		)
-		(pad "25" smd roundrect
-			(at 4.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 5 "key2")
-			(pinfunction "Pin_25")
-			(pintype "passive")
-			(uuid "662d9d69-9815-4c4a-a979-f4b79f6afaa5")
-		)
-		(pad "26" smd roundrect
-			(at 5.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 8 "key1")
-			(pinfunction "Pin_26")
-			(pintype "passive")
-			(uuid "bb180b41-8cbb-464d-bcf7-775cef281ecd")
-		)
-		(pad "27" smd roundrect
-			(at 5.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 26 "unconnected-(J1-Pin_27-Pad27)")
-			(pinfunction "Pin_27")
-			(pintype "passive+no_connect")
-			(uuid "ce8f185e-a0cb-427a-b370-5120bd1a116a")
-		)
-		(pad "28" smd roundrect
-			(at 6.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
-			(pinfunction "Pin_28")
-			(pintype "passive")
-			(uuid "30309df4-5396-44e1-94a2-b4a4502fbe7c")
-		)
-		(pad "29" smd roundrect
-			(at 6.75 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
-			(pinfunction "Pin_29")
-			(pintype "passive")
-			(uuid "29ce9328-1d7e-4cf6-8dfb-132d1675526c")
-		)
-		(pad "30" smd roundrect
-			(at 7.25 -2.3)
-			(size 0.3 0.65)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 1 "GND")
-			(pinfunction "Pin_30")
-			(pintype "passive")
-			(uuid "6feac251-8686-433e-b845-87e95cb015a5")
-		)
-		(pad "MP" smd roundrect
-			(at -8.135 0.51)
-			(size 0.3 1.15)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 21 "unconnected-(J1-MountPin-PadMP)")
-			(pinfunction "MountPin")
-			(pintype "passive+no_connect")
-			(uuid "1c701e1d-6c5e-4282-94d6-d61c78691a38")
-		)
-		(pad "MP" smd roundrect
-			(at 8.135 0.51)
-			(size 0.3 1.15)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.15)
-			(net 22 "unconnected-(J1-MountPin-PadMP)_1")
-			(pinfunction "MountPin")
-			(pintype "passive+no_connect")
-			(uuid "82609e2f-7a8e-4310-83f4-a90e07dd015e")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "a5d8097d-619b-4747-be0d-8ea550c6aa03")
-		(at 88 100)
-		(property "Reference" "SW7"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "1d278880-5661-4fda-b988-e82bc88a0bcf")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "39e03f3b-d12b-4f8f-9151-dcbc67757928")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "2d6bb003-ba15-4753-aa9f-33d956673529")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "fe0db8f7-0735-4fc7-b0be-fd211cab6409")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/bfa10e91-135a-42bc-9ae9-62aa45f2fc8e")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
 		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+			(start -7 -7)
+			(end 7 7)
 			(stroke
 				(width 0.05)
 				(type default)
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "7ec36838-0dde-46d7-a739-97260c95c6c0")
+			(uuid "8eea6c96-aa81-417c-bcae-e42646d3bdea")
 		)
-		(fp_rect
-			(start -7.5 -7.5)
-			(end 7.5 7.5)
+		(fp_line
+			(start -7.414824 -6.32022)
+			(end -5.038879 -6.32022)
 			(stroke
 				(width 0.05)
-				(type default)
+				(type solid)
 			)
-			(fill no)
 			(layer "F.CrtYd")
-			(uuid "879c0978-f37f-4b9b-aa8d-e4c124c37554")
+			(uuid "e0207dff-b68a-4659-be07-13ca8b4553b9")
 		)
-		(fp_rect
-			(start -9.5 -9.5)
-			(end 9.5 9.5)
+		(fp_line
+			(start -7.414824 -3.87022)
+			(end -7.414824 -6.32022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "74702422-b602-4170-b7fd-b64d59df4bd9")
+		)
+		(fp_line
+			(start -5.038879 -7.086025)
+			(end -5.038879 -6.32022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "83c54aa6-dde7-4dc2-8409-d6a15bdc86a2")
+		)
+		(fp_line
+			(start -5.038879 -3.87022)
+			(end -7.414824 -3.87022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "507b38e2-4121-453a-a9d0-c2dad835c63d")
+		)
+		(fp_line
+			(start -5.038879 -2.674721)
+			(end -5.038879 -3.87022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "ff6e8eb8-7b3d-4c77-925a-19bcc51d57e3")
+		)
+		(fp_line
+			(start -4.813902 -2.449741)
+			(end 0.239066 -2.449741)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "61d38cf8-e980-4536-b131-019afcae7839")
+		)
+		(fp_line
+			(start -0.870659 -7.311006)
+			(end -4.813902 -7.311006)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "afc29082-8ac7-47e1-a93e-2ba92eca3ad4")
+		)
+		(fp_line
+			(start 0.953718 -6.539103)
+			(end 0.316284 -6.539103)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "02726455-b1b6-4b58-b6fa-f0e958c04b79")
+		)
+		(fp_line
+			(start 1.436576 -6.861005)
+			(end 1.845965 -6.860996)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "c0eb8e34-52ad-4f08-8e62-434cf3d2695f")
+		)
+		(fp_line
+			(start 2.997274 -0.419747)
+			(end 6.085672 -0.419747)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "a1a031ae-8801-4c64-9c5b-5746f541108e")
+		)
+		(fp_line
+			(start 6.085672 -5.281006)
+			(end 4.774564 -5.281006)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5f91880f-b18d-4c98-a162-740b0a6620e0")
+		)
+		(fp_line
+			(start 6.310649 -5.056028)
+			(end 6.310649 -3.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "bc04623f-2261-4b07-a4bc-fc0be92bf4b6")
+		)
+		(fp_line
+			(start 6.310649 -3.75022)
+			(end 8.685176 -3.75022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "0ec0bd69-bf15-404b-9366-30cb78547ea5")
+		)
+		(fp_line
+			(start 6.310649 -0.644724)
+			(end 6.310649 -1.30022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "7a9b2951-ec00-46e1-9465-22326ac0936b")
+		)
+		(fp_line
+			(start 8.685176 -3.75022)
+			(end 8.685176 -1.30022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "1bdcf84b-5cb1-4745-b452-dd0681685a9f")
+		)
+		(fp_line
+			(start 8.685176 -1.30022)
+			(end 6.310649 -1.30022)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "48d9bcd2-0a8c-417a-bbb7-f76c5f78316d")
+		)
+		(fp_arc
+			(start -0.870659 -7.311006)
+			(mid -0.404802 -7.177082)
+			(end -0.081188 -6.816204)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "42745d91-9f44-406a-8dfd-312677bdc4a7")
+		)
+		(fp_arc
+			(start 0.239066 -2.449741)
+			(mid 1.301345 -1.970299)
+			(end 2.018091 -1.051291)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "259c3220-d4f8-4f3f-be5c-0501604f251e")
+		)
+		(fp_arc
+			(start 0.316284 -6.539103)
+			(mid 0.075462 -6.617285)
+			(end -0.081188 -6.816204)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "efc8c370-8d47-488a-8267-58ddf4fcffc6")
+		)
+		(fp_arc
+			(start 1.344869 -6.800882)
+			(mid 1.1877 -6.612605)
+			(end 0.953718 -6.539103)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "6aef4ab4-bf06-4f38-b8ce-b37bff63f8c8")
+		)
+		(fp_arc
+			(start 1.344869 -6.800882)
+			(mid 1.381745 -6.844643)
+			(end 1.436576 -6.861005)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "adf0991d-8c27-4c3f-bcaa-a037e877ac5d")
+		)
+		(fp_arc
+			(start 1.845965 -6.860996)
+			(mid 2.356288 -6.732106)
+			(end 2.744226 -6.376372)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f4edb540-a648-4e50-9220-a213af91dce8")
+		)
+		(fp_arc
+			(start 2.997274 -0.419747)
+			(mid 2.414853 -0.591219)
+			(end 2.018265 -1.05093)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "9c07b0e4-44c6-4b49-8329-208667128644")
+		)
+		(fp_arc
+			(start 4.774564 -5.281006)
+			(mid 3.62108 -5.572312)
+			(end 2.744226 -6.376372)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "a0104ff1-28a1-4da9-bbe2-dbda0d086234")
+		)
+		(fp_curve
+			(pts
+				(xy -5.038879 -2.674721) (xy -5.038879 -2.556922) (xy -4.931702 -2.449741) (xy -4.813902 -2.449741)
+			)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "6295efeb-2bc4-426b-bc77-359e19857800")
+		)
+		(fp_curve
+			(pts
+				(xy -4.813902 -7.311006) (xy -4.931702 -7.311006) (xy -5.038879 -7.203825) (xy -5.038879 -7.086025)
+			)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "2763f843-92dc-4d4f-8e86-509dab68de8d")
+		)
+		(fp_curve
+			(pts
+				(xy 6.085672 -0.419747) (xy 6.203471 -0.419747) (xy 6.310649 -0.526925) (xy 6.310649 -0.644724)
+			)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "6c500c59-6ffb-4836-b26b-adb12d1e2016")
+		)
+		(fp_curve
+			(pts
+				(xy 6.310649 -5.056028) (xy 6.310649 -5.173827) (xy 6.203471 -5.281006) (xy 6.085672 -5.281006)
+			)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "e10558e8-6a51-4d12-86be-f652cbfb54dd")
+		)
+		(fp_line
+			(start -5.038879 -7.086025)
+			(end -5.038879 -6.58)
 			(stroke
 				(width 0.1)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "b412fb6e-3f2b-418b-a779-1d1b0eaa9484")
+			(layer "F.Fab")
+			(uuid "30b2d0a7-d9f9-43c9-ac21-ef35f600b662")
+		)
+		(fp_line
+			(start -5.038879 -2.674721)
+			(end -5.038879 -3.58)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "35866bae-03f0-4c31-9797-bbb6fd655144")
+		)
+		(fp_line
+			(start -4.813902 -2.449741)
+			(end 0.239066 -2.449741)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "e33086f6-5c2e-4dce-b1b6-97026c1e8fcf")
+		)
+		(fp_line
+			(start -0.870659 -7.311006)
+			(end -4.813902 -7.311006)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "6ee7d1be-598a-44d8-a957-5535383af299")
+		)
+		(fp_line
+			(start 0.953718 -6.539103)
+			(end 0.316284 -6.539103)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "c79bbad8-c944-4c56-a227-ddef05ac99b2")
+		)
+		(fp_line
+			(start 1.436576 -6.861005)
+			(end 1.845965 -6.860996)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "adb1ead6-1b96-48e1-9f3e-0ac0e75976fe")
+		)
+		(fp_line
+			(start 2.997274 -0.419747)
+			(end 6.085672 -0.419747)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "8037b648-193a-45af-bf84-90c41caabe41")
+		)
+		(fp_line
+			(start 6.085672 -5.281006)
+			(end 4.774564 -5.281006)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "e1a09081-3c5c-45d3-ba53-c49264aee2f0")
+		)
+		(fp_line
+			(start 6.310649 -5.056028)
+			(end 6.310649 -4.04)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "62eb2c6d-deac-49b6-b443-b2f36ebde9bb")
+		)
+		(fp_line
+			(start 6.310649 -0.644724)
+			(end 6.310649 -1.04)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "1302ab23-632e-43d2-bf7a-c133d5803aa5")
+		)
+		(fp_arc
+			(start -0.870659 -7.311006)
+			(mid -0.404802 -7.177082)
+			(end -0.081188 -6.816204)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "c11e2304-7716-418b-a8de-350d46ff1570")
+		)
+		(fp_arc
+			(start 0.239066 -2.449741)
+			(mid 1.301345 -1.970299)
+			(end 2.018091 -1.051291)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "3b80a452-450d-4003-85c9-8dffe8488fa3")
+		)
+		(fp_arc
+			(start 0.316284 -6.539103)
+			(mid 0.075462 -6.617285)
+			(end -0.081188 -6.816204)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "454dde6f-c8d1-4d11-8e8e-7a9c02b9c385")
+		)
+		(fp_arc
+			(start 1.344869 -6.800882)
+			(mid 1.1877 -6.612605)
+			(end 0.953718 -6.539103)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "0ffc5996-375c-4ee4-8a6a-45ba39231a73")
+		)
+		(fp_arc
+			(start 1.344869 -6.800882)
+			(mid 1.381745 -6.844643)
+			(end 1.436576 -6.861005)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "821440aa-c4db-4872-9a2e-20989517fd98")
+		)
+		(fp_arc
+			(start 1.845965 -6.860996)
+			(mid 2.356288 -6.732106)
+			(end 2.744226 -6.376372)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "88a7c394-e6fd-475b-844e-5cc46415591e")
+		)
+		(fp_arc
+			(start 2.997274 -0.419747)
+			(mid 2.414853 -0.591219)
+			(end 2.018265 -1.05093)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "19e13bb9-f684-4c71-b28e-0ed9fd75f662")
+		)
+		(fp_arc
+			(start 4.774564 -5.281006)
+			(mid 3.62108 -5.572312)
+			(end 2.744226 -6.376372)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "e0c53379-fa5c-4c1b-8d79-d6eae8fa7378")
+		)
+		(fp_curve
+			(pts
+				(xy -5.038879 -2.674721) (xy -5.038879 -2.556922) (xy -4.931702 -2.449741) (xy -4.813902 -2.449741)
+			)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "1c3cf5e7-674c-4863-86e5-db5ea1feb313")
+		)
+		(fp_curve
+			(pts
+				(xy -4.813902 -7.311006) (xy -4.931702 -7.311006) (xy -5.038879 -7.203825) (xy -5.038879 -7.086025)
+			)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "e2cc48c6-ce26-417a-8264-1bda47fa1738")
+		)
+		(fp_curve
+			(pts
+				(xy 6.085672 -0.419747) (xy 6.203471 -0.419747) (xy 6.310649 -0.526925) (xy 6.310649 -0.644724)
+			)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "b0b27df0-1056-404f-8f54-b8e6fc0b78ae")
+		)
+		(fp_curve
+			(pts
+				(xy 6.310649 -5.056028) (xy 6.310649 -5.173827) (xy 6.203471 -5.281006) (xy 6.085672 -5.281006)
+			)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "93b344b9-d545-427b-812b-c646ad2a2867")
 		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
+			(at 0.5 -4.5 0)
 			(layer "F.Fab")
-			(uuid "2f1dcf3a-2727-49aa-a6ea-3c14f5f8afd6")
+			(uuid "9fa17eda-cf5f-4f68-80ea-3722a4300e6d")
 			(effects
 				(font
-					(size 1 1)
-					(thickness 0.15)
+					(size 0.8 0.8)
+					(thickness 0.12)
 				)
 			)
 		)
 		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "3a471113-ac17-411c-899f-868dbe82dce2")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 -5.08 270)
+			(at -5.08 0)
 			(size 1.75 1.75)
 			(drill 1.75)
-			(layers "*.Mask")
-			(uuid "8489b1d0-0092-4f14-9f59-8ae09800160c")
+			(layers "*.Cu" "*.Mask")
+			(uuid "eb5a9233-1253-4a12-bf9f-7a583cdc45b9")
 		)
 		(pad "" np_thru_hole circle
 			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "112c10b3-d162-4a14-9180-4fe7f294cce9")
+			(size 3.9878 3.9878)
+			(drill 3.9878)
+			(layers "*.Cu" "*.Mask")
+			(uuid "e3192c9a-56dd-424e-bc5f-10aadfc5d085")
 		)
 		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "1eb64b01-f3a3-4f36-aa6b-f8e1d0f7cc4d")
-		)
-		(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")
-		)
-		(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 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "cc6f1f49-aa1d-40e1-92a2-54a4ca6a6c18")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "8da990ac-9d87-42af-a0e4-ac76e8ecfacd")
-		)
-		(pad "1" smd roundrect
-			(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")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "a12d650a-a7d7-4448-a7f0-f8975044ff83")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "a76535db-1572-4a28-8f77-0e67750b3e4a")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "1c075aad-71f8-47c6-986d-9b2263cd9ee3")
-		)
-		(pad "1" smd custom
-			(at 4.85 4.1 270)
-			(size 2.5 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "4bc07219-2c23-47dc-89be-e907ad8609ad")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 2 "key7")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "4b79a450-8882-4edf-883b-d3d8aaf80691")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "f4b04bf5-f428-4c30-aaec-d0d89585932d")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "0bb154e9-b91f-40a5-b446-d3868d1fae64")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "1a2c7863-aee9-4ba6-8081-494a80c8d874")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "e4b9061b-1700-41ef-8ce8-d5cda978e84d")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "08b0bc0e-b0fc-4806-94b8-74095bf5364c")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "a6ff9e70-98a8-499a-b516-91f957c4c3b0")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "67076723-5f30-49ea-852d-e79960b93810")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "aa7a95b7-e67e-40e0-94b2-81e6e3f5b51d")
-		(at 145 81)
-		(property "Reference" "SW15"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "f8b7c47c-8bf4-4b34-a683-397924b68137")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "c520ac45-c5c5-44e7-bc3a-d25cc00cf82f")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "f7d59666-cc15-4c83-9332-d0e19739cbd1")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "3fd6963b-38ab-4250-a856-45238d3a616c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/4f3004ca-156a-4811-9b28-dd6afdd82cf7")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "1ec54fec-3801-491d-910f-1039b9cd90b5")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "c643eb76-5a35-4a4f-9ecb-a9a18d6bc6e5")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 -5.08 270)
+			(at 5.08 0)
 			(size 1.75 1.75)
 			(drill 1.75)
-			(layers "*.Mask")
-			(uuid "643a3c5b-be9b-4e51-97ad-abe604459aa7")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "f75c9dc2-61ff-49b6-94b0-5d8cf7070572")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "4c5e2ffc-92d8-4797-920d-57ad1e8002dd")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "dae36df5-fb42-43ab-99ed-06c6b9da677f")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
 			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 12 "key15")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "3281cfff-f772-4c87-a61d-58b217aaee67")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 12 "key15")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "2e912e98-e4c1-4141-923d-d6b5170e5119")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "key15")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "ad06fda4-dda3-4119-9dab-d3e24832f221")
+			(uuid "9abe2be4-5f0a-4486-9c4b-c00124a0b283")
 		)
 		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
+			(at 3.81 -2.54)
+			(size 3.3 3.3)
 			(drill 3)
+			(property pad_prop_mechanical)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 12 "key15")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "1b078787-4b5d-48bb-9ca1-c4f78860fa4e")
+			(uuid "16a01d3d-7b44-4cb6-8b20-00b43b00d61d")
 		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
+		(pad "1" smd rect
+			(at 5.635 -2.54 180)
+			(size 1.65 2.5)
+			(layers "F.Cu")
+			(uuid "71770098-4e38-4030-a1a7-1b6efac7f7ce")
+		)
+		(pad "1" smd roundrect
+			(at 7.36 -2.54)
+			(size 2.55 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "key15")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "0a93ff0a-ae77-42b6-95d3-bb015f95f7a5")
+			(roundrect_rratio 0.1)
+			(uuid "0bd3aeef-0fb8-4db3-bdb4-e5ec0a418cc7")
 		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "71c52a76-7867-4344-82f0-08e8547cd0d9")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 12 "key15")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "5f9499e1-7b88-40cc-9514-5c3436e61c9a")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
+		(pad "2" smd roundrect
+			(at -6.09 -5.08)
+			(size 2.55 2.5)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "f60fb711-ebba-4ecd-b85c-dfa3bf92e6c9")
+			(roundrect_rratio 0.1)
+			(uuid "4cf3daa3-7e76-4099-a5d7-1589d96045dd")
 		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "f12de39c-873b-475d-8a6a-fc9ff72f2e4d")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "00c007db-21f0-413e-9bef-745ca9479ac3")
+		(pad "2" smd rect
+			(at -4.34 -5.08)
+			(size 1.65 2.5)
+			(layers "F.Cu")
+			(uuid "c0185d35-0e53-42ac-8bc7-ffe5100d9b0e")
 		)
 		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
+			(at -2.54 -5.08)
+			(size 3.3 3.3)
 			(drill 3)
+			(property pad_prop_mechanical)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "dbe0df3d-7feb-4af2-acae-5e954b90d22b")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "dfa3b5c9-3e4e-4996-af3f-97ceec776580")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "ac2e4be1-08ba-4fab-90c8-31d17b8fe0d0")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "170b7465-0f90-4f27-b9dd-61eac20485ab")
+			(uuid "11948357-71d8-4b25-8645-6eb947e9512b")
 		)
 		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "b12b21e7-345e-4b80-afc3-804a10169d3f")
-		(at 116.5 138)
-		(property "Reference" "SW18"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "bc45ff81-6a8a-4a5b-8644-add5183f0853")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "f93770f8-2f0c-4384-a95a-577f4965c2da")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "05b0d520-92f6-492a-9f97-0abb10950069")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "f4600002-e1b9-4193-b7e3-9a27b1e6a4dd")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/51f7fc62-75a8-4307-8df9-43a1005c0cb9")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "baa91011-ba07-4d0e-ac14-1c1a66155542")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "acaccac1-f611-40c5-9997-89e5351da7ee")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "6d391c3f-6aba-49c1-b251-ee1544b03752")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "9b17bd04-fa34-48ed-bd7c-29b7f2f62f0b")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "8de00b43-37c0-40d7-ba2a-34bfe6827242")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 24 "key18")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "15b94e74-d7a7-4b9c-88b5-5ab8f808fec0")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 24 "key18")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "80dc7d73-8f82-4d99-b8d5-4403782ee20d")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "key18")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "03ec9121-115c-4c42-b0c2-4bb6ea5aeb42")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 24 "key18")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "e29c7928-45b4-4cbd-9703-4fe360675c09")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "key18")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "f2f04aa0-9104-41cd-9195-0fcdd018380b")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "a2e54c88-f3e4-4693-8307-02affa49c79f")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 24 "key18")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "6612d725-286d-4cd1-b6d8-5bdbcc195b27")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "38109ffa-ddad-4811-aede-60b56ab7cc7e")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "e79e426e-d2b7-4d83-8f7b-843ddc77c15a")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "bed19286-5540-4bcc-b606-176f368d1749")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "b92e2ab9-177d-46e2-a9cf-412415b03103")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "a475e650-837a-4dae-935d-2074a7c9e506")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "6fb9a718-512a-4546-ac13-b622d9972b12")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "1d0a4b45-df4f-499e-b998-4129513b8c97")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "b8267111-697a-4730-ba45-d6a52adb8d9a")
-		(at 126 100)
-		(property "Reference" "SW13"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "be3d930c-3ee8-47b1-9e4d-a406bda430bc")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "4de51291-61ae-45e8-b03a-49fded3a8550")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "90a4ba48-ba99-41e4-a5d9-e430bbb4c6c2")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "1c394e58-b6cc-4f71-9239-1160d7e02624")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/f6e9efc0-10ba-412f-b481-906c363eb639")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "870fe2df-f6a2-47df-b38e-bff7af262d6b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "d1ba3c2f-fbcc-4df6-b849-d2dd26f54152")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "96faedc2-26f4-4e78-a26e-b773a3c64210")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "a37c1a95-fb17-492f-b511-25f6ddc2cc72")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "1f4359bd-207c-4404-be37-d00f1f292caa")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 15 "key13")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "0063582c-65d0-4755-8fe0-ac53858427b5")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 15 "key13")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "ab80e50c-cc53-4db0-8e2f-62eeb2ff31f7")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 15 "key13")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "c59bf713-09ff-4558-9c8c-5eceedfae2df")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 15 "key13")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "1f2922b3-e557-4c5d-ac66-965892528616")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 15 "key13")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "6e401dfd-5b3c-4cc1-b0a8-8d750624bf84")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "1b565511-101c-4653-b2a3-074a4ff166ea")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 15 "key13")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "f0c0aba5-3474-47ae-90ed-4d54f5c875ac")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "6f1bf78f-259e-4e68-a1b7-56ab8ed80c5a")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "af6348e4-32e9-445d-a7c5-710ed281b56e")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "dc9fac4d-379d-4013-9851-e03dfacf76a3")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "9798fd87-9208-4e89-af27-ee00bf4ca0fd")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "b1bc44d9-464e-43fb-b5d9-615279ca3ea2")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "e828d91a-47a6-477a-aaec-54c67c5616d3")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "e1ee95d3-3a6e-4ca1-b5c0-e5156f905e2b")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "c6b3fc26-321b-4a08-8117-842fad0f4314")
-		(at 145 100)
-		(property "Reference" "SW16"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "116b31f2-a318-42b0-b6c1-013932e806a2")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "78c1456b-8981-49e8-a4c5-ce9213143ce4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "13983b78-c20d-4a76-a860-0e74ffa2103b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "ea6a1d62-f2d6-4490-8a9c-800843b86c8e")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/a4651a33-ea9c-4c90-92b9-17fe7780462d")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "8f2ed470-2272-4308-80df-e2d90e1e78bc")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "b90369c2-2c6a-4ca8-a16c-d00ccfc53052")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "1da42b84-841a-49e5-b97a-8c45657f9e2c")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "1bbe67c0-3fac-4097-878f-0d80d9abe28d")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "6efa5ead-7449-4408-aad2-2e3da05aee1d")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 16 "key16")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "7d7b5328-fd32-45dc-91b9-051dc810437a")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 16 "key16")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "4f44fcd9-e2aa-47e8-a234-853145f37a46")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "key16")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "9b78e3d5-2efd-4585-af7b-cb6b81ae32d0")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 16 "key16")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "58584713-30c1-4824-88f8-c0876f04e934")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "key16")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "9661971e-1251-4c0f-b0c2-37e3c5f2ab87")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "17673da0-cc43-400e-ad73-8d16e53f3562")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 16 "key16")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "521728a5-4edc-42c3-af8f-63394b566751")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "da277442-44a0-4fc1-875b-d79f830f9c25")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "cb214c46-167e-48b5-be8f-df325b2ff180")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "e74bf017-1fd1-41d6-9a81-ad9ff06cfec2")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "db72c702-da72-45ef-9626-75036d0ab639")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "61154deb-4b50-480d-9565-59f213bb9cc8")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "91b6f40a-d894-45d9-aea6-d1ece334851d")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "5a1eb187-f03b-4843-89b0-80e30d0e0c76")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:mx_choc-12_ks33-123_hs"
-		(layer "F.Cu")
-		(uuid "f93692e4-e471-44fa-b6ef-44eb669546f8")
-		(at 126 81)
-		(property "Reference" "SW12"
-			(at 0 -0.5 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "a06a8e4d-371a-476f-ae90-712fbc100120")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "SW_Push_45deg"
-			(at 0 11 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "bbf4f3c0-f6c9-4cd1-85b1-d7331bcc83fc")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "6fd56818-0ef5-45c8-b089-0d1a73d16157")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "38c43098-5286-4863-a1b9-2a5faabf1f68")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(path "/52608491-a07b-4c34-b7f4-3f2039564b81")
-		(sheetname "/")
-		(sheetfile "shield.kicad_sch")
-		(clearance 0)
-		(attr through_hole)
-		(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")
-		)
-		(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")
-		)
-		(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")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -3.4 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "e53ca692-7cb2-421c-a965-6aaeb1340925")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -5.494064 0.00753 270)
-			(size 1.9 1.9)
-			(drill 1.9)
-			(layers "*.Mask")
-			(uuid "fe133e9c-d403-449c-93eb-f002c6c6bec2")
-		)
-		(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 0)
-			(size 5.05 5.05)
-			(drill 5.05)
-			(layers "*.Mask")
-			(uuid "78183abb-44c3-4071-8659-7f906a2219e3")
-		)
-		(pad "" np_thru_hole circle
-			(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")
-		)
-		(pad "" np_thru_hole circle
-			(at 0 6 270)
-			(size 3 3)
-			(drill 3)
-			(layers "*.Mask")
-			(clearance 0)
-			(uuid "950c3987-8d5f-426d-bca9-d39da7bcc0f1")
-		)
-		(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")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "3da370fc-8ecd-4347-84db-cb23a822e2d0")
-		)
-		(pad "1" thru_hole oval
-			(at -5.425 -2.575 355)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 28 "key12")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "422d61ed-4de3-4dc9-81ae-b0d8acfff886")
-		)
-		(pad "1" smd roundrect
-			(at -5.08 -4.54 270)
-			(size 4 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 28 "key12")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "6b98761a-dc3e-4797-b540-7393ac5998b6")
-		)
-		(pad "1" smd custom
-			(at 2.25 2.05)
-			(size 0.2 0.2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 28 "key12")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_arc
-					(start -4.866295 -3.393503)
-					(mid -0.322994 -4.271857)
-					(end -0.55 0.35)
-					(width 0.2)
-				)
-				(gr_arc
-					(start -4.866294 -3.393503)
-					(mid -5.612479 -3.169514)
-					(end -5.827192 -3.91842)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy -5.693179 -3.226751) (xy -5.86 -3.44) (xy -6.172812 -3.43838) (xy -6.357657 -3.26)
-					)
-					(width 0.2)
-				)
-				(gr_curve
-					(pts
-						(xy 0.17 -0.387638) (xy 0.01 -0.181834) (xy 0.18 0.11) (xy 0.45 0.13)
-					)
-					(width 0.2)
-				)
-			)
-			(uuid "b8e0d3d8-9a26-4c86-87fd-9cfc7942d521")
-		)
-		(pad "1" thru_hole circle
-			(at 2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 28 "key12")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "b6571b40-314a-4012-a5e6-d7d26202c574")
-		)
-		(pad "1" smd custom
-			(at 2.737497 6.1125)
-			(size 2.074994 2.074994)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 28 "key12")
-			(pinfunction "1")
-			(pintype "passive")
-			(clearance 0)
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -1.437497 -1.2125) (xy 0.962503 -1.2125) (xy 0.962503 1.2875) (xy -1.737497 1.2875) (xy -1.084363 0.740634)
-						(xy -0.937497 0.3875) (xy -0.937497 -0.3125) (xy -1.037497 -0.8125)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -1.437497 -1.2125)
-					(mid -1.047664 0.098369)
-					(end -1.747684 1.273238)
-					(width 0.2)
-				)
-			)
-			(uuid "86b27bb1-4079-40b3-9104-947de6022d1e")
-		)
-		(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")
-			(pinfunction "1")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_rect
-					(start -1.35 -3.9)
-					(end 0.75 -0.35)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start 2.5 -1)
-					(mid 1.334023 -1.482964)
-					(end 0.851059 -2.648941)
-					(width 0.2)
-				)
-				(gr_arc
-					(start 2.55 -0.85)
-					(mid 1.277208 -1.377208)
-					(end 0.75 -2.65)
-					(width 0.5)
-				)
-				(gr_rect
-					(start 1.05 -1.35)
-					(end 1.35 -0.900289)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_poly
-					(pts
-						(xy 0.2 -0.85) (xy 0.21903 -0.945671) (xy 0.273223 -1.026777) (xy 0.354329 -1.08097) (xy 0.45 -1.1)
-						(xy 4.95 -1.1) (xy 5.045671 -1.08097) (xy 5.126777 -1.026777) (xy 5.18097 -0.945671) (xy 5.2 -0.85)
-						(xy 5.2 1.15) (xy 5.18097 1.245671) (xy 5.126777 1.326777) (xy 5.045671 1.38097) (xy 4.95 1.4)
-						(xy 0.45 1.4) (xy 0.354329 1.38097) (xy 0.273223 1.326777) (xy 0.21903 1.245671) (xy 0.2 1.15)
-					)
-					(width 0)
-					(fill yes)
-				)
-			)
-			(uuid "ce8cb1f1-cae1-4518-8ddb-c236a1f28a8d")
-		)
-		(pad "1" thru_hole oval
-			(at 4.85 4.1 65)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 28 "key12")
-			(pinfunction "1")
-			(pintype "passive")
-			(uuid "0362241a-a02c-476c-88c3-8d1cbd7978bf")
-		)
-		(pad "2" smd custom
-			(at -4.875001 4.098634 90)
-			(size 2.5 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy -0.201366 -0.824999) (xy -0.220396 -0.92067) (xy -0.274589 -1.001776) (xy -0.355695 -1.055969)
-						(xy -0.451366 -1.074999) (xy -4.951366 -1.074999) (xy -5.047037 -1.055969) (xy -5.128143 -1.001776)
-						(xy -5.182336 -0.92067) (xy -5.201366 -0.824999) (xy -5.201366 1.175001) (xy -5.182336 1.270672)
-						(xy -5.128143 1.351778) (xy -5.047037 1.405971) (xy -4.951366 1.425001) (xy -0.451366 1.425001)
-						(xy -0.355695 1.405971) (xy -0.274589 1.351778) (xy -0.220396 1.270672) (xy -0.201366 1.175001)
-					)
-					(width 0)
-					(fill yes)
-				)
-				(gr_rect
-					(start -0.751366 -3.874999)
-					(end 1.348634 -0.324999)
-					(width 0.5)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.852425 -2.62394)
-					(mid -1.335389 -1.457963)
-					(end -2.501366 -0.974999)
-					(width 0.2)
-				)
-				(gr_rect
-					(start -1.351366 -1.324999)
-					(end -1.051366 -0.974999)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start -0.751366 -2.624999)
-					(mid -1.278574 -1.352207)
-					(end -2.551366 -0.824999)
-					(width 0.5)
-				)
-			)
-			(uuid "4491ef87-f736-4012-8861-09d2a2f36343")
-		)
-		(pad "2" thru_hole oval
-			(at -4.875001 4.098634 295)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "d7a946b5-302a-4746-b5aa-419f91e0f6b5")
-		)
-		(pad "2" smd custom
-			(at -2.7875 6.1125)
-			(size 1.975 1.975)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(thermal_bridge_angle 90)
-			(options
-				(clearance outline)
-				(anchor circle)
-			)
-			(primitives
-				(gr_poly
-					(pts
-						(xy 1.5375 -1.2625) (xy -0.9125 -1.2625) (xy -0.9125 1.2875) (xy 1.7875 1.2875) (xy 1.3375 1.0375)
-						(xy 1.0375 0.4875) (xy 0.9875 -0.3625) (xy 1.1375 -0.9625)
-					)
-					(width 0.2)
-					(fill yes)
-				)
-				(gr_arc
-					(start 1.80025 1.26965)
-					(mid 1.098042 0.062808)
-					(end 1.5375 -1.2625)
-					(width 0.2)
-				)
-			)
-			(uuid "9e90d3f5-48d8-4bb6-a2d3-70060f86ae0b")
-		)
-		(pad "2" thru_hole circle
-			(at -2.54 3.81)
-			(size 3.5 3.5)
-			(drill 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(clearance 0)
-			(uuid "73a6bf9e-c53c-47c5-aee9-8553c80e48b5")
-		)
-		(pad "2" smd roundrect
-			(at 5.08 -4.54 90)
-			(size 4 2.5)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "9ed33ed6-2095-479f-a659-7ccbaaa9c4ff")
-		)
-		(pad "2" thru_hole oval
-			(at 5.421187 -2.575646 5)
-			(size 4.2 3.5)
-			(drill oval 3.7 3)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "1712dc9f-7310-4b70-870e-e64c0c86e92c")
-		)
-		(pad "2" smd roundrect
-			(at 5.75 -5.05 270)
-			(size 4.9 2.5)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.1)
-			(net 1 "GND")
-			(pinfunction "2")
-			(pintype "passive")
-			(uuid "92565c74-412c-4652-8655-fd1e57ca5a95")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical"
-		(locked yes)
-		(layer "B.Cu")
-		(uuid "40a62d4d-015c-4ad0-9656-246c9b1b8404")
-		(at 54.6 82.025 180)
-		(descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
-		(tags "Through hole pin header THT 1x02 2.54mm single row")
-		(property "Reference" "J5"
-			(at 2.7 -1.125 0)
-			(layer "B.SilkS")
-			(hide yes)
-			(uuid "0e2d3aee-ee7b-4e58-b44f-8f5509b96f34")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Value" "Conn_01x02"
-			(at 0 -4.92 0)
-			(layer "B.Fab")
-			(uuid "1ba5eb13-c680-4b02-92cf-67498dfffab2")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "a6397e3b-faba-49ee-80bb-a75dc9a64afe")
-			(effects
-				(font
-					(size 1.27 1.27)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
-			(at 0 0 0)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "0d50a31c-f2b9-45d2-9b01-ecbc8243e231")
-			(effects
-				(font
-					(size 1.27 1.27)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(attr through_hole exclude_from_bom dnp)
-		(fp_line
-			(start 1.38 -1.27)
-			(end 1.38 -3.92)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "0a2f4ed7-a992-4a03-b226-89f1384d7695")
-		)
-		(fp_line
-			(start -1.38 1.38)
-			(end 0 1.38)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "7c57002d-769f-4ac9-8934-f70d76f852b1")
-		)
-		(fp_line
-			(start -1.38 0)
-			(end -1.38 1.38)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "cedb51c6-fbd8-4830-9573-d4fe6c3d774d")
-		)
-		(fp_line
-			(start -1.38 -1.27)
-			(end 1.38 -1.27)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "2cdeb9db-f6c3-411e-9346-05fd2d479fe3")
-		)
-		(fp_line
-			(start -1.38 -1.27)
-			(end -1.38 -3.92)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "93b062e6-38f8-47bd-b59c-50a30043021c")
-		)
-		(fp_line
-			(start -1.38 -3.92)
-			(end 1.38 -3.92)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "9586c5a5-ed9c-4aee-99f1-feffb3ba25e4")
-		)
-		(fp_line
-			(start 1.77 1.77)
-			(end -1.77 1.77)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "35f41287-afaa-45fb-9463-e6ffe889bec2")
-		)
-		(fp_line
-			(start 1.77 -4.32)
-			(end 1.77 1.77)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "d9fad7bc-0703-4b82-a89d-fe258e6985c7")
-		)
-		(fp_line
-			(start -1.77 1.77)
-			(end -1.77 -4.32)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "4e665833-19af-4eb4-adf3-86a9ab0dee34")
-		)
-		(fp_line
-			(start -1.77 -4.32)
-			(end 1.77 -4.32)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "8f542b30-d856-43fd-99b8-bbde76166a9e")
-		)
-		(fp_line
-			(start 1.27 1.27)
-			(end 1.27 -3.81)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "975baa93-be00-4b04-975b-9b6995b87a65")
-		)
-		(fp_line
-			(start 1.27 -3.81)
-			(end -1.27 -3.81)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "fb8c5295-d27d-402c-8858-19129bc15d08")
-		)
-		(fp_line
-			(start -0.635 1.27)
-			(end 1.27 1.27)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "10c2493f-415b-48a7-861c-028be08b372b")
-		)
-		(fp_line
-			(start -1.27 0.635)
-			(end -0.635 1.27)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "a6fc91b7-9102-4a47-a81b-ba3e2ee6ab61")
-		)
-		(fp_line
-			(start -1.27 -3.81)
-			(end -1.27 0.635)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "cfb20c8b-161b-465d-9144-478a81a78a16")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -1.27 90)
-			(layer "B.Fab")
-			(uuid "898864d7-fa9f-47c2-88e5-433c758206d3")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.7 1.7)
-			(drill 1)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 35 "vbat")
-			(pinfunction "Pin_1")
-			(pintype "passive")
-			(uuid "a9ec09ee-cf8d-4ce8-b512-84692456adde")
-		)
-		(pad "2" thru_hole circle
-			(at 0 -2.54 180)
-			(size 1.7 1.7)
-			(drill 1)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "Pin_2")
-			(pintype "passive")
-			(uuid "236dbea9-6c66-4c69-8b5b-e82ae41e656a")
-		)
-		(embedded_fonts no)
-		(model "${KICAD9_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.stpZ"
+		(model "${KICAD8_3RD_PARTY}/3dmodels/com_github_ebastler_marbastlib/HS_KS-2P02B01-01_MX.step"
 			(offset
 				(xyz 0 0 0)
 			)
@@ -10615,464 +4705,775 @@
 			)
 		)
 	)
-	(footprint "phiboard:THD_0510-10CL-GF"
-		(locked yes)
-		(layer "B.Cu")
-		(uuid "447504e5-c3d6-48a6-8d7a-31adfdc8ec3b")
-		(at 42.4 69 90)
-		(descr "FFC FPC 1x10")
-		(property "Reference" "J4"
-			(at 0 0.1 270)
-			(unlocked yes)
-			(layer "B.SilkS")
+	(footprint "PCM_marbastlib-xp-choc:SW_choc_v2_HS_CPG135001S30_1u"
+		(layer "F.Cu")
+		(uuid "d9387b54-4809-4728-b454-cfc10e9ec697")
+		(at 245.5 121.2)
+		(descr "Hotswap footprint for Kailh Choc v2 style switches")
+		(property "Reference" "REF**"
+			(at 0 -2.75 180)
+			(layer "Dwgs.User")
 			(hide yes)
-			(uuid "4e25ca9f-9678-4f42-b6fe-14de670196e8")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Value" "Conn_01x10"
-			(at 0 -2.6 270)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "7b193f9e-fa74-43af-b0c4-8d953500e753")
+			(uuid "3df909b7-5941-48d5-8947-847583966bdb")
 			(effects
 				(font
 					(size 1 1)
 					(thickness 0.15)
 				)
-				(justify mirror)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 0 0 270)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "f7503003-e2a6-4a3d-bd63-1e2af9f07eb2")
+		(property "Value" "CPG135001S30"
+			(at 0 0 180)
+			(layer "F.Fab")
+			(uuid "7cac0b0e-f23d-4d69-9fce-c8197e4db1b8")
 			(effects
 				(font
 					(size 1 1)
 					(thickness 0.15)
 				)
-				(justify mirror)
 			)
 		)
-		(property "Description" "Generic connectable mounting pin connector, single row, 01x10, script generated (kicad-library-utils/schlib/autogen/connector/)"
-			(at 0 0 270)
-			(unlocked yes)
-			(layer "B.Fab")
+		(property "Datasheet" ""
+			(at 0 0 0)
+			(layer "F.Fab")
 			(hide yes)
-			(uuid "827b24a0-9484-41a4-b63f-6c328331f456")
+			(uuid "15c0494d-8d1b-4fc7-98cb-ae2c4556b241")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
-				(justify mirror)
 			)
 		)
-		(property "LCSC PN" "C283121"
-			(at 0 0 270)
-			(unlocked yes)
-			(layer "B.Fab")
+		(property "Description" ""
+			(at 0 0 0)
+			(layer "F.Fab")
 			(hide yes)
-			(uuid "1bb9defa-4ad8-46a7-9193-6afb26b334eb")
+			(uuid "763b83f1-c128-4bf2-85a2-bf5a5eadc40e")
 			(effects
 				(font
-					(size 1 1)
+					(size 1.27 1.27)
 					(thickness 0.15)
 				)
-				(justify mirror)
 			)
 		)
 		(attr smd)
-		(fp_poly
-			(pts
-				(xy -2.6 2.2) (xy -3.6 2.2) (xy -3.6 -2) (xy 3.6 -2) (xy 3.6 2.1) (xy 2.6 2.1) (xy 2.6 2.8) (xy -2.6 2.8)
+		(fp_line
+			(start -2.3 7.475)
+			(end -1.5 8.275)
+			(stroke
+				(width 0.12)
+				(type solid)
 			)
+			(layer "F.SilkS")
+			(uuid "23724082-c464-42f5-ac12-754498ef18e9")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end -2.3 4.425)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "e2203347-d178-4188-bb7b-c8f0fa5b0a75")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end -0.5 3.625)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "5802aed8-9a2c-43c2-a2af-a47564e475a3")
+		)
+		(fp_line
+			(start -1.5 8.275)
+			(end -0.5 8.275)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "93c74c73-5acd-46ad-ac2a-88d4b523e46d")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 6.504 1.475)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "686e04dd-881e-4a7b-b112-602be10f5f72")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 7.504 2.175)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "a8e7c546-31e1-4781-beaf-93466ae9f06d")
+		)
+		(fp_arc
+			(start 7.25 5.325)
+			(mid 7.015685 5.890685)
+			(end 6.45 6.125)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "57df1425-3738-4606-a629-d6e83f25f0d7")
+		)
+		(fp_rect
+			(start -9 -8.5)
+			(end 9 8.5)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Dwgs.User")
+			(uuid "9cc935d6-0277-4c39-ab26-294c057e8456")
+		)
+		(fp_rect
+			(start -2.75 -6.405)
+			(end 2.75 -3.455)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Cmts.User")
+			(uuid "9327e501-cad1-40ee-b2e0-5c82d60117fe")
+		)
+		(fp_rect
+			(start -9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(fill no)
+			(layer "Eco1.User")
+			(uuid "8477629b-a319-446e-95d2-e9f2bd656ca4")
+		)
+		(fp_line
+			(start -6.95 6.45)
+			(end -6.95 -6.45)
 			(stroke
 				(width 0.05)
 				(type solid)
 			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "31148d4e-0d3d-4d2d-9979-613202419c6e")
+			(layer "Eco2.User")
+			(uuid "faf3baef-d684-4c9a-be99-84ae70025b68")
 		)
 		(fp_line
-			(start 2.8 -1.4)
-			(end -2.8 -1.4)
-			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "4ec89874-3bc1-465c-b28a-163689fbc333")
-		)
-		(fp_line
-			(start -2.8 -1.4)
-			(end -2.8 0.4)
-			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "937e6a87-e4c7-4dba-b11b-636c4ae6c0da")
-		)
-		(fp_line
-			(start -3.4 0.1)
-			(end -3.4 1.9)
-			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "60083704-7b4d-4f85-84f8-4c41ad21cd43")
-		)
-		(fp_line
-			(start 2.8 0.4)
-			(end 2.8 -1.4)
-			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "8fe5f925-2e45-4015-bb1f-78b6e36d2dca")
-		)
-		(fp_line
-			(start -3.4 1.215)
-			(end 3.4 1.215)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "User.1")
-			(uuid "d691ece2-0c2c-4f2b-8897-be2649b78674")
-		)
-		(fp_line
-			(start 3.4 1.9)
-			(end 3.4 0.1)
-			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "3914eab8-9406-4805-b137-64492f2eefa3")
-		)
-		(fp_line
-			(start -3.4 1.9)
-			(end 3.4 1.9)
-			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "807fb984-2088-492e-974e-5c3e931d7418")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 0 270)
-			(unlocked yes)
-			(layer "B.Fab")
-			(uuid "26d01003-3090-463f-b1c9-f7c6ed420ac1")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(pad "1" smd roundrect
-			(at -2.25 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 37 "sclk")
-			(pinfunction "Pin_1")
-			(pintype "passive")
-			(uuid "2170a1f5-7ed2-42ac-9d03-d13bdcc27df3")
-		)
-		(pad "2" smd roundrect
-			(at -1.75 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 38 "si")
-			(pinfunction "Pin_2")
-			(pintype "passive")
-			(uuid "3b1ca821-3f23-4fc3-aa44-9c3c01f28979")
-		)
-		(pad "3" smd roundrect
-			(at -1.25 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 36 "scs")
-			(pinfunction "Pin_3")
-			(pintype "passive")
-			(uuid "bdd53f1c-fe21-4132-a60f-99bf9a180a91")
-		)
-		(pad "4" smd roundrect
-			(at -0.75 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 1 "GND")
-			(pinfunction "Pin_4")
-			(pintype "passive")
-			(uuid "00895bfe-ead9-4856-b37e-277e66c1451f")
-		)
-		(pad "5" smd roundrect
-			(at -0.25 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
-			(pinfunction "Pin_5")
-			(pintype "passive")
-			(uuid "174263b1-3dbe-4bc9-8c5b-035622676ae7")
-		)
-		(pad "6" smd roundrect
-			(at 0.25 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
-			(pinfunction "Pin_6")
-			(pintype "passive")
-			(uuid "d31b5e14-b846-4929-9508-2158d925b2bc")
-		)
-		(pad "7" smd roundrect
-			(at 0.75 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
-			(pinfunction "Pin_7")
-			(pintype "passive")
-			(uuid "d8bc7be6-cada-4c5c-bbbb-bc1080d00b37")
-		)
-		(pad "8" smd roundrect
-			(at 1.25 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 1 "GND")
-			(pinfunction "Pin_8")
-			(pintype "passive")
-			(uuid "72fc0470-18e7-4070-b6c0-ea752861d6d7")
-		)
-		(pad "9" smd roundrect
-			(at 1.75 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 1 "GND")
-			(pinfunction "Pin_9")
-			(pintype "passive")
-			(uuid "251f2d80-a43a-4d2b-9e66-8ee7b23eace4")
-		)
-		(pad "10" smd roundrect
-			(at 2.25 2.3 90)
-			(size 0.3 0.65)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 1 "GND")
-			(pinfunction "Pin_10")
-			(pintype "passive")
-			(uuid "dab3acce-ece1-42ff-8bac-5cd37f58cbb1")
-		)
-		(pad "MP" smd roundrect
-			(at -3.135 -0.51 90)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 52 "unconnected-(J4-MountPin-PadMP)")
-			(pinfunction "MountPin")
-			(pintype "passive+no_connect")
-			(uuid "e5f6beba-66d7-4349-9d88-6761d53307fe")
-		)
-		(pad "MP" smd roundrect
-			(at 3.135 -0.51 90)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.15)
-			(net 53 "unconnected-(J4-MountPin-PadMP)_1")
-			(pinfunction "MountPin")
-			(pintype "passive+no_connect")
-			(uuid "c18dda00-5c32-4ddc-97f4-f25aa3e3c958")
-		)
-		(embedded_fonts no)
-	)
-	(footprint "phiboard:magnetic connector 01x02P"
-		(locked yes)
-		(layer "B.Cu")
-		(uuid "48bfa332-5891-4bf2-97e6-f91507c52850")
-		(at 43.5 59 180)
-		(property "Reference" "J2"
-			(at 0 1 0)
-			(unlocked yes)
-			(layer "B.SilkS")
-			(hide yes)
-			(uuid "0f872701-ffe0-458d-89d8-e3789c4de093")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Value" "Conn_01x02"
-			(at 0 -4.9 0)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "49f77e97-4276-4755-b814-5b9bd1bf4fc5")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "1fd584b4-3cef-4c34-9ede-c6cd9742119c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "6eb77c90-8e23-45be-b5b9-2ca840733b17")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(attr smd exclude_from_bom dnp)
-		(fp_poly
-			(pts
-				(xy 6 2) (xy -6 2) (xy -6 -2) (xy -2.5 -2) (xy -2.5 -4.5) (xy 2.5 -4.5) (xy 2.5 -2) (xy 6 -2)
-			)
+			(start -6.45 -6.95)
+			(end 6.45 -6.95)
 			(stroke
 				(width 0.05)
 				(type solid)
 			)
+			(layer "Eco2.User")
+			(uuid "46218fef-e93c-4b3a-a7a9-9509c3d18583")
+		)
+		(fp_line
+			(start 6.45 6.95)
+			(end -6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "4025d905-875b-4852-80b1-6d16579886df")
+		)
+		(fp_line
+			(start 6.95 -6.45)
+			(end 6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "d1accc87-5590-4c86-83a1-27a0446f9391")
+		)
+		(fp_arc
+			(start -6.95 -6.45)
+			(mid -6.803553 -6.803553)
+			(end -6.45 -6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "9d753620-a5e7-4ef6-9bbc-8b37a9e5d7be")
+		)
+		(fp_arc
+			(start -6.45 6.95)
+			(mid -6.803553 6.803553)
+			(end -6.95 6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "2eb6b98e-27c9-4b0e-902f-d6109abc74fc")
+		)
+		(fp_arc
+			(start 6.45 -6.95)
+			(mid 6.803553 -6.803553)
+			(end 6.95 -6.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "19c7de5c-9ccf-4763-85ba-f7e7468a5699")
+		)
+		(fp_arc
+			(start 6.95 6.45)
+			(mid 6.803553 6.803553)
+			(end 6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "07da32e9-598f-4095-86a8-0898216da6fd")
+		)
+		(fp_arc
+			(start 6.95 6.45)
+			(mid 6.803553 6.803553)
+			(end 6.45 6.95)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "Eco2.User")
+			(uuid "8d9d1f19-9229-4898-a18b-e6a415ffc3c1")
+		)
+		(fp_rect
+			(start -7 -7)
+			(end 7 7)
+			(stroke
+				(width 0.05)
+				(type default)
+			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "7eb13d47-40df-438c-88a0-dca53a7be583")
+			(uuid "c1dd8b86-40a7-4c79-bf19-1cdd61e63c39")
 		)
 		(fp_line
-			(start 6 -1)
-			(end 5 -1)
+			(start -4.104 4.975)
+			(end -4.104 6.925)
 			(stroke
-				(width 0.1)
-				(type default)
+				(width 0.05)
+				(type solid)
 			)
-			(layer "User.1")
-			(uuid "0e727473-59b3-4d78-8164-88e06c5b71c0")
+			(layer "F.CrtYd")
+			(uuid "f8372d65-52e1-43d7-ae95-65a2887d8f6d")
 		)
 		(fp_line
-			(start -6 -1)
-			(end -5 -1)
+			(start -4.104 4.975)
+			(end -2.3 4.975)
 			(stroke
-				(width 0.1)
-				(type default)
-			)
-			(layer "User.1")
-			(uuid "549be7d8-781f-4291-a185-b66d0f66c8a4")
-		)
-		(fp_rect
-			(start -6 2)
-			(end 6 0)
-			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "3afd0f82-aa64-43bc-8d5e-2cb0a6f5a26b")
+			(layer "F.CrtYd")
+			(uuid "ec460ea1-2132-4a1a-937d-8dfe116be11a")
 		)
-		(fp_rect
-			(start -6 0)
-			(end 6 -2)
+		(fp_line
+			(start -4.104 6.925)
+			(end -2.3 6.925)
 			(stroke
-				(width 0.1)
+				(width 0.05)
 				(type solid)
 			)
-			(fill no)
-			(layer "User.1")
-			(uuid "6353cfa0-4183-440e-ad14-aa851a8bd0b8")
+			(layer "F.CrtYd")
+			(uuid "58cb8fe9-46f7-4ef9-9072-edc264589dd9")
 		)
-		(fp_text user "${REFERENCE}"
-			(at 0 1 0)
-			(unlocked yes)
-			(layer "B.Fab")
-			(uuid "0650ecd3-cb86-4bd2-9d19-af7ad6e470b1")
+		(fp_line
+			(start -2.3 4.975)
+			(end -2.3 4.425)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "0b01a50f-55c8-477f-8944-069003e87ba1")
+		)
+		(fp_line
+			(start -2.3 7.475)
+			(end -2.3 6.925)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "9b3a12e7-e1bc-48e6-a7b0-4a8065b02f6a")
+		)
+		(fp_line
+			(start -2.3 7.475)
+			(end -1.5 8.275)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "9cf6bb1c-e1bd-48c3-b6b6-40af2e45f9b1")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end -2.3 4.425)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "060d0f02-4e6e-498e-bbd1-9000ed55101b")
+		)
+		(fp_line
+			(start -1.5 3.625)
+			(end 0.3 3.625)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5b58df53-1e39-46a7-9eef-aeaad788e543")
+		)
+		(fp_line
+			(start -1.5 8.275)
+			(end 1.65 8.275)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "d7cdaf11-2e54-4bae-8081-e05abb85f918")
+		)
+		(fp_line
+			(start 2.45 7.475)
+			(end 1.65 8.275)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "874a8e10-5db1-4a31-ae8d-c4514f516bd4")
+		)
+		(fp_line
+			(start 2.45 7.475)
+			(end 2.45 7.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "acc8549b-0a33-4b56-a6ef-7fde1f0cd2b0")
+		)
+		(fp_line
+			(start 3.45 6.125)
+			(end 6.45 6.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "7ee7b035-8c56-49b8-aa83-ed4d8e8a9336")
+		)
+		(fp_line
+			(start 7.25 4.725)
+			(end 9.104 4.725)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "adc6904e-42a0-4a7b-8c23-784e93099ddc")
+		)
+		(fp_line
+			(start 7.25 5.325)
+			(end 7.25 4.725)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "771a9f59-afd7-4173-8d69-0fbaa289c06b")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 3.4 1.475)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "5f7132ec-320c-42d2-8d8f-5dccf7f61748")
+		)
+		(fp_line
+			(start 7.504 1.475)
+			(end 7.504 2.175)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "f96fd842-f75e-4139-b66e-13059ebe7b7d")
+		)
+		(fp_line
+			(start 7.504 2.175)
+			(end 7.504 2.775)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "c5d1709c-5f14-4feb-805f-df3498399cc5")
+		)
+		(fp_line
+			(start 9.104 2.775)
+			(end 7.504 2.775)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "c5c3bae9-3f50-42f8-b41e-ada0c35e353d")
+		)
+		(fp_line
+			(start 9.104 4.725)
+			(end 9.104 2.775)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "1e979617-afa7-4dc7-bf5a-df2346d1fcc2")
+		)
+		(fp_arc
+			(start 2.45 7.125)
+			(mid 2.742893 6.417893)
+			(end 3.45 6.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "52a531ce-22ea-4410-8a65-f8bc154f782f")
+		)
+		(fp_arc
+			(start 2.455444 2.13293)
+			(mid 1.577272 3.167235)
+			(end 0.299999 3.624999)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "cd50f14e-8741-4201-adfa-9ea750d8a7aa")
+		)
+		(fp_arc
+			(start 2.460307 2.13298)
+			(mid 2.826423 1.655848)
+			(end 3.4 1.475)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "1122e1b6-f5f6-4386-879e-b1d77a151f82")
+		)
+		(fp_arc
+			(start 7.25 5.325)
+			(mid 7.015685 5.890685)
+			(end 6.45 6.125)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "d4a84ae6-8889-4ee7-a0ca-9c1e165a56fc")
+		)
+		(fp_line
+			(start -2.304 7.5)
+			(end -2.304 4.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "920a8a48-5394-47ae-bc70-4e65e42fe002")
+		)
+		(fp_line
+			(start -2.304 7.5)
+			(end -1.504 8.3)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "0d541cda-aff8-4e9e-ab13-b822b01ca8ec")
+		)
+		(fp_line
+			(start -1.504 3.65)
+			(end -2.304 4.45)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "8516c564-f4ea-44c0-88cd-f6f4c127c6a9")
+		)
+		(fp_line
+			(start -1.504 3.65)
+			(end 0.296 3.65)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "b450a410-62bc-4051-a90e-fe886ac7ca35")
+		)
+		(fp_line
+			(start -1.504 8.3)
+			(end 1.646 8.3)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "3f090bc7-f5fb-415e-b8cb-fe2c264686c4")
+		)
+		(fp_line
+			(start 2.446 7.5)
+			(end 1.646 8.3)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "ee1feae1-e9c9-48ed-bdb0-b60bb1237ed0")
+		)
+		(fp_line
+			(start 2.446 7.5)
+			(end 2.446 7.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "62e18b67-2dc8-414c-ab98-2c8120f4016a")
+		)
+		(fp_line
+			(start 3.446 6.15)
+			(end 6.446 6.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "a9a45c11-4e05-49e7-86d2-664a02135f31")
+		)
+		(fp_line
+			(start 7.246 1.5)
+			(end 3.396 1.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "c4668559-bc07-427d-9ec2-8cc13267b278")
+		)
+		(fp_line
+			(start 7.246 5.35)
+			(end 7.246 1.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "978d2c3c-114a-4086-b597-91a6a79162c6")
+		)
+		(fp_arc
+			(start 2.446 7.15)
+			(mid 2.738893 6.442893)
+			(end 3.446 6.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "09580029-e730-4faa-a547-0ec8b3ab91fa")
+		)
+		(fp_arc
+			(start 2.451444 2.15793)
+			(mid 1.573272 3.192235)
+			(end 0.295999 3.649999)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "77cbfb81-a0ed-41fe-8aa1-919f49c9f48e")
+		)
+		(fp_arc
+			(start 2.456307 2.15798)
+			(mid 2.822423 1.680848)
+			(end 3.396 1.5)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "55edf218-53fb-46f2-8668-ceb37fae8c85")
+		)
+		(fp_arc
+			(start 7.246 5.35)
+			(mid 7.011685 5.915685)
+			(end 6.446 6.15)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "d7f1c680-ae7e-40dd-aedc-ed9c17d23fb6")
+		)
+		(fp_text user "18x17 spacing"
+			(at 0 -7.6 180)
+			(layer "Dwgs.User")
+			(uuid "d8db3696-74ab-4fae-a6ca-219ea35439cd")
 			(effects
 				(font
 					(size 1 1)
 					(thickness 0.15)
 				)
-				(justify mirror)
 			)
 		)
+		(fp_text user "LED"
+			(at 0 -4.7625 0)
+			(unlocked yes)
+			(layer "Cmts.User")
+			(uuid "200904b0-99c2-4e39-9beb-ddcf994d2e06")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(fp_text user "19.05 spacing"
+			(at 0 -8.7 180)
+			(layer "Eco1.User")
+			(uuid "766ea0e7-92aa-4cd3-b64a-119bf49c2fc1")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(fp_text user "${REFERENCE}"
+			(at 2.496 5.025 0)
+			(layer "F.Fab")
+			(uuid "8106a43c-3ef4-408f-8fc9-6f633fab3b4b")
+			(effects
+				(font
+					(size 0.8 0.8)
+					(thickness 0.12)
+				)
+			)
+		)
+		(pad "" np_thru_hole circle
+			(at 0 0 180)
+			(size 5 5)
+			(drill 5)
+			(layers "*.Cu" "*.Mask")
+			(uuid "dd24650e-e8d7-4ca0-9d66-3543b42cc5f6")
+		)
 		(pad "1" thru_hole circle
-			(at -1.27 -3.3 180)
-			(size 2 2)
-			(drill 1)
-			(layers "*.Cu" "*.Mask")
+			(at 5 3.75)
+			(size 3.3 3.3)
+			(drill 3)
+			(property pad_prop_mechanical)
+			(layers "*.Cu" "F.Mask")
 			(remove_unused_layers no)
-			(net 48 "Net-(D1-A)")
-			(pinfunction "Pin_1")
-			(pintype "passive")
-			(uuid "58232757-0f74-429e-bbc1-701438dfc5ff")
+			(uuid "a0ed2410-bf03-4e41-86b8-81c8b8dd6259")
+		)
+		(pad "1" smd rect
+			(at 6.55 3.75)
+			(size 1.2 2.6)
+			(layers "F.Cu")
+			(uuid "f3e43b54-bba5-426f-b9c2-7ebb6746a61c")
+		)
+		(pad "1" smd roundrect
+			(at 8.245 3.75)
+			(size 2.65 2.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
+			(roundrect_rratio 0.1)
+			(uuid "4553a2b0-a71f-4a23-967a-02b2b67b814d")
+		)
+		(pad "2" smd roundrect
+			(at -3.245 5.95)
+			(size 2.65 2.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
+			(roundrect_rratio 0.1)
+			(uuid "e0d78de6-9d86-4cc2-b842-10793f43b038")
+		)
+		(pad "2" smd rect
+			(at -1.55 5.95 180)
+			(size 1.2 2.6)
+			(layers "F.Cu")
+			(uuid "2accfbd4-3648-4815-9595-816dfbbd8e6f")
 		)
 		(pad "2" thru_hole circle
-			(at 1.27 -3.3 180)
-			(size 2 2)
-			(drill 1)
-			(layers "*.Cu" "*.Mask")
+			(at 0 5.95)
+			(size 3.3 3.3)
+			(drill 3)
+			(property pad_prop_mechanical)
+			(layers "*.Cu" "F.Mask")
 			(remove_unused_layers no)
-			(net 1 "GND")
-			(pinfunction "Pin_2")
-			(pintype "passive")
-			(uuid "c156ed08-3234-4f81-9549-b1774575bbc7")
+			(uuid "b0423caa-d5e8-413f-bbad-898a703800f2")
+		)
+		(pad "MP" thru_hole circle
+			(at -5 -5.15 180)
+			(size 2.4 2.4)
+			(drill 1.6)
+			(layers "*.Cu" "F.Mask")
+			(remove_unused_layers no)
+			(uuid "372907d9-19ca-4b44-9ba2-f612dfe9ea2d")
 		)
 		(embedded_fonts no)
+		(model "${KICAD8_3RD_PARTY}/3dmodels/com_github_ebastler_marbastlib/HS_CPG135001S30_Choc.step"
+			(offset
+				(xyz -5 -3.75 1.2)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 90 0 180)
+			)
+		)
 	)
 	(footprint "phiboard:THD_0510-30CL-GF"
 		(layer "B.Cu")
-		(uuid "7b1314a1-1e2c-4664-aae5-103e517234bc")
-		(at 85.75 67)
+		(uuid "2667b851-325b-4061-a6a3-2ffb3587eaca")
+		(at 210.8 18.1)
 		(descr "FFC FPC 1x30")
 		(property "Reference" "J2"
 			(at 0 0.1 180)
 			(unlocked yes)
 			(layer "B.SilkS")
 			(hide yes)
-			(uuid "f1ab0e52-6ec3-4b3f-804b-541ef34a91c4")
+			(uuid "5802ab25-e4c6-4f97-a5f1-b5bada20b30c")
 			(effects
 				(font
 					(size 1 1)
@@ -11086,7 +5487,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "69265465-ab3a-4dd1-bf59-feede95baa7d")
+			(uuid "c227347e-7067-4cc1-8b30-67da6f1c94c2")
 			(effects
 				(font
 					(size 1 1)
@@ -11100,7 +5501,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "8254eb2e-0cb0-49e2-9fdb-dc030f173529")
+			(uuid "3fd223a4-def2-48c4-bb0a-14d2ffa01eff")
 			(effects
 				(font
 					(size 1 1)
@@ -11114,7 +5515,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "4e16c459-4224-4d40-b883-ff7d9f1000ec")
+			(uuid "2826b18b-8e11-45c7-a279-72a06684c56e")
 			(effects
 				(font
 					(size 1 1)
@@ -11128,7 +5529,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "6b15aed1-3921-44e1-8895-66f2745c7b98")
+			(uuid "aa2a0aae-58ec-4421-8cf2-b7272b6bf86e")
 			(effects
 				(font
 					(size 1 1)
@@ -11153,7 +5554,7 @@
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "77bdd54d-3760-4681-925e-142f65098830")
+			(uuid "2d804cd4-59f2-4aac-8e05-df26a4d74b34")
 		)
 		(fp_line
 			(start -8.4 0.1)
@@ -11163,7 +5564,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "1a6013ea-bdae-4282-b800-491630b1693b")
+			(uuid "afa75edf-4d86-46a5-ae6a-e7137a843431")
 		)
 		(fp_line
 			(start -8.4 1.215)
@@ -11173,7 +5574,7 @@
 				(type solid)
 			)
 			(layer "User.1")
-			(uuid "c6151744-190c-4e1d-9b96-44916cb428cf")
+			(uuid "3c48fa29-d59b-473e-83e4-b8318cbdbf1a")
 		)
 		(fp_line
 			(start -8.4 1.9)
@@ -11183,7 +5584,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "aa0196e2-89cd-45e8-888c-c529f9556006")
+			(uuid "c38b7d49-500b-4c81-ab74-d08cc0347891")
 		)
 		(fp_line
 			(start -7.8 -1.4)
@@ -11193,7 +5594,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "6552ead8-0e15-4697-b1df-82ed51eaf234")
+			(uuid "2f934e07-9fd4-4f69-8d7b-b9ba477e21fa")
 		)
 		(fp_line
 			(start 7.8 -1.4)
@@ -11203,7 +5604,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "76ebe8c8-34a3-4912-9538-960c40197d34")
+			(uuid "8fa3cbf1-972f-4518-a027-4c35f015ca2e")
 		)
 		(fp_line
 			(start 7.8 0.4)
@@ -11213,7 +5614,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "1c6afd6f-2d8b-41b5-b8f4-02f298085518")
+			(uuid "88d004e9-667b-4a43-828a-e3fe49044582")
 		)
 		(fp_line
 			(start 8.4 1.9)
@@ -11223,13 +5624,13 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "6db66e99-2734-4227-bf6d-06836355c97c")
+			(uuid "789d669a-8280-447b-b9ab-3177908136f3")
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 180)
 			(unlocked yes)
 			(layer "B.Fab")
-			(uuid "8b902d1e-f332-4b36-bcbf-264655a434e1")
+			(uuid "80461d8d-734a-4a06-b29f-3f17322fdf3a")
 			(effects
 				(font
 					(size 1 1)
@@ -11243,335 +5644,980 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 1 "GND")
+			(net 2 "GND")
 			(pinfunction "Pin_1")
 			(pintype "passive")
-			(uuid "427c043b-39aa-4b47-b0b7-20992ea20c58")
+			(uuid "e9725878-2b6b-4aa6-843c-6b992e1f5698")
 		)
 		(pad "2" smd roundrect
 			(at -6.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 25 "+1V8")
 			(pinfunction "Pin_2")
 			(pintype "passive")
-			(uuid "869eafd3-d99b-433e-96ca-0adf99ea7ffc")
+			(uuid "38b482c7-d25d-4612-b0c7-54be3f80bc98")
 		)
 		(pad "3" smd roundrect
 			(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 16 "+3V3")
 			(pinfunction "Pin_3")
 			(pintype "passive")
-			(uuid "196c1663-4aa5-410b-9a68-f7c6482dcb74")
+			(uuid "6528b412-a580-4388-8759-c99d7183b1c7")
 		)
 		(pad "4" smd roundrect
 			(at -5.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 8 "key1")
+			(net 17 "key23")
 			(pinfunction "Pin_4")
 			(pintype "passive")
-			(uuid "3658a35d-7ee3-43f1-a114-0966839f9947")
+			(uuid "e5652a3a-361f-4d60-9a40-4ff6ee1756d8")
 		)
 		(pad "5" smd roundrect
 			(at -5.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 5 "key2")
+			(net 12 "key22")
 			(pinfunction "Pin_5")
 			(pintype "passive")
-			(uuid "18e73cac-b55f-4e34-b8df-bf109fe3a16d")
+			(uuid "fbd633bb-deca-48f8-addb-cc571b0e5e1e")
 		)
 		(pad "6" smd roundrect
 			(at -4.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 10 "key3")
+			(net 1 "key21")
 			(pinfunction "Pin_6")
 			(pintype "passive")
-			(uuid "d6f7401f-5e03-4b59-8b32-e4e61ad1b26c")
+			(uuid "d265bde4-e103-46ac-b8aa-88a9807c02ad")
 		)
 		(pad "7" smd roundrect
 			(at -4.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 30 "unconnected-(J2-Pin_7-Pad7)")
+			(net 32 "unconnected-(J2-Pin_7-Pad7)")
 			(pinfunction "Pin_7")
-			(pintype "passive+no_connect")
-			(uuid "37937f41-eb9c-470b-9505-d01b67f3de18")
+			(pintype "passive")
+			(uuid "5acac4ce-e40d-4d87-83f5-205984488bee")
 		)
 		(pad "8" smd roundrect
 			(at -3.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 7 "key4")
+			(net 8 "key19")
 			(pinfunction "Pin_8")
 			(pintype "passive")
-			(uuid "cf22589e-4b2d-4b3b-9f56-c671525c0540")
+			(uuid "2714ff9c-bf73-434a-ab80-f8e7a60913df")
 		)
 		(pad "9" smd roundrect
 			(at -3.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 6 "key5")
+			(net 10 "key18")
 			(pinfunction "Pin_9")
 			(pintype "passive")
-			(uuid "3a403cf6-d2c5-4cba-a3fd-c363ed868903")
+			(uuid "7f0c6147-3cdb-45ae-97f0-6a09aac2fea7")
 		)
 		(pad "10" smd roundrect
 			(at -2.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 9 "key6")
+			(net 27 "key17")
 			(pinfunction "Pin_10")
 			(pintype "passive")
-			(uuid "0b566ff8-b733-4138-95f6-53abf1f0b5b0")
+			(uuid "b20c43fe-e12c-436d-b638-b85662ac3d2f")
 		)
 		(pad "11" smd roundrect
 			(at -2.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 2 "key7")
+			(net 6 "key16")
 			(pinfunction "Pin_11")
 			(pintype "passive")
-			(uuid "63a8590a-c226-4085-bae0-86cacede53b9")
+			(uuid "fe468d84-11d6-4bbb-99dd-eace0d0824cd")
 		)
 		(pad "12" smd roundrect
 			(at -1.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 4 "key8")
+			(net 11 "key15")
 			(pinfunction "Pin_12")
 			(pintype "passive")
-			(uuid "6b412fd8-e911-47e6-b170-83cd41a5acf9")
+			(uuid "b5039203-7641-4b99-a09a-c5cf9b4065f3")
 		)
 		(pad "13" smd roundrect
 			(at -1.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 3 "key9")
+			(net 21 "key14")
 			(pinfunction "Pin_13")
 			(pintype "passive")
-			(uuid "6b510b5b-6a64-403e-a4b7-36f45be96c2e")
+			(uuid "0b9facbc-f8e7-4eb9-8333-19a8cd18ace1")
 		)
 		(pad "14" smd roundrect
 			(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 30 "key13")
 			(pinfunction "Pin_14")
 			(pintype "passive")
-			(uuid "dba921d0-7c65-4cd1-a453-07bc4a9c61ee")
+			(uuid "0344deb7-53d3-43de-9839-d4cde53775b9")
 		)
 		(pad "15" smd roundrect
 			(at -0.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 27 "key11")
+			(net 22 "key12")
 			(pinfunction "Pin_15")
 			(pintype "passive")
-			(uuid "b5b2a591-795d-4647-a6bf-0bbbf888f976")
+			(uuid "b09e836e-95e1-4274-b37c-d97e2497dfc6")
 		)
 		(pad "16" smd roundrect
 			(at 0.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 28 "key12")
+			(net 13 "key11")
 			(pinfunction "Pin_16")
 			(pintype "passive")
-			(uuid "d5dfe253-6bca-44bd-9939-ad861cc8774b")
+			(uuid "6dcf49aa-cea8-45fe-b6d5-b59f2ff9902e")
 		)
 		(pad "17" smd roundrect
 			(at 0.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 15 "key13")
+			(net 3 "key10")
 			(pinfunction "Pin_17")
 			(pintype "passive")
-			(uuid "53980ac4-e07b-41c4-8ebb-0abdd691a4a8")
+			(uuid "9aa29dfa-a457-4ef8-b76e-0c6e5c1c4813")
 		)
 		(pad "18" smd roundrect
 			(at 1.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 18 "key14")
+			(net 7 "key9")
 			(pinfunction "Pin_18")
 			(pintype "passive")
-			(uuid "a1d718e0-6358-42b4-ae38-bf84826ccd6d")
+			(uuid "02584378-e879-47ca-9b59-b1b19fa27ba5")
 		)
 		(pad "19" smd roundrect
 			(at 1.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 12 "key15")
+			(net 9 "key8")
 			(pinfunction "Pin_19")
 			(pintype "passive")
-			(uuid "5ab55cf2-f687-44d8-a7b7-2d406ea36de9")
+			(uuid "f9243207-7efd-4625-9b77-59dd62e395b9")
 		)
 		(pad "20" smd roundrect
 			(at 2.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 16 "key16")
+			(net 4 "key7")
 			(pinfunction "Pin_20")
 			(pintype "passive")
-			(uuid "91445780-7190-408c-8b64-8a9045afcf75")
+			(uuid "f96638c8-b38d-4bdb-a59a-3a6dc06b5f0b")
 		)
 		(pad "21" smd roundrect
 			(at 2.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 23 "key17")
+			(net 26 "key6")
 			(pinfunction "Pin_21")
 			(pintype "passive")
-			(uuid "a5f3ce6a-e821-49d4-9a6c-69f6f603048a")
+			(uuid "12b2262d-faf9-4beb-a08d-5a851bfd167a")
 		)
 		(pad "22" smd roundrect
 			(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 15 "key5")
 			(pinfunction "Pin_22")
 			(pintype "passive")
-			(uuid "88ee911c-f2a0-4555-b391-f5fea06cd7a6")
+			(uuid "373bb4ce-fe35-49c9-9dc5-df76b8229362")
 		)
 		(pad "23" smd roundrect
 			(at 3.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 29 "key19")
+			(net 20 "key4")
 			(pinfunction "Pin_23")
 			(pintype "passive")
-			(uuid "c2096ad9-86cf-4cbf-909a-9bcc052a8d60")
+			(uuid "af6b9ad7-7519-42d5-937d-13baf9a18ef6")
 		)
 		(pad "24" smd roundrect
 			(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 28 "key3")
 			(pinfunction "Pin_24")
 			(pintype "passive")
-			(uuid "b04335cb-b611-461f-b2ec-a85cc1a4d312")
+			(uuid "55663334-85a8-4aca-98a8-84ee4e76374a")
 		)
 		(pad "25" smd roundrect
 			(at 4.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 13 "key21")
+			(net 14 "key2")
 			(pinfunction "Pin_25")
 			(pintype "passive")
-			(uuid "e9229856-585e-4371-97a0-1631528c4d94")
+			(uuid "92244bb3-7488-47e7-a974-51757f1aa9ce")
 		)
 		(pad "26" smd roundrect
 			(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 23 "key1")
 			(pinfunction "Pin_26")
 			(pintype "passive")
-			(uuid "23389430-5175-4ab2-b75e-65b02da12bea")
+			(uuid "c68cd183-fff1-4263-ba1b-4258071d05ff")
 		)
 		(pad "27" smd roundrect
 			(at 5.75 2.3)
 			(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")
+			(uuid "2c5e8a3f-53bb-4395-bc7e-8ad9bdb0f017")
 		)
 		(pad "28" smd roundrect
 			(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 16 "+3V3")
 			(pinfunction "Pin_28")
 			(pintype "passive")
-			(uuid "d94ae8fe-0ecc-4159-b9f2-98888c25d8f3")
+			(uuid "c97d0e54-1ad8-4c99-bb3d-c0cb10156211")
 		)
 		(pad "29" smd roundrect
 			(at 6.75 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 25 "+1V8")
 			(pinfunction "Pin_29")
 			(pintype "passive")
-			(uuid "caf65fab-5f98-413c-aee6-7af3fd8d3ab7")
+			(uuid "8b42e98b-b5fe-49ef-9a80-0e16713d8944")
 		)
 		(pad "30" smd roundrect
 			(at 7.25 2.3)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 1 "GND")
+			(net 2 "GND")
 			(pinfunction "Pin_30")
 			(pintype "passive")
-			(uuid "5c87cb14-9f85-408c-b536-920d88beb6da")
+			(uuid "c732b7aa-bcb5-4c78-bbe8-9fc624d7c82b")
 		)
 		(pad "MP" smd roundrect
 			(at -8.135 -0.51)
 			(size 0.3 1.15)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 32 "unconnected-(J2-MountPin-PadMP)_1")
+			(net 34 "unconnected-(J2-MountPin-PadMP)_1")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "d475158f-b364-49c4-9775-8463ce144fd2")
+			(uuid "e398f39b-cdf6-4140-8310-b61d8c89d7f5")
 		)
 		(pad "MP" smd roundrect
 			(at 8.135 -0.51)
 			(size 0.3 1.15)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 31 "unconnected-(J2-MountPin-PadMP)")
+			(net 33 "unconnected-(J2-MountPin-PadMP)")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "966abb1c-adbe-4323-aa2a-9fd9ee1d00eb")
+			(uuid "cde42d45-9e2c-4088-928a-f75a228659a9")
 		)
 		(embedded_fonts no)
 	)
+	(footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical"
+		(locked yes)
+		(layer "B.Cu")
+		(uuid "6da3e3e0-b9a0-44b7-97f2-b575f62f928a")
+		(at 54.1 111.525 180)
+		(descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+		(tags "Through hole pin header THT 1x02 2.54mm single row")
+		(property "Reference" "J5"
+			(at 2.7 -1.125 0)
+			(layer "B.SilkS")
+			(hide yes)
+			(uuid "1a42ee0e-d1a7-41c6-b17c-b877c2780876")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Value" "Conn_01x02"
+			(at 0 -4.92 0)
+			(layer "B.Fab")
+			(uuid "e8a8af5b-9c2b-4f01-a18c-93dd2d2590e5")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 0 0 0)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "73a689f2-1b5b-4b96-a5d8-040852c33c38")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
+			(at 0 0 0)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "1e46178b-eab6-4bdd-bdbe-b73a6f5f817a")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(attr through_hole exclude_from_bom dnp)
+		(fp_line
+			(start 1.38 -1.27)
+			(end 1.38 -3.92)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "731f5904-8c5d-41b0-9a33-bc74dbc9d825")
+		)
+		(fp_line
+			(start -1.38 1.38)
+			(end 0 1.38)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "8dd1e2db-dab1-45f9-9b3d-191b58fab347")
+		)
+		(fp_line
+			(start -1.38 0)
+			(end -1.38 1.38)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "248850a8-820d-4fdb-bc5b-7941dbae3285")
+		)
+		(fp_line
+			(start -1.38 -1.27)
+			(end 1.38 -1.27)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "f3bd4dbc-fbbc-4c56-9681-4230003dcd0d")
+		)
+		(fp_line
+			(start -1.38 -1.27)
+			(end -1.38 -3.92)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "cf74c45a-cd6f-44c4-b297-c9b4cf7e2c9d")
+		)
+		(fp_line
+			(start -1.38 -3.92)
+			(end 1.38 -3.92)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "3e17fbeb-5dac-46fa-a943-067015c60ae3")
+		)
+		(fp_line
+			(start 1.77 1.77)
+			(end -1.77 1.77)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "cf756194-1518-4e9b-bb9b-5886dd569429")
+		)
+		(fp_line
+			(start 1.77 -4.32)
+			(end 1.77 1.77)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "f8a7ffc8-6f01-40e8-8c94-61d8e14187ec")
+		)
+		(fp_line
+			(start -1.77 1.77)
+			(end -1.77 -4.32)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "2a7e162c-afd7-4cd9-b566-fe073cfac7af")
+		)
+		(fp_line
+			(start -1.77 -4.32)
+			(end 1.77 -4.32)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "b2da9cbf-c695-4a6c-b3fc-4ac2b123e3cd")
+		)
+		(fp_line
+			(start 1.27 1.27)
+			(end 1.27 -3.81)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "B.Fab")
+			(uuid "68886f75-8575-4c62-9fa8-86445a89e916")
+		)
+		(fp_line
+			(start 1.27 -3.81)
+			(end -1.27 -3.81)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "B.Fab")
+			(uuid "c3793ff9-d595-41a6-9130-14da3434107c")
+		)
+		(fp_line
+			(start -0.635 1.27)
+			(end 1.27 1.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "B.Fab")
+			(uuid "50900e44-957b-4df5-b97e-6785da0a1b7a")
+		)
+		(fp_line
+			(start -1.27 0.635)
+			(end -0.635 1.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "B.Fab")
+			(uuid "e99a1aa2-8c6d-490c-a489-ce97daedd6d9")
+		)
+		(fp_line
+			(start -1.27 -3.81)
+			(end -1.27 0.635)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "B.Fab")
+			(uuid "ff720b57-4759-4667-aa38-1dc9d0fd7870")
+		)
+		(fp_text user "${REFERENCE}"
+			(at 0 -1.27 90)
+			(layer "B.Fab")
+			(uuid "9084d38a-bf7a-42ab-aa45-e6c0b0017777")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(pad "1" thru_hole rect
+			(at 0 0 180)
+			(size 1.7 1.7)
+			(drill 1)
+			(layers "*.Cu" "*.Mask")
+			(remove_unused_layers no)
+			(net 35 "vbat")
+			(pinfunction "Pin_1")
+			(pintype "passive")
+			(uuid "26873b64-fd6d-4432-8263-a86dbc7652bd")
+		)
+		(pad "2" thru_hole circle
+			(at 0 -2.54 180)
+			(size 1.7 1.7)
+			(drill 1)
+			(layers "*.Cu" "*.Mask")
+			(remove_unused_layers no)
+			(net 2 "GND")
+			(pinfunction "Pin_2")
+			(pintype "passive")
+			(uuid "ce628a67-1f1f-4943-acd9-e6309c6e0cad")
+		)
+		(embedded_fonts no)
+		(model "${KICAD9_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.stpZ"
+			(offset
+				(xyz 0 0 0)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 0 0 0)
+			)
+		)
+	)
+	(footprint "Connector_USB:USB_C_Receptacle_GCT_USB4105-xx-A_16P_TopMnt_Horizontal"
+		(locked yes)
+		(layer "B.Cu")
+		(uuid "a479d007-a138-4214-aa89-4a660a15fec0")
+		(at 54.32 90.675)
+		(descr "USB 2.0 Type C Receptacle, GCT, 16P, top mounted, horizontal, 5A: https://gct.co/files/drawings/usb4105.pdf")
+		(tags "USB C Type-C Receptacle SMD USB 2.0 16P 16C USB4105-15-A USB4105-15-A-060 USB4105-15-A-120 USB4105-GF-A USB4105-GF-A-060 USB4105-GF-A-120")
+		(property "Reference" "J3"
+			(at -0.05 2.14 180)
+			(unlocked yes)
+			(layer "B.SilkS")
+			(hide yes)
+			(uuid "6cc42b95-be31-4cef-9f5d-d6f409f77290")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Value" "USB_C_Receptacle_USB2.0_16P"
+			(at 0 -5 180)
+			(unlocked yes)
+			(layer "B.Fab")
+			(uuid "05e946b9-feaf-413e-8a2f-702db246eee8")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip"
+			(at 0 0 180)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "f0042529-31c6-445d-87ea-c008706da9fc")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Description" "USB 2.0-only 16P Type-C Receptacle connector"
+			(at 0 0 180)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "f9d03757-0c6d-4960-9d32-874b108afd83")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "LCSC PN" "C393939"
+			(at 0 0 180)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "57dd4b96-be80-4926-923e-7a039a8aa47b")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(attr smd)
+		(fp_line
+			(start -4.67 0.1)
+			(end -4.67 1.8)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "38e87a2d-040f-4882-92fd-1bdff337fecc")
+		)
+		(fp_line
+			(start 4.67 0.1)
+			(end 4.67 1.8)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "B.SilkS")
+			(uuid "d925b3ac-ca71-4a72-99d8-c0c448a7c92b")
+		)
+		(fp_line
+			(start 5 -3.675)
+			(end -5 -3.675)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "c51f06d8-1e77-4b84-b24f-15c83fbcede9")
+		)
+		(fp_rect
+			(start -5.32 4.76)
+			(end 5.32 -4.18)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(fill no)
+			(layer "B.CrtYd")
+			(uuid "a2e42814-53b6-4067-a2a1-3972f54a7f38")
+		)
+		(fp_rect
+			(start -4.47 3.675)
+			(end 4.47 -3.675)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(fill no)
+			(layer "B.Fab")
+			(uuid "791a819a-7dc9-4baa-859a-9e354d7c01c0")
+		)
+		(fp_text user "PCB Edge"
+			(at 0 -3.1 180)
+			(unlocked yes)
+			(layer "Dwgs.User")
+			(uuid "f5e71a36-7b80-45c3-ada6-d6da3bee1505")
+			(effects
+				(font
+					(size 0.5 0.5)
+					(thickness 0.1)
+				)
+			)
+		)
+		(fp_text user "${REFERENCE}"
+			(at 0 0 180)
+			(unlocked yes)
+			(layer "B.Fab")
+			(uuid "143201dc-44a8-4190-b0a4-1f87cd44495a")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(pad "" np_thru_hole circle
+			(at -2.89 2.605)
+			(size 0.65 0.65)
+			(drill 0.65)
+			(layers "*.Cu" "*.Mask")
+			(uuid "45a622c7-d9e6-43ed-b45a-3d5ce7c7effb")
+		)
+		(pad "" np_thru_hole circle
+			(at 2.89 2.605)
+			(size 0.65 0.65)
+			(drill 0.65)
+			(layers "*.Cu" "*.Mask")
+			(uuid "56512045-6edf-4ed9-b2d9-f254e5cb7278")
+		)
+		(pad "A1" smd roundrect
+			(at -3.2 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 2 "GND")
+			(pinfunction "GND")
+			(pintype "passive")
+			(uuid "5b723641-0f90-4d2e-b72d-eba115d30918")
+		)
+		(pad "A4" smd roundrect
+			(at -2.4 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 42 "Net-(D2-A)")
+			(pinfunction "VBUS")
+			(pintype "passive")
+			(uuid "5f018ac4-6674-427b-9bd4-83352cd3917b")
+		)
+		(pad "A5" smd roundrect
+			(at -1.25 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 43 "Net-(J3-CC1)")
+			(pinfunction "CC1")
+			(pintype "bidirectional")
+			(uuid "cd4d14d6-f0bc-4f96-9f4f-0580ef3186c1")
+		)
+		(pad "A6" smd roundrect
+			(at -0.25 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 39 "usbd+")
+			(pinfunction "D+")
+			(pintype "bidirectional")
+			(uuid "9edbc884-c80d-422a-998a-acb5296c1577")
+		)
+		(pad "A7" smd roundrect
+			(at 0.25 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 38 "usbd-")
+			(pinfunction "D-")
+			(pintype "bidirectional")
+			(uuid "4c2561fc-54ca-42a6-9f02-249c889a13e8")
+		)
+		(pad "A8" smd roundrect
+			(at 1.25 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 48 "unconnected-(J3-SBU1-PadA8)")
+			(pinfunction "SBU1")
+			(pintype "bidirectional+no_connect")
+			(uuid "074ad30e-f1fe-409d-9201-d88a8614486b")
+		)
+		(pad "A9" smd roundrect
+			(at 2.4 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 42 "Net-(D2-A)")
+			(pinfunction "VBUS")
+			(pintype "passive")
+			(uuid "c3288e79-da5a-4d4f-987c-290f2d306cc4")
+		)
+		(pad "A12" smd roundrect
+			(at 3.2 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 2 "GND")
+			(pinfunction "GND")
+			(pintype "passive")
+			(uuid "a1ead71b-aba3-463b-828e-cdf94ba4b8b2")
+		)
+		(pad "B1" smd roundrect
+			(at 3.2 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 2 "GND")
+			(pinfunction "GND")
+			(pintype "passive")
+			(uuid "25a49dee-fdf1-4931-8ed1-e89782711190")
+		)
+		(pad "B4" smd roundrect
+			(at 2.4 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 42 "Net-(D2-A)")
+			(pinfunction "VBUS")
+			(pintype "passive")
+			(uuid "2dd5a7d3-54fe-4613-8f2a-417891b3724b")
+		)
+		(pad "B5" smd roundrect
+			(at 1.75 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 44 "Net-(J3-CC2)")
+			(pinfunction "CC2")
+			(pintype "bidirectional")
+			(uuid "13264e06-0e57-4904-8931-95b1b559b2d5")
+		)
+		(pad "B6" smd roundrect
+			(at 0.75 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 39 "usbd+")
+			(pinfunction "D+")
+			(pintype "bidirectional")
+			(uuid "b11bba35-1cc9-4117-9232-d8098078536b")
+		)
+		(pad "B7" smd roundrect
+			(at -0.75 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 38 "usbd-")
+			(pinfunction "D-")
+			(pintype "bidirectional")
+			(uuid "78bf5b67-a0f6-4c4e-9ef4-c7795468292b")
+		)
+		(pad "B8" smd roundrect
+			(at -1.75 3.68)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 49 "unconnected-(J3-SBU2-PadB8)")
+			(pinfunction "SBU2")
+			(pintype "bidirectional+no_connect")
+			(uuid "95d272d0-da31-4b13-affc-40a45bda505e")
+		)
+		(pad "B9" smd roundrect
+			(at -2.4 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 42 "Net-(D2-A)")
+			(pinfunction "VBUS")
+			(pintype "passive")
+			(uuid "60e58078-bfa0-42dd-b8d4-8a745ec85ca6")
+		)
+		(pad "B12" smd roundrect
+			(at -3.2 3.68)
+			(size 0.6 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.25)
+			(net 2 "GND")
+			(pinfunction "GND")
+			(pintype "passive")
+			(uuid "8d29e4f2-57d0-443b-b661-c36617a520d2")
+		)
+		(pad "S1" thru_hole oval
+			(at -4.32 -1.075)
+			(size 1 1.8)
+			(drill oval 0.6 1.4)
+			(property pad_prop_heatsink)
+			(layers "*.Cu" "*.Mask" "B.Paste")
+			(remove_unused_layers no)
+			(net 45 "Net-(J3-SHIELD)")
+			(pinfunction "SHIELD")
+			(pintype "passive")
+			(uuid "656ac202-9bbd-472c-a409-e50e1f3ded2e")
+		)
+		(pad "S1" thru_hole oval
+			(at -4.32 3.105)
+			(size 1 2.1)
+			(drill oval 0.6 1.7)
+			(property pad_prop_heatsink)
+			(layers "*.Cu" "*.Mask" "B.Paste")
+			(remove_unused_layers no)
+			(net 45 "Net-(J3-SHIELD)")
+			(pinfunction "SHIELD")
+			(pintype "passive")
+			(uuid "f698a6c4-1aa8-44d6-aafc-0243d1409ae0")
+		)
+		(pad "S1" thru_hole oval
+			(at 4.32 -1.075)
+			(size 1 1.8)
+			(drill oval 0.6 1.4)
+			(property pad_prop_heatsink)
+			(layers "*.Cu" "*.Mask" "B.Paste")
+			(remove_unused_layers no)
+			(net 45 "Net-(J3-SHIELD)")
+			(pinfunction "SHIELD")
+			(pintype "passive")
+			(uuid "8c67613a-2252-42ae-a071-9d95591f3944")
+		)
+		(pad "S1" thru_hole oval
+			(at 4.32 3.105)
+			(size 1 2.1)
+			(drill oval 0.6 1.7)
+			(property pad_prop_heatsink)
+			(layers "*.Cu" "*.Mask" "B.Paste")
+			(remove_unused_layers no)
+			(net 45 "Net-(J3-SHIELD)")
+			(pinfunction "SHIELD")
+			(pintype "passive")
+			(uuid "f560269b-d218-4b04-ae4c-71059b53324f")
+		)
+		(embedded_fonts no)
+		(model "${KICAD9_3DMODEL_DIR}/Connector_USB.3dshapes/USB_C_Receptacle_GCT_USB4105-xx-A_16P_TopMnt_Horizontal.stpZ"
+			(offset
+				(xyz 0 0 0)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 0 0 0)
+			)
+		)
+	)
 	(footprint "phiboard:THD_0510-30CL-GF"
 		(locked yes)
 		(layer "B.Cu")
-		(uuid "7d7d1cbd-d77a-4c5d-8d71-86fb8e7d0b6f")
-		(at 85.75 62.4 180)
+		(uuid "c7d41e31-14ad-400b-8c3c-588f4076d925")
+		(at 85.25 91.9 180)
 		(descr "FFC FPC 1x30")
 		(property "Reference" "J1"
 			(at 0 0.1 0)
 			(unlocked yes)
 			(layer "B.SilkS")
 			(hide yes)
-			(uuid "31039d94-6e64-4896-8e7d-178951d1921a")
+			(uuid "64614dff-04d3-4076-8eca-2e8ce598ca67")
 			(effects
 				(font
 					(size 1 1)
@@ -11585,7 +6631,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "ab1a346c-8e22-4efb-a41b-2a30ff13f7ed")
+			(uuid "246009a1-4de6-4875-af09-b0004164c5ca")
 			(effects
 				(font
 					(size 1 1)
@@ -11599,7 +6645,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "32c86c9f-a788-4913-b99c-4ab44269de2e")
+			(uuid "17ab1942-45fa-40f5-bf89-a55fcc0800f3")
 			(effects
 				(font
 					(size 1 1)
@@ -11613,7 +6659,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "5f470fcc-7f49-4fea-bdf9-a8aded5d2f14")
+			(uuid "207e3ef7-3e2f-4ed5-8996-e554c34d5bac")
 			(effects
 				(font
 					(size 1 1)
@@ -11627,7 +6673,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "27e7f963-da88-4a71-85b8-3b5d6bfe5b13")
+			(uuid "22220631-4f04-4924-b83b-9ba86e464030")
 			(effects
 				(font
 					(size 1 1)
@@ -11648,7 +6694,7 @@
 			)
 			(fill no)
 			(layer "B.CrtYd")
-			(uuid "43f428bd-2ddf-405b-aa7c-07b786374e45")
+			(uuid "04e93585-6b5d-4b80-b54c-ba628f6d8ede")
 		)
 		(fp_line
 			(start 8.4 1.9)
@@ -11658,7 +6704,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "c1102329-1312-49b4-a355-54b20bd2e200")
+			(uuid "5e0b80cc-b478-420d-9164-5e93467102c0")
 		)
 		(fp_line
 			(start 7.8 0.4)
@@ -11668,7 +6714,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "59489311-6a08-4703-a1ec-582a5d55c729")
+			(uuid "375d57a3-1485-42fe-9cf3-eb09591ab2b0")
 		)
 		(fp_line
 			(start 7.8 -1.4)
@@ -11678,7 +6724,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "bf7774f3-86b1-4d6f-886c-37f1b80ae76e")
+			(uuid "4a5b38c4-abf0-472e-bbd5-17bc52963361")
 		)
 		(fp_line
 			(start -7.8 -1.4)
@@ -11688,7 +6734,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "e122189b-13c8-43cc-8aad-8ed26a1a48e1")
+			(uuid "75b6d16b-946f-408f-ba56-22bb4333673c")
 		)
 		(fp_line
 			(start -8.4 1.9)
@@ -11698,7 +6744,7 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "7ca4dfeb-6613-4445-a052-c0e71bb0b649")
+			(uuid "56f8f075-84d4-4c3b-935b-82405b1cc218")
 		)
 		(fp_line
 			(start -8.4 1.215)
@@ -11708,7 +6754,7 @@
 				(type solid)
 			)
 			(layer "User.1")
-			(uuid "0d314036-1e6d-4366-9736-138a3ba02b3c")
+			(uuid "b4eb0790-36f9-4ef5-8f4a-f3b7558de0ab")
 		)
 		(fp_line
 			(start -8.4 0.1)
@@ -11718,13 +6764,13 @@
 				(type default)
 			)
 			(layer "User.1")
-			(uuid "b5b4a7d7-529b-4021-ac3c-8f377831f039")
+			(uuid "afe3b8f5-e651-4dd7-b431-d5d0da56318f")
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 0)
 			(unlocked yes)
 			(layer "B.Fab")
-			(uuid "0a503597-14ce-425f-9276-22f4695b4a6a")
+			(uuid "57f730cf-02b7-4e26-a7c3-5230b13a6b27")
 			(effects
 				(font
 					(size 1 1)
@@ -11738,723 +6784,334 @@
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 1 "GND")
+			(net 2 "GND")
 			(pinfunction "Pin_1")
 			(pintype "passive")
-			(uuid "4adfbd17-5dba-493e-bbc8-0237c9c43d46")
+			(uuid "072bf36e-87dd-448a-87d8-5aac22b6c431")
 		)
 		(pad "2" smd roundrect
 			(at -6.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 25 "+1V8")
 			(pinfunction "Pin_2")
 			(pintype "passive")
-			(uuid "38573df3-5529-44c4-a4bf-b8497b25c21d")
+			(uuid "83ada278-a98f-4a21-b909-ba2fb2ff8c65")
 		)
 		(pad "3" smd roundrect
 			(at -6.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
+			(net 16 "+3V3")
 			(pinfunction "Pin_3")
 			(pintype "passive")
-			(uuid "c283e7c2-a102-4ef1-99fa-e904b274c630")
+			(uuid "d84b384c-8a80-4c0d-be36-c2a6c7feefd0")
 		)
 		(pad "4" smd roundrect
 			(at -5.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 8 "key1")
+			(net 23 "key1")
 			(pinfunction "Pin_4")
 			(pintype "passive")
-			(uuid "ccc80606-be79-403f-aa27-6be807896cea")
+			(uuid "543b3e53-1955-4d12-9a7f-2c2a3c6b64d7")
 		)
 		(pad "5" smd roundrect
 			(at -5.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 5 "key2")
+			(net 14 "key2")
 			(pinfunction "Pin_5")
 			(pintype "passive")
-			(uuid "1d12280e-18f0-400d-98e4-90a39f699658")
+			(uuid "9525de22-1495-4ccf-9bc7-075ceb5c3368")
 		)
 		(pad "6" smd roundrect
 			(at -4.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 10 "key3")
+			(net 28 "key3")
 			(pinfunction "Pin_6")
 			(pintype "passive")
-			(uuid "9d02bee1-59d4-4ece-aedd-89a6b6ba798f")
+			(uuid "98b2a64c-553a-4f8b-a6d0-7e622db10f27")
 		)
 		(pad "7" smd roundrect
 			(at -4.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 7 "key4")
+			(net 20 "key4")
 			(pinfunction "Pin_7")
 			(pintype "passive")
-			(uuid "e598f8fc-8ed7-4ff9-90b8-92208a602e97")
+			(uuid "201de330-423d-4b8c-8c3f-c37e9186ba97")
 		)
 		(pad "8" smd roundrect
 			(at -3.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 6 "key5")
+			(net 15 "key5")
 			(pinfunction "Pin_8")
 			(pintype "passive")
-			(uuid "d680c2f2-9e98-458f-bdaf-25fffce01f9c")
+			(uuid "8c86c08c-3a77-41ba-b1ed-b6e89ff5f0e0")
 		)
 		(pad "9" smd roundrect
 			(at -3.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 9 "key6")
+			(net 26 "key6")
 			(pinfunction "Pin_9")
 			(pintype "passive")
-			(uuid "81458bae-a8a9-431d-bef6-5713d494f32f")
+			(uuid "b23eb443-f8f1-40b5-9967-7e462e8e34ca")
 		)
 		(pad "10" smd roundrect
 			(at -2.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 2 "key7")
+			(net 4 "key7")
 			(pinfunction "Pin_10")
 			(pintype "passive")
-			(uuid "e8d1d3f1-dfc7-4ea0-a61a-3430a4f96056")
+			(uuid "4bb4da75-7bd5-44fb-8916-f7704363d1d4")
 		)
 		(pad "11" smd roundrect
 			(at -2.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 4 "key8")
+			(net 9 "key8")
 			(pinfunction "Pin_11")
 			(pintype "passive")
-			(uuid "cfee6a64-62e3-412b-928e-8564c33b1a79")
+			(uuid "3927a5aa-d7da-40fc-b2a7-d8bfd4c2716d")
 		)
 		(pad "12" smd roundrect
 			(at -1.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 3 "key9")
+			(net 7 "key9")
 			(pinfunction "Pin_12")
 			(pintype "passive")
-			(uuid "afef13c0-13e3-46c3-8de6-f065b5233253")
+			(uuid "68142944-6418-4100-975f-256f3e938f56")
 		)
 		(pad "13" smd roundrect
 			(at -1.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 25 "key10")
+			(net 3 "key10")
 			(pinfunction "Pin_13")
 			(pintype "passive")
-			(uuid "ff4afd32-5df6-4b29-946a-60da1eae299a")
+			(uuid "a4931583-07a5-4c42-b82b-6e76d3d3f447")
 		)
 		(pad "14" smd roundrect
 			(at -0.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 27 "key11")
+			(net 13 "key11")
 			(pinfunction "Pin_14")
 			(pintype "passive")
-			(uuid "d183b083-7372-47b3-b619-180f179028c1")
+			(uuid "a23013e6-38fe-4ed2-b57f-22a57bf43fa6")
 		)
 		(pad "15" smd roundrect
 			(at -0.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 28 "key12")
+			(net 22 "key12")
 			(pinfunction "Pin_15")
 			(pintype "passive")
-			(uuid "2065924b-ebcf-4c30-a3d6-04169787b469")
+			(uuid "6a380e14-3ea8-4bf6-8245-f59c00022da5")
 		)
 		(pad "16" smd roundrect
 			(at 0.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 20 "unconnected-(J1-Pin_16-Pad16)")
+			(net 5 "unconnected-(J1-Pin_16-Pad16)")
 			(pinfunction "Pin_16")
 			(pintype "passive+no_connect")
-			(uuid "276c91df-214d-454d-a05b-003e25f90ea3")
+			(uuid "7668e509-e81c-4e1f-9f71-30602e418075")
 		)
 		(pad "17" smd roundrect
 			(at 0.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 18 "key14")
+			(net 21 "key14")
 			(pinfunction "Pin_17")
 			(pintype "passive")
-			(uuid "2c309514-7eab-4276-864b-c5fa0b66ecae")
+			(uuid "4b2bb55e-e0de-4f72-94d5-246a2011157b")
 		)
 		(pad "18" smd roundrect
 			(at 1.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 12 "key15")
+			(net 11 "key15")
 			(pinfunction "Pin_18")
 			(pintype "passive")
-			(uuid "86b16749-ed42-49e2-a7ea-b92758b8a8a6")
+			(uuid "788df136-d825-4848-b160-d1ce4a47daf8")
 		)
 		(pad "19" smd roundrect
 			(at 1.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 16 "key16")
+			(net 6 "key16")
 			(pinfunction "Pin_19")
 			(pintype "passive")
-			(uuid "d4adf116-1b98-44ba-987e-638ffe23a1dd")
+			(uuid "b2a14106-9314-40ec-9571-9e4eb663c947")
 		)
 		(pad "20" smd roundrect
 			(at 2.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 23 "key17")
+			(net 27 "key17")
 			(pinfunction "Pin_20")
 			(pintype "passive")
-			(uuid "c5ae5f74-619b-4821-bfd6-a2e547219db2")
+			(uuid "fd5facbf-400e-437e-a193-5b53a3a5b145")
 		)
 		(pad "21" smd roundrect
 			(at 2.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 24 "key18")
+			(net 10 "key18")
 			(pinfunction "Pin_21")
 			(pintype "passive")
-			(uuid "7e450d70-720e-417d-9880-ec5e698902e4")
+			(uuid "7435d330-271e-40e9-91a1-4bcaf73f50c4")
 		)
 		(pad "22" smd roundrect
 			(at 3.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 29 "key19")
+			(net 8 "key19")
 			(pinfunction "Pin_22")
 			(pintype "passive")
-			(uuid "50167024-c23a-4e6e-b6f2-053875807fd2")
+			(uuid "55c0913c-a673-4dce-912b-2fd572802006")
 		)
 		(pad "23" smd roundrect
 			(at 3.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 19 "key20")
+			(net 24 "key20")
 			(pinfunction "Pin_23")
 			(pintype "passive")
-			(uuid "30309b53-c539-4a80-b7ea-3a05673a129d")
+			(uuid "d98b4926-8c5f-4f56-b982-0f9a76654820")
 		)
 		(pad "24" smd roundrect
 			(at 4.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 13 "key21")
+			(net 1 "key21")
 			(pinfunction "Pin_24")
 			(pintype "passive")
-			(uuid "e7307bac-cc1a-43d1-8042-12b3f179fb9b")
+			(uuid "8309cc36-f233-402f-b8c5-8bed5909b218")
 		)
 		(pad "25" smd roundrect
 			(at 4.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 14 "key22")
+			(net 12 "key22")
 			(pinfunction "Pin_25")
 			(pintype "passive")
-			(uuid "1307e379-4cb8-471e-80ce-fe3dc182281b")
+			(uuid "d0e9cc15-f005-47e1-8225-9870a0826b10")
 		)
 		(pad "26" smd roundrect
 			(at 5.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 34 "key23")
+			(net 17 "key23")
 			(pinfunction "Pin_26")
 			(pintype "passive")
-			(uuid "eb14f493-74b2-4e19-9fa5-1e6585b89ccf")
+			(uuid "879d56b8-2578-47c8-a33b-c151dd3c2498")
 		)
 		(pad "27" smd roundrect
 			(at 5.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 26 "unconnected-(J1-Pin_27-Pad27)")
+			(net 29 "unconnected-(J1-Pin_27-Pad27)")
 			(pinfunction "Pin_27")
 			(pintype "passive+no_connect")
-			(uuid "84358c0c-f70b-4017-9c3a-57f8fefebd96")
+			(uuid "a95e5313-f5fe-45f8-a361-ab8a6be670ed")
 		)
 		(pad "28" smd roundrect
 			(at 6.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 17 "+3V3")
+			(net 16 "+3V3")
 			(pinfunction "Pin_28")
 			(pintype "passive")
-			(uuid "b3fef635-55a2-41ab-8ca6-41e84683f4b7")
+			(uuid "2775691e-4ae5-45f5-99e0-ec5d3b15c890")
 		)
 		(pad "29" smd roundrect
 			(at 6.75 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 11 "+1V8")
+			(net 25 "+1V8")
 			(pinfunction "Pin_29")
 			(pintype "passive")
-			(uuid "1d9f7e6a-c8a9-4147-a167-4fa8d5a06cd4")
+			(uuid "0b75ead6-d703-40bd-9ba4-bcd70fdcbc8b")
 		)
 		(pad "30" smd roundrect
 			(at 7.25 2.3 180)
 			(size 0.3 0.65)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 1 "GND")
+			(net 2 "GND")
 			(pinfunction "Pin_30")
 			(pintype "passive")
-			(uuid "97882e07-97b9-48de-8ad4-42d84fd6b97d")
+			(uuid "8980d2dd-29d3-41e8-b7b8-95963091b1da")
 		)
 		(pad "MP" smd roundrect
 			(at -8.135 -0.51 180)
 			(size 0.3 1.15)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 21 "unconnected-(J1-MountPin-PadMP)")
+			(net 18 "unconnected-(J1-MountPin-PadMP)")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "3286a158-229d-44f8-b3e9-c799c48fce17")
+			(uuid "29599b7b-033c-4d41-861b-eea90dde5b44")
 		)
 		(pad "MP" smd roundrect
 			(at 8.135 -0.51 180)
 			(size 0.3 1.15)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.15)
-			(net 22 "unconnected-(J1-MountPin-PadMP)_1")
+			(net 19 "unconnected-(J1-MountPin-PadMP)_1")
 			(pinfunction "MountPin")
 			(pintype "passive+no_connect")
-			(uuid "5a1a81ef-71d2-41c8-955d-8f56bbe9bcf6")
+			(uuid "1d1ac4ab-7020-4f69-a914-0bc4295a4d12")
 		)
 		(embedded_fonts no)
 	)
-	(footprint "Connector_USB:USB_C_Receptacle_GCT_USB4105-xx-A_16P_TopMnt_Horizontal"
+	(footprint "phiboard:magnetic connector 01x02P"
 		(locked yes)
 		(layer "B.Cu")
-		(uuid "e6b3e7df-a8d0-4cf8-a534-5a4a049b1898")
-		(at 54.82 61.175)
-		(descr "USB 2.0 Type C Receptacle, GCT, 16P, top mounted, horizontal, 5A: https://gct.co/files/drawings/usb4105.pdf")
-		(tags "USB C Type-C Receptacle SMD USB 2.0 16P 16C USB4105-15-A USB4105-15-A-060 USB4105-15-A-120 USB4105-GF-A USB4105-GF-A-060 USB4105-GF-A-120")
-		(property "Reference" "J3"
-			(at -0.05 2.14 180)
+		(uuid "dcfb95bb-e56b-4c2b-a1e0-117205260525")
+		(at 43 88.5 180)
+		(property "Reference" "J2"
+			(at 0 1 0)
 			(unlocked yes)
 			(layer "B.SilkS")
 			(hide yes)
-			(uuid "c9263707-abf5-4466-9836-9494f9a9321f")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Value" "USB_C_Receptacle_USB2.0_16P"
-			(at 0 -5 180)
-			(unlocked yes)
-			(layer "B.Fab")
-			(uuid "63c2b72a-9a29-48ff-bc11-cde6862857ca")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip"
-			(at 0 0 180)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "d8230bf9-6178-4cf6-8e8a-58923b311fcc")
-			(effects
-				(font
-					(size 1.27 1.27)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Description" "USB 2.0-only 16P Type-C Receptacle connector"
-			(at 0 0 180)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "d72916d1-7e3b-4094-bc63-db453495362d")
-			(effects
-				(font
-					(size 1.27 1.27)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "LCSC PN" "C393939"
-			(at 0 0 180)
-			(unlocked yes)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "f8daaf8c-359e-46ea-aeb4-1517591a9064")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(attr smd)
-		(fp_line
-			(start -4.67 0.1)
-			(end -4.67 1.8)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "3cc2770b-0c34-43d2-b624-193653f108d4")
-		)
-		(fp_line
-			(start 4.67 0.1)
-			(end 4.67 1.8)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "751cf84d-8103-4ab8-b043-4022c87cfef9")
-		)
-		(fp_line
-			(start 5 -3.675)
-			(end -5 -3.675)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "2c6f0db3-127d-4563-aa63-222656f4bc07")
-		)
-		(fp_rect
-			(start -5.32 4.76)
-			(end 5.32 -4.18)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(fill no)
-			(layer "B.CrtYd")
-			(uuid "d6a864df-6b43-47e7-be08-dc9126b93afb")
-		)
-		(fp_rect
-			(start -4.47 3.675)
-			(end 4.47 -3.675)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(fill no)
-			(layer "B.Fab")
-			(uuid "0d28eb9f-85f5-49ce-a379-96afe1601ada")
-		)
-		(fp_text user "PCB Edge"
-			(at 0 -3.1 180)
-			(unlocked yes)
-			(layer "Dwgs.User")
-			(uuid "c35c5361-818f-47a8-b8ee-b365ea579242")
-			(effects
-				(font
-					(size 0.5 0.5)
-					(thickness 0.1)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 0 180)
-			(unlocked yes)
-			(layer "B.Fab")
-			(uuid "02d66cae-2e72-4479-b46f-f2f8d6ccc0e9")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(pad "" np_thru_hole circle
-			(at -2.89 2.605)
-			(size 0.65 0.65)
-			(drill 0.65)
-			(layers "*.Cu" "*.Mask")
-			(uuid "849311a2-3dfe-490d-b76c-3376b807f937")
-		)
-		(pad "" np_thru_hole circle
-			(at 2.89 2.605)
-			(size 0.65 0.65)
-			(drill 0.65)
-			(layers "*.Cu" "*.Mask")
-			(uuid "84ad24ab-73a5-4a8d-a084-33e2dea424d0")
-		)
-		(pad "A1" smd roundrect
-			(at -3.2 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 1 "GND")
-			(pinfunction "GND")
-			(pintype "passive")
-			(uuid "299a9f38-a10f-4826-92b0-2d230dd5723b")
-		)
-		(pad "A4" smd roundrect
-			(at -2.4 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 44 "Net-(D2-A)")
-			(pinfunction "VBUS")
-			(pintype "passive")
-			(uuid "647b7f1d-d0db-4b72-94de-cc39d748cd87")
-		)
-		(pad "A5" smd roundrect
-			(at -1.25 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 46 "Net-(J3-CC1)")
-			(pinfunction "CC1")
-			(pintype "bidirectional")
-			(uuid "4b6f4745-1fbd-4e40-a8b0-e5eb60ca25f5")
-		)
-		(pad "A6" smd roundrect
-			(at -0.25 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 40 "usbd+")
-			(pinfunction "D+")
-			(pintype "bidirectional")
-			(uuid "f02a516b-f580-431e-962f-842a5391c9d9")
-		)
-		(pad "A7" smd roundrect
-			(at 0.25 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 41 "usbd-")
-			(pinfunction "D-")
-			(pintype "bidirectional")
-			(uuid "168e6edc-6981-4578-bd20-6e37a25fcfbc")
-		)
-		(pad "A8" smd roundrect
-			(at 1.25 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 50 "unconnected-(J3-SBU1-PadA8)")
-			(pinfunction "SBU1")
-			(pintype "bidirectional+no_connect")
-			(uuid "8cc3f443-a4e1-4bab-b603-a20a98b78e1c")
-		)
-		(pad "A9" smd roundrect
-			(at 2.4 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 44 "Net-(D2-A)")
-			(pinfunction "VBUS")
-			(pintype "passive")
-			(uuid "3ee1b262-146a-430a-a929-c99aacf75cd4")
-		)
-		(pad "A12" smd roundrect
-			(at 3.2 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 1 "GND")
-			(pinfunction "GND")
-			(pintype "passive")
-			(uuid "4006327d-c123-4f33-9740-3468e76fae83")
-		)
-		(pad "B1" smd roundrect
-			(at 3.2 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 1 "GND")
-			(pinfunction "GND")
-			(pintype "passive")
-			(uuid "f95a3153-b7f6-406e-921c-568bb25c60c2")
-		)
-		(pad "B4" smd roundrect
-			(at 2.4 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 44 "Net-(D2-A)")
-			(pinfunction "VBUS")
-			(pintype "passive")
-			(uuid "51f3871f-1d74-47e1-8b2c-c1079258eb05")
-		)
-		(pad "B5" smd roundrect
-			(at 1.75 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 47 "Net-(J3-CC2)")
-			(pinfunction "CC2")
-			(pintype "bidirectional")
-			(uuid "695f0ff3-d3e9-45ca-8176-d24d5e6ef964")
-		)
-		(pad "B6" smd roundrect
-			(at 0.75 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 40 "usbd+")
-			(pinfunction "D+")
-			(pintype "bidirectional")
-			(uuid "c2a61bc9-c71f-4aa8-ab17-00d295cbc1fe")
-		)
-		(pad "B7" smd roundrect
-			(at -0.75 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 41 "usbd-")
-			(pinfunction "D-")
-			(pintype "bidirectional")
-			(uuid "def9cc47-2dbe-49ad-8037-496f6e541772")
-		)
-		(pad "B8" smd roundrect
-			(at -1.75 3.68)
-			(size 0.3 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 51 "unconnected-(J3-SBU2-PadB8)")
-			(pinfunction "SBU2")
-			(pintype "bidirectional+no_connect")
-			(uuid "6c692465-532d-4b52-9015-d7745af7610d")
-		)
-		(pad "B9" smd roundrect
-			(at -2.4 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 44 "Net-(D2-A)")
-			(pinfunction "VBUS")
-			(pintype "passive")
-			(uuid "408fe004-0f6f-471e-aad3-b4c426373f85")
-		)
-		(pad "B12" smd roundrect
-			(at -3.2 3.68)
-			(size 0.6 1.15)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(roundrect_rratio 0.25)
-			(net 1 "GND")
-			(pinfunction "GND")
-			(pintype "passive")
-			(uuid "ac135080-998f-433d-8b66-962268973c64")
-		)
-		(pad "S1" thru_hole oval
-			(at -4.32 -1.075)
-			(size 1 1.8)
-			(drill oval 0.6 1.4)
-			(property pad_prop_heatsink)
-			(layers "*.Cu" "*.Mask" "B.Paste")
-			(remove_unused_layers no)
-			(net 45 "Net-(J3-SHIELD)")
-			(pinfunction "SHIELD")
-			(pintype "passive")
-			(uuid "834b527d-8900-4603-be6b-3dbf0d49e6b4")
-		)
-		(pad "S1" thru_hole oval
-			(at -4.32 3.105)
-			(size 1 2.1)
-			(drill oval 0.6 1.7)
-			(property pad_prop_heatsink)
-			(layers "*.Cu" "*.Mask" "B.Paste")
-			(remove_unused_layers no)
-			(net 45 "Net-(J3-SHIELD)")
-			(pinfunction "SHIELD")
-			(pintype "passive")
-			(uuid "be630763-e2f0-4eb8-9987-cb5fc897f3ac")
-		)
-		(pad "S1" thru_hole oval
-			(at 4.32 -1.075)
-			(size 1 1.8)
-			(drill oval 0.6 1.4)
-			(property pad_prop_heatsink)
-			(layers "*.Cu" "*.Mask" "B.Paste")
-			(remove_unused_layers no)
-			(net 45 "Net-(J3-SHIELD)")
-			(pinfunction "SHIELD")
-			(pintype "passive")
-			(uuid "f0ace43c-c8d1-45dd-bf03-e9b33aebed5a")
-		)
-		(pad "S1" thru_hole oval
-			(at 4.32 3.105)
-			(size 1 2.1)
-			(drill oval 0.6 1.7)
-			(property pad_prop_heatsink)
-			(layers "*.Cu" "*.Mask" "B.Paste")
-			(remove_unused_layers no)
-			(net 45 "Net-(J3-SHIELD)")
-			(pinfunction "SHIELD")
-			(pintype "passive")
-			(uuid "c08ce390-458d-4cce-abdd-4f3c1766f239")
-		)
-		(embedded_fonts no)
-		(model "${KICAD9_3DMODEL_DIR}/Connector_USB.3dshapes/USB_C_Receptacle_GCT_USB4105-xx-A_16P_TopMnt_Horizontal.stpZ"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
-	)
-	(footprint "phiboard:swd_pad"
-		(locked yes)
-		(layer "B.Cu")
-		(uuid "f48a9c43-afd4-4add-ba4d-1347e45957e6")
-		(at 44.04 83.23 180)
-		(property "Reference" "J6"
-			(at 0 3 0)
-			(unlocked yes)
-			(layer "B.SilkS")
-			(hide yes)
-			(uuid "1be17222-3ec0-48fa-a1ea-e62d31ff6542")
+			(uuid "588c0dda-6e2c-445c-87b6-1b444d7418a7")
 			(effects
 				(font
 					(size 1 1)
@@ -12463,12 +7120,12 @@
 				(justify mirror)
 			)
 		)
-		(property "Value" "Conn_01x06"
-			(at 0 -3 0)
+		(property "Value" "Conn_01x02"
+			(at 0 -4.9 0)
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "18e5a81e-7f5c-4c18-ac93-329cc3096346")
+			(uuid "d99f8367-407b-423e-ab99-028a3c7f4060")
 			(effects
 				(font
 					(size 1 1)
@@ -12482,7 +7139,7 @@
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "8dd800a1-8c4d-4330-89ca-c00a607ea3fa")
+			(uuid "3ab8ee54-0620-4625-bf9e-0379f3a66c0e")
 			(effects
 				(font
 					(size 1 1)
@@ -12491,12 +7148,12 @@
 				(justify mirror)
 			)
 		)
-		(property "Description" "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)"
+		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
 			(at 0 0 0)
 			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "5dfa7aa3-0447-40a2-988e-c6f2fe7fc03a")
+			(uuid "e2bb1e22-fa5f-4f1a-8cc5-f0179af437ba")
 			(effects
 				(font
 					(size 1 1)
@@ -12505,12 +7162,66 @@
 				(justify mirror)
 			)
 		)
-		(attr smd exclude_from_bom)
+		(attr smd exclude_from_bom dnp)
+		(fp_poly
+			(pts
+				(xy 6 2) (xy -6 2) (xy -6 -2) (xy -2.5 -2) (xy -2.5 -4.5) (xy 2.5 -4.5) (xy 2.5 -2) (xy 6 -2)
+			)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(fill no)
+			(layer "B.CrtYd")
+			(uuid "a7f762d2-ac84-4305-aa68-7f8ce5d68411")
+		)
+		(fp_line
+			(start 6 -1)
+			(end 5 -1)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "028070be-ed26-4591-8e49-c7f7ef8aab7d")
+		)
+		(fp_line
+			(start -6 -1)
+			(end -5 -1)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "bcc72e8d-dae8-4911-ba6c-058aaaa75cc1")
+		)
+		(fp_rect
+			(start -6 2)
+			(end 6 0)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(fill no)
+			(layer "User.1")
+			(uuid "d4fbaf40-f3e7-4c28-9b6d-b7167e754f94")
+		)
+		(fp_rect
+			(start -6 0)
+			(end 6 -2)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(fill no)
+			(layer "User.1")
+			(uuid "d1e09169-7954-4e99-ae58-87c0c986762b")
+		)
 		(fp_text user "${REFERENCE}"
-			(at 0 -3.2 0)
+			(at 0 1 0)
 			(unlocked yes)
 			(layer "B.Fab")
-			(uuid "ed7492c4-4694-4581-945f-b4114ad88f62")
+			(uuid "8add29e6-f675-4a04-abf2-17325b17ad3d")
 			(effects
 				(font
 					(size 1 1)
@@ -12519,713 +7230,769 @@
 				(justify mirror)
 			)
 		)
-		(pad "1" smd rect
-			(at -2.54 1.27 180)
+		(pad "1" thru_hole circle
+			(at -1.27 -3.3 180)
 			(size 2 2)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 49 "unconnected-(J6-Pin_1-Pad1)")
+			(drill 1)
+			(layers "*.Cu" "*.Mask")
+			(remove_unused_layers no)
+			(net 41 "Net-(D1-A)")
 			(pinfunction "Pin_1")
-			(pintype "passive+no_connect")
-			(uuid "a6b4d269-0a52-4993-b7bd-589275d9af30")
+			(pintype "passive")
+			(uuid "0593835c-912f-4715-8ec2-5d99273dce45")
 		)
-		(pad "2" smd circle
-			(at -2.54 -1.27 180)
+		(pad "2" thru_hole circle
+			(at 1.27 -3.3 180)
 			(size 2 2)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 17 "+3V3")
+			(drill 1)
+			(layers "*.Cu" "*.Mask")
+			(remove_unused_layers no)
+			(net 2 "GND")
 			(pinfunction "Pin_2")
 			(pintype "passive")
-			(uuid "0a690627-1f09-44f4-8a23-0e4ced774c37")
-		)
-		(pad "3" smd circle
-			(at 0 1.27 180)
-			(size 2 2)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 43 "swd_data")
-			(pinfunction "Pin_3")
-			(pintype "passive")
-			(uuid "acde1fe6-2266-4a82-9d0b-17ebbe7409e4")
-		)
-		(pad "4" smd circle
-			(at 0 -1.27 180)
-			(size 2 2)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 39 "swd_clk")
-			(pinfunction "Pin_4")
-			(pintype "passive")
-			(uuid "2a354401-cbe8-4cd9-8830-969719f6347f")
-		)
-		(pad "5" smd circle
-			(at 2.54 1.27 180)
-			(size 2 2)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 42 "nreset")
-			(pinfunction "Pin_5")
-			(pintype "passive")
-			(uuid "1fd2a3fb-9858-4c73-bbaf-0abd2c376bad")
-		)
-		(pad "6" smd circle
-			(at 2.54 -1.27 180)
-			(size 2 2)
-			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "GND")
-			(pinfunction "Pin_6")
-			(pintype "passive")
-			(uuid "b8002882-e9f9-4e4d-9d49-359332d610db")
+			(uuid "668b5759-c6db-4114-b64f-d85779a91b5f")
 		)
 		(embedded_fonts no)
 	)
-	(gr_rect
-		(start 126 128.5)
-		(end 145 147.5)
-		(stroke
-			(width 0.1)
-			(type default)
-		)
-		(fill no)
-		(layer "Dwgs.User")
-		(uuid "c070c3eb-9072-477b-854e-1c23c91e11a5")
-	)
-	(gr_arc
-		(start 76.4 78.6)
-		(mid 76.312132 78.812132)
-		(end 76.1 78.9)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "00db681d-4858-48f1-93d9-ff995a24e77a")
-	)
-	(gr_line
-		(start 95.4 59.3)
-		(end 95.4 69.1)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "014e2754-3149-461a-9f98-57b5070944fb")
-	)
-	(gr_arc
-		(start 37.5 59.3)
-		(mid 37.587868 59.087868)
-		(end 37.8 59)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "0a011db8-38f9-42b6-8bb5-1114f3f77929")
-	)
-	(gr_arc
-		(start 37.8 88.4)
-		(mid 37.587868 88.312132)
-		(end 37.5 88.1)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "1a4f121e-4cd4-4c7c-bcc8-71f274171425")
-	)
-	(gr_arc
-		(start 37.5 59.3)
-		(mid 37.587868 59.087868)
-		(end 37.8 59)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "39cece40-4e86-4b01-b8f5-c3f9302f0cb4")
-	)
-	(gr_arc
-		(start 37.8 88.4)
-		(mid 37.587868 88.312132)
-		(end 37.5 88.1)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "3f47e9c6-f235-48b0-8c6c-bffc8590584a")
-	)
-	(gr_line
-		(start 76.8 69.4)
-		(end 95.1 69.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "50d064bb-1060-4f24-b42a-ced718901b27")
-	)
-	(gr_arc
-		(start 95.1 59)
-		(mid 95.312132 59.087868)
-		(end 95.4 59.3)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "52209838-05ec-4683-a4d0-2b5ba76a8831")
-	)
-	(gr_line
-		(start 76.1 78.9)
-		(end 57.8 78.9)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "57dc6877-bbb6-41c5-beaf-45e2b72ae472")
-	)
-	(gr_arc
-		(start 76.4 69.8)
-		(mid 76.4 69.4)
-		(end 76.8 69.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "624b99ea-5206-4fc0-8bae-a7f8122ca979")
-	)
-	(gr_arc
-		(start 95.4 69.1)
-		(mid 95.312132 69.312132)
-		(end 95.1 69.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "659cd820-d646-4133-a3b6-97b8f1cc08c1")
-	)
-	(gr_line
-		(start 37.8 59)
-		(end 95.1 59)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "66f73efe-0f71-4201-b5f8-e9e75ceddf12")
-	)
-	(gr_arc
-		(start 76.4 78.6)
-		(mid 76.312132 78.812132)
-		(end 76.1 78.9)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "780089e7-3213-44bc-b2c1-657afe9a3372")
-	)
-	(gr_line
-		(start 57.8 78.900001)
-		(end 76.1 78.900001)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "81f24b68-d6da-46ca-b666-c9114aaa6c2d")
-	)
-	(gr_arc
-		(start 57.4 88.1)
-		(mid 57.312132 88.312132)
-		(end 57.1 88.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "84f5025f-a6cd-46b9-a1fe-6af7c4d79838")
-	)
-	(gr_arc
-		(start 76.4 69.8)
-		(mid 76.4 69.4)
-		(end 76.8 69.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "861f1141-e8f7-4763-9f24-f8b5f6ae4781")
-	)
-	(gr_line
-		(start 95.1 69.4)
-		(end 76.8 69.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "863a801c-b46c-4148-bfcb-1931b124582a")
-	)
-	(gr_line
-		(start 57.400002 79.3)
-		(end 57.4 88.1)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "87471bae-fc01-408f-9418-327527ef0c84")
-	)
-	(gr_arc
-		(start 57.4 88.1)
-		(mid 57.312132 88.312132)
-		(end 57.1 88.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "8970a1a4-717d-48c6-91ad-2efca976eaa6")
-	)
-	(gr_line
-		(start 57.1 88.4)
-		(end 37.8 88.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "9270aabf-eb61-475a-b996-a44f8c9d5068")
-	)
-	(gr_line
-		(start 37.5 88.1)
-		(end 37.5 59.3)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "95a4fdf1-0be2-4667-bb8d-9155ca839714")
-	)
-	(gr_line
-		(start 57.4 88.1)
-		(end 57.4 79.3)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "9e8b71e0-a224-46ea-996e-74e6ff1eae1c")
-	)
-	(gr_arc
-		(start 57.4 79.3)
-		(mid 57.4 78.9)
-		(end 57.8 78.9)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "a4e5ca08-0020-446a-ad58-870870511ea0")
-	)
-	(gr_line
-		(start 37.5 59.3)
-		(end 37.5 88.1)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "b3b0802a-0d75-4221-952a-cf649a8e9026")
-	)
-	(gr_arc
-		(start 95.1 59)
-		(mid 95.312132 59.087868)
-		(end 95.4 59.3)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "bbf64b6b-2f93-4e88-8c77-036608b9567d")
-	)
-	(gr_line
-		(start 95.1 59)
-		(end 37.8 59)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "bebe3bd9-f78c-422f-9dc6-25367be454d0")
-	)
-	(gr_line
-		(start 76.4 69.8)
-		(end 76.4 78.6)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "c2292df6-6ede-4cae-9759-eb69b79a281b")
-	)
-	(gr_line
-		(start 76.4 69.8)
-		(end 76.4 78.6)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "d1969a22-7465-4bc7-a192-45186bdf1086")
-	)
-	(gr_line
-		(start 95.4 69.1)
-		(end 95.4 59.3)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "d22b060f-92e7-49a2-8179-84e884302eb5")
-	)
-	(gr_line
-		(start 37.8 88.4)
-		(end 57.1 88.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "e87fa8f6-16d0-4bea-bbc2-bad6ff9e3d2b")
-	)
-	(gr_arc
-		(start 57.4 79.3)
-		(mid 57.4 78.9)
-		(end 57.8 78.9)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "e909c730-ec6b-4e79-93ad-edb72c2f7aaa")
-	)
-	(gr_arc
-		(start 95.4 69.1)
-		(mid 95.312132 69.312132)
-		(end 95.1 69.4)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "fd52b728-cd76-4bea-b158-2152bd63f56b")
-	)
-	(gr_poly
-		(pts
-			(xy 131.5 129.3) (xy 149.8 134.2) (xy 145 152.6) (xy 126.6 147.6)
-		)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(fill no)
+	(footprint "phiboard:THD_0510-10CL-GF"
 		(locked yes)
+		(layer "B.Cu")
+		(uuid "df45c429-4685-4b1e-b357-073fea0c1e02")
+		(at 41.9 98.5 90)
+		(descr "FFC FPC 1x10")
+		(property "Reference" "J4"
+			(at 0 0.1 270)
+			(unlocked yes)
+			(layer "B.SilkS")
+			(hide yes)
+			(uuid "b5cf1a3f-4995-477c-82c1-d5e61515241c")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.1)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Value" "Conn_01x10"
+			(at 0 -2.6 270)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "e4daf20a-9513-4e41-8f4d-3f51e347d4bb")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 0 0 270)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "2c96abd5-f3d3-4edc-8ff1-8d7a7846565a")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Description" "Generic connectable mounting pin connector, single row, 01x10, script generated (kicad-library-utils/schlib/autogen/connector/)"
+			(at 0 0 270)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "dca92eec-43e3-426c-80f7-c6fbaed1a6a9")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "LCSC PN" "C283121"
+			(at 0 0 270)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "417ecf9f-190a-4364-8825-779441fa36ee")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(attr smd)
+		(fp_poly
+			(pts
+				(xy -2.6 2.2) (xy -3.6 2.2) (xy -3.6 -2) (xy 3.6 -2) (xy 3.6 2.1) (xy 2.6 2.1) (xy 2.6 2.8) (xy -2.6 2.8)
+			)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(fill no)
+			(layer "B.CrtYd")
+			(uuid "15de675e-a89d-4df9-991c-5d61374bf60b")
+		)
+		(fp_line
+			(start 2.8 -1.4)
+			(end -2.8 -1.4)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "70a0bde7-3c03-4aaa-b345-4008d61d7989")
+		)
+		(fp_line
+			(start -2.8 -1.4)
+			(end -2.8 0.4)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "23c3305b-0219-4860-9f60-e18376d341ad")
+		)
+		(fp_line
+			(start -3.4 0.1)
+			(end -3.4 1.9)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "c0d94be8-284d-4b34-bd8f-7aeba35e9835")
+		)
+		(fp_line
+			(start 2.8 0.4)
+			(end 2.8 -1.4)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "fdca011f-6dc8-468d-aacc-766ddb4aae5b")
+		)
+		(fp_line
+			(start -3.4 1.215)
+			(end 3.4 1.215)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "User.1")
+			(uuid "305b74c7-1a0a-4b6d-ae5f-707d17880d8d")
+		)
+		(fp_line
+			(start 3.4 1.9)
+			(end 3.4 0.1)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "097cf130-5c03-47e9-80f0-a5bb3183c005")
+		)
+		(fp_line
+			(start -3.4 1.9)
+			(end 3.4 1.9)
+			(stroke
+				(width 0.1)
+				(type default)
+			)
+			(layer "User.1")
+			(uuid "96e87a00-0a26-40a7-a00e-c7e3c6d53608")
+		)
+		(fp_text user "${REFERENCE}"
+			(at 0 0 270)
+			(unlocked yes)
+			(layer "B.Fab")
+			(uuid "24d28c7c-532c-4f0a-8c0a-8655c0e1eac4")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(pad "1" smd roundrect
+			(at -2.25 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 40 "sclk")
+			(pinfunction "Pin_1")
+			(pintype "passive")
+			(uuid "ea19e3fa-193c-45c9-9f93-17f9c89b7318")
+		)
+		(pad "2" smd roundrect
+			(at -1.75 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 37 "si")
+			(pinfunction "Pin_2")
+			(pintype "passive")
+			(uuid "bc079b72-6a34-4742-91f5-502d243497bd")
+		)
+		(pad "3" smd roundrect
+			(at -1.25 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 36 "scs")
+			(pinfunction "Pin_3")
+			(pintype "passive")
+			(uuid "8e9daf5e-95ea-4dfa-9d24-30327e1f24ec")
+		)
+		(pad "4" smd roundrect
+			(at -0.75 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 2 "GND")
+			(pinfunction "Pin_4")
+			(pintype "passive")
+			(uuid "aa3d4c39-391f-4922-b8a8-f6ec7401ca89")
+		)
+		(pad "5" smd roundrect
+			(at -0.25 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 16 "+3V3")
+			(pinfunction "Pin_5")
+			(pintype "passive")
+			(uuid "c61e3a9d-f428-4bce-a8ec-a237d044f34a")
+		)
+		(pad "6" smd roundrect
+			(at 0.25 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 16 "+3V3")
+			(pinfunction "Pin_6")
+			(pintype "passive")
+			(uuid "acb2b814-2965-4a23-a357-12e8a6ada30d")
+		)
+		(pad "7" smd roundrect
+			(at 0.75 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 16 "+3V3")
+			(pinfunction "Pin_7")
+			(pintype "passive")
+			(uuid "bfc4f8af-1cce-4430-a03d-f16a077aadcb")
+		)
+		(pad "8" smd roundrect
+			(at 1.25 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 2 "GND")
+			(pinfunction "Pin_8")
+			(pintype "passive")
+			(uuid "d3e73e5e-15d9-494c-96a2-138fe8503fa9")
+		)
+		(pad "9" smd roundrect
+			(at 1.75 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 2 "GND")
+			(pinfunction "Pin_9")
+			(pintype "passive")
+			(uuid "af76e7b7-1d1b-43ab-9f2f-cfc9a2e175d4")
+		)
+		(pad "10" smd roundrect
+			(at 2.25 2.3 90)
+			(size 0.3 0.65)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 2 "GND")
+			(pinfunction "Pin_10")
+			(pintype "passive")
+			(uuid "1c64ffaf-aaf5-4c94-85ba-aafbd0dd95ae")
+		)
+		(pad "MP" smd roundrect
+			(at -3.135 -0.51 90)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 46 "unconnected-(J4-MountPin-PadMP)")
+			(pinfunction "MountPin")
+			(pintype "passive+no_connect")
+			(uuid "fe8232ff-79fa-49b1-b3ff-1bbb0b19cd07")
+		)
+		(pad "MP" smd roundrect
+			(at 3.135 -0.51 90)
+			(size 0.3 1.15)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.15)
+			(net 47 "unconnected-(J4-MountPin-PadMP)_1")
+			(pinfunction "MountPin")
+			(pintype "passive+no_connect")
+			(uuid "01de4d1a-d1f5-4929-8d20-869212499dbf")
+		)
+		(embedded_fonts no)
+	)
+	(gr_arc
+		(start 94.9 98.6)
+		(mid 94.812132 98.812132)
+		(end 94.6 98.9)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "095eccd6-fd52-46f5-a4d1-dd90e6387ba4")
+	)
+	(gr_line
+		(start 75.6 108.4)
+		(end 57.3 108.4)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "1b4c652e-433e-4818-b185-e464250baf8c")
+	)
+	(gr_line
+		(start 94.6 98.9)
+		(end 76.3 98.9)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "344550fd-f7db-46e3-bd08-84499670c963")
+	)
+	(gr_arc
+		(start 56.9 108.8)
+		(mid 56.9 108.4)
+		(end 57.3 108.4)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "437a9932-9ce3-461b-917d-363ce4fb2ee6")
+	)
+	(gr_arc
+		(start 94.6 88.5)
+		(mid 94.812132 88.587868)
+		(end 94.9 88.8)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "54a016a5-92d7-4253-9635-ec567c861fd4")
+	)
+	(gr_line
+		(start 75.9 99.3)
+		(end 75.9 108.1)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "591a6abf-c6e4-43cc-b262-37b155eb634f")
+	)
+	(gr_arc
+		(start 75.9 108.1)
+		(mid 75.812132 108.312132)
+		(end 75.6 108.4)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "619d27e3-0873-441e-920c-51ede3e06c09")
+	)
+	(gr_line
+		(start 56.6 117.9)
+		(end 37.3 117.9)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "6cd936d3-d078-42f2-bef4-06359c84430f")
+	)
+	(gr_arc
+		(start 56.9 117.6)
+		(mid 56.812132 117.812132)
+		(end 56.6 117.9)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "7ea010c3-940b-4275-ae15-5e1b1bac5686")
+	)
+	(gr_line
+		(start 37 117.6)
+		(end 37 88.8)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "99905284-11ec-4c47-aae9-e4c6b5187eea")
+	)
+	(gr_arc
+		(start 37 88.8)
+		(mid 37.087868 88.587868)
+		(end 37.3 88.5)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "9bcacff7-7af7-401b-8c4f-958ba7a2d2e5")
+	)
+	(gr_arc
+		(start 37.3 117.9)
+		(mid 37.087868 117.812132)
+		(end 37 117.6)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "ab25d611-da93-4442-9b00-5b2f80ceb3d8")
+	)
+	(gr_line
+		(start 94.9 88.8)
+		(end 94.9 98.6)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "b6a764bb-25a5-4b0d-8628-718513cdfb2c")
+	)
+	(gr_arc
+		(start 75.9 99.3)
+		(mid 75.9 98.9)
+		(end 76.3 98.9)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "ba642a65-53b8-4eae-beb4-22c453f22964")
+	)
+	(gr_line
+		(start 37.3 88.5)
+		(end 94.6 88.5)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "bde11dec-9157-4105-a4a4-a46cc4d4b989")
+	)
+	(gr_line
+		(start 56.900002 108.8)
+		(end 56.9 117.6)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "fc128d69-0c9d-4b52-8ff9-6f4400c4cb87")
+	)
+	(gr_line
+		(start 76 99)
+		(end 95 99)
+		(stroke
+			(width 0.1)
+			(type default)
+		)
 		(layer "User.1")
-		(uuid "10c12339-d787-44b7-ace4-f428edd948d6")
+		(uuid "00316468-f261-4b74-ac35-b9a58a436d99")
 	)
 	(gr_rect
-		(start 135.5 109.5)
-		(end 154.5 128.5)
+		(start 135 139)
+		(end 154 158)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "29693232-3a73-4736-a6bc-09a1afbdf65d")
 	)
 	(gr_rect
-		(start 59.5 119)
-		(end 78.5 138)
+		(start 59 148.5)
+		(end 78 167.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "41faea2c-1a5b-427c-9c7d-0948d816983b")
 	)
 	(gr_rect
-		(start 97.5 100)
-		(end 116.5 119)
+		(start 97 129.5)
+		(end 116 148.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "4b2b37ca-2686-4428-9f19-2d269fe381a2")
 	)
 	(gr_rect
-		(start 59.5 100)
-		(end 78.5 119)
+		(start 59 129.5)
+		(end 78 148.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "5db0a17f-942f-44ce-b07b-0bca1061d59f")
 	)
+	(gr_line
+		(start 95 99)
+		(end 95 88.5)
+		(stroke
+			(width 0.1)
+			(type default)
+		)
+		(layer "User.1")
+		(uuid "6e6c70a4-34f8-4f7d-b0a9-ecf3e05bdbcd")
+	)
+	(gr_line
+		(start 57 118)
+		(end 37 118)
+		(stroke
+			(width 0.1)
+			(type default)
+		)
+		(layer "User.1")
+		(uuid "6e876278-b3e7-4a81-bbe2-b2e17a43f9bc")
+	)
 	(gr_rect
-		(start 116.5 71.5)
-		(end 135.5 90.5)
+		(start 116 101)
+		(end 135 120)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "71f57942-f2ba-452b-81f9-a4ee44fcf61a")
 	)
 	(gr_rect
-		(start 116.5 90.5)
-		(end 135.5 109.5)
+		(start 116 120)
+		(end 135 139)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "732e9fc3-f28a-4255-af24-0ce39d08c6b3")
 	)
 	(gr_rect
-		(start 116.5 109.5)
-		(end 135.5 128.5)
+		(start 116 139)
+		(end 135 158)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "9baf3af7-e0f3-4463-9496-8b796671b3e8")
 	)
 	(gr_rect
-		(start 135.5 71.5)
-		(end 154.5 90.5)
+		(start 135 101)
+		(end 154 120)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "9d798101-84a7-43b9-af78-f7efc56500ea")
 	)
 	(gr_rect
-		(start 135.5 90.5)
-		(end 154.5 109.5)
+		(start 135 120)
+		(end 154 139)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "a7e42781-6d93-44aa-a526-84a15a005e66")
 	)
 	(gr_rect
-		(start 78.5 109.5)
-		(end 97.5 128.5)
+		(start 78 139)
+		(end 97 158)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "af5ee885-82b8-49a9-a58d-5f6fd659a31f")
 	)
-	(gr_rect
-		(start 107 128.5)
-		(end 126 147.5)
+	(gr_line
+		(start 76 108.5)
+		(end 76 99)
 		(stroke
 			(width 0.1)
-			(type solid)
+			(type default)
 		)
-		(fill no)
-		(locked yes)
 		(layer "User.1")
-		(uuid "b2727a7d-ead1-4978-8813-69c50c8f4492")
+		(uuid "b37cbb96-2b1b-4f99-88a1-5879112bd585")
 	)
 	(gr_rect
-		(start 97.5 81)
-		(end 116.5 100)
+		(start 97 110.5)
+		(end 116 129.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "b650454e-8b1f-4510-874e-3796183841a3")
 	)
+	(gr_line
+		(start 57 118)
+		(end 57 108.5)
+		(stroke
+			(width 0.1)
+			(type default)
+		)
+		(layer "User.1")
+		(uuid "bbde07e6-ab09-42af-b698-bdb220891204")
+	)
 	(gr_rect
-		(start 78.5 90.5)
-		(end 97.5 109.5)
+		(start 78 120)
+		(end 97 139)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "c50bef36-c3aa-44ef-886d-45e82ece7ac9")
 	)
 	(gr_rect
-		(start 40.5 109.5)
-		(end 59.5 128.5)
+		(start 40 139)
+		(end 59 158)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.1")
 		(uuid "d0a48e47-d3e1-4db3-90a5-69012d21bc49")
 	)
-	(gr_poly
-		(pts
-			(xy 154.933447 136.465274) (xy 171.387929 145.965274) (xy 161.887929 162.419756) (xy 145.433447 152.919756)
-		)
+	(gr_line
+		(start 57 108.5)
+		(end 76 108.5)
 		(stroke
 			(width 0.1)
-			(type solid)
+			(type default)
 		)
-		(fill no)
-		(locked yes)
 		(layer "User.1")
-		(uuid "dc48a460-0b55-4231-b40c-d8b7368cf70f")
+		(uuid "e9c856c6-62e3-47d9-8020-429c2b566940")
 	)
 	(gr_rect
-		(start 40.5 90.5)
-		(end 59.5 109.5)
+		(start 40 120)
+		(end 59 139)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.3")
 		(uuid "016fe171-15bd-4201-99dd-4f8683c4a5e2")
 	)
 	(gr_rect
-		(start 78.5 71.5)
-		(end 97.5 90.5)
+		(start 78 101)
+		(end 97 120)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.3")
 		(uuid "0b9219e2-49ee-41cf-b86f-0f93aabb35d9")
 	)
 	(gr_rect
-		(start 97.5 62)
-		(end 116.5 81)
+		(start 97 91.5)
+		(end 116 110.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
 		(layer "User.3")
 		(uuid "1c10a9ae-403d-4b97-88a5-3b7aed2caca0")
 	)
-	(gr_line
-		(start 35.5 57)
-		(end 35.5 95)
-		(stroke
-			(width 0.1)
-			(type default)
-		)
-		(layer "User.3")
-		(uuid "53af7525-d72b-484e-a648-fc31045ef17f")
-	)
-	(gr_line
-		(start 35.5 57)
-		(end 106.5 57)
-		(stroke
-			(width 0.1)
-			(type default)
-		)
-		(layer "User.3")
-		(uuid "78d7dd8a-c24e-40dd-97a3-1c4f383a64f3")
-	)
 	(gr_rect
-		(start 41 62)
-		(end 73 76)
+		(start 59 110.5)
+		(end 78 129.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
-		(locked yes)
-		(layer "User.3")
-		(uuid "8f9ecc8f-3509-4830-8312-d08e4f7be9ef")
-	)
-	(gr_rect
-		(start 59.5 81)
-		(end 78.5 100)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(fill no)
-		(locked yes)
 		(layer "User.3")
 		(uuid "9800c642-cdd0-48b2-83e0-c4e1187c1384")
 	)
 	(gr_line
-		(start 35.5 57)
-		(end 35.5 95)
+		(start 35 86.5)
+		(end 106 86.5)
 		(stroke
 			(width 0.1)
 			(type default)
 		)
 		(layer "User.3")
-		(uuid "ebbd703a-6f2e-4808-87cc-14d47f8c2761")
+		(uuid "db8ecd8e-47c1-42cc-9455-fbea14095a97")
+	)
+	(gr_line
+		(start 35 86.5)
+		(end 35 124.5)
+		(stroke
+			(width 0.1)
+			(type default)
+		)
+		(layer "User.3")
+		(uuid "e0d7cfa6-632b-4d6e-b5f9-23b5d2b76e84")
 	)
 	(gr_rect
-		(start 78.5 71.5)
-		(end 97.5 90.5)
+		(start 40.5 91.5)
+		(end 72.5 105.5)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
 		(fill no)
 		(layer "User.3")
-		(uuid "efbd7937-a955-4354-b0a3-be59db0f6cf9")
-	)
-	(gr_line
-		(start 35.5 57)
-		(end 106.5 57)
-		(stroke
-			(width 0.1)
-			(type default)
-		)
-		(layer "User.3")
-		(uuid "f472a216-f34e-4f50-ba8c-eb93088b3cf6")
+		(uuid "e2b3f103-718b-4352-9e7c-cb8d99f7aa13")
 	)
 	(embedded_fonts no)
 )
diff --git a/shield/shield.kicad_sch b/shield/shield.kicad_sch
index f6b7dcd..37be5ce 100644
--- a/shield/shield.kicad_sch
+++ b/shield/shield.kicad_sch
@@ -1567,12 +1567,6 @@
 		(color 0 0 0 0)
 		(uuid "30483b62-19dd-4b9d-8ec1-3be23a73a051")
 	)
-	(junction
-		(at 78.74 138.43)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "76dbd299-03a0-46d4-be45-a8465cbf9dc2")
-	)
 	(junction
 		(at 129.54 133.35)
 		(diameter 0)
@@ -1615,11 +1609,17 @@
 		(color 0 0 0 0)
 		(uuid "e1ff6251-f55b-40df-8996-18274efa463c")
 	)
+	(junction
+		(at 78.74 138.43)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "f40dd28b-16ee-4a2d-91f7-cae6ce29d33e")
+	)
 	(junction
 		(at 78.74 148.59)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "e99c354d-96f1-4e62-b653-b10fcf894afa")
+		(uuid "fdbd1336-be65-48e8-815c-7616102ff8a0")
 	)
 	(no_connect
 		(at 48.26 46.99)
@@ -1795,6 +1795,16 @@
 		)
 		(uuid "2e898dc4-ea58-4e3c-82ca-05e5913da9c8")
 	)
+	(wire
+		(pts
+			(xy 78.74 128.27) (xy 78.74 138.43)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "33f34049-c249-481a-a8f1-8c7abc43a814")
+	)
 	(wire
 		(pts
 			(xy 40.64 46.99) (xy 40.64 62.23)
@@ -1945,16 +1955,6 @@
 		)
 		(uuid "7b650138-8aca-48ca-8740-1842363fd6e0")
 	)
-	(wire
-		(pts
-			(xy 78.74 138.43) (xy 78.74 148.59)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "879cf62a-e589-4d29-b63b-bbecd060bba1")
-	)
 	(wire
 		(pts
 			(xy 181.61 45.72) (xy 181.61 68.58)
@@ -1975,6 +1975,16 @@
 		)
 		(uuid "8fd8f3ee-4704-4b90-9e4f-aef83454be96")
 	)
+	(wire
+		(pts
+			(xy 78.74 138.43) (xy 78.74 148.59)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "90421678-bf97-430e-8377-c259a10fc244")
+	)
 	(wire
 		(pts
 			(xy 111.76 138.43) (xy 111.76 142.24)
@@ -2057,7 +2067,7 @@
 	)
 	(wire
 		(pts
-			(xy 78.74 128.27) (xy 78.74 138.43)
+			(xy 78.74 148.59) (xy 78.74 152.4)
 		)
 		(stroke
 			(width 0)
@@ -2095,16 +2105,6 @@
 		)
 		(uuid "c88983ba-3241-43f4-8cb2-e9699ff538ef")
 	)
-	(wire
-		(pts
-			(xy 78.74 148.59) (xy 78.74 152.4)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "d813c338-7135-4602-b362-35f3f488c66e")
-	)
 	(wire
 		(pts
 			(xy 163.83 166.37) (xy 163.83 165.1)
@@ -2157,7 +2157,7 @@
 	)
 	(global_label "key17"
 		(shape input)
-		(at 229.87 45.72 270)
+		(at 201.93 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2167,7 +2167,7 @@
 		)
 		(uuid "08f33fa2-5613-49a2-bd8d-d0c0b3260a8a")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 229.87 54.2085 90)
+			(at 201.93 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2201,7 +2201,7 @@
 	)
 	(global_label "key3"
 		(shape input)
-		(at 191.77 45.72 270)
+		(at 237.49 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2211,7 +2211,7 @@
 		)
 		(uuid "1304c5ec-ed9a-469e-ab3a-c6fea18c4b07")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 191.77 52.999 90)
+			(at 237.49 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2289,7 +2289,7 @@
 	)
 	(global_label "key6"
 		(shape input)
-		(at 201.93 45.72 270)
+		(at 229.87 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2299,7 +2299,7 @@
 		)
 		(uuid "19b3bb93-5536-4bac-9688-59168bcdd1e0")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 201.93 52.999 90)
+			(at 229.87 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2311,7 +2311,7 @@
 	)
 	(global_label "key13"
 		(shape input)
-		(at 219.71 45.72 270)
+		(at 212.09 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2321,7 +2321,7 @@
 		)
 		(uuid "1c26737b-7f33-47d1-a429-aa3612f86bfe")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 219.71 54.2085 90)
+			(at 212.09 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2421,7 +2421,7 @@
 	)
 	(global_label "key14"
 		(shape input)
-		(at 222.25 45.72 270)
+		(at 209.55 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2431,7 +2431,7 @@
 		)
 		(uuid "2760834e-821d-4b38-a094-30f2f7f7ef71")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 222.25 54.2085 90)
+			(at 209.55 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2641,7 +2641,7 @@
 	)
 	(global_label "key16"
 		(shape input)
-		(at 227.33 45.72 270)
+		(at 204.47 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2651,7 +2651,7 @@
 		)
 		(uuid "62cce8bc-d31d-4afa-9ffe-0b2c01bad39c")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 227.33 54.2085 90)
+			(at 204.47 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2663,7 +2663,7 @@
 	)
 	(global_label "key19"
 		(shape input)
-		(at 234.95 45.72 270)
+		(at 196.85 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2673,7 +2673,7 @@
 		)
 		(uuid "64c00f2c-9f4e-43a4-9234-0891af26fd17")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 234.95 54.2085 90)
+			(at 196.85 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2685,7 +2685,7 @@
 	)
 	(global_label "key22"
 		(shape input)
-		(at 242.57 45.72 270)
+		(at 186.69 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2695,7 +2695,7 @@
 		)
 		(uuid "6586651c-b42a-4e0c-969d-97cecf28b170")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 242.57 54.2085 90)
+			(at 186.69 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2751,7 +2751,7 @@
 	)
 	(global_label "key5"
 		(shape input)
-		(at 199.39 45.72 270)
+		(at 232.41 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2761,7 +2761,7 @@
 		)
 		(uuid "739a6f7a-7747-4d01-bb4b-8dff5b7ce7fc")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 199.39 52.999 90)
+			(at 232.41 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2817,7 +2817,7 @@
 	)
 	(global_label "key9"
 		(shape input)
-		(at 209.55 45.72 270)
+		(at 222.25 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2827,7 +2827,7 @@
 		)
 		(uuid "77881f99-f2ab-4c69-b4f9-db3aec4092fb")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 209.55 52.999 90)
+			(at 222.25 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2905,7 +2905,7 @@
 	)
 	(global_label "key7"
 		(shape input)
-		(at 204.47 45.72 270)
+		(at 227.33 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2915,7 +2915,7 @@
 		)
 		(uuid "851c6610-1e0d-4c63-9db8-b217eb43faa2")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 204.47 52.999 90)
+			(at 227.33 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2949,7 +2949,7 @@
 	)
 	(global_label "key10"
 		(shape input)
-		(at 212.09 45.72 270)
+		(at 219.71 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2959,7 +2959,7 @@
 		)
 		(uuid "858b286b-dd94-4f11-92b5-01ab0b469883")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 212.09 54.2085 90)
+			(at 219.71 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2993,7 +2993,7 @@
 	)
 	(global_label "key1"
 		(shape input)
-		(at 186.69 45.72 270)
+		(at 242.57 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3003,7 +3003,7 @@
 		)
 		(uuid "8c8feb6c-d7e5-4beb-a6d1-10fc4a954ae6")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 186.69 52.999 90)
+			(at 242.57 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3015,7 +3015,7 @@
 	)
 	(global_label "key21"
 		(shape input)
-		(at 240.03 45.72 270)
+		(at 189.23 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3025,7 +3025,7 @@
 		)
 		(uuid "902efb47-c17e-4889-988e-78e68851412d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 240.03 54.2085 90)
+			(at 189.23 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3059,7 +3059,7 @@
 	)
 	(global_label "key11"
 		(shape input)
-		(at 214.63 45.72 270)
+		(at 217.17 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3069,7 +3069,7 @@
 		)
 		(uuid "92f66949-bb02-485a-9819-035bdd8be77d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 214.63 54.2085 90)
+			(at 217.17 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3081,7 +3081,7 @@
 	)
 	(global_label "key20"
 		(shape input)
-		(at 237.49 45.72 270)
+		(at 191.77 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3091,7 +3091,7 @@
 		)
 		(uuid "9916311c-e12c-48c7-9b63-560a3726887b")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 237.49 54.2085 90)
+			(at 191.77 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3213,7 +3213,7 @@
 	)
 	(global_label "key12"
 		(shape input)
-		(at 217.17 45.72 270)
+		(at 214.63 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3223,7 +3223,7 @@
 		)
 		(uuid "b09bcb00-1319-4027-af89-e3fe826d59de")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 217.17 54.2085 90)
+			(at 214.63 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3279,7 +3279,7 @@
 	)
 	(global_label "key2"
 		(shape input)
-		(at 189.23 45.72 270)
+		(at 240.03 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3289,7 +3289,7 @@
 		)
 		(uuid "bc27ce48-d510-41ee-88db-7c728a16f531")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 189.23 52.999 90)
+			(at 240.03 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3345,7 +3345,7 @@
 	)
 	(global_label "key8"
 		(shape input)
-		(at 207.01 45.72 270)
+		(at 224.79 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3355,7 +3355,7 @@
 		)
 		(uuid "d94fe0eb-f6a7-4085-9139-926a41d68787")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 207.01 52.999 90)
+			(at 224.79 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3367,7 +3367,7 @@
 	)
 	(global_label "key4"
 		(shape input)
-		(at 196.85 45.72 270)
+		(at 234.95 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3377,7 +3377,7 @@
 		)
 		(uuid "e200e82d-336b-4a3a-904e-978097254845")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 196.85 52.999 90)
+			(at 234.95 52.999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3455,7 +3455,7 @@
 	)
 	(global_label "key15"
 		(shape input)
-		(at 224.79 45.72 270)
+		(at 207.01 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3465,7 +3465,7 @@
 		)
 		(uuid "ef2b287a-1f2a-45cb-9694-54c6fbe2240a")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 224.79 54.2085 90)
+			(at 207.01 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3521,7 +3521,7 @@
 	)
 	(global_label "key18"
 		(shape input)
-		(at 232.41 45.72 270)
+		(at 199.39 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -3531,7 +3531,7 @@
 		)
 		(uuid "fa8a06d6-4e02-48db-8d90-2b328c11e483")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 232.41 54.2085 90)
+			(at 199.39 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4564,7 +4564,7 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 76.2 125.73 0)
+		(at 92.71 120.65 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4572,7 +4572,7 @@
 		(dnp no)
 		(uuid "5b5f16e9-a0aa-4aae-bb41-88808b7226cc")
 		(property "Reference" "SW3"
-			(at 75.946 121.158 0)
+			(at 92.456 116.078 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4580,7 +4580,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 76.2 120.65 0)
+			(at 92.71 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4589,7 +4589,7 @@
 			)
 		)
 		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
-			(at 76.2 125.73 0)
+			(at 92.71 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4598,7 +4598,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 76.2 125.73 0)
+			(at 92.71 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4607,7 +4607,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 76.2 125.73 0)
+			(at 92.71 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4700,7 +4700,7 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 92.71 120.65 0)
+		(at 76.2 146.05 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4708,7 +4708,7 @@
 		(dnp no)
 		(uuid "71593c22-9c71-498f-8264-c3e21440f9eb")
 		(property "Reference" "SW6"
-			(at 92.456 116.078 0)
+			(at 75.946 141.478 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4716,7 +4716,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 92.71 115.57 0)
+			(at 76.2 140.97 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4725,7 +4725,7 @@
 			)
 		)
 		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
-			(at 92.71 120.65 0)
+			(at 76.2 146.05 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4734,7 +4734,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 92.71 120.65 0)
+			(at 76.2 146.05 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4743,7 +4743,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 92.71 120.65 0)
+			(at 76.2 146.05 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5198,7 +5198,7 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 76.2 146.05 0)
+		(at 76.2 135.89 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5206,7 +5206,7 @@
 		(dnp no)
 		(uuid "a206fdcd-54ff-4dcc-8db2-e213dbb4b523")
 		(property "Reference" "SW5"
-			(at 75.946 141.478 0)
+			(at 75.946 131.318 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5214,7 +5214,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 76.2 140.97 0)
+			(at 76.2 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5223,7 +5223,7 @@
 			)
 		)
 		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
-			(at 76.2 146.05 0)
+			(at 76.2 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5232,7 +5232,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 76.2 146.05 0)
+			(at 76.2 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5241,7 +5241,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 76.2 146.05 0)
+			(at 76.2 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5666,7 +5666,7 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 76.2 135.89 0)
+		(at 76.2 125.73 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5674,7 +5674,7 @@
 		(dnp no)
 		(uuid "d22f8a47-d1cf-47e8-9c9f-02de0c1cc10d")
 		(property "Reference" "SW4"
-			(at 75.946 131.318 0)
+			(at 75.946 121.158 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5682,7 +5682,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 76.2 130.81 0)
+			(at 76.2 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5691,7 +5691,7 @@
 			)
 		)
 		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
-			(at 76.2 135.89 0)
+			(at 76.2 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5700,7 +5700,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 76.2 135.89 0)
+			(at 76.2 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5709,7 +5709,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 76.2 135.89 0)
+			(at 76.2 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)