diff --git a/hardware/mainboard/2_CM3588_Connector_2.kicad_sch b/hardware/mainboard/2_CM3588_Connector_2.kicad_sch
index ffac5f6..e669d80 100644
--- a/hardware/mainboard/2_CM3588_Connector_2.kicad_sch
+++ b/hardware/mainboard/2_CM3588_Connector_2.kicad_sch
@@ -3375,326 +3375,6 @@
 		)
 		(uuid "fccd8501-c5a0-4959-bf9b-6b828049f583")
 	)
-	(global_label "TYPEC0_OTG_DP"
-		(shape bidirectional)
-		(at 132.08 187.96 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "09cd322a-6bb1-48b3-a00a-de50f7387c23")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 132.08 187.96 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC1_SSRX1_N"
-		(shape input)
-		(at 86.36 198.12 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "330e2b76-0a4b-40cf-877d-adc3de67c058")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 198.12 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSRX1_P"
-		(shape input)
-		(at 86.36 165.1 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "37c5c5e4-cfd2-47e7-8bdc-02ad20b6e953")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 165.1 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC1_OTG_DM"
-		(shape bidirectional)
-		(at 132.08 198.12 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "4fc2c27c-850c-4653-bb37-fabe04f439df")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 132.08 198.12 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSTX2_N"
-		(shape output)
-		(at 86.36 144.78 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "66bb2e34-ff8f-48f8-a374-8c2847348224")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 144.78 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC1_OTG_DP"
-		(shape bidirectional)
-		(at 132.08 195.58 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "6eb658e1-1aaa-4179-861a-f74233851ac6")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 132.08 195.58 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSRX2_N"
-		(shape input)
-		(at 86.36 152.4 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "74647ad9-4990-42c2-acea-0ec380c51fde")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 152.4 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_OTG_DM"
-		(shape bidirectional)
-		(at 132.08 190.5 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "80a74aa0-b435-4056-a7c6-831e83dce3c0")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 132.08 190.5 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSTX1_N"
-		(shape output)
-		(at 86.36 160.02 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "99537526-63bb-4e30-9c8f-9282674a8e03")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 160.02 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSRX2_P"
-		(shape input)
-		(at 86.36 149.86 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "9fc0fa9d-b910-4901-8dac-8a73470a3381")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 149.86 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSRX1_N"
-		(shape input)
-		(at 86.36 167.64 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "a8b4a06e-7a02-4027-955b-f5b11f8ae900")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 167.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSTX2_P"
-		(shape output)
-		(at 86.36 142.24 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "be65d4d8-8069-489f-ab4d-b2f023d10ca9")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 142.24 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC1_SSTX1_N"
-		(shape output)
-		(at 86.36 190.5 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "ceceedcf-2e7b-48ba-bb69-195cf97843bb")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 190.5 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC0_SSTX1_P"
-		(shape output)
-		(at 86.36 157.48 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "d745d9f7-8217-4599-bf0a-8c39098ea8ff")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 157.48 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC1_SSTX1_P"
-		(shape output)
-		(at 86.36 187.96 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "e4e192d3-91dd-4688-8681-0959d9fef67b")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 187.96 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "TYPEC1_SSRX1_P"
-		(shape input)
-		(at 86.36 195.58 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "f242ca6c-fe82-4d12-a81b-1ba9407b2f22")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 86.36 195.58 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-	)
 	(hierarchical_label "HPR"
 		(shape input)
 		(at 86.36 78.74 180)
@@ -3728,6 +3408,28 @@
 		)
 		(uuid "1949b8a0-f7a1-4ecb-88ee-57ffa9d0b4a2")
 	)
+	(hierarchical_label "TYPEC0_SSTX1_P"
+		(shape input)
+		(at 86.36 157.48 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "19b2b510-c603-4814-964d-babac713d80f")
+	)
+	(hierarchical_label "TYPEC0_SSTX1_N"
+		(shape input)
+		(at 86.36 160.02 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "1c89ea85-28f1-4c25-a511-34cda1881db2")
+	)
 	(hierarchical_label "MIPI_DPHY0_TX_D0_N"
 		(shape input)
 		(at 86.36 137.16 180)
@@ -3750,6 +3452,39 @@
 		)
 		(uuid "2788cb3f-d0e3-4544-9dd4-1f0e132908a2")
 	)
