From c45308f5ffcafa5a547c0229c9280915b2794aaf Mon Sep 17 00:00:00 2001
From: phiwan-dev <75113544+phiwan-dev@users.noreply.github.com>
Date: Fri, 10 Apr 2026 13:50:52 +0200
Subject: [PATCH 1/2] shield: pcb key footprint connect pads across

---
 .../mx_choc-12_ks33-123_hs.kicad_mod          | 190 +++++++-----------
 shield/shield.kicad_pro                       |  23 ++-
 2 files changed, 95 insertions(+), 118 deletions(-)

diff --git a/kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod b/kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod
index 5a81dae..f251626 100644
--- a/kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod
+++ b/kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod
@@ -8,7 +8,7 @@
 		(unlocked yes)
 		(layer "F.SilkS")
 		(hide yes)
-		(uuid "de57fbc9-0cc6-4557-a69e-3cc239c42429")
+		(uuid "75c8667a-d83a-4212-8741-a0a6c36c286d")
 		(effects
 			(font
 				(size 1 1)
@@ -21,7 +21,7 @@
 		(unlocked yes)
 		(layer "F.Fab")
 		(hide yes)
-		(uuid "af2793e9-beee-4d4f-aae0-c9a51b675163")
+		(uuid "db0364d5-41f3-48e9-a509-bf2c49cdc9f0")
 		(effects
 			(font
 				(size 1 1)
@@ -34,7 +34,7 @@
 		(unlocked yes)
 		(layer "F.Fab")
 		(hide yes)
-		(uuid "5b5b435a-7890-408d-8a2c-cf9430427305")
+		(uuid "7811f012-8d6e-42c7-8e36-c554780420ca")
 		(effects
 			(font
 				(size 1 1)
@@ -47,7 +47,7 @@
 		(unlocked yes)
 		(layer "F.Fab")
 		(hide yes)
-		(uuid "4c8bd3a4-7454-40ae-81de-70a1a208c753")
+		(uuid "e83807ce-74aa-4d1f-aad0-cdd5fb7c6d7f")
 		(effects
 			(font
 				(size 1 1)
@@ -55,62 +55,8 @@
 			)
 		)
 	)
+	(clearance 0)
 	(attr through_hole)
-	(fp_rect
-		(start 2.24 2.02)
-		(end 2.29 2.07)
-		(stroke
-			(width 0.2)
-			(type default)
-		)
-		(fill no)
-		(layer "F.Cu")
-		(uuid "44232b89-5dd7-46e1-94e7-14b8e1f5892a")
-	)
-	(fp_arc
-		(start -2.616295 -1.343503)
-		(mid 1.927006 -2.221857)
-		(end 1.7 2.4)
-		(stroke
-			(width 0.2)
-			(type default)
-		)
-		(layer "F.Cu")
-		(uuid "f061d1f8-37dd-4504-9409-1d7e59e4a446")
-	)
-	(fp_arc
-		(start -2.616294 -1.343503)
-		(mid -3.362479 -1.119514)
-		(end -3.577192 -1.86842)
-		(stroke
-			(width 0.2)
-			(type default)
-		)
-		(layer "F.Cu")
-		(uuid "922e3e72-8405-433c-bb10-1f1b29685e5e")
-	)
-	(fp_curve
-		(pts
-			(xy -3.443179 -1.176751) (xy -3.61 -1.39) (xy -3.922812 -1.38838) (xy -4.107657 -1.21)
-		)
-		(stroke
-			(width 0.2)
-			(type default)
-		)
-		(layer "F.Cu")
-		(uuid "6899e1e1-ec54-47f8-9356-fca3bfa51e06")
-	)
-	(fp_curve
-		(pts
-			(xy 2.42 1.662362) (xy 2.26 1.868166) (xy 2.43 2.16) (xy 2.7 2.18)
-		)
-		(stroke
-			(width 0.2)
-			(type default)
-		)
-		(layer "F.Cu")
-		(uuid "f3939ec5-177f-44ae-9f81-5ce8085b8336")
-	)
 	(fp_rect
 		(start -7.5 -7.5)
 		(end 7.5 7.5)
@@ -182,6 +128,7 @@
 		(size 0.2 0.2)
 		(drill oval 1 1.6)
 		(layers "*.Mask")
+		(clearance 0)
 		(uuid "6f091cb5-bbf3-446d-92f4-8a6bf0697557")
 	)
 	(pad "" np_thru_hole circle
@@ -189,6 +136,7 @@
 		(size 3 3)
 		(drill 3)
 		(layers "*.Mask")
+		(clearance 0)
 		(uuid "92b4e9e7-f730-4d88-8428-6d93d773e36f")
 	)
 	(pad "" np_thru_hole circle
@@ -221,49 +169,79 @@
 		(uuid "467dfa06-2f06-4f31-849f-3b49cbbbf070")
 	)
 	(pad "1" smd custom
-		(at 2.4 6.1)
-		(size 2.75 2.75)
+		(at 2.25 2.05)
+		(size 0.2 0.2)
 		(layers "F.Cu" "F.Mask" "F.Paste")
 		(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 "c0aae120-462d-4489-93e4-f9834fe23a02")
+	)
+	(pad "1" thru_hole circle
+		(at 2.54 3.81)
+		(size 3.5 3.5)
+		(drill 3)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(clearance 0)
+		(uuid "db316589-838e-4c3e-954e-6b3ea0d4480a")
+	)
+	(pad "1" smd custom
+		(at 2.737497 6.1125)
+		(size 2.074994 2.074994)
+		(layers "F.Cu" "F.Mask" "F.Paste")
+		(clearance 0)
+		(thermal_bridge_angle 90)
+		(options
+			(clearance outline)
+			(anchor circle)
+		)
 		(primitives
 			(gr_poly
 				(pts
-					(xy -1.15 -1.8) (xy -1.420485 -1.018996) (xy 1.295671 -1.003672) (xy 1.295671 -1.8)
+					(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.2 -1.8)
-				(mid -1.361091 -1.411091)
-				(end -1.75 -1.25)
+				(start -1.437497 -1.2125)
+				(mid -1.047664 0.098369)
+				(end -1.747684 1.273238)
 				(width 0.2)
 			)
-			(gr_poly
-				(pts
-					(xy -2.4 -1.1) (xy -2.38097 -1.195671) (xy -2.326777 -1.276777) (xy -2.245671 -1.33097) (xy -2.15 -1.35)
-					(xy 1.15 -1.35) (xy 1.245671 -1.33097) (xy 1.326777 -1.276777) (xy 1.38097 -1.195671) (xy 1.4 -1.1)
-					(xy 1.4 1.15) (xy 1.38097 1.245671) (xy 1.326777 1.326777) (xy 1.245671 1.38097) (xy 1.15 1.4)
-					(xy -2.15 1.4) (xy -2.245671 1.38097) (xy -2.326777 1.326777) (xy -2.38097 1.245671) (xy -2.4 1.15)
-				)
-				(width 0)
-				(fill yes)
-			)
 		)
 		(uuid "bcf113a8-37d9-4ebb-b910-45ea0b809dcc")
 	)
-	(pad "1" thru_hole circle
-		(at 2.54 3.81)
-		(size 3.5 3.5)
-		(drill 3)
-		(layers "*.Cu" "*.Mask")
-		(remove_unused_layers no)
-		(uuid "db316589-838e-4c3e-954e-6b3ea0d4480a")
-	)
 	(pad "1" smd custom
 		(at 4.85 4.1 270)
 		(size 2.5 2.5)
@@ -375,17 +353,9 @@
 		(remove_unused_layers no)
 		(uuid "ab60ce77-0dba-4a11-8214-7a1d130a6b06")
 	)
-	(pad "2" thru_hole circle
-		(at -2.54 3.81)
-		(size 3.5 3.5)
-		(drill 3)
-		(layers "*.Cu" "*.Mask")
-		(remove_unused_layers no)
-		(uuid "22ef473c-a21a-4dcc-a412-65db4b2643de")
-	)
 	(pad "2" smd custom
-		(at -2.4 6.1)
-		(size 2.75 2.75)
+		(at -2.7875 6.1125)
+		(size 1.975 1.975)
 		(layers "B.Cu" "B.Mask" "B.Paste")
 		(thermal_bridge_angle 90)
 		(options
@@ -395,36 +365,30 @@
 		(primitives
 			(gr_poly
 				(pts
-					(xy 1.15 -1.8) (xy 1.420485 -1.018996) (xy -1.295671 -1.003672) (xy -1.295671 -1.8)
+					(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.75 -1.25)
-				(mid 1.361091 -1.411091)
-				(end 1.2 -1.8)
+				(start 1.80025 1.26965)
+				(mid 1.098042 0.062808)
+				(end 1.5375 -1.2625)
 				(width 0.2)
 			)
-			(gr_arc
-				(start 1.75 -1.25)
-				(mid 1.361091 -1.411091)
-				(end 1.2 -1.8)
-				(width 0.2)
-			)
-			(gr_poly
-				(pts
-					(xy 2.4 -1.1) (xy 2.38097 -1.195671) (xy 2.326777 -1.276777) (xy 2.245671 -1.33097) (xy 2.15 -1.35)
-					(xy -1.15 -1.35) (xy -1.245671 -1.33097) (xy -1.326777 -1.276777) (xy -1.38097 -1.195671) (xy -1.4 -1.1)
-					(xy -1.4 1.15) (xy -1.38097 1.245671) (xy -1.326777 1.326777) (xy -1.245671 1.38097) (xy -1.15 1.4)
-					(xy 2.15 1.4) (xy 2.245671 1.38097) (xy 2.326777 1.326777) (xy 2.38097 1.245671) (xy 2.4 1.15)
-				)
-				(width 0)
-				(fill yes)
-			)
 		)
 		(uuid "85986989-65e5-4a20-aeb0-0aab717e6582")
 	)
+	(pad "2" thru_hole circle
+		(at -2.54 3.81)
+		(size 3.5 3.5)
+		(drill 3)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(clearance 0)
+		(uuid "22ef473c-a21a-4dcc-a412-65db4b2643de")
+	)
 	(pad "2" smd roundrect
 		(at 5.08 -4.54 90)
 		(size 4 2.5)
diff --git a/shield/shield.kicad_pro b/shield/shield.kicad_pro
index 1c2f76a..95c6e4b 100644
--- a/shield/shield.kicad_pro
+++ b/shield/shield.kicad_pro
@@ -51,7 +51,13 @@
           "min_clearance": 0.5
         }
       },
-      "diff_pair_dimensions": [],
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.0,
+          "via_gap": 0.0,
+          "width": 0.0
+        }
+      ],
       "drc_exclusions": [],
       "meta": {
         "version": 2
@@ -119,9 +125,9 @@
         "max_error": 0.005,
         "min_clearance": 0.0,
         "min_connection": 0.0,
-        "min_copper_edge_clearance": 0.5,
+        "min_copper_edge_clearance": 0.0,
         "min_groove_width": 0.0,
-        "min_hole_clearance": 0.25,
+        "min_hole_clearance": 0.0,
         "min_hole_to_hole": 0.25,
         "min_microvia_diameter": 0.2,
         "min_microvia_drill": 0.1,
@@ -180,7 +186,9 @@
           "td_width_to_size_filter_ratio": 0.9
         }
       ],
-      "track_widths": [],
+      "track_widths": [
+        0.0
+      ],
       "tuning_pattern_settings": {
         "diff_pair_defaults": {
           "corner_radius_percentage": 80,
@@ -207,7 +215,12 @@
           "spacing": 0.6
         }
       },
-      "via_dimensions": [],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        }
+      ],
       "zones_allow_external_fillets": false
     },
     "ipc2581": {

From cf582f1c6cce12e660ede3db6206d073cb4d9528 Mon Sep 17 00:00:00 2001
From: phiwan-dev <75113544+phiwan-dev@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:08:28 +0200
Subject: [PATCH 2/2] shield: sch create key schematic and board to board
 connectors

---
 board-right/board_right.kicad_pcb    |    2 +-
 board-right/board_to_board.kicad_sch |    4 +
 shield/shield.kicad_sch              | 2396 ++++++++++++++++++++++++--
 3 files changed, 2295 insertions(+), 107 deletions(-)

diff --git a/board-right/board_right.kicad_pcb b/board-right/board_right.kicad_pcb
index c438e59..fdf2b1f 100644
--- a/board-right/board_right.kicad_pcb
+++ b/board-right/board_right.kicad_pcb
@@ -1960,7 +1960,7 @@
 			(roundrect_rratio 0.15)
 			(net 33 "unconnected-(J1-Pin_7-Pad7)")
 			(pinfunction "Pin_7")
-			(pintype "passive")
+			(pintype "passive+no_connect")
 			(uuid "305f147e-bb4d-4fdf-9592-93fae586029c")
 		)
 		(pad "8" smd roundrect
diff --git a/board-right/board_to_board.kicad_sch b/board-right/board_to_board.kicad_sch
index 1608b53..935a63e 100644
--- a/board-right/board_to_board.kicad_sch
+++ b/board-right/board_to_board.kicad_sch
@@ -1364,6 +1364,10 @@
 		(at 166.37 82.55)
 		(uuid "2a30fa34-8948-4d5d-ad2d-51aecf05bddc")
 	)
+	(no_connect
+		(at 115.57 82.55)
+		(uuid "7be424b9-3ef3-4d4b-a324-9f3e94365a75")
+	)
 	(no_connect
 		(at 179.07 77.47)
 		(uuid "edc82ba1-4202-481d-9696-e1d485fefc68")
diff --git a/shield/shield.kicad_sch b/shield/shield.kicad_sch
index 528da4b..37be5ce 100644
--- a/shield/shield.kicad_sch
+++ b/shield/shield.kicad_sch
@@ -1550,21 +1550,85 @@
 		(uuid "d1fa6cfe-68ab-4c37-a235-8f913d793f64")
 	)
 	(junction
-		(at 59.69 151.13)
+		(at 129.54 143.51)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "2713750d-5135-4a26-80cb-b6bc9552780f")
+		(uuid "086dee01-a7d6-49fc-9c6e-b222919dc869")
 	)
 	(junction
-		(at 59.69 161.29)
+		(at 95.25 143.51)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "df21eef8-6c80-47d6-b704-d305af878c37")
+		(uuid "1bfabc13-f66c-4653-952e-d45dce9536f7")
+	)
+	(junction
+		(at 95.25 133.35)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "30483b62-19dd-4b9d-8ec1-3be23a73a051")
+	)
+	(junction
+		(at 129.54 133.35)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "780124e6-c600-4111-aeda-5672a1d5873e")
+	)
+	(junction
+		(at 111.76 138.43)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "9212ae46-bb0e-4d6a-8386-87b2a259738b")
+	)
+	(junction
+		(at 147.32 133.35)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "941ac878-5ee2-40f9-98a7-6a17aeb21c88")
+	)
+	(junction
+		(at 147.32 166.37)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "aa27c590-ae34-4d5a-9a67-b63304c1a64f")
+	)
+	(junction
+		(at 111.76 128.27)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "af9d4ce2-97b7-4541-94d2-40bab36d8464")
+	)
+	(junction
+		(at 62.23 143.51)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "b40c33f8-b64b-4e1a-8dda-812b072f364b")
+	)
+	(junction
+		(at 147.32 143.51)
+		(diameter 0)
+		(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 "fdbd1336-be65-48e8-815c-7616102ff8a0")
 	)
 	(no_connect
 		(at 48.26 46.99)
 		(uuid "1ccf6e7f-9c5f-4b06-9522-9f97718ede81")
 	)
