diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-10P_1x10_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-10P_1x10_P2.54mm_Horizontal.kicad_mod
index 592e82253..e0042a50f 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-10P_1x10_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-10P_1x10_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-10P, 10 pins, pitch 2.54mm, size 25.9x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-10P pitch 2.54mm size 25.9x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-10P, 10 pins, pitch 2.54mm, size 25.9x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-10P pitch 2.54mm size 25.9x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 11.43 -4.22 0)
 		(layer "F.SilkS")
@@ -25,95 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 24.5 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 24.5 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 24.5 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 24.5 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 24.5 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 24.5 -3.22)
+		(end 24.5 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 24.88 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 24.88 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 24.88 3.9)
+		(end 24.88 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -125,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 24.38 -3.1)
-		(end 24.38 3.4)
+		(start -1.52 -1.5)
+		(end 24.38 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -134,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 24.38 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 24.38 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -170,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 24.5 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 24.38 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -188,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 24.5 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 24.38 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 24.5 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 24.5 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 24.5 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 24.5 -3.22)
-		(end 24.5 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 24.38 -3.1)
+		(end 24.38 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,118 +391,113 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 24.38 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 24.88 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 24.88 3.9)
-		(end 24.88 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 24.88 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 11.43 2.15 0)
@@ -554,6 +509,77 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-10P_1x10_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-11P_1x11_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-11P_1x11_P2.54mm_Horizontal.kicad_mod
index 27f30efd0..d644ad796 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-11P_1x11_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-11P_1x11_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-11P, 11 pins, pitch 2.54mm, size 28.4x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-11P pitch 2.54mm size 28.4x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-11P, 11 pins, pitch 2.54mm, size 28.4x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-11P pitch 2.54mm size 28.4x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 12.7 -4.22 0)
 		(layer "F.SilkS")
@@ -25,104 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 27.04 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 27.04 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 27.04 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 27.04 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 27.04 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 27.04 -3.22)
+		(end 27.04 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 27.42 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 27.42 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 27.42 3.9)
+		(end 27.42 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -134,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.92 -3.1)
-		(end 26.92 3.4)
+		(start -1.52 -1.5)
+		(end 26.92 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -143,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.92 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 26.92 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -179,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 27.04 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 26.92 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -197,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 27.04 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 26.92 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 27.04 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 27.04 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 27.04 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 27.04 -3.22)
-		(end 27.04 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 26.92 -3.1)
+		(end 26.92 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,124 +409,123 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 26.92 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 27.42 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 27.42 3.9)
-		(end 27.42 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 27.42 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 12.7 2.15 0)
@@ -587,6 +537,84 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-11P_1x11_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-12P_1x12_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-12P_1x12_P2.54mm_Horizontal.kicad_mod
index 6fb78ef2a..1d06d8ae9 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-12P_1x12_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-12P_1x12_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-12P, 12 pins, pitch 2.54mm, size 31x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-12P pitch 2.54mm size 31x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-12P, 12 pins, pitch 2.54mm, size 31x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-12P pitch 2.54mm size 31x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 13.97 -4.22 0)
 		(layer "F.SilkS")
@@ -25,113 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 29.58 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 29.58 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 29.58 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 29.58 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 29.58 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 29.58 -3.22)
+		(end 29.58 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 29.96 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 29.96 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 29.96 3.9)
+		(end 29.96 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -143,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 29.46 -3.1)
-		(end 29.46 3.4)
+		(start -1.52 -1.5)
+		(end 29.46 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -152,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 29.46 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 29.46 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -188,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 29.58 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 29.46 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 29.58 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 29.46 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 29.58 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 29.58 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 29.58 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 29.58 -3.22)
-		(end 29.58 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 29.46 -3.1)
+		(end 29.46 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,130 +427,133 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 29.46 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 29.96 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 29.96 3.9)
-		(end 29.96 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 29.96 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 13.97 2.15 0)
@@ -620,6 +565,91 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-12P_1x12_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-13P_1x13_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-13P_1x13_P2.54mm_Horizontal.kicad_mod
index 813eaea55..9d8f159b3 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-13P_1x13_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-13P_1x13_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-13P, 13 pins, pitch 2.54mm, size 33.5x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-13P pitch 2.54mm size 33.5x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-13P, 13 pins, pitch 2.54mm, size 33.5x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-13P pitch 2.54mm size 33.5x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 15.24 -4.22 0)
 		(layer "F.SilkS")
@@ -25,122 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 32.12 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 32.12 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 32.12 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 32.12 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 32.12 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 32.12 -3.22)
+		(end 32.12 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 32.5 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 32.5 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 32.5 3.9)
+		(end 32.5 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -152,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 32 -3.1)
-		(end 32 3.4)
+		(start -1.52 -1.5)
+		(end 32 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -161,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 32 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 32 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -197,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 32.121 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 32 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 32.121 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 32 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 32.121 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 32.121 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 32.121 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 32.121 -3.22)
-		(end 32.121 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 32 -3.1)
+		(end 32 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,136 +445,143 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 32 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 32.5 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 32.5 3.9)
-		(end 32.5 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 32.5 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 15.24 2.15 0)
@@ -653,6 +593,98 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-13P_1x13_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-14P_1x14_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-14P_1x14_P2.54mm_Horizontal.kicad_mod
index b8219cfe9..53396b06f 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-14P_1x14_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-14P_1x14_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-14P, 14 pins, pitch 2.54mm, size 36.1x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-14P pitch 2.54mm size 36.1x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-14P, 14 pins, pitch 2.54mm, size 36.1x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-14P pitch 2.54mm size 36.1x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 16.51 -4.22 0)
 		(layer "F.SilkS")
@@ -25,131 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 34.66 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 34.66 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 34.66 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 34.66 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 34.66 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 34.66 -3.22)
+		(end 34.66 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 35.04 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 35.04 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 35.04 3.9)
+		(end 35.04 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -161,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 34.54 -3.1)
-		(end 34.54 3.4)
+		(start -1.52 -1.5)
+		(end 34.54 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -170,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 34.54 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 34.54 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 34.66 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 34.54 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 34.66 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 34.54 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 34.66 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 34.66 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 34.66 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 34.66 -3.22)
-		(end 34.66 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 34.54 -3.1)
+		(end 34.54 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,142 +463,153 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 34.54 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 35.04 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 35.04 3.9)
-		(end 35.04 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 35.04 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 16.51 2.15 0)
@@ -686,6 +621,105 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-14P_1x14_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-15P_1x15_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-15P_1x15_P2.54mm_Horizontal.kicad_mod
index 77a933e58..3633184f3 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-15P_1x15_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-15P_1x15_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-15P, 15 pins, pitch 2.54mm, size 38.6x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-15P pitch 2.54mm size 38.6x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-15P, 15 pins, pitch 2.54mm, size 38.6x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-15P pitch 2.54mm size 38.6x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 17.78 -4.22 0)
 		(layer "F.SilkS")