+	(hierarchical_label "TYPEC1_OTG_DM"
+		(shape input)
+		(at 132.08 198.12 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "28fc326a-4d37-483a-8563-87852b484d5d")
+	)
+	(hierarchical_label "TYPEC0_OTG_DM"
+		(shape input)
+		(at 132.08 190.5 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "329f5846-9de3-4e6e-bdd9-428292b57985")
+	)
+	(hierarchical_label "TYPEC1_SSRX1_N"
+		(shape input)
+		(at 86.36 198.12 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "380be2f9-c413-4404-92f7-879db7005583")
+	)
 	(hierarchical_label "HPL"
 		(shape input)
 		(at 132.08 78.74 0)
@@ -3794,6 +3529,17 @@
 		)
 		(uuid "57b867cc-4c9c-420c-be68-beae09e1d013")
 	)
+	(hierarchical_label "TYPEC0_SSRX1_P"
+		(shape input)
+		(at 86.36 165.1 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "6999fc69-1d48-4ca7-b9d4-cb21bef3a3cf")
+	)
 	(hierarchical_label "MIPI_DPHY0_TX_D3_P"
 		(shape input)
 		(at 86.36 104.14 180)
@@ -3805,6 +3551,17 @@
 		)
 		(uuid "6a67b976-f9a1-4d33-9d64-b56f9e87cef4")
 	)
+	(hierarchical_label "TYPEC1_SSTX1_N"
+		(shape input)
+		(at 86.36 190.5 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "6c3f3dfe-030f-417a-a94e-db17231999c9")
+	)
 	(hierarchical_label "MIC_IN"
 		(shape input)
 		(at 132.08 81.28 0)
@@ -3838,6 +3595,28 @@
 		)
 		(uuid "98c2ae98-b46d-434e-9105-d03aab20971a")
 	)
+	(hierarchical_label "TYPEC0_SSRX2_P"
+		(shape input)
+		(at 86.36 149.86 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "9c33143c-dcd8-40ce-a976-d35c65cde12c")
+	)
+	(hierarchical_label "TYPEC0_OTG_DP"
+		(shape input)
+		(at 132.08 187.96 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "ac2f2d45-aac4-4fdd-9bbe-4a66ea6b82dc")
+	)
 	(hierarchical_label "GPIO1_C4{slash}~{HP_DET}"
 		(shape input)
 		(at 132.08 83.82 0)
@@ -3860,6 +3639,39 @@
 		)
 		(uuid "cb6fef15-e017-47ae-909a-33bf9f649fed")
 	)
+	(hierarchical_label "TYPEC0_SSTX2_N"
+		(shape input)
+		(at 86.36 144.78 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "ce2d5c0e-3169-498a-93e7-7864c5bb306a")
+	)
+	(hierarchical_label "TYPEC1_OTG_DP"
+		(shape input)
+		(at 132.08 195.58 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "d087f57f-1628-45b7-b2dc-4f801a4a378a")
+	)
+	(hierarchical_label "TYPEC0_SSRX2_N"
+		(shape input)
+		(at 86.36 152.4 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "d975e3a6-d2ee-4a1c-9093-024a3453f44b")
+	)
 	(hierarchical_label "MIPI_DPHY0_TX_CLK_P"
 		(shape input)
 		(at 86.36 119.38 180)
@@ -3882,6 +3694,50 @@
 		)
 		(uuid "ec77baf1-f09e-4099-aa19-94bc2aa73141")
 	)
+	(hierarchical_label "TYPEC0_SSRX1_N"
+		(shape input)
+		(at 86.36 167.64 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "f759f7eb-d2c1-45c5-873f-ea37008acc19")
+	)
+	(hierarchical_label "TYPEC1_SSTX1_P"
+		(shape input)
+		(at 86.36 187.96 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "fb888043-7b02-440d-acd9-0361478fddba")
+	)
+	(hierarchical_label "TYPEC1_SSRX1_P"
+		(shape input)
+		(at 86.36 195.58 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "fbb5e75f-bd7e-4ef7-b1b1-579b05df66cc")
+	)
+	(hierarchical_label "TYPEC0_SSTX2_P"
+		(shape input)
+		(at 86.36 142.24 180)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify right)
+		)
+		(uuid "fe9c88e8-d438-4d0f-8734-b1440ecf9843")
+	)
 	(symbol
 		(lib_id "mainboard:Ground-GND")
 		(at 91.44 208.28 0)