+	(no_connect
+		(at 194.31 45.72)
+		(uuid "9397943f-47c7-4fb1-814b-f17766f334f9")
+	)
 	(no_connect
 		(at 76.2 46.99)
 		(uuid "981d53c8-51b0-43ea-b672-d58580bde7ff")
@@ -1581,6 +1645,26 @@
 		(at 245.11 45.72)
 		(uuid "d0e8e199-80e1-46aa-981d-fbffda410976")
 	)
+	(wire
+		(pts
+			(xy 147.32 143.51) (xy 147.32 147.32)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0277f234-f0d4-4a14-b377-23bd0a15bcc2")
+	)
+	(wire
+		(pts
+			(xy 95.25 133.35) (xy 95.25 143.51)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0f2187a4-7650-431a-bd1d-22ff460ee8fb")
+	)
 	(wire
 		(pts
 			(xy 184.15 45.72) (xy 184.15 62.23)
@@ -1631,6 +1715,16 @@
 		)
 		(uuid "1f3d313c-8dfe-40ea-a8ac-76c993ae1531")
 	)
+	(wire
+		(pts
+			(xy 95.25 123.19) (xy 95.25 133.35)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "22a53dc5-4f3d-42c4-b470-562a05c626da")
+	)
 	(wire
 		(pts
 			(xy 179.07 45.72) (xy 179.07 60.96)
@@ -1671,6 +1765,26 @@
 		)
 		(uuid "2a4222ec-c10d-4ff6-8b65-4e60b9909960")
 	)
+	(wire
+		(pts
+			(xy 62.23 143.51) (xy 62.23 147.32)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "2aeacd5f-f4ce-46e4-a0b7-78719099531b")
+	)
+	(wire
+		(pts
+			(xy 129.54 166.37) (xy 147.32 166.37)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "2b38ecd6-e1b2-44f6-b26a-adc07971533c")
+	)
 	(wire
 		(pts
 			(xy 106.68 63.5) (xy 106.68 62.23)
@@ -1681,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)
@@ -1713,13 +1837,23 @@
 	)
 	(wire
 		(pts
-			(xy 59.69 151.13) (xy 59.69 161.29)
+			(xy 147.32 166.37) (xy 163.83 166.37)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "49089495-de47-442f-973b-c57806c4495f")
+		(uuid "483ff845-aee0-4d34-a615-5e0a184507f4")
+	)
+	(wire
+		(pts
+			(xy 147.32 133.35) (xy 147.32 143.51)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "4afe68c5-0dbf-417d-bb42-b421df086ae1")
 	)
 	(wire
 		(pts
@@ -1761,6 +1895,16 @@
 		)
 		(uuid "5c97cee5-ce19-4701-af22-3f09c5c1e9fd")
 	)
+	(wire
+		(pts
+			(xy 147.32 123.19) (xy 147.32 133.35)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "67606884-8772-4723-8cd1-1756ebe7bf79")
+	)
 	(wire
 		(pts
 			(xy 45.72 63.5) (xy 49.53 63.5)
@@ -1793,7 +1937,7 @@
 	)
 	(wire
 		(pts
-			(xy 59.69 161.29) (xy 59.69 165.1)
+			(xy 62.23 133.35) (xy 62.23 143.51)
 		)
 		(stroke
 			(width 0)
@@ -1821,6 +1965,36 @@
 		)
 		(uuid "8e8db939-5738-476d-8d1a-6e4b4772322a")
 	)
+	(wire
+		(pts
+			(xy 129.54 123.19) (xy 129.54 133.35)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(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)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "9afd05ae-3d5e-495c-ab8b-528ef53353b0")
+	)
 	(wire
 		(pts
 			(xy 111.76 69.85) (xy 106.68 69.85)
@@ -1853,13 +2027,63 @@
 	)
 	(wire
 		(pts
-			(xy 59.69 139.7) (xy 59.69 151.13)
+			(xy 129.54 166.37) (xy 129.54 165.1)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "af762915-6351-4307-9590-fde8bf4dd333")
+		(uuid "aef88042-2e0a-4dbf-a732-f14c67347246")
+	)
+	(wire
+		(pts
+			(xy 129.54 143.51) (xy 129.54 147.32)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b0798692-e1e9-4f8a-b17f-e2701016d8ec")
+	)
+	(wire
+		(pts
+			(xy 95.25 143.51) (xy 95.25 147.32)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b2d11ff9-5012-4491-9bdb-89ce0996f7ce")
+	)
+	(wire
+		(pts
+			(xy 111.76 128.27) (xy 111.76 138.43)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b8eb5bee-e4d2-4915-9687-014bcd227188")
+	)
+	(wire
+		(pts
+			(xy 78.74 148.59) (xy 78.74 152.4)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "be20b85e-2b94-4d45-afdd-91672f7ccee4")
+	)
+	(wire
+		(pts
+			(xy 111.76 118.11) (xy 111.76 128.27)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c0dbb3a9-2b79-4ca1-826e-a5507edee704")
 	)
 	(wire
 		(pts
@@ -1881,6 +2105,16 @@
 		)
 		(uuid "c88983ba-3241-43f4-8cb2-e9699ff538ef")
 	)
+	(wire
+		(pts
+			(xy 163.83 166.37) (xy 163.83 165.1)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "ea82087e-b745-4761-bd87-1297692b4d10")
+	)
 	(wire
 		(pts
 			(xy 181.61 68.58) (xy 186.69 68.58)
@@ -1891,6 +2125,36 @@
 		)
 		(uuid "efb9073c-0cd2-43a3-aacc-b9cf2034de0d")
 	)
+	(wire
+		(pts
+			(xy 147.32 166.37) (xy 147.32 170.18)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "f66d852a-8ef7-4cc7-8989-e757543e393d")
+	)
+	(wire
+		(pts
+			(xy 129.54 133.35) (xy 129.54 143.51)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fbc98908-1a7d-4da7-a04a-3cfe4b3db519")
+	)
+	(wire
+		(pts
+			(xy 147.32 166.37) (xy 147.32 165.1)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fe00ca48-2587-4897-9a72-84ac1766abdd")
+	)
 	(global_label "key17"
 		(shape input)
 		(at 201.93 45.72 270)
@@ -1913,6 +2177,28 @@
 			)
 		)
 	)
+	(global_label "key13"
+		(shape input)
+		(at 124.46 128.27 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "0de424de-2acf-4141-81bc-58844c1393de")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 115.9715 128.27 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
 	(global_label "key3"
 		(shape input)
 		(at 237.49 45.72 270)
@@ -1935,9 +2221,31 @@
 			)
 		)
 	)
+	(global_label "key5"
+		(shape input)
+		(at 73.66 143.51 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "1683d150-ef5e-4064-9599-647efa6af799")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 66.381 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
 	(global_label "key17"
 		(shape input)
-		(at 66.04 46.99 270)
+		(at 93.98 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -1947,7 +2255,29 @@
 		)
 		(uuid "16eeccd6-63f4-40fe-9459-f2a18a1bc204")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 66.04 55.4785 90)
+			(at 93.98 55.4785 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key4"
+		(shape input)
+		(at 73.66 133.35 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "1753f211-7635-403b-bff8-da063dfe0d81")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 66.381 133.35 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2003,7 +2333,7 @@
 	)
 	(global_label "key14"
 		(shape input)
-		(at 73.66 46.99 270)
+		(at 86.36 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2013,7 +2343,51 @@
 		)
 		(uuid "1d444dc0-48d3-4bd0-a388-f1d68eb49fd2")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 73.66 55.4785 90)
+			(at 86.36 55.4785 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key8"
+		(shape input)
+		(at 90.17 138.43 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "1e6e4d35-2a84-4b60-be8a-45b5be1727fe")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 82.891 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key16"
+		(shape input)
+		(at 142.24 128.27 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "2478dfe4-7540-4977-839c-3f23317559db")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 133.7515 128.27 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2025,7 +2399,7 @@
 	)
 	(global_label "key2"
 		(shape input)
-		(at 104.14 46.99 270)
+		(at 53.34 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2035,7 +2409,7 @@
 		)
 		(uuid "25546492-438e-49ab-bac8-1f030aa4286d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 104.14 54.269 90)
+			(at 53.34 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2069,7 +2443,7 @@
 	)
 	(global_label "key8"
 		(shape input)
-		(at 88.9 46.99 270)
+		(at 68.58 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2079,7 +2453,7 @@
 		)
 		(uuid "2aa46aa2-a3c8-4d72-8478-3a9a43b94d72")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 88.9 54.269 90)
+			(at 68.58 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2091,7 +2465,7 @@
 	)
 	(global_label "key3"
 		(shape input)
-		(at 101.6 46.99 270)
+		(at 55.88 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2101,7 +2475,7 @@
 		)
 		(uuid "36c00a8d-4fbd-4eb2-b069-7d9cb90c051b")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 101.6 54.269 90)
+			(at 55.88 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2113,7 +2487,7 @@
 	)
 	(global_label "key20"
 		(shape input)
-		(at 58.42 46.99 270)
+		(at 101.6 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2123,7 +2497,7 @@
 		)
 		(uuid "395c47d8-4292-41a9-8963-fe6754e50618")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 58.42 55.4785 90)
+			(at 101.6 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2135,7 +2509,7 @@
 	)
 	(global_label "key21"
 		(shape input)
-		(at 55.88 46.99 270)
+		(at 104.14 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2145,7 +2519,29 @@
 		)
 		(uuid "4ad24c13-4c9e-460e-9a18-58933fc48e4f")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 55.88 55.4785 90)
+			(at 104.14 55.4785 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key7"
+		(shape input)
+		(at 90.17 128.27 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "4eab2d87-6c4b-4a19-a511-51abef741c54")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 82.891 128.27 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2157,7 +2553,7 @@
 	)
 	(global_label "key18"
 		(shape input)
-		(at 63.5 46.99 270)
+		(at 96.52 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2167,7 +2563,7 @@
 		)
 		(uuid "53027929-ad51-41a9-a1d8-73cd1954e9a6")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 63.5 55.4785 90)
+			(at 96.52 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2179,7 +2575,7 @@
 	)
 	(global_label "key3"
 		(shape input)
-		(at 54.61 156.21 180)
+		(at 73.66 123.19 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2187,9 +2583,53 @@
 			)
 			(justify right)
 		)
-		(uuid "5d52b76e-b1a1-4e9b-b6c4-ea1c4ba4b916")
+		(uuid "539c00e3-bc0c-4988-832d-6534f1ec476c")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 47.331 156.21 0)
+			(at 66.381 123.19 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key9"
+		(shape input)
+		(at 106.68 113.03 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "58691c5e-0b35-455c-93bd-d1309a72a204")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 99.401 113.03 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key17"
+		(shape input)
+		(at 142.24 138.43 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "5be69628-7887-49a8-b2af-ca1f3b06b57d")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 133.7515 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2245,7 +2685,7 @@
 	)
 	(global_label "key22"
 		(shape input)
-		(at 189.23 45.72 270)
+		(at 186.69 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2255,7 +2695,7 @@
 		)
 		(uuid "6586651c-b42a-4e0c-969d-97cecf28b170")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 189.23 54.2085 90)
+			(at 186.69 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2265,9 +2705,9 @@
 			)
 		)
 	)
-	(global_label "key23"
+	(global_label "key13"
 		(shape input)
-		(at 50.8 46.99 270)
+		(at 83.82 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2277,7 +2717,7 @@
 		)
 		(uuid "675034e6-1337-46d4-bc3a-34d9f88663d9")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 50.8 55.4785 90)
+			(at 83.82 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2289,7 +2729,7 @@
 	)
 	(global_label "key12"
 		(shape input)
-		(at 78.74 46.99 270)
+		(at 81.28 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2299,7 +2739,7 @@
 		)
 		(uuid "6c035ba0-6a01-46ca-8344-cef744b7b9b1")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 78.74 55.4785 90)
+			(at 81.28 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2333,7 +2773,7 @@
 	)
 	(global_label "key1"
 		(shape input)
-		(at 54.61 134.62 180)
+		(at 57.15 128.27 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2343,7 +2783,7 @@
 		)
 		(uuid "73c21a31-602b-4204-8db4-df9bf8aa7c10")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 47.331 134.62 0)
+			(at 49.871 128.27 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2355,7 +2795,7 @@
 	)
 	(global_label "key16"
 		(shape input)
-		(at 68.58 46.99 270)
+		(at 91.44 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2365,7 +2805,7 @@
 		)
 		(uuid "765d60d0-929b-4cc4-ab92-8e250a4ac5cf")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 68.58 55.4785 90)
+			(at 91.44 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2397,9 +2837,53 @@
 			)
 		)
 	)
+	(global_label "key18"
+		(shape input)
+		(at 124.46 160.02 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "7e1086f2-4317-4db4-b24f-5bc258e782d8")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 115.9715 160.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key14"
+		(shape input)
+		(at 124.46 138.43 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "81709f2d-71b8-4c0d-aa8b-77b3dfa76c28")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 115.9715 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
 	(global_label "key22"
 		(shape input)
-		(at 53.34 46.99 270)
+		(at 106.68 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2409,7 +2893,7 @@
 		)
 		(uuid "836a5c31-4fa6-4521-92ac-06033b1ffef5")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 53.34 55.4785 90)
+			(at 106.68 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2443,7 +2927,7 @@
 	)
 	(global_label "key2"
 		(shape input)
-		(at 54.61 146.05 180)
+		(at 57.15 138.43 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2453,7 +2937,7 @@
 		)
 		(uuid "8547063c-3b0a-4ebf-8024-fa7154186fcc")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 47.331 146.05 0)
+			(at 49.871 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2485,6 +2969,28 @@
 			)
 		)
 	)
+	(global_label "key19"
+		(shape input)
+		(at 142.24 160.02 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "8c81b14c-4c4b-40d6-8891-39d4c722b5fb")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 133.7515 160.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
 	(global_label "key1"
 		(shape input)
 		(at 242.57 45.72 270)
@@ -2509,7 +3015,7 @@
 	)
 	(global_label "key21"
 		(shape input)
-		(at 191.77 45.72 270)
+		(at 189.23 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2519,7 +3025,7 @@
 		)
 		(uuid "902efb47-c17e-4889-988e-78e68851412d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 191.77 54.2085 90)
+			(at 189.23 54.2085 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2531,7 +3037,7 @@
 	)
 	(global_label "key1"
 		(shape input)
-		(at 106.68 46.99 270)
+		(at 50.8 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2541,7 +3047,7 @@
 		)
 		(uuid "91af6daf-6928-4af3-ad67-9c8b80664439")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 106.68 54.269 90)
+			(at 50.8 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2573,9 +3079,9 @@
 			)
 		)
 	)
-	(global_label "key23"
+	(global_label "key20"
 		(shape input)
-		(at 186.69 45.72 270)
+		(at 191.77 45.72 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2585,7 +3091,29 @@
 		)
 		(uuid "9916311c-e12c-48c7-9b63-560a3726887b")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 186.69 54.2085 90)
+			(at 191.77 54.2085 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key20"
+		(shape input)
+		(at 158.75 160.02 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "99e74a2a-98db-4126-88a4-8d5752d4c3d0")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 150.2615 160.02 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2597,7 +3125,7 @@
 	)
 	(global_label "key15"
 		(shape input)
-		(at 71.12 46.99 270)
+		(at 88.9 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2607,7 +3135,7 @@
 		)
 		(uuid "a62a556d-a381-43d0-abf8-8b33bb05a36d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 71.12 55.4785 90)
+			(at 88.9 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2619,7 +3147,7 @@
 	)
 	(global_label "key11"
 		(shape input)
-		(at 81.28 46.99 270)
+		(at 78.74 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2629,7 +3157,51 @@
 		)
 		(uuid "a715fdb1-235e-4764-8c3e-7ed423aade53")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 81.28 55.4785 90)
+			(at 78.74 55.4785 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key11"
+		(shape input)
+		(at 106.68 133.35 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "a7d070f7-fc51-49d8-a510-741c2d935f6d")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 98.1915 133.35 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key10"
+		(shape input)
+		(at 106.68 123.19 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "aefc0767-b9af-40f2-9a57-1aea1886d667")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 98.1915 123.19 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2663,7 +3235,7 @@
 	)
 	(global_label "key5"
 		(shape input)
-		(at 96.52 46.99 270)
+		(at 60.96 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2673,7 +3245,7 @@
 		)
 		(uuid "b36e2f2b-dfab-4801-859e-83e62d070f34")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 96.52 54.269 90)
+			(at 60.96 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2685,7 +3257,7 @@
 	)
 	(global_label "key19"
 		(shape input)
-		(at 60.96 46.99 270)
+		(at 99.06 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2695,7 +3267,7 @@
 		)
 		(uuid "b3f5829c-e60b-44cf-8115-0a39bfba0279")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 60.96 55.4785 90)
+			(at 99.06 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2729,7 +3301,7 @@
 	)
 	(global_label "key9"
 		(shape input)
-		(at 86.36 46.99 270)
+		(at 71.12 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2739,7 +3311,29 @@
 		)
 		(uuid "cd538a73-274b-4d03-bd27-8d98955db50e")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 54.269 90)
+			(at 71.12 54.269 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key12"
+		(shape input)
+		(at 124.46 118.11 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "d8782d76-2466-4040-9c24-99e379b8171d")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 115.9715 118.11 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2795,7 +3389,7 @@
 	)
 	(global_label "key4"
 		(shape input)
-		(at 99.06 46.99 270)
+		(at 58.42 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2805,7 +3399,29 @@
 		)
 		(uuid "e581ce49-cf67-4b0e-b0ed-fb8fcacfb0b4")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 99.06 54.269 90)
+			(at 58.42 54.269 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "key15"
+		(shape input)
+		(at 142.24 118.11 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "e775ba5c-6a8f-43b6-9b49-c18d87037245")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 133.7515 118.11 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2817,7 +3433,7 @@
 	)
 	(global_label "key6"
 		(shape input)
-		(at 93.98 46.99 270)
+		(at 63.5 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2827,7 +3443,7 @@
 		)
 		(uuid "e8e1cb3b-86e2-4cb8-bf47-058403549ec8")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 93.98 54.269 90)
+			(at 63.5 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2861,7 +3477,7 @@
 	)
 	(global_label "key10"
 		(shape input)
-		(at 83.82 46.99 270)
+		(at 73.66 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2871,7 +3487,7 @@
 		)
 		(uuid "f2b54ae4-d04a-4588-808f-c6db48ddfe02")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 83.82 55.4785 90)
+			(at 73.66 55.4785 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2883,7 +3499,7 @@
 	)
 	(global_label "key7"
 		(shape input)
-		(at 91.44 46.99 270)
+		(at 66.04 46.99 270)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2893,7 +3509,7 @@
 		)
 		(uuid "fa768b65-07ad-4f1d-96f8-04039cf803b8")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 91.44 54.269 90)
+			(at 66.04 54.269 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2925,17 +3541,39 @@
 			)
 		)
 	)
+	(global_label "key6"
+		(shape input)
+		(at 90.17 118.11 180)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "fe7dfc26-5d83-48dc-9a4e-da1743e8b552")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 82.891 118.11 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+				(hide yes)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
-		(at 59.69 165.1 0)
+		(at 147.32 147.32 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "0820c470-0a1f-4eda-958f-c5b7408739e8")
-		(property "Reference" "#PWR01"
-			(at 59.69 171.45 0)
+		(uuid "041d49f0-c6d8-4059-abe1-84253151b550")
+		(property "Reference" "#PWR017"
+			(at 147.32 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2944,7 +3582,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 59.69 169.672 0)
+			(at 147.32 151.892 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2952,7 +3590,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 59.69 165.1 0)
+			(at 147.32 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2961,7 +3599,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 59.69 165.1 0)
+			(at 147.32 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2970,7 +3608,72 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 59.69 165.1 0)
+			(at 147.32 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "4de4ad5a-4d5b-4052-b53b-1e5f116b2006")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "#PWR017")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 62.23 147.32 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "0820c470-0a1f-4eda-958f-c5b7408739e8")
+		(property "Reference" "#PWR01"
+			(at 62.23 153.67 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 62.23 151.892 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 62.23 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 62.23 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 62.23 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2990,6 +3693,142 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 109.22 125.73 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "0b2dbf0c-2b52-4b7b-9d0d-a109665c5cd5")
+		(property "Reference" "SW10"
+			(at 108.966 121.158 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 109.22 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 109.22 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 109.22 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 109.22 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "c8f1fa05-65e4-4d3f-a1e6-3b3aff6d5ca7")
+		)
+		(pin "1"
+			(uuid "a37912af-8d65-4de0-b334-a2682edd2f2d")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW10")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 109.22 115.57 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "1dc30b32-59fc-4f41-8ab6-efe7d035b10a")
+		(property "Reference" "SW9"
+			(at 108.966 110.998 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 109.22 110.49 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 109.22 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 109.22 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 109.22 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "f07753bb-5a9d-42d8-9b29-ee2c8980dc3a")
+		)
+		(pin "1"
+			(uuid "373f13ec-7080-4d4b-95bb-99aafc63d41c")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW9")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:+1V8")
 		(at 106.68 68.58 0)
@@ -3055,6 +3894,142 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 92.71 140.97 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "2fe645b4-f92d-49d8-abdd-ebc8bbf525fe")
+		(property "Reference" "SW8"
+			(at 92.456 136.398 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 92.71 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 92.71 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 92.71 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 92.71 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "a22f62b5-a2fc-46c6-96b6-d5e0077da981")
+		)
+		(pin "1"
+			(uuid "a1e6e77d-6cfa-47d5-b6e9-f9aafa283fd8")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW8")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 127 140.97 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "36601408-3130-4d02-8aca-f76200b6be08")
+		(property "Reference" "SW14"
+			(at 126.746 136.398 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 127 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 127 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 127 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 127 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "ab7a5911-3e0d-401c-beaf-a78c800264e0")
+		)
+		(pin "1"
+			(uuid "898bdfbe-735f-4c94-9cb9-6f388db996bc")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW14")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:+3V3")
 		(at 49.53 62.23 0)
@@ -3252,15 +4227,15 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 57.15 148.59 0)
+		(at 144.78 162.56 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "6aea912b-c273-4986-bace-9455f840bead")
-		(property "Reference" "SW2"
-			(at 56.896 144.018 0)
+		(uuid "496c9716-8427-4670-8210-7b397d0fbb0f")
+		(property "Reference" "SW19"
+			(at 144.526 157.988 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3268,7 +4243,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 57.15 143.51 0)
+			(at 144.78 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3276,8 +4251,8 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" ""
-			(at 57.15 148.59 0)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 144.78 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3286,7 +4261,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 57.15 148.59 0)
+			(at 144.78 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3295,7 +4270,412 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 57.15 148.59 0)
+			(at 144.78 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "f4fe5415-9744-4c39-a201-bbcafb1a199b")
+		)
+		(pin "1"
+			(uuid "0ca5745d-1a4c-48d4-8fa2-d55440d1ef8d")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW19")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 95.25 147.32 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "4b0d9170-9f6d-4fe2-b6f5-bb47e9e6a0f3")
+		(property "Reference" "#PWR014"
+			(at 95.25 153.67 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 95.25 151.892 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 95.25 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 95.25 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 95.25 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "2d74390d-8b49-445f-8ebc-ee761b75aa00")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "#PWR014")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 144.78 120.65 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "4f3004ca-156a-4811-9b28-dd6afdd82cf7")
+		(property "Reference" "SW15"
+			(at 144.526 116.078 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 144.78 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 144.78 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 144.78 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 144.78 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "7a2f5486-cda6-4d1e-9f24-cf4af40b64c7")
+		)
+		(pin "1"
+			(uuid "3f54b055-1668-4ed6-8462-e180bde0af97")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW15")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 127 162.56 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "51f7fc62-75a8-4307-8df9-43a1005c0cb9")
+		(property "Reference" "SW18"
+			(at 126.746 157.988 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 127 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 127 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 127 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 127 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "cb6ad5a9-2d36-4b26-aebd-dca110f8a3d2")
+		)
+		(pin "1"
+			(uuid "ac5f8845-ffbd-4b72-9f6d-127b56a54000")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW18")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 127 120.65 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "52608491-a07b-4c34-b7f4-3f2039564b81")
+		(property "Reference" "SW12"
+			(at 126.746 116.078 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 127 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 127 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 127 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 127 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "eaee1068-6b65-4316-81cc-f510ba10f34f")
+		)
+		(pin "1"
+			(uuid "1568c3ed-d3da-4615-b92e-ec52af372b71")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW12")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 92.71 120.65 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "5b5f16e9-a0aa-4aae-bb41-88808b7226cc")
+		(property "Reference" "SW3"
+			(at 92.456 116.078 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 92.71 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 92.71 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 92.71 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 92.71 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "16707678-30e9-4f49-a679-c534429a83e7")
+		)
+		(pin "1"
+			(uuid "a18d496b-4cdb-4272-aafb-11b9c80f0a84")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW3")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 59.69 140.97 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "6aea912b-c273-4986-bace-9455f840bead")
+		(property "Reference" "SW2"
+			(at 59.436 136.398 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 59.69 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 59.69 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 59.69 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 59.69 140.97 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3318,6 +4698,272 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 76.2 146.05 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "71593c22-9c71-498f-8264-c3e21440f9eb")
+		(property "Reference" "SW6"
+			(at 75.946 141.478 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 76.2 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 76.2 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 76.2 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 76.2 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "25e3ed60-d09a-4fce-a9fe-e972267130ed")
+		)
+		(pin "1"
+			(uuid "314026e6-dd23-420f-ac1a-c0771ab8406b")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW6")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 78.74 152.4 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "756dc58e-ff15-4afa-9193-7aad75bfe0df")
+		(property "Reference" "#PWR013"
+			(at 78.74 158.75 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 78.74 156.972 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 78.74 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 78.74 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 78.74 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "2ac02d9f-e256-43b6-b761-1f3e2951a453")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "#PWR013")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 147.32 170.18 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "88ca5c68-a595-462c-a91b-2f6b2fc87d3f")
+		(property "Reference" "#PWR018"
+			(at 147.32 176.53 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 147.32 174.752 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 147.32 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 147.32 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 147.32 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "9a16b062-5243-4591-a8e6-a63e323c0780")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "#PWR018")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 109.22 135.89 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "890593d8-39f1-41ba-ac6e-14883614078b")
+		(property "Reference" "SW11"
+			(at 108.966 131.318 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 109.22 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 109.22 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 109.22 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 109.22 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "c9b80c7f-bf17-4460-bbba-f910e03a1a11")
+		)
+		(pin "1"
+			(uuid "d0969142-6f99-4adb-9e0d-62ff2ee3eb74")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW11")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Connector_Generic_MountingPin:Conn_01x30_MountingPin")
 		(at 78.74 41.91 270)
@@ -3482,6 +5128,346 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 144.78 140.97 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "a1c19ee4-ccd2-4131-97c0-a5d37db3a297")
+		(property "Reference" "SW17"
+			(at 144.526 136.398 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 144.78 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 144.78 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 144.78 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 144.78 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "a74c63f6-b4b5-42f2-aca4-752c93f72b59")
+		)
+		(pin "1"
+			(uuid "4be7e66d-9bec-4374-8b97-2956e7af6440")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW17")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 76.2 135.89 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "a206fdcd-54ff-4dcc-8db2-e213dbb4b523")
+		(property "Reference" "SW5"
+			(at 75.946 131.318 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 76.2 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 76.2 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 76.2 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 76.2 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "cfa55a19-bfde-493b-a2c5-b858bc9abe27")
+		)
+		(pin "1"
+			(uuid "0210ec20-3362-45cc-a675-877486af74ab")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW5")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 144.78 130.81 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "a4651a33-ea9c-4c90-92b9-17fe7780462d")
+		(property "Reference" "SW16"
+			(at 144.526 126.238 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 144.78 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 144.78 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 144.78 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 144.78 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "a3d6ede2-d204-4703-9444-fa68e1379df6")
+		)
+		(pin "1"
+			(uuid "c38d2060-f3ba-4e21-a911-77ee717d1eaa")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW16")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 161.29 162.56 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "bbc6d698-8230-47bf-9b84-fe883ee0f4b5")
+		(property "Reference" "SW20"
+			(at 161.036 157.988 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 161.29 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 161.29 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 161.29 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 161.29 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "422822bf-06ff-4add-b8d7-32c1d26f8e09")
+		)
+		(pin "1"
+			(uuid "8f208d3d-49a7-4304-90c5-d0d04f0bfd41")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW20")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 92.71 130.81 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "bfa10e91-135a-42bc-9ae9-62aa45f2fc8e")
+		(property "Reference" "SW7"
+			(at 92.456 126.238 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 92.71 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 92.71 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 92.71 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 92.71 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "5387e6ce-d57c-47ba-ae28-d18b498aae6a")
+		)
+		(pin "1"
+			(uuid "ca9d2390-becd-4bef-868a-5f18575dba91")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW7")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:+1V8")
 		(at 186.69 67.31 0)
@@ -3557,7 +5543,7 @@
 		(on_board yes)
 		(dnp no)
 		(uuid "c0fba4a0-4464-44f6-8410-37d7b05c9a3a")
-		(property "Reference" "#PWR02"
+		(property "Reference" "#PWR0101"
 			(at 40.64 68.58 0)
 			(effects
 				(font
@@ -3607,7 +5593,7 @@
 		(instances
 			(project "shield"
 				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
-					(reference "#PWR02")
+					(reference "#PWR0101")
 					(unit 1)
 				)
 			)
@@ -3680,15 +5666,15 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 57.15 158.75 0)
+		(at 76.2 125.73 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "d2a97d0c-235e-4f61-bff4-3ea16e5c8fe2")
-		(property "Reference" "SW3"
-			(at 56.896 154.178 0)
+		(uuid "d22f8a47-d1cf-47e8-9c9f-02de0c1cc10d")
+		(property "Reference" "SW4"
+			(at 75.946 121.158 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3696,7 +5682,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 57.15 153.67 0)
+			(at 76.2 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3704,8 +5690,8 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" ""
-			(at 57.15 158.75 0)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 76.2 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3714,7 +5700,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 57.15 158.75 0)
+			(at 76.2 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3723,7 +5709,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 57.15 158.75 0)
+			(at 76.2 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3732,15 +5718,80 @@
 			)
 		)
 		(pin "2"
-			(uuid "1d78f9a7-2a7e-4732-8520-6a72b2cda7ca")
+			(uuid "1f2d5626-92de-4163-ade8-7e7fff3a9e31")
 		)
 		(pin "1"
-			(uuid "15919e5d-9f32-4944-b7e1-67adf3f90d82")
+			(uuid "af8a6299-67c7-4d1e-84c9-2dc75b541336")
 		)
 		(instances
 			(project "shield"
 				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
-					(reference "SW3")
+					(reference "SW4")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 129.54 147.32 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "d2c16e4c-31b8-4487-88ce-ed5c1838ffb5")
+		(property "Reference" "#PWR016"
+			(at 129.54 153.67 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 129.54 151.892 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 129.54 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 129.54 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 129.54 147.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "0c416eb9-c843-44d5-8db8-6e908d72dfab")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "#PWR016")
 					(unit 1)
 				)
 			)
@@ -3977,7 +6028,7 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_Push_45deg")
-		(at 57.15 137.16 0)
+		(at 59.69 130.81 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -3985,7 +6036,7 @@
 		(dnp no)
 		(uuid "d6e47454-4530-4260-bdb6-dae123da9493")
 		(property "Reference" "SW1"
-			(at 56.896 132.588 0)
+			(at 59.436 126.238 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3993,7 +6044,7 @@
 			)
 		)
 		(property "Value" "SW_Push_45deg"
-			(at 57.15 132.08 0)
+			(at 59.69 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4001,8 +6052,8 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" ""
-			(at 57.15 137.16 0)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 59.69 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4011,7 +6062,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 57.15 137.16 0)
+			(at 59.69 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4020,7 +6071,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 57.15 137.16 0)
+			(at 59.69 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4175,6 +6226,71 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 111.76 142.24 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "e3d8b17c-a5a3-485d-b204-ef1e3e5a3f4b")
+		(property "Reference" "#PWR015"
+			(at 111.76 148.59 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 111.76 146.812 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 111.76 142.24 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 111.76 142.24 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 111.76 142.24 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "7dbad10b-3cea-49f5-9b18-f6687a44e799")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "#PWR015")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:+1V8")
 		(at 243.84 67.31 0)
@@ -4307,6 +6423,74 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 127 130.81 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "f6e9efc0-10ba-412f-b481-906c363eb639")
+		(property "Reference" "SW13"
+			(at 126.746 126.238 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 127 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "phiboard:mx_choc-12_ks33-123_hs"
+			(at 127 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 127 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 127 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "cace932b-a49d-455b-aa23-6569f2c5458e")
+		)
+		(pin "1"
+			(uuid "2146d3a2-9638-4846-a49f-484122b1454a")
+		)
+		(instances
+			(project "shield"
+				(path "/da96a5a9-47df-4dea-9f40-cb1ca39ef0b3"
+					(reference "SW13")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(sheet_instances
 		(path "/"
 			(page "1")