@@ -25,140 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 37.2 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 37.2 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 37.2 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 37.2 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 37.2 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 37.2 -3.22)
+		(end 37.2 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 37.58 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 37.58 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 37.58 3.9)
+		(end 37.58 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -170,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 37.08 -3.1)
-		(end 37.08 3.4)
+		(start -1.52 -1.5)
+		(end 37.08 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -179,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 37.08 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 37.08 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 37.2 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 37.08 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 37.2 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 37.08 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 37.2 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 37.2 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 37.2 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 37.2 -3.22)
-		(end 37.2 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 37.08 -3.1)
+		(end 37.08 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,148 +481,163 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 37.08 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 37.58 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 37.58 3.9)
-		(end 37.58 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 37.58 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 17.78 2.15 0)
@@ -719,6 +649,112 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-15P_1x15_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-16P_1x16_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-16P_1x16_P2.54mm_Horizontal.kicad_mod
index fbe3eaedf..a013f56a9 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-16P_1x16_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-16P_1x16_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-16P, 16 pins, pitch 2.54mm, size 41.1x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-16P pitch 2.54mm size 41.1x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-16P, 16 pins, pitch 2.54mm, size 41.1x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-16P pitch 2.54mm size 41.1x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 19.05 -4.22 0)
 		(layer "F.SilkS")
@@ -25,149 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 39.74 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 39.74 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 39.74 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 39.74 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 39.74 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 39.74 -3.22)
+		(end 39.74 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 40.12 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 40.12 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 40.12 3.9)
+		(end 40.12 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -179,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 39.62 -3.1)
-		(end 39.62 3.4)
+		(start -1.52 -1.5)
+		(end 39.62 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -188,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 39.62 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 39.62 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 39.74 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 39.62 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 39.74 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 39.62 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 39.74 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 39.74 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 39.74 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 39.74 -3.22)
-		(end 39.74 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 39.62 -3.1)
+		(end 39.62 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,154 +499,173 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 39.62 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 40.12 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 40.12 3.9)
-		(end 40.12 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 40.12 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 19.05 2.15 0)
@@ -752,6 +677,119 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-16P_1x16_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-17P_1x17_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-17P_1x17_P2.54mm_Horizontal.kicad_mod
index 7c9385c9d..64bb86a90 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-17P_1x17_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-17P_1x17_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-17P, 17 pins, pitch 2.54mm, size 43.7x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-17P pitch 2.54mm size 43.7x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-17P, 17 pins, pitch 2.54mm, size 43.7x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-17P pitch 2.54mm size 43.7x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 20.32 -4.22 0)
 		(layer "F.SilkS")
@@ -25,158 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 42.28 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 42.28 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 42.28 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 42.28 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 42.28 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 42.28 -3.22)
+		(end 42.28 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 42.66 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 42.66 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 42.66 3.9)
+		(end 42.66 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -188,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 42.16 -3.1)
-		(end 42.16 3.4)
+		(start -1.52 -1.5)
+		(end 42.16 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -197,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 42.16 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 42.16 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 42.28 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 42.16 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 42.28 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 42.16 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 42.28 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 42.28 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 42.28 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 42.28 -3.22)
-		(end 42.28 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 42.16 -3.1)
+		(end 42.16 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,160 +517,183 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 42.16 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 42.66 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 42.66 3.9)
-		(end 42.66 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 42.66 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 20.32 2.15 0)
@@ -785,6 +705,126 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-17P_1x17_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-18P_1x18_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-18P_1x18_P2.54mm_Horizontal.kicad_mod
index 71468e15a..98a9f58bb 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-18P_1x18_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-18P_1x18_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-18P, 18 pins, pitch 2.54mm, size 46.2x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-18P pitch 2.54mm size 46.2x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-18P, 18 pins, pitch 2.54mm, size 46.2x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-18P pitch 2.54mm size 46.2x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 21.59 -4.22 0)
 		(layer "F.SilkS")
