diff --git a/kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod b/kicad-libraries/phiboard.pretty/mx_choc-v1-v2_ks27_ks33-v2-v3_hs_reversible.kicad_mod
similarity index 91%
rename from kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod
rename to kicad-libraries/phiboard.pretty/mx_choc-v1-v2_ks27_ks33-v2-v3_hs_reversible.kicad_mod
index 5f85745..1b0d1c7 100644
--- a/kicad-libraries/phiboard.pretty/mx_choc-12_ks33-123_hs.kicad_mod
+++ b/kicad-libraries/phiboard.pretty/mx_choc-v1-v2_ks27_ks33-v2-v3_hs_reversible.kicad_mod
@@ -1,8 +1,9 @@
-(footprint "mx_choc-12_ks33-123_hs"
+(footprint "mx_choc-v1-v2_ks27_ks33-v2-v3_hs_reversible"
 	(version 20241229)
 	(generator "pcbnew")
 	(generator_version "9.0")
 	(layer "F.Cu")
+	(descr "Reversible combined hotswap footprint for mx, choc v1, choc v2, ks27 (ks33 v1), ks33 v2, ks33 v3")
 	(property "Reference" "REF**"
 		(at 0 -0.5 0)
 		(unlocked yes)
@@ -16,7 +17,7 @@
 			)
 		)
 	)
-	(property "Value" "mx_choc-12_ks33-123_hs"
+	(property "Value" "mx_choc-v1-v2_ks27_ks33-v2-v3_hs_reversible"
 		(at 0 11 0)
 		(unlocked yes)
 		(layer "F.Fab")
@@ -152,21 +153,13 @@
 		(roundrect_rratio 0.1)
 		(uuid "a5aa0ede-cf2f-48a3-bf08-09475dd06b03")
 	)
-	(pad "1" thru_hole circle
-		(at -4.7 -4.4 180)
-		(size 3.5 3.5)
-		(drill 3)
+	(pad "1" thru_hole oval
+		(at -3.6 -4.1 344)
+		(size 5.8 3.5)
+		(drill oval 5.3 3)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e7dd2ad3-1a96-43b2-bd73-93b6eb2cf0d9")
-	)
-	(pad "1" thru_hole circle
-		(at -2.54 -3.81 180)
-		(size 3.5 3.5)
-		(drill 3)
-		(layers "*.Cu" "*.Mask")
-		(remove_unused_layers no)
-		(uuid "421be7ef-3f39-4885-ba93-d953cf3768f1")
+		(uuid "fa4f120b-83bd-40ed-9328-cfcd36d7fe9c")
 	)
 	(pad "1" smd roundrect
 		(at -2.539999 -6.9 270)
@@ -175,6 +168,43 @@
 		(roundrect_rratio 0.1)
 		(uuid "a5cb389b-705c-4405-8c09-106ef4676d60")
 	)
+	(pad "1" smd custom
+		(at -2.3 -2 180)
+		(size 0.4 0.4)
+		(layers "F.Cu" "F.Mask" "F.Paste")
+		(thermal_bridge_angle 90)
+		(options
+			(clearance outline)
+			(anchor circle)
+		)
+		(primitives
+			(gr_curve
+				(pts
+					(xy 0.17 -0.387638) (xy 0.1 -0.181834) (xy 0.18 0.11) (xy 0.508183 0.188183)
+				)
+				(width 0.2)
+			)
+			(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)
+			)
+		)
+		(uuid "c0aae120-462d-4489-93e4-f9834fe23a02")
+	)
 	(pad "1" smd custom
 		(at 4.8 6.1)
 		(size 2.7 2.7)
@@ -385,43 +415,6 @@
 		)
 		(uuid "55967910-7110-4c43-9cab-c0365376fe85")
 	)
-	(pad "2" smd custom
-		(at -2.3 -2 180)
-		(size 0.4 0.4)
-		(layers "F.Cu" "F.Mask" "F.Paste")
-		(thermal_bridge_angle 90)
-		(options
-			(clearance outline)
-			(anchor circle)
-		)
-		(primitives
-			(gr_curve
-				(pts
-					(xy 0.17 -0.387638) (xy 0.1 -0.181834) (xy 0.18 0.11) (xy 0.508183 0.188183)
-				)
-				(width 0.2)
-			)
-			(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)
-			)
-		)
-		(uuid "c0aae120-462d-4489-93e4-f9834fe23a02")
-	)
 	(pad "2" smd roundrect
 		(at 2.54 -6.9 90)
 		(size 4.4 2.5)
@@ -429,13 +422,13 @@
 		(roundrect_rratio 0.1)
 		(uuid "b697f783-2a9f-4cba-aca2-1d3dc7d96199")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 -3.81 180)
-		(size 3.5 3.5)
-		(drill 3)
+	(pad "2" thru_hole oval
+		(at 3.6 -4.1 16)
+		(size 5.8 3.5)
+		(drill oval 5.3 3)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "268e6c9a-b711-49dd-a726-de173f30b321")
+		(uuid "fa3ea8ef-d46b-4c3e-b016-c61135f3b079")
 	)
 	(pad "2" smd roundrect
 		(at 4.7 -6.9 270)
@@ -444,13 +437,5 @@
 		(roundrect_rratio 0.1)
 		(uuid "e82ba2d7-f8eb-4ffd-b339-874bd513fead")
 	)
-	(pad "2" thru_hole circle
-		(at 4.7 -4.4 180)
-		(size 3.5 3.5)
-		(drill 3)
-		(layers "*.Cu" "*.Mask")
-		(remove_unused_layers no)
-		(uuid "7c24903d-9ee4-4b4b-9365-cd9ce497d3ec")
-	)
 	(embedded_fonts no)
 )