@@ -25,167 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 44.82 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 44.82 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 44.82 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 44.82 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 44.82 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 44.82 -3.22)
+		(end 44.82 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 45.2 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 45.2 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 45.2 3.9)
+		(end 45.2 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 43.18 0)
-		(end 44.18 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -197,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 44.7 -3.1)
-		(end 44.7 3.4)
+		(start -1.52 -1.5)
+		(end 44.7 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 44.7 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 44.7 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 44.82 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 44.7 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 44.82 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 44.7 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 44.82 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 44.82 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 44.82 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 44.82 -3.22)
-		(end 44.82 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 43.816 -0.758)
+		(end 42.422 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -629,8 +517,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.939 -0.637)
-		(end 42.544 0.759)
+		(start 43.938 -0.636)
+		(end 42.544 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -638,8 +526,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.817 -0.759)
-		(end 42.422 0.637)
+		(start 44.7 -3.1)
+		(end 44.7 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -647,166 +535,193 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 44.7 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 45.2 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 45.2 3.9)
-		(end 45.2 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 45.2 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "18" thru_hole circle
-		(at 43.18 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 43.18 0)
+		(end 44.18 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 21.59 2.15 0)
@@ -818,6 +733,133 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "18" thru_hole circle
+		(at 43.18 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-18P_1x18_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-19P_1x19_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-19P_1x19_P2.54mm_Horizontal.kicad_mod
index b43bad56f..1230a1c1b 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-19P_1x19_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-19P_1x19_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-19P, 19 pins, pitch 2.54mm, size 48.8x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-19P pitch 2.54mm size 48.8x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-19P, 19 pins, pitch 2.54mm, size 48.8x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-19P pitch 2.54mm size 48.8x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 22.86 -4.22 0)
 		(layer "F.SilkS")
@@ -25,176 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 47.36 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 47.36 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 47.36 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 47.36 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 47.36 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 47.36 -3.22)
+		(end 47.36 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 47.74 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 47.74 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 47.74 3.9)
+		(end 47.74 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 43.18 0)
-		(end 44.18 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 45.72 0)
-		(end 46.72 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -206,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 47.24 -3.1)
-		(end 47.24 3.4)
+		(start -1.52 -1.5)
+		(end 47.24 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 47.24 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 47.24 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 47.36 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 47.24 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 47.36 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 47.24 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 47.36 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 47.36 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 47.36 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 47.36 -3.22)
-		(end 47.36 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -629,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 43.816 -0.758)
+		(end 42.422 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -638,8 +517,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.939 -0.637)
-		(end 42.544 0.759)
+		(start 43.938 -0.636)
+		(end 42.544 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -647,8 +526,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.817 -0.759)
-		(end 42.422 0.637)
+		(start 46.356 -0.758)
+		(end 44.962 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -656,8 +535,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.479 -0.637)
-		(end 45.084 0.759)
+		(start 46.478 -0.636)
+		(end 45.084 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -665,8 +544,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.357 -0.759)
-		(end 44.962 0.637)
+		(start 47.24 -3.1)
+		(end 47.24 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -674,172 +553,203 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 47.24 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 47.74 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 47.74 3.9)
-		(end 47.74 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 47.74 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 43.18 0)
+		(end 44.18 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "18" thru_hole circle
-		(at 43.18 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "19" thru_hole circle
-		(at 45.72 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 45.72 0)
+		(end 46.72 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 22.86 2.15 0)
@@ -851,6 +761,140 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "18" thru_hole circle
+		(at 43.18 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "19" thru_hole circle
+		(at 45.72 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-19P_1x19_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-20P_1x20_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-20P_1x20_P2.54mm_Horizontal.kicad_mod
index 788737db1..c63ced9aa 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-20P_1x20_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-20P_1x20_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-20P, 20 pins, pitch 2.54mm, size 51.3x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-20P pitch 2.54mm size 51.3x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-20P, 20 pins, pitch 2.54mm, size 51.3x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-20P pitch 2.54mm size 51.3x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 24.13 -4.22 0)
 		(layer "F.SilkS")
@@ -25,185 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 49.9 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 49.9 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 49.9 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 49.9 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 49.9 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 49.9 -3.22)
+		(end 49.9 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 50.28 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 50.28 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 50.28 3.9)
+		(end 50.28 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 43.18 0)
-		(end 44.18 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 45.72 0)
-		(end 46.72 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 48.26 0)
-		(end 49.26 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -215,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 49.78 -3.1)
-		(end 49.78 3.4)
+		(start -1.52 -1.5)
+		(end 49.78 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 49.78 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 49.78 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 49.9 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 49.78 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 49.9 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 49.78 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 49.9 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 49.9 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 49.9 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 49.9 -3.22)
-		(end 49.9 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -629,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -638,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 43.816 -0.758)
+		(end 42.422 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -647,8 +517,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.939 -0.637)
-		(end 42.544 0.759)
+		(start 43.938 -0.636)
+		(end 42.544 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -656,8 +526,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.817 -0.759)
-		(end 42.422 0.637)
+		(start 46.356 -0.758)
+		(end 44.962 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -665,8 +535,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.479 -0.637)
-		(end 45.084 0.759)
+		(start 46.478 -0.636)
+		(end 45.084 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -674,8 +544,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.357 -0.759)
-		(end 44.962 0.637)
+		(start 48.896 -0.758)
+		(end 47.502 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -683,8 +553,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 49.019 -0.637)
-		(end 47.624 0.759)
+		(start 49.018 -0.636)
+		(end 47.624 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -692,8 +562,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 48.897 -0.759)
-		(end 47.502 0.637)
+		(start 49.78 -3.1)
+		(end 49.78 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -701,178 +571,213 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 49.78 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 50.28 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 50.28 3.9)
-		(end 50.28 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 50.28 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 43.18 0)
+		(end 44.18 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 45.72 0)
+		(end 46.72 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "18" thru_hole circle
-		(at 43.18 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "19" thru_hole circle
-		(at 45.72 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "20" thru_hole circle
-		(at 48.26 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 48.26 0)
+		(end 49.26 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 24.13 2.15 0)
@@ -884,6 +789,147 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "18" thru_hole circle
+		(at 43.18 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "19" thru_hole circle
+		(at 45.72 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "20" thru_hole circle
+		(at 48.26 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-20P_1x20_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-21P_1x21_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-21P_1x21_P2.54mm_Horizontal.kicad_mod
index a072e600b..c8e14127c 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-21P_1x21_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-21P_1x21_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-21P, 21 pins, pitch 2.54mm, size 53.8x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-21P pitch 2.54mm size 53.8x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-21P, 21 pins, pitch 2.54mm, size 53.8x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-21P pitch 2.54mm size 53.8x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 25.4 -4.22 0)
 		(layer "F.SilkS")
@@ -25,194 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 52.44 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 52.44 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 52.44 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 52.44 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 52.44 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 52.44 -3.22)
+		(end 52.44 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 52.82 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 52.82 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 52.82 3.9)
+		(end 52.82 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 43.18 0)
-		(end 44.18 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 45.72 0)
-		(end 46.72 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 48.26 0)
-		(end 49.26 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 50.8 0)
-		(end 51.8 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -224,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 52.32 -3.1)
-		(end 52.32 3.4)
+		(start -1.52 -1.5)
+		(end 52.32 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 52.32 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 52.32 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 52.44 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 52.32 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 52.44 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 52.32 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 52.44 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 52.44 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 52.44 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 52.44 -3.22)
-		(end 52.44 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -629,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -638,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -647,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 43.816 -0.758)
+		(end 42.422 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -656,8 +517,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.939 -0.637)
-		(end 42.544 0.759)
+		(start 43.938 -0.636)
+		(end 42.544 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -665,8 +526,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.817 -0.759)
-		(end 42.422 0.637)
+		(start 46.356 -0.758)
+		(end 44.962 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -674,8 +535,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.479 -0.637)
-		(end 45.084 0.759)
+		(start 46.478 -0.636)
+		(end 45.084 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -683,8 +544,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.357 -0.759)
-		(end 44.962 0.637)
+		(start 48.896 -0.758)
+		(end 47.502 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -692,8 +553,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 49.019 -0.637)
-		(end 47.624 0.759)
+		(start 49.018 -0.636)
+		(end 47.624 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -701,8 +562,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 48.897 -0.759)
-		(end 47.502 0.637)
+		(start 51.436 -0.758)
+		(end 50.042 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -710,8 +571,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 51.559 -0.637)
-		(end 50.164 0.759)
+		(start 51.558 -0.636)
+		(end 50.164 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -719,8 +580,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 51.437 -0.759)
-		(end 50.042 0.637)
+		(start 52.32 -3.1)
+		(end 52.32 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -728,184 +589,223 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 52.32 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 52.82 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 52.82 3.9)
-		(end 52.82 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 52.82 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 43.18 0)
+		(end 44.18 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 45.72 0)
+		(end 46.72 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 48.26 0)
+		(end 49.26 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "18" thru_hole circle
-		(at 43.18 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "19" thru_hole circle
-		(at 45.72 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "20" thru_hole circle
-		(at 48.26 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "21" thru_hole circle
-		(at 50.8 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 50.8 0)
+		(end 51.8 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 25.4 2.15 0)
@@ -917,6 +817,154 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "18" thru_hole circle
+		(at 43.18 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "19" thru_hole circle
+		(at 45.72 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "20" thru_hole circle
+		(at 48.26 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "21" thru_hole circle
+		(at 50.8 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-21P_1x21_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-22P_1x22_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-22P_1x22_P2.54mm_Horizontal.kicad_mod
index be30f3037..05ca387d6 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-22P_1x22_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-22P_1x22_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-22P, 22 pins, pitch 2.54mm, size 56.4x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-22P pitch 2.54mm size 56.4x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-22P, 22 pins, pitch 2.54mm, size 56.4x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-22P pitch 2.54mm size 56.4x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 26.67 -4.22 0)
 		(layer "F.SilkS")
@@ -25,203 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 54.98 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 54.98 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 54.98 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 54.98 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 54.98 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 54.98 -3.22)
+		(end 54.98 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 55.36 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 55.36 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 55.36 3.9)
+		(end 55.36 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 43.18 0)
-		(end 44.18 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 45.72 0)
-		(end 46.72 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 48.26 0)
-		(end 49.26 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 50.8 0)
-		(end 51.8 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 53.34 0)
-		(end 54.34 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -233,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 54.86 -3.1)
-		(end 54.86 3.4)
+		(start -1.52 -1.5)
+		(end 54.86 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 54.86 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 54.86 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 54.98 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 54.86 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 54.98 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 54.86 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 54.98 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 54.98 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 54.98 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 54.98 -3.22)
-		(end 54.98 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -629,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -638,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -647,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -656,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 43.816 -0.758)
+		(end 42.422 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -665,8 +517,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.939 -0.637)
-		(end 42.544 0.759)
+		(start 43.938 -0.636)
+		(end 42.544 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -674,8 +526,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.817 -0.759)
-		(end 42.422 0.637)
+		(start 46.356 -0.758)
+		(end 44.962 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -683,8 +535,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.479 -0.637)
-		(end 45.084 0.759)
+		(start 46.478 -0.636)
+		(end 45.084 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -692,8 +544,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.357 -0.759)
-		(end 44.962 0.637)
+		(start 48.896 -0.758)
+		(end 47.502 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -701,8 +553,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 49.019 -0.637)
-		(end 47.624 0.759)
+		(start 49.018 -0.636)
+		(end 47.624 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -710,8 +562,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 48.897 -0.759)
-		(end 47.502 0.637)
+		(start 51.436 -0.758)
+		(end 50.042 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -719,8 +571,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 51.559 -0.637)
-		(end 50.164 0.759)
+		(start 51.558 -0.636)
+		(end 50.164 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -728,8 +580,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 51.437 -0.759)
-		(end 50.042 0.637)
+		(start 53.976 -0.758)
+		(end 52.582 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -737,8 +589,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 54.099 -0.637)
-		(end 52.704 0.759)
+		(start 54.098 -0.636)
+		(end 52.704 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -746,8 +598,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 53.977 -0.759)
-		(end 52.582 0.637)
+		(start 54.86 -3.1)
+		(end 54.86 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -755,190 +607,233 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 54.86 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 55.36 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 55.36 3.9)
-		(end 55.36 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 55.36 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 43.18 0)
+		(end 44.18 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 45.72 0)
+		(end 46.72 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 48.26 0)
+		(end 49.26 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 50.8 0)
+		(end 51.8 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "18" thru_hole circle
-		(at 43.18 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "19" thru_hole circle
-		(at 45.72 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "20" thru_hole circle
-		(at 48.26 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "21" thru_hole circle
-		(at 50.8 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "22" thru_hole circle
-		(at 53.34 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 53.34 0)
+		(end 54.34 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 26.67 2.15 0)
@@ -950,6 +845,161 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "18" thru_hole circle
+		(at 43.18 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "19" thru_hole circle
+		(at 45.72 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "20" thru_hole circle
+		(at 48.26 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "21" thru_hole circle
+		(at 50.8 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "22" thru_hole circle
+		(at 53.34 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-22P_1x22_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-23P_1x23_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-23P_1x23_P2.54mm_Horizontal.kicad_mod
index 202c7c036..d1021bd2d 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-23P_1x23_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-23P_1x23_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-23P, 23 pins, pitch 2.54mm, size 58.9x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-23P pitch 2.54mm size 58.9x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-23P, 23 pins, pitch 2.54mm, size 58.9x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-23P pitch 2.54mm size 58.9x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 27.94 -4.22 0)
 		(layer "F.SilkS")
@@ -25,212 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 57.52 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 57.52 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 57.52 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 57.52 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 57.52 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 57.52 -3.22)
+		(end 57.52 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 22.86 0)
-		(end 23.86 0)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 25.4 0)
-		(end 26.4 0)
+	(fp_line
+		(start -2.02 3.9)
+		(end 57.9 3.9)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 27.94 0)
-		(end 28.94 0)
+	(fp_line
+		(start 57.9 -3.6)
+		(end -2.02 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
-	(fp_circle
-		(center 30.48 0)
-		(end 31.48 0)
+	(fp_line
+		(start 57.9 3.9)
+		(end 57.9 -3.6)
 		(stroke
-			(width 0.1)
+			(width 0.05)
 			(type solid)
 		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 33.02 0)
-		(end 34.02 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 35.56 0)
-		(end 36.56 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 38.1 0)
-		(end 39.1 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 40.64 0)
-		(end 41.64 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 43.18 0)
-		(end 44.18 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 45.72 0)
-		(end 46.72 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 48.26 0)
-		(end 49.26 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 50.8 0)
-		(end 51.8 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 53.34 0)
-		(end 54.34 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_circle
-		(center 55.88 0)
-		(end 56.88 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -242,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 57.4 -3.1)
-		(end 57.4 3.4)
+		(start -1.52 -1.5)
+		(end 57.4 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 57.4 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 57.4 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 57.52 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 57.4 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 57.52 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 57.4 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 57.52 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 57.52 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 57.52 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 57.52 -3.22)
-		(end 57.52 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -413,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -422,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -431,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -440,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -449,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -458,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -467,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -476,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -485,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -494,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -503,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -512,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -521,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 23.496 -0.758)
+		(end 22.102 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -530,8 +373,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.619 -0.637)
-		(end 22.224 0.759)
+		(start 23.618 -0.636)
+		(end 22.224 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -539,8 +382,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 23.497 -0.759)
-		(end 22.102 0.637)
+		(start 26.036 -0.758)
+		(end 24.642 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -548,8 +391,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.159 -0.637)
-		(end 24.764 0.759)
+		(start 26.158 -0.636)
+		(end 24.764 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -557,8 +400,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 26.037 -0.759)
-		(end 24.642 0.637)
+		(start 28.576 -0.758)
+		(end 27.182 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -566,8 +409,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.699 -0.637)
-		(end 27.304 0.759)
+		(start 28.698 -0.636)
+		(end 27.304 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -575,8 +418,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 28.577 -0.759)
-		(end 27.182 0.637)
+		(start 31.116 -0.758)
+		(end 29.722 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -584,8 +427,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.239 -0.637)
-		(end 29.844 0.759)
+		(start 31.238 -0.636)
+		(end 29.844 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -593,8 +436,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 31.117 -0.759)
-		(end 29.722 0.637)
+		(start 33.656 -0.758)
+		(end 32.262 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -602,8 +445,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.779 -0.637)
-		(end 32.384 0.759)
+		(start 33.778 -0.636)
+		(end 32.384 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -611,8 +454,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 33.657 -0.759)
-		(end 32.262 0.637)
+		(start 36.196 -0.758)
+		(end 34.802 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -620,8 +463,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.319 -0.637)
-		(end 34.924 0.759)
+		(start 36.318 -0.636)
+		(end 34.924 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -629,8 +472,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 36.197 -0.759)
-		(end 34.802 0.637)
+		(start 38.736 -0.758)
+		(end 37.342 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -638,8 +481,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.859 -0.637)
-		(end 37.464 0.759)
+		(start 38.858 -0.636)
+		(end 37.464 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -647,8 +490,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 38.737 -0.759)
-		(end 37.342 0.637)
+		(start 41.276 -0.758)
+		(end 39.882 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -656,8 +499,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.399 -0.637)
-		(end 40.004 0.759)
+		(start 41.398 -0.636)
+		(end 40.004 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -665,8 +508,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 41.277 -0.759)
-		(end 39.882 0.637)
+		(start 43.816 -0.758)
+		(end 42.422 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -674,8 +517,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.939 -0.637)
-		(end 42.544 0.759)
+		(start 43.938 -0.636)
+		(end 42.544 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -683,8 +526,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 43.817 -0.759)
-		(end 42.422 0.637)
+		(start 46.356 -0.758)
+		(end 44.962 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -692,8 +535,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.479 -0.637)
-		(end 45.084 0.759)
+		(start 46.478 -0.636)
+		(end 45.084 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -701,8 +544,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 46.357 -0.759)
-		(end 44.962 0.637)
+		(start 48.896 -0.758)
+		(end 47.502 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -710,8 +553,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 49.019 -0.637)
-		(end 47.624 0.759)
+		(start 49.018 -0.636)
+		(end 47.624 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -719,8 +562,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 48.897 -0.759)
-		(end 47.502 0.637)
+		(start 51.436 -0.758)
+		(end 50.042 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -728,8 +571,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 51.559 -0.637)
-		(end 50.164 0.759)
+		(start 51.558 -0.636)
+		(end 50.164 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -737,8 +580,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 51.437 -0.759)
-		(end 50.042 0.637)
+		(start 53.976 -0.758)
+		(end 52.582 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -746,8 +589,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 54.099 -0.637)
-		(end 52.704 0.759)
+		(start 54.098 -0.636)
+		(end 52.704 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -755,8 +598,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 53.977 -0.759)
-		(end 52.582 0.637)
+		(start 56.516 -0.758)
+		(end 55.122 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -764,8 +607,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 56.639 -0.637)
-		(end 55.244 0.759)
+		(start 56.638 -0.636)
+		(end 55.244 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -773,8 +616,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 56.517 -0.759)
-		(end 55.122 0.637)
+		(start 57.4 -3.1)
+		(end 57.4 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -782,196 +625,243 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 57.4 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 57.9 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 57.9 3.9)
-		(end 57.9 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 57.9 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 22.86 0)
+		(end 23.86 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 25.4 0)
+		(end 26.4 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 27.94 0)
+		(end 28.94 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 30.48 0)
+		(end 31.48 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 33.02 0)
+		(end 34.02 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "10" thru_hole circle
-		(at 22.86 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 35.56 0)
+		(end 36.56 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "11" thru_hole circle
-		(at 25.4 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 38.1 0)
+		(end 39.1 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "12" thru_hole circle
-		(at 27.94 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 40.64 0)
+		(end 41.64 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "13" thru_hole circle
-		(at 30.48 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 43.18 0)
+		(end 44.18 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "14" thru_hole circle
-		(at 33.02 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 45.72 0)
+		(end 46.72 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "15" thru_hole circle
-		(at 35.56 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 48.26 0)
+		(end 49.26 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "16" thru_hole circle
-		(at 38.1 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 50.8 0)
+		(end 51.8 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "17" thru_hole circle
-		(at 40.64 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 53.34 0)
+		(end 54.34 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "18" thru_hole circle
-		(at 43.18 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "19" thru_hole circle
-		(at 45.72 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "20" thru_hole circle
-		(at 48.26 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "21" thru_hole circle
-		(at 50.8 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "22" thru_hole circle
-		(at 53.34 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "23" thru_hole circle
-		(at 55.88 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 55.88 0)
+		(end 56.88 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 27.94 2.15 0)
@@ -983,6 +873,168 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "10" thru_hole circle
+		(at 22.86 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "11" thru_hole circle
+		(at 25.4 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "12" thru_hole circle
+		(at 27.94 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "13" thru_hole circle
+		(at 30.48 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "14" thru_hole circle
+		(at 33.02 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "15" thru_hole circle
+		(at 35.56 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "16" thru_hole circle
+		(at 38.1 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "17" thru_hole circle
+		(at 40.64 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "18" thru_hole circle
+		(at 43.18 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "19" thru_hole circle
+		(at 45.72 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "20" thru_hole circle
+		(at 48.26 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "21" thru_hole circle
+		(at 50.8 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "22" thru_hole circle
+		(at 53.34 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "23" thru_hole circle
+		(at 55.88 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-23P_1x23_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-2P_1x02_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-2P_1x02_P2.54mm_Horizontal.kicad_mod
index 3efdc6cad..0ae93d0f0 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-2P_1x02_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-2P_1x02_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-2P, 2 pins, pitch 2.54mm, size 5.58x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-2P pitch 2.54mm size 5.58x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-2P, 2 pins, pitch 2.54mm, size 5.58x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-2P pitch 2.54mm size 5.58x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 1.27 -4.22 0)
 		(layer "F.SilkS")
@@ -25,23 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 4.18 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 4.18 -1.5)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 1.6)
+		(end 4.18 1.6)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 2.6)
+		(end 4.18 2.6)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 0.3 3.52)
+		(end 4.18 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 4.18 -3.22)
+		(end 4.18 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 4.57 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 4.57 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 4.57 3.9)
+		(end 4.57 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -53,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 4.06 -3.1)
-		(end 4.06 3.4)
+		(start -1.52 -1.5)
+		(end 4.06 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -62,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 4.06 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 4.06 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -98,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 4.18 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 4.06 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -116,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 4.18 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 4.06 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -134,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 4.18 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 4.18 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 4.18 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 4.18 -3.22)
-		(end 4.18 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -188,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -197,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 4.06 -3.1)
+		(end 4.06 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,70 +247,33 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 4.06 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 4.57 3.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.57 3.9)
-		(end 4.57 -3.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.57 -3.6)
-		(end -2.02 -3.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 2.15 0)
@@ -290,6 +285,21 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-2P_1x02_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-3P_1x03_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-3P_1x03_P2.54mm_Horizontal.kicad_mod
index c75097def..9d9abfdc8 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-3P_1x03_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-3P_1x03_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-3P, 3 pins, pitch 2.54mm, size 8.12x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-3P pitch 2.54mm size 8.12x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-3P, 3 pins, pitch 2.54mm, size 8.12x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-3P pitch 2.54mm size 8.12x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 2.54 -4.22 0)
 		(layer "F.SilkS")
@@ -25,32 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 6.72 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 6.72 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 1.6)
+		(end 6.72 1.6)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 2.6)
+		(end 6.72 2.6)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 0.3 3.52)
+		(end 6.72 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 6.72 -3.22)
+		(end 6.72 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 7.11 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 7.11 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 7.11 3.9)
+		(end 7.11 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -62,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 6.6 -3.1)
-		(end 6.6 3.4)
+		(start -1.52 -1.5)
+		(end 6.6 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -71,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 6.6 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 6.6 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -107,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 6.721 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 6.6 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -125,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 6.721 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 6.6 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -143,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 6.721 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 6.721 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 6.721 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.721 -3.22)
-		(end 6.721 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -197,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 6.6 -3.1)
+		(end 6.6 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,76 +265,43 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 6.6 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 7.11 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 7.11 3.9)
-		(end 7.11 -3.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 7.11 -3.6)
-		(end -2.02 -3.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 2.15 0)
@@ -323,6 +313,28 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-3P_1x03_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-4P_1x04_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-4P_1x04_P2.54mm_Horizontal.kicad_mod
index 62911ba7b..ff665e645 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-4P_1x04_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-4P_1x04_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-4P, 4 pins, pitch 2.54mm, size 10.7x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-4P pitch 2.54mm size 10.7x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-4P, 4 pins, pitch 2.54mm, size 10.7x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-4P pitch 2.54mm size 10.7x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 3.81 -4.22 0)
 		(layer "F.SilkS")
@@ -25,41 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 9.26 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 9.26 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 9.26 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 2.6)
+		(end 9.26 2.6)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 0.3 3.52)
+		(end 9.26 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 9.26 -3.22)
+		(end 9.26 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 9.64 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 9.64 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 9.64 3.9)
+		(end 9.64 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -71,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 9.14 -3.1)
-		(end 9.14 3.4)
+		(start -1.52 -1.5)
+		(end 9.14 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -80,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 9.14 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 9.14 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -116,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 9.26 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 9.14 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -134,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 9.26 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 9.14 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -152,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 9.26 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 9.26 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 9.26 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.26 -3.22)
-		(end 9.26 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -206,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 9.14 -3.1)
+		(end 9.14 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,82 +283,53 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 9.14 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 9.64 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 9.64 3.9)
-		(end 9.64 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.64 -3.6)
-		(end -2.02 -3.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 2.15 0)
@@ -356,6 +341,35 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-4P_1x04_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-5P_1x05_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-5P_1x05_P2.54mm_Horizontal.kicad_mod
index 6868a7eff..1bcbbe1bc 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-5P_1x05_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-5P_1x05_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-5P, 5 pins, pitch 2.54mm, size 13.2x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-5P pitch 2.54mm size 13.2x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-5P, 5 pins, pitch 2.54mm, size 13.2x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-5P pitch 2.54mm size 13.2x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 5.08 -4.22 0)
 		(layer "F.SilkS")
@@ -25,50 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 11.8 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 11.8 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 11.8 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 11.8 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 0.3 3.52)
+		(end 11.8 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 11.8 -3.22)
+		(end 11.8 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 12.18 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 12.18 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 12.18 3.9)
+		(end 12.18 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -80,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 11.68 -3.1)
-		(end 11.68 3.4)
+		(start -1.52 -1.5)
+		(end 11.68 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -89,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 11.68 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 11.68 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -125,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 11.8 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 11.68 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -143,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 11.8 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 11.68 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -161,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 11.8 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 11.8 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 11.8 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 11.8 -3.22)
-		(end 11.8 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -215,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 11.68 -3.1)
+		(end 11.68 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,88 +301,63 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 11.68 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 12.18 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 12.18 3.9)
-		(end 12.18 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 12.18 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.08 2.15 0)
@@ -389,6 +369,42 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-5P_1x05_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-6P_1x06_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-6P_1x06_P2.54mm_Horizontal.kicad_mod
index f1134b416..ff454f121 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-6P_1x06_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-6P_1x06_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-6P, 6 pins, pitch 2.54mm, size 15.7x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-6P pitch 2.54mm size 15.7x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-6P, 6 pins, pitch 2.54mm, size 15.7x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-6P pitch 2.54mm size 15.7x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 6.35 -4.22 0)
 		(layer "F.SilkS")
@@ -25,59 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 14.34 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 14.34 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 14.34 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 14.34 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 0.3 3.52)
+		(end 14.34 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 14.34 -3.22)
+		(end 14.34 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 14.72 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 14.72 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 14.72 3.9)
+		(end 14.72 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -89,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 14.22 -3.1)
-		(end 14.22 3.4)
+		(start -1.52 -1.5)
+		(end 14.22 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -98,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 14.22 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 14.22 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -134,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 14.34 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 14.22 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -152,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 14.34 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 14.22 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -170,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 14.34 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 14.34 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 14.34 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 14.34 -3.22)
-		(end 14.34 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -224,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 14.22 -3.1)
+		(end 14.22 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,94 +319,73 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 14.22 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 14.72 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 14.72 3.9)
-		(end 14.72 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 14.72 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 6.35 2.15 0)
@@ -422,6 +397,49 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-6P_1x06_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-7P_1x07_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-7P_1x07_P2.54mm_Horizontal.kicad_mod
index 642fff1a4..c163a16b4 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-7P_1x07_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-7P_1x07_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-7P, 7 pins, pitch 2.54mm, size 18.3x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-7P pitch 2.54mm size 18.3x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-7P, 7 pins, pitch 2.54mm, size 18.3x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-7P pitch 2.54mm size 18.3x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 7.62 -4.22 0)
 		(layer "F.SilkS")
@@ -25,68 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 16.88 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 16.88 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 16.88 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 16.88 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 16.88 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start 16.88 -3.22)
+		(end 16.88 3.52)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 17.27 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 17.27 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 17.27 3.9)
+		(end 17.27 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -98,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 16.76 -3.1)
-		(end 16.76 3.4)
+		(start -1.52 -1.5)
+		(end 16.76 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -107,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 16.76 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 16.76 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -143,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 16.88 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 16.76 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -161,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 16.88 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 16.76 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -179,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 16.88 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 16.88 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 16.88 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.88 -3.22)
-		(end 16.88 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -233,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 16.76 -3.1)
+		(end 16.76 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,100 +337,83 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 16.76 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 17.27 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 17.27 3.9)
-		(end 17.27 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 17.27 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 7.62 2.15 0)
@@ -455,6 +425,56 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-7P_1x07_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-8P_1x08_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-8P_1x08_P2.54mm_Horizontal.kicad_mod
index faaf5dfb2..7498eb222 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-8P_1x08_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-8P_1x08_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-8P, 8 pins, pitch 2.54mm, size 20.8x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-8P pitch 2.54mm size 20.8x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-8P, 8 pins, pitch 2.54mm, size 20.8x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-8P pitch 2.54mm size 20.8x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 8.89 -4.22 0)
 		(layer "F.SilkS")
@@ -25,77 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 19.42 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 19.42 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 19.42 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 19.42 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 19.42 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 19.42 -3.22)
+		(end 19.42 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
+	)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 19.8 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 19.8 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 19.8 3.9)
+		(end 19.8 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -107,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 19.3 -3.1)
-		(end 19.3 3.4)
+		(start -1.52 -1.5)
+		(end 19.3 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -116,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 19.3 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 19.3 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -152,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 19.42 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 19.3 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -170,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 19.42 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 19.3 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -188,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 19.42 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 19.42 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 19.42 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 19.42 -3.22)
-		(end 19.42 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -242,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 19.3 -3.1)
+		(end 19.3 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,106 +355,93 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 19.3 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 19.8 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 19.8 3.9)
-		(end 19.8 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 19.8 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 2.15 0)
@@ -488,6 +453,63 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-8P_1x08_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)
diff --git a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-9P_1x09_P2.54mm_Horizontal.kicad_mod b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-9P_1x09_P2.54mm_Horizontal.kicad_mod
index 3a66e8361..9807373cd 100644
--- a/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-9P_1x09_P2.54mm_Horizontal.kicad_mod
+++ b/TerminalBlock.pretty/TerminalBlock_Xinya_XY308-2.54-9P_1x09_P2.54mm_Horizontal.kicad_mod
@@ -2,8 +2,8 @@
 	(version 20240108)
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "Terminal Block Xinya XY308-2.54-9P, 9 pins, pitch 2.54mm, size 23.4x6.5mm^2, drill diameter 1.2mm, pad diameter 2mm, see http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
-	(tags "THT Terminal Block Xinya XY308-2.54-9P pitch 2.54mm size 23.4x6.5mm^2 drill 1.2mm pad 2mm")
+	(descr "Terminal Block Xinya XY308-2.54-9P, 9 pins, pitch 2.54mm, size 23.4x6.5mm, drill diameter 1.2mm, pad diameter 2mm, http://www.xinyaelectronic.com/product/xy308-254, script-generated using https://gitlab.com/kicad/libraries/kicad-footprint-generator/-/tree/master/scripts/TerminalBlock_Xinya")
+	(tags "THT Terminal Block Xinya XY308-2.54-9P pitch 2.54mm size 23.4x6.5mm drill 1.2mm pad 2mm")
 	(property "Reference" "REF**"
 		(at 10.16 -4.22 0)
 		(layer "F.SilkS")
@@ -25,86 +25,127 @@
 		)
 	)
 	(attr through_hole)
-	(fp_circle
-		(center 0 0)
-		(end 1 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end -1.64 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 2.54 0)
-		(end 3.54 0)
+	(fp_line
+		(start -1.64 -3.22)
+		(end 21.96 -3.22)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 5.08 0)
-		(end 6.08 0)
+	(fp_line
+		(start -1.64 -1.5)
+		(end 21.96 -1.5)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 7.62 0)
-		(end 8.62 0)
+	(fp_line
+		(start -1.64 1.6)
+		(end 21.96 1.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 10.16 0)
-		(end 11.16 0)
+	(fp_line
+		(start -1.64 2.6)
+		(end 21.96 2.6)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 12.7 0)
-		(end 13.7 0)
+	(fp_line
+		(start -1.64 3.52)
+		(end -0.3 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 15.24 0)
-		(end 16.24 0)
+	(fp_line
+		(start 0.3 3.52)
+		(end 21.96 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 17.78 0)
-		(end 18.78 0)
+	(fp_line
+		(start 21.96 -3.22)
+		(end 21.96 3.52)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(layer "F.SilkS")
 	)
-	(fp_circle
-		(center 20.32 0)
-		(end 21.32 0)
+	(fp_poly
+		(pts
+			(xy 0 3.52)
+			(xy 0.44 4.13)
+			(xy -0.44 4.13)
+			(xy 0 3.52)
+		)
 		(stroke
-			(width 0.1)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.Fab")
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_line
+		(start -2.02 -3.6)
+		(end -2.02 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start -2.02 3.9)
+		(end 22.34 3.9)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 22.34 -3.6)
+		(end -2.02 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+	)
+	(fp_line
+		(start 22.34 3.9)
+		(end 22.34 -3.6)
+		(stroke
+			(width 0.05)
+			(type solid)
+		)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.52 -3.1)
@@ -116,8 +157,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.84 -3.1)
-		(end 21.84 3.4)
+		(start -1.52 -1.5)
+		(end 21.84 -1.5)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -125,17 +166,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.84 3.4)
-		(end -0.72 3.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -0.72 3.4)
-		(end -1.52 2.6)
+		(start -1.52 1.6)
+		(end 21.84 1.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -161,17 +193,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 2.6)
-		(end 21.96 2.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 1.6)
-		(end 21.84 1.6)
+		(start -0.72 3.4)
+		(end -1.52 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -179,17 +202,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 1.6)
-		(end 21.96 1.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.52 -1.5)
-		(end 21.84 -1.5)
+		(start 0.636 -0.758)
+		(end -0.758 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -197,53 +211,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.64 -1.501)
-		(end 21.96 -1.501)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end 21.96 -3.22)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 3.52)
-		(end 21.96 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.64 -3.22)
-		(end -1.64 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 21.96 -3.22)
-		(end 21.96 3.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 0.759 -0.637)
-		(end -0.637 0.759)
+		(start 0.758 -0.636)
+		(end -0.636 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -251,8 +220,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 0.637 -0.759)
-		(end -0.759 0.637)
+		(start 3.176 -0.758)
+		(end 1.782 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,8 +229,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.299 -0.637)
-		(end 1.904 0.759)
+		(start 3.298 -0.636)
+		(end 1.904 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -269,8 +238,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 3.177 -0.759)
-		(end 1.782 0.637)
+		(start 5.716 -0.758)
+		(end 4.322 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -278,8 +247,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.839 -0.637)
-		(end 4.444 0.759)
+		(start 5.838 -0.636)
+		(end 4.444 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -287,8 +256,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 5.717 -0.759)
-		(end 4.322 0.637)
+		(start 8.256 -0.758)
+		(end 6.862 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -296,8 +265,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.379 -0.637)
-		(end 6.984 0.759)
+		(start 8.378 -0.636)
+		(end 6.984 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -305,8 +274,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.257 -0.759)
-		(end 6.862 0.637)
+		(start 10.796 -0.758)
+		(end 9.402 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -314,8 +283,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.919 -0.637)
-		(end 9.524 0.759)
+		(start 10.918 -0.636)
+		(end 9.524 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -323,8 +292,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 10.797 -0.759)
-		(end 9.402 0.637)
+		(start 13.336 -0.758)
+		(end 11.942 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -332,8 +301,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.459 -0.637)
-		(end 12.064 0.759)
+		(start 13.458 -0.636)
+		(end 12.064 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -341,8 +310,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 13.337 -0.759)
-		(end 11.942 0.637)
+		(start 15.876 -0.758)
+		(end 14.482 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -350,8 +319,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.999 -0.637)
-		(end 14.604 0.759)
+		(start 15.998 -0.636)
+		(end 14.604 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -359,8 +328,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 15.877 -0.759)
-		(end 14.482 0.637)
+		(start 18.416 -0.758)
+		(end 17.022 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -368,8 +337,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.539 -0.637)
-		(end 17.144 0.759)
+		(start 18.538 -0.636)
+		(end 17.144 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -377,8 +346,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 18.417 -0.759)
-		(end 17.022 0.637)
+		(start 20.956 -0.758)
+		(end 19.562 0.636)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -386,8 +355,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 21.079 -0.637)
-		(end 19.684 0.759)
+		(start 21.078 -0.636)
+		(end 19.684 0.758)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -395,8 +364,8 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 20.957 -0.759)
-		(end 19.562 0.637)
+		(start 21.84 -3.1)
+		(end 21.84 3.4)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -404,112 +373,103 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start -1.88 2.72)
-		(end -1.88 3.76)
+		(start 21.84 3.4)
+		(end -0.72 3.4)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.88 3.76)
-		(end -1.08 3.76)
+	(fp_circle
+		(center 0 0)
+		(end 1 0)
 		(stroke
-			(width 0.12)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.SilkS")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 -3.6)
-		(end -2.02 3.9)
+	(fp_circle
+		(center 2.54 0)
+		(end 3.54 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.02 3.9)
-		(end 22.34 3.9)
+	(fp_circle
+		(center 5.08 0)
+		(end 6.08 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 22.34 3.9)
-		(end 22.34 -3.6)
+	(fp_circle
+		(center 7.62 0)
+		(end 8.62 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(fp_line
-		(start 22.34 -3.6)
-		(end -2.02 -3.6)
+	(fp_circle
+		(center 10.16 0)
+		(end 11.16 0)
 		(stroke
-			(width 0.05)
+			(width 0.1)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "1" thru_hole rect
-		(at 0 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 12.7 0)
+		(end 13.7 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "2" thru_hole circle
-		(at 2.54 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 15.24 0)
+		(end 16.24 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "3" thru_hole circle
-		(at 5.08 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 17.78 0)
+		(end 18.78 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
-	(pad "4" thru_hole circle
-		(at 7.62 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "5" thru_hole circle
-		(at 10.16 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "6" thru_hole circle
-		(at 12.7 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "7" thru_hole circle
-		(at 15.24 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "8" thru_hole circle
-		(at 17.78 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
-	)
-	(pad "9" thru_hole circle
-		(at 20.32 0)
-		(size 2 2)
-		(drill 1.2)
-		(layers "*.Cu" "*.Mask")
+	(fp_circle
+		(center 20.32 0)
+		(end 21.32 0)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 10.16 2.15 0)
@@ -521,6 +481,70 @@
 			)
 		)
 	)
+	(pad "1" thru_hole roundrect
+		(at 0 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+		(roundrect_rratio 0.125)
+	)
+	(pad "2" thru_hole circle
+		(at 2.54 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "3" thru_hole circle
+		(at 5.08 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "4" thru_hole circle
+		(at 7.62 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "5" thru_hole circle
+		(at 10.16 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "6" thru_hole circle
+		(at 12.7 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "7" thru_hole circle
+		(at 15.24 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "8" thru_hole circle
+		(at 17.78 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
+	(pad "9" thru_hole circle
+		(at 20.32 0)
+		(size 2 2)
+		(drill 1.2)
+		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
+	)
 	(model "${KICAD8_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_Xinya_XY308-2.54-9P_1x09_P2.54mm_Horizontal.wrl"
 		(offset
 			(xyz 0 0 0)