diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index db0fae9cb..f1944682e 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -79,114 +79,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -0.635)
 		(end -0.603333 0.635)
@@ -196,24 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -2.11)
 		(end 3.41 -0.8)
@@ -232,40 +106,34 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -2.36)
-		(end -4.7 2.36)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 2.36)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -2.36)
 		(end 4.7 2.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -2.36)
-		(end -4.7 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 2.36)
-		(end 4.7 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -295,132 +163,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -0.635)
 		(end -0.603333 0.635)
@@ -430,24 +172,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -2.05)
 		(end 3.35 2.05)
@@ -466,6 +190,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -486,15 +230,17 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 7f832f359..b1f99d4c1 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -79,114 +79,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -0.635)
 		(end -0.603333 0.635)
@@ -196,24 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -2.11)
 		(end 3.41 -0.8)
@@ -232,40 +106,34 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -2.36)
-		(end -5.78 2.36)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 2.36)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -2.36)
 		(end 5.78 2.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -2.36)
-		(end -5.78 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 2.36)
-		(end 5.78 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -295,132 +163,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -0.635)
 		(end -0.603333 0.635)
@@ -430,24 +172,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -2.05)
 		(end 3.35 2.05)
@@ -466,6 +190,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -486,15 +230,17 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W8.61mm_P2.54mm.kicad_mod
index 39472f732..93514466f 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W8.61mm_P2.54mm.kicad_mod
@@ -79,114 +79,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.515)
-		(end -0.676667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.395)
-		(end -0.676667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.275)
-		(end -0.676667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.155)
-		(end -0.676667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.085)
-		(end -0.676667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.205)
-		(end -0.676667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.325)
-		(end -0.676667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.445)
-		(end -0.676667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -0.635)
 		(end -0.676667 0.635)
@@ -196,24 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -2.42)
 		(end 4.95 -0.8)
@@ -232,40 +106,34 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -2.67)
-		(end -5.78 2.67)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 2.67)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -2.67)
 		(end 5.78 2.67)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -2.67)
-		(end -5.78 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 2.67)
-		(end 5.78 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -295,132 +163,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.535)
-		(end -0.676667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.435)
-		(end -0.676667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.335)
-		(end -0.676667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.235)
-		(end -0.676667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.135)
-		(end -0.676667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.065)
-		(end -0.676667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.165)
-		(end -0.676667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.265)
-		(end -0.676667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.365)
-		(end -0.676667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.465)
-		(end -0.676667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -0.635)
 		(end -0.676667 0.635)
@@ -430,24 +172,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -2.36)
 		(end 4.89 2.36)
@@ -466,6 +190,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -486,15 +230,17 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01A_W5.08mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01A_W5.08mm_P1.27mm_JPin.kicad_mod
index 1474299ca..886e092ae 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01A_W5.08mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01A_W5.08mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.59 -1.58)
-		(end -3.59 1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.59 1.58)
 		(end 3.59 1.58)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 -1.58)
-		(end -3.59 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 1.58)
-		(end 3.59 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,60 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -1.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end 1.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -0.25)
 		(end -0.5 0.25)
@@ -214,24 +134,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -0.25)
-		(end -1.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.25)
-		(end 1.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -1.27)
 		(end 2.7 1.27)
@@ -250,6 +152,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -0.25)
+		(end -0.5 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.25)
+		(end 1.5 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -270,15 +192,17 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.54 0)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 2.54 0)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_Copal_CHS-01A_W5.08mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01B_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01B_W7.62mm_P1.27mm.kicad_mod
index 6d1bbef71..6796ad317 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01B_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CHS-01B_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.86 -1.58)
-		(end -4.86 1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.86 1.58)
 		(end 4.86 1.58)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 -1.58)
-		(end -4.86 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 1.58)
-		(end 4.86 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,60 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -1.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end 1.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -0.25)
 		(end -0.5 0.25)
@@ -214,24 +134,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -0.25)
-		(end -1.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.25)
-		(end 1.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -1.27)
 		(end 2.7 1.27)
@@ -250,6 +152,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -0.25)
+		(end -0.5 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.25)
+		(end 1.5 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -270,15 +192,17 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 0)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 3.81 0)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_Copal_CHS-01B_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CVS-01xB_W5.9mm_P1mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CVS-01xB_W5.9mm_P1mm.kicad_mod
index 01329902f..b6091f91a 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CVS-01xB_W5.9mm_P1mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Copal_CVS-01xB_W5.9mm_P1mm.kicad_mod
@@ -52,40 +52,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.8 -1.66)
-		(end -3.8 1.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.8 1.66)
 		(end 3.8 1.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 -1.66)
-		(end -3.8 -1.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 1.66)
-		(end 3.8 -1.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -115,60 +89,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -0.25)
-		(end -1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.15)
-		(end -0.333333 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.05)
-		(end -0.333333 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.05)
-		(end -0.333333 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.15)
-		(end -0.333333 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.25)
-		(end 1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -0.25)
 		(end -0.333333 0.25)
@@ -178,24 +98,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -0.25)
-		(end -1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.25)
-		(end 1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.35 -1)
 		(end 2.35 1)
@@ -214,6 +116,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -0.25)
+		(end -0.333333 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.25)
+		(end 1 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.675 0 90)
 		(layer "F.Fab")
@@ -234,35 +156,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.95 0)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 2.95 0)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.15 -1)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.15 1)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 2.15 -1)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 2.15 1)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_Copal_CVS-01xB_W5.9mm_P1mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Omron_A6S-110x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Omron_A6S-110x_W8.9mm_P2.54mm.kicad_mod
index 1b0ba56af..34d30827f 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Omron_A6S-110x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx01_Slide_Omron_A6S-110x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -2.05)
-		(end -5.45 2.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 2.05)
 		(end 5.45 2.05)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -2.05)
-		(end -5.45 -2.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 2.05)
-		(end 5.45 -2.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,123 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -0.55)
-		(end -1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.45)
-		(end -0.5 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.35)
-		(end -0.5 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -0.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end -0.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.35)
-		(end -0.5 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.45)
-		(end -0.5 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end -0.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end 1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -0.55)
 		(end -0.5 0.55)
@@ -277,24 +134,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -0.55)
-		(end -1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.55)
-		(end 1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -1.74)
 		(end 3.1 1.74)
@@ -313,6 +152,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end -0.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end 1.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -333,15 +192,17 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at 4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx01_Slide_Omron_A6S-110x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 54364bfad..c870f8086 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -88,222 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -1.905)
 		(end -0.603333 -0.635)
@@ -322,42 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -3.38)
 		(end 3.41 -2.07)
@@ -385,40 +133,54 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -3.63)
-		(end -4.7 3.63)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 3.63)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -3.63)
 		(end 4.7 3.63)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -3.63)
-		(end -4.7 -3.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 3.63)
-		(end 4.7 -3.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -448,258 +210,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -1.905)
 		(end -0.603333 -0.635)
@@ -718,42 +228,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -3.32)
 		(end 3.35 3.32)
@@ -772,6 +246,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -792,25 +306,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 64849e64d..3dd2cee5d 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -88,222 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -1.905)
 		(end -0.603333 -0.635)
@@ -322,42 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -3.38)
 		(end 3.41 -2.07)
@@ -385,40 +133,54 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -3.63)
-		(end -5.78 3.63)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 3.63)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -3.63)
 		(end 5.78 3.63)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -3.63)
-		(end -5.78 -3.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 3.63)
-		(end 5.78 -3.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -448,258 +210,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -1.905)
 		(end -0.603333 -0.635)
@@ -718,42 +228,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -3.32)
 		(end 3.35 3.32)
@@ -772,6 +246,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -792,25 +306,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W8.61mm_P2.54mm.kicad_mod
index 77a57e748..23cf19c5e 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W8.61mm_P2.54mm.kicad_mod
@@ -88,222 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.785)
-		(end -0.676667 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.665)
-		(end -0.676667 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.545)
-		(end -0.676667 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.425)
-		(end -0.676667 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.185)
-		(end -0.676667 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.065)
-		(end -0.676667 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.945)
-		(end -0.676667 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.825)
-		(end -0.676667 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.755)
-		(end -0.676667 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.875)
-		(end -0.676667 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.995)
-		(end -0.676667 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.115)
-		(end -0.676667 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.355)
-		(end -0.676667 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.475)
-		(end -0.676667 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.595)
-		(end -0.676667 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.715)
-		(end -0.676667 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -1.905)
 		(end -0.676667 -0.635)
@@ -322,42 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -3.69)
 		(end 4.95 -2.07)
@@ -385,40 +133,54 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -3.94)
-		(end -5.78 3.94)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 3.94)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -3.94)
 		(end 5.78 3.94)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -3.94)
-		(end -5.78 -3.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 3.94)
-		(end 5.78 -3.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -448,258 +210,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.805)
-		(end -0.676667 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.705)
-		(end -0.676667 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.605)
-		(end -0.676667 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.505)
-		(end -0.676667 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.405)
-		(end -0.676667 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.205)
-		(end -0.676667 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.105)
-		(end -0.676667 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.005)
-		(end -0.676667 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.905)
-		(end -0.676667 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.805)
-		(end -0.676667 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.735)
-		(end -0.676667 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.835)
-		(end -0.676667 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.935)
-		(end -0.676667 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.035)
-		(end -0.676667 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.135)
-		(end -0.676667 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.335)
-		(end -0.676667 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.435)
-		(end -0.676667 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.535)
-		(end -0.676667 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.635)
-		(end -0.676667 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.735)
-		(end -0.676667 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -1.905)
 		(end -0.676667 -0.635)
@@ -718,42 +228,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -3.63)
 		(end 4.89 3.63)
@@ -772,6 +246,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -792,25 +306,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02A_W5.08mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02A_W5.08mm_P1.27mm_JPin.kicad_mod
index b356b7458..690e7729e 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02A_W5.08mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02A_W5.08mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.59 -2.22)
-		(end -3.59 2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.59 2.22)
 		(end 3.59 2.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 -2.22)
-		(end -3.59 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 2.22)
-		(end 3.59 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,114 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -0.885)
 		(end -0.5 -0.385)
@@ -277,42 +143,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -1.905)
 		(end 2.7 1.905)
@@ -331,6 +161,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -351,25 +221,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_Copal_CHS-02A_W5.08mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02B_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02B_W7.62mm_P1.27mm.kicad_mod
index cd4732470..e609859be 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02B_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CHS-02B_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.86 -2.22)
-		(end -4.86 2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.86 2.22)
 		(end 4.86 2.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 -2.22)
-		(end -4.86 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 2.22)
-		(end 4.86 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,114 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -0.885)
 		(end -0.5 -0.385)
@@ -277,42 +143,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -1.905)
 		(end 2.7 1.905)
@@ -331,6 +161,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -351,25 +221,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_Copal_CHS-02B_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CVS-02xB_W5.9mm_P1mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CVS-02xB_W5.9mm_P1mm.kicad_mod
index 289a8e896..27b0ad204 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CVS-02xB_W5.9mm_P1mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Copal_CVS-02xB_W5.9mm_P1mm.kicad_mod
@@ -52,40 +52,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.8 -2.16)
-		(end -3.8 2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.8 2.16)
 		(end 3.8 2.16)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 -2.16)
-		(end -3.8 -2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 2.16)
-		(end 3.8 -2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -115,114 +89,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -0.75)
-		(end -1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.65)
-		(end -0.333333 -0.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.55)
-		(end -0.333333 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.45)
-		(end -0.333333 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.35)
-		(end -0.333333 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.25)
-		(end 1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.25)
-		(end -1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.35)
-		(end -0.333333 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.45)
-		(end -0.333333 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.55)
-		(end -0.333333 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.65)
-		(end -0.333333 0.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.75)
-		(end 1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -0.75)
 		(end -0.333333 -0.25)
@@ -241,42 +107,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -0.75)
-		(end -1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.25)
-		(end 1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.25)
-		(end -1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.75)
-		(end 1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.35 -1.5)
 		(end 2.35 1.5)
@@ -295,6 +125,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -0.75)
+		(end -0.333333 -0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.75)
+		(end 1 -0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.25)
+		(end -0.333333 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.25)
+		(end 1 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.675 0 90)
 		(layer "F.Fab")
@@ -315,45 +185,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.95 -0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.95 0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 2.95 0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 2.95 -0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.15 -1.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.15 1.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.15 -1.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.15 1.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_Copal_CVS-02xB_W5.9mm_P1mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index 1e6670236..17661c283 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -2.48)
-		(end -4.2 2.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 2.48)
 		(end 4.2 2.48)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -2.48)
-		(end -4.2 -2.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 2.48)
-		(end 4.2 -2.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,168 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -1.035)
 		(end -0.333333 -0.235)
@@ -331,42 +143,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -2.17)
 		(end 2.7 2.17)
@@ -385,6 +161,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -405,25 +221,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TS_W7.62mm_P1.27mm.kicad_mod
index b32d826ae..cc00fd09b 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -2.39)
-		(end -4.7 2.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 2.38)
 		(end 4.7 2.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -2.39)
-		(end -4.7 -2.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 2.38)
-		(end 4.7 -2.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,168 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -1.035)
 		(end -0.333333 -0.235)
@@ -331,42 +143,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -2.07)
 		(end 2.7 2.07)
@@ -385,6 +161,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -405,25 +221,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_KingTek_DSHP02TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6H-2101_W6.15mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6H-2101_W6.15mm_P1.27mm.kicad_mod
index 550a4e346..acc2c9c78 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6H-2101_W6.15mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6H-2101_W6.15mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.95 -2.22)
-		(end -3.95 2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.95 2.22)
 		(end 3.95 2.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 -2.22)
-		(end -3.95 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 2.22)
-		(end 3.95 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -142,114 +116,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.6 -0.885)
-		(end -1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.785)
-		(end -0.533333 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.685)
-		(end -0.533333 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.585)
-		(end -0.533333 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.485)
-		(end -0.533333 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.385)
-		(end 1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.385)
-		(end -1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.485)
-		(end -0.533333 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.585)
-		(end -0.533333 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.685)
-		(end -0.533333 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.785)
-		(end -0.533333 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end 1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.25 -1.905)
 		(end 2.25 -1.905)
@@ -277,42 +143,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.6 -0.885)
-		(end -1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.385)
-		(end 1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.385)
-		(end -1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.885)
-		(end 1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.25 -1.905)
 		(end 2.25 1.905)
@@ -331,6 +161,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end -0.533333 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end 1.6 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end -0.533333 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end 1.6 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.925 0 90)
 		(layer "F.Fab")
@@ -351,25 +221,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_Omron_A6H-2101_W6.15mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm.kicad_mod
index 1ded5d34c..cdfdee675 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -3.32)
-		(end -5.45 3.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 3.32)
 		(end 5.45 3.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -3.32)
-		(end -5.45 -3.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 3.32)
-		(end 5.45 -3.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,231 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -1.82)
-		(end -1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.72)
-		(end -0.5 -1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.62)
-		(end -0.5 -1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.52)
-		(end -0.5 -1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.42)
-		(end -0.5 -1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.32)
-		(end -0.5 -1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.22)
-		(end -0.5 -1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.12)
-		(end -0.5 -1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.02)
-		(end -0.5 -1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.92)
-		(end -0.5 -0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.82)
-		(end -0.5 -0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end -0.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end 1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.72)
-		(end -1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.82)
-		(end -0.5 0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.92)
-		(end -0.5 0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.02)
-		(end -0.5 1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.12)
-		(end -0.5 1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.22)
-		(end -0.5 1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.32)
-		(end -0.5 1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.42)
-		(end -0.5 1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.52)
-		(end -0.5 1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.62)
-		(end -0.5 1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.72)
-		(end -0.5 1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end 1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -1.82)
 		(end -0.5 -0.72)
@@ -394,42 +143,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -1.82)
-		(end -1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.72)
-		(end 1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.72)
-		(end -1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.82)
-		(end 1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -3.01)
 		(end 3.1 3.01)
@@ -448,6 +161,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end -0.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end 1.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end -0.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end 1.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -468,25 +221,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx02_Slide_Omron_A6S-210x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index cd56adea3..8cb14c57a 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -97,330 +97,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -3.175)
 		(end -0.603333 -1.905)
@@ -448,60 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -4.65)
 		(end 3.41 -3.34)
@@ -538,40 +160,74 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -4.9)
-		(end -4.7 4.9)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 4.9)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -4.9)
 		(end 4.7 4.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -4.9)
-		(end -4.7 -4.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 4.9)
-		(end 4.7 -4.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -601,384 +257,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -3.175)
 		(end -0.603333 -1.905)
@@ -1006,60 +284,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -4.59)
 		(end 3.35 4.59)
@@ -1078,6 +302,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -1098,35 +382,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index dc765356c..fbcea91f8 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -97,330 +97,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -3.175)
 		(end -0.603333 -1.905)
@@ -448,60 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -4.65)
 		(end 3.41 -3.34)
@@ -538,40 +160,74 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -4.9)
-		(end -5.78 4.9)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 4.9)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -4.9)
 		(end 5.78 4.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -4.9)
-		(end -5.78 -4.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 4.9)
-		(end 5.78 -4.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -601,384 +257,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -3.175)
 		(end -0.603333 -1.905)
@@ -1006,60 +284,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -4.59)
 		(end 3.35 4.59)
@@ -1078,6 +302,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -1098,35 +382,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W8.61mm_P2.54mm.kicad_mod
index c20344d37..441590599 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W8.61mm_P2.54mm.kicad_mod
@@ -97,330 +97,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.055)
-		(end -0.676667 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.935)
-		(end -0.676667 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.815)
-		(end -0.676667 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.695)
-		(end -0.676667 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.455)
-		(end -0.676667 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.335)
-		(end -0.676667 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.215)
-		(end -0.676667 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.095)
-		(end -0.676667 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.515)
-		(end -0.676667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.395)
-		(end -0.676667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.275)
-		(end -0.676667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.155)
-		(end -0.676667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.085)
-		(end -0.676667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.205)
-		(end -0.676667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.325)
-		(end -0.676667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.445)
-		(end -0.676667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.025)
-		(end -0.676667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.145)
-		(end -0.676667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.265)
-		(end -0.676667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.385)
-		(end -0.676667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.625)
-		(end -0.676667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.745)
-		(end -0.676667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.865)
-		(end -0.676667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.985)
-		(end -0.676667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -3.175)
 		(end -0.676667 -1.905)
@@ -448,60 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -4.96)
 		(end 4.95 -3.34)
@@ -538,40 +160,74 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -5.21)
-		(end -5.78 5.21)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 5.21)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -5.21)
 		(end 5.78 5.21)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -5.21)
-		(end -5.78 -5.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 5.21)
-		(end 5.78 -5.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -601,384 +257,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.075)
-		(end -0.676667 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.975)
-		(end -0.676667 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.875)
-		(end -0.676667 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.775)
-		(end -0.676667 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.675)
-		(end -0.676667 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.475)
-		(end -0.676667 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.375)
-		(end -0.676667 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.275)
-		(end -0.676667 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.175)
-		(end -0.676667 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.075)
-		(end -0.676667 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.535)
-		(end -0.676667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.435)
-		(end -0.676667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.335)
-		(end -0.676667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.235)
-		(end -0.676667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.135)
-		(end -0.676667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.065)
-		(end -0.676667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.165)
-		(end -0.676667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.265)
-		(end -0.676667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.365)
-		(end -0.676667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.465)
-		(end -0.676667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.005)
-		(end -0.676667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.105)
-		(end -0.676667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.205)
-		(end -0.676667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.305)
-		(end -0.676667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.405)
-		(end -0.676667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.605)
-		(end -0.676667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.705)
-		(end -0.676667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.805)
-		(end -0.676667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.905)
-		(end -0.676667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.005)
-		(end -0.676667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -3.175)
 		(end -0.676667 -1.905)
@@ -1006,60 +284,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -4.9)
 		(end 4.89 4.9)
@@ -1078,6 +302,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -1098,35 +382,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Copal_CVS-03xB_W5.9mm_P1mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Copal_CVS-03xB_W5.9mm_P1mm.kicad_mod
index d8dec39f9..83cb473b0 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Copal_CVS-03xB_W5.9mm_P1mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Copal_CVS-03xB_W5.9mm_P1mm.kicad_mod
@@ -52,40 +52,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.8 -2.66)
-		(end -3.8 2.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.8 2.66)
 		(end 3.8 2.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 -2.66)
-		(end -3.8 -2.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 2.66)
-		(end 3.8 -2.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -115,168 +89,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -1.25)
-		(end -1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.15)
-		(end -0.333333 -1.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.05)
-		(end -0.333333 -1.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.95)
-		(end -0.333333 -0.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.85)
-		(end -0.333333 -0.85)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.75)
-		(end 1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.25)
-		(end -1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.15)
-		(end -0.333333 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.05)
-		(end -0.333333 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.05)
-		(end -0.333333 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.15)
-		(end -0.333333 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.25)
-		(end 1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.75)
-		(end -1 1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.85)
-		(end -0.333333 0.85)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.95)
-		(end -0.333333 0.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.05)
-		(end -0.333333 1.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.15)
-		(end -0.333333 1.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.25)
-		(end 1 1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -1.25)
 		(end -0.333333 -0.75)
@@ -304,60 +116,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -1.25)
-		(end -1 -1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.75)
-		(end 1 -1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.25)
-		(end -1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.25)
-		(end 1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.75)
-		(end -1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.25)
-		(end 1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.35 -2)
 		(end 2.35 2)
@@ -376,6 +134,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -1.25)
+		(end -0.333333 -0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.25)
+		(end 1 -0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.25)
+		(end -0.333333 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.25)
+		(end 1 0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.75)
+		(end -0.333333 1.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.75)
+		(end 1 1.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.675 0 90)
 		(layer "F.Fab")
@@ -396,55 +214,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.95 -1)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.95 0)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.95 1)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 2.95 1)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.95 0)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 2.95 -1)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.15 -2)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.15 2)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.15 -2)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.15 2)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_Copal_CVS-03xB_W5.9mm_P1mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index 389d1462e..abad61a1a 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -3.12)
-		(end -4.2 3.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 3.12)
 		(end 4.2 3.12)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -3.12)
-		(end -4.2 -3.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 3.12)
-		(end 4.2 -3.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,249 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -1.67)
 		(end -0.333333 -0.87)
@@ -421,60 +152,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -2.805)
 		(end 2.7 2.805)
@@ -493,6 +170,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -513,35 +250,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TS_W7.62mm_P1.27mm.kicad_mod
index 5113dcaa6..4c9f3f99a 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -3.02)
-		(end -4.7 3.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 3.02)
 		(end 4.7 3.02)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -3.02)
-		(end -4.7 -3.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 3.02)
-		(end 4.7 -3.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,249 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -1.67)
 		(end -0.333333 -0.87)
@@ -421,60 +152,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -2.705)
 		(end 2.7 2.705)
@@ -493,6 +170,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -513,35 +250,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_KingTek_DSHP03TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Omron_A6S-310x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Omron_A6S-310x_W8.9mm_P2.54mm.kicad_mod
index c60025ce9..b1cf5e756 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Omron_A6S-310x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx03_Slide_Omron_A6S-310x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -4.59)
-		(end -5.45 4.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 4.59)
 		(end 5.45 4.59)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -4.59)
-		(end -5.45 -4.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 4.59)
-		(end 5.45 -4.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,348 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -3.09)
-		(end -1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.99)
-		(end -0.5 -2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.89)
-		(end -0.5 -2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.79)
-		(end -0.5 -2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.69)
-		(end -0.5 -2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.59)
-		(end -0.5 -2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.49)
-		(end -0.5 -2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.39)
-		(end -0.5 -2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.29)
-		(end -0.5 -2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.19)
-		(end -0.5 -2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.09)
-		(end -0.5 -2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end -0.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end 1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.55)
-		(end -1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.45)
-		(end -0.5 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.35)
-		(end -0.5 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -0.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end -0.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.35)
-		(end -0.5 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.45)
-		(end -0.5 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end 1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.99)
-		(end -1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.09)
-		(end -0.5 2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.19)
-		(end -0.5 2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.29)
-		(end -0.5 2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.39)
-		(end -0.5 2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.49)
-		(end -0.5 2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.59)
-		(end -0.5 2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.69)
-		(end -0.5 2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.79)
-		(end -0.5 2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.89)
-		(end -0.5 2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.99)
-		(end -0.5 2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end -0.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end 1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -3.09)
 		(end -0.5 -1.99)
@@ -520,60 +152,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -3.09)
-		(end -1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.99)
-		(end 1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.55)
-		(end -1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.55)
-		(end 1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.99)
-		(end -1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.09)
-		(end 1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -4.28)
 		(end 3.1 4.28)
@@ -592,6 +170,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end -0.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end 1.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end -0.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end 1.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end -0.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end 1.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -612,35 +250,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx03_Slide_Omron_A6S-310x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 299c1bf7f..a68755c41 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -106,438 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -4.445)
 		(end -0.603333 -3.175)
@@ -574,78 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -5.92)
 		(end 3.41 -4.61)
@@ -691,40 +187,94 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -6.17)
-		(end -4.7 6.17)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 6.17)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -6.17)
 		(end 4.7 6.17)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -6.17)
-		(end -4.7 -6.17)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 6.17)
-		(end 4.7 -6.17)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -754,510 +304,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -4.445)
 		(end -0.603333 -3.175)
@@ -1294,78 +340,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -5.86)
 		(end 3.35 5.86)
@@ -1384,6 +358,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -1404,45 +458,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 226987726..04f6202d7 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -106,438 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -4.445)
 		(end -0.603333 -3.175)
@@ -574,78 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -5.92)
 		(end 3.41 -4.61)
@@ -691,40 +187,94 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -6.17)
-		(end -5.78 6.17)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 6.17)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -6.17)
 		(end 5.78 6.17)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -6.17)
-		(end -5.78 -6.17)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 6.17)
-		(end 5.78 -6.17)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -754,510 +304,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -4.445)
 		(end -0.603333 -3.175)
@@ -1294,78 +340,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -5.86)
 		(end 3.35 5.86)
@@ -1384,6 +358,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -1404,45 +458,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W8.61mm_P2.54mm.kicad_mod
index 8c6f33435..03671fcf7 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W8.61mm_P2.54mm.kicad_mod
@@ -106,438 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.325)
-		(end -0.676667 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.205)
-		(end -0.676667 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.085)
-		(end -0.676667 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.965)
-		(end -0.676667 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.725)
-		(end -0.676667 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.605)
-		(end -0.676667 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.485)
-		(end -0.676667 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.365)
-		(end -0.676667 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.785)
-		(end -0.676667 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.665)
-		(end -0.676667 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.545)
-		(end -0.676667 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.425)
-		(end -0.676667 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.185)
-		(end -0.676667 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.065)
-		(end -0.676667 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.945)
-		(end -0.676667 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.825)
-		(end -0.676667 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.755)
-		(end -0.676667 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.875)
-		(end -0.676667 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.995)
-		(end -0.676667 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.115)
-		(end -0.676667 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.355)
-		(end -0.676667 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.475)
-		(end -0.676667 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.595)
-		(end -0.676667 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.715)
-		(end -0.676667 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.295)
-		(end -0.676667 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.415)
-		(end -0.676667 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.535)
-		(end -0.676667 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.655)
-		(end -0.676667 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.895)
-		(end -0.676667 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.015)
-		(end -0.676667 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.135)
-		(end -0.676667 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.255)
-		(end -0.676667 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -4.445)
 		(end -0.676667 -3.175)
@@ -574,78 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -6.23)
 		(end 4.95 -4.61)
@@ -691,40 +187,94 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -6.48)
-		(end -5.78 6.48)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 6.48)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -6.48)
 		(end 5.78 6.48)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -6.48)
-		(end -5.78 -6.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 6.48)
-		(end 5.78 -6.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -754,510 +304,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.345)
-		(end -0.676667 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.245)
-		(end -0.676667 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.145)
-		(end -0.676667 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.045)
-		(end -0.676667 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.945)
-		(end -0.676667 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.745)
-		(end -0.676667 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.645)
-		(end -0.676667 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.545)
-		(end -0.676667 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.445)
-		(end -0.676667 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.345)
-		(end -0.676667 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.805)
-		(end -0.676667 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.705)
-		(end -0.676667 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.605)
-		(end -0.676667 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.505)
-		(end -0.676667 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.405)
-		(end -0.676667 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.205)
-		(end -0.676667 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.105)
-		(end -0.676667 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.005)
-		(end -0.676667 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.905)
-		(end -0.676667 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.805)
-		(end -0.676667 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.735)
-		(end -0.676667 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.835)
-		(end -0.676667 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.935)
-		(end -0.676667 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.035)
-		(end -0.676667 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.135)
-		(end -0.676667 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.335)
-		(end -0.676667 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.435)
-		(end -0.676667 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.535)
-		(end -0.676667 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.635)
-		(end -0.676667 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.735)
-		(end -0.676667 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.275)
-		(end -0.676667 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.375)
-		(end -0.676667 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.475)
-		(end -0.676667 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.575)
-		(end -0.676667 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.675)
-		(end -0.676667 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.875)
-		(end -0.676667 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.975)
-		(end -0.676667 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.075)
-		(end -0.676667 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.175)
-		(end -0.676667 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.275)
-		(end -0.676667 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -4.445)
 		(end -0.676667 -3.175)
@@ -1294,78 +340,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -6.17)
 		(end 4.89 6.17)
@@ -1384,6 +358,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -1404,45 +458,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04A_W5.08mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04A_W5.08mm_P1.27mm_JPin.kicad_mod
index b74659a7b..0757d259d 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04A_W5.08mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04A_W5.08mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.59 -3.49)
-		(end -3.59 3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.59 3.49)
 		(end 3.59 3.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 -3.49)
-		(end -3.59 -3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 3.49)
-		(end 3.59 -3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,222 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -2.155)
 		(end -0.5 -1.655)
@@ -403,78 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -3.175)
 		(end 2.7 3.175)
@@ -493,6 +179,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -513,45 +279,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_Copal_CHS-04A_W5.08mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04B_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04B_W7.62mm_P1.27mm.kicad_mod
index 777af7202..c651b8504 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04B_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CHS-04B_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.86 -3.49)
-		(end -4.86 3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.86 3.49)
 		(end 4.86 3.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 -3.49)
-		(end -4.86 -3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 3.49)
-		(end 4.86 -3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,222 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -2.155)
 		(end -0.5 -1.655)
@@ -403,78 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -3.175)
 		(end 2.7 3.175)
@@ -493,6 +179,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -513,45 +279,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_Copal_CHS-04B_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CVS-04xB_W5.9mm_P1mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CVS-04xB_W5.9mm_P1mm.kicad_mod
index d5f95473a..78076e72c 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CVS-04xB_W5.9mm_P1mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Copal_CVS-04xB_W5.9mm_P1mm.kicad_mod
@@ -52,40 +52,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.8 -3.16)
-		(end -3.8 3.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.8 3.16)
 		(end 3.8 3.16)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 -3.16)
-		(end -3.8 -3.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 3.16)
-		(end 3.8 -3.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -115,222 +89,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -1.75)
-		(end -1 -1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.65)
-		(end -0.333333 -1.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.55)
-		(end -0.333333 -1.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.45)
-		(end -0.333333 -1.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.35)
-		(end -0.333333 -1.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.25)
-		(end 1 -1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.75)
-		(end -1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.65)
-		(end -0.333333 -0.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.55)
-		(end -0.333333 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.45)
-		(end -0.333333 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.35)
-		(end -0.333333 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.25)
-		(end 1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.25)
-		(end -1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.35)
-		(end -0.333333 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.45)
-		(end -0.333333 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.55)
-		(end -0.333333 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.65)
-		(end -0.333333 0.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.75)
-		(end 1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.25)
-		(end -1 1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.35)
-		(end -0.333333 1.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.45)
-		(end -0.333333 1.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.55)
-		(end -0.333333 1.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.65)
-		(end -0.333333 1.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.75)
-		(end 1 1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -1.75)
 		(end -0.333333 -1.25)
@@ -367,78 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -1.75)
-		(end -1 -1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.25)
-		(end 1 -1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.75)
-		(end -1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.25)
-		(end 1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.25)
-		(end -1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.75)
-		(end 1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.25)
-		(end -1 1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.75)
-		(end 1 1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.35 -2.5)
 		(end 2.35 2.5)
@@ -457,6 +143,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -1.75)
+		(end -0.333333 -1.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.75)
+		(end 1 -1.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.75)
+		(end -0.333333 -0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.75)
+		(end 1 -0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.25)
+		(end -0.333333 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.25)
+		(end 1 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.25)
+		(end -0.333333 1.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.25)
+		(end 1 1.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.675 0 90)
 		(layer "F.Fab")
@@ -477,65 +243,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.95 -1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.95 -0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.95 0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.95 1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.95 1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 2.95 0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.95 -0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.95 -1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -2.15 -2.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -2.15 2.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.15 -2.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.15 2.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_Copal_CVS-04xB_W5.9mm_P1mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index 380c6f07d..3f3866c7f 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -3.75)
-		(end -4.2 3.75)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 3.75)
 		(end 4.2 3.75)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -3.75)
-		(end -4.2 -3.75)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 3.75)
-		(end 4.2 -3.75)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,330 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -2.305)
 		(end -0.333333 -1.505)
@@ -511,78 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -3.44)
 		(end 2.7 3.44)
@@ -601,6 +179,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -621,45 +279,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TS_W7.62mm_P1.27mm.kicad_mod
index 2cf13675c..88620369e 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -3.66)
-		(end -4.7 3.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 3.66)
 		(end 4.7 3.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -3.66)
-		(end -4.7 -3.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 3.66)
-		(end 4.7 -3.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,330 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -2.305)
 		(end -0.333333 -1.505)
@@ -511,78 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -3.34)
 		(end 2.7 3.34)
@@ -601,6 +179,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -621,45 +279,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_KingTek_DSHP04TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6H-4101_W6.15mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6H-4101_W6.15mm_P1.27mm.kicad_mod
index 0a3e7c9f0..3c722617d 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6H-4101_W6.15mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6H-4101_W6.15mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.95 -3.49)
-		(end -3.95 3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.95 3.49)
 		(end 3.95 3.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 -3.49)
-		(end -3.95 -3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 3.49)
-		(end 3.95 -3.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -142,222 +116,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.6 -2.155)
-		(end -1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.055)
-		(end -0.533333 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.955)
-		(end -0.533333 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.855)
-		(end -0.533333 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.755)
-		(end -0.533333 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.655)
-		(end 1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.885)
-		(end -1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.785)
-		(end -0.533333 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.685)
-		(end -0.533333 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.585)
-		(end -0.533333 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.485)
-		(end -0.533333 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.385)
-		(end 1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.385)
-		(end -1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.485)
-		(end -0.533333 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.585)
-		(end -0.533333 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.685)
-		(end -0.533333 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.785)
-		(end -0.533333 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end 1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.655)
-		(end -1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.755)
-		(end -0.533333 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.855)
-		(end -0.533333 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.955)
-		(end -0.533333 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.055)
-		(end -0.533333 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end 1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.25 -3.175)
 		(end 2.25 -3.175)
@@ -403,78 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.6 -2.155)
-		(end -1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -1.655)
-		(end 1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.885)
-		(end -1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.385)
-		(end 1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.385)
-		(end -1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.885)
-		(end 1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 1.655)
-		(end -1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.155)
-		(end 1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.25 -3.175)
 		(end 2.25 3.175)
@@ -493,6 +179,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end -0.533333 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end 1.6 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end -0.533333 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end 1.6 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end -0.533333 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end 1.6 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end -0.533333 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end 1.6 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.925 0 90)
 		(layer "F.Fab")
@@ -513,45 +279,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_Omron_A6H-4101_W6.15mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6S-410x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6S-410x_W8.9mm_P2.54mm.kicad_mod
index db7281c7d..b41eb2ee2 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6S-410x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx04_Slide_Omron_A6S-410x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -5.86)
-		(end -5.45 5.86)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 5.86)
 		(end 5.45 5.86)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -5.86)
-		(end -5.45 -5.86)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 5.86)
-		(end 5.45 -5.86)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,465 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -4.36)
-		(end -1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.26)
-		(end -0.5 -4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.16)
-		(end -0.5 -4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.06)
-		(end -0.5 -4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.96)
-		(end -0.5 -3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.86)
-		(end -0.5 -3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.76)
-		(end -0.5 -3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.66)
-		(end -0.5 -3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.56)
-		(end -0.5 -3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.46)
-		(end -0.5 -3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.36)
-		(end -0.5 -3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end -0.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end 1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.82)
-		(end -1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.72)
-		(end -0.5 -1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.62)
-		(end -0.5 -1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.52)
-		(end -0.5 -1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.42)
-		(end -0.5 -1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.32)
-		(end -0.5 -1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.22)
-		(end -0.5 -1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.12)
-		(end -0.5 -1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.02)
-		(end -0.5 -1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.92)
-		(end -0.5 -0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.82)
-		(end -0.5 -0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end 1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.72)
-		(end -1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.82)
-		(end -0.5 0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.92)
-		(end -0.5 0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.02)
-		(end -0.5 1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.12)
-		(end -0.5 1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.22)
-		(end -0.5 1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.32)
-		(end -0.5 1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.42)
-		(end -0.5 1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.52)
-		(end -0.5 1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.62)
-		(end -0.5 1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.72)
-		(end -0.5 1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end -0.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end 1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.26)
-		(end -1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.36)
-		(end -0.5 3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.46)
-		(end -0.5 3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.56)
-		(end -0.5 3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.66)
-		(end -0.5 3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.76)
-		(end -0.5 3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.86)
-		(end -0.5 3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.96)
-		(end -0.5 3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.06)
-		(end -0.5 4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.16)
-		(end -0.5 4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.26)
-		(end -0.5 4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end -0.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end 1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -4.36)
 		(end -0.5 -3.26)
@@ -646,78 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -4.36)
-		(end -1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.26)
-		(end 1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.82)
-		(end -1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.72)
-		(end 1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.72)
-		(end -1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.82)
-		(end 1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.26)
-		(end -1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.36)
-		(end 1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -5.55)
 		(end 3.1 5.55)
@@ -736,6 +179,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end -0.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end 1.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end -0.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end 1.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end -0.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end 1.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end -0.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end 1.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -756,45 +279,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx04_Slide_Omron_A6S-410x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 8a78e98cf..579010686 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -115,546 +115,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -5.715)
 		(end -0.603333 -4.445)
@@ -700,96 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -7.19)
 		(end 3.41 -5.88)
@@ -844,40 +214,114 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -7.44)
-		(end -4.7 7.44)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 7.44)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -7.44)
 		(end 4.7 7.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -7.44)
-		(end -4.7 -7.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 7.44)
-		(end 4.7 -7.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -907,636 +351,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -5.715)
 		(end -0.603333 -4.445)
@@ -1582,96 +396,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -7.13)
 		(end 3.35 7.13)
@@ -1690,6 +414,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -1710,55 +534,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 752f75a02..55784f7d6 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -115,546 +115,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -5.715)
 		(end -0.603333 -4.445)
@@ -700,96 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -7.19)
 		(end 3.41 -5.88)
@@ -844,40 +214,114 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -7.44)
-		(end -5.78 7.44)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 7.44)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -7.44)
 		(end 5.78 7.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -7.44)
-		(end -5.78 -7.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 7.44)
-		(end 5.78 -7.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -907,636 +351,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -5.715)
 		(end -0.603333 -4.445)
@@ -1582,96 +396,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -7.13)
 		(end 3.35 7.13)
@@ -1690,6 +414,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -1710,55 +534,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W8.61mm_P2.54mm.kicad_mod
index b654824b9..4f6340d52 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W8.61mm_P2.54mm.kicad_mod
@@ -115,546 +115,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.595)
-		(end -0.676667 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.475)
-		(end -0.676667 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.355)
-		(end -0.676667 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.235)
-		(end -0.676667 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.995)
-		(end -0.676667 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.875)
-		(end -0.676667 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.755)
-		(end -0.676667 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.635)
-		(end -0.676667 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.055)
-		(end -0.676667 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.935)
-		(end -0.676667 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.815)
-		(end -0.676667 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.695)
-		(end -0.676667 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.455)
-		(end -0.676667 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.335)
-		(end -0.676667 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.215)
-		(end -0.676667 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.095)
-		(end -0.676667 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.515)
-		(end -0.676667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.395)
-		(end -0.676667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.275)
-		(end -0.676667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.155)
-		(end -0.676667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.085)
-		(end -0.676667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.205)
-		(end -0.676667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.325)
-		(end -0.676667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.445)
-		(end -0.676667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.025)
-		(end -0.676667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.145)
-		(end -0.676667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.265)
-		(end -0.676667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.385)
-		(end -0.676667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.625)
-		(end -0.676667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.745)
-		(end -0.676667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.865)
-		(end -0.676667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.985)
-		(end -0.676667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.565)
-		(end -0.676667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.685)
-		(end -0.676667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.805)
-		(end -0.676667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.925)
-		(end -0.676667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.165)
-		(end -0.676667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.285)
-		(end -0.676667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.405)
-		(end -0.676667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.525)
-		(end -0.676667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -5.715)
 		(end -0.676667 -4.445)
@@ -700,96 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -7.5)
 		(end 4.95 -5.88)
@@ -844,40 +214,114 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -7.75)
-		(end -5.78 7.75)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 7.75)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -7.75)
 		(end 5.78 7.75)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -7.75)
-		(end -5.78 -7.75)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 7.75)
-		(end 5.78 -7.75)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -907,636 +351,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.615)
-		(end -0.676667 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.515)
-		(end -0.676667 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.415)
-		(end -0.676667 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.315)
-		(end -0.676667 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.215)
-		(end -0.676667 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.015)
-		(end -0.676667 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.915)
-		(end -0.676667 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.815)
-		(end -0.676667 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.715)
-		(end -0.676667 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.615)
-		(end -0.676667 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.075)
-		(end -0.676667 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.975)
-		(end -0.676667 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.875)
-		(end -0.676667 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.775)
-		(end -0.676667 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.675)
-		(end -0.676667 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.475)
-		(end -0.676667 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.375)
-		(end -0.676667 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.275)
-		(end -0.676667 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.175)
-		(end -0.676667 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.075)
-		(end -0.676667 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.535)
-		(end -0.676667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.435)
-		(end -0.676667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.335)
-		(end -0.676667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.235)
-		(end -0.676667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.135)
-		(end -0.676667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.065)
-		(end -0.676667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.165)
-		(end -0.676667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.265)
-		(end -0.676667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.365)
-		(end -0.676667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.465)
-		(end -0.676667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.005)
-		(end -0.676667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.105)
-		(end -0.676667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.205)
-		(end -0.676667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.305)
-		(end -0.676667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.405)
-		(end -0.676667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.605)
-		(end -0.676667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.705)
-		(end -0.676667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.805)
-		(end -0.676667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.905)
-		(end -0.676667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.005)
-		(end -0.676667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.545)
-		(end -0.676667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.645)
-		(end -0.676667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.745)
-		(end -0.676667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.845)
-		(end -0.676667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.945)
-		(end -0.676667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.145)
-		(end -0.676667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.245)
-		(end -0.676667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.345)
-		(end -0.676667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.445)
-		(end -0.676667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.545)
-		(end -0.676667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -5.715)
 		(end -0.676667 -4.445)
@@ -1582,96 +396,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -7.44)
 		(end 4.89 7.44)
@@ -1690,6 +414,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -1710,55 +534,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index 23377b16f..d269ac292 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -4.39)
-		(end -4.2 4.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 4.39)
 		(end 4.2 4.39)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -4.39)
-		(end -4.2 -4.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 4.39)
-		(end 4.2 -4.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,420 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -2.94)
-		(end -1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.84)
-		(end -0.333333 -2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.74)
-		(end -0.333333 -2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.64)
-		(end -0.333333 -2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.54)
-		(end -0.333333 -2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.44)
-		(end -0.333333 -2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.34)
-		(end -0.333333 -2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.24)
-		(end -0.333333 -2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.14)
-		(end 1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.14)
-		(end -1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.24)
-		(end -0.333333 2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.34)
-		(end -0.333333 2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.44)
-		(end -0.333333 2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.54)
-		(end -0.333333 2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.64)
-		(end -0.333333 2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.74)
-		(end -0.333333 2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.84)
-		(end -0.333333 2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end -0.333333 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end 1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -2.94)
 		(end -0.333333 -2.14)
@@ -610,96 +170,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -2.94)
-		(end -1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.14)
-		(end 1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.14)
-		(end -1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.94)
-		(end 1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -4.075)
 		(end 2.7 4.075)
@@ -718,6 +188,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -2.94)
+		(end -0.333333 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end 1 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end -0.333333 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end 1 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -738,55 +308,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.625 2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 2.625 2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.625 -2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TS_W7.62mm_P1.27mm.kicad_mod
index 0f833d6f0..ea197cb97 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -4.29)
-		(end -4.7 4.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 4.29)
 		(end 4.7 4.29)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -4.29)
-		(end -4.7 -4.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 4.29)
-		(end 4.7 -4.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,420 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -2.94)
-		(end -1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.84)
-		(end -0.333333 -2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.74)
-		(end -0.333333 -2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.64)
-		(end -0.333333 -2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.54)
-		(end -0.333333 -2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.44)
-		(end -0.333333 -2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.34)
-		(end -0.333333 -2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.24)
-		(end -0.333333 -2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.14)
-		(end 1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.14)
-		(end -1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.24)
-		(end -0.333333 2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.34)
-		(end -0.333333 2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.44)
-		(end -0.333333 2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.54)
-		(end -0.333333 2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.64)
-		(end -0.333333 2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.74)
-		(end -0.333333 2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.84)
-		(end -0.333333 2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end -0.333333 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end 1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -2.94)
 		(end -0.333333 -2.14)
@@ -610,96 +170,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -2.94)
-		(end -1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.14)
-		(end 1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.14)
-		(end -1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.94)
-		(end 1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -3.975)
 		(end 2.7 3.975)
@@ -718,6 +188,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -2.94)
+		(end -0.333333 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end 1 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end -0.333333 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end 1 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -738,55 +308,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx05_Slide_KingTek_DSHP05TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_Omron_A6S-510x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_Omron_A6S-510x_W8.9mm_P2.54mm.kicad_mod
index e47e04b94..4bdaab161 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_Omron_A6S-510x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx05_Slide_Omron_A6S-510x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -7.13)
-		(end -5.45 7.13)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 7.13)
 		(end 5.45 7.13)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -7.13)
-		(end -5.45 -7.13)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 7.13)
-		(end 5.45 -7.13)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,582 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -5.63)
-		(end -1.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.53)
-		(end -0.5 -5.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.43)
-		(end -0.5 -5.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.33)
-		(end -0.5 -5.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.23)
-		(end -0.5 -5.23)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.13)
-		(end -0.5 -5.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.03)
-		(end -0.5 -5.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.93)
-		(end -0.5 -4.93)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.83)
-		(end -0.5 -4.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.73)
-		(end -0.5 -4.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.63)
-		(end -0.5 -4.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.53)
-		(end -0.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.53)
-		(end 1.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.09)
-		(end -1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.99)
-		(end -0.5 -2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.89)
-		(end -0.5 -2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.79)
-		(end -0.5 -2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.69)
-		(end -0.5 -2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.59)
-		(end -0.5 -2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.49)
-		(end -0.5 -2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.39)
-		(end -0.5 -2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.29)
-		(end -0.5 -2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.19)
-		(end -0.5 -2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.09)
-		(end -0.5 -2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end 1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.55)
-		(end -1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.45)
-		(end -0.5 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.35)
-		(end -0.5 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -0.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end -0.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.35)
-		(end -0.5 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.45)
-		(end -0.5 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end -0.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end 1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.99)
-		(end -1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.09)
-		(end -0.5 2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.19)
-		(end -0.5 2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.29)
-		(end -0.5 2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.39)
-		(end -0.5 2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.49)
-		(end -0.5 2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.59)
-		(end -0.5 2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.69)
-		(end -0.5 2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.79)
-		(end -0.5 2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.89)
-		(end -0.5 2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.99)
-		(end -0.5 2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end -0.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end 1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.53)
-		(end -1.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.63)
-		(end -0.5 4.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.73)
-		(end -0.5 4.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.83)
-		(end -0.5 4.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.93)
-		(end -0.5 4.93)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.03)
-		(end -0.5 5.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.13)
-		(end -0.5 5.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.23)
-		(end -0.5 5.23)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.33)
-		(end -0.5 5.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.43)
-		(end -0.5 5.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.53)
-		(end -0.5 5.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.63)
-		(end -0.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.63)
-		(end 1.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -5.63)
 		(end -0.5 -4.53)
@@ -772,96 +170,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -5.63)
-		(end -1.5 -5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.53)
-		(end 1.5 -5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.09)
-		(end -1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.99)
-		(end 1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.55)
-		(end -1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.55)
-		(end 1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.99)
-		(end -1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.09)
-		(end 1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.53)
-		(end -1.5 4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.63)
-		(end 1.5 4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -6.82)
 		(end 3.1 6.82)
@@ -880,6 +188,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -5.63)
+		(end -0.5 -4.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.63)
+		(end 1.5 -4.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end -0.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end 1.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end -0.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end 1.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end -0.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end 1.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.53)
+		(end -0.5 5.63)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.53)
+		(end 1.5 5.63)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -900,55 +308,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.45 5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.45 5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.45 -5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx05_Slide_Omron_A6S-510x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 035a8d60b..928fc2b97 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -124,654 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -6.985)
 		(end -0.603333 -5.715)
@@ -826,114 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -8.46)
 		(end 3.41 -7.15)
@@ -997,40 +241,134 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -8.72)
-		(end -4.7 8.72)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 8.72)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -8.72)
 		(end 4.7 8.72)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -8.72)
-		(end -4.7 -8.72)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 8.72)
-		(end 4.7 -8.72)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1060,762 +398,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -6.985)
 		(end -0.603333 -5.715)
@@ -1870,114 +452,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -8.4)
 		(end 3.35 8.4)
@@ -1996,6 +470,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2016,65 +610,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 77cb40a24..d0ee265f4 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -124,654 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -6.985)
 		(end -0.603333 -5.715)
@@ -826,114 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -8.46)
 		(end 3.41 -7.15)
@@ -997,40 +241,134 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -8.72)
-		(end -5.78 8.72)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 8.72)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -8.72)
 		(end 5.78 8.72)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -8.72)
-		(end -5.78 -8.72)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 8.72)
-		(end 5.78 -8.72)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1060,762 +398,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -6.985)
 		(end -0.603333 -5.715)
@@ -1870,114 +452,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -8.4)
 		(end 3.35 8.4)
@@ -1996,6 +470,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2016,65 +610,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W8.61mm_P2.54mm.kicad_mod
index 37643f397..9034176d8 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W8.61mm_P2.54mm.kicad_mod
@@ -124,654 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.865)
-		(end -0.676667 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.745)
-		(end -0.676667 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.625)
-		(end -0.676667 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.505)
-		(end -0.676667 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.265)
-		(end -0.676667 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.145)
-		(end -0.676667 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.025)
-		(end -0.676667 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.905)
-		(end -0.676667 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.325)
-		(end -0.676667 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.205)
-		(end -0.676667 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.085)
-		(end -0.676667 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.965)
-		(end -0.676667 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.725)
-		(end -0.676667 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.605)
-		(end -0.676667 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.485)
-		(end -0.676667 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.365)
-		(end -0.676667 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.785)
-		(end -0.676667 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.665)
-		(end -0.676667 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.545)
-		(end -0.676667 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.425)
-		(end -0.676667 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.185)
-		(end -0.676667 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.065)
-		(end -0.676667 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.945)
-		(end -0.676667 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.825)
-		(end -0.676667 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.755)
-		(end -0.676667 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.875)
-		(end -0.676667 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.995)
-		(end -0.676667 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.115)
-		(end -0.676667 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.355)
-		(end -0.676667 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.475)
-		(end -0.676667 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.595)
-		(end -0.676667 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.715)
-		(end -0.676667 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.295)
-		(end -0.676667 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.415)
-		(end -0.676667 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.535)
-		(end -0.676667 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.655)
-		(end -0.676667 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.895)
-		(end -0.676667 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.015)
-		(end -0.676667 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.135)
-		(end -0.676667 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.255)
-		(end -0.676667 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.835)
-		(end -0.676667 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.955)
-		(end -0.676667 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.075)
-		(end -0.676667 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.195)
-		(end -0.676667 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.435)
-		(end -0.676667 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.555)
-		(end -0.676667 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.675)
-		(end -0.676667 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.795)
-		(end -0.676667 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -6.985)
 		(end -0.676667 -5.715)
@@ -826,114 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -8.77)
 		(end 4.95 -7.15)
@@ -997,40 +241,134 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -9.02)
-		(end -5.78 9.02)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 9.02)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -9.02)
 		(end 5.78 9.02)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -9.02)
-		(end -5.78 -9.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 9.02)
-		(end 5.78 -9.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1060,762 +398,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.885)
-		(end -0.676667 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.785)
-		(end -0.676667 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.685)
-		(end -0.676667 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.585)
-		(end -0.676667 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.485)
-		(end -0.676667 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.285)
-		(end -0.676667 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.185)
-		(end -0.676667 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.085)
-		(end -0.676667 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.985)
-		(end -0.676667 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.885)
-		(end -0.676667 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.345)
-		(end -0.676667 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.245)
-		(end -0.676667 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.145)
-		(end -0.676667 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.045)
-		(end -0.676667 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.945)
-		(end -0.676667 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.745)
-		(end -0.676667 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.645)
-		(end -0.676667 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.545)
-		(end -0.676667 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.445)
-		(end -0.676667 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.345)
-		(end -0.676667 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.805)
-		(end -0.676667 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.705)
-		(end -0.676667 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.605)
-		(end -0.676667 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.505)
-		(end -0.676667 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.405)
-		(end -0.676667 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.205)
-		(end -0.676667 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.105)
-		(end -0.676667 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.005)
-		(end -0.676667 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.905)
-		(end -0.676667 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.805)
-		(end -0.676667 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.735)
-		(end -0.676667 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.835)
-		(end -0.676667 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.935)
-		(end -0.676667 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.035)
-		(end -0.676667 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.135)
-		(end -0.676667 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.335)
-		(end -0.676667 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.435)
-		(end -0.676667 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.535)
-		(end -0.676667 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.635)
-		(end -0.676667 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.735)
-		(end -0.676667 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.275)
-		(end -0.676667 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.375)
-		(end -0.676667 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.475)
-		(end -0.676667 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.575)
-		(end -0.676667 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.675)
-		(end -0.676667 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.875)
-		(end -0.676667 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.975)
-		(end -0.676667 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.075)
-		(end -0.676667 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.175)
-		(end -0.676667 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.275)
-		(end -0.676667 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.815)
-		(end -0.676667 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.915)
-		(end -0.676667 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.015)
-		(end -0.676667 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.115)
-		(end -0.676667 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.215)
-		(end -0.676667 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.415)
-		(end -0.676667 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.515)
-		(end -0.676667 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.615)
-		(end -0.676667 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.715)
-		(end -0.676667 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.815)
-		(end -0.676667 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -6.985)
 		(end -0.676667 -5.715)
@@ -1870,114 +452,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -8.71)
 		(end 4.89 8.71)
@@ -1996,6 +470,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -2016,65 +610,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06A_W5.08mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06A_W5.08mm_P1.27mm_JPin.kicad_mod
index de1685c64..480e18972 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06A_W5.08mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06A_W5.08mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.59 -4.76)
-		(end -3.59 4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.59 4.76)
 		(end 3.59 4.76)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 -4.76)
-		(end -3.59 -4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 4.76)
-		(end 3.59 -4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,348 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -3.425)
-		(end -1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.325)
-		(end -0.5 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.225)
-		(end -0.5 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.125)
-		(end -0.5 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.025)
-		(end -0.5 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.925)
-		(end 1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end -0.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.925)
-		(end -1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.025)
-		(end -0.5 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.125)
-		(end -0.5 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.225)
-		(end -0.5 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.325)
-		(end -0.5 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end -0.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end 1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -3.425)
 		(end -0.5 -2.925)
@@ -547,114 +179,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -3.425)
-		(end -1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.925)
-		(end 1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.925)
-		(end -1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.425)
-		(end 1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -4.445)
 		(end 2.7 4.445)
@@ -673,6 +197,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end -0.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end 1.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end -0.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end 1.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -693,65 +337,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.54 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.54 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.54 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.54 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_Copal_CHS-06A_W5.08mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06B_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06B_W7.62mm_P1.27mm.kicad_mod
index 40a724c74..e505a3c4c 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06B_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Copal_CHS-06B_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.86 -4.76)
-		(end -4.86 4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.86 4.76)
 		(end 4.86 4.76)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 -4.76)
-		(end -4.86 -4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 4.76)
-		(end 4.86 -4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,348 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -3.425)
-		(end -1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.325)
-		(end -0.5 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.225)
-		(end -0.5 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.125)
-		(end -0.5 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.025)
-		(end -0.5 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.925)
-		(end 1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end -0.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.925)
-		(end -1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.025)
-		(end -0.5 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.125)
-		(end -0.5 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.225)
-		(end -0.5 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.325)
-		(end -0.5 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end -0.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end 1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -3.425)
 		(end -0.5 -2.925)
@@ -547,114 +179,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -3.425)
-		(end -1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.925)
-		(end 1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.925)
-		(end -1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.425)
-		(end 1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -4.445)
 		(end 2.7 4.445)
@@ -673,6 +197,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end -0.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end 1.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end -0.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end 1.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -693,65 +337,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_Copal_CHS-06B_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index e64703a35..9b48bee29 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -5.02)
-		(end -4.2 5.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 5.02)
 		(end 4.2 5.02)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -5.02)
-		(end -4.2 -5.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 5.02)
-		(end 4.2 -5.02)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,510 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -3.575)
-		(end -1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.475)
-		(end -0.333333 -3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.375)
-		(end -0.333333 -3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.275)
-		(end -0.333333 -3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.175)
-		(end -0.333333 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.075)
-		(end -0.333333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.975)
-		(end -0.333333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.875)
-		(end -0.333333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.775)
-		(end 1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end -0.333333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.775)
-		(end -1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.875)
-		(end -0.333333 2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.975)
-		(end -0.333333 2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.075)
-		(end -0.333333 3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.175)
-		(end -0.333333 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.275)
-		(end -0.333333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.375)
-		(end -0.333333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.475)
-		(end -0.333333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end -0.333333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end 1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -3.575)
 		(end -0.333333 -2.775)
@@ -709,114 +179,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -3.575)
-		(end -1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.775)
-		(end 1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.775)
-		(end -1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.575)
-		(end 1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -4.71)
 		(end 2.7 4.71)
@@ -835,6 +197,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -3.575)
+		(end -0.333333 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end 1 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end -0.333333 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end 1 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -855,65 +337,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.625 3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 2.625 3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.625 -3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TS_W7.62mm_P1.27mm.kicad_mod
index 61f0a5181..208b0ada4 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -4.92)
-		(end -4.7 4.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 4.92)
 		(end 4.7 4.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -4.92)
-		(end -4.7 -4.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 4.92)
-		(end 4.7 -4.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,510 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -3.575)
-		(end -1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.475)
-		(end -0.333333 -3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.375)
-		(end -0.333333 -3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.275)
-		(end -0.333333 -3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.175)
-		(end -0.333333 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.075)
-		(end -0.333333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.975)
-		(end -0.333333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.875)
-		(end -0.333333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.775)
-		(end 1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end -0.333333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.775)
-		(end -1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.875)
-		(end -0.333333 2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.975)
-		(end -0.333333 2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.075)
-		(end -0.333333 3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.175)
-		(end -0.333333 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.275)
-		(end -0.333333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.375)
-		(end -0.333333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.475)
-		(end -0.333333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end -0.333333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end 1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -3.575)
 		(end -0.333333 -2.775)
@@ -709,114 +179,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -3.575)
-		(end -1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.775)
-		(end 1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.775)
-		(end -1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.575)
-		(end 1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -4.61)
 		(end 2.7 4.61)
@@ -835,6 +197,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -3.575)
+		(end -0.333333 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end 1 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end -0.333333 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end 1 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -855,65 +337,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_KingTek_DSHP06TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6H-6101_W6.15mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6H-6101_W6.15mm_P1.27mm.kicad_mod
index dc2a39750..49c4cc925 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6H-6101_W6.15mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6H-6101_W6.15mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.95 -4.76)
-		(end -3.95 4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.95 4.76)
 		(end 3.95 4.76)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 -4.76)
-		(end -3.95 -4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 4.76)
-		(end 3.95 -4.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -142,348 +116,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.6 -3.425)
-		(end -1.6 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.325)
-		(end -0.533333 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.225)
-		(end -0.533333 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.125)
-		(end -0.533333 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.025)
-		(end -0.533333 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.925)
-		(end 1.6 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.155)
-		(end -1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.055)
-		(end -0.533333 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.955)
-		(end -0.533333 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.855)
-		(end -0.533333 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.755)
-		(end -0.533333 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.655)
-		(end 1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.885)
-		(end -1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.785)
-		(end -0.533333 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.685)
-		(end -0.533333 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.585)
-		(end -0.533333 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.485)
-		(end -0.533333 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.385)
-		(end 1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.385)
-		(end -1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.485)
-		(end -0.533333 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.585)
-		(end -0.533333 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.685)
-		(end -0.533333 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.785)
-		(end -0.533333 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end 1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.655)
-		(end -1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.755)
-		(end -0.533333 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.855)
-		(end -0.533333 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.955)
-		(end -0.533333 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.055)
-		(end -0.533333 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end -0.533333 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end 1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.925)
-		(end -1.6 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.025)
-		(end -0.533333 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.125)
-		(end -0.533333 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.225)
-		(end -0.533333 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.325)
-		(end -0.533333 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.425)
-		(end -0.533333 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.425)
-		(end 1.6 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.25 -4.445)
 		(end 2.25 -4.445)
@@ -547,114 +179,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.6 -3.425)
-		(end -1.6 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -2.925)
-		(end 1.6 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -2.155)
-		(end -1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -1.655)
-		(end 1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.885)
-		(end -1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.385)
-		(end 1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.385)
-		(end -1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.885)
-		(end 1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 1.655)
-		(end -1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.155)
-		(end 1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.925)
-		(end -1.6 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 3.425)
-		(end 1.6 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.25 -4.445)
 		(end 2.25 4.445)
@@ -673,6 +197,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.6 -3.425)
+		(end -0.533333 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -3.425)
+		(end 1.6 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end -0.533333 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end 1.6 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end -0.533333 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end 1.6 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end -0.533333 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end 1.6 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end -0.533333 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end 1.6 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 2.925)
+		(end -0.533333 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 2.925)
+		(end 1.6 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.925 0 90)
 		(layer "F.Fab")
@@ -693,65 +337,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.075 -3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.075 3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.075 3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.075 -3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_Omron_A6H-6101_W6.15mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6S-610x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6S-610x_W8.9mm_P2.54mm.kicad_mod
index 0a93b52fc..fd48b847e 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6S-610x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx06_Slide_Omron_A6S-610x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -8.4)
-		(end -5.45 8.4)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 8.4)
 		(end 5.45 8.4)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -8.4)
-		(end -5.45 -8.4)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 8.4)
-		(end 5.45 -8.4)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,699 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -6.9)
-		(end -1.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.8)
-		(end -0.5 -6.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.7)
-		(end -0.5 -6.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.6)
-		(end -0.5 -6.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.5)
-		(end -0.5 -6.5)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.4)
-		(end -0.5 -6.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.3)
-		(end -0.5 -6.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.2)
-		(end -0.5 -6.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.1)
-		(end -0.5 -6.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6)
-		(end -0.5 -6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.9)
-		(end -0.5 -5.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.8)
-		(end -0.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.8)
-		(end 1.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.36)
-		(end -1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.26)
-		(end -0.5 -4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.16)
-		(end -0.5 -4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.06)
-		(end -0.5 -4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.96)
-		(end -0.5 -3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.86)
-		(end -0.5 -3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.76)
-		(end -0.5 -3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.66)
-		(end -0.5 -3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.56)
-		(end -0.5 -3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.46)
-		(end -0.5 -3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.36)
-		(end -0.5 -3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end 1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.82)
-		(end -1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.72)
-		(end -0.5 -1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.62)
-		(end -0.5 -1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.52)
-		(end -0.5 -1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.42)
-		(end -0.5 -1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.32)
-		(end -0.5 -1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.22)
-		(end -0.5 -1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.12)
-		(end -0.5 -1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.02)
-		(end -0.5 -1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.92)
-		(end -0.5 -0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.82)
-		(end -0.5 -0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end -0.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end 1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.72)
-		(end -1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.82)
-		(end -0.5 0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.92)
-		(end -0.5 0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.02)
-		(end -0.5 1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.12)
-		(end -0.5 1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.22)
-		(end -0.5 1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.32)
-		(end -0.5 1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.42)
-		(end -0.5 1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.52)
-		(end -0.5 1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.62)
-		(end -0.5 1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.72)
-		(end -0.5 1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end -0.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end 1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.26)
-		(end -1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.36)
-		(end -0.5 3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.46)
-		(end -0.5 3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.56)
-		(end -0.5 3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.66)
-		(end -0.5 3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.76)
-		(end -0.5 3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.86)
-		(end -0.5 3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.96)
-		(end -0.5 3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.06)
-		(end -0.5 4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.16)
-		(end -0.5 4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.26)
-		(end -0.5 4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end -0.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end 1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.8)
-		(end -1.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.9)
-		(end -0.5 5.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6)
-		(end -0.5 6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.1)
-		(end -0.5 6.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.2)
-		(end -0.5 6.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.3)
-		(end -0.5 6.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.4)
-		(end -0.5 6.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.5)
-		(end -0.5 6.5)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.6)
-		(end -0.5 6.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.7)
-		(end -0.5 6.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.8)
-		(end -0.5 6.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.9)
-		(end -0.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.9)
-		(end 1.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -6.9)
 		(end -0.5 -5.8)
@@ -898,114 +179,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -6.9)
-		(end -1.5 -6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.8)
-		(end 1.5 -6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.36)
-		(end -1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.26)
-		(end 1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.82)
-		(end -1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.72)
-		(end 1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.72)
-		(end -1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.82)
-		(end 1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.26)
-		(end -1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.36)
-		(end 1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.8)
-		(end -1.5 5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 6.9)
-		(end 1.5 5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -8.09)
 		(end 3.1 8.09)
@@ -1024,6 +197,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -6.9)
+		(end -0.5 -5.8)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -6.9)
+		(end 1.5 -5.8)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end -0.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end 1.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end -0.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end 1.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end -0.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end 1.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end -0.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end 1.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.8)
+		(end -0.5 6.9)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.8)
+		(end 1.5 6.9)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -1044,65 +337,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.45 6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.45 6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.45 -6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx06_Slide_Omron_A6S-610x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 7723bd12c..abd20ec07 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -133,762 +133,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.135)
-		(end -0.603333 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.015)
-		(end -0.603333 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.895)
-		(end -0.603333 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.775)
-		(end -0.603333 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.535)
-		(end -0.603333 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.415)
-		(end -0.603333 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.295)
-		(end -0.603333 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.175)
-		(end -0.603333 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.105)
-		(end -0.603333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.225)
-		(end -0.603333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.345)
-		(end -0.603333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.465)
-		(end -0.603333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.705)
-		(end -0.603333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.825)
-		(end -0.603333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.945)
-		(end -0.603333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.065)
-		(end -0.603333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -8.255)
 		(end -0.603333 -6.985)
@@ -952,132 +196,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -9.73)
 		(end 3.41 -8.42)
@@ -1150,40 +268,154 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -9.98)
-		(end -4.7 9.98)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 9.98)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -9.98)
 		(end 4.7 9.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -9.98)
-		(end -4.7 -9.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 9.98)
-		(end 4.7 -9.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1213,888 +445,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.155)
-		(end -0.603333 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.055)
-		(end -0.603333 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.955)
-		(end -0.603333 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.855)
-		(end -0.603333 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.755)
-		(end -0.603333 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.555)
-		(end -0.603333 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.455)
-		(end -0.603333 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.355)
-		(end -0.603333 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.255)
-		(end -0.603333 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.155)
-		(end -0.603333 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.085)
-		(end -0.603333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.185)
-		(end -0.603333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.285)
-		(end -0.603333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.385)
-		(end -0.603333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.485)
-		(end -0.603333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.685)
-		(end -0.603333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.785)
-		(end -0.603333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.885)
-		(end -0.603333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.985)
-		(end -0.603333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.085)
-		(end -0.603333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -8.255)
 		(end -0.603333 -6.985)
@@ -2158,132 +508,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -9.67)
 		(end 3.35 9.67)
@@ -2302,6 +526,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2322,75 +686,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.365 7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.365 7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.365 -7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index e2ac9dfff..a52b8c30a 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -133,762 +133,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.135)
-		(end -0.603333 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.015)
-		(end -0.603333 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.895)
-		(end -0.603333 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.775)
-		(end -0.603333 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.535)
-		(end -0.603333 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.415)
-		(end -0.603333 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.295)
-		(end -0.603333 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.175)
-		(end -0.603333 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.105)
-		(end -0.603333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.225)
-		(end -0.603333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.345)
-		(end -0.603333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.465)
-		(end -0.603333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.705)
-		(end -0.603333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.825)
-		(end -0.603333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.945)
-		(end -0.603333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.065)
-		(end -0.603333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -8.255)
 		(end -0.603333 -6.985)
@@ -952,132 +196,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -9.73)
 		(end 3.41 -8.42)
@@ -1150,40 +268,154 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -9.98)
-		(end -5.78 9.98)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 9.98)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -9.98)
 		(end 5.78 9.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -9.98)
-		(end -5.78 -9.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 9.98)
-		(end 5.78 -9.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1213,888 +445,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.155)
-		(end -0.603333 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.055)
-		(end -0.603333 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.955)
-		(end -0.603333 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.855)
-		(end -0.603333 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.755)
-		(end -0.603333 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.555)
-		(end -0.603333 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.455)
-		(end -0.603333 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.355)
-		(end -0.603333 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.255)
-		(end -0.603333 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.155)
-		(end -0.603333 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.085)
-		(end -0.603333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.185)
-		(end -0.603333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.285)
-		(end -0.603333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.385)
-		(end -0.603333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.485)
-		(end -0.603333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.685)
-		(end -0.603333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.785)
-		(end -0.603333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.885)
-		(end -0.603333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.985)
-		(end -0.603333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.085)
-		(end -0.603333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -8.255)
 		(end -0.603333 -6.985)
@@ -2158,132 +508,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -9.67)
 		(end 3.35 9.67)
@@ -2302,6 +526,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2322,75 +686,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W8.61mm_P2.54mm.kicad_mod
index 920db0ebd..6d36a39ae 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W8.61mm_P2.54mm.kicad_mod
@@ -133,762 +133,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.135)
-		(end -0.676667 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.015)
-		(end -0.676667 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.895)
-		(end -0.676667 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.775)
-		(end -0.676667 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.655)
-		(end -0.676667 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.535)
-		(end -0.676667 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.415)
-		(end -0.676667 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.295)
-		(end -0.676667 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.175)
-		(end -0.676667 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.055)
-		(end -0.676667 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.595)
-		(end -0.676667 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.475)
-		(end -0.676667 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.355)
-		(end -0.676667 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.235)
-		(end -0.676667 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.995)
-		(end -0.676667 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.875)
-		(end -0.676667 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.755)
-		(end -0.676667 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.635)
-		(end -0.676667 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.055)
-		(end -0.676667 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.935)
-		(end -0.676667 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.815)
-		(end -0.676667 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.695)
-		(end -0.676667 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.455)
-		(end -0.676667 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.335)
-		(end -0.676667 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.215)
-		(end -0.676667 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.095)
-		(end -0.676667 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.515)
-		(end -0.676667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.395)
-		(end -0.676667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.275)
-		(end -0.676667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.155)
-		(end -0.676667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.085)
-		(end -0.676667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.205)
-		(end -0.676667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.325)
-		(end -0.676667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.445)
-		(end -0.676667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.025)
-		(end -0.676667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.145)
-		(end -0.676667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.265)
-		(end -0.676667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.385)
-		(end -0.676667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.625)
-		(end -0.676667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.745)
-		(end -0.676667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.865)
-		(end -0.676667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.985)
-		(end -0.676667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.565)
-		(end -0.676667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.685)
-		(end -0.676667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.805)
-		(end -0.676667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.925)
-		(end -0.676667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.165)
-		(end -0.676667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.285)
-		(end -0.676667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.405)
-		(end -0.676667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.525)
-		(end -0.676667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.105)
-		(end -0.676667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.225)
-		(end -0.676667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.345)
-		(end -0.676667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.465)
-		(end -0.676667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.585)
-		(end -0.676667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.705)
-		(end -0.676667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.825)
-		(end -0.676667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.945)
-		(end -0.676667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.065)
-		(end -0.676667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.185)
-		(end -0.676667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -8.255)
 		(end -0.676667 -6.985)
@@ -952,132 +196,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -10.04)
 		(end 4.95 -8.42)
@@ -1150,40 +268,154 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -10.29)
-		(end -5.78 10.29)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end -0.676667 -6.985)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 10.29)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end 2.03 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end -0.676667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end 2.03 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -10.29)
 		(end 5.78 10.29)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -10.29)
-		(end -5.78 -10.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 10.29)
-		(end 5.78 -10.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1213,888 +445,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.155)
-		(end -0.676667 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.055)
-		(end -0.676667 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.955)
-		(end -0.676667 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.855)
-		(end -0.676667 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.755)
-		(end -0.676667 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.655)
-		(end -0.676667 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.555)
-		(end -0.676667 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.455)
-		(end -0.676667 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.355)
-		(end -0.676667 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.255)
-		(end -0.676667 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.155)
-		(end -0.676667 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.055)
-		(end -0.676667 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.615)
-		(end -0.676667 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.515)
-		(end -0.676667 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.415)
-		(end -0.676667 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.315)
-		(end -0.676667 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.215)
-		(end -0.676667 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.015)
-		(end -0.676667 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.915)
-		(end -0.676667 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.815)
-		(end -0.676667 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.715)
-		(end -0.676667 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.615)
-		(end -0.676667 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.075)
-		(end -0.676667 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.975)
-		(end -0.676667 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.875)
-		(end -0.676667 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.775)
-		(end -0.676667 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.675)
-		(end -0.676667 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.475)
-		(end -0.676667 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.375)
-		(end -0.676667 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.275)
-		(end -0.676667 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.175)
-		(end -0.676667 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.075)
-		(end -0.676667 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.535)
-		(end -0.676667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.435)
-		(end -0.676667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.335)
-		(end -0.676667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.235)
-		(end -0.676667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.135)
-		(end -0.676667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.065)
-		(end -0.676667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.165)
-		(end -0.676667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.265)
-		(end -0.676667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.365)
-		(end -0.676667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.465)
-		(end -0.676667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.005)
-		(end -0.676667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.105)
-		(end -0.676667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.205)
-		(end -0.676667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.305)
-		(end -0.676667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.405)
-		(end -0.676667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.605)
-		(end -0.676667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.705)
-		(end -0.676667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.805)
-		(end -0.676667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.905)
-		(end -0.676667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.005)
-		(end -0.676667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.545)
-		(end -0.676667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.645)
-		(end -0.676667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.745)
-		(end -0.676667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.845)
-		(end -0.676667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.945)
-		(end -0.676667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.145)
-		(end -0.676667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.245)
-		(end -0.676667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.345)
-		(end -0.676667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.445)
-		(end -0.676667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.545)
-		(end -0.676667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.085)
-		(end -0.676667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.185)
-		(end -0.676667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.285)
-		(end -0.676667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.385)
-		(end -0.676667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.485)
-		(end -0.676667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.585)
-		(end -0.676667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.685)
-		(end -0.676667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.785)
-		(end -0.676667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.885)
-		(end -0.676667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.985)
-		(end -0.676667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.085)
-		(end -0.676667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.185)
-		(end -0.676667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -8.255)
 		(end -0.676667 -6.985)
@@ -2158,132 +508,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -9.98)
 		(end 4.89 9.98)
@@ -2302,6 +526,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end -0.676667 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end 2.03 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end -0.676667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end 2.03 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -2322,75 +686,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index d1f7bbc51..a26f33918 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -5.66)
-		(end -4.2 5.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 5.66)
 		(end 4.2 5.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -5.66)
-		(end -4.2 -5.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 5.66)
-		(end 4.2 -5.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,600 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -4.21)
-		(end -1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.11)
-		(end -0.333333 -4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.01)
-		(end -0.333333 -4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.91)
-		(end -0.333333 -3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.81)
-		(end -0.333333 -3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.71)
-		(end -0.333333 -3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.61)
-		(end -0.333333 -3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.51)
-		(end -0.333333 -3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.41)
-		(end 1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.94)
-		(end -1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.84)
-		(end -0.333333 -2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.74)
-		(end -0.333333 -2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.64)
-		(end -0.333333 -2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.54)
-		(end -0.333333 -2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.44)
-		(end -0.333333 -2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.34)
-		(end -0.333333 -2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.24)
-		(end -0.333333 -2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.14)
-		(end 1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end -0.333333 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.14)
-		(end -1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.24)
-		(end -0.333333 2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.34)
-		(end -0.333333 2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.44)
-		(end -0.333333 2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.54)
-		(end -0.333333 2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.64)
-		(end -0.333333 2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.74)
-		(end -0.333333 2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.84)
-		(end -0.333333 2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end -0.333333 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end 1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.41)
-		(end -1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.51)
-		(end -0.333333 3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.61)
-		(end -0.333333 3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.71)
-		(end -0.333333 3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.81)
-		(end -0.333333 3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.91)
-		(end -0.333333 3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.01)
-		(end -0.333333 4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.11)
-		(end -0.333333 4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end -0.333333 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end 1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -4.21)
 		(end -0.333333 -3.41)
@@ -808,132 +188,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -4.21)
-		(end -1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.41)
-		(end 1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.94)
-		(end -1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.14)
-		(end 1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.14)
-		(end -1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.94)
-		(end 1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.41)
-		(end -1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.21)
-		(end 1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -5.345)
 		(end 2.7 5.345)
@@ -952,6 +206,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -4.21)
+		(end -0.333333 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.21)
+		(end 1 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end -0.333333 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end 1 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end -0.333333 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end 1 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end -0.333333 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end 1 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -972,75 +366,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.625 2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.625 3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 2.625 3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.625 2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.625 -2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.625 -3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TS_W7.62mm_P1.27mm.kicad_mod
index c8cbed109..8a41f3f7b 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -5.56)
-		(end -4.7 5.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 5.56)
 		(end 4.7 5.56)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -5.56)
-		(end -4.7 -5.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 5.56)
-		(end 4.7 -5.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,600 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -4.21)
-		(end -1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.11)
-		(end -0.333333 -4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.01)
-		(end -0.333333 -4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.91)
-		(end -0.333333 -3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.81)
-		(end -0.333333 -3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.71)
-		(end -0.333333 -3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.61)
-		(end -0.333333 -3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.51)
-		(end -0.333333 -3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.41)
-		(end 1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.94)
-		(end -1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.84)
-		(end -0.333333 -2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.74)
-		(end -0.333333 -2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.64)
-		(end -0.333333 -2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.54)
-		(end -0.333333 -2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.44)
-		(end -0.333333 -2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.34)
-		(end -0.333333 -2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.24)
-		(end -0.333333 -2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.14)
-		(end 1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end -0.333333 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.14)
-		(end -1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.24)
-		(end -0.333333 2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.34)
-		(end -0.333333 2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.44)
-		(end -0.333333 2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.54)
-		(end -0.333333 2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.64)
-		(end -0.333333 2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.74)
-		(end -0.333333 2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.84)
-		(end -0.333333 2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end -0.333333 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end 1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.41)
-		(end -1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.51)
-		(end -0.333333 3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.61)
-		(end -0.333333 3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.71)
-		(end -0.333333 3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.81)
-		(end -0.333333 3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.91)
-		(end -0.333333 3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.01)
-		(end -0.333333 4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.11)
-		(end -0.333333 4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end -0.333333 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end 1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -4.21)
 		(end -0.333333 -3.41)
@@ -808,132 +188,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -4.21)
-		(end -1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.41)
-		(end 1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.94)
-		(end -1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.14)
-		(end 1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.14)
-		(end -1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.94)
-		(end 1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.41)
-		(end -1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.21)
-		(end 1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -5.245)
 		(end 2.7 5.245)
@@ -952,6 +206,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -4.21)
+		(end -0.333333 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.21)
+		(end 1 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end -0.333333 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end 1 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end -0.333333 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end 1 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end -0.333333 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end 1 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -972,75 +366,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx07_Slide_KingTek_DSHP07TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_Omron_A6S-710x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_Omron_A6S-710x_W8.9mm_P2.54mm.kicad_mod
index 962ae6f84..90dc87349 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_Omron_A6S-710x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx07_Slide_Omron_A6S-710x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -9.67)
-		(end -5.45 9.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 9.67)
 		(end 5.45 9.67)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -9.67)
-		(end -5.45 -9.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 9.67)
-		(end 5.45 -9.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,816 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -8.17)
-		(end -1.5 -7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.07)
-		(end -0.5 -8.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.97)
-		(end -0.5 -7.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.87)
-		(end -0.5 -7.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.77)
-		(end -0.5 -7.77)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.67)
-		(end -0.5 -7.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.57)
-		(end -0.5 -7.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.47)
-		(end -0.5 -7.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.37)
-		(end -0.5 -7.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.27)
-		(end -0.5 -7.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.17)
-		(end -0.5 -7.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.07)
-		(end -0.5 -7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.07)
-		(end 1.5 -7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.63)
-		(end -1.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.53)
-		(end -0.5 -5.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.43)
-		(end -0.5 -5.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.33)
-		(end -0.5 -5.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.23)
-		(end -0.5 -5.23)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.13)
-		(end -0.5 -5.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.03)
-		(end -0.5 -5.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.93)
-		(end -0.5 -4.93)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.83)
-		(end -0.5 -4.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.73)
-		(end -0.5 -4.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.63)
-		(end -0.5 -4.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.53)
-		(end 1.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.09)
-		(end -1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.99)
-		(end -0.5 -2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.89)
-		(end -0.5 -2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.79)
-		(end -0.5 -2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.69)
-		(end -0.5 -2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.59)
-		(end -0.5 -2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.49)
-		(end -0.5 -2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.39)
-		(end -0.5 -2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.29)
-		(end -0.5 -2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.19)
-		(end -0.5 -2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.09)
-		(end -0.5 -2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end -0.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end 1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.55)
-		(end -1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.45)
-		(end -0.5 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.35)
-		(end -0.5 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -0.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end -0.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.35)
-		(end -0.5 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.45)
-		(end -0.5 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end -0.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end 1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.99)
-		(end -1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.09)
-		(end -0.5 2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.19)
-		(end -0.5 2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.29)
-		(end -0.5 2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.39)
-		(end -0.5 2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.49)
-		(end -0.5 2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.59)
-		(end -0.5 2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.69)
-		(end -0.5 2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.79)
-		(end -0.5 2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.89)
-		(end -0.5 2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.99)
-		(end -0.5 2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end -0.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end 1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.53)
-		(end -1.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.63)
-		(end -0.5 4.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.73)
-		(end -0.5 4.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.83)
-		(end -0.5 4.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.93)
-		(end -0.5 4.93)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.03)
-		(end -0.5 5.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.13)
-		(end -0.5 5.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.23)
-		(end -0.5 5.23)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.33)
-		(end -0.5 5.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.43)
-		(end -0.5 5.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.53)
-		(end -0.5 5.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.63)
-		(end -0.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.63)
-		(end 1.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.07)
-		(end -1.5 8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.17)
-		(end -0.5 7.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.27)
-		(end -0.5 7.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.37)
-		(end -0.5 7.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.47)
-		(end -0.5 7.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.57)
-		(end -0.5 7.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.67)
-		(end -0.5 7.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.77)
-		(end -0.5 7.77)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.87)
-		(end -0.5 7.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.97)
-		(end -0.5 7.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.07)
-		(end -0.5 8.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.17)
-		(end -0.5 8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.17)
-		(end 1.5 8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -8.17)
 		(end -0.5 -7.07)
@@ -1024,132 +188,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -8.17)
-		(end -1.5 -8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -7.07)
-		(end 1.5 -8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.63)
-		(end -1.5 -5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.53)
-		(end 1.5 -5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.09)
-		(end -1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.99)
-		(end 1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.55)
-		(end -1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.55)
-		(end 1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.99)
-		(end -1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.09)
-		(end 1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.53)
-		(end -1.5 4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.63)
-		(end 1.5 4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 7.07)
-		(end -1.5 7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 8.17)
-		(end 1.5 7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -9.36)
 		(end 3.1 9.36)
@@ -1168,6 +206,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -8.17)
+		(end -0.5 -7.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -8.17)
+		(end 1.5 -7.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.63)
+		(end -0.5 -4.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.63)
+		(end 1.5 -4.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end -0.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end 1.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end -0.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end 1.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end -0.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end 1.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.53)
+		(end -0.5 5.63)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.53)
+		(end 1.5 5.63)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 7.07)
+		(end -0.5 8.17)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 7.07)
+		(end 1.5 8.17)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -1188,75 +366,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.45 5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.45 7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.45 7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.45 5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.45 -5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.45 -7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx07_Slide_Omron_A6S-710x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 041d83ed3..acace48aa 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -142,870 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.405)
-		(end -0.603333 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.285)
-		(end -0.603333 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.165)
-		(end -0.603333 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.045)
-		(end -0.603333 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.805)
-		(end -0.603333 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.685)
-		(end -0.603333 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.565)
-		(end -0.603333 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.445)
-		(end -0.603333 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.375)
-		(end -0.603333 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.495)
-		(end -0.603333 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.615)
-		(end -0.603333 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.735)
-		(end -0.603333 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.975)
-		(end -0.603333 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.095)
-		(end -0.603333 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.215)
-		(end -0.603333 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.335)
-		(end -0.603333 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -9.525)
 		(end -0.603333 -8.255)
@@ -1078,150 +214,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -11)
 		(end 3.41 -9.69)
@@ -1303,40 +295,174 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -11.26)
-		(end -4.7 11.26)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 11.26)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -11.26)
 		(end 4.7 11.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -11.26)
-		(end -4.7 -11.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 11.26)
-		(end 4.7 -11.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1366,1014 +492,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.425)
-		(end -0.603333 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.325)
-		(end -0.603333 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.225)
-		(end -0.603333 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.125)
-		(end -0.603333 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.025)
-		(end -0.603333 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.825)
-		(end -0.603333 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.725)
-		(end -0.603333 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.625)
-		(end -0.603333 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.525)
-		(end -0.603333 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.425)
-		(end -0.603333 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.355)
-		(end -0.603333 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.455)
-		(end -0.603333 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.555)
-		(end -0.603333 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.655)
-		(end -0.603333 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.755)
-		(end -0.603333 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.955)
-		(end -0.603333 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.055)
-		(end -0.603333 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.155)
-		(end -0.603333 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.255)
-		(end -0.603333 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.355)
-		(end -0.603333 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -9.525)
 		(end -0.603333 -8.255)
@@ -2446,150 +564,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -10.94)
 		(end 3.35 10.94)
@@ -2608,6 +582,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2628,85 +762,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.365 8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.365 8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.365 -8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 5c0747f93..3a80103f1 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -142,870 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.405)
-		(end -0.603333 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.285)
-		(end -0.603333 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.165)
-		(end -0.603333 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.045)
-		(end -0.603333 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.805)
-		(end -0.603333 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.685)
-		(end -0.603333 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.565)
-		(end -0.603333 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.445)
-		(end -0.603333 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.375)
-		(end -0.603333 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.495)
-		(end -0.603333 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.615)
-		(end -0.603333 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.735)
-		(end -0.603333 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.975)
-		(end -0.603333 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.095)
-		(end -0.603333 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.215)
-		(end -0.603333 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.335)
-		(end -0.603333 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -9.525)
 		(end -0.603333 -8.255)
@@ -1078,150 +214,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -11)
 		(end 3.41 -9.69)
@@ -1303,40 +295,174 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -11.26)
-		(end -5.78 11.26)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 11.26)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -11.26)
 		(end 5.78 11.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -11.26)
-		(end -5.78 -11.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 11.26)
-		(end 5.78 -11.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1366,1014 +492,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.425)
-		(end -0.603333 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.325)
-		(end -0.603333 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.225)
-		(end -0.603333 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.125)
-		(end -0.603333 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.025)
-		(end -0.603333 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.825)
-		(end -0.603333 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.725)
-		(end -0.603333 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.625)
-		(end -0.603333 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.525)
-		(end -0.603333 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.425)
-		(end -0.603333 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.355)
-		(end -0.603333 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.455)
-		(end -0.603333 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.555)
-		(end -0.603333 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.655)
-		(end -0.603333 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.755)
-		(end -0.603333 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.955)
-		(end -0.603333 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.055)
-		(end -0.603333 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.155)
-		(end -0.603333 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.255)
-		(end -0.603333 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.355)
-		(end -0.603333 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -9.525)
 		(end -0.603333 -8.255)
@@ -2446,150 +564,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -10.94)
 		(end 3.35 10.94)
@@ -2608,6 +582,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2628,85 +762,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W8.61mm_P2.54mm.kicad_mod
index f3dc7616e..96bdcdead 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W8.61mm_P2.54mm.kicad_mod
@@ -142,870 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.405)
-		(end -0.676667 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.285)
-		(end -0.676667 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.165)
-		(end -0.676667 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.045)
-		(end -0.676667 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.925)
-		(end -0.676667 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.805)
-		(end -0.676667 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.685)
-		(end -0.676667 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.565)
-		(end -0.676667 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.445)
-		(end -0.676667 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.325)
-		(end -0.676667 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.865)
-		(end -0.676667 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.745)
-		(end -0.676667 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.625)
-		(end -0.676667 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.505)
-		(end -0.676667 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.265)
-		(end -0.676667 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.145)
-		(end -0.676667 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.025)
-		(end -0.676667 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.905)
-		(end -0.676667 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.325)
-		(end -0.676667 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.205)
-		(end -0.676667 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.085)
-		(end -0.676667 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.965)
-		(end -0.676667 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.725)
-		(end -0.676667 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.605)
-		(end -0.676667 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.485)
-		(end -0.676667 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.365)
-		(end -0.676667 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.785)
-		(end -0.676667 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.665)
-		(end -0.676667 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.545)
-		(end -0.676667 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.425)
-		(end -0.676667 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.185)
-		(end -0.676667 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.065)
-		(end -0.676667 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.945)
-		(end -0.676667 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.825)
-		(end -0.676667 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.755)
-		(end -0.676667 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.875)
-		(end -0.676667 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.995)
-		(end -0.676667 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.115)
-		(end -0.676667 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.355)
-		(end -0.676667 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.475)
-		(end -0.676667 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.595)
-		(end -0.676667 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.715)
-		(end -0.676667 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.295)
-		(end -0.676667 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.415)
-		(end -0.676667 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.535)
-		(end -0.676667 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.655)
-		(end -0.676667 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.895)
-		(end -0.676667 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.015)
-		(end -0.676667 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.135)
-		(end -0.676667 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.255)
-		(end -0.676667 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.835)
-		(end -0.676667 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.955)
-		(end -0.676667 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.075)
-		(end -0.676667 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.195)
-		(end -0.676667 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.435)
-		(end -0.676667 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.555)
-		(end -0.676667 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.675)
-		(end -0.676667 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.795)
-		(end -0.676667 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.375)
-		(end -0.676667 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.495)
-		(end -0.676667 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.615)
-		(end -0.676667 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.735)
-		(end -0.676667 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.855)
-		(end -0.676667 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.975)
-		(end -0.676667 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.095)
-		(end -0.676667 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.215)
-		(end -0.676667 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.335)
-		(end -0.676667 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.455)
-		(end -0.676667 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -9.525)
 		(end -0.676667 -8.255)
@@ -1078,150 +214,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -11.31)
 		(end 4.95 -9.69)
@@ -1303,40 +295,174 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -11.56)
-		(end -5.78 11.56)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end -0.676667 -8.255)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 11.56)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end 2.03 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end -0.676667 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end 2.03 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -11.56)
 		(end 5.78 11.56)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -11.56)
-		(end -5.78 -11.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 11.56)
-		(end 5.78 -11.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1366,1014 +492,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.425)
-		(end -0.676667 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.325)
-		(end -0.676667 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.225)
-		(end -0.676667 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.125)
-		(end -0.676667 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.025)
-		(end -0.676667 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.925)
-		(end -0.676667 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.825)
-		(end -0.676667 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.725)
-		(end -0.676667 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.625)
-		(end -0.676667 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.525)
-		(end -0.676667 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.425)
-		(end -0.676667 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.325)
-		(end -0.676667 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.885)
-		(end -0.676667 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.785)
-		(end -0.676667 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.685)
-		(end -0.676667 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.585)
-		(end -0.676667 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.485)
-		(end -0.676667 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.285)
-		(end -0.676667 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.185)
-		(end -0.676667 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.085)
-		(end -0.676667 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.985)
-		(end -0.676667 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.885)
-		(end -0.676667 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.345)
-		(end -0.676667 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.245)
-		(end -0.676667 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.145)
-		(end -0.676667 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.045)
-		(end -0.676667 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.945)
-		(end -0.676667 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.745)
-		(end -0.676667 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.645)
-		(end -0.676667 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.545)
-		(end -0.676667 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.445)
-		(end -0.676667 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.345)
-		(end -0.676667 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.805)
-		(end -0.676667 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.705)
-		(end -0.676667 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.605)
-		(end -0.676667 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.505)
-		(end -0.676667 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.405)
-		(end -0.676667 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.205)
-		(end -0.676667 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.105)
-		(end -0.676667 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.005)
-		(end -0.676667 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.905)
-		(end -0.676667 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.805)
-		(end -0.676667 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.735)
-		(end -0.676667 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.835)
-		(end -0.676667 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.935)
-		(end -0.676667 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.035)
-		(end -0.676667 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.135)
-		(end -0.676667 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.335)
-		(end -0.676667 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.435)
-		(end -0.676667 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.535)
-		(end -0.676667 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.635)
-		(end -0.676667 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.735)
-		(end -0.676667 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.275)
-		(end -0.676667 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.375)
-		(end -0.676667 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.475)
-		(end -0.676667 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.575)
-		(end -0.676667 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.675)
-		(end -0.676667 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.875)
-		(end -0.676667 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.975)
-		(end -0.676667 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.075)
-		(end -0.676667 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.175)
-		(end -0.676667 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.275)
-		(end -0.676667 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.815)
-		(end -0.676667 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.915)
-		(end -0.676667 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.015)
-		(end -0.676667 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.115)
-		(end -0.676667 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.215)
-		(end -0.676667 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.415)
-		(end -0.676667 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.515)
-		(end -0.676667 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.615)
-		(end -0.676667 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.715)
-		(end -0.676667 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.815)
-		(end -0.676667 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.355)
-		(end -0.676667 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.455)
-		(end -0.676667 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.555)
-		(end -0.676667 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.655)
-		(end -0.676667 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.755)
-		(end -0.676667 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.855)
-		(end -0.676667 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.955)
-		(end -0.676667 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.055)
-		(end -0.676667 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.155)
-		(end -0.676667 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.255)
-		(end -0.676667 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.355)
-		(end -0.676667 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.455)
-		(end -0.676667 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -9.525)
 		(end -0.676667 -8.255)
@@ -2446,150 +564,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -11.25)
 		(end 4.89 11.25)
@@ -2608,6 +582,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end -0.676667 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end 2.03 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end -0.676667 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end 2.03 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -2628,85 +762,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08A_W5.08mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08A_W5.08mm_P1.27mm_JPin.kicad_mod
index 534377dd9..1f97a0504 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08A_W5.08mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08A_W5.08mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.59 -6.03)
-		(end -3.59 6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.59 6.03)
 		(end 3.59 6.03)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 -6.03)
-		(end -3.59 -6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 6.03)
-		(end 3.59 -6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,474 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -4.695)
-		(end -1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.595)
-		(end -0.5 -4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.495)
-		(end -0.5 -4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.395)
-		(end -0.5 -4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.295)
-		(end -0.5 -4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.195)
-		(end 1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.425)
-		(end -1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.325)
-		(end -0.5 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.225)
-		(end -0.5 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.125)
-		(end -0.5 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.025)
-		(end -0.5 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.925)
-		(end 1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end -0.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end -0.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.925)
-		(end -1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.025)
-		(end -0.5 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.125)
-		(end -0.5 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.225)
-		(end -0.5 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.325)
-		(end -0.5 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end -0.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end 1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.195)
-		(end -1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.295)
-		(end -0.5 4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.395)
-		(end -0.5 4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.495)
-		(end -0.5 4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.595)
-		(end -0.5 4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end -0.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end 1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -4.695)
 		(end -0.5 -4.195)
@@ -691,150 +197,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -4.695)
-		(end -1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.195)
-		(end 1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.425)
-		(end -1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.925)
-		(end 1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.925)
-		(end -1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.425)
-		(end 1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.195)
-		(end -1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.695)
-		(end 1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -5.715)
 		(end 2.7 5.715)
@@ -853,6 +215,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end -0.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end 1.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end -0.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end 1.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end -0.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end 1.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end -0.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end 1.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -873,85 +395,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.54 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.54 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.54 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -2.54 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.54 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.54 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 2.54 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 2.54 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_Copal_CHS-08A_W5.08mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08B_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08B_W7.62mm_P1.27mm.kicad_mod
index 1de6000eb..23b3d8c0d 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08B_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CHS-08B_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.86 -6.03)
-		(end -4.86 6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.86 6.03)
 		(end 4.86 6.03)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 -6.03)
-		(end -4.86 -6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 6.03)
-		(end 4.86 -6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,474 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -4.695)
-		(end -1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.595)
-		(end -0.5 -4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.495)
-		(end -0.5 -4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.395)
-		(end -0.5 -4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.295)
-		(end -0.5 -4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.195)
-		(end 1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.425)
-		(end -1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.325)
-		(end -0.5 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.225)
-		(end -0.5 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.125)
-		(end -0.5 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.025)
-		(end -0.5 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.925)
-		(end 1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end -0.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end -0.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.925)
-		(end -1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.025)
-		(end -0.5 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.125)
-		(end -0.5 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.225)
-		(end -0.5 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.325)
-		(end -0.5 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end -0.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end 1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.195)
-		(end -1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.295)
-		(end -0.5 4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.395)
-		(end -0.5 4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.495)
-		(end -0.5 4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.595)
-		(end -0.5 4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end -0.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end 1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -4.695)
 		(end -0.5 -4.195)
@@ -691,150 +197,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -4.695)
-		(end -1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.195)
-		(end 1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.425)
-		(end -1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.925)
-		(end 1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.925)
-		(end -1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.425)
-		(end 1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.195)
-		(end -1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.695)
-		(end 1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -5.715)
 		(end 2.7 5.715)
@@ -853,6 +215,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end -0.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end 1.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end -0.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end 1.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end -0.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end 1.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end -0.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end 1.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -873,85 +395,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_Copal_CHS-08B_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CVS-08xB_W5.9mm_P1mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CVS-08xB_W5.9mm_P1mm.kicad_mod
index 198de589b..22a6d2a77 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CVS-08xB_W5.9mm_P1mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Copal_CVS-08xB_W5.9mm_P1mm.kicad_mod
@@ -52,40 +52,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.8 -5.16)
-		(end -3.8 5.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.8 5.16)
 		(end 3.8 5.16)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 -5.16)
-		(end -3.8 -5.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.8 5.16)
-		(end 3.8 -5.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -115,474 +89,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -3.75)
-		(end -1 -3.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.65)
-		(end -0.333333 -3.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.55)
-		(end -0.333333 -3.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.45)
-		(end -0.333333 -3.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.35)
-		(end -0.333333 -3.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.25)
-		(end 1 -3.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.75)
-		(end -1 -2.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.65)
-		(end -0.333333 -2.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.55)
-		(end -0.333333 -2.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.45)
-		(end -0.333333 -2.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.35)
-		(end -0.333333 -2.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.25)
-		(end 1 -2.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.75)
-		(end -1 -1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.65)
-		(end -0.333333 -1.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.55)
-		(end -0.333333 -1.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.45)
-		(end -0.333333 -1.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.35)
-		(end -0.333333 -1.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.25)
-		(end 1 -1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.75)
-		(end -1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.65)
-		(end -0.333333 -0.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.55)
-		(end -0.333333 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.45)
-		(end -0.333333 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.35)
-		(end -0.333333 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.25)
-		(end 1 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.25)
-		(end -1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.35)
-		(end -0.333333 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.45)
-		(end -0.333333 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.55)
-		(end -0.333333 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.65)
-		(end -0.333333 0.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.75)
-		(end -0.333333 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.75)
-		(end 1 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.25)
-		(end -1 1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.35)
-		(end -0.333333 1.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.45)
-		(end -0.333333 1.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.55)
-		(end -0.333333 1.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.65)
-		(end -0.333333 1.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.75)
-		(end -0.333333 1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.75)
-		(end 1 1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.25)
-		(end -1 2.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.35)
-		(end -0.333333 2.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.45)
-		(end -0.333333 2.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.55)
-		(end -0.333333 2.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.65)
-		(end -0.333333 2.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.75)
-		(end -0.333333 2.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.75)
-		(end 1 2.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.25)
-		(end -1 3.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.35)
-		(end -0.333333 3.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.45)
-		(end -0.333333 3.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.55)
-		(end -0.333333 3.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.65)
-		(end -0.333333 3.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.75)
-		(end -0.333333 3.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.75)
-		(end 1 3.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -3.75)
 		(end -0.333333 -3.25)
@@ -655,150 +161,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -3.75)
-		(end -1 -3.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.25)
-		(end 1 -3.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.75)
-		(end -1 -2.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.25)
-		(end 1 -2.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.75)
-		(end -1 -1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.25)
-		(end 1 -1.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.75)
-		(end -1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.25)
-		(end 1 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.25)
-		(end -1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.75)
-		(end 1 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.25)
-		(end -1 1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.75)
-		(end 1 1.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.25)
-		(end -1 2.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.75)
-		(end 1 2.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.25)
-		(end -1 3.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.75)
-		(end 1 3.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.35 -4.5)
 		(end 2.35 4.5)
@@ -817,6 +179,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -3.75)
+		(end -0.333333 -3.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.75)
+		(end 1 -3.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.75)
+		(end -0.333333 -2.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.75)
+		(end 1 -2.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.75)
+		(end -0.333333 -1.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.75)
+		(end 1 -1.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.75)
+		(end -0.333333 -0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.75)
+		(end 1 -0.25)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.25)
+		(end -0.333333 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.25)
+		(end 1 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.25)
+		(end -0.333333 1.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.25)
+		(end 1 1.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.25)
+		(end -0.333333 2.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.25)
+		(end 1 2.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.25)
+		(end -0.333333 3.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.25)
+		(end 1 3.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.675 0 90)
 		(layer "F.Fab")
@@ -837,105 +359,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.95 -3.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.95 -2.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.95 -1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.95 -0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.95 0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.95 1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.95 2.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -2.95 3.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.95 3.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.95 2.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.95 1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.95 0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.95 -0.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.95 -1.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 2.95 -2.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 2.95 -3.5)
 		(size 1.2 0.5)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -2.15 -4.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -2.15 4.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 2.15 -4.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 2.15 4.5)
 		(size 0.7 0.7)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_Copal_CVS-08xB_W5.9mm_P1mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index 07e3a0b4d..9e232b499 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -6.29)
-		(end -4.2 6.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 6.29)
 		(end 4.2 6.29)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -6.29)
-		(end -4.2 -6.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 6.29)
-		(end 4.2 -6.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,690 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -4.845)
-		(end -1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.745)
-		(end -0.333333 -4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.645)
-		(end -0.333333 -4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.545)
-		(end -0.333333 -4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.445)
-		(end -0.333333 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.345)
-		(end -0.333333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.245)
-		(end -0.333333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.145)
-		(end -0.333333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.045)
-		(end 1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.575)
-		(end -1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.475)
-		(end -0.333333 -3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.375)
-		(end -0.333333 -3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.275)
-		(end -0.333333 -3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.175)
-		(end -0.333333 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.075)
-		(end -0.333333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.975)
-		(end -0.333333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.875)
-		(end -0.333333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.775)
-		(end 1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end -0.333333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end -0.333333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.775)
-		(end -1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.875)
-		(end -0.333333 2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.975)
-		(end -0.333333 2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.075)
-		(end -0.333333 3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.175)
-		(end -0.333333 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.275)
-		(end -0.333333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.375)
-		(end -0.333333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.475)
-		(end -0.333333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end -0.333333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end 1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.045)
-		(end -1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.145)
-		(end -0.333333 4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.245)
-		(end -0.333333 4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.345)
-		(end -0.333333 4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.445)
-		(end -0.333333 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.545)
-		(end -0.333333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.645)
-		(end -0.333333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.745)
-		(end -0.333333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end -0.333333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end 1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -4.845)
 		(end -0.333333 -4.045)
@@ -907,150 +197,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -4.845)
-		(end -1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.045)
-		(end 1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.575)
-		(end -1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.775)
-		(end 1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.775)
-		(end -1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.575)
-		(end 1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.045)
-		(end -1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.845)
-		(end 1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -5.98)
 		(end 2.7 5.98)
@@ -1069,6 +215,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -4.845)
+		(end -0.333333 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.845)
+		(end 1 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end -0.333333 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end 1 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end -0.333333 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end 1 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end -0.333333 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end 1 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -1089,85 +395,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.625 3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -2.625 4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 2.625 4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.625 3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 2.625 -3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 2.625 -4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TS_W7.62mm_P1.27mm.kicad_mod
index b570cc34e..37415bca9 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -6.2)
-		(end -4.7 6.19)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 6.19)
 		(end 4.7 6.19)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -6.2)
-		(end -4.7 -6.2)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 6.19)
-		(end 4.7 -6.2)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,690 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -4.845)
-		(end -1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.745)
-		(end -0.333333 -4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.645)
-		(end -0.333333 -4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.545)
-		(end -0.333333 -4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.445)
-		(end -0.333333 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.345)
-		(end -0.333333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.245)
-		(end -0.333333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.145)
-		(end -0.333333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.045)
-		(end 1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.575)
-		(end -1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.475)
-		(end -0.333333 -3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.375)
-		(end -0.333333 -3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.275)
-		(end -0.333333 -3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.175)
-		(end -0.333333 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.075)
-		(end -0.333333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.975)
-		(end -0.333333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.875)
-		(end -0.333333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.775)
-		(end 1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end -0.333333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end -0.333333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.775)
-		(end -1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.875)
-		(end -0.333333 2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.975)
-		(end -0.333333 2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.075)
-		(end -0.333333 3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.175)
-		(end -0.333333 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.275)
-		(end -0.333333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.375)
-		(end -0.333333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.475)
-		(end -0.333333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end -0.333333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end 1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.045)
-		(end -1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.145)
-		(end -0.333333 4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.245)
-		(end -0.333333 4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.345)
-		(end -0.333333 4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.445)
-		(end -0.333333 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.545)
-		(end -0.333333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.645)
-		(end -0.333333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.745)
-		(end -0.333333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end -0.333333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end 1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -4.845)
 		(end -0.333333 -4.045)
@@ -907,150 +197,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -4.845)
-		(end -1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.045)
-		(end 1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.575)
-		(end -1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.775)
-		(end 1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.775)
-		(end -1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.575)
-		(end 1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.045)
-		(end -1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.845)
-		(end 1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -5.88)
 		(end 2.7 5.88)
@@ -1069,6 +215,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -4.845)
+		(end -0.333333 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.845)
+		(end 1 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end -0.333333 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end 1 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end -0.333333 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end 1 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end -0.333333 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end 1 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -1089,85 +395,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_KingTek_DSHP08TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6H-8101_W6.15mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6H-8101_W6.15mm_P1.27mm.kicad_mod
index ee52cf425..c270e3ebe 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6H-8101_W6.15mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6H-8101_W6.15mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.95 -6.03)
-		(end -3.95 6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.95 6.03)
 		(end 3.95 6.03)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 -6.03)
-		(end -3.95 -6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 6.03)
-		(end 3.95 -6.03)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -142,474 +116,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.6 -4.695)
-		(end -1.6 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.595)
-		(end -0.533333 -4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.495)
-		(end -0.533333 -4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.395)
-		(end -0.533333 -4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.295)
-		(end -0.533333 -4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.195)
-		(end 1.6 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.425)
-		(end -1.6 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.325)
-		(end -0.533333 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.225)
-		(end -0.533333 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.125)
-		(end -0.533333 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.025)
-		(end -0.533333 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.925)
-		(end 1.6 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.155)
-		(end -1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.055)
-		(end -0.533333 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.955)
-		(end -0.533333 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.855)
-		(end -0.533333 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.755)
-		(end -0.533333 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.655)
-		(end 1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.885)
-		(end -1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.785)
-		(end -0.533333 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.685)
-		(end -0.533333 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.585)
-		(end -0.533333 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.485)
-		(end -0.533333 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.385)
-		(end 1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.385)
-		(end -1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.485)
-		(end -0.533333 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.585)
-		(end -0.533333 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.685)
-		(end -0.533333 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.785)
-		(end -0.533333 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end -0.533333 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end 1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.655)
-		(end -1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.755)
-		(end -0.533333 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.855)
-		(end -0.533333 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.955)
-		(end -0.533333 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.055)
-		(end -0.533333 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end -0.533333 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end 1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.925)
-		(end -1.6 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.025)
-		(end -0.533333 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.125)
-		(end -0.533333 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.225)
-		(end -0.533333 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.325)
-		(end -0.533333 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.425)
-		(end -0.533333 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.425)
-		(end 1.6 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.195)
-		(end -1.6 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.295)
-		(end -0.533333 4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.395)
-		(end -0.533333 4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.495)
-		(end -0.533333 4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.595)
-		(end -0.533333 4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.695)
-		(end -0.533333 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.695)
-		(end 1.6 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.25 -5.715)
 		(end 2.25 -5.715)
@@ -691,150 +197,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.6 -4.695)
-		(end -1.6 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -4.195)
-		(end 1.6 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -3.425)
-		(end -1.6 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -2.925)
-		(end 1.6 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -2.155)
-		(end -1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -1.655)
-		(end 1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.885)
-		(end -1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.385)
-		(end 1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.385)
-		(end -1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.885)
-		(end 1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 1.655)
-		(end -1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.155)
-		(end 1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.925)
-		(end -1.6 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 3.425)
-		(end 1.6 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 4.195)
-		(end -1.6 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 4.695)
-		(end 1.6 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.25 -5.715)
 		(end 2.25 5.715)
@@ -853,6 +215,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.6 -4.695)
+		(end -0.533333 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -4.695)
+		(end 1.6 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -3.425)
+		(end -0.533333 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -3.425)
+		(end 1.6 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end -0.533333 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end 1.6 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end -0.533333 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end 1.6 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end -0.533333 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end 1.6 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end -0.533333 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end 1.6 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 2.925)
+		(end -0.533333 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 2.925)
+		(end 1.6 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 4.195)
+		(end -0.533333 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 4.195)
+		(end 1.6 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.925 0 90)
 		(layer "F.Fab")
@@ -873,85 +395,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.075 -4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.075 -3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.075 3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.075 4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.075 4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.075 3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.075 -3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.075 -4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_Omron_A6H-8101_W6.15mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6S-810x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6S-810x_W8.9mm_P2.54mm.kicad_mod
index 19d7caa36..183bed9a7 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6S-810x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx08_Slide_Omron_A6S-810x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -10.94)
-		(end -5.45 10.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 10.94)
 		(end 5.45 10.94)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -10.94)
-		(end -5.45 -10.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 10.94)
-		(end 5.45 -10.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,924 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -9.44)
-		(end -1.5 -8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.34)
-		(end -0.5 -9.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.24)
-		(end -0.5 -9.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.14)
-		(end -0.5 -9.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.04)
-		(end -0.5 -9.04)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.94)
-		(end -0.5 -8.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.84)
-		(end -0.5 -8.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.74)
-		(end -0.5 -8.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.64)
-		(end -0.5 -8.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.54)
-		(end -0.5 -8.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.44)
-		(end -0.5 -8.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.34)
-		(end -0.5 -8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.34)
-		(end 1.5 -8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.9)
-		(end -1.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.8)
-		(end -0.5 -6.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.7)
-		(end -0.5 -6.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.6)
-		(end -0.5 -6.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.5)
-		(end -0.5 -6.5)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.4)
-		(end -0.5 -6.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.3)
-		(end -0.5 -6.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.2)
-		(end -0.5 -6.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.1)
-		(end -0.5 -6.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6)
-		(end -0.5 -6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.9)
-		(end -0.5 -5.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.8)
-		(end 1.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.36)
-		(end -1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.26)
-		(end -0.5 -4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.16)
-		(end -0.5 -4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.06)
-		(end -0.5 -4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.96)
-		(end -0.5 -3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.86)
-		(end -0.5 -3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.76)
-		(end -0.5 -3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.66)
-		(end -0.5 -3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.56)
-		(end -0.5 -3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.46)
-		(end -0.5 -3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.36)
-		(end -0.5 -3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end -0.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end 1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.82)
-		(end -1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.72)
-		(end -0.5 -1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.62)
-		(end -0.5 -1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.52)
-		(end -0.5 -1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.42)
-		(end -0.5 -1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.32)
-		(end -0.5 -1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.22)
-		(end -0.5 -1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.12)
-		(end -0.5 -1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.02)
-		(end -0.5 -1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.92)
-		(end -0.5 -0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.82)
-		(end -0.5 -0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end -0.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end 1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.72)
-		(end -1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.82)
-		(end -0.5 0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.92)
-		(end -0.5 0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.02)
-		(end -0.5 1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.12)
-		(end -0.5 1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.22)
-		(end -0.5 1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.32)
-		(end -0.5 1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.42)
-		(end -0.5 1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.52)
-		(end -0.5 1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.62)
-		(end -0.5 1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.72)
-		(end -0.5 1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end -0.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end 1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.26)
-		(end -1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.36)
-		(end -0.5 3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.46)
-		(end -0.5 3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.56)
-		(end -0.5 3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.66)
-		(end -0.5 3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.76)
-		(end -0.5 3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.86)
-		(end -0.5 3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.96)
-		(end -0.5 3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.06)
-		(end -0.5 4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.16)
-		(end -0.5 4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.26)
-		(end -0.5 4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end -0.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end 1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.8)
-		(end -1.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.9)
-		(end -0.5 5.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6)
-		(end -0.5 6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.1)
-		(end -0.5 6.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.2)
-		(end -0.5 6.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.3)
-		(end -0.5 6.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.4)
-		(end -0.5 6.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.5)
-		(end -0.5 6.5)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.6)
-		(end -0.5 6.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.7)
-		(end -0.5 6.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.8)
-		(end -0.5 6.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.9)
-		(end -0.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.9)
-		(end 1.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.34)
-		(end -1.5 9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.44)
-		(end -0.5 8.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.54)
-		(end -0.5 8.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.64)
-		(end -0.5 8.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.74)
-		(end -0.5 8.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.84)
-		(end -0.5 8.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.94)
-		(end -0.5 8.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.04)
-		(end -0.5 9.04)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.14)
-		(end -0.5 9.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.24)
-		(end -0.5 9.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.34)
-		(end -0.5 9.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.44)
-		(end 1.5 9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -9.44)
 		(end -0.5 -8.34)
@@ -1141,150 +197,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -9.44)
-		(end -1.5 -9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -8.34)
-		(end 1.5 -9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -6.9)
-		(end -1.5 -6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.8)
-		(end 1.5 -6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.36)
-		(end -1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.26)
-		(end 1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.82)
-		(end -1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.72)
-		(end 1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.72)
-		(end -1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.82)
-		(end 1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.26)
-		(end -1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.36)
-		(end 1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.8)
-		(end -1.5 5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 6.9)
-		(end 1.5 5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 8.34)
-		(end -1.5 8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 9.44)
-		(end 1.5 8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -10.63)
 		(end 3.1 10.63)
@@ -1303,6 +215,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -9.44)
+		(end -0.5 -8.34)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -9.44)
+		(end 1.5 -8.34)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -6.9)
+		(end -0.5 -5.8)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -6.9)
+		(end 1.5 -5.8)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end -0.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end 1.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end -0.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end 1.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end -0.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end 1.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end -0.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end 1.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.8)
+		(end -0.5 6.9)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.8)
+		(end 1.5 6.9)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 8.34)
+		(end -0.5 9.44)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 8.34)
+		(end 1.5 9.44)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -1323,85 +395,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.45 6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.45 8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.45 8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.45 6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.45 -6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.45 -8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx08_Slide_Omron_A6S-810x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 5f55b087e..e75faab86 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -151,978 +151,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.675)
-		(end -0.603333 -10.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.555)
-		(end -0.603333 -10.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.435)
-		(end -0.603333 -10.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.315)
-		(end -0.603333 -10.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.075)
-		(end -0.603333 -10.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.955)
-		(end -0.603333 -9.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.835)
-		(end -0.603333 -9.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.715)
-		(end -0.603333 -9.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.135)
-		(end -0.603333 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.015)
-		(end -0.603333 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.895)
-		(end -0.603333 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.775)
-		(end -0.603333 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.535)
-		(end -0.603333 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.415)
-		(end -0.603333 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.295)
-		(end -0.603333 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.175)
-		(end -0.603333 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.105)
-		(end -0.603333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.225)
-		(end -0.603333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.345)
-		(end -0.603333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.465)
-		(end -0.603333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.705)
-		(end -0.603333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.825)
-		(end -0.603333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.945)
-		(end -0.603333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.065)
-		(end -0.603333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.645)
-		(end -0.603333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.765)
-		(end -0.603333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.885)
-		(end -0.603333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.005)
-		(end -0.603333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.245)
-		(end -0.603333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.365)
-		(end -0.603333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.485)
-		(end -0.603333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.605)
-		(end -0.603333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -10.795)
 		(end -0.603333 -9.525)
@@ -1204,168 +232,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -12.27)
 		(end 3.41 -10.96)
@@ -1456,40 +322,194 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -12.52)
-		(end -4.7 12.52)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 12.52)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -12.52)
 		(end 4.7 12.52)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -12.52)
-		(end -4.7 -12.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 12.52)
-		(end 4.7 -12.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1519,1140 +539,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.695)
-		(end -0.603333 -10.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.595)
-		(end -0.603333 -10.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.495)
-		(end -0.603333 -10.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.395)
-		(end -0.603333 -10.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.295)
-		(end -0.603333 -10.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.095)
-		(end -0.603333 -10.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.995)
-		(end -0.603333 -9.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.895)
-		(end -0.603333 -9.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.795)
-		(end -0.603333 -9.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.695)
-		(end -0.603333 -9.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.155)
-		(end -0.603333 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.055)
-		(end -0.603333 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.955)
-		(end -0.603333 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.855)
-		(end -0.603333 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.755)
-		(end -0.603333 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.555)
-		(end -0.603333 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.455)
-		(end -0.603333 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.355)
-		(end -0.603333 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.255)
-		(end -0.603333 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.155)
-		(end -0.603333 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.085)
-		(end -0.603333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.185)
-		(end -0.603333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.285)
-		(end -0.603333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.385)
-		(end -0.603333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.485)
-		(end -0.603333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.685)
-		(end -0.603333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.785)
-		(end -0.603333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.885)
-		(end -0.603333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.985)
-		(end -0.603333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.085)
-		(end -0.603333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.625)
-		(end -0.603333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.725)
-		(end -0.603333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.825)
-		(end -0.603333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.925)
-		(end -0.603333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.025)
-		(end -0.603333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.225)
-		(end -0.603333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.325)
-		(end -0.603333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.425)
-		(end -0.603333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.525)
-		(end -0.603333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.625)
-		(end -0.603333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -10.795)
 		(end -0.603333 -9.525)
@@ -2734,168 +620,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -12.21)
 		(end 3.35 12.21)
@@ -2914,6 +638,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2934,95 +838,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.365 7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.365 10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.365 10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.365 7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.365 -7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.365 -10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index d11dc41b1..f964110b8 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -151,978 +151,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.675)
-		(end -0.603333 -10.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.555)
-		(end -0.603333 -10.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.435)
-		(end -0.603333 -10.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.315)
-		(end -0.603333 -10.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.075)
-		(end -0.603333 -10.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.955)
-		(end -0.603333 -9.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.835)
-		(end -0.603333 -9.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.715)
-		(end -0.603333 -9.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.135)
-		(end -0.603333 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.015)
-		(end -0.603333 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.895)
-		(end -0.603333 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.775)
-		(end -0.603333 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.535)
-		(end -0.603333 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.415)
-		(end -0.603333 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.295)
-		(end -0.603333 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.175)
-		(end -0.603333 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.105)
-		(end -0.603333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.225)
-		(end -0.603333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.345)
-		(end -0.603333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.465)
-		(end -0.603333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.705)
-		(end -0.603333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.825)
-		(end -0.603333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.945)
-		(end -0.603333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.065)
-		(end -0.603333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.645)
-		(end -0.603333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.765)
-		(end -0.603333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.885)
-		(end -0.603333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.005)
-		(end -0.603333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.245)
-		(end -0.603333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.365)
-		(end -0.603333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.485)
-		(end -0.603333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.605)
-		(end -0.603333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -10.795)
 		(end -0.603333 -9.525)
@@ -1204,168 +232,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -12.27)
 		(end 3.41 -10.96)
@@ -1456,40 +322,194 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -12.52)
-		(end -5.78 12.52)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 12.52)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -12.52)
 		(end 5.78 12.52)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -12.52)
-		(end -5.78 -12.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 12.52)
-		(end 5.78 -12.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1519,1140 +539,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.695)
-		(end -0.603333 -10.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.595)
-		(end -0.603333 -10.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.495)
-		(end -0.603333 -10.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.395)
-		(end -0.603333 -10.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.295)
-		(end -0.603333 -10.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.095)
-		(end -0.603333 -10.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.995)
-		(end -0.603333 -9.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.895)
-		(end -0.603333 -9.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.795)
-		(end -0.603333 -9.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.695)
-		(end -0.603333 -9.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.155)
-		(end -0.603333 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.055)
-		(end -0.603333 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.955)
-		(end -0.603333 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.855)
-		(end -0.603333 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.755)
-		(end -0.603333 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.555)
-		(end -0.603333 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.455)
-		(end -0.603333 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.355)
-		(end -0.603333 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.255)
-		(end -0.603333 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.155)
-		(end -0.603333 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.085)
-		(end -0.603333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.185)
-		(end -0.603333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.285)
-		(end -0.603333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.385)
-		(end -0.603333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.485)
-		(end -0.603333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.685)
-		(end -0.603333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.785)
-		(end -0.603333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.885)
-		(end -0.603333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.985)
-		(end -0.603333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.085)
-		(end -0.603333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.625)
-		(end -0.603333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.725)
-		(end -0.603333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.825)
-		(end -0.603333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.925)
-		(end -0.603333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.025)
-		(end -0.603333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.225)
-		(end -0.603333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.325)
-		(end -0.603333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.425)
-		(end -0.603333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.525)
-		(end -0.603333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.625)
-		(end -0.603333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -10.795)
 		(end -0.603333 -9.525)
@@ -2734,168 +620,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -12.21)
 		(end 3.35 12.21)
@@ -2914,6 +638,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -2934,95 +838,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W8.61mm_P2.54mm.kicad_mod
index 20618c2be..ea5f8fd0a 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W8.61mm_P2.54mm.kicad_mod
@@ -151,978 +151,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.675)
-		(end -0.676667 -10.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.555)
-		(end -0.676667 -10.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.435)
-		(end -0.676667 -10.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.315)
-		(end -0.676667 -10.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.195)
-		(end -0.676667 -10.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.075)
-		(end -0.676667 -10.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.955)
-		(end -0.676667 -9.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.835)
-		(end -0.676667 -9.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.715)
-		(end -0.676667 -9.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.595)
-		(end -0.676667 -9.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.135)
-		(end -0.676667 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.015)
-		(end -0.676667 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.895)
-		(end -0.676667 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.775)
-		(end -0.676667 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.655)
-		(end -0.676667 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.535)
-		(end -0.676667 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.415)
-		(end -0.676667 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.295)
-		(end -0.676667 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.175)
-		(end -0.676667 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.055)
-		(end -0.676667 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.595)
-		(end -0.676667 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.475)
-		(end -0.676667 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.355)
-		(end -0.676667 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.235)
-		(end -0.676667 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.995)
-		(end -0.676667 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.875)
-		(end -0.676667 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.755)
-		(end -0.676667 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.635)
-		(end -0.676667 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.055)
-		(end -0.676667 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.935)
-		(end -0.676667 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.815)
-		(end -0.676667 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.695)
-		(end -0.676667 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.455)
-		(end -0.676667 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.335)
-		(end -0.676667 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.215)
-		(end -0.676667 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.095)
-		(end -0.676667 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.515)
-		(end -0.676667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.395)
-		(end -0.676667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.275)
-		(end -0.676667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.155)
-		(end -0.676667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.085)
-		(end -0.676667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.205)
-		(end -0.676667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.325)
-		(end -0.676667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.445)
-		(end -0.676667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.025)
-		(end -0.676667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.145)
-		(end -0.676667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.265)
-		(end -0.676667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.385)
-		(end -0.676667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.625)
-		(end -0.676667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.745)
-		(end -0.676667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.865)
-		(end -0.676667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.985)
-		(end -0.676667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.565)
-		(end -0.676667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.685)
-		(end -0.676667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.805)
-		(end -0.676667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.925)
-		(end -0.676667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.165)
-		(end -0.676667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.285)
-		(end -0.676667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.405)
-		(end -0.676667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.525)
-		(end -0.676667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.105)
-		(end -0.676667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.225)
-		(end -0.676667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.345)
-		(end -0.676667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.465)
-		(end -0.676667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.585)
-		(end -0.676667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.705)
-		(end -0.676667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.825)
-		(end -0.676667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.945)
-		(end -0.676667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.065)
-		(end -0.676667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.185)
-		(end -0.676667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.645)
-		(end -0.676667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.765)
-		(end -0.676667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.885)
-		(end -0.676667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.005)
-		(end -0.676667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.125)
-		(end -0.676667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.245)
-		(end -0.676667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.365)
-		(end -0.676667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.485)
-		(end -0.676667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.605)
-		(end -0.676667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.725)
-		(end -0.676667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -10.795)
 		(end -0.676667 -9.525)
@@ -1204,168 +232,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -12.58)
 		(end 4.95 -10.96)
@@ -1456,40 +322,194 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -12.83)
-		(end -5.78 12.83)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end -0.676667 -9.525)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 12.83)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end 2.03 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end -0.676667 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end 2.03 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end -0.676667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end 2.03 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end -0.676667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end 2.03 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -12.83)
 		(end 5.78 12.83)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -12.83)
-		(end -5.78 -12.83)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 12.83)
-		(end 5.78 -12.83)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1519,1140 +539,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.695)
-		(end -0.676667 -10.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.595)
-		(end -0.676667 -10.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.495)
-		(end -0.676667 -10.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.395)
-		(end -0.676667 -10.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.295)
-		(end -0.676667 -10.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.195)
-		(end -0.676667 -10.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.095)
-		(end -0.676667 -10.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.995)
-		(end -0.676667 -9.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.895)
-		(end -0.676667 -9.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.795)
-		(end -0.676667 -9.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.695)
-		(end -0.676667 -9.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.595)
-		(end -0.676667 -9.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.155)
-		(end -0.676667 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.055)
-		(end -0.676667 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.955)
-		(end -0.676667 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.855)
-		(end -0.676667 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.755)
-		(end -0.676667 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.655)
-		(end -0.676667 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.555)
-		(end -0.676667 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.455)
-		(end -0.676667 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.355)
-		(end -0.676667 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.255)
-		(end -0.676667 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.155)
-		(end -0.676667 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.055)
-		(end -0.676667 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.615)
-		(end -0.676667 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.515)
-		(end -0.676667 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.415)
-		(end -0.676667 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.315)
-		(end -0.676667 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.215)
-		(end -0.676667 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.015)
-		(end -0.676667 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.915)
-		(end -0.676667 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.815)
-		(end -0.676667 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.715)
-		(end -0.676667 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.615)
-		(end -0.676667 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.075)
-		(end -0.676667 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.975)
-		(end -0.676667 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.875)
-		(end -0.676667 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.775)
-		(end -0.676667 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.675)
-		(end -0.676667 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.475)
-		(end -0.676667 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.375)
-		(end -0.676667 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.275)
-		(end -0.676667 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.175)
-		(end -0.676667 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.075)
-		(end -0.676667 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.535)
-		(end -0.676667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.435)
-		(end -0.676667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.335)
-		(end -0.676667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.235)
-		(end -0.676667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.135)
-		(end -0.676667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.065)
-		(end -0.676667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.165)
-		(end -0.676667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.265)
-		(end -0.676667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.365)
-		(end -0.676667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.465)
-		(end -0.676667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.005)
-		(end -0.676667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.105)
-		(end -0.676667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.205)
-		(end -0.676667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.305)
-		(end -0.676667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.405)
-		(end -0.676667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.605)
-		(end -0.676667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.705)
-		(end -0.676667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.805)
-		(end -0.676667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.905)
-		(end -0.676667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.005)
-		(end -0.676667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.545)
-		(end -0.676667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.645)
-		(end -0.676667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.745)
-		(end -0.676667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.845)
-		(end -0.676667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.945)
-		(end -0.676667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.145)
-		(end -0.676667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.245)
-		(end -0.676667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.345)
-		(end -0.676667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.445)
-		(end -0.676667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.545)
-		(end -0.676667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.085)
-		(end -0.676667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.185)
-		(end -0.676667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.285)
-		(end -0.676667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.385)
-		(end -0.676667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.485)
-		(end -0.676667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.585)
-		(end -0.676667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.685)
-		(end -0.676667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.785)
-		(end -0.676667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.885)
-		(end -0.676667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.985)
-		(end -0.676667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.085)
-		(end -0.676667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.185)
-		(end -0.676667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.625)
-		(end -0.676667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.725)
-		(end -0.676667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.825)
-		(end -0.676667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.925)
-		(end -0.676667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.025)
-		(end -0.676667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.125)
-		(end -0.676667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.225)
-		(end -0.676667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.325)
-		(end -0.676667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.425)
-		(end -0.676667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.525)
-		(end -0.676667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.625)
-		(end -0.676667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.725)
-		(end -0.676667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -10.795)
 		(end -0.676667 -9.525)
@@ -2734,168 +620,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -12.52)
 		(end 4.89 12.52)
@@ -2914,6 +638,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end -0.676667 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end 2.03 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end -0.676667 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end 2.03 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end -0.676667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end 2.03 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end -0.676667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end 2.03 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -2934,95 +838,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index eae6aa88f..5f15f3eaf 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -6.93)
-		(end -4.2 6.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 6.93)
 		(end 4.2 6.93)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -6.93)
-		(end -4.2 -6.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 6.93)
-		(end 4.2 -6.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,780 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -5.48)
-		(end -1 -4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.38)
-		(end -0.333333 -5.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.28)
-		(end -0.333333 -5.28)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.18)
-		(end -0.333333 -5.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.08)
-		(end -0.333333 -5.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.98)
-		(end -0.333333 -4.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.88)
-		(end -0.333333 -4.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.78)
-		(end -0.333333 -4.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.68)
-		(end 1 -4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.21)
-		(end -1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.11)
-		(end -0.333333 -4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.01)
-		(end -0.333333 -4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.91)
-		(end -0.333333 -3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.81)
-		(end -0.333333 -3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.71)
-		(end -0.333333 -3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.61)
-		(end -0.333333 -3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.51)
-		(end -0.333333 -3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.41)
-		(end 1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.94)
-		(end -1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.84)
-		(end -0.333333 -2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.74)
-		(end -0.333333 -2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.64)
-		(end -0.333333 -2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.54)
-		(end -0.333333 -2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.44)
-		(end -0.333333 -2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.34)
-		(end -0.333333 -2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.24)
-		(end -0.333333 -2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.14)
-		(end 1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end -0.333333 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end -0.333333 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.14)
-		(end -1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.24)
-		(end -0.333333 2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.34)
-		(end -0.333333 2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.44)
-		(end -0.333333 2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.54)
-		(end -0.333333 2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.64)
-		(end -0.333333 2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.74)
-		(end -0.333333 2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.84)
-		(end -0.333333 2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end -0.333333 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end 1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.41)
-		(end -1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.51)
-		(end -0.333333 3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.61)
-		(end -0.333333 3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.71)
-		(end -0.333333 3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.81)
-		(end -0.333333 3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.91)
-		(end -0.333333 3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.01)
-		(end -0.333333 4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.11)
-		(end -0.333333 4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end -0.333333 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end 1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.68)
-		(end -1 5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.78)
-		(end -0.333333 4.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.88)
-		(end -0.333333 4.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.98)
-		(end -0.333333 4.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.08)
-		(end -0.333333 5.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.18)
-		(end -0.333333 5.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.28)
-		(end -0.333333 5.28)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.38)
-		(end -0.333333 5.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.48)
-		(end -0.333333 5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.48)
-		(end 1 5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -5.48)
 		(end -0.333333 -4.68)
@@ -1006,168 +206,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -5.48)
-		(end -1 -5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.68)
-		(end 1 -5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.21)
-		(end -1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.41)
-		(end 1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.94)
-		(end -1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.14)
-		(end 1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.14)
-		(end -1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.94)
-		(end 1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.41)
-		(end -1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.21)
-		(end 1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.68)
-		(end -1 4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 5.48)
-		(end 1 4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -6.615)
 		(end 2.7 6.615)
@@ -1186,6 +224,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -5.48)
+		(end -0.333333 -4.68)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -5.48)
+		(end 1 -4.68)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.21)
+		(end -0.333333 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.21)
+		(end 1 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end -0.333333 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end 1 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end -0.333333 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end 1 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end -0.333333 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end 1 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.68)
+		(end -0.333333 5.48)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.68)
+		(end 1 5.48)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -1206,95 +424,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -5.08)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 -2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.625 2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -2.625 3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -2.625 5.08)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 2.625 5.08)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.625 3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.625 2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.625 1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.625 0)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 2.625 -1.27)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 2.625 -2.54)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 2.625 -3.81)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 2.625 -5.08)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TS_W7.62mm_P1.27mm.kicad_mod
index 1b9beceeb..3921aff04 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -6.83)
-		(end -4.7 6.83)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 6.83)
 		(end 4.7 6.83)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -6.83)
-		(end -4.7 -6.83)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 6.83)
-		(end 4.7 -6.83)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,780 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -5.48)
-		(end -1 -4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.38)
-		(end -0.333333 -5.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.28)
-		(end -0.333333 -5.28)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.18)
-		(end -0.333333 -5.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.08)
-		(end -0.333333 -5.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.98)
-		(end -0.333333 -4.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.88)
-		(end -0.333333 -4.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.78)
-		(end -0.333333 -4.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.68)
-		(end 1 -4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.21)
-		(end -1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.11)
-		(end -0.333333 -4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.01)
-		(end -0.333333 -4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.91)
-		(end -0.333333 -3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.81)
-		(end -0.333333 -3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.71)
-		(end -0.333333 -3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.61)
-		(end -0.333333 -3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.51)
-		(end -0.333333 -3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.41)
-		(end 1 -3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.94)
-		(end -1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.84)
-		(end -0.333333 -2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.74)
-		(end -0.333333 -2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.64)
-		(end -0.333333 -2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.54)
-		(end -0.333333 -2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.44)
-		(end -0.333333 -2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.34)
-		(end -0.333333 -2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.24)
-		(end -0.333333 -2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.14)
-		(end 1 -2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.67)
-		(end -1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.57)
-		(end -0.333333 -1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.47)
-		(end -0.333333 -1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.37)
-		(end -0.333333 -1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.27)
-		(end -0.333333 -1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.17)
-		(end -0.333333 -1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.07)
-		(end -0.333333 -1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.97)
-		(end -0.333333 -0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.87)
-		(end 1 -0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.4)
-		(end -1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.3)
-		(end -0.333333 -0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.2)
-		(end -0.333333 -0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.1)
-		(end -0.333333 -0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0)
-		(end -0.333333 0)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.1)
-		(end -0.333333 0.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.2)
-		(end -0.333333 0.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.3)
-		(end -0.333333 0.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end -0.333333 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.4)
-		(end 1 0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.87)
-		(end -1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.97)
-		(end -0.333333 0.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.07)
-		(end -0.333333 1.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.17)
-		(end -0.333333 1.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.27)
-		(end -0.333333 1.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.37)
-		(end -0.333333 1.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.47)
-		(end -0.333333 1.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.57)
-		(end -0.333333 1.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end -0.333333 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.67)
-		(end 1 1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.14)
-		(end -1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.24)
-		(end -0.333333 2.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.34)
-		(end -0.333333 2.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.44)
-		(end -0.333333 2.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.54)
-		(end -0.333333 2.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.64)
-		(end -0.333333 2.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.74)
-		(end -0.333333 2.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.84)
-		(end -0.333333 2.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end -0.333333 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.94)
-		(end 1 2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.41)
-		(end -1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.51)
-		(end -0.333333 3.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.61)
-		(end -0.333333 3.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.71)
-		(end -0.333333 3.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.81)
-		(end -0.333333 3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.91)
-		(end -0.333333 3.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.01)
-		(end -0.333333 4.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.11)
-		(end -0.333333 4.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end -0.333333 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.21)
-		(end 1 4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.68)
-		(end -1 5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.78)
-		(end -0.333333 4.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.88)
-		(end -0.333333 4.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.98)
-		(end -0.333333 4.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.08)
-		(end -0.333333 5.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.18)
-		(end -0.333333 5.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.28)
-		(end -0.333333 5.28)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.38)
-		(end -0.333333 5.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.48)
-		(end -0.333333 5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.48)
-		(end 1 5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -5.48)
 		(end -0.333333 -4.68)
@@ -1006,168 +206,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -5.48)
-		(end -1 -5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.68)
-		(end 1 -5.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.21)
-		(end -1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.41)
-		(end 1 -4.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.94)
-		(end -1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.14)
-		(end 1 -2.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.67)
-		(end -1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.87)
-		(end 1 -1.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.4)
-		(end -1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.4)
-		(end 1 -0.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.87)
-		(end -1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.67)
-		(end 1 0.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.14)
-		(end -1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.94)
-		(end 1 2.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.41)
-		(end -1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.21)
-		(end 1 3.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.68)
-		(end -1 4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 5.48)
-		(end 1 4.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -6.515)
 		(end 2.7 6.515)
@@ -1186,6 +224,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -5.48)
+		(end -0.333333 -4.68)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -5.48)
+		(end 1 -4.68)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.21)
+		(end -0.333333 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.21)
+		(end 1 -3.41)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end -0.333333 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.94)
+		(end 1 -2.14)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end -0.333333 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.67)
+		(end 1 -0.87)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end -0.333333 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -0.4)
+		(end 1 0.4)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end -0.333333 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.87)
+		(end 1 1.67)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end -0.333333 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.14)
+		(end 1 2.94)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end -0.333333 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 3.41)
+		(end 1 4.21)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.68)
+		(end -0.333333 5.48)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.68)
+		(end 1 5.48)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -1206,95 +424,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -5.08)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 5.08)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 5.08)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 0)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -5.08)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx09_Slide_KingTek_DSHP09TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_Omron_A6S-910x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_Omron_A6S-910x_W8.9mm_P2.54mm.kicad_mod
index 06f05a3b0..478d10920 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_Omron_A6S-910x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx09_Slide_Omron_A6S-910x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -12.21)
-		(end -5.45 12.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 12.21)
 		(end 5.45 12.21)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -12.21)
-		(end -5.45 -12.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 12.21)
-		(end 5.45 -12.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,1032 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -10.71)
-		(end -1.5 -9.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.61)
-		(end -0.5 -10.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.51)
-		(end -0.5 -10.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.41)
-		(end -0.5 -10.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.31)
-		(end -0.5 -10.31)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.21)
-		(end -0.5 -10.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.11)
-		(end -0.5 -10.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.01)
-		(end -0.5 -10.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.91)
-		(end -0.5 -9.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.81)
-		(end -0.5 -9.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.71)
-		(end -0.5 -9.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.61)
-		(end -0.5 -9.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.61)
-		(end 1.5 -9.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.17)
-		(end -1.5 -7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.07)
-		(end -0.5 -8.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.97)
-		(end -0.5 -7.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.87)
-		(end -0.5 -7.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.77)
-		(end -0.5 -7.77)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.67)
-		(end -0.5 -7.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.57)
-		(end -0.5 -7.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.47)
-		(end -0.5 -7.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.37)
-		(end -0.5 -7.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.27)
-		(end -0.5 -7.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.17)
-		(end -0.5 -7.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -7.07)
-		(end 1.5 -7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.63)
-		(end -1.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.53)
-		(end -0.5 -5.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.43)
-		(end -0.5 -5.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.33)
-		(end -0.5 -5.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.23)
-		(end -0.5 -5.23)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.13)
-		(end -0.5 -5.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.03)
-		(end -0.5 -5.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.93)
-		(end -0.5 -4.93)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.83)
-		(end -0.5 -4.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.73)
-		(end -0.5 -4.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.63)
-		(end -0.5 -4.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.53)
-		(end -0.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.53)
-		(end 1.5 -4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.09)
-		(end -1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.99)
-		(end -0.5 -2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.89)
-		(end -0.5 -2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.79)
-		(end -0.5 -2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.69)
-		(end -0.5 -2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.59)
-		(end -0.5 -2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.49)
-		(end -0.5 -2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.39)
-		(end -0.5 -2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.29)
-		(end -0.5 -2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.19)
-		(end -0.5 -2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.09)
-		(end -0.5 -2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end -0.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.99)
-		(end 1.5 -1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.55)
-		(end -1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.45)
-		(end -0.5 -0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.35)
-		(end -0.5 -0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.25)
-		(end -0.5 -0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.15)
-		(end -0.5 -0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.05)
-		(end -0.5 -0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.05)
-		(end -0.5 0.05)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.15)
-		(end -0.5 0.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.25)
-		(end -0.5 0.25)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.35)
-		(end -0.5 0.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.45)
-		(end -0.5 0.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end -0.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.55)
-		(end 1.5 0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.99)
-		(end -1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.09)
-		(end -0.5 2.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.19)
-		(end -0.5 2.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.29)
-		(end -0.5 2.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.39)
-		(end -0.5 2.39)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.49)
-		(end -0.5 2.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.59)
-		(end -0.5 2.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.69)
-		(end -0.5 2.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.79)
-		(end -0.5 2.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.89)
-		(end -0.5 2.89)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.99)
-		(end -0.5 2.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end -0.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.09)
-		(end 1.5 3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.53)
-		(end -1.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.63)
-		(end -0.5 4.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.73)
-		(end -0.5 4.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.83)
-		(end -0.5 4.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.93)
-		(end -0.5 4.93)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.03)
-		(end -0.5 5.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.13)
-		(end -0.5 5.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.23)
-		(end -0.5 5.23)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.33)
-		(end -0.5 5.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.43)
-		(end -0.5 5.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.53)
-		(end -0.5 5.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.63)
-		(end -0.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.63)
-		(end 1.5 5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.07)
-		(end -1.5 8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.17)
-		(end -0.5 7.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.27)
-		(end -0.5 7.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.37)
-		(end -0.5 7.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.47)
-		(end -0.5 7.47)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.57)
-		(end -0.5 7.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.67)
-		(end -0.5 7.67)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.77)
-		(end -0.5 7.77)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.87)
-		(end -0.5 7.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 7.97)
-		(end -0.5 7.97)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.07)
-		(end -0.5 8.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.17)
-		(end 1.5 8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.61)
-		(end -1.5 10.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.71)
-		(end -0.5 9.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.81)
-		(end -0.5 9.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.91)
-		(end -0.5 9.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.01)
-		(end -0.5 10.01)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.11)
-		(end -0.5 10.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.21)
-		(end -0.5 10.21)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.31)
-		(end -0.5 10.31)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.41)
-		(end -0.5 10.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.51)
-		(end -0.5 10.51)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.61)
-		(end -0.5 10.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.71)
-		(end 1.5 10.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -10.71)
 		(end -0.5 -9.61)
@@ -1258,168 +206,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -10.71)
-		(end -1.5 -10.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -9.61)
-		(end 1.5 -10.71)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -8.17)
-		(end -1.5 -8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -7.07)
-		(end 1.5 -8.17)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.63)
-		(end -1.5 -5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.53)
-		(end 1.5 -5.63)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.09)
-		(end -1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.99)
-		(end 1.5 -3.09)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.55)
-		(end -1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.55)
-		(end 1.5 -0.55)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.99)
-		(end -1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.09)
-		(end 1.5 1.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.53)
-		(end -1.5 4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.63)
-		(end 1.5 4.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 7.07)
-		(end -1.5 7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 8.17)
-		(end 1.5 7.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 9.61)
-		(end -1.5 9.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 10.71)
-		(end 1.5 9.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -11.9)
 		(end 3.1 11.9)
@@ -1438,6 +224,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -10.71)
+		(end -0.5 -9.61)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -10.71)
+		(end 1.5 -9.61)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -8.17)
+		(end -0.5 -7.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -8.17)
+		(end 1.5 -7.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.63)
+		(end -0.5 -4.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.63)
+		(end 1.5 -4.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end -0.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.09)
+		(end 1.5 -1.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end -0.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.55)
+		(end 1.5 0.55)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end -0.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.99)
+		(end 1.5 3.09)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.53)
+		(end -0.5 5.63)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.53)
+		(end 1.5 5.63)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 7.07)
+		(end -0.5 8.17)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 7.07)
+		(end 1.5 8.17)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 9.61)
+		(end -0.5 10.71)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 9.61)
+		(end 1.5 10.71)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -1458,95 +424,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -10.16)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 -5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.45 5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.45 7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.45 10.16)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.45 10.16)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.45 7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.45 5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.45 2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.45 0)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.45 -2.54)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.45 -5.08)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.45 -7.62)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.45 -10.16)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx09_Slide_Omron_A6S-910x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 6d2b8641d..9c4000e95 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -160,1086 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.945)
-		(end -0.603333 -11.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.825)
-		(end -0.603333 -11.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.705)
-		(end -0.603333 -11.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.585)
-		(end -0.603333 -11.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.345)
-		(end -0.603333 -11.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.225)
-		(end -0.603333 -11.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.105)
-		(end -0.603333 -11.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.985)
-		(end -0.603333 -10.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.405)
-		(end -0.603333 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.285)
-		(end -0.603333 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.165)
-		(end -0.603333 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.045)
-		(end -0.603333 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.805)
-		(end -0.603333 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.685)
-		(end -0.603333 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.565)
-		(end -0.603333 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.445)
-		(end -0.603333 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.375)
-		(end -0.603333 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.495)
-		(end -0.603333 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.615)
-		(end -0.603333 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.735)
-		(end -0.603333 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.975)
-		(end -0.603333 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.095)
-		(end -0.603333 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.215)
-		(end -0.603333 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.335)
-		(end -0.603333 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.915)
-		(end -0.603333 10.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.035)
-		(end -0.603333 11.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.155)
-		(end -0.603333 11.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.275)
-		(end -0.603333 11.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.515)
-		(end -0.603333 11.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.635)
-		(end -0.603333 11.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.755)
-		(end -0.603333 11.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.875)
-		(end -0.603333 11.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -12.065)
 		(end -0.603333 -10.795)
@@ -1330,186 +250,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -13.54)
 		(end 3.41 -12.23)
@@ -1609,40 +349,214 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -13.79)
-		(end -4.7 13.79)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 13.79)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -13.79)
 		(end 4.7 13.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -13.79)
-		(end -4.7 -13.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 13.79)
-		(end 4.7 -13.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1672,1266 +586,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.965)
-		(end -0.603333 -11.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.865)
-		(end -0.603333 -11.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.765)
-		(end -0.603333 -11.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.665)
-		(end -0.603333 -11.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.565)
-		(end -0.603333 -11.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.365)
-		(end -0.603333 -11.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.265)
-		(end -0.603333 -11.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.165)
-		(end -0.603333 -11.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.065)
-		(end -0.603333 -11.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.965)
-		(end -0.603333 -10.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.425)
-		(end -0.603333 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.325)
-		(end -0.603333 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.225)
-		(end -0.603333 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.125)
-		(end -0.603333 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.025)
-		(end -0.603333 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.825)
-		(end -0.603333 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.725)
-		(end -0.603333 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.625)
-		(end -0.603333 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.525)
-		(end -0.603333 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.425)
-		(end -0.603333 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.355)
-		(end -0.603333 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.455)
-		(end -0.603333 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.555)
-		(end -0.603333 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.655)
-		(end -0.603333 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.755)
-		(end -0.603333 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.955)
-		(end -0.603333 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.055)
-		(end -0.603333 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.155)
-		(end -0.603333 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.255)
-		(end -0.603333 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.355)
-		(end -0.603333 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.895)
-		(end -0.603333 10.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.995)
-		(end -0.603333 10.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.095)
-		(end -0.603333 11.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.195)
-		(end -0.603333 11.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.295)
-		(end -0.603333 11.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.495)
-		(end -0.603333 11.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.595)
-		(end -0.603333 11.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.695)
-		(end -0.603333 11.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.795)
-		(end -0.603333 11.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.895)
-		(end -0.603333 11.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -12.065)
 		(end -0.603333 -10.795)
@@ -3022,186 +676,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -13.48)
 		(end 3.35 13.48)
@@ -3220,6 +694,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -3240,105 +914,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.365 8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.365 11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.365 11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.365 8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.365 -8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.365 -11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index dcd8fdaab..516c6043f 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -160,1086 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.945)
-		(end -0.603333 -11.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.825)
-		(end -0.603333 -11.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.705)
-		(end -0.603333 -11.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.585)
-		(end -0.603333 -11.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.345)
-		(end -0.603333 -11.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.225)
-		(end -0.603333 -11.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.105)
-		(end -0.603333 -11.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.985)
-		(end -0.603333 -10.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.405)
-		(end -0.603333 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.285)
-		(end -0.603333 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.165)
-		(end -0.603333 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.045)
-		(end -0.603333 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.805)
-		(end -0.603333 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.685)
-		(end -0.603333 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.565)
-		(end -0.603333 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.445)
-		(end -0.603333 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.375)
-		(end -0.603333 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.495)
-		(end -0.603333 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.615)
-		(end -0.603333 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.735)
-		(end -0.603333 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.975)
-		(end -0.603333 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.095)
-		(end -0.603333 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.215)
-		(end -0.603333 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.335)
-		(end -0.603333 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.915)
-		(end -0.603333 10.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.035)
-		(end -0.603333 11.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.155)
-		(end -0.603333 11.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.275)
-		(end -0.603333 11.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.515)
-		(end -0.603333 11.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.635)
-		(end -0.603333 11.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.755)
-		(end -0.603333 11.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.875)
-		(end -0.603333 11.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -12.065)
 		(end -0.603333 -10.795)
@@ -1330,186 +250,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -13.54)
 		(end 3.41 -12.23)
@@ -1609,40 +349,214 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -13.79)
-		(end -5.78 13.79)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 13.79)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -13.79)
 		(end 5.78 13.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -13.79)
-		(end -5.78 -13.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 13.79)
-		(end 5.78 -13.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1672,1266 +586,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.965)
-		(end -0.603333 -11.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.865)
-		(end -0.603333 -11.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.765)
-		(end -0.603333 -11.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.665)
-		(end -0.603333 -11.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.565)
-		(end -0.603333 -11.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.365)
-		(end -0.603333 -11.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.265)
-		(end -0.603333 -11.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.165)
-		(end -0.603333 -11.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.065)
-		(end -0.603333 -11.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.965)
-		(end -0.603333 -10.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.425)
-		(end -0.603333 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.325)
-		(end -0.603333 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.225)
-		(end -0.603333 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.125)
-		(end -0.603333 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.025)
-		(end -0.603333 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.825)
-		(end -0.603333 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.725)
-		(end -0.603333 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.625)
-		(end -0.603333 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.525)
-		(end -0.603333 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.425)
-		(end -0.603333 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.355)
-		(end -0.603333 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.455)
-		(end -0.603333 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.555)
-		(end -0.603333 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.655)
-		(end -0.603333 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.755)
-		(end -0.603333 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.955)
-		(end -0.603333 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.055)
-		(end -0.603333 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.155)
-		(end -0.603333 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.255)
-		(end -0.603333 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.355)
-		(end -0.603333 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.895)
-		(end -0.603333 10.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.995)
-		(end -0.603333 10.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.095)
-		(end -0.603333 11.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.195)
-		(end -0.603333 11.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.295)
-		(end -0.603333 11.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.495)
-		(end -0.603333 11.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.595)
-		(end -0.603333 11.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.695)
-		(end -0.603333 11.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.795)
-		(end -0.603333 11.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.895)
-		(end -0.603333 11.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -12.065)
 		(end -0.603333 -10.795)
@@ -3022,186 +676,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -13.48)
 		(end 3.35 13.48)
@@ -3220,6 +694,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -3240,105 +914,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W8.61mm_P2.54mm.kicad_mod
index ed14848b4..413b66051 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W8.61mm_P2.54mm.kicad_mod
@@ -160,1086 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -12.065)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.945)
-		(end -0.676667 -11.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.825)
-		(end -0.676667 -11.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.705)
-		(end -0.676667 -11.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.585)
-		(end -0.676667 -11.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.465)
-		(end -0.676667 -11.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.345)
-		(end -0.676667 -11.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.225)
-		(end -0.676667 -11.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.105)
-		(end -0.676667 -11.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.985)
-		(end -0.676667 -10.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.865)
-		(end -0.676667 -10.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.405)
-		(end -0.676667 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.285)
-		(end -0.676667 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.165)
-		(end -0.676667 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.045)
-		(end -0.676667 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.925)
-		(end -0.676667 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.805)
-		(end -0.676667 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.685)
-		(end -0.676667 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.565)
-		(end -0.676667 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.445)
-		(end -0.676667 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.325)
-		(end -0.676667 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.865)
-		(end -0.676667 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.745)
-		(end -0.676667 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.625)
-		(end -0.676667 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.505)
-		(end -0.676667 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.265)
-		(end -0.676667 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.145)
-		(end -0.676667 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.025)
-		(end -0.676667 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.905)
-		(end -0.676667 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.325)
-		(end -0.676667 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.205)
-		(end -0.676667 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.085)
-		(end -0.676667 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.965)
-		(end -0.676667 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.725)
-		(end -0.676667 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.605)
-		(end -0.676667 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.485)
-		(end -0.676667 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.365)
-		(end -0.676667 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.785)
-		(end -0.676667 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.665)
-		(end -0.676667 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.545)
-		(end -0.676667 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.425)
-		(end -0.676667 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.185)
-		(end -0.676667 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.065)
-		(end -0.676667 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.945)
-		(end -0.676667 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.825)
-		(end -0.676667 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.755)
-		(end -0.676667 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.875)
-		(end -0.676667 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.995)
-		(end -0.676667 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.115)
-		(end -0.676667 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.355)
-		(end -0.676667 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.475)
-		(end -0.676667 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.595)
-		(end -0.676667 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.715)
-		(end -0.676667 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.295)
-		(end -0.676667 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.415)
-		(end -0.676667 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.535)
-		(end -0.676667 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.655)
-		(end -0.676667 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.895)
-		(end -0.676667 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.015)
-		(end -0.676667 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.135)
-		(end -0.676667 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.255)
-		(end -0.676667 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.835)
-		(end -0.676667 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.955)
-		(end -0.676667 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.075)
-		(end -0.676667 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.195)
-		(end -0.676667 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.435)
-		(end -0.676667 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.555)
-		(end -0.676667 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.675)
-		(end -0.676667 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.795)
-		(end -0.676667 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.375)
-		(end -0.676667 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.495)
-		(end -0.676667 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.615)
-		(end -0.676667 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.735)
-		(end -0.676667 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.855)
-		(end -0.676667 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.975)
-		(end -0.676667 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.095)
-		(end -0.676667 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.215)
-		(end -0.676667 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.335)
-		(end -0.676667 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.455)
-		(end -0.676667 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end -2.03 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.915)
-		(end -0.676667 10.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.035)
-		(end -0.676667 11.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.155)
-		(end -0.676667 11.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.275)
-		(end -0.676667 11.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.395)
-		(end -0.676667 11.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.515)
-		(end -0.676667 11.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.635)
-		(end -0.676667 11.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.755)
-		(end -0.676667 11.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.875)
-		(end -0.676667 11.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.995)
-		(end -0.676667 11.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.065)
-		(end 2.03 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -12.065)
 		(end -0.676667 -10.795)
@@ -1330,186 +250,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -12.065)
-		(end -2.03 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end 2.03 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 12.065)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -13.85)
 		(end 4.95 -12.23)
@@ -1609,40 +349,214 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -14.1)
-		(end -5.78 14.1)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end -0.676667 -10.795)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 14.1)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end 2.03 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end -0.676667 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end 2.03 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end -0.676667 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end 2.03 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end -0.676667 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end 2.03 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -14.1)
 		(end 5.78 14.1)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -14.1)
-		(end -5.78 -14.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 14.1)
-		(end 5.78 -14.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1672,1266 +586,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -12.065)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.965)
-		(end -0.676667 -11.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.865)
-		(end -0.676667 -11.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.765)
-		(end -0.676667 -11.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.665)
-		(end -0.676667 -11.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.565)
-		(end -0.676667 -11.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.465)
-		(end -0.676667 -11.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.365)
-		(end -0.676667 -11.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.265)
-		(end -0.676667 -11.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.165)
-		(end -0.676667 -11.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.065)
-		(end -0.676667 -11.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.965)
-		(end -0.676667 -10.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.865)
-		(end -0.676667 -10.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.425)
-		(end -0.676667 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.325)
-		(end -0.676667 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.225)
-		(end -0.676667 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.125)
-		(end -0.676667 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.025)
-		(end -0.676667 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.925)
-		(end -0.676667 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.825)
-		(end -0.676667 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.725)
-		(end -0.676667 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.625)
-		(end -0.676667 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.525)
-		(end -0.676667 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.425)
-		(end -0.676667 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.325)
-		(end -0.676667 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.885)
-		(end -0.676667 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.785)
-		(end -0.676667 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.685)
-		(end -0.676667 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.585)
-		(end -0.676667 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.485)
-		(end -0.676667 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.285)
-		(end -0.676667 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.185)
-		(end -0.676667 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.085)
-		(end -0.676667 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.985)
-		(end -0.676667 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.885)
-		(end -0.676667 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.345)
-		(end -0.676667 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.245)
-		(end -0.676667 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.145)
-		(end -0.676667 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.045)
-		(end -0.676667 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.945)
-		(end -0.676667 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.745)
-		(end -0.676667 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.645)
-		(end -0.676667 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.545)
-		(end -0.676667 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.445)
-		(end -0.676667 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.345)
-		(end -0.676667 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.805)
-		(end -0.676667 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.705)
-		(end -0.676667 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.605)
-		(end -0.676667 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.505)
-		(end -0.676667 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.405)
-		(end -0.676667 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.205)
-		(end -0.676667 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.105)
-		(end -0.676667 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.005)
-		(end -0.676667 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.905)
-		(end -0.676667 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.805)
-		(end -0.676667 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.735)
-		(end -0.676667 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.835)
-		(end -0.676667 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.935)
-		(end -0.676667 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.035)
-		(end -0.676667 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.135)
-		(end -0.676667 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.335)
-		(end -0.676667 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.435)
-		(end -0.676667 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.535)
-		(end -0.676667 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.635)
-		(end -0.676667 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.735)
-		(end -0.676667 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.275)
-		(end -0.676667 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.375)
-		(end -0.676667 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.475)
-		(end -0.676667 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.575)
-		(end -0.676667 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.675)
-		(end -0.676667 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.875)
-		(end -0.676667 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.975)
-		(end -0.676667 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.075)
-		(end -0.676667 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.175)
-		(end -0.676667 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.275)
-		(end -0.676667 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.815)
-		(end -0.676667 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.915)
-		(end -0.676667 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.015)
-		(end -0.676667 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.115)
-		(end -0.676667 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.215)
-		(end -0.676667 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.415)
-		(end -0.676667 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.515)
-		(end -0.676667 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.615)
-		(end -0.676667 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.715)
-		(end -0.676667 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.815)
-		(end -0.676667 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.355)
-		(end -0.676667 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.455)
-		(end -0.676667 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.555)
-		(end -0.676667 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.655)
-		(end -0.676667 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.755)
-		(end -0.676667 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.855)
-		(end -0.676667 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.955)
-		(end -0.676667 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.055)
-		(end -0.676667 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.155)
-		(end -0.676667 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.255)
-		(end -0.676667 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.355)
-		(end -0.676667 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.455)
-		(end -0.676667 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end -2.03 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.895)
-		(end -0.676667 10.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.995)
-		(end -0.676667 10.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.095)
-		(end -0.676667 11.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.195)
-		(end -0.676667 11.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.295)
-		(end -0.676667 11.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.395)
-		(end -0.676667 11.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.495)
-		(end -0.676667 11.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.595)
-		(end -0.676667 11.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.695)
-		(end -0.676667 11.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.795)
-		(end -0.676667 11.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.895)
-		(end -0.676667 11.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.995)
-		(end -0.676667 11.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.065)
-		(end 2.03 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -12.065)
 		(end -0.676667 -10.795)
@@ -3022,186 +676,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -12.065)
-		(end -2.03 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end 2.03 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 12.065)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -13.79)
 		(end 4.89 13.79)
@@ -3220,6 +694,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end -0.676667 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end 2.03 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end -0.676667 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end 2.03 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end -0.676667 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end 2.03 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end -0.676667 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end 2.03 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -3240,105 +914,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10A_W5.08mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10A_W5.08mm_P1.27mm_JPin.kicad_mod
index 40b0746b7..87096d718 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10A_W5.08mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10A_W5.08mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.59 -7.3)
-		(end -3.59 7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.59 7.3)
 		(end 3.59 7.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 -7.3)
-		(end -3.59 -7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.59 7.3)
-		(end 3.59 -7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,600 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -5.965)
-		(end -1.5 -5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.865)
-		(end -0.5 -5.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.765)
-		(end -0.5 -5.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.665)
-		(end -0.5 -5.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.565)
-		(end -0.5 -5.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.465)
-		(end 1.5 -5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.695)
-		(end -1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.595)
-		(end -0.5 -4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.495)
-		(end -0.5 -4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.395)
-		(end -0.5 -4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.295)
-		(end -0.5 -4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.195)
-		(end 1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.425)
-		(end -1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.325)
-		(end -0.5 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.225)
-		(end -0.5 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.125)
-		(end -0.5 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.025)
-		(end -0.5 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.925)
-		(end 1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end -0.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end -0.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end -0.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.925)
-		(end -1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.025)
-		(end -0.5 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.125)
-		(end -0.5 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.225)
-		(end -0.5 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.325)
-		(end -0.5 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end -0.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end 1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.195)
-		(end -1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.295)
-		(end -0.5 4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.395)
-		(end -0.5 4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.495)
-		(end -0.5 4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.595)
-		(end -0.5 4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end -0.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end 1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.465)
-		(end -1.5 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.565)
-		(end -0.5 5.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.665)
-		(end -0.5 5.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.765)
-		(end -0.5 5.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.865)
-		(end -0.5 5.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.965)
-		(end -0.5 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.965)
-		(end 1.5 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -5.965)
 		(end -0.5 -5.465)
@@ -835,186 +215,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -5.965)
-		(end -1.5 -5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.465)
-		(end 1.5 -5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.695)
-		(end -1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.195)
-		(end 1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.425)
-		(end -1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.925)
-		(end 1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.925)
-		(end -1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.425)
-		(end 1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.195)
-		(end -1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.695)
-		(end 1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.465)
-		(end -1.5 5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.965)
-		(end 1.5 5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -6.985)
 		(end 2.7 6.985)
@@ -1033,6 +233,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -5.965)
+		(end -0.5 -5.465)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.965)
+		(end 1.5 -5.465)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end -0.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end 1.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end -0.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end 1.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end -0.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end 1.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end -0.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end 1.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.465)
+		(end -0.5 5.965)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.465)
+		(end 1.5 5.965)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -1053,105 +453,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.54 -5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.54 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.54 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -2.54 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -2.54 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -2.54 5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.54 5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.54 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.54 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.54 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 2.54 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 2.54 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 2.54 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 2.54 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 2.54 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 2.54 -5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_Copal_CHS-10A_W5.08mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10B_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10B_W7.62mm_P1.27mm.kicad_mod
index b9f85ed16..67d9f3153 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10B_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Copal_CHS-10B_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.86 -7.3)
-		(end -4.86 7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.86 7.3)
 		(end 4.86 7.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 -7.3)
-		(end -4.86 -7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.86 7.3)
-		(end 4.86 -7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,600 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -5.965)
-		(end -1.5 -5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.865)
-		(end -0.5 -5.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.765)
-		(end -0.5 -5.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.665)
-		(end -0.5 -5.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.565)
-		(end -0.5 -5.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.465)
-		(end 1.5 -5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.695)
-		(end -1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.595)
-		(end -0.5 -4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.495)
-		(end -0.5 -4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.395)
-		(end -0.5 -4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.295)
-		(end -0.5 -4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.195)
-		(end 1.5 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.425)
-		(end -1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.325)
-		(end -0.5 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.225)
-		(end -0.5 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.125)
-		(end -0.5 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.025)
-		(end -0.5 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.925)
-		(end 1.5 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.155)
-		(end -1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -2.055)
-		(end -0.5 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.955)
-		(end -0.5 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.855)
-		(end -0.5 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.755)
-		(end -0.5 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.655)
-		(end 1.5 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.885)
-		(end -1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.785)
-		(end -0.5 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.685)
-		(end -0.5 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.585)
-		(end -0.5 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.485)
-		(end -0.5 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end -0.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.385)
-		(end 1.5 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.385)
-		(end -1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.485)
-		(end -0.5 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.585)
-		(end -0.5 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.685)
-		(end -0.5 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.785)
-		(end -0.5 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end -0.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.885)
-		(end 1.5 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.655)
-		(end -1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.755)
-		(end -0.5 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.855)
-		(end -0.5 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.955)
-		(end -0.5 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.055)
-		(end -0.5 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end -0.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.155)
-		(end 1.5 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 2.925)
-		(end -1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.025)
-		(end -0.5 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.125)
-		(end -0.5 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.225)
-		(end -0.5 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.325)
-		(end -0.5 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end -0.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.425)
-		(end 1.5 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.195)
-		(end -1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.295)
-		(end -0.5 4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.395)
-		(end -0.5 4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.495)
-		(end -0.5 4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.595)
-		(end -0.5 4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end -0.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.695)
-		(end 1.5 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.465)
-		(end -1.5 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.565)
-		(end -0.5 5.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.665)
-		(end -0.5 5.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.765)
-		(end -0.5 5.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.865)
-		(end -0.5 5.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.965)
-		(end -0.5 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.965)
-		(end 1.5 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -5.965)
 		(end -0.5 -5.465)
@@ -835,186 +215,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -5.965)
-		(end -1.5 -5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.465)
-		(end 1.5 -5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.695)
-		(end -1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.195)
-		(end 1.5 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.425)
-		(end -1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.925)
-		(end 1.5 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -2.155)
-		(end -1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.655)
-		(end 1.5 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.885)
-		(end -1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.385)
-		(end 1.5 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.385)
-		(end -1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.885)
-		(end 1.5 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.655)
-		(end -1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.155)
-		(end 1.5 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 2.925)
-		(end -1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.425)
-		(end 1.5 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.195)
-		(end -1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.695)
-		(end 1.5 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.465)
-		(end -1.5 5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.965)
-		(end 1.5 5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -6.985)
 		(end 2.7 6.985)
@@ -1033,6 +233,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -5.965)
+		(end -0.5 -5.465)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -5.965)
+		(end 1.5 -5.465)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end -0.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.695)
+		(end 1.5 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end -0.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -3.425)
+		(end 1.5 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end -0.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -2.155)
+		(end 1.5 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end -0.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -0.885)
+		(end 1.5 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end -0.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.385)
+		(end 1.5 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end -0.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 1.655)
+		(end 1.5 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end -0.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 2.925)
+		(end 1.5 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end -0.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 4.195)
+		(end 1.5 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.465)
+		(end -0.5 5.965)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.465)
+		(end 1.5 5.965)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.1 0 90)
 		(layer "F.Fab")
@@ -1053,105 +453,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -3.175)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -4.445)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -5.715)
 		(size 1.6 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_Copal_CHS-10B_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TJ_W5.25mm_P1.27mm_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TJ_W5.25mm_P1.27mm_JPin.kicad_mod
index 5456ff1f0..a4a181023 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TJ_W5.25mm_P1.27mm_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TJ_W5.25mm_P1.27mm_JPin.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.2 -7.56)
-		(end -4.2 7.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.2 7.56)
 		(end 4.2 7.56)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 -7.56)
-		(end -4.2 -7.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.2 7.56)
-		(end 4.2 -7.56)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,870 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -6.115)
-		(end -1 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -6.015)
-		(end -0.333333 -6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.915)
-		(end -0.333333 -5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.815)
-		(end -0.333333 -5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.715)
-		(end -0.333333 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.615)
-		(end -0.333333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.515)
-		(end -0.333333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.415)
-		(end -0.333333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.315)
-		(end 1 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.845)
-		(end -1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.745)
-		(end -0.333333 -4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.645)
-		(end -0.333333 -4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.545)
-		(end -0.333333 -4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.445)
-		(end -0.333333 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.345)
-		(end -0.333333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.245)
-		(end -0.333333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.145)
-		(end -0.333333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.045)
-		(end 1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.575)
-		(end -1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.475)
-		(end -0.333333 -3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.375)
-		(end -0.333333 -3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.275)
-		(end -0.333333 -3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.175)
-		(end -0.333333 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.075)
-		(end -0.333333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.975)
-		(end -0.333333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.875)
-		(end -0.333333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.775)
-		(end 1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end -0.333333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end -0.333333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end -0.333333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.775)
-		(end -1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.875)
-		(end -0.333333 2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.975)
-		(end -0.333333 2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.075)
-		(end -0.333333 3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.175)
-		(end -0.333333 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.275)
-		(end -0.333333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.375)
-		(end -0.333333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.475)
-		(end -0.333333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end -0.333333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end 1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.045)
-		(end -1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.145)
-		(end -0.333333 4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.245)
-		(end -0.333333 4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.345)
-		(end -0.333333 4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.445)
-		(end -0.333333 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.545)
-		(end -0.333333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.645)
-		(end -0.333333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.745)
-		(end -0.333333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end -0.333333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end 1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.315)
-		(end -1 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.415)
-		(end -0.333333 5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.515)
-		(end -0.333333 5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.615)
-		(end -0.333333 5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.715)
-		(end -0.333333 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.815)
-		(end -0.333333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.915)
-		(end -0.333333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 6.015)
-		(end -0.333333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 6.115)
-		(end -0.333333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 6.115)
-		(end 1 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -6.115)
 		(end -0.333333 -5.315)
@@ -1105,186 +215,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -6.115)
-		(end -1 -6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -5.315)
-		(end 1 -6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.845)
-		(end -1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.045)
-		(end 1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.575)
-		(end -1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.775)
-		(end 1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.775)
-		(end -1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.575)
-		(end 1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.045)
-		(end -1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.845)
-		(end 1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 5.315)
-		(end -1 5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 6.115)
-		(end 1 5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -7.25)
 		(end 2.7 7.25)
@@ -1303,6 +233,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -6.115)
+		(end -0.333333 -5.315)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -6.115)
+		(end 1 -5.315)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.845)
+		(end -0.333333 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.845)
+		(end 1 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end -0.333333 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end 1 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end -0.333333 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end 1 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end -0.333333 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end 1 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 5.315)
+		(end -0.333333 6.115)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 5.315)
+		(end 1 6.115)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -1323,105 +453,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -2.625 -5.715)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -2.625 -4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -2.625 -3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -2.625 3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -2.625 4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -2.625 5.715)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 2.625 5.715)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 2.625 4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 2.625 3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 2.625 1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 2.625 0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 2.625 -0.635)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 2.625 -1.905)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 2.625 -3.175)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 2.625 -4.445)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 2.625 -5.715)
 		(size 2.65 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TJ_W5.25mm_P1.27mm_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TS_W7.62mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TS_W7.62mm_P1.27mm.kicad_mod
index dd9d11c37..b4caefd11 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TS_W7.62mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TS_W7.62mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -4.7 -7.47)
-		(end -4.7 7.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -4.7 7.46)
 		(end 4.7 7.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -7.47)
-		(end -4.7 -7.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 7.46)
-		(end 4.7 -7.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,870 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1 -6.115)
-		(end -1 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -6.015)
-		(end -0.333333 -6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.915)
-		(end -0.333333 -5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.815)
-		(end -0.333333 -5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.715)
-		(end -0.333333 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.615)
-		(end -0.333333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.515)
-		(end -0.333333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.415)
-		(end -0.333333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -5.315)
-		(end 1 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.845)
-		(end -1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.745)
-		(end -0.333333 -4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.645)
-		(end -0.333333 -4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.545)
-		(end -0.333333 -4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.445)
-		(end -0.333333 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.345)
-		(end -0.333333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.245)
-		(end -0.333333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.145)
-		(end -0.333333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -4.045)
-		(end 1 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.575)
-		(end -1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.475)
-		(end -0.333333 -3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.375)
-		(end -0.333333 -3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.275)
-		(end -0.333333 -3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.175)
-		(end -0.333333 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -3.075)
-		(end -0.333333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.975)
-		(end -0.333333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.875)
-		(end -0.333333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.775)
-		(end 1 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.305)
-		(end -1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.205)
-		(end -0.333333 -2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.105)
-		(end -0.333333 -2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -2.005)
-		(end -0.333333 -2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.905)
-		(end -0.333333 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.805)
-		(end -0.333333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.705)
-		(end -0.333333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.605)
-		(end -0.333333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.505)
-		(end 1 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -1.035)
-		(end -1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.935)
-		(end -0.333333 -0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.835)
-		(end -0.333333 -0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.735)
-		(end -0.333333 -0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.635)
-		(end -0.333333 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.535)
-		(end -0.333333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.435)
-		(end -0.333333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.335)
-		(end -0.333333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end -0.333333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 -0.235)
-		(end 1 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.235)
-		(end -1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.335)
-		(end -0.333333 0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.435)
-		(end -0.333333 0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.535)
-		(end -0.333333 0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.635)
-		(end -0.333333 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.735)
-		(end -0.333333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.835)
-		(end -0.333333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 0.935)
-		(end -0.333333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end -0.333333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.035)
-		(end 1 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.505)
-		(end -1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.605)
-		(end -0.333333 1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.705)
-		(end -0.333333 1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.805)
-		(end -0.333333 1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 1.905)
-		(end -0.333333 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.005)
-		(end -0.333333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.105)
-		(end -0.333333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.205)
-		(end -0.333333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end -0.333333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.305)
-		(end 1 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.775)
-		(end -1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.875)
-		(end -0.333333 2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 2.975)
-		(end -0.333333 2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.075)
-		(end -0.333333 3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.175)
-		(end -0.333333 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.275)
-		(end -0.333333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.375)
-		(end -0.333333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.475)
-		(end -0.333333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end -0.333333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 3.575)
-		(end 1 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.045)
-		(end -1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.145)
-		(end -0.333333 4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.245)
-		(end -0.333333 4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.345)
-		(end -0.333333 4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.445)
-		(end -0.333333 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.545)
-		(end -0.333333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.645)
-		(end -0.333333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.745)
-		(end -0.333333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end -0.333333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 4.845)
-		(end 1 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.315)
-		(end -1 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.415)
-		(end -0.333333 5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.515)
-		(end -0.333333 5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.615)
-		(end -0.333333 5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.715)
-		(end -0.333333 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.815)
-		(end -0.333333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 5.915)
-		(end -0.333333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 6.015)
-		(end -0.333333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 6.115)
-		(end -0.333333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1 6.115)
-		(end 1 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.333333 -6.115)
 		(end -0.333333 -5.315)
@@ -1105,186 +215,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1 -6.115)
-		(end -1 -6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -5.315)
-		(end 1 -6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.845)
-		(end -1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -4.045)
-		(end 1 -4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -3.575)
-		(end -1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.775)
-		(end 1 -3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -2.305)
-		(end -1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.505)
-		(end 1 -2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -1.035)
-		(end -1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 -0.235)
-		(end 1 -1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 0.235)
-		(end -1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.035)
-		(end 1 0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 1.505)
-		(end -1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.305)
-		(end 1 1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 2.775)
-		(end -1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 3.575)
-		(end 1 2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.045)
-		(end -1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 4.845)
-		(end 1 4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 5.315)
-		(end -1 5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1 6.115)
-		(end 1 5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.7 -7.15)
 		(end 2.7 7.15)
@@ -1303,6 +233,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1 -6.115)
+		(end -0.333333 -5.315)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -6.115)
+		(end 1 -5.315)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.845)
+		(end -0.333333 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -4.845)
+		(end 1 -4.045)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end -0.333333 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -3.575)
+		(end 1 -2.775)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end -0.333333 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -2.305)
+		(end 1 -1.505)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end -0.333333 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 -1.035)
+		(end 1 -0.235)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end -0.333333 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 0.235)
+		(end 1 1.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end -0.333333 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 1.505)
+		(end 1 2.305)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end -0.333333 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 2.775)
+		(end 1 3.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end -0.333333 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 4.045)
+		(end 1 4.845)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 5.315)
+		(end -0.333333 6.115)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1 5.315)
+		(end 1 6.115)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.85 0 90)
 		(layer "F.Fab")
@@ -1323,105 +453,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -5.715)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 5.715)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 5.715)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -0.635)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -1.905)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -3.175)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -4.445)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -5.715)
 		(size 1.27 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_KingTek_DSHP10TS_W7.62mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6H-10101_W6.15mm_P1.27mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6H-10101_W6.15mm_P1.27mm.kicad_mod
index 4700e0144..ded423f7f 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6H-10101_W6.15mm_P1.27mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6H-10101_W6.15mm_P1.27mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.95 -7.3)
-		(end -3.95 7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.95 7.3)
 		(end 3.95 7.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 -7.3)
-		(end -3.95 -7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 3.95 7.3)
-		(end 3.95 -7.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -142,600 +116,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.6 -5.965)
-		(end -1.6 -5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -5.865)
-		(end -0.533333 -5.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -5.765)
-		(end -0.533333 -5.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -5.665)
-		(end -0.533333 -5.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -5.565)
-		(end -0.533333 -5.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -5.465)
-		(end 1.6 -5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.695)
-		(end -1.6 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.595)
-		(end -0.533333 -4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.495)
-		(end -0.533333 -4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.395)
-		(end -0.533333 -4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.295)
-		(end -0.533333 -4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -4.195)
-		(end 1.6 -4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.425)
-		(end -1.6 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.325)
-		(end -0.533333 -3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.225)
-		(end -0.533333 -3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.125)
-		(end -0.533333 -3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -3.025)
-		(end -0.533333 -3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.925)
-		(end 1.6 -2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.155)
-		(end -1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -2.055)
-		(end -0.533333 -2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.955)
-		(end -0.533333 -1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.855)
-		(end -0.533333 -1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.755)
-		(end -0.533333 -1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -1.655)
-		(end 1.6 -1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.885)
-		(end -1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.785)
-		(end -0.533333 -0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.685)
-		(end -0.533333 -0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.585)
-		(end -0.533333 -0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.485)
-		(end -0.533333 -0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.385)
-		(end -0.533333 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 -0.385)
-		(end 1.6 -0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.385)
-		(end -1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.485)
-		(end -0.533333 0.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.585)
-		(end -0.533333 0.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.685)
-		(end -0.533333 0.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.785)
-		(end -0.533333 0.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end -0.533333 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 0.885)
-		(end 1.6 0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.655)
-		(end -1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.755)
-		(end -0.533333 1.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.855)
-		(end -0.533333 1.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 1.955)
-		(end -0.533333 1.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.055)
-		(end -0.533333 2.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end -0.533333 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.155)
-		(end 1.6 2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 2.925)
-		(end -1.6 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.025)
-		(end -0.533333 3.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.125)
-		(end -0.533333 3.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.225)
-		(end -0.533333 3.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.325)
-		(end -0.533333 3.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.425)
-		(end -0.533333 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 3.425)
-		(end 1.6 3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.195)
-		(end -1.6 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.295)
-		(end -0.533333 4.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.395)
-		(end -0.533333 4.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.495)
-		(end -0.533333 4.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.595)
-		(end -0.533333 4.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.695)
-		(end -0.533333 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 4.695)
-		(end 1.6 4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.465)
-		(end -1.6 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.565)
-		(end -0.533333 5.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.665)
-		(end -0.533333 5.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.765)
-		(end -0.533333 5.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.865)
-		(end -0.533333 5.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.965)
-		(end -0.533333 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.6 5.965)
-		(end 1.6 5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.25 -6.985)
 		(end 2.25 -6.985)
@@ -835,186 +215,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.6 -5.965)
-		(end -1.6 -5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -5.465)
-		(end 1.6 -5.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -4.695)
-		(end -1.6 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -4.195)
-		(end 1.6 -4.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -3.425)
-		(end -1.6 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -2.925)
-		(end 1.6 -3.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -2.155)
-		(end -1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -1.655)
-		(end 1.6 -2.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.885)
-		(end -1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 -0.385)
-		(end 1.6 -0.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.385)
-		(end -1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 0.885)
-		(end 1.6 0.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 1.655)
-		(end -1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.155)
-		(end 1.6 1.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 2.925)
-		(end -1.6 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 3.425)
-		(end 1.6 2.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 4.195)
-		(end -1.6 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 4.695)
-		(end 1.6 4.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 5.465)
-		(end -1.6 5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.6 5.965)
-		(end 1.6 5.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 2.25 -6.985)
 		(end 2.25 6.985)
@@ -1033,6 +233,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.6 -5.965)
+		(end -0.533333 -5.465)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -5.965)
+		(end 1.6 -5.465)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -4.695)
+		(end -0.533333 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -4.695)
+		(end 1.6 -4.195)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -3.425)
+		(end -0.533333 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -3.425)
+		(end 1.6 -2.925)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end -0.533333 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -2.155)
+		(end 1.6 -1.655)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end -0.533333 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 -0.885)
+		(end 1.6 -0.385)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end -0.533333 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 0.385)
+		(end 1.6 0.885)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end -0.533333 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 1.655)
+		(end 1.6 2.155)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 2.925)
+		(end -0.533333 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 2.925)
+		(end 1.6 3.425)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 4.195)
+		(end -0.533333 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 4.195)
+		(end 1.6 4.695)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 5.465)
+		(end -0.533333 5.965)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.6 5.465)
+		(end 1.6 5.965)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 1.925 0 90)
 		(layer "F.Fab")
@@ -1053,105 +453,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.075 -5.715)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.075 -4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.075 -3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.075 3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.075 4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.075 5.715)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.075 5.715)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.075 4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.075 3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.075 1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.075 0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.075 -0.635)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.075 -1.905)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.075 -3.175)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.075 -4.445)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.075 -5.715)
 		(size 1.25 0.76)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.25)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_Omron_A6H-10101_W6.15mm_P1.27mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6S-1010x_W8.9mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6S-1010x_W8.9mm_P2.54mm.kicad_mod
index 1d42237cb..d7d680278 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6S-1010x_W8.9mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx10_Slide_Omron_A6S-1010x_W8.9mm_P2.54mm.kicad_mod
@@ -88,40 +88,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.45 -13.48)
-		(end -5.45 13.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.45 13.48)
 		(end 5.45 13.48)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 -13.48)
-		(end -5.45 -13.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.45 13.48)
-		(end 5.45 -13.48)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -151,1140 +125,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.5 -11.98)
-		(end -1.5 -10.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.88)
-		(end -0.5 -11.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.78)
-		(end -0.5 -11.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.68)
-		(end -0.5 -11.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.58)
-		(end -0.5 -11.58)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.48)
-		(end -0.5 -11.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.38)
-		(end -0.5 -11.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.28)
-		(end -0.5 -11.28)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.18)
-		(end -0.5 -11.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -11.08)
-		(end -0.5 -11.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.98)
-		(end -0.5 -10.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.88)
-		(end -0.5 -10.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -10.88)
-		(end 1.5 -10.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.44)
-		(end -1.5 -8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.34)
-		(end -0.5 -9.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.24)
-		(end -0.5 -9.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.14)
-		(end -0.5 -9.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -9.04)
-		(end -0.5 -9.04)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.94)
-		(end -0.5 -8.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.84)
-		(end -0.5 -8.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.74)
-		(end -0.5 -8.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.64)
-		(end -0.5 -8.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.54)
-		(end -0.5 -8.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.44)
-		(end -0.5 -8.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -8.34)
-		(end 1.5 -8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.9)
-		(end -1.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.8)
-		(end -0.5 -6.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.7)
-		(end -0.5 -6.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.6)
-		(end -0.5 -6.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.5)
-		(end -0.5 -6.5)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.4)
-		(end -0.5 -6.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.3)
-		(end -0.5 -6.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.2)
-		(end -0.5 -6.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6.1)
-		(end -0.5 -6.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -6)
-		(end -0.5 -6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.9)
-		(end -0.5 -5.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.8)
-		(end -0.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -5.8)
-		(end 1.5 -5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.36)
-		(end -1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.26)
-		(end -0.5 -4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.16)
-		(end -0.5 -4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -4.06)
-		(end -0.5 -4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.96)
-		(end -0.5 -3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.86)
-		(end -0.5 -3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.76)
-		(end -0.5 -3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.66)
-		(end -0.5 -3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.56)
-		(end -0.5 -3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.46)
-		(end -0.5 -3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.36)
-		(end -0.5 -3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end -0.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -3.26)
-		(end 1.5 -3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.82)
-		(end -1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.72)
-		(end -0.5 -1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.62)
-		(end -0.5 -1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.52)
-		(end -0.5 -1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.42)
-		(end -0.5 -1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.32)
-		(end -0.5 -1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.22)
-		(end -0.5 -1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.12)
-		(end -0.5 -1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -1.02)
-		(end -0.5 -1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.92)
-		(end -0.5 -0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.82)
-		(end -0.5 -0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end -0.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 -0.72)
-		(end 1.5 -0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.72)
-		(end -1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.82)
-		(end -0.5 0.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 0.92)
-		(end -0.5 0.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.02)
-		(end -0.5 1.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.12)
-		(end -0.5 1.12)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.22)
-		(end -0.5 1.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.32)
-		(end -0.5 1.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.42)
-		(end -0.5 1.42)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.52)
-		(end -0.5 1.52)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.62)
-		(end -0.5 1.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.72)
-		(end -0.5 1.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end -0.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 1.82)
-		(end 1.5 1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.26)
-		(end -1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.36)
-		(end -0.5 3.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.46)
-		(end -0.5 3.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.56)
-		(end -0.5 3.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.66)
-		(end -0.5 3.66)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.76)
-		(end -0.5 3.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.86)
-		(end -0.5 3.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 3.96)
-		(end -0.5 3.96)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.06)
-		(end -0.5 4.06)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.16)
-		(end -0.5 4.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.26)
-		(end -0.5 4.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end -0.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 4.36)
-		(end 1.5 4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.8)
-		(end -1.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 5.9)
-		(end -0.5 5.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6)
-		(end -0.5 6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.1)
-		(end -0.5 6.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.2)
-		(end -0.5 6.2)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.3)
-		(end -0.5 6.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.4)
-		(end -0.5 6.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.5)
-		(end -0.5 6.5)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.6)
-		(end -0.5 6.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.7)
-		(end -0.5 6.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.8)
-		(end -0.5 6.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 6.9)
-		(end 1.5 6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.34)
-		(end -1.5 9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.44)
-		(end -0.5 8.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.54)
-		(end -0.5 8.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.64)
-		(end -0.5 8.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.74)
-		(end -0.5 8.74)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.84)
-		(end -0.5 8.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 8.94)
-		(end -0.5 8.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.04)
-		(end -0.5 9.04)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.14)
-		(end -0.5 9.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.24)
-		(end -0.5 9.24)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.34)
-		(end -0.5 9.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 9.44)
-		(end 1.5 9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.88)
-		(end -1.5 11.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 10.98)
-		(end -0.5 10.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.08)
-		(end -0.5 11.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.18)
-		(end -0.5 11.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.28)
-		(end -0.5 11.28)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.38)
-		(end -0.5 11.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.48)
-		(end -0.5 11.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.58)
-		(end -0.5 11.58)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.68)
-		(end -0.5 11.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.78)
-		(end -0.5 11.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.88)
-		(end -0.5 11.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.5 11.98)
-		(end 1.5 11.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.5 -11.98)
 		(end -0.5 -10.88)
@@ -1375,186 +215,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.5 -11.98)
-		(end -1.5 -11.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -10.88)
-		(end 1.5 -11.98)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -9.44)
-		(end -1.5 -9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -8.34)
-		(end 1.5 -9.44)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -6.9)
-		(end -1.5 -6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -5.8)
-		(end 1.5 -6.9)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -4.36)
-		(end -1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -3.26)
-		(end 1.5 -4.36)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -1.82)
-		(end -1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 -0.72)
-		(end 1.5 -1.82)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 0.72)
-		(end -1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 1.82)
-		(end 1.5 0.72)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 3.26)
-		(end -1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 4.36)
-		(end 1.5 3.26)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 5.8)
-		(end -1.5 5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 6.9)
-		(end 1.5 5.8)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 8.34)
-		(end -1.5 8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 9.44)
-		(end 1.5 8.34)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 10.88)
-		(end -1.5 10.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.5 11.98)
-		(end 1.5 10.88)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.1 -13.17)
 		(end 3.1 13.17)
@@ -1573,6 +233,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.5 -11.98)
+		(end -0.5 -10.88)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -11.98)
+		(end 1.5 -10.88)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -9.44)
+		(end -0.5 -8.34)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -9.44)
+		(end 1.5 -8.34)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -6.9)
+		(end -0.5 -5.8)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -6.9)
+		(end 1.5 -5.8)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end -0.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -4.36)
+		(end 1.5 -3.26)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end -0.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 -1.82)
+		(end 1.5 -0.72)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end -0.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 0.72)
+		(end 1.5 1.82)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end -0.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 3.26)
+		(end 1.5 4.36)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.8)
+		(end -0.5 6.9)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 5.8)
+		(end 1.5 6.9)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 8.34)
+		(end -0.5 9.44)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 8.34)
+		(end 1.5 9.44)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 10.88)
+		(end -0.5 11.98)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.5 10.88)
+		(end 1.5 11.98)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.3 0 90)
 		(layer "F.Fab")
@@ -1593,105 +453,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.45 -11.43)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.45 -8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.45 -6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.45 6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.45 8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.45 11.43)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.45 11.43)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.45 8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.45 6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.45 3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.45 1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.45 -1.27)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.45 -3.81)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.45 -6.35)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.45 -8.89)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.45 -11.43)
 		(size 1.5 1.1)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.227273)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx10_Slide_Omron_A6S-1010x_W8.9mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 0783c74d9..21536e926 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -169,1194 +169,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.215)
-		(end -0.603333 -13.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.095)
-		(end -0.603333 -13.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.975)
-		(end -0.603333 -12.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.855)
-		(end -0.603333 -12.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.735)
-		(end -0.603333 -12.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.615)
-		(end -0.603333 -12.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.495)
-		(end -0.603333 -12.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.375)
-		(end -0.603333 -12.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.255)
-		(end -0.603333 -12.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.135)
-		(end -0.603333 -12.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.675)
-		(end -0.603333 -10.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.555)
-		(end -0.603333 -10.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.435)
-		(end -0.603333 -10.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.315)
-		(end -0.603333 -10.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.075)
-		(end -0.603333 -10.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.955)
-		(end -0.603333 -9.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.835)
-		(end -0.603333 -9.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.715)
-		(end -0.603333 -9.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.135)
-		(end -0.603333 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.015)
-		(end -0.603333 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.895)
-		(end -0.603333 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.775)
-		(end -0.603333 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.535)
-		(end -0.603333 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.415)
-		(end -0.603333 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.295)
-		(end -0.603333 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.175)
-		(end -0.603333 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.105)
-		(end -0.603333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.225)
-		(end -0.603333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.345)
-		(end -0.603333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.465)
-		(end -0.603333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.705)
-		(end -0.603333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.825)
-		(end -0.603333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.945)
-		(end -0.603333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.065)
-		(end -0.603333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.645)
-		(end -0.603333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.765)
-		(end -0.603333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.885)
-		(end -0.603333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.005)
-		(end -0.603333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.245)
-		(end -0.603333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.365)
-		(end -0.603333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.485)
-		(end -0.603333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.605)
-		(end -0.603333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.185)
-		(end -0.603333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.305)
-		(end -0.603333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.425)
-		(end -0.603333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.545)
-		(end -0.603333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.665)
-		(end -0.603333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.785)
-		(end -0.603333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.905)
-		(end -0.603333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.025)
-		(end -0.603333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.145)
-		(end -0.603333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.265)
-		(end -0.603333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -13.335)
 		(end -0.603333 -12.065)
@@ -1456,204 +268,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -14.81)
 		(end 3.41 -13.5)
@@ -1762,40 +376,234 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -15.06)
-		(end -4.7 15.06)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end -0.603333 -12.065)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 15.06)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end 1.81 -12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end -0.603333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end 1.81 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -15.06)
 		(end 4.7 15.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -15.06)
-		(end -4.7 -15.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 15.06)
-		(end 4.7 -15.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1825,1392 +633,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.235)
-		(end -0.603333 -13.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.135)
-		(end -0.603333 -13.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.035)
-		(end -0.603333 -13.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.935)
-		(end -0.603333 -12.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.835)
-		(end -0.603333 -12.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.735)
-		(end -0.603333 -12.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.635)
-		(end -0.603333 -12.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.535)
-		(end -0.603333 -12.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.435)
-		(end -0.603333 -12.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.335)
-		(end -0.603333 -12.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.235)
-		(end -0.603333 -12.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.135)
-		(end -0.603333 -12.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.695)
-		(end -0.603333 -10.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.595)
-		(end -0.603333 -10.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.495)
-		(end -0.603333 -10.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.395)
-		(end -0.603333 -10.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.295)
-		(end -0.603333 -10.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.095)
-		(end -0.603333 -10.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.995)
-		(end -0.603333 -9.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.895)
-		(end -0.603333 -9.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.795)
-		(end -0.603333 -9.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.695)
-		(end -0.603333 -9.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.155)
-		(end -0.603333 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.055)
-		(end -0.603333 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.955)
-		(end -0.603333 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.855)
-		(end -0.603333 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.755)
-		(end -0.603333 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.555)
-		(end -0.603333 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.455)
-		(end -0.603333 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.355)
-		(end -0.603333 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.255)
-		(end -0.603333 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.155)
-		(end -0.603333 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.085)
-		(end -0.603333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.185)
-		(end -0.603333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.285)
-		(end -0.603333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.385)
-		(end -0.603333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.485)
-		(end -0.603333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.685)
-		(end -0.603333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.785)
-		(end -0.603333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.885)
-		(end -0.603333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.985)
-		(end -0.603333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.085)
-		(end -0.603333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.625)
-		(end -0.603333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.725)
-		(end -0.603333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.825)
-		(end -0.603333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.925)
-		(end -0.603333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.025)
-		(end -0.603333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.225)
-		(end -0.603333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.325)
-		(end -0.603333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.425)
-		(end -0.603333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.525)
-		(end -0.603333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.625)
-		(end -0.603333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.165)
-		(end -0.603333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.265)
-		(end -0.603333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.365)
-		(end -0.603333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.465)
-		(end -0.603333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.565)
-		(end -0.603333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.665)
-		(end -0.603333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.765)
-		(end -0.603333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.865)
-		(end -0.603333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.965)
-		(end -0.603333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.065)
-		(end -0.603333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.165)
-		(end -0.603333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.265)
-		(end -0.603333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -13.335)
 		(end -0.603333 -12.065)
@@ -3310,204 +732,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -14.75)
 		(end 3.35 14.75)
@@ -3526,6 +750,226 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end -0.603333 -12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end 1.81 -12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end -0.603333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end 1.81 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -3546,115 +990,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -12.7)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.365 7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.365 10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.365 12.7)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.365 12.7)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.365 10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.365 7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.365 5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.365 2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.365 0)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.365 -2.54)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.365 -5.08)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.365 -7.62)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.365 -10.16)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.365 -12.7)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index 8716bb4c7..f75660321 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -169,1194 +169,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.215)
-		(end -0.603333 -13.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.095)
-		(end -0.603333 -13.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.975)
-		(end -0.603333 -12.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.855)
-		(end -0.603333 -12.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.735)
-		(end -0.603333 -12.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.615)
-		(end -0.603333 -12.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.495)
-		(end -0.603333 -12.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.375)
-		(end -0.603333 -12.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.255)
-		(end -0.603333 -12.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.135)
-		(end -0.603333 -12.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.675)
-		(end -0.603333 -10.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.555)
-		(end -0.603333 -10.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.435)
-		(end -0.603333 -10.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.315)
-		(end -0.603333 -10.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.075)
-		(end -0.603333 -10.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.955)
-		(end -0.603333 -9.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.835)
-		(end -0.603333 -9.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.715)
-		(end -0.603333 -9.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.135)
-		(end -0.603333 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.015)
-		(end -0.603333 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.895)
-		(end -0.603333 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.775)
-		(end -0.603333 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.535)
-		(end -0.603333 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.415)
-		(end -0.603333 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.295)
-		(end -0.603333 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.175)
-		(end -0.603333 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.595)
-		(end -0.603333 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.475)
-		(end -0.603333 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.355)
-		(end -0.603333 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.235)
-		(end -0.603333 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.995)
-		(end -0.603333 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.875)
-		(end -0.603333 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.755)
-		(end -0.603333 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.635)
-		(end -0.603333 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.055)
-		(end -0.603333 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.935)
-		(end -0.603333 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.815)
-		(end -0.603333 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.695)
-		(end -0.603333 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.455)
-		(end -0.603333 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.335)
-		(end -0.603333 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.215)
-		(end -0.603333 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -2.095)
-		(end -0.603333 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.515)
-		(end -0.603333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.395)
-		(end -0.603333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.275)
-		(end -0.603333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.155)
-		(end -0.603333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.085)
-		(end -0.603333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.205)
-		(end -0.603333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.325)
-		(end -0.603333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.445)
-		(end -0.603333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.025)
-		(end -0.603333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.145)
-		(end -0.603333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.265)
-		(end -0.603333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.385)
-		(end -0.603333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.625)
-		(end -0.603333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.745)
-		(end -0.603333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.865)
-		(end -0.603333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 2.985)
-		(end -0.603333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.565)
-		(end -0.603333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.685)
-		(end -0.603333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.805)
-		(end -0.603333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.925)
-		(end -0.603333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.165)
-		(end -0.603333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.285)
-		(end -0.603333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.405)
-		(end -0.603333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.525)
-		(end -0.603333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.105)
-		(end -0.603333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.225)
-		(end -0.603333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.345)
-		(end -0.603333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.465)
-		(end -0.603333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.705)
-		(end -0.603333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.825)
-		(end -0.603333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 7.945)
-		(end -0.603333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.065)
-		(end -0.603333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.645)
-		(end -0.603333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.765)
-		(end -0.603333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.885)
-		(end -0.603333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.005)
-		(end -0.603333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.245)
-		(end -0.603333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.365)
-		(end -0.603333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.485)
-		(end -0.603333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.605)
-		(end -0.603333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.185)
-		(end -0.603333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.305)
-		(end -0.603333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.425)
-		(end -0.603333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.545)
-		(end -0.603333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.665)
-		(end -0.603333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.785)
-		(end -0.603333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.905)
-		(end -0.603333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.025)
-		(end -0.603333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.145)
-		(end -0.603333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.265)
-		(end -0.603333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -13.335)
 		(end -0.603333 -12.065)
@@ -1456,204 +268,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -14.81)
 		(end 3.41 -13.5)
@@ -1762,40 +376,234 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -15.06)
-		(end -5.78 15.06)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end -0.603333 -12.065)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 15.06)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end 1.81 -12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end -0.603333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end 1.81 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -15.06)
 		(end 5.78 15.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -15.06)
-		(end -5.78 -15.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 15.06)
-		(end 5.78 -15.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1825,1392 +633,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.235)
-		(end -0.603333 -13.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.135)
-		(end -0.603333 -13.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.035)
-		(end -0.603333 -13.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.935)
-		(end -0.603333 -12.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.835)
-		(end -0.603333 -12.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.735)
-		(end -0.603333 -12.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.635)
-		(end -0.603333 -12.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.535)
-		(end -0.603333 -12.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.435)
-		(end -0.603333 -12.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.335)
-		(end -0.603333 -12.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.235)
-		(end -0.603333 -12.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.135)
-		(end -0.603333 -12.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.695)
-		(end -0.603333 -10.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.595)
-		(end -0.603333 -10.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.495)
-		(end -0.603333 -10.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.395)
-		(end -0.603333 -10.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.295)
-		(end -0.603333 -10.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.195)
-		(end -0.603333 -10.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.095)
-		(end -0.603333 -10.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.995)
-		(end -0.603333 -9.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.895)
-		(end -0.603333 -9.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.795)
-		(end -0.603333 -9.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.695)
-		(end -0.603333 -9.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.595)
-		(end -0.603333 -9.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.155)
-		(end -0.603333 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.055)
-		(end -0.603333 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.955)
-		(end -0.603333 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.855)
-		(end -0.603333 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.755)
-		(end -0.603333 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.655)
-		(end -0.603333 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.555)
-		(end -0.603333 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.455)
-		(end -0.603333 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.355)
-		(end -0.603333 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.255)
-		(end -0.603333 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.155)
-		(end -0.603333 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -7.055)
-		(end -0.603333 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.615)
-		(end -0.603333 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.515)
-		(end -0.603333 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.415)
-		(end -0.603333 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.315)
-		(end -0.603333 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.215)
-		(end -0.603333 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.115)
-		(end -0.603333 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.015)
-		(end -0.603333 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.915)
-		(end -0.603333 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.815)
-		(end -0.603333 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.715)
-		(end -0.603333 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.615)
-		(end -0.603333 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.515)
-		(end -0.603333 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.075)
-		(end -0.603333 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.975)
-		(end -0.603333 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.875)
-		(end -0.603333 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.775)
-		(end -0.603333 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.675)
-		(end -0.603333 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.575)
-		(end -0.603333 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.475)
-		(end -0.603333 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.375)
-		(end -0.603333 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.275)
-		(end -0.603333 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.175)
-		(end -0.603333 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -2.075)
-		(end -0.603333 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.975)
-		(end -0.603333 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.535)
-		(end -0.603333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.435)
-		(end -0.603333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.335)
-		(end -0.603333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.235)
-		(end -0.603333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.135)
-		(end -0.603333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.035)
-		(end -0.603333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.065)
-		(end -0.603333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.165)
-		(end -0.603333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.265)
-		(end -0.603333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.365)
-		(end -0.603333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.465)
-		(end -0.603333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.565)
-		(end -0.603333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.005)
-		(end -0.603333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.105)
-		(end -0.603333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.205)
-		(end -0.603333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.305)
-		(end -0.603333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.405)
-		(end -0.603333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.505)
-		(end -0.603333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.605)
-		(end -0.603333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.705)
-		(end -0.603333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.805)
-		(end -0.603333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 2.905)
-		(end -0.603333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.005)
-		(end -0.603333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.105)
-		(end -0.603333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.545)
-		(end -0.603333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.645)
-		(end -0.603333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.745)
-		(end -0.603333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.845)
-		(end -0.603333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.945)
-		(end -0.603333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.045)
-		(end -0.603333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.145)
-		(end -0.603333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.245)
-		(end -0.603333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.345)
-		(end -0.603333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.445)
-		(end -0.603333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.545)
-		(end -0.603333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.645)
-		(end -0.603333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.085)
-		(end -0.603333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.185)
-		(end -0.603333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.285)
-		(end -0.603333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.385)
-		(end -0.603333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.485)
-		(end -0.603333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.585)
-		(end -0.603333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.685)
-		(end -0.603333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.785)
-		(end -0.603333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.885)
-		(end -0.603333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 7.985)
-		(end -0.603333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.085)
-		(end -0.603333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.185)
-		(end -0.603333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.625)
-		(end -0.603333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.725)
-		(end -0.603333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.825)
-		(end -0.603333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.925)
-		(end -0.603333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.025)
-		(end -0.603333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.125)
-		(end -0.603333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.225)
-		(end -0.603333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.325)
-		(end -0.603333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.425)
-		(end -0.603333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.525)
-		(end -0.603333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.625)
-		(end -0.603333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.725)
-		(end -0.603333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.165)
-		(end -0.603333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.265)
-		(end -0.603333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.365)
-		(end -0.603333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.465)
-		(end -0.603333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.565)
-		(end -0.603333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.665)
-		(end -0.603333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.765)
-		(end -0.603333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.865)
-		(end -0.603333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.965)
-		(end -0.603333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.065)
-		(end -0.603333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.165)
-		(end -0.603333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.265)
-		(end -0.603333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -13.335)
 		(end -0.603333 -12.065)
@@ -3310,204 +732,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -14.75)
 		(end 3.35 14.75)
@@ -3526,6 +750,226 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end -0.603333 -12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -13.335)
+		(end 1.81 -12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end -0.603333 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -10.795)
+		(end 1.81 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end -0.603333 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -8.255)
+		(end 1.81 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end -0.603333 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -5.715)
+		(end 1.81 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end -0.603333 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -3.175)
+		(end 1.81 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end -0.603333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -0.635)
+		(end 1.81 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end -0.603333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 1.905)
+		(end 1.81 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end -0.603333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 4.445)
+		(end 1.81 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end -0.603333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 6.985)
+		(end 1.81 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end -0.603333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 9.525)
+		(end 1.81 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end -0.603333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 12.065)
+		(end 1.81 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -3546,115 +990,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.305 12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.305 -12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W8.61mm_P2.54mm.kicad_mod
index e73999709..78dff130d 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W8.61mm_P2.54mm.kicad_mod
@@ -169,1194 +169,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -13.335)
-		(end -2.03 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.215)
-		(end -0.676667 -13.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.095)
-		(end -0.676667 -13.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.975)
-		(end -0.676667 -12.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.855)
-		(end -0.676667 -12.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.735)
-		(end -0.676667 -12.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.615)
-		(end -0.676667 -12.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.495)
-		(end -0.676667 -12.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.375)
-		(end -0.676667 -12.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.255)
-		(end -0.676667 -12.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.135)
-		(end -0.676667 -12.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.065)
-		(end 2.03 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.675)
-		(end -0.676667 -10.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.555)
-		(end -0.676667 -10.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.435)
-		(end -0.676667 -10.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.315)
-		(end -0.676667 -10.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.195)
-		(end -0.676667 -10.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.075)
-		(end -0.676667 -10.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.955)
-		(end -0.676667 -9.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.835)
-		(end -0.676667 -9.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.715)
-		(end -0.676667 -9.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.595)
-		(end -0.676667 -9.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.135)
-		(end -0.676667 -8.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.015)
-		(end -0.676667 -8.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.895)
-		(end -0.676667 -7.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.775)
-		(end -0.676667 -7.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.655)
-		(end -0.676667 -7.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.535)
-		(end -0.676667 -7.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.415)
-		(end -0.676667 -7.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.295)
-		(end -0.676667 -7.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.175)
-		(end -0.676667 -7.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -7.055)
-		(end -0.676667 -7.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.595)
-		(end -0.676667 -5.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.475)
-		(end -0.676667 -5.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.355)
-		(end -0.676667 -5.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.235)
-		(end -0.676667 -5.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.995)
-		(end -0.676667 -4.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.875)
-		(end -0.676667 -4.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.755)
-		(end -0.676667 -4.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.635)
-		(end -0.676667 -4.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.055)
-		(end -0.676667 -3.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.935)
-		(end -0.676667 -2.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.815)
-		(end -0.676667 -2.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.695)
-		(end -0.676667 -2.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.455)
-		(end -0.676667 -2.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.335)
-		(end -0.676667 -2.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.215)
-		(end -0.676667 -2.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -2.095)
-		(end -0.676667 -2.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.515)
-		(end -0.676667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.395)
-		(end -0.676667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.275)
-		(end -0.676667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.155)
-		(end -0.676667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.085)
-		(end -0.676667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.205)
-		(end -0.676667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.325)
-		(end -0.676667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.445)
-		(end -0.676667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.025)
-		(end -0.676667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.145)
-		(end -0.676667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.265)
-		(end -0.676667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.385)
-		(end -0.676667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.625)
-		(end -0.676667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.745)
-		(end -0.676667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.865)
-		(end -0.676667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 2.985)
-		(end -0.676667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.565)
-		(end -0.676667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.685)
-		(end -0.676667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.805)
-		(end -0.676667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.925)
-		(end -0.676667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.165)
-		(end -0.676667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.285)
-		(end -0.676667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.405)
-		(end -0.676667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.525)
-		(end -0.676667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.105)
-		(end -0.676667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.225)
-		(end -0.676667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.345)
-		(end -0.676667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.465)
-		(end -0.676667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.585)
-		(end -0.676667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.705)
-		(end -0.676667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.825)
-		(end -0.676667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 7.945)
-		(end -0.676667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.065)
-		(end -0.676667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.185)
-		(end -0.676667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.645)
-		(end -0.676667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.765)
-		(end -0.676667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.885)
-		(end -0.676667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.005)
-		(end -0.676667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.125)
-		(end -0.676667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.245)
-		(end -0.676667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.365)
-		(end -0.676667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.485)
-		(end -0.676667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.605)
-		(end -0.676667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.725)
-		(end -0.676667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.065)
-		(end -2.03 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.185)
-		(end -0.676667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.305)
-		(end -0.676667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.425)
-		(end -0.676667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.545)
-		(end -0.676667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.665)
-		(end -0.676667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.785)
-		(end -0.676667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.905)
-		(end -0.676667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.025)
-		(end -0.676667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.145)
-		(end -0.676667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.265)
-		(end -0.676667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.335)
-		(end 2.03 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -13.335)
 		(end -0.676667 -12.065)
@@ -1456,204 +268,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -13.335)
-		(end -2.03 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -12.065)
-		(end 2.03 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 12.065)
-		(end -2.03 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 13.335)
-		(end 2.03 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -15.12)
 		(end 4.95 -13.5)
@@ -1762,40 +376,234 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -15.37)
-		(end -5.78 15.37)
+	(fp_rect
+		(start -2.03 -13.335)
+		(end -0.676667 -12.065)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 15.37)
+	(fp_rect
+		(start -2.03 -13.335)
+		(end 2.03 -12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end -0.676667 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end 2.03 -9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end -0.676667 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end 2.03 -6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end -0.676667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end 2.03 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end -0.676667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end 2.03 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 12.065)
+		(end -0.676667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 12.065)
+		(end 2.03 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -15.37)
 		(end 5.78 15.37)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -15.37)
-		(end -5.78 -15.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 15.37)
-		(end 5.78 -15.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1825,1392 +633,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -13.335)
-		(end -2.03 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.235)
-		(end -0.676667 -13.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.135)
-		(end -0.676667 -13.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.035)
-		(end -0.676667 -13.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.935)
-		(end -0.676667 -12.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.835)
-		(end -0.676667 -12.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.735)
-		(end -0.676667 -12.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.635)
-		(end -0.676667 -12.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.535)
-		(end -0.676667 -12.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.435)
-		(end -0.676667 -12.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.335)
-		(end -0.676667 -12.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.235)
-		(end -0.676667 -12.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.135)
-		(end -0.676667 -12.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.065)
-		(end 2.03 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.695)
-		(end -0.676667 -10.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.595)
-		(end -0.676667 -10.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.495)
-		(end -0.676667 -10.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.395)
-		(end -0.676667 -10.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.295)
-		(end -0.676667 -10.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.195)
-		(end -0.676667 -10.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.095)
-		(end -0.676667 -10.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.995)
-		(end -0.676667 -9.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.895)
-		(end -0.676667 -9.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.795)
-		(end -0.676667 -9.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.695)
-		(end -0.676667 -9.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.595)
-		(end -0.676667 -9.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.155)
-		(end -0.676667 -8.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.055)
-		(end -0.676667 -8.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.955)
-		(end -0.676667 -7.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.855)
-		(end -0.676667 -7.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.755)
-		(end -0.676667 -7.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.655)
-		(end -0.676667 -7.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.555)
-		(end -0.676667 -7.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.455)
-		(end -0.676667 -7.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.355)
-		(end -0.676667 -7.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.255)
-		(end -0.676667 -7.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.155)
-		(end -0.676667 -7.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -7.055)
-		(end -0.676667 -7.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.615)
-		(end -0.676667 -5.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.515)
-		(end -0.676667 -5.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.415)
-		(end -0.676667 -5.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.315)
-		(end -0.676667 -5.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.215)
-		(end -0.676667 -5.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.115)
-		(end -0.676667 -5.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.015)
-		(end -0.676667 -5.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.915)
-		(end -0.676667 -4.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.815)
-		(end -0.676667 -4.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.715)
-		(end -0.676667 -4.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.615)
-		(end -0.676667 -4.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.515)
-		(end -0.676667 -4.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.075)
-		(end -0.676667 -3.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.975)
-		(end -0.676667 -2.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.875)
-		(end -0.676667 -2.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.775)
-		(end -0.676667 -2.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.675)
-		(end -0.676667 -2.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.575)
-		(end -0.676667 -2.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.475)
-		(end -0.676667 -2.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.375)
-		(end -0.676667 -2.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.275)
-		(end -0.676667 -2.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.175)
-		(end -0.676667 -2.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -2.075)
-		(end -0.676667 -2.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.975)
-		(end -0.676667 -1.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.535)
-		(end -0.676667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.435)
-		(end -0.676667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.335)
-		(end -0.676667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.235)
-		(end -0.676667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.135)
-		(end -0.676667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.035)
-		(end -0.676667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.065)
-		(end -0.676667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.165)
-		(end -0.676667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.265)
-		(end -0.676667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.365)
-		(end -0.676667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.465)
-		(end -0.676667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.565)
-		(end -0.676667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.005)
-		(end -0.676667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.105)
-		(end -0.676667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.205)
-		(end -0.676667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.305)
-		(end -0.676667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.405)
-		(end -0.676667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.505)
-		(end -0.676667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.605)
-		(end -0.676667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.705)
-		(end -0.676667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.805)
-		(end -0.676667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 2.905)
-		(end -0.676667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.005)
-		(end -0.676667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.105)
-		(end -0.676667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.545)
-		(end -0.676667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.645)
-		(end -0.676667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.745)
-		(end -0.676667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.845)
-		(end -0.676667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.945)
-		(end -0.676667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.045)
-		(end -0.676667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.145)
-		(end -0.676667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.245)
-		(end -0.676667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.345)
-		(end -0.676667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.445)
-		(end -0.676667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.545)
-		(end -0.676667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.645)
-		(end -0.676667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.085)
-		(end -0.676667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.185)
-		(end -0.676667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.285)
-		(end -0.676667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.385)
-		(end -0.676667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.485)
-		(end -0.676667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.585)
-		(end -0.676667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.685)
-		(end -0.676667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.785)
-		(end -0.676667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.885)
-		(end -0.676667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 7.985)
-		(end -0.676667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.085)
-		(end -0.676667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.185)
-		(end -0.676667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.625)
-		(end -0.676667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.725)
-		(end -0.676667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.825)
-		(end -0.676667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.925)
-		(end -0.676667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.025)
-		(end -0.676667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.125)
-		(end -0.676667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.225)
-		(end -0.676667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.325)
-		(end -0.676667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.425)
-		(end -0.676667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.525)
-		(end -0.676667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.625)
-		(end -0.676667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.725)
-		(end -0.676667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.065)
-		(end -2.03 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.165)
-		(end -0.676667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.265)
-		(end -0.676667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.365)
-		(end -0.676667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.465)
-		(end -0.676667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.565)
-		(end -0.676667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.665)
-		(end -0.676667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.765)
-		(end -0.676667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.865)
-		(end -0.676667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.965)
-		(end -0.676667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.065)
-		(end -0.676667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.165)
-		(end -0.676667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.265)
-		(end -0.676667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.335)
-		(end 2.03 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -13.335)
 		(end -0.676667 -12.065)
@@ -3310,204 +732,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -13.335)
-		(end -2.03 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -12.065)
-		(end 2.03 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 12.065)
-		(end -2.03 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 13.335)
-		(end 2.03 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -15.06)
 		(end 4.89 15.06)
@@ -3526,6 +750,226 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -13.335)
+		(end -0.676667 -12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -13.335)
+		(end 2.03 -12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end -0.676667 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -10.795)
+		(end 2.03 -9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end -0.676667 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -8.255)
+		(end 2.03 -6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end -0.676667 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -5.715)
+		(end 2.03 -4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end -0.676667 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -3.175)
+		(end 2.03 -1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end -0.676667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -0.635)
+		(end 2.03 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end -0.676667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 1.905)
+		(end 2.03 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end -0.676667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 4.445)
+		(end 2.03 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end -0.676667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 6.985)
+		(end 2.03 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end -0.676667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 9.525)
+		(end 2.03 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 12.065)
+		(end -0.676667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 12.065)
+		(end 2.03 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -3546,115 +990,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.305 12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.305 12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 0)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 -2.54)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.305 -5.08)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.305 -7.62)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.305 -10.16)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.305 -12.7)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
index 4a0d1276d..668ef8330 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W6.73mm_P2.54mm_LowProfile_JPin.kicad_mod
@@ -178,1302 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -14.605)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.485)
-		(end -0.603333 -14.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.365)
-		(end -0.603333 -14.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.245)
-		(end -0.603333 -14.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.125)
-		(end -0.603333 -14.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.005)
-		(end -0.603333 -14.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.885)
-		(end -0.603333 -13.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.765)
-		(end -0.603333 -13.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.645)
-		(end -0.603333 -13.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.525)
-		(end -0.603333 -13.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.405)
-		(end -0.603333 -13.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.945)
-		(end -0.603333 -11.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.825)
-		(end -0.603333 -11.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.705)
-		(end -0.603333 -11.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.585)
-		(end -0.603333 -11.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.345)
-		(end -0.603333 -11.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.225)
-		(end -0.603333 -11.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.105)
-		(end -0.603333 -11.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.985)
-		(end -0.603333 -10.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.405)
-		(end -0.603333 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.285)
-		(end -0.603333 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.165)
-		(end -0.603333 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.045)
-		(end -0.603333 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.805)
-		(end -0.603333 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.685)
-		(end -0.603333 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.565)
-		(end -0.603333 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.445)
-		(end -0.603333 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.375)
-		(end -0.603333 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.495)
-		(end -0.603333 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.615)
-		(end -0.603333 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.735)
-		(end -0.603333 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.975)
-		(end -0.603333 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.095)
-		(end -0.603333 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.215)
-		(end -0.603333 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.335)
-		(end -0.603333 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.915)
-		(end -0.603333 10.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.035)
-		(end -0.603333 11.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.155)
-		(end -0.603333 11.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.275)
-		(end -0.603333 11.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.515)
-		(end -0.603333 11.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.635)
-		(end -0.603333 11.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.755)
-		(end -0.603333 11.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.875)
-		(end -0.603333 11.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end -1.81 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.455)
-		(end -0.603333 13.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.575)
-		(end -0.603333 13.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.695)
-		(end -0.603333 13.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.815)
-		(end -0.603333 13.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.935)
-		(end -0.603333 13.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.055)
-		(end -0.603333 14.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.175)
-		(end -0.603333 14.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.295)
-		(end -0.603333 14.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.415)
-		(end -0.603333 14.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.535)
-		(end -0.603333 14.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.605)
-		(end 1.81 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -14.605)
 		(end -0.603333 -13.335)
@@ -1582,222 +286,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -14.605)
-		(end -1.81 -14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end 1.81 -14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 14.605)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -16.08)
 		(end 3.41 -14.77)
@@ -1915,40 +403,254 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 -16.34)
-		(end -4.7 16.33)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end -0.603333 -13.335)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -4.7 16.33)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end 1.81 -13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end -0.603333 14.605)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end 1.81 14.605)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -4.7 -16.34)
 		(end 4.7 16.33)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 -16.34)
-		(end -4.7 -16.34)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 4.7 16.33)
-		(end 4.7 -16.34)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1978,1518 +680,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -14.605)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.505)
-		(end -0.603333 -14.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.405)
-		(end -0.603333 -14.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.305)
-		(end -0.603333 -14.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.205)
-		(end -0.603333 -14.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.105)
-		(end -0.603333 -14.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.005)
-		(end -0.603333 -14.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.905)
-		(end -0.603333 -13.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.805)
-		(end -0.603333 -13.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.705)
-		(end -0.603333 -13.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.605)
-		(end -0.603333 -13.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.505)
-		(end -0.603333 -13.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.405)
-		(end -0.603333 -13.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.965)
-		(end -0.603333 -11.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.865)
-		(end -0.603333 -11.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.765)
-		(end -0.603333 -11.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.665)
-		(end -0.603333 -11.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.565)
-		(end -0.603333 -11.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.365)
-		(end -0.603333 -11.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.265)
-		(end -0.603333 -11.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.165)
-		(end -0.603333 -11.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.065)
-		(end -0.603333 -11.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.965)
-		(end -0.603333 -10.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.425)
-		(end -0.603333 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.325)
-		(end -0.603333 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.225)
-		(end -0.603333 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.125)
-		(end -0.603333 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.025)
-		(end -0.603333 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.825)
-		(end -0.603333 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.725)
-		(end -0.603333 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.625)
-		(end -0.603333 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.525)
-		(end -0.603333 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.425)
-		(end -0.603333 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.355)
-		(end -0.603333 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.455)
-		(end -0.603333 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.555)
-		(end -0.603333 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.655)
-		(end -0.603333 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.755)
-		(end -0.603333 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.955)
-		(end -0.603333 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.055)
-		(end -0.603333 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.155)
-		(end -0.603333 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.255)
-		(end -0.603333 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.355)
-		(end -0.603333 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.895)
-		(end -0.603333 10.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.995)
-		(end -0.603333 10.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.095)
-		(end -0.603333 11.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.195)
-		(end -0.603333 11.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.295)
-		(end -0.603333 11.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.495)
-		(end -0.603333 11.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.595)
-		(end -0.603333 11.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.695)
-		(end -0.603333 11.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.795)
-		(end -0.603333 11.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.895)
-		(end -0.603333 11.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end -1.81 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.435)
-		(end -0.603333 13.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.535)
-		(end -0.603333 13.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.635)
-		(end -0.603333 13.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.735)
-		(end -0.603333 13.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.835)
-		(end -0.603333 13.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.935)
-		(end -0.603333 13.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.035)
-		(end -0.603333 14.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.135)
-		(end -0.603333 14.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.235)
-		(end -0.603333 14.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.335)
-		(end -0.603333 14.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.435)
-		(end -0.603333 14.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.535)
-		(end -0.603333 14.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.605)
-		(end 1.81 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -14.605)
 		(end -0.603333 -13.335)
@@ -3598,222 +788,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -14.605)
-		(end -1.81 -14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end 1.81 -14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 14.605)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -16.02)
 		(end 3.35 16.02)
@@ -3832,6 +806,246 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end -0.603333 -13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end 1.81 -13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end -0.603333 14.605)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end 1.81 14.605)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -3852,125 +1066,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.365 -13.97)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.365 -11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.365 -8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.365 8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.365 11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -3.365 13.97)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.365 13.97)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.365 11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.365 8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.365 6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.365 3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.365 1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.365 -1.27)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.365 -3.81)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.365 -6.35)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.365 -8.89)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 3.365 -11.43)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 3.365 -13.97)
 		(size 2.16 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W6.73mm_P2.54mm_LowProfile_JPin.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W8.61mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
index f1a4ce6b4..f53a03de1 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W8.61mm_P2.54mm_LowProfile.kicad_mod
@@ -178,1302 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.81 -14.605)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.485)
-		(end -0.603333 -14.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.365)
-		(end -0.603333 -14.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.245)
-		(end -0.603333 -14.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.125)
-		(end -0.603333 -14.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -14.005)
-		(end -0.603333 -14.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.885)
-		(end -0.603333 -13.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.765)
-		(end -0.603333 -13.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.645)
-		(end -0.603333 -13.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.525)
-		(end -0.603333 -13.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.405)
-		(end -0.603333 -13.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.945)
-		(end -0.603333 -11.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.825)
-		(end -0.603333 -11.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.705)
-		(end -0.603333 -11.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.585)
-		(end -0.603333 -11.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.345)
-		(end -0.603333 -11.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.225)
-		(end -0.603333 -11.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -11.105)
-		(end -0.603333 -11.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.985)
-		(end -0.603333 -10.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.405)
-		(end -0.603333 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.285)
-		(end -0.603333 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.165)
-		(end -0.603333 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -9.045)
-		(end -0.603333 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.805)
-		(end -0.603333 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.685)
-		(end -0.603333 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.565)
-		(end -0.603333 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.445)
-		(end -0.603333 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.865)
-		(end -0.603333 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.745)
-		(end -0.603333 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.625)
-		(end -0.603333 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.505)
-		(end -0.603333 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.265)
-		(end -0.603333 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.145)
-		(end -0.603333 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -6.025)
-		(end -0.603333 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.905)
-		(end -0.603333 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.325)
-		(end -0.603333 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.205)
-		(end -0.603333 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -4.085)
-		(end -0.603333 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.965)
-		(end -0.603333 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.725)
-		(end -0.603333 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.605)
-		(end -0.603333 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.485)
-		(end -0.603333 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.365)
-		(end -0.603333 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.785)
-		(end -0.603333 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.665)
-		(end -0.603333 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.545)
-		(end -0.603333 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.425)
-		(end -0.603333 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.185)
-		(end -0.603333 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -1.065)
-		(end -0.603333 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.945)
-		(end -0.603333 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.825)
-		(end -0.603333 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.755)
-		(end -0.603333 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.875)
-		(end -0.603333 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 0.995)
-		(end -0.603333 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.115)
-		(end -0.603333 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.355)
-		(end -0.603333 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.475)
-		(end -0.603333 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.595)
-		(end -0.603333 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.715)
-		(end -0.603333 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.295)
-		(end -0.603333 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.415)
-		(end -0.603333 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.535)
-		(end -0.603333 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.655)
-		(end -0.603333 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 3.895)
-		(end -0.603333 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.015)
-		(end -0.603333 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.135)
-		(end -0.603333 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.255)
-		(end -0.603333 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.835)
-		(end -0.603333 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 5.955)
-		(end -0.603333 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.075)
-		(end -0.603333 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.195)
-		(end -0.603333 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.435)
-		(end -0.603333 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.555)
-		(end -0.603333 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.675)
-		(end -0.603333 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.795)
-		(end -0.603333 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.375)
-		(end -0.603333 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.495)
-		(end -0.603333 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.615)
-		(end -0.603333 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.735)
-		(end -0.603333 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 8.975)
-		(end -0.603333 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.095)
-		(end -0.603333 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.215)
-		(end -0.603333 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.335)
-		(end -0.603333 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 10.915)
-		(end -0.603333 10.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.035)
-		(end -0.603333 11.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.155)
-		(end -0.603333 11.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.275)
-		(end -0.603333 11.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.515)
-		(end -0.603333 11.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.635)
-		(end -0.603333 11.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.755)
-		(end -0.603333 11.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.875)
-		(end -0.603333 11.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end -1.81 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.455)
-		(end -0.603333 13.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.575)
-		(end -0.603333 13.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.695)
-		(end -0.603333 13.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.815)
-		(end -0.603333 13.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 13.935)
-		(end -0.603333 13.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.055)
-		(end -0.603333 14.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.175)
-		(end -0.603333 14.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.295)
-		(end -0.603333 14.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.415)
-		(end -0.603333 14.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.535)
-		(end -0.603333 14.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.81 14.605)
-		(end 1.81 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.603333 -14.605)
 		(end -0.603333 -13.335)
@@ -1582,222 +286,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.81 -14.605)
-		(end -1.81 -14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end 1.81 -14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.81 14.605)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.41 -16.08)
 		(end 3.41 -14.77)
@@ -1915,40 +403,254 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -16.34)
-		(end -5.78 16.33)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end -0.603333 -13.335)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 16.33)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end 1.81 -13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end -0.603333 14.605)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end 1.81 14.605)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -16.34)
 		(end 5.78 16.33)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -16.34)
-		(end -5.78 -16.34)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 16.33)
-		(end 5.78 -16.34)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1978,1518 +680,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.81 -14.605)
-		(end -1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.505)
-		(end -0.603333 -14.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.405)
-		(end -0.603333 -14.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.305)
-		(end -0.603333 -14.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.205)
-		(end -0.603333 -14.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.105)
-		(end -0.603333 -14.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -14.005)
-		(end -0.603333 -14.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.905)
-		(end -0.603333 -13.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.805)
-		(end -0.603333 -13.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.705)
-		(end -0.603333 -13.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.605)
-		(end -0.603333 -13.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.505)
-		(end -0.603333 -13.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.405)
-		(end -0.603333 -13.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -13.335)
-		(end 1.81 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -12.065)
-		(end -1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.965)
-		(end -0.603333 -11.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.865)
-		(end -0.603333 -11.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.765)
-		(end -0.603333 -11.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.665)
-		(end -0.603333 -11.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.565)
-		(end -0.603333 -11.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.465)
-		(end -0.603333 -11.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.365)
-		(end -0.603333 -11.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.265)
-		(end -0.603333 -11.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.165)
-		(end -0.603333 -11.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -11.065)
-		(end -0.603333 -11.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.965)
-		(end -0.603333 -10.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.865)
-		(end -0.603333 -10.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -10.795)
-		(end 1.81 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.525)
-		(end -1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.425)
-		(end -0.603333 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.325)
-		(end -0.603333 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.225)
-		(end -0.603333 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.125)
-		(end -0.603333 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -9.025)
-		(end -0.603333 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.925)
-		(end -0.603333 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.825)
-		(end -0.603333 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.725)
-		(end -0.603333 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.625)
-		(end -0.603333 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.525)
-		(end -0.603333 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.425)
-		(end -0.603333 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.325)
-		(end -0.603333 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -8.255)
-		(end 1.81 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.985)
-		(end -1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.885)
-		(end -0.603333 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.785)
-		(end -0.603333 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.685)
-		(end -0.603333 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.585)
-		(end -0.603333 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.485)
-		(end -0.603333 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.385)
-		(end -0.603333 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.285)
-		(end -0.603333 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.185)
-		(end -0.603333 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -6.085)
-		(end -0.603333 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.985)
-		(end -0.603333 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.885)
-		(end -0.603333 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.785)
-		(end -0.603333 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -5.715)
-		(end 1.81 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.445)
-		(end -1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.345)
-		(end -0.603333 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.245)
-		(end -0.603333 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.145)
-		(end -0.603333 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -4.045)
-		(end -0.603333 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.945)
-		(end -0.603333 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.845)
-		(end -0.603333 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.745)
-		(end -0.603333 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.645)
-		(end -0.603333 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.545)
-		(end -0.603333 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.445)
-		(end -0.603333 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.345)
-		(end -0.603333 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.245)
-		(end -0.603333 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -3.175)
-		(end 1.81 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.905)
-		(end -1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.805)
-		(end -0.603333 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.705)
-		(end -0.603333 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.605)
-		(end -0.603333 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.505)
-		(end -0.603333 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.405)
-		(end -0.603333 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.305)
-		(end -0.603333 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.205)
-		(end -0.603333 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.105)
-		(end -0.603333 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -1.005)
-		(end -0.603333 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.905)
-		(end -0.603333 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.805)
-		(end -0.603333 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.705)
-		(end -0.603333 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 -0.635)
-		(end 1.81 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.635)
-		(end -1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.735)
-		(end -0.603333 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.835)
-		(end -0.603333 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 0.935)
-		(end -0.603333 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.035)
-		(end -0.603333 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.135)
-		(end -0.603333 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.235)
-		(end -0.603333 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.335)
-		(end -0.603333 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.435)
-		(end -0.603333 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.535)
-		(end -0.603333 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.635)
-		(end -0.603333 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.735)
-		(end -0.603333 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.835)
-		(end -0.603333 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 1.905)
-		(end 1.81 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.175)
-		(end -1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.275)
-		(end -0.603333 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.375)
-		(end -0.603333 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.475)
-		(end -0.603333 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.575)
-		(end -0.603333 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.675)
-		(end -0.603333 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.775)
-		(end -0.603333 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.875)
-		(end -0.603333 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 3.975)
-		(end -0.603333 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.075)
-		(end -0.603333 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.175)
-		(end -0.603333 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.275)
-		(end -0.603333 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.375)
-		(end -0.603333 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 4.445)
-		(end 1.81 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.715)
-		(end -1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.815)
-		(end -0.603333 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 5.915)
-		(end -0.603333 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.015)
-		(end -0.603333 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.115)
-		(end -0.603333 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.215)
-		(end -0.603333 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.315)
-		(end -0.603333 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.415)
-		(end -0.603333 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.515)
-		(end -0.603333 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.615)
-		(end -0.603333 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.715)
-		(end -0.603333 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.815)
-		(end -0.603333 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.915)
-		(end -0.603333 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 6.985)
-		(end 1.81 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.255)
-		(end -1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.355)
-		(end -0.603333 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.455)
-		(end -0.603333 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.555)
-		(end -0.603333 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.655)
-		(end -0.603333 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.755)
-		(end -0.603333 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.855)
-		(end -0.603333 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 8.955)
-		(end -0.603333 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.055)
-		(end -0.603333 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.155)
-		(end -0.603333 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.255)
-		(end -0.603333 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.355)
-		(end -0.603333 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.455)
-		(end -0.603333 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 9.525)
-		(end 1.81 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.795)
-		(end -1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.895)
-		(end -0.603333 10.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 10.995)
-		(end -0.603333 10.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.095)
-		(end -0.603333 11.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.195)
-		(end -0.603333 11.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.295)
-		(end -0.603333 11.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.395)
-		(end -0.603333 11.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.495)
-		(end -0.603333 11.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.595)
-		(end -0.603333 11.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.695)
-		(end -0.603333 11.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.795)
-		(end -0.603333 11.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.895)
-		(end -0.603333 11.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 11.995)
-		(end -0.603333 11.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 12.065)
-		(end 1.81 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.335)
-		(end -1.81 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.435)
-		(end -0.603333 13.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.535)
-		(end -0.603333 13.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.635)
-		(end -0.603333 13.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.735)
-		(end -0.603333 13.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.835)
-		(end -0.603333 13.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 13.935)
-		(end -0.603333 13.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.035)
-		(end -0.603333 14.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.135)
-		(end -0.603333 14.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.235)
-		(end -0.603333 14.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.335)
-		(end -0.603333 14.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.435)
-		(end -0.603333 14.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.535)
-		(end -0.603333 14.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.81 14.605)
-		(end 1.81 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.603333 -14.605)
 		(end -0.603333 -13.335)
@@ -3598,222 +788,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.81 -14.605)
-		(end -1.81 -14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -13.335)
-		(end 1.81 -14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -12.065)
-		(end -1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -10.795)
-		(end 1.81 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -9.525)
-		(end -1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -8.255)
-		(end 1.81 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -6.985)
-		(end -1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -5.715)
-		(end 1.81 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -4.445)
-		(end -1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -3.175)
-		(end 1.81 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -1.905)
-		(end -1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 -0.635)
-		(end 1.81 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 0.635)
-		(end -1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 1.905)
-		(end 1.81 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 3.175)
-		(end -1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 4.445)
-		(end 1.81 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 5.715)
-		(end -1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 6.985)
-		(end 1.81 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 8.255)
-		(end -1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 9.525)
-		(end 1.81 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 10.795)
-		(end -1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 12.065)
-		(end 1.81 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 13.335)
-		(end -1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.81 14.605)
-		(end 1.81 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.35 -16.02)
 		(end 3.35 16.02)
@@ -3832,6 +806,246 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end -0.603333 -13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -14.605)
+		(end 1.81 -13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end -0.603333 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -12.065)
+		(end 1.81 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end -0.603333 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -9.525)
+		(end 1.81 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end -0.603333 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -6.985)
+		(end 1.81 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end -0.603333 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -4.445)
+		(end 1.81 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end -0.603333 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 -1.905)
+		(end 1.81 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end -0.603333 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 0.635)
+		(end 1.81 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end -0.603333 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 3.175)
+		(end 1.81 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end -0.603333 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 5.715)
+		(end 1.81 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end -0.603333 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 8.255)
+		(end 1.81 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end -0.603333 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 10.795)
+		(end 1.81 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end -0.603333 14.605)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.81 13.335)
+		(end 1.81 14.605)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 2.58 0 90)
 		(layer "F.Fab")
@@ -3852,125 +1066,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -4.305 13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 4.305 -13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W8.61mm_P2.54mm_LowProfile.wrl"
 		(offset
diff --git a/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W8.61mm_P2.54mm.kicad_mod b/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W8.61mm_P2.54mm.kicad_mod
index 846a523ac..826ad1c4b 100644
--- a/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W8.61mm_P2.54mm.kicad_mod
+++ b/Button_Switch_SMD.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W8.61mm_P2.54mm.kicad_mod
@@ -178,1302 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -2.03 -14.605)
-		(end -2.03 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -14.485)
-		(end -0.676667 -14.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -14.365)
-		(end -0.676667 -14.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -14.245)
-		(end -0.676667 -14.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -14.125)
-		(end -0.676667 -14.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -14.005)
-		(end -0.676667 -14.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.885)
-		(end -0.676667 -13.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.765)
-		(end -0.676667 -13.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.645)
-		(end -0.676667 -13.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.525)
-		(end -0.676667 -13.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.405)
-		(end -0.676667 -13.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -13.335)
-		(end 2.03 -13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -12.065)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.945)
-		(end -0.676667 -11.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.825)
-		(end -0.676667 -11.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.705)
-		(end -0.676667 -11.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.585)
-		(end -0.676667 -11.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.465)
-		(end -0.676667 -11.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.345)
-		(end -0.676667 -11.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.225)
-		(end -0.676667 -11.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -11.105)
-		(end -0.676667 -11.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.985)
-		(end -0.676667 -10.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.865)
-		(end -0.676667 -10.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.405)
-		(end -0.676667 -9.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.285)
-		(end -0.676667 -9.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.165)
-		(end -0.676667 -9.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -9.045)
-		(end -0.676667 -9.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.925)
-		(end -0.676667 -8.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.805)
-		(end -0.676667 -8.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.685)
-		(end -0.676667 -8.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.565)
-		(end -0.676667 -8.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.445)
-		(end -0.676667 -8.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.325)
-		(end -0.676667 -8.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.865)
-		(end -0.676667 -6.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.745)
-		(end -0.676667 -6.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.625)
-		(end -0.676667 -6.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.505)
-		(end -0.676667 -6.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.265)
-		(end -0.676667 -6.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.145)
-		(end -0.676667 -6.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -6.025)
-		(end -0.676667 -6.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.905)
-		(end -0.676667 -5.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.325)
-		(end -0.676667 -4.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.205)
-		(end -0.676667 -4.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -4.085)
-		(end -0.676667 -4.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.965)
-		(end -0.676667 -3.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.725)
-		(end -0.676667 -3.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.605)
-		(end -0.676667 -3.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.485)
-		(end -0.676667 -3.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.365)
-		(end -0.676667 -3.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.785)
-		(end -0.676667 -1.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.665)
-		(end -0.676667 -1.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.545)
-		(end -0.676667 -1.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.425)
-		(end -0.676667 -1.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.185)
-		(end -0.676667 -1.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -1.065)
-		(end -0.676667 -1.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.945)
-		(end -0.676667 -0.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.825)
-		(end -0.676667 -0.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.755)
-		(end -0.676667 0.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.875)
-		(end -0.676667 0.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 0.995)
-		(end -0.676667 0.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.115)
-		(end -0.676667 1.115)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.355)
-		(end -0.676667 1.355)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.475)
-		(end -0.676667 1.475)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.595)
-		(end -0.676667 1.595)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.715)
-		(end -0.676667 1.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.295)
-		(end -0.676667 3.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.415)
-		(end -0.676667 3.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.535)
-		(end -0.676667 3.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.655)
-		(end -0.676667 3.655)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 3.895)
-		(end -0.676667 3.895)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.015)
-		(end -0.676667 4.015)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.135)
-		(end -0.676667 4.135)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.255)
-		(end -0.676667 4.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.835)
-		(end -0.676667 5.835)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 5.955)
-		(end -0.676667 5.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.075)
-		(end -0.676667 6.075)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.195)
-		(end -0.676667 6.195)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.435)
-		(end -0.676667 6.435)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.555)
-		(end -0.676667 6.555)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.675)
-		(end -0.676667 6.675)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.795)
-		(end -0.676667 6.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.375)
-		(end -0.676667 8.375)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.495)
-		(end -0.676667 8.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.615)
-		(end -0.676667 8.615)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.735)
-		(end -0.676667 8.735)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.855)
-		(end -0.676667 8.855)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 8.975)
-		(end -0.676667 8.975)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.095)
-		(end -0.676667 9.095)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.215)
-		(end -0.676667 9.215)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.335)
-		(end -0.676667 9.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.455)
-		(end -0.676667 9.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end -2.03 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 10.915)
-		(end -0.676667 10.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.035)
-		(end -0.676667 11.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.155)
-		(end -0.676667 11.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.275)
-		(end -0.676667 11.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.395)
-		(end -0.676667 11.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.515)
-		(end -0.676667 11.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.635)
-		(end -0.676667 11.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.755)
-		(end -0.676667 11.755)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.875)
-		(end -0.676667 11.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 11.995)
-		(end -0.676667 11.995)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 12.065)
-		(end 2.03 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.335)
-		(end -2.03 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.455)
-		(end -0.676667 13.455)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.575)
-		(end -0.676667 13.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.695)
-		(end -0.676667 13.695)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.815)
-		(end -0.676667 13.815)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 13.935)
-		(end -0.676667 13.935)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 14.055)
-		(end -0.676667 14.055)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 14.175)
-		(end -0.676667 14.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 14.295)
-		(end -0.676667 14.295)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 14.415)
-		(end -0.676667 14.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 14.535)
-		(end -0.676667 14.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -2.03 14.605)
-		(end 2.03 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -0.676667 -14.605)
 		(end -0.676667 -13.335)
@@ -1582,222 +286,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2.03 -14.605)
-		(end -2.03 -14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -13.335)
-		(end 2.03 -14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -12.065)
-		(end -2.03 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end 2.03 -12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 12.065)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 13.335)
-		(end -2.03 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2.03 14.605)
-		(end 2.03 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 4.95 -16.39)
 		(end 4.95 -14.77)
@@ -1915,40 +403,254 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 -16.64)
-		(end -5.78 16.64)
+	(fp_rect
+		(start -2.03 -14.605)
+		(end -0.676667 -13.335)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -5.78 16.64)
+	(fp_rect
+		(start -2.03 -14.605)
+		(end 2.03 -13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end -0.676667 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end 2.03 -10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end -0.676667 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end 2.03 -8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end -0.676667 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end 2.03 9.525)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end -0.676667 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end 2.03 12.065)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 13.335)
+		(end -0.676667 14.605)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -2.03 13.335)
+		(end 2.03 14.605)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -5.78 -16.64)
 		(end 5.78 16.64)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 -16.64)
-		(end -5.78 -16.64)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.78 16.64)
-		(end 5.78 -16.64)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1978,1518 +680,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -2.03 -14.605)
-		(end -2.03 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -14.505)
-		(end -0.676667 -14.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -14.405)
-		(end -0.676667 -14.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -14.305)
-		(end -0.676667 -14.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -14.205)
-		(end -0.676667 -14.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -14.105)
-		(end -0.676667 -14.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -14.005)
-		(end -0.676667 -14.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.905)
-		(end -0.676667 -13.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.805)
-		(end -0.676667 -13.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.705)
-		(end -0.676667 -13.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.605)
-		(end -0.676667 -13.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.505)
-		(end -0.676667 -13.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.405)
-		(end -0.676667 -13.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -13.335)
-		(end 2.03 -13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -12.065)
-		(end -2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.965)
-		(end -0.676667 -11.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.865)
-		(end -0.676667 -11.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.765)
-		(end -0.676667 -11.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.665)
-		(end -0.676667 -11.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.565)
-		(end -0.676667 -11.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.465)
-		(end -0.676667 -11.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.365)
-		(end -0.676667 -11.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.265)
-		(end -0.676667 -11.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.165)
-		(end -0.676667 -11.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -11.065)
-		(end -0.676667 -11.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.965)
-		(end -0.676667 -10.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.865)
-		(end -0.676667 -10.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -10.795)
-		(end 2.03 -10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.525)
-		(end -2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.425)
-		(end -0.676667 -9.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.325)
-		(end -0.676667 -9.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.225)
-		(end -0.676667 -9.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.125)
-		(end -0.676667 -9.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -9.025)
-		(end -0.676667 -9.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.925)
-		(end -0.676667 -8.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.825)
-		(end -0.676667 -8.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.725)
-		(end -0.676667 -8.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.625)
-		(end -0.676667 -8.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.525)
-		(end -0.676667 -8.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.425)
-		(end -0.676667 -8.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.325)
-		(end -0.676667 -8.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -8.255)
-		(end 2.03 -8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.985)
-		(end -2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.885)
-		(end -0.676667 -6.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.785)
-		(end -0.676667 -6.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.685)
-		(end -0.676667 -6.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.585)
-		(end -0.676667 -6.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.485)
-		(end -0.676667 -6.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.385)
-		(end -0.676667 -6.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.285)
-		(end -0.676667 -6.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.185)
-		(end -0.676667 -6.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -6.085)
-		(end -0.676667 -6.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.985)
-		(end -0.676667 -5.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.885)
-		(end -0.676667 -5.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.785)
-		(end -0.676667 -5.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -5.715)
-		(end 2.03 -5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.445)
-		(end -2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.345)
-		(end -0.676667 -4.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.245)
-		(end -0.676667 -4.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.145)
-		(end -0.676667 -4.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -4.045)
-		(end -0.676667 -4.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.945)
-		(end -0.676667 -3.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.845)
-		(end -0.676667 -3.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.745)
-		(end -0.676667 -3.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.645)
-		(end -0.676667 -3.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.545)
-		(end -0.676667 -3.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.445)
-		(end -0.676667 -3.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.345)
-		(end -0.676667 -3.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.245)
-		(end -0.676667 -3.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -3.175)
-		(end 2.03 -3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.905)
-		(end -2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.805)
-		(end -0.676667 -1.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.705)
-		(end -0.676667 -1.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.605)
-		(end -0.676667 -1.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.505)
-		(end -0.676667 -1.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.405)
-		(end -0.676667 -1.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.305)
-		(end -0.676667 -1.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.205)
-		(end -0.676667 -1.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.105)
-		(end -0.676667 -1.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -1.005)
-		(end -0.676667 -1.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.905)
-		(end -0.676667 -0.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.805)
-		(end -0.676667 -0.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.705)
-		(end -0.676667 -0.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 -0.635)
-		(end 2.03 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.635)
-		(end -2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.735)
-		(end -0.676667 0.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.835)
-		(end -0.676667 0.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 0.935)
-		(end -0.676667 0.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.035)
-		(end -0.676667 1.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.135)
-		(end -0.676667 1.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.235)
-		(end -0.676667 1.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.335)
-		(end -0.676667 1.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.435)
-		(end -0.676667 1.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.535)
-		(end -0.676667 1.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.635)
-		(end -0.676667 1.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.735)
-		(end -0.676667 1.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.835)
-		(end -0.676667 1.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 1.905)
-		(end 2.03 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.175)
-		(end -2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.275)
-		(end -0.676667 3.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.375)
-		(end -0.676667 3.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.475)
-		(end -0.676667 3.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.575)
-		(end -0.676667 3.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.675)
-		(end -0.676667 3.675)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.775)
-		(end -0.676667 3.775)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.875)
-		(end -0.676667 3.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 3.975)
-		(end -0.676667 3.975)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.075)
-		(end -0.676667 4.075)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.175)
-		(end -0.676667 4.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.275)
-		(end -0.676667 4.275)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.375)
-		(end -0.676667 4.375)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 4.445)
-		(end 2.03 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.715)
-		(end -2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.815)
-		(end -0.676667 5.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 5.915)
-		(end -0.676667 5.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.015)
-		(end -0.676667 6.015)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.115)
-		(end -0.676667 6.115)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.215)
-		(end -0.676667 6.215)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.315)
-		(end -0.676667 6.315)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.415)
-		(end -0.676667 6.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.515)
-		(end -0.676667 6.515)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.615)
-		(end -0.676667 6.615)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.715)
-		(end -0.676667 6.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.815)
-		(end -0.676667 6.815)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.915)
-		(end -0.676667 6.915)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 6.985)
-		(end 2.03 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.255)
-		(end -2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.355)
-		(end -0.676667 8.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.455)
-		(end -0.676667 8.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.555)
-		(end -0.676667 8.555)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.655)
-		(end -0.676667 8.655)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.755)
-		(end -0.676667 8.755)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.855)
-		(end -0.676667 8.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 8.955)
-		(end -0.676667 8.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.055)
-		(end -0.676667 9.055)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.155)
-		(end -0.676667 9.155)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.255)
-		(end -0.676667 9.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.355)
-		(end -0.676667 9.355)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.455)
-		(end -0.676667 9.455)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 9.525)
-		(end 2.03 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.795)
-		(end -2.03 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.895)
-		(end -0.676667 10.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 10.995)
-		(end -0.676667 10.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.095)
-		(end -0.676667 11.095)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.195)
-		(end -0.676667 11.195)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.295)
-		(end -0.676667 11.295)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.395)
-		(end -0.676667 11.395)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.495)
-		(end -0.676667 11.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.595)
-		(end -0.676667 11.595)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.695)
-		(end -0.676667 11.695)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.795)
-		(end -0.676667 11.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.895)
-		(end -0.676667 11.895)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 11.995)
-		(end -0.676667 11.995)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 12.065)
-		(end 2.03 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.335)
-		(end -2.03 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.435)
-		(end -0.676667 13.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.535)
-		(end -0.676667 13.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.635)
-		(end -0.676667 13.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.735)
-		(end -0.676667 13.735)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.835)
-		(end -0.676667 13.835)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 13.935)
-		(end -0.676667 13.935)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.035)
-		(end -0.676667 14.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.135)
-		(end -0.676667 14.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.235)
-		(end -0.676667 14.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.335)
-		(end -0.676667 14.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.435)
-		(end -0.676667 14.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.535)
-		(end -0.676667 14.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.03 14.605)
-		(end 2.03 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -0.676667 -14.605)
 		(end -0.676667 -13.335)
@@ -3598,222 +788,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2.03 -14.605)
-		(end -2.03 -14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -13.335)
-		(end 2.03 -14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -12.065)
-		(end -2.03 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -10.795)
-		(end 2.03 -12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -9.525)
-		(end -2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -8.255)
-		(end 2.03 -9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -6.985)
-		(end -2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -5.715)
-		(end 2.03 -6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -4.445)
-		(end -2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -3.175)
-		(end 2.03 -4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -1.905)
-		(end -2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 -0.635)
-		(end 2.03 -1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 0.635)
-		(end -2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 1.905)
-		(end 2.03 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 3.175)
-		(end -2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 4.445)
-		(end 2.03 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 5.715)
-		(end -2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 6.985)
-		(end 2.03 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 8.255)
-		(end -2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 9.525)
-		(end 2.03 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 10.795)
-		(end -2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 12.065)
-		(end 2.03 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 13.335)
-		(end -2.03 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2.03 14.605)
-		(end 2.03 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 4.89 -16.33)
 		(end 4.89 16.33)
@@ -3832,6 +806,246 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -2.03 -14.605)
+		(end -0.676667 -13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -14.605)
+		(end 2.03 -13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end -0.676667 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -12.065)
+		(end 2.03 -10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end -0.676667 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -9.525)
+		(end 2.03 -8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end -0.676667 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -6.985)
+		(end 2.03 -5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end -0.676667 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -4.445)
+		(end 2.03 -3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end -0.676667 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 -1.905)
+		(end 2.03 -0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end -0.676667 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 0.635)
+		(end 2.03 1.905)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end -0.676667 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 3.175)
+		(end 2.03 4.445)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end -0.676667 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 5.715)
+		(end 2.03 6.985)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end -0.676667 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 8.255)
+		(end 2.03 9.525)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end -0.676667 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 10.795)
+		(end 2.03 12.065)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 13.335)
+		(end -0.676667 14.605)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -2.03 13.335)
+		(end 2.03 14.605)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.46 0 90)
 		(layer "F.Fab")
@@ -3852,125 +1066,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.305 -13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -4.305 13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.305 13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.305 11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.305 8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.305 6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.305 3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.305 1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.305 -1.27)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.305 -3.81)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.305 -6.35)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.305 -8.89)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 4.305 -11.43)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 4.305 -13.97)
 		(size 2.44 1.12)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.223214)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Button_Switch_SMD.3dshapes/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W8.61mm_P2.54mm.wrl"
 		(offset
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Piano_10.8x4.1mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Piano_10.8x4.1mm_W7.62mm_P2.54mm.kicad_mod
index a51e516b3..ec7c1a159 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Piano_10.8x4.1mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Piano_10.8x4.1mm_W7.62mm_P2.54mm.kicad_mod
@@ -115,60 +115,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.36)
-		(end -3.65 2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 2.36)
 		(end 9.47 2.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.36)
-		(end -3.65 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 2.36)
-		(end 9.47 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -178,24 +134,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 2.05)
 		(end -1.59 -1.05)
@@ -232,6 +170,16 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 0 0)
 		(layer "F.Fab")
@@ -242,12 +190,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 7.62 0)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index 80c42496d..98fa0ad10 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_6.7x4.1mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -79,114 +79,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -196,24 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -232,40 +106,34 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.36)
-		(end -1.06 2.36)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 2.36)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.36)
 		(end 8.67 2.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.36)
-		(end -1.06 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 2.36)
-		(end 8.67 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -295,132 +163,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -430,24 +172,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 2.05)
@@ -466,6 +190,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 0 90)
 		(layer "F.Fab")
@@ -486,12 +230,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 7.62 0)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W7.62mm_P2.54mm.kicad_mod
index a350a03a0..ad5a90e30 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx01_Slide_9.78x4.72mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,114 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -187,24 +79,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 2.42)
@@ -214,40 +88,34 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 2.67)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 2.67)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 2.67)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 2.67)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -277,132 +145,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -412,24 +154,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 2.36)
@@ -448,6 +172,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 0 90)
 		(layer "F.Fab")
@@ -468,12 +212,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 7.62 0)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_10.8x6.64mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_10.8x6.64mm_W7.62mm_P2.54mm.kicad_mod
index 374ea0dcf..6341addcf 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_10.8x6.64mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_10.8x6.64mm_W7.62mm_P2.54mm.kicad_mod
@@ -151,78 +151,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.36)
-		(end -3.65 4.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 4.9)
 		(end 9.47 4.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.36)
-		(end -3.65 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 4.9)
-		(end 9.47 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -232,42 +170,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 4.59)
 		(end -1.59 -1.05)
@@ -304,6 +206,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 1.27 0)
 		(layer "F.Fab")
@@ -314,12 +236,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_CTS_Series194-2MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_CTS_Series194-2MSTN_W7.62mm_P2.54mm.kicad_mod
index aa511919d..cefa757d3 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_CTS_Series194-2MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Piano_CTS_Series194-2MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -151,78 +151,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 5.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 5.21)
 		(end 8.95 5.21)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 5.21)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -232,42 +170,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 4.9)
 		(end -1.08 -1.36)
@@ -304,6 +206,26 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 1.27 0)
 		(layer "F.Fab")
@@ -314,12 +236,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index b9b2f9713..cfdc66a69 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_6.7x6.64mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -88,222 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -322,42 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -385,40 +133,54 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.36)
-		(end -1.06 4.9)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 4.9)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.36)
 		(end 8.67 4.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.36)
-		(end -1.06 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 4.9)
-		(end 8.67 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -448,258 +210,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -718,42 +228,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 4.59)
@@ -772,6 +246,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 1.27 90)
 		(layer "F.Fab")
@@ -792,12 +306,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W7.62mm_P2.54mm.kicad_mod
index bfc28a95b..4b427c3aa 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx02_Slide_9.78x7.26mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,222 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -304,42 +88,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 4.96)
@@ -349,40 +97,54 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 5.21)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 5.21)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 5.21)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 5.21)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -412,258 +174,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -682,42 +192,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 4.9)
@@ -736,6 +210,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 1.27 90)
 		(layer "F.Fab")
@@ -756,12 +270,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_10.8x9.18mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_10.8x9.18mm_W7.62mm_P2.54mm.kicad_mod
index ecdfc0788..46b086a8d 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_10.8x9.18mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_10.8x9.18mm_W7.62mm_P2.54mm.kicad_mod
@@ -187,96 +187,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.36)
-		(end -3.65 7.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 7.44)
 		(end 9.47 7.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.36)
-		(end -3.65 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 7.44)
-		(end 9.47 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -286,60 +206,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 7.13)
 		(end -1.59 -1.05)
@@ -376,6 +242,36 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 2.54 0)
 		(layer "F.Fab")
@@ -386,12 +282,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_CTS_Series194-3MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_CTS_Series194-3MSTN_W7.62mm_P2.54mm.kicad_mod
index f5805cb2b..2e4b9c661 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_CTS_Series194-3MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Piano_CTS_Series194-3MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -187,96 +187,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 7.75)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 7.75)
 		(end 8.95 7.75)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 7.75)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -286,60 +206,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 7.44)
 		(end -1.08 -1.36)
@@ -376,6 +242,36 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 2.54 0)
 		(layer "F.Fab")
@@ -386,12 +282,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index fa4725e0f..cb0740866 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_6.7x9.18mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -97,330 +97,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -448,60 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -538,40 +160,74 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.36)
-		(end -1.06 7.44)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 7.44)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.36)
 		(end 8.67 7.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.36)
-		(end -1.06 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 7.44)
-		(end 8.67 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -601,384 +257,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1006,60 +284,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 7.13)
@@ -1078,6 +302,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 2.54 90)
 		(layer "F.Fab")
@@ -1098,12 +382,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W7.62mm_P2.54mm.kicad_mod
index 3cc82a462..1fbfd4bb1 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx03_Slide_9.78x9.8mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,330 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -421,60 +97,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 7.5)
@@ -484,40 +106,74 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 7.75)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 7.75)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 7.75)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 7.75)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -547,384 +203,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -952,60 +230,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 7.44)
@@ -1024,6 +248,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 2.54 90)
 		(layer "F.Fab")
@@ -1044,12 +328,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_10.8x11.72mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_10.8x11.72mm_W7.62mm_P2.54mm.kicad_mod
index c8d151cb7..e621f16c1 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_10.8x11.72mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_10.8x11.72mm_W7.62mm_P2.54mm.kicad_mod
@@ -223,114 +223,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.36)
-		(end -3.65 9.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 9.98)
 		(end 9.47 9.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.36)
-		(end -3.65 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 9.98)
-		(end 9.47 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -340,78 +242,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 9.67)
 		(end -1.59 -1.05)
@@ -448,6 +278,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 3.81 0)
 		(layer "F.Fab")
@@ -458,12 +328,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_CTS_Series194-4MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_CTS_Series194-4MSTN_W7.62mm_P2.54mm.kicad_mod
index e612a4c36..8f075e5f7 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_CTS_Series194-4MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Piano_CTS_Series194-4MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -223,114 +223,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 10.29)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 10.29)
 		(end 8.95 10.29)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 10.29)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -340,78 +242,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 9.98)
 		(end -1.08 -1.36)
@@ -448,6 +278,46 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 3.81 0)
 		(layer "F.Fab")
@@ -458,12 +328,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index eb79b8e1c..910733a5a 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_6.7x11.72mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -106,438 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -574,78 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -691,40 +187,94 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.36)
-		(end -1.06 9.98)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 9.98)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.36)
 		(end 8.67 9.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.36)
-		(end -1.06 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 9.98)
-		(end 8.67 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -754,510 +304,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1294,78 +340,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 9.67)
@@ -1384,6 +358,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 3.81 90)
 		(layer "F.Fab")
@@ -1404,12 +458,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W7.62mm_P2.54mm.kicad_mod
index 112872918..58db296ea 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx04_Slide_9.78x12.34mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,438 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -538,78 +106,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 10.04)
@@ -619,40 +115,94 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 10.29)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 10.29)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 10.29)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 10.29)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -682,510 +232,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1222,78 +268,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 9.98)
@@ -1312,6 +286,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 3.81 90)
 		(layer "F.Fab")
@@ -1332,12 +386,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_10.8x14.26mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_10.8x14.26mm_W7.62mm_P2.54mm.kicad_mod
index 45141809e..a59fdc544 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_10.8x14.26mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_10.8x14.26mm_W7.62mm_P2.54mm.kicad_mod
@@ -259,132 +259,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 12.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 12.52)
 		(end 9.47 12.52)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 12.52)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -394,96 +278,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 12.21)
 		(end -1.59 -1.05)
@@ -520,6 +314,56 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 5.08 0)
 		(layer "F.Fab")
@@ -530,12 +374,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_CTS_Series194-5MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_CTS_Series194-5MSTN_W7.62mm_P2.54mm.kicad_mod
index bc6312900..519ab4cd2 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_CTS_Series194-5MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Piano_CTS_Series194-5MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -259,132 +259,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 12.83)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 12.83)
 		(end 8.95 12.83)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 12.83)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -394,96 +278,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 12.52)
 		(end -1.08 -1.36)
@@ -520,6 +314,56 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 5.08 0)
 		(layer "F.Fab")
@@ -530,12 +374,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index adcf765bf..f416a2705 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_6.7x14.26mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -115,546 +115,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -700,96 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -844,40 +214,114 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 12.52)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 12.52)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 12.52)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 12.52)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -907,636 +351,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1582,96 +396,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 12.21)
@@ -1690,6 +414,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 5.08 90)
 		(layer "F.Fab")
@@ -1710,12 +534,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W7.62mm_P2.54mm.kicad_mod
index 54b918adb..ffe16cf97 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx05_Slide_9.78x14.88mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,546 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -655,96 +115,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 12.58)
@@ -754,40 +124,114 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 12.83)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 12.83)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 12.83)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 12.83)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -817,636 +261,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1492,96 +306,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 12.52)
@@ -1600,6 +324,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 5.08 90)
 		(layer "F.Fab")
@@ -1620,12 +444,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_10.8x16.8mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_10.8x16.8mm_W7.62mm_P2.54mm.kicad_mod
index 7f6f64db9..9875d4758 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_10.8x16.8mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_10.8x16.8mm_W7.62mm_P2.54mm.kicad_mod
@@ -295,150 +295,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 15.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 15.06)
 		(end 9.47 15.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 15.06)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -448,114 +314,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 14.75)
 		(end -1.59 -1.05)
@@ -592,6 +350,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 6.35 0)
 		(layer "F.Fab")
@@ -602,12 +420,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_CTS_Series194-6MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_CTS_Series194-6MSTN_W7.62mm_P2.54mm.kicad_mod
index adb4d34c6..af2417599 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_CTS_Series194-6MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Piano_CTS_Series194-6MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -295,150 +295,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 15.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 15.37)
 		(end 8.95 15.37)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 15.37)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -448,114 +314,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 15.06)
 		(end -1.08 -1.36)
@@ -592,6 +350,66 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 6.35 0)
 		(layer "F.Fab")
@@ -602,12 +420,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index 2bf9fbb04..cd7d7a842 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_6.7x16.8mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -124,654 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -826,114 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -997,40 +241,134 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 15.06)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 15.06)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 15.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 15.06)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1060,762 +398,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1870,114 +452,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 14.75)
@@ -1996,6 +470,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 6.35 90)
 		(layer "F.Fab")
@@ -2016,12 +610,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W7.62mm_P2.54mm.kicad_mod
index 50db4fa96..e95dde108 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx06_Slide_9.78x17.42mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,654 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -772,114 +124,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 15.12)
@@ -889,40 +133,134 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 15.37)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 15.37)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 15.37)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 15.37)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -952,762 +290,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1762,114 +344,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 15.06)
@@ -1888,6 +362,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 6.35 90)
 		(layer "F.Fab")
@@ -1908,12 +502,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_10.8x19.34mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_10.8x19.34mm_W7.62mm_P2.54mm.kicad_mod
index 2a39a6a1c..835bf9ae6 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_10.8x19.34mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_10.8x19.34mm_W7.62mm_P2.54mm.kicad_mod
@@ -331,168 +331,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 17.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 17.6)
 		(end 9.47 17.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 17.6)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 14.49)
-		(end -1.59 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 15.99)
-		(end -3.39 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -502,132 +350,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 14.49)
-		(end -1.59 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 15.99)
-		(end -3.39 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 17.29)
 		(end -1.59 -1.05)
@@ -664,6 +386,76 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 14.49)
+		(end -3.39 15.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 7.62 0)
 		(layer "F.Fab")
@@ -674,12 +466,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_CTS_Series194-7MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_CTS_Series194-7MSTN_W7.62mm_P2.54mm.kicad_mod
index 7ef959874..d1b256946 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_CTS_Series194-7MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Piano_CTS_Series194-7MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -331,168 +331,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.68)
-		(end -2.47 17.91)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 17.91)
 		(end 8.95 17.91)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.68)
-		(end -2.47 -2.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 17.91)
-		(end 8.95 -2.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 14.48)
-		(end -1.08 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 16)
-		(end -2.22 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -502,132 +350,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 14.48)
-		(end -1.08 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 16)
-		(end -2.22 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 17.6)
 		(end -1.08 -1.36)
@@ -664,6 +386,76 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 14.48)
+		(end -2.22 16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 7.62 0)
 		(layer "F.Fab")
@@ -674,12 +466,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index e6a5c3071..a1ae25c57 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_6.7x19.34mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -133,762 +133,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.725)
-		(end 3.206667 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.845)
-		(end 3.206667 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.965)
-		(end 3.206667 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.085)
-		(end 3.206667 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.325)
-		(end 3.206667 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.445)
-		(end 3.206667 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.565)
-		(end 3.206667 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.685)
-		(end 3.206667 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -952,132 +196,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -1150,40 +268,154 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 17.6)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 17.6)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 17.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 17.6)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1213,888 +445,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.705)
-		(end 3.206667 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.805)
-		(end 3.206667 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.905)
-		(end 3.206667 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.005)
-		(end 3.206667 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.105)
-		(end 3.206667 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.305)
-		(end 3.206667 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.405)
-		(end 3.206667 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.505)
-		(end 3.206667 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.605)
-		(end 3.206667 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.705)
-		(end 3.206667 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -2158,132 +508,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 17.29)
@@ -2302,6 +526,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 7.62 90)
 		(layer "F.Fab")
@@ -2322,12 +686,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W7.62mm_P2.54mm.kicad_mod
index 717bb59bb..064ce10dd 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx07_Slide_9.78x19.96mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,762 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.725)
-		(end 3.133333 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.845)
-		(end 3.133333 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.965)
-		(end 3.133333 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.085)
-		(end 3.133333 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.325)
-		(end 3.133333 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.445)
-		(end 3.133333 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.565)
-		(end 3.133333 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.685)
-		(end 3.133333 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -889,132 +133,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 17.66)
@@ -1024,40 +142,154 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.68)
-		(end -1.33 17.91)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 17.91)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.68)
 		(end 8.95 17.91)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.68)
-		(end -1.33 -2.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 17.91)
-		(end 8.95 -2.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1087,888 +319,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.705)
-		(end 3.133333 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.805)
-		(end 3.133333 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.905)
-		(end 3.133333 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.005)
-		(end 3.133333 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.105)
-		(end 3.133333 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.305)
-		(end 3.133333 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.405)
-		(end 3.133333 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.505)
-		(end 3.133333 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.605)
-		(end 3.133333 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.705)
-		(end 3.133333 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -2032,132 +382,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 17.6)
@@ -2176,6 +400,146 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 7.62 90)
 		(layer "F.Fab")
@@ -2196,12 +560,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_10.8x21.88mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_10.8x21.88mm_W7.62mm_P2.54mm.kicad_mod
index 29e7620c7..705747671 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_10.8x21.88mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_10.8x21.88mm_W7.62mm_P2.54mm.kicad_mod
@@ -367,186 +367,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 20.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 20.14)
 		(end 9.47 20.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 20.14)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 14.49)
-		(end -1.59 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 15.99)
-		(end -3.39 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 17.03)
-		(end -1.59 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 18.53)
-		(end -3.39 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -556,150 +386,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 14.49)
-		(end -1.59 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 15.99)
-		(end -3.39 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 17.03)
-		(end -1.59 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 18.53)
-		(end -3.39 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 19.83)
 		(end -1.59 -1.05)
@@ -736,6 +422,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 14.49)
+		(end -3.39 15.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 17.03)
+		(end -3.39 18.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 8.89 0)
 		(layer "F.Fab")
@@ -746,12 +512,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_CTS_Series194-8MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_CTS_Series194-8MSTN_W7.62mm_P2.54mm.kicad_mod
index a23ef3b75..8c8b94ee3 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_CTS_Series194-8MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Piano_CTS_Series194-8MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -367,186 +367,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 20.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 20.46)
 		(end 8.95 20.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 20.46)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 14.48)
-		(end -1.08 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 16)
-		(end -2.22 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 17.02)
-		(end -1.08 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 18.54)
-		(end -2.22 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -556,150 +386,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 14.48)
-		(end -1.08 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 16)
-		(end -2.22 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 17.02)
-		(end -1.08 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 18.54)
-		(end -2.22 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 20.14)
 		(end -1.08 -1.36)
@@ -736,6 +422,86 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 14.48)
+		(end -2.22 16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 17.02)
+		(end -2.22 18.54)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 8.89 0)
 		(layer "F.Fab")
@@ -746,12 +512,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index 500295cc2..4fefa1b83 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_6.7x21.88mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -142,870 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.725)
-		(end 3.206667 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.845)
-		(end 3.206667 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.965)
-		(end 3.206667 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.085)
-		(end 3.206667 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.325)
-		(end 3.206667 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.445)
-		(end 3.206667 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.565)
-		(end 3.206667 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.685)
-		(end 3.206667 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.265)
-		(end 3.206667 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.385)
-		(end 3.206667 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.505)
-		(end 3.206667 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.625)
-		(end 3.206667 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.865)
-		(end 3.206667 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.985)
-		(end 3.206667 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.105)
-		(end 3.206667 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.225)
-		(end 3.206667 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1078,150 +214,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -1303,40 +295,174 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 20.14)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 20.14)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 20.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 20.14)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1366,1014 +492,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.705)
-		(end 3.206667 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.805)
-		(end 3.206667 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.905)
-		(end 3.206667 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.005)
-		(end 3.206667 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.105)
-		(end 3.206667 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.305)
-		(end 3.206667 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.405)
-		(end 3.206667 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.505)
-		(end 3.206667 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.605)
-		(end 3.206667 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.705)
-		(end 3.206667 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.245)
-		(end 3.206667 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.345)
-		(end 3.206667 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.445)
-		(end 3.206667 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.545)
-		(end 3.206667 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.645)
-		(end 3.206667 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.845)
-		(end 3.206667 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.945)
-		(end 3.206667 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.045)
-		(end 3.206667 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.145)
-		(end 3.206667 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.245)
-		(end 3.206667 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -2446,150 +564,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 19.83)
@@ -2608,6 +582,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 8.89 90)
 		(layer "F.Fab")
@@ -2628,12 +762,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W7.62mm_P2.54mm.kicad_mod
index 3726fbd40..998bcf6df 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx08_Slide_9.78x22.5mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,870 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.725)
-		(end 3.133333 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.845)
-		(end 3.133333 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.965)
-		(end 3.133333 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.085)
-		(end 3.133333 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.325)
-		(end 3.133333 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.445)
-		(end 3.133333 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.565)
-		(end 3.133333 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.685)
-		(end 3.133333 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.265)
-		(end 3.133333 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.385)
-		(end 3.133333 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.505)
-		(end 3.133333 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.625)
-		(end 3.133333 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.865)
-		(end 3.133333 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.985)
-		(end 3.133333 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.105)
-		(end 3.133333 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.225)
-		(end 3.133333 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1006,150 +142,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 20.2)
@@ -1159,40 +151,174 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 20.46)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 20.46)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 20.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 20.46)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1222,1014 +348,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.705)
-		(end 3.133333 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.805)
-		(end 3.133333 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.905)
-		(end 3.133333 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.005)
-		(end 3.133333 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.105)
-		(end 3.133333 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.305)
-		(end 3.133333 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.405)
-		(end 3.133333 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.505)
-		(end 3.133333 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.605)
-		(end 3.133333 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.705)
-		(end 3.133333 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.245)
-		(end 3.133333 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.345)
-		(end 3.133333 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.445)
-		(end 3.133333 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.545)
-		(end 3.133333 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.645)
-		(end 3.133333 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.845)
-		(end 3.133333 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.945)
-		(end 3.133333 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.045)
-		(end 3.133333 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.145)
-		(end 3.133333 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.245)
-		(end 3.133333 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -2302,150 +420,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 20.14)
@@ -2464,6 +438,166 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 8.89 90)
 		(layer "F.Fab")
@@ -2484,12 +618,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_10.8x24.42mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_10.8x24.42mm_W7.62mm_P2.54mm.kicad_mod
index 02e86e494..ac464727f 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_10.8x24.42mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_10.8x24.42mm_W7.62mm_P2.54mm.kicad_mod
@@ -403,204 +403,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 22.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 22.68)
 		(end 9.47 22.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 22.68)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 14.49)
-		(end -1.59 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 15.99)
-		(end -3.39 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 17.03)
-		(end -1.59 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 18.53)
-		(end -3.39 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 19.57)
-		(end -1.59 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 21.07)
-		(end -3.39 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -610,168 +422,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 14.49)
-		(end -1.59 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 15.99)
-		(end -3.39 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 17.03)
-		(end -1.59 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 18.53)
-		(end -3.39 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 19.57)
-		(end -1.59 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 21.07)
-		(end -3.39 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 22.37)
 		(end -1.59 -1.05)
@@ -808,6 +458,96 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 14.49)
+		(end -3.39 15.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 17.03)
+		(end -3.39 18.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 19.57)
+		(end -3.39 21.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 10.16 0)
 		(layer "F.Fab")
@@ -818,12 +558,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_CTS_Series194-9MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_CTS_Series194-9MSTN_W7.62mm_P2.54mm.kicad_mod
index 24ddfb646..f8f8b82c5 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_CTS_Series194-9MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Piano_CTS_Series194-9MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -403,204 +403,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 22.99)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 22.99)
 		(end 8.95 22.99)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 22.99)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 14.48)
-		(end -1.08 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 16)
-		(end -2.22 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 17.02)
-		(end -1.08 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 18.54)
-		(end -2.22 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 19.56)
-		(end -1.08 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 21.08)
-		(end -2.22 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -610,168 +422,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 14.48)
-		(end -1.08 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 16)
-		(end -2.22 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 17.02)
-		(end -1.08 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 18.54)
-		(end -2.22 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 19.56)
-		(end -1.08 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 21.08)
-		(end -2.22 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 22.68)
 		(end -1.08 -1.36)
@@ -808,6 +458,96 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 14.48)
+		(end -2.22 16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 17.02)
+		(end -2.22 18.54)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 19.56)
+		(end -2.22 21.08)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 10.16 0)
 		(layer "F.Fab")
@@ -818,12 +558,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index 5de8c9cef..e99901803 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_6.7x24.42mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -151,978 +151,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.725)
-		(end 3.206667 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.845)
-		(end 3.206667 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.965)
-		(end 3.206667 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.085)
-		(end 3.206667 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.325)
-		(end 3.206667 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.445)
-		(end 3.206667 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.565)
-		(end 3.206667 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.685)
-		(end 3.206667 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.265)
-		(end 3.206667 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.385)
-		(end 3.206667 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.505)
-		(end 3.206667 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.625)
-		(end 3.206667 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.865)
-		(end 3.206667 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.985)
-		(end 3.206667 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.105)
-		(end 3.206667 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.225)
-		(end 3.206667 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.805)
-		(end 3.206667 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.925)
-		(end 3.206667 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.045)
-		(end 3.206667 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.165)
-		(end 3.206667 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.405)
-		(end 3.206667 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.525)
-		(end 3.206667 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.645)
-		(end 3.206667 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.765)
-		(end 3.206667 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1204,168 +232,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -1456,40 +322,194 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 22.68)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 22.68)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 22.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 22.68)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1519,1140 +539,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.705)
-		(end 3.206667 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.805)
-		(end 3.206667 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.905)
-		(end 3.206667 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.005)
-		(end 3.206667 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.105)
-		(end 3.206667 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.305)
-		(end 3.206667 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.405)
-		(end 3.206667 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.505)
-		(end 3.206667 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.605)
-		(end 3.206667 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.705)
-		(end 3.206667 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.245)
-		(end 3.206667 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.345)
-		(end 3.206667 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.445)
-		(end 3.206667 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.545)
-		(end 3.206667 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.645)
-		(end 3.206667 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.845)
-		(end 3.206667 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.945)
-		(end 3.206667 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.045)
-		(end 3.206667 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.145)
-		(end 3.206667 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.245)
-		(end 3.206667 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.785)
-		(end 3.206667 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.885)
-		(end 3.206667 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.985)
-		(end 3.206667 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.085)
-		(end 3.206667 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.185)
-		(end 3.206667 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.385)
-		(end 3.206667 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.485)
-		(end 3.206667 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.585)
-		(end 3.206667 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.685)
-		(end 3.206667 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.785)
-		(end 3.206667 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -2734,168 +620,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 22.37)
@@ -2914,6 +638,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 10.16 90)
 		(layer "F.Fab")
@@ -2934,12 +838,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W7.62mm_P2.54mm.kicad_mod
index bf7ba73d7..9af37c867 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx09_Slide_9.78x25.04mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,978 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.725)
-		(end 3.133333 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.845)
-		(end 3.133333 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.965)
-		(end 3.133333 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.085)
-		(end 3.133333 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.325)
-		(end 3.133333 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.445)
-		(end 3.133333 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.565)
-		(end 3.133333 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.685)
-		(end 3.133333 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.265)
-		(end 3.133333 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.385)
-		(end 3.133333 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.505)
-		(end 3.133333 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.625)
-		(end 3.133333 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.865)
-		(end 3.133333 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.985)
-		(end 3.133333 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.105)
-		(end 3.133333 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.225)
-		(end 3.133333 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.805)
-		(end 3.133333 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.925)
-		(end 3.133333 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.045)
-		(end 3.133333 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.165)
-		(end 3.133333 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.405)
-		(end 3.133333 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.525)
-		(end 3.133333 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.645)
-		(end 3.133333 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.765)
-		(end 3.133333 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1123,168 +151,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 22.74)
@@ -1294,40 +160,194 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 22.99)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 22.99)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 22.99)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 22.99)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1357,1140 +377,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.705)
-		(end 3.133333 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.805)
-		(end 3.133333 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.905)
-		(end 3.133333 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.005)
-		(end 3.133333 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.105)
-		(end 3.133333 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.305)
-		(end 3.133333 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.405)
-		(end 3.133333 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.505)
-		(end 3.133333 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.605)
-		(end 3.133333 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.705)
-		(end 3.133333 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.245)
-		(end 3.133333 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.345)
-		(end 3.133333 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.445)
-		(end 3.133333 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.545)
-		(end 3.133333 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.645)
-		(end 3.133333 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.845)
-		(end 3.133333 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.945)
-		(end 3.133333 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.045)
-		(end 3.133333 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.145)
-		(end 3.133333 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.245)
-		(end 3.133333 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.785)
-		(end 3.133333 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.885)
-		(end 3.133333 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.985)
-		(end 3.133333 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.085)
-		(end 3.133333 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.185)
-		(end 3.133333 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.385)
-		(end 3.133333 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.485)
-		(end 3.133333 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.585)
-		(end 3.133333 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.685)
-		(end 3.133333 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.785)
-		(end 3.133333 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -2572,168 +458,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 22.68)
@@ -2752,6 +476,186 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 10.16 90)
 		(layer "F.Fab")
@@ -2772,12 +676,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_10.8x26.96mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_10.8x26.96mm_W7.62mm_P2.54mm.kicad_mod
index a6894e1c8..d6112729e 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_10.8x26.96mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_10.8x26.96mm_W7.62mm_P2.54mm.kicad_mod
@@ -439,222 +439,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 25.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 25.22)
 		(end 9.47 25.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 25.22)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 14.49)
-		(end -1.59 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 15.99)
-		(end -3.39 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 17.03)
-		(end -1.59 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 18.53)
-		(end -3.39 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 19.57)
-		(end -1.59 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 21.07)
-		(end -3.39 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 22.11)
-		(end -1.59 22.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 23.61)
-		(end -3.39 22.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -664,186 +458,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 14.49)
-		(end -1.59 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 15.99)
-		(end -3.39 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 17.03)
-		(end -1.59 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 18.53)
-		(end -3.39 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 19.57)
-		(end -1.59 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 21.07)
-		(end -3.39 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 22.11)
-		(end -1.59 23.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 23.61)
-		(end -3.39 23.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 24.91)
 		(end -1.59 -1.05)
@@ -880,6 +494,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 14.49)
+		(end -3.39 15.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 17.03)
+		(end -3.39 18.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 19.57)
+		(end -3.39 21.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 22.11)
+		(end -3.39 23.61)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 11.43 0)
 		(layer "F.Fab")
@@ -890,12 +604,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_CTS_Series194-10MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_CTS_Series194-10MSTN_W7.62mm_P2.54mm.kicad_mod
index 9118bfd8d..0ea4370c7 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_CTS_Series194-10MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Piano_CTS_Series194-10MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -439,222 +439,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 25.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 25.53)
 		(end 8.95 25.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 25.53)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 14.48)
-		(end -1.08 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 16)
-		(end -2.22 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 17.02)
-		(end -1.08 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 18.54)
-		(end -2.22 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 19.56)
-		(end -1.08 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 21.08)
-		(end -2.22 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 22.1)
-		(end -1.08 22.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 23.62)
-		(end -2.22 22.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -664,186 +458,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 14.48)
-		(end -1.08 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 16)
-		(end -2.22 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 17.02)
-		(end -1.08 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 18.54)
-		(end -2.22 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 19.56)
-		(end -1.08 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 21.08)
-		(end -2.22 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 22.1)
-		(end -1.08 23.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 23.62)
-		(end -2.22 23.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 25.22)
 		(end -1.08 -1.36)
@@ -880,6 +494,106 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 14.48)
+		(end -2.22 16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 17.02)
+		(end -2.22 18.54)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 19.56)
+		(end -2.22 21.08)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 22.1)
+		(end -2.22 23.62)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 11.43 0)
 		(layer "F.Fab")
@@ -890,12 +604,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index 976469871..3981fda2e 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_6.7x26.96mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -160,1086 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.725)
-		(end 3.206667 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.845)
-		(end 3.206667 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.965)
-		(end 3.206667 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.085)
-		(end 3.206667 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.325)
-		(end 3.206667 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.445)
-		(end 3.206667 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.565)
-		(end 3.206667 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.685)
-		(end 3.206667 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.265)
-		(end 3.206667 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.385)
-		(end 3.206667 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.505)
-		(end 3.206667 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.625)
-		(end 3.206667 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.865)
-		(end 3.206667 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.985)
-		(end 3.206667 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.105)
-		(end 3.206667 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.225)
-		(end 3.206667 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.805)
-		(end 3.206667 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.925)
-		(end 3.206667 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.045)
-		(end 3.206667 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.165)
-		(end 3.206667 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.405)
-		(end 3.206667 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.525)
-		(end 3.206667 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.645)
-		(end 3.206667 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.765)
-		(end 3.206667 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.225)
-		(end 2 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.345)
-		(end 3.206667 22.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.465)
-		(end 3.206667 22.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.585)
-		(end 3.206667 22.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.705)
-		(end 3.206667 22.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.825)
-		(end 3.206667 22.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.945)
-		(end 3.206667 22.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.065)
-		(end 3.206667 23.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.185)
-		(end 3.206667 23.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.305)
-		(end 3.206667 23.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.425)
-		(end 3.206667 23.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.495)
-		(end 5.62 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1330,186 +250,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 22.225)
-		(end 2 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 23.495)
-		(end 5.62 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -1609,40 +349,214 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 25.22)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 25.22)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 3.206667 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 5.62 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 25.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 25.22)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1672,1266 +586,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.705)
-		(end 3.206667 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.805)
-		(end 3.206667 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.905)
-		(end 3.206667 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.005)
-		(end 3.206667 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.105)
-		(end 3.206667 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.305)
-		(end 3.206667 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.405)
-		(end 3.206667 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.505)
-		(end 3.206667 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.605)
-		(end 3.206667 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.705)
-		(end 3.206667 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.245)
-		(end 3.206667 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.345)
-		(end 3.206667 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.445)
-		(end 3.206667 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.545)
-		(end 3.206667 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.645)
-		(end 3.206667 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.845)
-		(end 3.206667 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.945)
-		(end 3.206667 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.045)
-		(end 3.206667 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.145)
-		(end 3.206667 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.245)
-		(end 3.206667 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.785)
-		(end 3.206667 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.885)
-		(end 3.206667 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.985)
-		(end 3.206667 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.085)
-		(end 3.206667 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.185)
-		(end 3.206667 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.385)
-		(end 3.206667 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.485)
-		(end 3.206667 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.585)
-		(end 3.206667 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.685)
-		(end 3.206667 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.785)
-		(end 3.206667 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.225)
-		(end 2 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.325)
-		(end 3.206667 22.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.425)
-		(end 3.206667 22.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.525)
-		(end 3.206667 22.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.625)
-		(end 3.206667 22.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.725)
-		(end 3.206667 22.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.825)
-		(end 3.206667 22.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.925)
-		(end 3.206667 22.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.025)
-		(end 3.206667 23.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.125)
-		(end 3.206667 23.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.225)
-		(end 3.206667 23.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.325)
-		(end 3.206667 23.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.425)
-		(end 3.206667 23.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.495)
-		(end 5.62 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -3022,186 +676,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 22.225)
-		(end 2 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 23.495)
-		(end 5.62 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 24.91)
@@ -3220,6 +694,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 3.206667 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 5.62 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 11.43 90)
 		(layer "F.Fab")
@@ -3240,12 +914,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W7.62mm_P2.54mm.kicad_mod
index 2a9180bb7..be63087bd 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx10_Slide_9.78x27.58mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,1086 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.725)
-		(end 3.133333 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.845)
-		(end 3.133333 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.965)
-		(end 3.133333 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.085)
-		(end 3.133333 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.325)
-		(end 3.133333 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.445)
-		(end 3.133333 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.565)
-		(end 3.133333 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.685)
-		(end 3.133333 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.265)
-		(end 3.133333 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.385)
-		(end 3.133333 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.505)
-		(end 3.133333 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.625)
-		(end 3.133333 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.865)
-		(end 3.133333 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.985)
-		(end 3.133333 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.105)
-		(end 3.133333 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.225)
-		(end 3.133333 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.805)
-		(end 3.133333 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.925)
-		(end 3.133333 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.045)
-		(end 3.133333 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.165)
-		(end 3.133333 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.405)
-		(end 3.133333 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.525)
-		(end 3.133333 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.645)
-		(end 3.133333 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.765)
-		(end 3.133333 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.225)
-		(end 1.78 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.345)
-		(end 3.133333 22.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.465)
-		(end 3.133333 22.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.585)
-		(end 3.133333 22.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.705)
-		(end 3.133333 22.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.825)
-		(end 3.133333 22.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.945)
-		(end 3.133333 22.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.065)
-		(end 3.133333 23.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.185)
-		(end 3.133333 23.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.305)
-		(end 3.133333 23.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.425)
-		(end 3.133333 23.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.495)
-		(end 5.84 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1240,186 +160,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 22.225)
-		(end 1.78 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 23.495)
-		(end 5.84 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 25.28)
@@ -1429,40 +169,214 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 25.53)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 25.53)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 3.133333 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 5.84 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 25.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 25.53)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1492,1266 +406,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.705)
-		(end 3.133333 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.805)
-		(end 3.133333 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.905)
-		(end 3.133333 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.005)
-		(end 3.133333 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.105)
-		(end 3.133333 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.305)
-		(end 3.133333 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.405)
-		(end 3.133333 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.505)
-		(end 3.133333 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.605)
-		(end 3.133333 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.705)
-		(end 3.133333 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.245)
-		(end 3.133333 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.345)
-		(end 3.133333 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.445)
-		(end 3.133333 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.545)
-		(end 3.133333 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.645)
-		(end 3.133333 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.845)
-		(end 3.133333 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.945)
-		(end 3.133333 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.045)
-		(end 3.133333 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.145)
-		(end 3.133333 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.245)
-		(end 3.133333 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.785)
-		(end 3.133333 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.885)
-		(end 3.133333 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.985)
-		(end 3.133333 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.085)
-		(end 3.133333 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.185)
-		(end 3.133333 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.385)
-		(end 3.133333 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.485)
-		(end 3.133333 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.585)
-		(end 3.133333 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.685)
-		(end 3.133333 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.785)
-		(end 3.133333 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.225)
-		(end 1.78 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.325)
-		(end 3.133333 22.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.425)
-		(end 3.133333 22.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.525)
-		(end 3.133333 22.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.625)
-		(end 3.133333 22.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.725)
-		(end 3.133333 22.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.825)
-		(end 3.133333 22.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.925)
-		(end 3.133333 22.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.025)
-		(end 3.133333 23.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.125)
-		(end 3.133333 23.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.225)
-		(end 3.133333 23.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.325)
-		(end 3.133333 23.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.425)
-		(end 3.133333 23.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.495)
-		(end 5.84 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -2842,186 +496,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 22.225)
-		(end 1.78 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 23.495)
-		(end 5.84 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 25.22)
@@ -3040,6 +514,206 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 3.133333 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 5.84 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 11.43 90)
 		(layer "F.Fab")
@@ -3060,12 +734,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_10.8x29.5mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_10.8x29.5mm_W7.62mm_P2.54mm.kicad_mod
index 8fd35f178..72d7f6e49 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_10.8x29.5mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_10.8x29.5mm_W7.62mm_P2.54mm.kicad_mod
@@ -475,240 +475,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.37)
-		(end -3.65 27.76)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 27.76)
 		(end 9.47 27.76)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.37)
-		(end -3.65 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 27.76)
-		(end 9.47 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 14.49)
-		(end -1.59 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 15.99)
-		(end -3.39 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 17.03)
-		(end -1.59 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 18.53)
-		(end -3.39 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 19.57)
-		(end -1.59 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 21.07)
-		(end -3.39 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 22.11)
-		(end -1.59 22.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 23.61)
-		(end -3.39 22.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 24.65)
-		(end -1.59 24.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 26.15)
-		(end -3.39 24.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -718,204 +494,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 14.49)
-		(end -1.59 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 15.99)
-		(end -3.39 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 17.03)
-		(end -1.59 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 18.53)
-		(end -3.39 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 19.57)
-		(end -1.59 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 21.07)
-		(end -3.39 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 22.11)
-		(end -1.59 23.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 23.61)
-		(end -3.39 23.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 24.65)
-		(end -1.59 26.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 26.15)
-		(end -3.39 26.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 27.45)
 		(end -1.59 -1.05)
@@ -952,6 +530,116 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 14.49)
+		(end -3.39 15.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 17.03)
+		(end -3.39 18.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 19.57)
+		(end -3.39 21.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 22.11)
+		(end -3.39 23.61)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 24.65)
+		(end -3.39 26.15)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 12.7 0)
 		(layer "F.Fab")
@@ -962,12 +650,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_CTS_Series194-11MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_CTS_Series194-11MSTN_W7.62mm_P2.54mm.kicad_mod
index 0dc05aa83..e3dec045a 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_CTS_Series194-11MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Piano_CTS_Series194-11MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -475,240 +475,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 28.07)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 28.07)
 		(end 8.95 28.07)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 28.07)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 14.48)
-		(end -1.08 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 16)
-		(end -2.22 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 17.02)
-		(end -1.08 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 18.54)
-		(end -2.22 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 19.56)
-		(end -1.08 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 21.08)
-		(end -2.22 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 22.1)
-		(end -1.08 22.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 23.62)
-		(end -2.22 22.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 24.64)
-		(end -1.08 24.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 26.16)
-		(end -2.22 24.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -718,204 +494,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 14.48)
-		(end -1.08 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 16)
-		(end -2.22 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 17.02)
-		(end -1.08 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 18.54)
-		(end -2.22 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 19.56)
-		(end -1.08 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 21.08)
-		(end -2.22 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 22.1)
-		(end -1.08 23.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 23.62)
-		(end -2.22 23.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 24.64)
-		(end -1.08 26.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 26.16)
-		(end -2.22 26.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 27.76)
 		(end -1.08 -1.36)
@@ -952,6 +530,116 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 14.48)
+		(end -2.22 16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 17.02)
+		(end -2.22 18.54)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 19.56)
+		(end -2.22 21.08)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 22.1)
+		(end -2.22 23.62)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 24.64)
+		(end -2.22 26.16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 12.7 0)
 		(layer "F.Fab")
@@ -962,12 +650,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index 2e783f40e..3a0145f64 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_6.7x29.5mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -169,1194 +169,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.725)
-		(end 3.206667 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.845)
-		(end 3.206667 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.965)
-		(end 3.206667 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.085)
-		(end 3.206667 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.325)
-		(end 3.206667 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.445)
-		(end 3.206667 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.565)
-		(end 3.206667 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.685)
-		(end 3.206667 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.265)
-		(end 3.206667 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.385)
-		(end 3.206667 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.505)
-		(end 3.206667 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.625)
-		(end 3.206667 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.865)
-		(end 3.206667 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.985)
-		(end 3.206667 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.105)
-		(end 3.206667 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.225)
-		(end 3.206667 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.805)
-		(end 3.206667 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.925)
-		(end 3.206667 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.045)
-		(end 3.206667 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.165)
-		(end 3.206667 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.405)
-		(end 3.206667 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.525)
-		(end 3.206667 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.645)
-		(end 3.206667 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.765)
-		(end 3.206667 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.225)
-		(end 2 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.345)
-		(end 3.206667 22.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.465)
-		(end 3.206667 22.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.585)
-		(end 3.206667 22.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.705)
-		(end 3.206667 22.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.825)
-		(end 3.206667 22.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.945)
-		(end 3.206667 22.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.065)
-		(end 3.206667 23.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.185)
-		(end 3.206667 23.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.305)
-		(end 3.206667 23.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.425)
-		(end 3.206667 23.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.495)
-		(end 5.62 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 24.765)
-		(end 2 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 24.885)
-		(end 3.206667 24.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.005)
-		(end 3.206667 25.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.125)
-		(end 3.206667 25.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.245)
-		(end 3.206667 25.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.365)
-		(end 3.206667 25.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.485)
-		(end 3.206667 25.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.605)
-		(end 3.206667 25.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.725)
-		(end 3.206667 25.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.845)
-		(end 3.206667 25.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.965)
-		(end 3.206667 25.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 26.035)
-		(end 5.62 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1456,204 +268,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 22.225)
-		(end 2 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 23.495)
-		(end 5.62 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 24.765)
-		(end 2 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 26.035)
-		(end 5.62 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -1762,40 +376,234 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.37)
-		(end -1.06 27.76)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 27.76)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 3.206667 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 5.62 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 3.206667 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 5.62 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.37)
 		(end 8.67 27.76)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.37)
-		(end -1.06 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 27.76)
-		(end 8.67 -2.37)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1825,1392 +633,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.705)
-		(end 3.206667 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.805)
-		(end 3.206667 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.905)
-		(end 3.206667 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.005)
-		(end 3.206667 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.105)
-		(end 3.206667 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.305)
-		(end 3.206667 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.405)
-		(end 3.206667 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.505)
-		(end 3.206667 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.605)
-		(end 3.206667 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.705)
-		(end 3.206667 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.245)
-		(end 3.206667 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.345)
-		(end 3.206667 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.445)
-		(end 3.206667 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.545)
-		(end 3.206667 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.645)
-		(end 3.206667 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.845)
-		(end 3.206667 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.945)
-		(end 3.206667 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.045)
-		(end 3.206667 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.145)
-		(end 3.206667 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.245)
-		(end 3.206667 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.785)
-		(end 3.206667 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.885)
-		(end 3.206667 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.985)
-		(end 3.206667 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.085)
-		(end 3.206667 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.185)
-		(end 3.206667 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.385)
-		(end 3.206667 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.485)
-		(end 3.206667 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.585)
-		(end 3.206667 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.685)
-		(end 3.206667 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.785)
-		(end 3.206667 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.225)
-		(end 2 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.325)
-		(end 3.206667 22.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.425)
-		(end 3.206667 22.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.525)
-		(end 3.206667 22.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.625)
-		(end 3.206667 22.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.725)
-		(end 3.206667 22.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.825)
-		(end 3.206667 22.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.925)
-		(end 3.206667 22.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.025)
-		(end 3.206667 23.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.125)
-		(end 3.206667 23.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.225)
-		(end 3.206667 23.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.325)
-		(end 3.206667 23.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.425)
-		(end 3.206667 23.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.495)
-		(end 5.62 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 24.765)
-		(end 2 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 24.865)
-		(end 3.206667 24.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 24.965)
-		(end 3.206667 24.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.065)
-		(end 3.206667 25.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.165)
-		(end 3.206667 25.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.265)
-		(end 3.206667 25.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.365)
-		(end 3.206667 25.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.465)
-		(end 3.206667 25.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.565)
-		(end 3.206667 25.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.665)
-		(end 3.206667 25.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.765)
-		(end 3.206667 25.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.865)
-		(end 3.206667 25.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.965)
-		(end 3.206667 25.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 26.035)
-		(end 5.62 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -3310,204 +732,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 22.225)
-		(end 2 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 23.495)
-		(end 5.62 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 24.765)
-		(end 2 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 26.035)
-		(end 5.62 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 27.45)
@@ -3526,6 +750,226 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 3.206667 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 5.62 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 3.206667 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 5.62 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 12.7 90)
 		(layer "F.Fab")
@@ -3546,12 +990,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W7.62mm_P2.54mm.kicad_mod
index 99fb587c7..3202ee916 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx11_Slide_9.78x30.12mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,1194 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.725)
-		(end 3.133333 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.845)
-		(end 3.133333 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.965)
-		(end 3.133333 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.085)
-		(end 3.133333 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.325)
-		(end 3.133333 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.445)
-		(end 3.133333 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.565)
-		(end 3.133333 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.685)
-		(end 3.133333 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.265)
-		(end 3.133333 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.385)
-		(end 3.133333 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.505)
-		(end 3.133333 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.625)
-		(end 3.133333 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.865)
-		(end 3.133333 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.985)
-		(end 3.133333 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.105)
-		(end 3.133333 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.225)
-		(end 3.133333 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.805)
-		(end 3.133333 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.925)
-		(end 3.133333 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.045)
-		(end 3.133333 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.165)
-		(end 3.133333 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.405)
-		(end 3.133333 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.525)
-		(end 3.133333 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.645)
-		(end 3.133333 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.765)
-		(end 3.133333 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.225)
-		(end 1.78 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.345)
-		(end 3.133333 22.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.465)
-		(end 3.133333 22.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.585)
-		(end 3.133333 22.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.705)
-		(end 3.133333 22.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.825)
-		(end 3.133333 22.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.945)
-		(end 3.133333 22.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.065)
-		(end 3.133333 23.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.185)
-		(end 3.133333 23.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.305)
-		(end 3.133333 23.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.425)
-		(end 3.133333 23.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.495)
-		(end 5.84 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 24.765)
-		(end 1.78 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 24.885)
-		(end 3.133333 24.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.005)
-		(end 3.133333 25.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.125)
-		(end 3.133333 25.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.245)
-		(end 3.133333 25.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.365)
-		(end 3.133333 25.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.485)
-		(end 3.133333 25.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.605)
-		(end 3.133333 25.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.725)
-		(end 3.133333 25.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.845)
-		(end 3.133333 25.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.965)
-		(end 3.133333 25.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 26.035)
-		(end 5.84 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1357,204 +169,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 22.225)
-		(end 1.78 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 23.495)
-		(end 5.84 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 24.765)
-		(end 1.78 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 26.035)
-		(end 5.84 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 27.82)
@@ -1564,40 +178,234 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 28.07)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 28.07)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 3.133333 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 5.84 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 3.133333 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 5.84 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 28.07)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 28.07)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1627,1392 +435,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.705)
-		(end 3.133333 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.805)
-		(end 3.133333 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.905)
-		(end 3.133333 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.005)
-		(end 3.133333 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.105)
-		(end 3.133333 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.305)
-		(end 3.133333 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.405)
-		(end 3.133333 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.505)
-		(end 3.133333 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.605)
-		(end 3.133333 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.705)
-		(end 3.133333 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.245)
-		(end 3.133333 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.345)
-		(end 3.133333 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.445)
-		(end 3.133333 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.545)
-		(end 3.133333 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.645)
-		(end 3.133333 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.845)
-		(end 3.133333 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.945)
-		(end 3.133333 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.045)
-		(end 3.133333 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.145)
-		(end 3.133333 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.245)
-		(end 3.133333 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.785)
-		(end 3.133333 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.885)
-		(end 3.133333 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.985)
-		(end 3.133333 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.085)
-		(end 3.133333 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.185)
-		(end 3.133333 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.385)
-		(end 3.133333 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.485)
-		(end 3.133333 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.585)
-		(end 3.133333 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.685)
-		(end 3.133333 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.785)
-		(end 3.133333 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.225)
-		(end 1.78 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.325)
-		(end 3.133333 22.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.425)
-		(end 3.133333 22.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.525)
-		(end 3.133333 22.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.625)
-		(end 3.133333 22.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.725)
-		(end 3.133333 22.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.825)
-		(end 3.133333 22.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.925)
-		(end 3.133333 22.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.025)
-		(end 3.133333 23.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.125)
-		(end 3.133333 23.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.225)
-		(end 3.133333 23.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.325)
-		(end 3.133333 23.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.425)
-		(end 3.133333 23.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.495)
-		(end 5.84 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 24.765)
-		(end 1.78 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 24.865)
-		(end 3.133333 24.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 24.965)
-		(end 3.133333 24.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.065)
-		(end 3.133333 25.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.165)
-		(end 3.133333 25.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.265)
-		(end 3.133333 25.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.365)
-		(end 3.133333 25.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.465)
-		(end 3.133333 25.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.565)
-		(end 3.133333 25.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.665)
-		(end 3.133333 25.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.765)
-		(end 3.133333 25.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.865)
-		(end 3.133333 25.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.965)
-		(end 3.133333 25.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 26.035)
-		(end 5.84 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -3112,204 +534,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 22.225)
-		(end 1.78 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 23.495)
-		(end 5.84 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 24.765)
-		(end 1.78 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 26.035)
-		(end 5.84 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 27.76)
@@ -3328,6 +552,226 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 3.133333 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 5.84 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 3.133333 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 5.84 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 12.7 90)
 		(layer "F.Fab")
@@ -3348,12 +792,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_10.8x32.04mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_10.8x32.04mm_W7.62mm_P2.54mm.kicad_mod
index 29270e106..e1ad493d9 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_10.8x32.04mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_10.8x32.04mm_W7.62mm_P2.54mm.kicad_mod
@@ -511,258 +511,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -3.65 -2.36)
-		(end -3.65 30.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.65 30.3)
 		(end 9.47 30.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.47 -2.36)
-		(end -3.65 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.47 30.3)
-		(end 9.47 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -3.39 -0.75)
-		(end -1.59 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 0.75)
-		(end -3.39 -0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 1.79)
-		(end -1.59 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 3.29)
-		(end -3.39 1.79)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 4.33)
-		(end -1.59 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 5.83)
-		(end -3.39 4.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 6.87)
-		(end -1.59 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 8.37)
-		(end -3.39 6.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 9.41)
-		(end -1.59 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 10.91)
-		(end -3.39 9.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 11.95)
-		(end -1.59 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 13.45)
-		(end -3.39 11.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 14.49)
-		(end -1.59 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 15.99)
-		(end -3.39 14.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 17.03)
-		(end -1.59 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 18.53)
-		(end -3.39 17.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 19.57)
-		(end -1.59 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 21.07)
-		(end -3.39 19.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 22.11)
-		(end -1.59 22.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 23.61)
-		(end -3.39 22.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 24.65)
-		(end -1.59 24.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 26.15)
-		(end -3.39 24.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 27.19)
-		(end -1.59 27.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -3.39 28.69)
-		(end -3.39 27.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 -1.05)
 		(end -0.59 -2.05)
@@ -772,222 +530,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.59 -0.75)
-		(end -1.59 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 0.75)
-		(end -3.39 0.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 1.79)
-		(end -1.59 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 3.29)
-		(end -3.39 3.29)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 4.33)
-		(end -1.59 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 5.83)
-		(end -3.39 5.83)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 6.87)
-		(end -1.59 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 8.37)
-		(end -3.39 8.37)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 9.41)
-		(end -1.59 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 10.91)
-		(end -3.39 10.91)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 11.95)
-		(end -1.59 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 13.45)
-		(end -3.39 13.45)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 14.49)
-		(end -1.59 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 15.99)
-		(end -3.39 15.99)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 17.03)
-		(end -1.59 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 18.53)
-		(end -3.39 18.53)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 19.57)
-		(end -1.59 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 21.07)
-		(end -3.39 21.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 22.11)
-		(end -1.59 23.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 23.61)
-		(end -3.39 23.61)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 24.65)
-		(end -1.59 26.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 26.15)
-		(end -3.39 26.15)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 27.19)
-		(end -1.59 28.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.59 28.69)
-		(end -3.39 28.69)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.59 29.99)
 		(end -1.59 -1.05)
@@ -1024,6 +566,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.59 -0.75)
+		(end -3.39 0.75)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 1.79)
+		(end -3.39 3.29)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 4.33)
+		(end -3.39 5.83)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 6.87)
+		(end -3.39 8.37)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 9.41)
+		(end -3.39 10.91)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 11.95)
+		(end -3.39 13.45)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 14.49)
+		(end -3.39 15.99)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 17.03)
+		(end -3.39 18.53)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 19.57)
+		(end -3.39 21.07)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 22.11)
+		(end -3.39 23.61)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 24.65)
+		(end -3.39 26.15)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.59 27.19)
+		(end -3.39 28.69)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 13.97 0)
 		(layer "F.Fab")
@@ -1034,12 +696,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_CTS_Series194-12MSTN_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_CTS_Series194-12MSTN_W7.62mm_P2.54mm.kicad_mod
index 048a005d7..f0f97f933 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_CTS_Series194-12MSTN_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Piano_CTS_Series194-12MSTN_W7.62mm_P2.54mm.kicad_mod
@@ -511,258 +511,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -2.47 -2.67)
-		(end -2.47 30.61)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.47 30.61)
 		(end 8.95 30.61)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -2.47 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 30.61)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -2.22 -0.76)
-		(end -1.08 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 0.76)
-		(end -2.22 -0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 1.78)
-		(end -1.08 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 3.3)
-		(end -2.22 1.78)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 4.32)
-		(end -1.08 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 5.84)
-		(end -2.22 4.32)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 6.86)
-		(end -1.08 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 8.38)
-		(end -2.22 6.86)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 9.4)
-		(end -1.08 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 10.92)
-		(end -2.22 9.4)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 11.94)
-		(end -1.08 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 13.46)
-		(end -2.22 11.94)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 14.48)
-		(end -1.08 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 16)
-		(end -2.22 14.48)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 17.02)
-		(end -1.08 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 18.54)
-		(end -2.22 17.02)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 19.56)
-		(end -1.08 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 21.08)
-		(end -2.22 19.56)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 22.1)
-		(end -1.08 22.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 23.62)
-		(end -2.22 22.1)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 24.64)
-		(end -1.08 24.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 26.16)
-		(end -2.22 24.64)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 27.18)
-		(end -1.08 27.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -2.22 28.7)
-		(end -2.22 27.18)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 -1.36)
 		(end -0.08 -2.36)
@@ -772,222 +530,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start -1.08 -0.76)
-		(end -1.08 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 0.76)
-		(end -2.22 0.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 1.78)
-		(end -1.08 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 3.3)
-		(end -2.22 3.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 4.32)
-		(end -1.08 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 5.84)
-		(end -2.22 5.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 6.86)
-		(end -1.08 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 8.38)
-		(end -2.22 8.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 9.4)
-		(end -1.08 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 10.92)
-		(end -2.22 10.92)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 11.94)
-		(end -1.08 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 13.46)
-		(end -2.22 13.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 14.48)
-		(end -1.08 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 16)
-		(end -2.22 16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 17.02)
-		(end -1.08 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 18.54)
-		(end -2.22 18.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 19.56)
-		(end -1.08 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 21.08)
-		(end -2.22 21.08)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 22.1)
-		(end -1.08 23.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 23.62)
-		(end -2.22 23.62)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 24.64)
-		(end -1.08 26.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 26.16)
-		(end -2.22 26.16)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 27.18)
-		(end -1.08 28.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.08 28.7)
-		(end -2.22 28.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -1.08 30.3)
 		(end -1.08 -1.36)
@@ -1024,6 +566,126 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start -1.08 -0.76)
+		(end -2.22 0.76)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 1.78)
+		(end -2.22 3.3)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 4.32)
+		(end -2.22 5.84)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 6.86)
+		(end -2.22 8.38)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 9.4)
+		(end -2.22 10.92)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 11.94)
+		(end -2.22 13.46)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 14.48)
+		(end -2.22 16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 17.02)
+		(end -2.22 18.54)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 19.56)
+		(end -2.22 21.08)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 22.1)
+		(end -2.22 23.62)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 24.64)
+		(end -2.22 26.16)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start -1.08 27.18)
+		(end -2.22 28.7)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 13.97 0)
 		(layer "F.Fab")
@@ -1034,12 +696,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W7.62mm_P2.54mm_LowProfile.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
index b43fee098..f65e630ee 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_6.7x32.04mm_W7.62mm_P2.54mm_LowProfile.kicad_mod
@@ -178,1302 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.515)
-		(end 3.206667 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.395)
-		(end 3.206667 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.275)
-		(end 3.206667 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.155)
-		(end 3.206667 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.085)
-		(end 3.206667 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.205)
-		(end 3.206667 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.325)
-		(end 3.206667 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.445)
-		(end 3.206667 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.025)
-		(end 3.206667 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.145)
-		(end 3.206667 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.265)
-		(end 3.206667 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.385)
-		(end 3.206667 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.625)
-		(end 3.206667 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.745)
-		(end 3.206667 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.865)
-		(end 3.206667 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 2.985)
-		(end 3.206667 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.565)
-		(end 3.206667 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.685)
-		(end 3.206667 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.805)
-		(end 3.206667 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 4.925)
-		(end 3.206667 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.165)
-		(end 3.206667 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.285)
-		(end 3.206667 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.405)
-		(end 3.206667 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.525)
-		(end 3.206667 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.105)
-		(end 3.206667 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.225)
-		(end 3.206667 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.345)
-		(end 3.206667 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.465)
-		(end 3.206667 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.705)
-		(end 3.206667 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.825)
-		(end 3.206667 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 7.945)
-		(end 3.206667 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.065)
-		(end 3.206667 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.645)
-		(end 3.206667 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.765)
-		(end 3.206667 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 9.885)
-		(end 3.206667 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.005)
-		(end 3.206667 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.245)
-		(end 3.206667 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.365)
-		(end 3.206667 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.485)
-		(end 3.206667 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.605)
-		(end 3.206667 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.185)
-		(end 3.206667 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.305)
-		(end 3.206667 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.425)
-		(end 3.206667 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.545)
-		(end 3.206667 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.785)
-		(end 3.206667 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 12.905)
-		(end 3.206667 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.025)
-		(end 3.206667 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.145)
-		(end 3.206667 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.725)
-		(end 3.206667 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.845)
-		(end 3.206667 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 14.965)
-		(end 3.206667 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.085)
-		(end 3.206667 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.325)
-		(end 3.206667 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.445)
-		(end 3.206667 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.565)
-		(end 3.206667 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.685)
-		(end 3.206667 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.265)
-		(end 3.206667 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.385)
-		(end 3.206667 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.505)
-		(end 3.206667 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.625)
-		(end 3.206667 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.865)
-		(end 3.206667 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 17.985)
-		(end 3.206667 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.105)
-		(end 3.206667 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.225)
-		(end 3.206667 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.805)
-		(end 3.206667 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 19.925)
-		(end 3.206667 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.045)
-		(end 3.206667 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.165)
-		(end 3.206667 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.405)
-		(end 3.206667 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.525)
-		(end 3.206667 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.645)
-		(end 3.206667 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.765)
-		(end 3.206667 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.225)
-		(end 2 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.345)
-		(end 3.206667 22.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.465)
-		(end 3.206667 22.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.585)
-		(end 3.206667 22.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.705)
-		(end 3.206667 22.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.825)
-		(end 3.206667 22.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 22.945)
-		(end 3.206667 22.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.065)
-		(end 3.206667 23.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.185)
-		(end 3.206667 23.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.305)
-		(end 3.206667 23.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.425)
-		(end 3.206667 23.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 23.495)
-		(end 5.62 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 24.765)
-		(end 2 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 24.885)
-		(end 3.206667 24.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.005)
-		(end 3.206667 25.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.125)
-		(end 3.206667 25.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.245)
-		(end 3.206667 25.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.365)
-		(end 3.206667 25.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.485)
-		(end 3.206667 25.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.605)
-		(end 3.206667 25.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.725)
-		(end 3.206667 25.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.845)
-		(end 3.206667 25.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 25.965)
-		(end 3.206667 25.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 26.035)
-		(end 5.62 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 27.305)
-		(end 2 28.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 27.425)
-		(end 3.206667 27.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 27.545)
-		(end 3.206667 27.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 27.665)
-		(end 3.206667 27.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 27.785)
-		(end 3.206667 27.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 27.905)
-		(end 3.206667 27.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 28.025)
-		(end 3.206667 28.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 28.145)
-		(end 3.206667 28.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 28.265)
-		(end 3.206667 28.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 28.385)
-		(end 3.206667 28.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 28.505)
-		(end 3.206667 28.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 2 28.575)
-		(end 5.62 28.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -1582,222 +286,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 22.225)
-		(end 2 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 23.495)
-		(end 5.62 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 24.765)
-		(end 2 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 26.035)
-		(end 5.62 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 27.305)
-		(end 2 27.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.62 28.575)
-		(end 5.62 27.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 7.22 -2.11)
 		(end 7.22 -0.96)
@@ -1915,40 +403,254 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 -2.36)
-		(end -1.06 30.3)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.06 30.3)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 3.206667 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 5.62 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 3.206667 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 5.62 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 27.305)
+		(end 3.206667 28.575)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 2 27.305)
+		(end 5.62 28.575)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.06 -2.36)
 		(end 8.67 30.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.36)
-		(end -1.06 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 30.3)
-		(end 8.67 -2.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1978,1518 +680,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 2 -0.635)
-		(end 2 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.535)
-		(end 3.206667 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.435)
-		(end 3.206667 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.335)
-		(end 3.206667 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.235)
-		(end 3.206667 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.135)
-		(end 3.206667 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 -0.035)
-		(end 3.206667 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.065)
-		(end 3.206667 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.165)
-		(end 3.206667 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.265)
-		(end 3.206667 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.365)
-		(end 3.206667 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.465)
-		(end 3.206667 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.565)
-		(end 3.206667 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 0.635)
-		(end 5.62 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 1.905)
-		(end 2 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.005)
-		(end 3.206667 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.105)
-		(end 3.206667 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.205)
-		(end 3.206667 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.305)
-		(end 3.206667 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.405)
-		(end 3.206667 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.505)
-		(end 3.206667 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.605)
-		(end 3.206667 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.705)
-		(end 3.206667 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.805)
-		(end 3.206667 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 2.905)
-		(end 3.206667 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.005)
-		(end 3.206667 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.105)
-		(end 3.206667 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 3.175)
-		(end 5.62 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.445)
-		(end 2 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.545)
-		(end 3.206667 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.645)
-		(end 3.206667 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.745)
-		(end 3.206667 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.845)
-		(end 3.206667 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 4.945)
-		(end 3.206667 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.045)
-		(end 3.206667 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.145)
-		(end 3.206667 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.245)
-		(end 3.206667 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.345)
-		(end 3.206667 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.445)
-		(end 3.206667 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.545)
-		(end 3.206667 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.645)
-		(end 3.206667 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 5.715)
-		(end 5.62 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 6.985)
-		(end 2 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.085)
-		(end 3.206667 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.185)
-		(end 3.206667 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.285)
-		(end 3.206667 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.385)
-		(end 3.206667 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.485)
-		(end 3.206667 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.585)
-		(end 3.206667 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.685)
-		(end 3.206667 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.785)
-		(end 3.206667 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.885)
-		(end 3.206667 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 7.985)
-		(end 3.206667 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.085)
-		(end 3.206667 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.185)
-		(end 3.206667 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 8.255)
-		(end 5.62 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.525)
-		(end 2 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.625)
-		(end 3.206667 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.725)
-		(end 3.206667 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.825)
-		(end 3.206667 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 9.925)
-		(end 3.206667 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.025)
-		(end 3.206667 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.125)
-		(end 3.206667 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.225)
-		(end 3.206667 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.325)
-		(end 3.206667 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.425)
-		(end 3.206667 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.525)
-		(end 3.206667 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.625)
-		(end 3.206667 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.725)
-		(end 3.206667 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 10.795)
-		(end 5.62 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.065)
-		(end 2 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.165)
-		(end 3.206667 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.265)
-		(end 3.206667 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.365)
-		(end 3.206667 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.465)
-		(end 3.206667 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.565)
-		(end 3.206667 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.665)
-		(end 3.206667 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.765)
-		(end 3.206667 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.865)
-		(end 3.206667 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 12.965)
-		(end 3.206667 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.065)
-		(end 3.206667 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.165)
-		(end 3.206667 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.265)
-		(end 3.206667 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 13.335)
-		(end 5.62 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.605)
-		(end 2 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.705)
-		(end 3.206667 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.805)
-		(end 3.206667 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 14.905)
-		(end 3.206667 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.005)
-		(end 3.206667 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.105)
-		(end 3.206667 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.205)
-		(end 3.206667 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.305)
-		(end 3.206667 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.405)
-		(end 3.206667 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.505)
-		(end 3.206667 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.605)
-		(end 3.206667 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.705)
-		(end 3.206667 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.805)
-		(end 3.206667 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 15.875)
-		(end 5.62 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.145)
-		(end 2 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.245)
-		(end 3.206667 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.345)
-		(end 3.206667 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.445)
-		(end 3.206667 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.545)
-		(end 3.206667 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.645)
-		(end 3.206667 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.745)
-		(end 3.206667 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.845)
-		(end 3.206667 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 17.945)
-		(end 3.206667 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.045)
-		(end 3.206667 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.145)
-		(end 3.206667 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.245)
-		(end 3.206667 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.345)
-		(end 3.206667 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 18.415)
-		(end 5.62 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.685)
-		(end 2 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.785)
-		(end 3.206667 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.885)
-		(end 3.206667 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 19.985)
-		(end 3.206667 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.085)
-		(end 3.206667 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.185)
-		(end 3.206667 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.285)
-		(end 3.206667 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.385)
-		(end 3.206667 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.485)
-		(end 3.206667 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.585)
-		(end 3.206667 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.685)
-		(end 3.206667 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.785)
-		(end 3.206667 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.885)
-		(end 3.206667 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 20.955)
-		(end 5.62 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.225)
-		(end 2 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.325)
-		(end 3.206667 22.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.425)
-		(end 3.206667 22.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.525)
-		(end 3.206667 22.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.625)
-		(end 3.206667 22.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.725)
-		(end 3.206667 22.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.825)
-		(end 3.206667 22.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 22.925)
-		(end 3.206667 22.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.025)
-		(end 3.206667 23.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.125)
-		(end 3.206667 23.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.225)
-		(end 3.206667 23.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.325)
-		(end 3.206667 23.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.425)
-		(end 3.206667 23.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 23.495)
-		(end 5.62 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 24.765)
-		(end 2 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 24.865)
-		(end 3.206667 24.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 24.965)
-		(end 3.206667 24.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.065)
-		(end 3.206667 25.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.165)
-		(end 3.206667 25.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.265)
-		(end 3.206667 25.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.365)
-		(end 3.206667 25.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.465)
-		(end 3.206667 25.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.565)
-		(end 3.206667 25.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.665)
-		(end 3.206667 25.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.765)
-		(end 3.206667 25.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.865)
-		(end 3.206667 25.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 25.965)
-		(end 3.206667 25.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 26.035)
-		(end 5.62 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.305)
-		(end 2 28.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.405)
-		(end 3.206667 27.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.505)
-		(end 3.206667 27.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.605)
-		(end 3.206667 27.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.705)
-		(end 3.206667 27.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.805)
-		(end 3.206667 27.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 27.905)
-		(end 3.206667 27.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.005)
-		(end 3.206667 28.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.105)
-		(end 3.206667 28.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.205)
-		(end 3.206667 28.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.305)
-		(end 3.206667 28.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.405)
-		(end 3.206667 28.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.505)
-		(end 3.206667 28.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 2 28.575)
-		(end 5.62 28.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.206667 -0.635)
 		(end 3.206667 0.635)
@@ -3598,222 +788,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.62 -0.635)
-		(end 2 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 0.635)
-		(end 5.62 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 1.905)
-		(end 2 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 3.175)
-		(end 5.62 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 4.445)
-		(end 2 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 5.715)
-		(end 5.62 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 6.985)
-		(end 2 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 8.255)
-		(end 5.62 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 9.525)
-		(end 2 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 10.795)
-		(end 5.62 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 12.065)
-		(end 2 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 13.335)
-		(end 5.62 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 14.605)
-		(end 2 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 15.875)
-		(end 5.62 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 17.145)
-		(end 2 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 18.415)
-		(end 5.62 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 19.685)
-		(end 2 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 20.955)
-		(end 5.62 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 22.225)
-		(end 2 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 23.495)
-		(end 5.62 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 24.765)
-		(end 2 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 26.035)
-		(end 5.62 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 27.305)
-		(end 2 27.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.62 28.575)
-		(end 5.62 27.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 7.16 -2.05)
 		(end 7.16 29.99)
@@ -3832,6 +806,246 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 3.206667 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 -0.635)
+		(end 5.62 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 3.206667 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 1.905)
+		(end 5.62 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 3.206667 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 4.445)
+		(end 5.62 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 3.206667 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 6.985)
+		(end 5.62 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 3.206667 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 9.525)
+		(end 5.62 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 3.206667 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 12.065)
+		(end 5.62 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 3.206667 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 14.605)
+		(end 5.62 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 3.206667 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 17.145)
+		(end 5.62 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 3.206667 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 19.685)
+		(end 5.62 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 3.206667 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 22.225)
+		(end 5.62 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 3.206667 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 24.765)
+		(end 5.62 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 27.305)
+		(end 3.206667 28.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 2 27.305)
+		(end 5.62 28.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 6.39 13.97 90)
 		(layer "F.Fab")
@@ -3852,12 +1066,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W7.62mm_P2.54mm.kicad_mod b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W7.62mm_P2.54mm.kicad_mod
index 7bf549dff..cbb0ebd54 100644
--- a/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W7.62mm_P2.54mm.kicad_mod
+++ b/Button_Switch_THT.pretty/SW_DIP_SPSTx12_Slide_9.78x32.66mm_W7.62mm_P2.54mm.kicad_mod
@@ -70,1302 +70,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.515)
-		(end 3.133333 -0.515)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.395)
-		(end 3.133333 -0.395)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.275)
-		(end 3.133333 -0.275)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.155)
-		(end 3.133333 -0.155)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.085)
-		(end 3.133333 0.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.205)
-		(end 3.133333 0.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.325)
-		(end 3.133333 0.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.445)
-		(end 3.133333 0.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.025)
-		(end 3.133333 2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.145)
-		(end 3.133333 2.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.265)
-		(end 3.133333 2.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.385)
-		(end 3.133333 2.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.625)
-		(end 3.133333 2.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.745)
-		(end 3.133333 2.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.865)
-		(end 3.133333 2.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 2.985)
-		(end 3.133333 2.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.565)
-		(end 3.133333 4.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.685)
-		(end 3.133333 4.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.805)
-		(end 3.133333 4.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 4.925)
-		(end 3.133333 4.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.165)
-		(end 3.133333 5.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.285)
-		(end 3.133333 5.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.405)
-		(end 3.133333 5.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.525)
-		(end 3.133333 5.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.105)
-		(end 3.133333 7.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.225)
-		(end 3.133333 7.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.345)
-		(end 3.133333 7.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.465)
-		(end 3.133333 7.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.705)
-		(end 3.133333 7.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.825)
-		(end 3.133333 7.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 7.945)
-		(end 3.133333 7.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.065)
-		(end 3.133333 8.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.645)
-		(end 3.133333 9.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.765)
-		(end 3.133333 9.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 9.885)
-		(end 3.133333 9.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.005)
-		(end 3.133333 10.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.245)
-		(end 3.133333 10.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.365)
-		(end 3.133333 10.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.485)
-		(end 3.133333 10.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.605)
-		(end 3.133333 10.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.185)
-		(end 3.133333 12.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.305)
-		(end 3.133333 12.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.425)
-		(end 3.133333 12.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.545)
-		(end 3.133333 12.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.785)
-		(end 3.133333 12.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 12.905)
-		(end 3.133333 12.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.025)
-		(end 3.133333 13.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.145)
-		(end 3.133333 13.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.725)
-		(end 3.133333 14.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.845)
-		(end 3.133333 14.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 14.965)
-		(end 3.133333 14.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.085)
-		(end 3.133333 15.085)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.325)
-		(end 3.133333 15.325)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.445)
-		(end 3.133333 15.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.565)
-		(end 3.133333 15.565)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.685)
-		(end 3.133333 15.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.265)
-		(end 3.133333 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.385)
-		(end 3.133333 17.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.505)
-		(end 3.133333 17.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.625)
-		(end 3.133333 17.625)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.865)
-		(end 3.133333 17.865)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 17.985)
-		(end 3.133333 17.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.105)
-		(end 3.133333 18.105)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.225)
-		(end 3.133333 18.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.805)
-		(end 3.133333 19.805)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 19.925)
-		(end 3.133333 19.925)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.045)
-		(end 3.133333 20.045)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.165)
-		(end 3.133333 20.165)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.405)
-		(end 3.133333 20.405)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.525)
-		(end 3.133333 20.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.645)
-		(end 3.133333 20.645)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.765)
-		(end 3.133333 20.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.225)
-		(end 1.78 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.345)
-		(end 3.133333 22.345)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.465)
-		(end 3.133333 22.465)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.585)
-		(end 3.133333 22.585)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.705)
-		(end 3.133333 22.705)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.825)
-		(end 3.133333 22.825)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 22.945)
-		(end 3.133333 22.945)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.065)
-		(end 3.133333 23.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.185)
-		(end 3.133333 23.185)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.305)
-		(end 3.133333 23.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.425)
-		(end 3.133333 23.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 23.495)
-		(end 5.84 23.495)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 24.765)
-		(end 1.78 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 24.885)
-		(end 3.133333 24.885)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.005)
-		(end 3.133333 25.005)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.125)
-		(end 3.133333 25.125)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.245)
-		(end 3.133333 25.245)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.365)
-		(end 3.133333 25.365)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.485)
-		(end 3.133333 25.485)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.605)
-		(end 3.133333 25.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.725)
-		(end 3.133333 25.725)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.845)
-		(end 3.133333 25.845)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 25.965)
-		(end 3.133333 25.965)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 26.035)
-		(end 5.84 26.035)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 27.305)
-		(end 1.78 28.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 27.425)
-		(end 3.133333 27.425)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 27.545)
-		(end 3.133333 27.545)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 27.665)
-		(end 3.133333 27.665)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 27.785)
-		(end 3.133333 27.785)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 27.905)
-		(end 3.133333 27.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 28.025)
-		(end 3.133333 28.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 28.145)
-		(end 3.133333 28.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 28.265)
-		(end 3.133333 28.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 28.385)
-		(end 3.133333 28.385)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 28.505)
-		(end 3.133333 28.505)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 1.78 28.575)
-		(end 5.84 28.575)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -1474,222 +178,6 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 22.225)
-		(end 1.78 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 23.495)
-		(end 5.84 22.225)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 24.765)
-		(end 1.78 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 26.035)
-		(end 5.84 24.765)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 27.305)
-		(end 1.78 27.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.84 28.575)
-		(end 5.84 27.305)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 8.76 -2.42)
 		(end 8.76 30.36)
@@ -1699,40 +187,254 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 -2.67)
-		(end -1.33 30.61)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
 		(stroke
-			(width 0.05)
+			(width 0.12)
 			(type solid)
 		)
-		(layer "F.CrtYd")
+		(fill solid)
+		(layer "F.SilkS")
 	)
-	(fp_line
-		(start -1.33 30.61)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 3.133333 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 5.84 23.495)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 3.133333 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 5.84 26.035)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 27.305)
+		(end 3.133333 28.575)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start 1.78 27.305)
+		(end 5.84 28.575)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.SilkS")
+	)
+	(fp_rect
+		(start -1.33 -2.67)
 		(end 8.95 30.61)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 -2.67)
-		(end -1.33 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.95 30.61)
-		(end 8.95 -2.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -1762,1518 +464,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 1.78 -0.635)
-		(end 1.78 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.535)
-		(end 3.133333 -0.535)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.435)
-		(end 3.133333 -0.435)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.335)
-		(end 3.133333 -0.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.235)
-		(end 3.133333 -0.235)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.135)
-		(end 3.133333 -0.135)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 -0.035)
-		(end 3.133333 -0.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.065)
-		(end 3.133333 0.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.165)
-		(end 3.133333 0.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.265)
-		(end 3.133333 0.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.365)
-		(end 3.133333 0.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.465)
-		(end 3.133333 0.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.565)
-		(end 3.133333 0.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 0.635)
-		(end 5.84 0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 1.905)
-		(end 1.78 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.005)
-		(end 3.133333 2.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.105)
-		(end 3.133333 2.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.205)
-		(end 3.133333 2.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.305)
-		(end 3.133333 2.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.405)
-		(end 3.133333 2.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.505)
-		(end 3.133333 2.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.605)
-		(end 3.133333 2.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.705)
-		(end 3.133333 2.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.805)
-		(end 3.133333 2.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 2.905)
-		(end 3.133333 2.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.005)
-		(end 3.133333 3.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.105)
-		(end 3.133333 3.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 3.175)
-		(end 5.84 3.175)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.445)
-		(end 1.78 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.545)
-		(end 3.133333 4.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.645)
-		(end 3.133333 4.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.745)
-		(end 3.133333 4.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.845)
-		(end 3.133333 4.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 4.945)
-		(end 3.133333 4.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.045)
-		(end 3.133333 5.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.145)
-		(end 3.133333 5.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.245)
-		(end 3.133333 5.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.345)
-		(end 3.133333 5.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.445)
-		(end 3.133333 5.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.545)
-		(end 3.133333 5.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.645)
-		(end 3.133333 5.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 5.715)
-		(end 5.84 5.715)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 6.985)
-		(end 1.78 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.085)
-		(end 3.133333 7.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.185)
-		(end 3.133333 7.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.285)
-		(end 3.133333 7.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.385)
-		(end 3.133333 7.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.485)
-		(end 3.133333 7.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.585)
-		(end 3.133333 7.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.685)
-		(end 3.133333 7.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.785)
-		(end 3.133333 7.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.885)
-		(end 3.133333 7.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 7.985)
-		(end 3.133333 7.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.085)
-		(end 3.133333 8.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.185)
-		(end 3.133333 8.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 8.255)
-		(end 5.84 8.255)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.525)
-		(end 1.78 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.625)
-		(end 3.133333 9.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.725)
-		(end 3.133333 9.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.825)
-		(end 3.133333 9.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 9.925)
-		(end 3.133333 9.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.025)
-		(end 3.133333 10.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.125)
-		(end 3.133333 10.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.225)
-		(end 3.133333 10.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.325)
-		(end 3.133333 10.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.425)
-		(end 3.133333 10.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.525)
-		(end 3.133333 10.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.625)
-		(end 3.133333 10.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.725)
-		(end 3.133333 10.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 10.795)
-		(end 5.84 10.795)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.065)
-		(end 1.78 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.165)
-		(end 3.133333 12.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.265)
-		(end 3.133333 12.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.365)
-		(end 3.133333 12.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.465)
-		(end 3.133333 12.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.565)
-		(end 3.133333 12.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.665)
-		(end 3.133333 12.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.765)
-		(end 3.133333 12.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.865)
-		(end 3.133333 12.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 12.965)
-		(end 3.133333 12.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.065)
-		(end 3.133333 13.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.165)
-		(end 3.133333 13.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.265)
-		(end 3.133333 13.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 13.335)
-		(end 5.84 13.335)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.605)
-		(end 1.78 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.705)
-		(end 3.133333 14.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.805)
-		(end 3.133333 14.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 14.905)
-		(end 3.133333 14.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.005)
-		(end 3.133333 15.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.105)
-		(end 3.133333 15.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.205)
-		(end 3.133333 15.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.305)
-		(end 3.133333 15.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.405)
-		(end 3.133333 15.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.505)
-		(end 3.133333 15.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.605)
-		(end 3.133333 15.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.705)
-		(end 3.133333 15.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.805)
-		(end 3.133333 15.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 15.875)
-		(end 5.84 15.875)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.145)
-		(end 1.78 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.245)
-		(end 3.133333 17.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.345)
-		(end 3.133333 17.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.445)
-		(end 3.133333 17.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.545)
-		(end 3.133333 17.545)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.645)
-		(end 3.133333 17.645)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.745)
-		(end 3.133333 17.745)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.845)
-		(end 3.133333 17.845)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 17.945)
-		(end 3.133333 17.945)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.045)
-		(end 3.133333 18.045)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.145)
-		(end 3.133333 18.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.245)
-		(end 3.133333 18.245)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.345)
-		(end 3.133333 18.345)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 18.415)
-		(end 5.84 18.415)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.685)
-		(end 1.78 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.785)
-		(end 3.133333 19.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.885)
-		(end 3.133333 19.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 19.985)
-		(end 3.133333 19.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.085)
-		(end 3.133333 20.085)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.185)
-		(end 3.133333 20.185)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.285)
-		(end 3.133333 20.285)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.385)
-		(end 3.133333 20.385)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.485)
-		(end 3.133333 20.485)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.585)
-		(end 3.133333 20.585)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.685)
-		(end 3.133333 20.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.785)
-		(end 3.133333 20.785)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.885)
-		(end 3.133333 20.885)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 20.955)
-		(end 5.84 20.955)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.225)
-		(end 1.78 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.325)
-		(end 3.133333 22.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.425)
-		(end 3.133333 22.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.525)
-		(end 3.133333 22.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.625)
-		(end 3.133333 22.625)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.725)
-		(end 3.133333 22.725)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.825)
-		(end 3.133333 22.825)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 22.925)
-		(end 3.133333 22.925)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.025)
-		(end 3.133333 23.025)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.125)
-		(end 3.133333 23.125)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.225)
-		(end 3.133333 23.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.325)
-		(end 3.133333 23.325)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.425)
-		(end 3.133333 23.425)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 23.495)
-		(end 5.84 23.495)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 24.765)
-		(end 1.78 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 24.865)
-		(end 3.133333 24.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 24.965)
-		(end 3.133333 24.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.065)
-		(end 3.133333 25.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.165)
-		(end 3.133333 25.165)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.265)
-		(end 3.133333 25.265)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.365)
-		(end 3.133333 25.365)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.465)
-		(end 3.133333 25.465)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.565)
-		(end 3.133333 25.565)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.665)
-		(end 3.133333 25.665)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.765)
-		(end 3.133333 25.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.865)
-		(end 3.133333 25.865)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 25.965)
-		(end 3.133333 25.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 26.035)
-		(end 5.84 26.035)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.305)
-		(end 1.78 28.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.405)
-		(end 3.133333 27.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.505)
-		(end 3.133333 27.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.605)
-		(end 3.133333 27.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.705)
-		(end 3.133333 27.705)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.805)
-		(end 3.133333 27.805)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 27.905)
-		(end 3.133333 27.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.005)
-		(end 3.133333 28.005)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.105)
-		(end 3.133333 28.105)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.205)
-		(end 3.133333 28.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.305)
-		(end 3.133333 28.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.405)
-		(end 3.133333 28.405)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.505)
-		(end 3.133333 28.505)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 1.78 28.575)
-		(end 5.84 28.575)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 3.133333 -0.635)
 		(end 3.133333 0.635)
@@ -3382,222 +572,6 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.84 -0.635)
-		(end 1.78 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 0.635)
-		(end 5.84 -0.635)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 1.905)
-		(end 1.78 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 3.175)
-		(end 5.84 1.905)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 4.445)
-		(end 1.78 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 5.715)
-		(end 5.84 4.445)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 6.985)
-		(end 1.78 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 8.255)
-		(end 5.84 6.985)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 9.525)
-		(end 1.78 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 10.795)
-		(end 5.84 9.525)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 12.065)
-		(end 1.78 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 13.335)
-		(end 5.84 12.065)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 14.605)
-		(end 1.78 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 15.875)
-		(end 5.84 14.605)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 17.145)
-		(end 1.78 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 18.415)
-		(end 5.84 17.145)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 19.685)
-		(end 1.78 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 20.955)
-		(end 5.84 19.685)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 22.225)
-		(end 1.78 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 23.495)
-		(end 5.84 22.225)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 24.765)
-		(end 1.78 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 26.035)
-		(end 5.84 24.765)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 27.305)
-		(end 1.78 27.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.84 28.575)
-		(end 5.84 27.305)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 8.7 -2.36)
 		(end 8.7 30.3)
@@ -3616,6 +590,246 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 3.133333 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 -0.635)
+		(end 5.84 0.635)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 3.133333 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 1.905)
+		(end 5.84 3.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 3.133333 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 4.445)
+		(end 5.84 5.715)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 3.133333 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 6.985)
+		(end 5.84 8.255)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 3.133333 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 9.525)
+		(end 5.84 10.795)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 3.133333 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 12.065)
+		(end 5.84 13.335)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 3.133333 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 14.605)
+		(end 5.84 15.875)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 3.133333 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 17.145)
+		(end 5.84 18.415)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 3.133333 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 19.685)
+		(end 5.84 20.955)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 3.133333 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 22.225)
+		(end 5.84 23.495)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 3.133333 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 24.765)
+		(end 5.84 26.035)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 27.305)
+		(end 3.133333 28.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill solid)
+		(layer "F.Fab")
+	)
+	(fp_rect
+		(start 1.78 27.305)
+		(end 5.84 28.575)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(fill none)
+		(layer "F.Fab")
+	)
 	(fp_text user "${REFERENCE}"
 		(at 7.27 13.97 90)
 		(layer "F.Fab")
@@ -3636,12 +850,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed.kicad_mod
index 8fdf456f3..9f13e74a3 100644
--- a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -2.16)
-		(end -1.06 17.4)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 17.4)
 		(end 8.67 17.4)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -2.16)
-		(end -1.06 -2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 17.4)
-		(end 8.67 -2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads.kicad_mod
index dc6aaebfc..39e1a9abe 100644
--- a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -2.16)
-		(end -1.45 17.4)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 17.4)
 		(end 9.07 17.4)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -2.16)
-		(end -1.45 -2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 17.4)
-		(end 9.07 -2.16)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 4d987dc60..917f9db73 100644
--- a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -2.025)
-		(end -1.44 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 17.265)
-		(end 9.06 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.965)
 		(end 1.56 17.205)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -2.025)
-		(end -1.44 -2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 17.265)
-		(end 9.06 -2.025)
+	(fp_rect
+		(start -1.44 -2.025)
+		(end 9.06 17.265)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -2.22)
-		(end -1.52 17.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 17.46)
 		(end 9.14 17.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -2.22)
-		(end -1.52 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 17.46)
-		(end 9.14 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.965)
-		(end -1.27 17.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 17.205)
-		(end 8.89 17.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.905)
 		(end 1.065 -1.905)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.965)
-		(end -1.27 -1.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 17.205)
-		(end 8.89 -1.965)
+	(fp_rect
+		(start -1.27 -1.965)
+		(end 8.89 17.205)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_Socket.kicad_mod
index 32e94a053..98c58a15d 100644
--- a/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-14_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -2.025)
-		(end -1.33 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 17.265)
-		(end 8.95 17.265)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.965)
 		(end 1.16 17.205)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -2.025)
-		(end -1.33 -2.025)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 17.265)
-		(end 8.95 -2.025)
+	(fp_rect
+		(start -1.33 -2.025)
+		(end 8.95 17.265)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -2.22)
-		(end -1.52 17.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 17.46)
 		(end 9.14 17.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -2.22)
-		(end -1.52 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 17.46)
-		(end 9.14 -2.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.965)
-		(end -1.27 17.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 17.205)
-		(end 8.89 17.205)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.905)
 		(end 1.065 -1.905)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.965)
-		(end -1.27 -1.965)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 17.205)
-		(end 8.89 -1.965)
+	(fp_rect
+		(start -1.27 -1.965)
+		(end 8.89 17.205)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed.kicad_mod
index 0881a6b61..f0782e305 100644
--- a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 19.3)
 		(end 8.67 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 19.3)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads.kicad_mod
index 25e3e2913..a4501bbb2 100644
--- a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 19.3)
 		(end 9.07 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 19.3)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index d775bdd9d..32f007906 100644
--- a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 19.17)
-		(end 9.06 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 19.11)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 19.17)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 19.17)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 19.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 19.36)
 		(end 9.14 19.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 19.36)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 19.11)
-		(end 8.89 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 19.11)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 19.11)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_Socket.kicad_mod
index 4327806e6..1bc72e7cf 100644
--- a/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-16_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 19.17)
-		(end 8.95 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 19.11)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 19.17)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 19.17)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 19.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 19.36)
 		(end 9.14 19.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 19.36)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 19.11)
-		(end 8.89 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 19.11)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 19.11)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed.kicad_mod
index b5ecd2db3..e7862fd33 100644
--- a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 21.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 21.84)
 		(end 8.67 21.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 21.84)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads.kicad_mod
index e2476f357..5202695e4 100644
--- a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 21.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 21.84)
 		(end 9.07 21.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 21.84)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 066f4340c..4273feec7 100644
--- a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 21.71)
-		(end 9.06 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 21.65)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 21.71)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 21.71)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 21.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 21.9)
 		(end 9.14 21.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 21.9)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 21.65)
-		(end 8.89 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 21.65)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 21.65)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_Socket.kicad_mod
index 5858d6bac..06f6631e8 100644
--- a/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-18_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 21.71)
-		(end 8.95 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 21.65)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 21.71)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 21.71)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 21.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 21.9)
 		(end 9.14 21.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 21.9)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 21.65)
-		(end 8.89 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 21.65)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 21.65)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed.kicad_mod
index c49f64e7d..d00e9c2d8 100644
--- a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 24.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 24.38)
 		(end 8.67 24.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 24.38)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads.kicad_mod
index 39e237660..79417b26d 100644
--- a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 24.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 24.38)
 		(end 9.07 24.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 24.38)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 814f15ce5..ab34c17bf 100644
--- a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 24.25)
-		(end 9.06 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 24.19)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 24.25)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 24.25)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 24.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 24.44)
 		(end 9.14 24.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 24.44)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 24.19)
-		(end 8.89 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 24.19)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 24.19)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_Socket.kicad_mod
index 034a6ed9c..90041cf4c 100644
--- a/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-20_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 24.25)
-		(end 8.95 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 24.19)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 24.25)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 24.25)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 24.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 24.44)
 		(end 9.14 24.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 24.44)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 24.19)
-		(end 8.89 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 24.19)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 24.19)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed.kicad_mod
index 24b395973..528561f55 100644
--- a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.53)
-		(end -1.06 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 26.92)
 		(end 8.67 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.53)
-		(end -1.06 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 26.92)
-		(end 8.67 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads.kicad_mod
index 093f8662a..47e768705 100644
--- a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.53)
-		(end -1.45 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 26.92)
 		(end 9.07 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.53)
-		(end -1.45 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 26.92)
-		(end 9.07 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 77f3ccfc7..fb78345f8 100644
--- a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 26.79)
-		(end 9.06 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 26.79)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 26.99)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 26.99)
 		(end 9.14 26.99)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 26.99)
-		(end 9.14 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 26.73)
-		(end 8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 26.73)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_Socket.kicad_mod
index 10bd68171..69640f3e6 100644
--- a/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-22_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 26.79)
-		(end 8.95 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 26.79)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 26.99)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 26.99)
 		(end 9.14 26.99)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 26.99)
-		(end 9.14 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 26.73)
-		(end 8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 26.73)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed.kicad_mod
index 8e40f4a8d..99e9fcd6d 100644
--- a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 29.46)
 		(end 8.67 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 29.46)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads.kicad_mod
index bcf422ced..67a478897 100644
--- a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 29.46)
 		(end 9.07 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 29.46)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 211507a01..452d07ec5 100644
--- a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 29.33)
-		(end 9.06 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 29.33)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 29.53)
 		(end 9.14 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 29.53)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 8.89 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 29.27)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_Socket.kicad_mod
index df2dd4b4a..0ae763306 100644
--- a/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-24_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 29.33)
-		(end 8.95 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 29.33)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 29.53)
 		(end 9.14 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 29.53)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 8.89 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 29.27)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed.kicad_mod
index 10da1541a..9d0030bb2 100644
--- a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 34.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 34.55)
 		(end 8.67 34.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 34.55)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads.kicad_mod
index d2dac8086..2f6a5a915 100644
--- a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 34.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 34.55)
 		(end 9.07 34.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 34.55)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 9cb5580d3..d6c93db68 100644
--- a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 34.41)
-		(end 9.06 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 34.35)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 34.41)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 34.41)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 34.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 34.6)
 		(end 9.14 34.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 34.6)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 34.35)
-		(end 8.89 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 34.35)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 34.35)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_Socket.kicad_mod
index c09e61d43..02b46c1ae 100644
--- a/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-28_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 34.41)
-		(end 8.95 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 34.35)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 34.41)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 34.41)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 34.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 34.6)
 		(end 9.14 34.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 34.6)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 34.35)
-		(end 8.89 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -0.27)
 		(end 1.065 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 34.35)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 34.35)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed.kicad_mod b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed.kicad_mod
index 90e1762b9..8f0ff6890 100644
--- a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -3.05)
-		(end -1.06 10.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 10.67)
 		(end 8.67 10.67)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -3.05)
-		(end -1.06 -3.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 10.67)
-		(end 8.67 -3.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads.kicad_mod b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads.kicad_mod
index 5de546790..62e7202ca 100644
--- a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -3.05)
-		(end -1.45 10.67)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 10.67)
 		(end 9.07 10.67)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -3.05)
-		(end -1.45 -3.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 10.67)
-		(end 9.07 -3.05)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
index 2f380e346..76036f7fa 100644
--- a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_LongPads_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -2.915)
-		(end -1.44 10.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 10.535)
-		(end 9.06 10.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -2.855)
 		(end 1.56 10.475)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -2.915)
-		(end -1.44 -2.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 10.535)
-		(end 9.06 -2.915)
+	(fp_rect
+		(start -1.44 -2.915)
+		(end 9.06 10.535)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -3.11)
-		(end -1.52 10.73)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 10.73)
 		(end 9.14 10.73)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -3.11)
-		(end -1.52 -3.11)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 10.73)
-		(end 9.14 -3.11)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -2.855)
-		(end -1.27 10.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 10.475)
-		(end 8.89 10.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -1.795)
 		(end 1.065 -2.795)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -2.855)
-		(end -1.27 -2.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 10.475)
-		(end 8.89 -2.855)
+	(fp_rect
+		(start -1.27 -2.855)
+		(end 8.89 10.475)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_Socket.kicad_mod b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_Socket.kicad_mod
index 41e25223e..c8262bf64 100644
--- a/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_Socket.kicad_mod
+++ b/Package_DIP.pretty/CERDIP-8_W7.62mm_SideBrazed_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -2.915)
-		(end -1.33 10.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 10.535)
-		(end 8.95 10.535)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -2.855)
 		(end 1.16 10.475)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -2.915)
-		(end -1.33 -2.915)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 10.535)
-		(end 8.95 -2.915)
+	(fp_rect
+		(start -1.33 -2.915)
+		(end 8.95 10.535)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -3.11)
-		(end -1.52 10.73)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 10.73)
 		(end 9.14 10.73)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -3.11)
-		(end -1.52 -3.11)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 10.73)
-		(end 9.14 -3.11)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -2.855)
-		(end -1.27 10.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 10.475)
-		(end 8.89 10.475)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.065 -1.795)
 		(end 1.065 -2.795)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -2.855)
-		(end -1.27 -2.855)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 10.475)
-		(end 8.89 -2.855)
+	(fp_rect
+		(start -1.27 -2.855)
+		(end 8.89 10.475)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-10_W10.16mm.kicad_mod
index 0eafd0574..62746e0be 100644
--- a/Package_DIP.pretty/DIP-10_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 11.68)
 		(end 11.21 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 11.68)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-10_W10.16mm_LongPads.kicad_mod
index 5ae38c9a4..3d3faa155 100644
--- a/Package_DIP.pretty/DIP-10_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 11.68)
 		(end 11.61 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 11.68)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-10_W7.62mm.kicad_mod
index a10dee48d..c15046e70 100644
--- a/Package_DIP.pretty/DIP-10_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 11.68)
 		(end 8.67 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 11.68)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-10_W7.62mm_LongPads.kicad_mod
index 60ce6bfb2..d2b1f6f07 100644
--- a/Package_DIP.pretty/DIP-10_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 11.68)
 		(end 9.07 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 11.68)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-10_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 410810596..08a728aff 100644
--- a/Package_DIP.pretty/DIP-10_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -6.47)
-		(end -5.14 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 6.47)
-		(end 5.14 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -6.41)
 		(end -2.65 6.41)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -6.47)
-		(end -5.14 -6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 6.47)
-		(end 5.14 -6.47)
+	(fp_rect
+		(start -5.14 -6.47)
+		(end 5.14 6.47)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -6.66)
-		(end -5.33 6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 6.66)
 		(end 5.33 6.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -6.66)
-		(end -5.33 -6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 6.66)
-		(end 5.33 -6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -6.41)
-		(end -5.08 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 6.41)
-		(end 5.08 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -5.35)
 		(end -2.175 -6.35)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -6.41)
-		(end -5.08 -6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 6.41)
-		(end 5.08 -6.41)
+	(fp_rect
+		(start -5.08 -6.41)
+		(end 5.08 6.41)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,55 +165,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-10_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-10_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-10_W7.62mm_Socket.kicad_mod
index 3c823e7ae..1e683b3d4 100644
--- a/Package_DIP.pretty/DIP-10_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 11.55)
-		(end 8.95 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 11.49)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 11.55)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 11.55)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 11.74)
 		(end 9.14 11.74)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 11.74)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 11.49)
-		(end 8.89 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 11.49)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 11.49)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-10_W7.62mm_Socket_LongPads.kicad_mod
index efad70610..dc46eb788 100644
--- a/Package_DIP.pretty/DIP-10_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 11.55)
-		(end 9.06 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 11.49)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 11.55)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 11.55)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 11.74)
 		(end 9.14 11.74)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 11.74)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 11.49)
-		(end 8.89 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 11.49)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 11.49)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-10_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-10_W8.89mm_SMDSocket_LongPads.kicad_mod
index eec62c158..a3092f502 100644
--- a/Package_DIP.pretty/DIP-10_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-10_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -6.47)
-		(end -6.235 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 6.47)
-		(end 6.235 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -6.41)
 		(end -2.535 6.41)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -6.47)
-		(end -6.235 -6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 6.47)
-		(end 6.235 -6.47)
+	(fp_rect
+		(start -6.235 -6.47)
+		(end 6.235 6.47)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -6.66)
-		(end -6.25 6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 6.66)
 		(end 6.25 6.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -6.66)
-		(end -6.25 -6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 6.66)
-		(end 6.25 -6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -6.41)
-		(end -5.08 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 6.41)
-		(end 5.08 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -5.35)
 		(end -2.175 -6.35)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -6.41)
-		(end -5.08 -6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 6.41)
-		(end 5.08 -6.41)
+	(fp_rect
+		(start -5.08 -6.41)
+		(end 5.08 6.41)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,55 +165,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-10_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-12_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-12_W10.16mm.kicad_mod
index d717302c2..56a8b192f 100644
--- a/Package_DIP.pretty/DIP-12_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 14.22)
 		(end 11.21 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 14.22)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-12_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-12_W10.16mm_LongPads.kicad_mod
index 5482baa3e..b2f253dd8 100644
--- a/Package_DIP.pretty/DIP-12_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 14.22)
 		(end 11.61 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 14.22)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-12_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-12_W7.62mm.kicad_mod
index ab37b19a6..737c141f4 100644
--- a/Package_DIP.pretty/DIP-12_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 14.22)
 		(end 8.67 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 14.22)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-12_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-12_W7.62mm_LongPads.kicad_mod
index 8a2e07de8..23c9aaf00 100644
--- a/Package_DIP.pretty/DIP-12_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 14.22)
 		(end 9.07 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 14.22)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-12_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-12_W7.62mm_SMDSocket_SmallPads.kicad_mod
index bcc018f1a..33ef79dc2 100644
--- a/Package_DIP.pretty/DIP-12_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -7.74)
-		(end -5.14 7.74)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 7.74)
-		(end 5.14 7.74)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -7.68)
 		(end -2.65 7.68)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -7.74)
-		(end -5.14 -7.74)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 7.74)
-		(end 5.14 -7.74)
+	(fp_rect
+		(start -5.14 -7.74)
+		(end 5.14 7.74)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -7.93)
-		(end -5.33 7.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 7.93)
 		(end 5.33 7.93)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -7.93)
-		(end -5.33 -7.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 7.93)
-		(end 5.33 -7.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -7.68)
-		(end -5.08 7.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 7.68)
-		(end 5.08 7.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -6.62)
 		(end -2.175 -7.62)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -7.68)
-		(end -5.08 -7.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 7.68)
-		(end 5.08 -7.68)
+	(fp_rect
+		(start -5.08 -7.68)
+		(end 5.08 7.68)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,65 +165,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-12_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-12_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-12_W7.62mm_Socket.kicad_mod
index f0e08d162..4f2542c8d 100644
--- a/Package_DIP.pretty/DIP-12_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 14.09)
-		(end 8.95 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 14.03)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 14.09)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 14.09)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 14.28)
 		(end 9.14 14.28)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 14.28)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 14.03)
-		(end 8.89 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 14.03)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 14.03)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-12_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-12_W7.62mm_Socket_LongPads.kicad_mod
index 649e40c67..4bdde0c90 100644
--- a/Package_DIP.pretty/DIP-12_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 14.09)
-		(end 9.06 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 14.03)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 14.09)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 14.09)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 14.28)
 		(end 9.14 14.28)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 14.28)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 14.03)
-		(end 8.89 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 14.03)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 14.03)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-12_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-12_W8.89mm_SMDSocket_LongPads.kicad_mod
index c1b6fea92..2b79a2049 100644
--- a/Package_DIP.pretty/DIP-12_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-12_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -7.74)
-		(end -6.235 7.74)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 7.74)
-		(end 6.235 7.74)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -7.68)
 		(end -2.535 7.68)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -7.74)
-		(end -6.235 -7.74)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 7.74)
-		(end 6.235 -7.74)
+	(fp_rect
+		(start -6.235 -7.74)
+		(end 6.235 7.74)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -7.93)
-		(end -6.25 7.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 7.93)
 		(end 6.25 7.93)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -7.93)
-		(end -6.25 -7.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 7.93)
-		(end 6.25 -7.93)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -7.68)
-		(end -5.08 7.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 7.68)
-		(end 5.08 7.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -6.62)
 		(end -2.175 -7.62)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -7.68)
-		(end -5.08 -7.68)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 7.68)
-		(end 5.08 -7.68)
+	(fp_rect
+		(start -5.08 -7.68)
+		(end 5.08 7.68)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,65 +165,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-12_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-14_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-14_W10.16mm.kicad_mod
index cbfc33cc9..8928ea7f1 100644
--- a/Package_DIP.pretty/DIP-14_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.53)
-		(end -1.05 16.77)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 16.77)
 		(end 11.21 16.77)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.53)
-		(end -1.05 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 16.77)
-		(end 11.21 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-14_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-14_W10.16mm_LongPads.kicad_mod
index a16ad2249..24be953b2 100644
--- a/Package_DIP.pretty/DIP-14_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.53)
-		(end -1.46 16.77)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 16.77)
 		(end 11.61 16.77)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.53)
-		(end -1.46 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 16.77)
-		(end 11.61 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-14_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-14_W7.62mm.kicad_mod
index 2ac6250d1..e6a6c445b 100644
--- a/Package_DIP.pretty/DIP-14_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.53)
-		(end -1.06 16.77)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 16.77)
 		(end 8.67 16.77)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.53)
-		(end -1.06 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 16.77)
-		(end 8.67 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-14_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-14_W7.62mm_LongPads.kicad_mod
index bca5d7017..e070e3e50 100644
--- a/Package_DIP.pretty/DIP-14_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.53)
-		(end -1.45 16.77)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 16.77)
 		(end 9.07 16.77)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.53)
-		(end -1.45 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 16.77)
-		(end 9.07 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-14_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-14_W7.62mm_SMDSocket_SmallPads.kicad_mod
index b62d35c5d..05a5d89ea 100644
--- a/Package_DIP.pretty/DIP-14_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -9.01)
-		(end -5.14 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 9.01)
-		(end 5.14 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -8.95)
 		(end -2.65 8.95)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -9.01)
-		(end -5.14 -9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 9.01)
-		(end 5.14 -9.01)
+	(fp_rect
+		(start -5.14 -9.01)
+		(end 5.14 9.01)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -9.21)
-		(end -5.33 9.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 9.21)
 		(end 5.33 9.21)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -9.21)
-		(end -5.33 -9.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 9.21)
-		(end 5.33 -9.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -8.95)
-		(end -5.08 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 8.95)
-		(end 5.08 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -7.89)
 		(end -2.175 -8.89)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -8.95)
-		(end -5.08 -8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 8.95)
-		(end 5.08 -8.95)
+	(fp_rect
+		(start -5.08 -8.95)
+		(end 5.08 8.95)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,75 +165,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-14_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-14_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-14_W7.62mm_Socket.kicad_mod
index c15f73007..5bd2b305a 100644
--- a/Package_DIP.pretty/DIP-14_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 16.63)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 16.63)
-		(end 8.95 16.63)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 16.57)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 16.63)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 16.63)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 16.82)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 16.82)
 		(end 9.14 16.82)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 16.82)
-		(end 9.14 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 16.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 16.57)
-		(end 8.89 16.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 16.57)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 16.57)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-14_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-14_W7.62mm_Socket_LongPads.kicad_mod
index f9f0af523..1ca1bbe98 100644
--- a/Package_DIP.pretty/DIP-14_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 16.63)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 16.63)
-		(end 9.06 16.63)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 16.57)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 16.63)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 16.63)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 16.82)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 16.82)
 		(end 9.14 16.82)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 16.82)
-		(end 9.14 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 16.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 16.57)
-		(end 8.89 16.57)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 16.57)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 16.57)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-14_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-14_W8.89mm_SMDSocket_LongPads.kicad_mod
index 7f2ad44bb..e57f4d6fb 100644
--- a/Package_DIP.pretty/DIP-14_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-14_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -9.01)
-		(end -6.235 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 9.01)
-		(end 6.235 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -8.95)
 		(end -2.535 8.95)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -9.01)
-		(end -6.235 -9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 9.01)
-		(end 6.235 -9.01)
+	(fp_rect
+		(start -6.235 -9.01)
+		(end 6.235 9.01)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -9.21)
-		(end -6.25 9.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 9.21)
 		(end 6.25 9.21)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -9.21)
-		(end -6.25 -9.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 9.21)
-		(end 6.25 -9.21)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -8.95)
-		(end -5.08 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 8.95)
-		(end 5.08 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -7.89)
 		(end -2.175 -8.89)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -8.95)
-		(end -5.08 -8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 8.95)
-		(end 5.08 -8.95)
+	(fp_rect
+		(start -5.08 -8.95)
+		(end 5.08 8.95)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,75 +165,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.445 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.445 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-14_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-16_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-16_W10.16mm.kicad_mod
index ada8c3a23..2f54be722 100644
--- a/Package_DIP.pretty/DIP-16_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 19.3)
 		(end 11.21 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 19.3)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-16_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-16_W10.16mm_LongPads.kicad_mod
index 4b2383069..edbecf111 100644
--- a/Package_DIP.pretty/DIP-16_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 19.3)
 		(end 11.61 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 19.3)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-16_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-16_W7.62mm.kicad_mod
index 76e830987..087177757 100644
--- a/Package_DIP.pretty/DIP-16_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 19.3)
 		(end 8.67 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 19.3)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-16_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-16_W7.62mm_LongPads.kicad_mod
index e00326d90..aa172bbae 100644
--- a/Package_DIP.pretty/DIP-16_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 19.3)
 		(end 9.07 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 19.3)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-16_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-16_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 7857836b6..fa32beaa0 100644
--- a/Package_DIP.pretty/DIP-16_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -10.28)
-		(end -5.14 10.28)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 10.28)
-		(end 5.14 10.28)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -10.22)
 		(end -2.65 10.22)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -10.28)
-		(end -5.14 -10.28)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 10.28)
-		(end 5.14 -10.28)
+	(fp_rect
+		(start -5.14 -10.28)
+		(end 5.14 10.28)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -10.47)
-		(end -5.33 10.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 10.47)
 		(end 5.33 10.47)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -10.47)
-		(end -5.33 -10.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 10.47)
-		(end 5.33 -10.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -10.22)
-		(end -5.08 10.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 10.22)
-		(end 5.08 10.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -9.16)
 		(end -2.175 -10.16)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -10.22)
-		(end -5.08 -10.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 10.22)
-		(end 5.08 -10.22)
+	(fp_rect
+		(start -5.08 -10.22)
+		(end 5.08 10.22)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,85 +165,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-16_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-16_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-16_W7.62mm_Socket.kicad_mod
index 5f237077f..ee626dd57 100644
--- a/Package_DIP.pretty/DIP-16_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 19.17)
-		(end 8.95 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 19.11)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 19.17)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 19.17)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 19.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 19.36)
 		(end 9.14 19.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 19.36)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 19.11)
-		(end 8.89 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 19.11)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 19.11)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-16_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-16_W7.62mm_Socket_LongPads.kicad_mod
index 3e8af6218..4192a65da 100644
--- a/Package_DIP.pretty/DIP-16_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 19.17)
-		(end 9.06 19.17)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 19.11)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 19.17)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 19.17)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 19.36)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 19.36)
 		(end 9.14 19.36)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 19.36)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 19.11)
-		(end 8.89 19.11)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 19.11)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 19.11)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-16_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-16_W8.89mm_SMDSocket_LongPads.kicad_mod
index 0ac6290cf..f3030b5ac 100644
--- a/Package_DIP.pretty/DIP-16_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-16_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -10.28)
-		(end -6.235 10.28)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 10.28)
-		(end 6.235 10.28)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -10.22)
 		(end -2.535 10.22)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -10.28)
-		(end -6.235 -10.28)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 10.28)
-		(end 6.235 -10.28)
+	(fp_rect
+		(start -6.235 -10.28)
+		(end 6.235 10.28)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -10.47)
-		(end -6.25 10.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 10.47)
 		(end 6.25 10.47)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -10.47)
-		(end -6.25 -10.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 10.47)
-		(end 6.25 -10.47)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -10.22)
-		(end -5.08 10.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 10.22)
-		(end 5.08 10.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -9.16)
 		(end -2.175 -10.16)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -10.22)
-		(end -5.08 -10.22)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 10.22)
-		(end 5.08 -10.22)
+	(fp_rect
+		(start -5.08 -10.22)
+		(end 5.08 10.22)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,85 +165,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-16_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-18_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-18_W7.62mm.kicad_mod
index 9498f37a4..d91c3258c 100644
--- a/Package_DIP.pretty/DIP-18_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-18_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 21.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 21.84)
 		(end 8.67 21.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 21.84)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-18_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-18_W7.62mm_LongPads.kicad_mod
index 3d3e0d20c..334d29882 100644
--- a/Package_DIP.pretty/DIP-18_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-18_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 21.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 21.84)
 		(end 9.07 21.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 21.84)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-18_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-18_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 2f5ac3555..a94bc6683 100644
--- a/Package_DIP.pretty/DIP-18_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-18_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -11.55)
-		(end -5.14 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 11.55)
-		(end 5.14 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -11.49)
 		(end -2.65 11.49)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -11.55)
-		(end -5.14 -11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 11.55)
-		(end 5.14 -11.55)
+	(fp_rect
+		(start -5.14 -11.55)
+		(end 5.14 11.55)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -11.74)
-		(end -5.33 11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 11.74)
 		(end 5.33 11.74)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -11.74)
-		(end -5.33 -11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 11.74)
-		(end 5.33 -11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -11.49)
-		(end -5.08 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 11.49)
-		(end 5.08 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -10.43)
 		(end -2.175 -11.43)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -11.49)
-		(end -5.08 -11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 11.49)
-		(end 5.08 -11.49)
+	(fp_rect
+		(start -5.08 -11.49)
+		(end 5.08 11.49)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,95 +165,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-18_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-18_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-18_W7.62mm_Socket.kicad_mod
index eba45c29e..7663f4536 100644
--- a/Package_DIP.pretty/DIP-18_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-18_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 21.71)
-		(end 8.95 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 21.65)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 21.71)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 21.71)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 21.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 21.9)
 		(end 9.14 21.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 21.9)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 21.65)
-		(end 8.89 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 21.65)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 21.65)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-18_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-18_W7.62mm_Socket_LongPads.kicad_mod
index f3215f46b..7382ff775 100644
--- a/Package_DIP.pretty/DIP-18_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-18_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 21.71)
-		(end 9.06 21.71)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 21.65)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 21.71)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 21.71)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 21.9)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 21.9)
 		(end 9.14 21.9)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 21.9)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 21.65)
-		(end 8.89 21.65)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 21.65)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 21.65)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-18_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-18_W8.89mm_SMDSocket_LongPads.kicad_mod
index 35e25aa4f..2cd785b95 100644
--- a/Package_DIP.pretty/DIP-18_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-18_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -11.55)
-		(end -6.235 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 11.55)
-		(end 6.235 11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -11.49)
 		(end -2.535 11.49)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -11.55)
-		(end -6.235 -11.55)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 11.55)
-		(end 6.235 -11.55)
+	(fp_rect
+		(start -6.235 -11.55)
+		(end 6.235 11.55)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -11.74)
-		(end -6.25 11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 11.74)
 		(end 6.25 11.74)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -11.74)
-		(end -6.25 -11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 11.74)
-		(end 6.25 -11.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -11.49)
-		(end -5.08 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 11.49)
-		(end 5.08 11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -10.43)
 		(end -2.175 -11.43)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -11.49)
-		(end -5.08 -11.49)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 11.49)
-		(end 5.08 -11.49)
+	(fp_rect
+		(start -5.08 -11.49)
+		(end 5.08 11.49)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,95 +165,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.445 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.445 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.445 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.445 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.445 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.445 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-18_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-20_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-20_W7.62mm.kicad_mod
index 103c8db75..ccbdecb31 100644
--- a/Package_DIP.pretty/DIP-20_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-20_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 24.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 24.38)
 		(end 8.67 24.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 24.38)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-20_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-20_W7.62mm_LongPads.kicad_mod
index 838dbfd72..8db61ab32 100644
--- a/Package_DIP.pretty/DIP-20_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-20_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 24.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 24.38)
 		(end 9.07 24.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 24.38)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-20_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-20_W7.62mm_SMDSocket_SmallPads.kicad_mod
index f598a55a1..bd0058c58 100644
--- a/Package_DIP.pretty/DIP-20_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-20_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -12.82)
-		(end -5.14 12.82)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 12.82)
-		(end 5.14 12.82)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -12.76)
 		(end -2.65 12.76)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -12.82)
-		(end -5.14 -12.82)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 12.82)
-		(end 5.14 -12.82)
+	(fp_rect
+		(start -5.14 -12.82)
+		(end 5.14 12.82)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -13.01)
-		(end -5.33 13.01)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 13.01)
 		(end 5.33 13.01)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -13.01)
-		(end -5.33 -13.01)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 13.01)
-		(end 5.33 -13.01)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -12.76)
-		(end -5.08 12.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 12.76)
-		(end 5.08 12.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -11.7)
 		(end -2.175 -12.7)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -12.76)
-		(end -5.08 -12.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 12.76)
-		(end 5.08 -12.76)
+	(fp_rect
+		(start -5.08 -12.76)
+		(end 5.08 12.76)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,105 +165,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-20_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-20_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-20_W7.62mm_Socket.kicad_mod
index 63e363f84..49f688999 100644
--- a/Package_DIP.pretty/DIP-20_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-20_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 24.25)
-		(end 8.95 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 24.19)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 24.25)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 24.25)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 24.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 24.44)
 		(end 9.14 24.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 24.44)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 24.19)
-		(end 8.89 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 24.19)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 24.19)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-20_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-20_W7.62mm_Socket_LongPads.kicad_mod
index 9bc7526f0..7cadce7c3 100644
--- a/Package_DIP.pretty/DIP-20_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-20_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 24.25)
-		(end 9.06 24.25)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 24.19)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 24.25)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 24.25)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 24.44)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 24.44)
 		(end 9.14 24.44)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 24.44)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 24.19)
-		(end 8.89 24.19)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 24.19)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 24.19)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-20_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-20_W8.89mm_SMDSocket_LongPads.kicad_mod
index b58be23f0..58def0367 100644
--- a/Package_DIP.pretty/DIP-20_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-20_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -12.82)
-		(end -6.235 12.82)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 12.82)
-		(end 6.235 12.82)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -12.76)
 		(end -2.535 12.76)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -12.82)
-		(end -6.235 -12.82)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 12.82)
-		(end 6.235 -12.82)
+	(fp_rect
+		(start -6.235 -12.82)
+		(end 6.235 12.82)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -13.01)
-		(end -6.25 13.01)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 13.01)
 		(end 6.25 13.01)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -13.01)
-		(end -6.25 -13.01)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 13.01)
-		(end 6.25 -13.01)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -12.76)
-		(end -5.08 12.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 12.76)
-		(end 5.08 12.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -11.7)
 		(end -2.175 -12.7)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -12.76)
-		(end -5.08 -12.76)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 12.76)
-		(end 5.08 -12.76)
+	(fp_rect
+		(start -5.08 -12.76)
+		(end 5.08 12.76)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,105 +165,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.445 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.445 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.445 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-20_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-22_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-22_W10.16mm.kicad_mod
index 01f49704d..f639cb880 100644
--- a/Package_DIP.pretty/DIP-22_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 26.92)
 		(end 11.21 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 26.92)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-22_W10.16mm_LongPads.kicad_mod
index ed9eeb74f..1f6966d9a 100644
--- a/Package_DIP.pretty/DIP-22_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 26.92)
 		(end 11.61 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 26.92)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W10.16mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-22_W10.16mm_SMDSocket_SmallPads.kicad_mod
index 00a8b7894..f495fd093 100644
--- a/Package_DIP.pretty/DIP-22_W10.16mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W10.16mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.41 -14.09)
-		(end -6.41 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.41 14.09)
-		(end 6.41 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -3.92 -14.03)
 		(end -3.92 14.03)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.41 -14.09)
-		(end -6.41 -14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.41 14.09)
-		(end 6.41 -14.09)
+	(fp_rect
+		(start -6.41 -14.09)
+		(end 6.41 14.09)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.6 -14.28)
-		(end -6.6 14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.6 14.28)
 		(end 6.6 14.28)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.6 -14.28)
-		(end -6.6 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.6 14.28)
-		(end 6.6 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.35 -14.03)
-		(end -6.35 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -6.35 14.03)
-		(end 6.35 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -4.57 -12.97)
 		(end -3.57 -13.97)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 6.35 -14.03)
-		(end -6.35 -14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 6.35 14.03)
-		(end 6.35 -14.03)
+	(fp_rect
+		(start -6.35 -14.03)
+		(end 6.35 14.03)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,115 +165,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.08 -12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.08 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.08 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.08 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.08 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.08 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.08 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.08 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.08 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.08 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.08 12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.08 12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.08 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.08 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.08 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.08 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.08 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.08 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.08 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.08 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.08 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.08 -12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-22_W10.16mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-22_W10.16mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-22_W10.16mm_Socket.kicad_mod
index 2838821b1..147a1869d 100644
--- a/Package_DIP.pretty/DIP-22_W10.16mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W10.16mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 26.79)
-		(end 11.49 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 11.49 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 11.49 26.79)
-		(end 11.49 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 11.49 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 26.98)
 		(end 11.68 26.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 11.68 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.68 26.98)
-		(end 11.68 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 26.73)
-		(end 11.43 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.51 -0.27)
 		(end 1.51 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 11.43 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 11.43 26.73)
-		(end 11.43 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 11.43 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W10.16mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-22_W10.16mm_Socket_LongPads.kicad_mod
index d9eeb7666..f503b380a 100644
--- a/Package_DIP.pretty/DIP-22_W10.16mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W10.16mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 26.79)
-		(end 11.6 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 11.6 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 11.6 26.79)
-		(end 11.6 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 11.6 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 26.98)
 		(end 11.68 26.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 11.68 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.68 26.98)
-		(end 11.68 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 26.73)
-		(end 11.43 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.51 -0.27)
 		(end 1.51 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 11.43 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 11.43 26.73)
-		(end 11.43 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 11.43 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W11.43mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-22_W11.43mm_SMDSocket_LongPads.kicad_mod
index e8ec98f48..a7481cc78 100644
--- a/Package_DIP.pretty/DIP-22_W11.43mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W11.43mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -7.505 -14.09)
-		(end -7.505 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -7.505 14.09)
-		(end 7.505 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -3.805 -14.03)
 		(end -3.805 14.03)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 7.505 -14.09)
-		(end -7.505 -14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 7.505 14.09)
-		(end 7.505 -14.09)
+	(fp_rect
+		(start -7.505 -14.09)
+		(end 7.505 14.09)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -7.52 -14.28)
-		(end -7.52 14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -7.52 14.28)
 		(end 7.52 14.28)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 7.52 -14.28)
-		(end -7.52 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 7.52 14.28)
-		(end 7.52 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.35 -14.03)
-		(end -6.35 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -6.35 14.03)
-		(end 6.35 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -4.57 -12.97)
 		(end -3.57 -13.97)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 6.35 -14.03)
-		(end -6.35 -14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 6.35 14.03)
-		(end 6.35 -14.03)
+	(fp_rect
+		(start -6.35 -14.03)
+		(end 6.35 14.03)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,115 +165,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.715 -12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.715 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.715 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.715 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.715 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.715 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.715 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.715 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.715 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.715 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.715 12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.715 12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.715 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.715 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.715 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.715 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.715 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.715 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.715 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.715 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.715 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.715 -12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-22_W11.43mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-22_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-22_W7.62mm.kicad_mod
index f0144324e..830458aca 100644
--- a/Package_DIP.pretty/DIP-22_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 26.92)
 		(end 8.67 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 26.92)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-22_W7.62mm_LongPads.kicad_mod
index dcb0e615e..dc8995602 100644
--- a/Package_DIP.pretty/DIP-22_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 26.92)
 		(end 9.07 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 26.92)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-22_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 6af0725c1..da7ca7537 100644
--- a/Package_DIP.pretty/DIP-22_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -14.09)
-		(end -5.14 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 14.09)
-		(end 5.14 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -14.03)
 		(end -2.65 14.03)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -14.09)
-		(end -5.14 -14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 14.09)
-		(end 5.14 -14.09)
+	(fp_rect
+		(start -5.14 -14.09)
+		(end 5.14 14.09)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -14.28)
-		(end -5.33 14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 14.28)
 		(end 5.33 14.28)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -14.28)
-		(end -5.33 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 14.28)
-		(end 5.33 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -14.03)
-		(end -5.08 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 14.03)
-		(end 5.08 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -12.97)
 		(end -2.175 -13.97)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -14.03)
-		(end -5.08 -14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 14.03)
-		(end 5.08 -14.03)
+	(fp_rect
+		(start -5.08 -14.03)
+		(end 5.08 14.03)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,115 +165,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.81 12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.81 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.81 -12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-22_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-22_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-22_W7.62mm_Socket.kicad_mod
index 4afacc91c..7801d97c0 100644
--- a/Package_DIP.pretty/DIP-22_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 26.79)
-		(end 8.95 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 26.79)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 26.98)
 		(end 9.14 26.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 26.98)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 26.73)
-		(end 8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 26.73)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-22_W7.62mm_Socket_LongPads.kicad_mod
index ef4babdb9..221e8f247 100644
--- a/Package_DIP.pretty/DIP-22_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 26.79)
-		(end 9.06 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 26.79)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 26.98)
 		(end 9.14 26.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 26.98)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 26.73)
-		(end 8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 26.73)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-22_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-22_W8.89mm_SMDSocket_LongPads.kicad_mod
index 46a601381..11f36d914 100644
--- a/Package_DIP.pretty/DIP-22_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-22_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -14.09)
-		(end -6.235 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 14.09)
-		(end 6.235 14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -14.03)
 		(end -2.535 14.03)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -14.09)
-		(end -6.235 -14.09)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 14.09)
-		(end 6.235 -14.09)
+	(fp_rect
+		(start -6.235 -14.09)
+		(end 6.235 14.09)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -14.28)
-		(end -6.25 14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 14.28)
 		(end 6.25 14.28)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -14.28)
-		(end -6.25 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 14.28)
-		(end 6.25 -14.28)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -14.03)
-		(end -5.08 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 14.03)
-		(end 5.08 14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -12.97)
 		(end -2.175 -13.97)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -14.03)
-		(end -5.08 -14.03)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 14.03)
-		(end 5.08 -14.03)
+	(fp_rect
+		(start -5.08 -14.03)
+		(end 5.08 14.03)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,115 +165,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.445 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.445 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.445 12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.445 12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.445 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.445 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.445 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.445 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.445 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.445 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.445 -12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-22_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-24_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-24_W10.16mm.kicad_mod
index 71d434e5f..bacee72f9 100644
--- a/Package_DIP.pretty/DIP-24_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 29.46)
 		(end 11.21 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 29.46)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W10.16mm_LongPads.kicad_mod
index 1adfb045c..68b892b64 100644
--- a/Package_DIP.pretty/DIP-24_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 29.46)
 		(end 11.61 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 29.46)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W10.16mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-24_W10.16mm_SMDSocket_SmallPads.kicad_mod
index e90cbea08..6e739ece7 100644
--- a/Package_DIP.pretty/DIP-24_W10.16mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W10.16mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.41 -15.36)
-		(end -6.41 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.41 15.36)
-		(end 6.41 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -3.92 -15.3)
 		(end -3.92 15.3)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.41 -15.36)
-		(end -6.41 -15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.41 15.36)
-		(end 6.41 -15.36)
+	(fp_rect
+		(start -6.41 -15.36)
+		(end 6.41 15.36)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.6 -15.55)
-		(end -6.6 15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.6 15.55)
 		(end 6.6 15.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.6 -15.55)
-		(end -6.6 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.6 15.55)
-		(end 6.6 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.35 -15.3)
-		(end -6.35 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -6.35 15.3)
-		(end 6.35 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -4.57 -14.24)
 		(end -3.57 -15.24)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 6.35 -15.3)
-		(end -6.35 -15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 6.35 15.3)
-		(end 6.35 -15.3)
+	(fp_rect
+		(start -6.35 -15.3)
+		(end 6.35 15.3)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,125 +165,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.08 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.08 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.08 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.08 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.08 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.08 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.08 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.08 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.08 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.08 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.08 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -5.08 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.08 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.08 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.08 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.08 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.08 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.08 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.08 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.08 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.08 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.08 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 5.08 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 5.08 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-24_W10.16mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-24_W10.16mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-24_W10.16mm_Socket.kicad_mod
index 04d0067b2..fb66f35df 100644
--- a/Package_DIP.pretty/DIP-24_W10.16mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W10.16mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 29.33)
-		(end 11.49 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 11.49 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 11.49 29.33)
-		(end 11.49 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 11.49 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 29.53)
 		(end 11.68 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 11.68 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.68 29.53)
-		(end 11.68 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 11.43 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.51 -0.27)
 		(end 1.51 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 11.43 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 11.43 29.27)
-		(end 11.43 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 11.43 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W10.16mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W10.16mm_Socket_LongPads.kicad_mod
index 6d759c17b..599b3f0a7 100644
--- a/Package_DIP.pretty/DIP-24_W10.16mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W10.16mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 29.33)
-		(end 11.6 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 11.6 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 11.6 29.33)
-		(end 11.6 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 11.6 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 29.53)
 		(end 11.68 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 11.68 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.68 29.53)
-		(end 11.68 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 11.43 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.51 -0.27)
 		(end 1.51 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 11.43 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 11.43 29.27)
-		(end 11.43 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 11.43 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W11.43mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W11.43mm_SMDSocket_LongPads.kicad_mod
index 692b204f5..41b009fca 100644
--- a/Package_DIP.pretty/DIP-24_W11.43mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W11.43mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -7.505 -15.36)
-		(end -7.505 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -7.505 15.36)
-		(end 7.505 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -3.805 -15.3)
 		(end -3.805 15.3)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 7.505 -15.36)
-		(end -7.505 -15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 7.505 15.36)
-		(end 7.505 -15.36)
+	(fp_rect
+		(start -7.505 -15.36)
+		(end 7.505 15.36)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -7.52 -15.55)
-		(end -7.52 15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -7.52 15.55)
 		(end 7.52 15.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 7.52 -15.55)
-		(end -7.52 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 7.52 15.55)
-		(end 7.52 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.35 -15.3)
-		(end -6.35 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -6.35 15.3)
-		(end 6.35 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -4.57 -14.24)
 		(end -3.57 -15.24)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 6.35 -15.3)
-		(end -6.35 -15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 6.35 15.3)
-		(end 6.35 -15.3)
+	(fp_rect
+		(start -6.35 -15.3)
+		(end 6.35 15.3)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,125 +165,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.715 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.715 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.715 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.715 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.715 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.715 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.715 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.715 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.715 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.715 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.715 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -5.715 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.715 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.715 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.715 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.715 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.715 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.715 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.715 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.715 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.715 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.715 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 5.715 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 5.715 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-24_W11.43mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-24_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-24_W15.24mm.kicad_mod
index 3573adfd2..8b3c936f4 100644
--- a/Package_DIP.pretty/DIP-24_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 29.46)
 		(end 16.29 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 29.46)
-		(end 16.29 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W15.24mm_LongPads.kicad_mod
index 8bc898b3a..608ee8134 100644
--- a/Package_DIP.pretty/DIP-24_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 29.46)
 		(end 16.69 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 29.46)
-		(end 16.69 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-24_W15.24mm_SMDSocket_SmallPads.kicad_mod
index 4e9c8180b..a941b9b7e 100644
--- a/Package_DIP.pretty/DIP-24_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -15.36)
-		(end -8.95 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 15.36)
-		(end 8.95 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -15.3)
 		(end -6.46 15.3)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -15.36)
-		(end -8.95 -15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 15.36)
-		(end 8.95 -15.36)
+	(fp_rect
+		(start -8.95 -15.36)
+		(end 8.95 15.36)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -15.55)
-		(end -9.14 15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 15.55)
 		(end 9.14 15.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -15.55)
-		(end -9.14 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 15.55)
-		(end 9.14 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -15.3)
-		(end -8.89 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 15.3)
-		(end 8.89 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -14.24)
 		(end -6.365 -15.24)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -15.3)
-		(end -8.89 -15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 15.3)
-		(end 8.89 -15.3)
+	(fp_rect
+		(start -8.89 -15.3)
+		(end 8.89 15.3)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,125 +165,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-24_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-24_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-24_W15.24mm_Socket.kicad_mod
index ccec86342..6d5e23865 100644
--- a/Package_DIP.pretty/DIP-24_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 29.33)
-		(end 16.57 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 29.33)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.58)
-		(end -1.53 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 29.53)
 		(end 16.77 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.58)
-		(end -1.53 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 29.53)
-		(end 16.77 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 16.51 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 29.27)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W15.24mm_Socket_LongPads.kicad_mod
index f21507f68..80af7ef38 100644
--- a/Package_DIP.pretty/DIP-24_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 29.33)
-		(end 16.68 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 29.33)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.58)
-		(end -1.53 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 29.53)
 		(end 16.77 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.58)
-		(end -1.53 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 29.53)
-		(end 16.77 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 16.51 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 29.27)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W16.51mm_SMDSocket_LongPads.kicad_mod
index 031403cac..a87182109 100644
--- a/Package_DIP.pretty/DIP-24_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -15.36)
-		(end -10.045 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 15.36)
-		(end 10.045 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -15.3)
 		(end -6.345 15.3)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -15.36)
-		(end -10.045 -15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 15.36)
-		(end 10.045 -15.36)
+	(fp_rect
+		(start -10.045 -15.36)
+		(end 10.045 15.36)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -15.55)
-		(end -10.06 15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 15.55)
 		(end 10.06 15.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -15.55)
-		(end -10.06 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 15.55)
-		(end 10.06 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -15.3)
-		(end -8.89 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 15.3)
-		(end 8.89 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -14.24)
 		(end -6.365 -15.24)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -15.3)
-		(end -8.89 -15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 15.3)
-		(end 8.89 -15.3)
+	(fp_rect
+		(start -8.89 -15.3)
+		(end 8.89 15.3)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,125 +165,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-24_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-24_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-24_W7.62mm.kicad_mod
index e2c1d8591..a7118b622 100644
--- a/Package_DIP.pretty/DIP-24_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 29.46)
 		(end 8.67 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 29.46)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W7.62mm_LongPads.kicad_mod
index f0a78bc55..da9a50951 100644
--- a/Package_DIP.pretty/DIP-24_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 29.46)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 29.46)
 		(end 9.07 29.46)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 29.46)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-24_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 2f9faf3aa..727084674 100644
--- a/Package_DIP.pretty/DIP-24_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -15.36)
-		(end -5.14 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 15.36)
-		(end 5.14 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -15.3)
 		(end -2.65 15.3)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -15.36)
-		(end -5.14 -15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 15.36)
-		(end 5.14 -15.36)
+	(fp_rect
+		(start -5.14 -15.36)
+		(end 5.14 15.36)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -15.55)
-		(end -5.33 15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 15.55)
 		(end 5.33 15.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -15.55)
-		(end -5.33 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 15.55)
-		(end 5.33 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -15.3)
-		(end -5.08 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 15.3)
-		(end 5.08 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -14.24)
 		(end -2.175 -15.24)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -15.3)
-		(end -5.08 -15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 15.3)
-		(end 5.08 -15.3)
+	(fp_rect
+		(start -5.08 -15.3)
+		(end 5.08 15.3)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,125 +165,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.81 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -3.81 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 3.81 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 3.81 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-24_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-24_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-24_W7.62mm_Socket.kicad_mod
index 2452a7b8b..4149c4853 100644
--- a/Package_DIP.pretty/DIP-24_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 29.33)
-		(end 8.95 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 29.33)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 29.53)
 		(end 9.14 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 29.53)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 8.89 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 29.27)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W7.62mm_Socket_LongPads.kicad_mod
index a28d5a948..fd17bc944 100644
--- a/Package_DIP.pretty/DIP-24_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 29.33)
-		(end 9.06 29.33)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 29.27)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 29.33)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 29.33)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 29.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 29.53)
 		(end 9.14 29.53)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 29.53)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 29.27)
-		(end 8.89 29.27)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 29.27)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 29.27)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-24_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-24_W8.89mm_SMDSocket_LongPads.kicad_mod
index 45dbdadd8..5371787a9 100644
--- a/Package_DIP.pretty/DIP-24_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-24_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -15.36)
-		(end -6.235 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 15.36)
-		(end 6.235 15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -15.3)
 		(end -2.535 15.3)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -15.36)
-		(end -6.235 -15.36)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 15.36)
-		(end 6.235 -15.36)
+	(fp_rect
+		(start -6.235 -15.36)
+		(end 6.235 15.36)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -15.55)
-		(end -6.25 15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 15.55)
 		(end 6.25 15.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -15.55)
-		(end -6.25 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 15.55)
-		(end 6.25 -15.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -15.3)
-		(end -5.08 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 15.3)
-		(end 5.08 15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -14.24)
 		(end -2.175 -15.24)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -15.3)
-		(end -5.08 -15.3)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 15.3)
-		(end 5.08 -15.3)
+	(fp_rect
+		(start -5.08 -15.3)
+		(end 5.08 15.3)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,125 +165,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.445 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -4.445 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.445 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.445 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 4.445 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 4.445 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-24_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-28_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-28_W15.24mm.kicad_mod
index 001f46ec3..c657c6aa0 100644
--- a/Package_DIP.pretty/DIP-28_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.53)
-		(end -1.05 34.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 34.55)
 		(end 16.29 34.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.53)
-		(end -1.05 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 34.55)
-		(end 16.29 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-28_W15.24mm_LongPads.kicad_mod
index 24cce8fc1..62eec3426 100644
--- a/Package_DIP.pretty/DIP-28_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.53)
-		(end -1.46 34.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 34.55)
 		(end 16.69 34.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.53)
-		(end -1.46 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 34.55)
-		(end 16.69 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-28_W15.24mm_SMDSocket_SmallPads.kicad_mod
index 015867484..85aca8270 100644
--- a/Package_DIP.pretty/DIP-28_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -17.9)
-		(end -8.95 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 17.9)
-		(end 8.95 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -17.84)
 		(end -6.46 17.84)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -17.9)
-		(end -8.95 -17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 17.9)
-		(end 8.95 -17.9)
+	(fp_rect
+		(start -8.95 -17.9)
+		(end 8.95 17.9)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -18.1)
-		(end -9.14 18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 18.1)
 		(end 9.14 18.1)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -18.1)
-		(end -9.14 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 18.1)
-		(end 9.14 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -17.84)
-		(end -8.89 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 17.84)
-		(end 8.89 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -16.78)
 		(end -6.365 -17.78)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -17.84)
-		(end -8.89 -17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 17.84)
-		(end 8.89 -17.84)
+	(fp_rect
+		(start -8.89 -17.84)
+		(end 8.89 17.84)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,145 +165,173 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-28_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-28_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-28_W15.24mm_Socket.kicad_mod
index db217b50a..c715c7c34 100644
--- a/Package_DIP.pretty/DIP-28_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 34.41)
-		(end 16.57 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 34.35)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 34.41)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 34.41)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 34.61)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 34.61)
 		(end 16.77 34.61)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 34.61)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 34.35)
-		(end 16.51 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 34.35)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 34.35)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-28_W15.24mm_Socket_LongPads.kicad_mod
index 2f88e5ee8..e9bcbf25e 100644
--- a/Package_DIP.pretty/DIP-28_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 34.41)
-		(end 16.68 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 34.35)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 34.41)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 34.41)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 34.61)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 34.61)
 		(end 16.77 34.61)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 34.61)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 34.35)
-		(end 16.51 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 34.35)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 34.35)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-28_W16.51mm_SMDSocket_LongPads.kicad_mod
index 4db003663..338697350 100644
--- a/Package_DIP.pretty/DIP-28_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -17.9)
-		(end -10.045 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 17.9)
-		(end 10.045 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -17.84)
 		(end -6.345 17.84)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -17.9)
-		(end -10.045 -17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 17.9)
-		(end 10.045 -17.9)
+	(fp_rect
+		(start -10.045 -17.9)
+		(end 10.045 17.9)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -18.1)
-		(end -10.06 18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 18.1)
 		(end 10.06 18.1)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -18.1)
-		(end -10.06 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 18.1)
-		(end 10.06 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -17.84)
-		(end -8.89 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 17.84)
-		(end 8.89 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -16.78)
 		(end -6.365 -17.78)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -17.84)
-		(end -8.89 -17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 17.84)
-		(end 8.89 -17.84)
+	(fp_rect
+		(start -8.89 -17.84)
+		(end 8.89 17.84)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,145 +165,173 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-28_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-28_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-28_W7.62mm.kicad_mod
index 193ab2b16..206556656 100644
--- a/Package_DIP.pretty/DIP-28_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.53)
-		(end -1.06 34.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 34.55)
 		(end 8.67 34.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.53)
-		(end -1.06 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 34.55)
-		(end 8.67 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-28_W7.62mm_LongPads.kicad_mod
index 433f20c42..720c66b76 100644
--- a/Package_DIP.pretty/DIP-28_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.53)
-		(end -1.45 34.55)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 34.55)
 		(end 9.07 34.55)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.53)
-		(end -1.45 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 34.55)
-		(end 9.07 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-28_W7.62mm_SMDSocket_SmallPads.kicad_mod
index db4239a4a..e48f841ac 100644
--- a/Package_DIP.pretty/DIP-28_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -17.9)
-		(end -5.14 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 17.9)
-		(end 5.14 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -17.84)
 		(end -2.65 17.84)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -17.9)
-		(end -5.14 -17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 17.9)
-		(end 5.14 -17.9)
+	(fp_rect
+		(start -5.14 -17.9)
+		(end 5.14 17.9)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -18.1)
-		(end -5.33 18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 18.1)
 		(end 5.33 18.1)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -18.1)
-		(end -5.33 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 18.1)
-		(end 5.33 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -17.84)
-		(end -5.08 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 17.84)
-		(end 5.08 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -16.78)
 		(end -2.175 -17.78)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -17.84)
-		(end -5.08 -17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 17.84)
-		(end 5.08 -17.84)
+	(fp_rect
+		(start -5.08 -17.84)
+		(end 5.08 17.84)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,145 +165,173 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -3.81 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -3.81 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -3.81 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 3.81 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 3.81 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 3.81 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 3.81 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 3.81 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-28_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-28_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-28_W7.62mm_Socket.kicad_mod
index 5e40b841f..862ac4df8 100644
--- a/Package_DIP.pretty/DIP-28_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 34.41)
-		(end 8.95 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 34.35)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 34.41)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 34.41)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 34.61)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 34.61)
 		(end 9.14 34.61)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 34.61)
-		(end 9.14 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 34.35)
-		(end 8.89 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 34.35)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 34.35)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-28_W7.62mm_Socket_LongPads.kicad_mod
index ee0d7ca2b..1680d886c 100644
--- a/Package_DIP.pretty/DIP-28_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 34.41)
-		(end 9.06 34.41)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 34.35)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 34.41)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 34.41)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 34.61)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 34.61)
 		(end 9.14 34.61)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 34.61)
-		(end 9.14 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 34.35)
-		(end 8.89 34.35)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 34.35)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 34.35)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-28_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-28_W8.89mm_SMDSocket_LongPads.kicad_mod
index 8bba14450..a87513b14 100644
--- a/Package_DIP.pretty/DIP-28_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-28_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -17.9)
-		(end -6.235 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 17.9)
-		(end 6.235 17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -17.84)
 		(end -2.535 17.84)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -17.9)
-		(end -6.235 -17.9)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 17.9)
-		(end 6.235 -17.9)
+	(fp_rect
+		(start -6.235 -17.9)
+		(end 6.235 17.9)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -18.1)
-		(end -6.25 18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 18.1)
 		(end 6.25 18.1)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -18.1)
-		(end -6.25 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 18.1)
-		(end 6.25 -18.1)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -17.84)
-		(end -5.08 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 17.84)
-		(end 5.08 17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -16.78)
 		(end -2.175 -17.78)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -17.84)
-		(end -5.08 -17.84)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 17.84)
-		(end 5.08 -17.84)
+	(fp_rect
+		(start -5.08 -17.84)
+		(end 5.08 17.84)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,145 +165,173 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -4.445 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -4.445 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -4.445 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.445 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.445 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.445 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.445 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.445 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 4.445 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 4.445 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 4.445 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 4.445 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 4.445 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-28_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-32_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-32_W15.24mm.kicad_mod
index 372ac4730..1b10f45f4 100644
--- a/Package_DIP.pretty/DIP-32_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-32_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.53)
-		(end -1.05 39.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 39.63)
 		(end 16.29 39.63)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.53)
-		(end -1.05 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 39.63)
-		(end 16.29 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-32_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-32_W15.24mm_LongPads.kicad_mod
index b15372aab..f8147928a 100644
--- a/Package_DIP.pretty/DIP-32_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-32_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.53)
-		(end -1.46 39.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 39.63)
 		(end 16.69 39.63)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.53)
-		(end -1.46 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 39.63)
-		(end 16.69 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-32_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-32_W15.24mm_SMDSocket_SmallPads.kicad_mod
index e73e94383..4d3506431 100644
--- a/Package_DIP.pretty/DIP-32_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-32_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -20.44)
-		(end -8.95 20.44)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 20.44)
-		(end 8.95 20.44)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -20.38)
 		(end -6.46 20.38)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -20.44)
-		(end -8.95 -20.44)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 20.44)
-		(end 8.95 -20.44)
+	(fp_rect
+		(start -8.95 -20.44)
+		(end 8.95 20.44)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -20.63)
-		(end -9.14 20.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 20.63)
 		(end 9.14 20.63)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -20.63)
-		(end -9.14 -20.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 20.63)
-		(end 9.14 -20.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -20.38)
-		(end -8.89 20.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 20.38)
-		(end 8.89 20.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -19.32)
 		(end -6.365 -20.32)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -20.38)
-		(end -8.89 -20.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 20.38)
-		(end 8.89 -20.38)
+	(fp_rect
+		(start -8.89 -20.38)
+		(end 8.89 20.38)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,165 +165,197 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-32_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-32_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-32_W15.24mm_Socket.kicad_mod
index 32955d371..b7e6c2edd 100644
--- a/Package_DIP.pretty/DIP-32_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-32_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 39.49)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 39.49)
-		(end 16.57 39.49)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 39.43)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 39.49)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 39.49)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 39.69)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 39.69)
 		(end 16.77 39.69)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 39.69)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 39.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 39.43)
-		(end 16.51 39.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 39.43)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 39.43)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-32_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-32_W15.24mm_Socket_LongPads.kicad_mod
index a95d972ab..36e2716fe 100644
--- a/Package_DIP.pretty/DIP-32_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-32_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 39.49)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 39.49)
-		(end 16.68 39.49)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 39.43)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 39.49)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 39.49)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 39.69)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 39.69)
 		(end 16.77 39.69)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 39.69)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 39.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 39.43)
-		(end 16.51 39.43)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 39.43)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 39.43)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-32_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-32_W16.51mm_SMDSocket_LongPads.kicad_mod
index cb7d1d1f0..6dd97964f 100644
--- a/Package_DIP.pretty/DIP-32_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-32_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -20.44)
-		(end -10.045 20.44)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 20.44)
-		(end 10.045 20.44)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -20.38)
 		(end -6.345 20.38)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -20.44)
-		(end -10.045 -20.44)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 20.44)
-		(end 10.045 -20.44)
+	(fp_rect
+		(start -10.045 -20.44)
+		(end 10.045 20.44)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -20.63)
-		(end -10.06 20.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 20.63)
 		(end 10.06 20.63)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -20.63)
-		(end -10.06 -20.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 20.63)
-		(end 10.06 -20.63)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -20.38)
-		(end -8.89 20.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 20.38)
-		(end 8.89 20.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -19.32)
 		(end -6.365 -20.32)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -20.38)
-		(end -8.89 -20.38)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 20.38)
-		(end 8.89 -20.38)
+	(fp_rect
+		(start -8.89 -20.38)
+		(end 8.89 20.38)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,165 +165,197 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-32_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-40_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-40_W15.24mm.kicad_mod
index fc5f91fd9..6a5fd47dc 100644
--- a/Package_DIP.pretty/DIP-40_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.53)
-		(end -1.05 49.78)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 49.78)
 		(end 16.29 49.78)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.53)
-		(end -1.05 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 49.78)
-		(end 16.29 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-40_W15.24mm_LongPads.kicad_mod
index 7963f0aac..77a9ae811 100644
--- a/Package_DIP.pretty/DIP-40_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.53)
-		(end -1.46 49.78)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 49.78)
 		(end 16.69 49.78)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.53)
-		(end -1.46 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 49.78)
-		(end 16.69 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-40_W15.24mm_SMDSocket_SmallPads.kicad_mod
index 74ad45e4e..2c0545365 100644
--- a/Package_DIP.pretty/DIP-40_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -25.52)
-		(end -8.95 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 25.52)
-		(end 8.95 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -25.46)
 		(end -6.46 25.46)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -25.52)
-		(end -8.95 -25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 25.52)
-		(end 8.95 -25.52)
+	(fp_rect
+		(start -8.95 -25.52)
+		(end 8.95 25.52)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -25.71)
-		(end -9.14 25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 25.71)
 		(end 9.14 25.71)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -25.71)
-		(end -9.14 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 25.71)
-		(end 9.14 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -25.46)
-		(end -8.89 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 25.46)
-		(end 8.89 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -24.4)
 		(end -6.365 -25.4)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -25.46)
-		(end -8.89 -25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 25.46)
-		(end 8.89 -25.46)
+	(fp_rect
+		(start -8.89 -25.46)
+		(end 8.89 25.46)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,205 +165,245 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-40_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-40_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-40_W15.24mm_Socket.kicad_mod
index 107899d26..e0f4f0b68 100644
--- a/Package_DIP.pretty/DIP-40_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 49.65)
-		(end 16.57 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 49.59)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 49.65)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 49.65)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 49.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 49.84)
 		(end 16.77 49.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 49.84)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 49.59)
-		(end 16.51 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 49.59)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 49.59)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-40_W15.24mm_Socket_LongPads.kicad_mod
index e0cc2b0ed..926ecf4d4 100644
--- a/Package_DIP.pretty/DIP-40_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 49.65)
-		(end 16.68 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 49.59)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 49.65)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 49.65)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 49.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 49.84)
 		(end 16.77 49.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 49.84)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 49.59)
-		(end 16.51 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 49.59)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 49.59)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-40_W16.51mm_SMDSocket_LongPads.kicad_mod
index df1f45d39..6655e39e3 100644
--- a/Package_DIP.pretty/DIP-40_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -25.52)
-		(end -10.045 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 25.52)
-		(end 10.045 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -25.46)
 		(end -6.345 25.46)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -25.52)
-		(end -10.045 -25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 25.52)
-		(end 10.045 -25.52)
+	(fp_rect
+		(start -10.045 -25.52)
+		(end 10.045 25.52)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -25.71)
-		(end -10.06 25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 25.71)
 		(end 10.06 25.71)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -25.71)
-		(end -10.06 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 25.71)
-		(end 10.06 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -25.46)
-		(end -8.89 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 25.46)
-		(end 8.89 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -24.4)
 		(end -6.365 -25.4)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -25.46)
-		(end -8.89 -25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 25.46)
-		(end 8.89 -25.46)
+	(fp_rect
+		(start -8.89 -25.46)
+		(end 8.89 25.46)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,205 +165,245 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -8.255 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -8.255 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 8.255 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 8.255 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 8.255 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 8.255 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-40_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-40_W25.4mm.kicad_mod b/Package_DIP.pretty/DIP-40_W25.4mm.kicad_mod
index d3fc17035..384c1e20f 100644
--- a/Package_DIP.pretty/DIP-40_W25.4mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W25.4mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.53)
-		(end -1.06 49.78)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 49.78)
 		(end 26.45 49.78)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.45 -1.53)
-		(end -1.06 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.45 49.78)
-		(end 26.45 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W25.4mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-40_W25.4mm_LongPads.kicad_mod
index 0967292c8..5256123b9 100644
--- a/Package_DIP.pretty/DIP-40_W25.4mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W25.4mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.53)
-		(end -1.45 49.78)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 49.78)
 		(end 26.85 49.78)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.85 -1.53)
-		(end -1.45 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.85 49.78)
-		(end 26.85 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W25.4mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-40_W25.4mm_SMDSocket_SmallPads.kicad_mod
index a4967b9bf..659aff751 100644
--- a/Package_DIP.pretty/DIP-40_W25.4mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W25.4mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -14.03 -25.52)
-		(end -14.03 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -14.03 25.52)
-		(end 14.03 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -11.54 -25.46)
 		(end -11.54 25.46)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 14.03 -25.52)
-		(end -14.03 -25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 14.03 25.52)
-		(end 14.03 -25.52)
+	(fp_rect
+		(start -14.03 -25.52)
+		(end 14.03 25.52)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -14.22 -25.71)
-		(end -14.22 25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -14.22 25.71)
 		(end 14.22 25.71)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 14.22 -25.71)
-		(end -14.22 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 14.22 25.71)
-		(end 14.22 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -13.97 -25.46)
-		(end -13.97 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -13.97 25.46)
-		(end 13.97 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -12.445 -24.4)
 		(end -11.445 -25.4)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 13.97 -25.46)
-		(end -13.97 -25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 13.97 25.46)
-		(end 13.97 -25.46)
+	(fp_rect
+		(start -13.97 -25.46)
+		(end 13.97 25.46)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,205 +165,245 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -12.7 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -12.7 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -12.7 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -12.7 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -12.7 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -12.7 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -12.7 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -12.7 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -12.7 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -12.7 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -12.7 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -12.7 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -12.7 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -12.7 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -12.7 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -12.7 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -12.7 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -12.7 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -12.7 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -12.7 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 12.7 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 12.7 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 12.7 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 12.7 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 12.7 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 12.7 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 12.7 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 12.7 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 12.7 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 12.7 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 12.7 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 12.7 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 12.7 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 12.7 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 12.7 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 12.7 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 12.7 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 12.7 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 12.7 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 12.7 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-40_W25.4mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-40_W25.4mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-40_W25.4mm_Socket.kicad_mod
index ddb467795..93c5884a4 100644
--- a/Package_DIP.pretty/DIP-40_W25.4mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W25.4mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 49.65)
-		(end 26.73 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 49.59)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 26.73 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 26.73 49.65)
-		(end 26.73 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 26.73 49.65)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 49.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 49.84)
 		(end 26.92 49.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 26.92 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.92 49.84)
-		(end 26.92 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 49.59)
-		(end 26.67 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 26.67 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 26.67 49.59)
-		(end 26.67 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 26.67 49.59)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W25.4mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-40_W25.4mm_Socket_LongPads.kicad_mod
index 3ab632847..c11275e16 100644
--- a/Package_DIP.pretty/DIP-40_W25.4mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W25.4mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 49.65)
-		(end 26.84 49.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 49.59)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 26.84 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 26.84 49.65)
-		(end 26.84 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 26.84 49.65)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.59)
-		(end -1.52 49.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 49.84)
 		(end 26.92 49.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 26.92 -1.59)
-		(end -1.52 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.92 49.84)
-		(end 26.92 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 49.59)
-		(end 26.67 49.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 26.67 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 26.67 49.59)
-		(end 26.67 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 26.67 49.59)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-40_W26.67mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-40_W26.67mm_SMDSocket_LongPads.kicad_mod
index ea9fbecd8..f1ab84c75 100644
--- a/Package_DIP.pretty/DIP-40_W26.67mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-40_W26.67mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -15.125 -25.52)
-		(end -15.125 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -15.125 25.52)
-		(end 15.125 25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -11.425 -25.46)
 		(end -11.425 25.46)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 15.125 -25.52)
-		(end -15.125 -25.52)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 15.125 25.52)
-		(end 15.125 -25.52)
+	(fp_rect
+		(start -15.125 -25.52)
+		(end 15.125 25.52)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -15.14 -25.71)
-		(end -15.14 25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -15.14 25.71)
 		(end 15.14 25.71)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 15.14 -25.71)
-		(end -15.14 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 15.14 25.71)
-		(end 15.14 -25.71)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -13.97 -25.46)
-		(end -13.97 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -13.97 25.46)
-		(end 13.97 25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -12.445 -24.4)
 		(end -11.445 -25.4)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 13.97 -25.46)
-		(end -13.97 -25.46)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 13.97 25.46)
-		(end 13.97 -25.46)
+	(fp_rect
+		(start -13.97 -25.46)
+		(end 13.97 25.46)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,205 +165,245 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -13.335 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -13.335 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -13.335 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -13.335 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -13.335 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -13.335 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -13.335 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -13.335 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -13.335 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -13.335 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -13.335 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -13.335 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -13.335 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -13.335 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -13.335 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -13.335 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -13.335 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -13.335 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -13.335 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -13.335 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 13.335 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 13.335 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 13.335 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 13.335 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 13.335 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 13.335 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 13.335 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 13.335 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 13.335 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 13.335 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 13.335 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 13.335 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 13.335 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 13.335 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 13.335 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 13.335 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 13.335 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 13.335 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 13.335 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 13.335 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-40_W26.67mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-42_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-42_W15.24mm.kicad_mod
index 130229d4c..7599acfd5 100644
--- a/Package_DIP.pretty/DIP-42_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-42_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.53)
-		(end -1.05 52.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 52.32)
 		(end 16.29 52.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.53)
-		(end -1.05 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 52.32)
-		(end 16.29 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-42_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-42_W15.24mm_LongPads.kicad_mod
index d3ea6a3ae..14a0b4827 100644
--- a/Package_DIP.pretty/DIP-42_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-42_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.53)
-		(end -1.46 52.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 52.32)
 		(end 16.69 52.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.53)
-		(end -1.46 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 52.32)
-		(end 16.69 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-42_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-42_W15.24mm_SMDSocket_SmallPads.kicad_mod
index 7d5115513..1e281e747 100644
--- a/Package_DIP.pretty/DIP-42_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-42_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -26.79)
-		(end -8.95 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 26.79)
-		(end 8.95 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -26.73)
 		(end -6.46 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -26.79)
-		(end -8.95 -26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 26.79)
-		(end 8.95 -26.79)
+	(fp_rect
+		(start -8.95 -26.79)
+		(end 8.95 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -26.98)
-		(end -9.14 26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 26.98)
 		(end 9.14 26.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -26.98)
-		(end -9.14 -26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 26.98)
-		(end 9.14 -26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -26.73)
-		(end -8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 26.73)
-		(end 8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -25.67)
 		(end -6.365 -26.67)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -26.73)
-		(end -8.89 -26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 26.73)
-		(end 8.89 -26.73)
+	(fp_rect
+		(start -8.89 -26.73)
+		(end 8.89 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,215 +165,257 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -25.4)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -22.86)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -20.32)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -17.78)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -15.24)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 15.24)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 17.78)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 20.32)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 22.86)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -7.62 25.4)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 25.4)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 22.86)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 20.32)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 17.78)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 15.24)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 -5.08)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 -7.62)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 -10.16)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 -12.7)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 -15.24)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 -17.78)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 -20.32)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 7.62 -22.86)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 7.62 -25.4)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-42_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-42_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-42_W15.24mm_Socket.kicad_mod
index 849e4348c..49907a6f3 100644
--- a/Package_DIP.pretty/DIP-42_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-42_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 52.19)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 52.19)
-		(end 16.57 52.19)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 52.13)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 52.19)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 52.19)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 52.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 52.38)
 		(end 16.77 52.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 52.38)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 52.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 52.13)
-		(end 16.51 52.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 52.13)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 52.13)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-42_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-42_W15.24mm_Socket_LongPads.kicad_mod
index fc4b3ff14..49a9ae7b8 100644
--- a/Package_DIP.pretty/DIP-42_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-42_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 52.19)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 52.19)
-		(end 16.68 52.19)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 52.13)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 52.19)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 52.19)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 52.38)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 52.38)
 		(end 16.77 52.38)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 52.38)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 52.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 52.13)
-		(end 16.51 52.13)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 52.13)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 52.13)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-42_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-42_W16.51mm_SMDSocket_LongPads.kicad_mod
index a73760af2..3052cdc97 100644
--- a/Package_DIP.pretty/DIP-42_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-42_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -26.79)
-		(end -10.045 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 26.79)
-		(end 10.045 26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -26.73)
 		(end -6.345 26.73)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -26.79)
-		(end -10.045 -26.79)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 26.79)
-		(end 10.045 -26.79)
+	(fp_rect
+		(start -10.045 -26.79)
+		(end 10.045 26.79)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -26.98)
-		(end -10.06 26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 26.98)
 		(end 10.06 26.98)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -26.98)
-		(end -10.06 -26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 26.98)
-		(end 10.06 -26.98)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -26.73)
-		(end -8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 26.73)
-		(end 8.89 26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -25.67)
 		(end -6.365 -26.67)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -26.73)
-		(end -8.89 -26.73)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 26.73)
-		(end 8.89 -26.73)
+	(fp_rect
+		(start -8.89 -26.73)
+		(end 8.89 26.73)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,215 +165,257 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -25.4)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -22.86)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -20.32)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -17.78)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -15.24)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -8.255 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -8.255 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -8.255 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -8.255 12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -8.255 15.24)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -8.255 17.78)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -8.255 20.32)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -8.255 22.86)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -8.255 25.4)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 8.255 25.4)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 8.255 22.86)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 8.255 20.32)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 8.255 17.78)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 8.255 15.24)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 8.255 12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 8.255 10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 8.255 7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 8.255 5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 8.255 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 8.255 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 8.255 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 8.255 -5.08)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 8.255 -7.62)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 8.255 -10.16)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 8.255 -12.7)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 8.255 -15.24)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 8.255 -17.78)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 8.255 -20.32)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 8.255 -22.86)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 8.255 -25.4)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-42_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-48_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-48_W15.24mm.kicad_mod
index 1cc9a5cfd..3f536fb27 100644
--- a/Package_DIP.pretty/DIP-48_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-48_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.53)
-		(end -1.05 59.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 59.94)
 		(end 16.29 59.94)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.53)
-		(end -1.05 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 59.94)
-		(end 16.29 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-48_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-48_W15.24mm_LongPads.kicad_mod
index 56160e032..bac0baeb7 100644
--- a/Package_DIP.pretty/DIP-48_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-48_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.53)
-		(end -1.46 59.94)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 59.94)
 		(end 16.69 59.94)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.53)
-		(end -1.46 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 59.94)
-		(end 16.69 -1.53)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-48_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-48_W15.24mm_SMDSocket_SmallPads.kicad_mod
index c1384c5b4..05937530e 100644
--- a/Package_DIP.pretty/DIP-48_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-48_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -30.6)
-		(end -8.95 30.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 30.6)
-		(end 8.95 30.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -30.54)
 		(end -6.46 30.54)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -30.6)
-		(end -8.95 -30.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 30.6)
-		(end 8.95 -30.6)
+	(fp_rect
+		(start -8.95 -30.6)
+		(end 8.95 30.6)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -30.79)
-		(end -9.14 30.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 30.79)
 		(end 9.14 30.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -30.79)
-		(end -9.14 -30.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 30.79)
-		(end 9.14 -30.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -30.54)
-		(end -8.89 30.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 30.54)
-		(end 8.89 30.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -29.48)
 		(end -6.365 -30.48)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -30.54)
-		(end -8.89 -30.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 30.54)
-		(end 8.89 -30.54)
+	(fp_rect
+		(start -8.89 -30.54)
+		(end 8.89 30.54)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,245 +165,293 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -7.62 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -7.62 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -7.62 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -7.62 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 7.62 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 7.62 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 7.62 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 7.62 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-48_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-48_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-48_W15.24mm_Socket.kicad_mod
index a7b293363..c0cc374fd 100644
--- a/Package_DIP.pretty/DIP-48_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-48_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 59.81)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 59.81)
-		(end 16.57 59.81)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 59.75)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 59.81)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 59.81)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 60)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 60)
 		(end 16.77 60)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 60)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 59.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 59.75)
-		(end 16.51 59.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 59.75)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 59.75)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-48_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-48_W15.24mm_Socket_LongPads.kicad_mod
index 0115212e6..f3ba3a834 100644
--- a/Package_DIP.pretty/DIP-48_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-48_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 59.81)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 59.81)
-		(end 16.68 59.81)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 59.75)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 59.81)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 59.81)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.59)
-		(end -1.53 60)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 60)
 		(end 16.77 60)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.59)
-		(end -1.53 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 60)
-		(end 16.77 -1.59)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 59.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 59.75)
-		(end 16.51 59.75)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 59.75)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 59.75)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-48_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-48_W16.51mm_SMDSocket_LongPads.kicad_mod
index 03723af08..4be91fb44 100644
--- a/Package_DIP.pretty/DIP-48_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-48_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -30.6)
-		(end -10.045 30.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 30.6)
-		(end 10.045 30.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -30.54)
 		(end -6.345 30.54)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -30.6)
-		(end -10.045 -30.6)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 30.6)
-		(end 10.045 -30.6)
+	(fp_rect
+		(start -10.045 -30.6)
+		(end 10.045 30.6)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -30.79)
-		(end -10.06 30.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 30.79)
 		(end 10.06 30.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -30.79)
-		(end -10.06 -30.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 30.79)
-		(end 10.06 -30.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -30.54)
-		(end -8.89 30.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 30.54)
-		(end 8.89 30.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -29.48)
 		(end -6.365 -30.48)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -30.54)
-		(end -8.89 -30.54)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 30.54)
-		(end 8.89 -30.54)
+	(fp_rect
+		(start -8.89 -30.54)
+		(end 8.89 30.54)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,245 +165,293 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -8.255 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -8.255 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -8.255 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -8.255 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 8.255 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 8.255 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 8.255 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 8.255 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 8.255 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 8.255 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 8.255 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 8.255 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-48_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-4_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-4_W10.16mm.kicad_mod
index b4de79538..d2546bc1b 100644
--- a/Package_DIP.pretty/DIP-4_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 4.07)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 4.07)
 		(end 11.21 4.07)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 4.07)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-4_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-4_W10.16mm_LongPads.kicad_mod
index 4eca0d63c..c4c5f8d80 100644
--- a/Package_DIP.pretty/DIP-4_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 4.07)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 4.07)
 		(end 11.61 4.07)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 4.07)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-4_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-4_W7.62mm.kicad_mod
index 32fff59bb..af8ac26f4 100644
--- a/Package_DIP.pretty/DIP-4_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 4.07)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 4.07)
 		(end 8.67 4.07)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 4.07)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-4_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-4_W7.62mm_LongPads.kicad_mod
index ebae5b015..fa22e6b3f 100644
--- a/Package_DIP.pretty/DIP-4_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 4.07)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 4.07)
 		(end 9.07 4.07)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 4.07)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-4_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-4_W7.62mm_SMDSocket_SmallPads.kicad_mod
index ef6ed0656..554310f87 100644
--- a/Package_DIP.pretty/DIP-4_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -2.66)
-		(end -5.14 2.66)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 2.66)
-		(end 5.14 2.66)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -2.6)
 		(end -2.65 2.6)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -2.66)
-		(end -5.14 -2.66)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 2.66)
-		(end 5.14 -2.66)
+	(fp_rect
+		(start -5.14 -2.66)
+		(end 5.14 2.66)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -2.85)
-		(end -5.33 2.85)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 2.85)
 		(end 5.33 2.85)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -2.85)
-		(end -5.33 -2.85)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 2.85)
-		(end 5.33 -2.85)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -2.6)
-		(end -5.08 2.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 2.6)
-		(end 5.08 2.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -1.54)
 		(end -2.175 -2.54)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -2.6)
-		(end -5.08 -2.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 2.6)
-		(end 5.08 -2.6)
+	(fp_rect
+		(start -5.08 -2.6)
+		(end 5.08 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,25 +165,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-4_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-4_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-4_W7.62mm_Socket.kicad_mod
index 6b4389121..213a64673 100644
--- a/Package_DIP.pretty/DIP-4_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 3.93)
-		(end 8.95 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 3.87)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 3.93)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 3.93)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 4.12)
 		(end 9.14 4.12)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 4.12)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 3.87)
-		(end 8.89 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 3.87)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 3.87)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-4_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-4_W7.62mm_Socket_LongPads.kicad_mod
index 3e7d45d7e..1c63278a5 100644
--- a/Package_DIP.pretty/DIP-4_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 3.93)
-		(end 9.06 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 3.87)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 3.93)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 3.93)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 4.12)
 		(end 9.14 4.12)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 4.12)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 3.87)
-		(end 8.89 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 3.87)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 3.87)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-4_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-4_W8.89mm_SMDSocket_LongPads.kicad_mod
index 85b63ac8a..d729e8a86 100644
--- a/Package_DIP.pretty/DIP-4_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-4_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -2.66)
-		(end -6.235 2.66)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 2.66)
-		(end 6.235 2.66)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -2.6)
 		(end -2.535 2.6)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -2.66)
-		(end -6.235 -2.66)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 2.66)
-		(end 6.235 -2.66)
+	(fp_rect
+		(start -6.235 -2.66)
+		(end 6.235 2.66)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -2.85)
-		(end -6.25 2.85)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 2.85)
 		(end 6.25 2.85)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -2.85)
-		(end -6.25 -2.85)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 2.85)
-		(end 6.25 -2.85)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -2.6)
-		(end -5.08 2.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 2.6)
-		(end 5.08 2.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -1.54)
 		(end -2.175 -2.54)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -2.6)
-		(end -5.08 -2.6)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 2.6)
-		(end 5.08 -2.6)
+	(fp_rect
+		(start -5.08 -2.6)
+		(end 5.08 2.6)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,25 +165,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-4_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-64_W15.24mm.kicad_mod b/Package_DIP.pretty/DIP-64_W15.24mm.kicad_mod
index e3595816e..b812b1d9b 100644
--- a/Package_DIP.pretty/DIP-64_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 80.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 80.26)
 		(end 16.29 80.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.29 80.26)
-		(end 16.29 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W15.24mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W15.24mm_LongPads.kicad_mod
index b109c40e5..a22f480a8 100644
--- a/Package_DIP.pretty/DIP-64_W15.24mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W15.24mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 80.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 80.26)
 		(end 16.69 80.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.69 80.26)
-		(end 16.69 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W15.24mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-64_W15.24mm_SMDSocket_SmallPads.kicad_mod
index 123d33be5..0e408a2a5 100644
--- a/Package_DIP.pretty/DIP-64_W15.24mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W15.24mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -8.95 -40.76)
-		(end -8.95 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -8.95 40.76)
-		(end 8.95 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.46 -40.7)
 		(end -6.46 40.7)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -40.76)
-		(end -8.95 -40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 40.76)
-		(end 8.95 -40.76)
+	(fp_rect
+		(start -8.95 -40.76)
+		(end 8.95 40.76)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -9.14 -40.95)
-		(end -9.14 40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -9.14 40.95)
 		(end 9.14 40.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -40.95)
-		(end -9.14 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 40.95)
-		(end 9.14 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -40.7)
-		(end -8.89 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 40.7)
-		(end 8.89 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -39.64)
 		(end -6.365 -40.64)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -40.7)
-		(end -8.89 -40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 40.7)
-		(end 8.89 -40.7)
+	(fp_rect
+		(start -8.89 -40.7)
+		(end 8.89 40.7)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,325 +165,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -7.62 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -7.62 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -7.62 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -7.62 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -7.62 31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -7.62 34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -7.62 36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -7.62 39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 7.62 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 7.62 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 7.62 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 7.62 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 7.62 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 7.62 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 7.62 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 7.62 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 7.62 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 7.62 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 7.62 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 7.62 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 7.62 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 7.62 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 7.62 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 7.62 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 7.62 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 7.62 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 7.62 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 7.62 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 7.62 -31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 7.62 -34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 7.62 -36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 7.62 -39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-64_W15.24mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-64_W15.24mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-64_W15.24mm_Socket.kicad_mod
index a0d19e971..5083cc9e7 100644
--- a/Package_DIP.pretty/DIP-64_W15.24mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W15.24mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 80.13)
-		(end 16.57 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 80.07)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.57 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.57 80.13)
-		(end 16.57 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 16.57 80.13)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.58)
-		(end -1.53 80.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 80.32)
 		(end 16.77 80.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.58)
-		(end -1.53 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 80.32)
-		(end 16.77 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 80.07)
-		(end 16.51 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 80.07)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 80.07)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W15.24mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W15.24mm_Socket_LongPads.kicad_mod
index 87e60e6e1..f9b1214dd 100644
--- a/Package_DIP.pretty/DIP-64_W15.24mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W15.24mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 80.13)
-		(end 16.68 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 80.07)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 16.68 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 16.68 80.13)
-		(end 16.68 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 16.68 80.13)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.53 -1.58)
-		(end -1.53 80.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.53 80.32)
 		(end 16.77 80.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 16.77 -1.58)
-		(end -1.53 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 16.77 80.32)
-		(end 16.77 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 80.07)
-		(end 16.51 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 16.51 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 16.51 80.07)
-		(end 16.51 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 16.51 80.07)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W16.51mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W16.51mm_SMDSocket_LongPads.kicad_mod
index 0511f8954..1ff13cc50 100644
--- a/Package_DIP.pretty/DIP-64_W16.51mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W16.51mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -10.045 -40.76)
-		(end -10.045 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -10.045 40.76)
-		(end 10.045 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -6.345 -40.7)
 		(end -6.345 40.7)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 10.045 -40.76)
-		(end -10.045 -40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 10.045 40.76)
-		(end 10.045 -40.76)
+	(fp_rect
+		(start -10.045 -40.76)
+		(end 10.045 40.76)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -10.06 -40.95)
-		(end -10.06 40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -10.06 40.95)
 		(end 10.06 40.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 10.06 -40.95)
-		(end -10.06 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 10.06 40.95)
-		(end 10.06 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.89 -40.7)
-		(end -8.89 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -8.89 40.7)
-		(end 8.89 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -7.365 -39.64)
 		(end -6.365 -40.64)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -40.7)
-		(end -8.89 -40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 40.7)
-		(end 8.89 -40.7)
+	(fp_rect
+		(start -8.89 -40.7)
+		(end 8.89 40.7)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,325 +165,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -8.255 -39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -8.255 -36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -8.255 -34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -8.255 -31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -8.255 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -8.255 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -8.255 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -8.255 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -8.255 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -8.255 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -8.255 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -8.255 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -8.255 31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -8.255 34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -8.255 36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -8.255 39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 8.255 39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 8.255 36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 8.255 34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 8.255 31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 8.255 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 8.255 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 8.255 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 8.255 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 8.255 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 8.255 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 8.255 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 8.255 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 8.255 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 8.255 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 8.255 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 8.255 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 8.255 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 8.255 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 8.255 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 8.255 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 8.255 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 8.255 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 8.255 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 8.255 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 8.255 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 8.255 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 8.255 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 8.255 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 8.255 -31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 8.255 -34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 8.255 -36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 8.255 -39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-64_W16.51mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-64_W22.86mm.kicad_mod b/Package_DIP.pretty/DIP-64_W22.86mm.kicad_mod
index 302727fb4..77795ae18 100644
--- a/Package_DIP.pretty/DIP-64_W22.86mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W22.86mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 80.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 80.26)
 		(end 23.91 80.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 23.91 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 23.91 80.26)
-		(end 23.91 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W22.86mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W22.86mm_LongPads.kicad_mod
index 1566e026e..007adfd76 100644
--- a/Package_DIP.pretty/DIP-64_W22.86mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W22.86mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 80.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 80.26)
 		(end 24.31 80.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 24.31 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 24.31 80.26)
-		(end 24.31 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W22.86mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-64_W22.86mm_SMDSocket_SmallPads.kicad_mod
index 5139c1e03..b7899b54e 100644
--- a/Package_DIP.pretty/DIP-64_W22.86mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W22.86mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -12.76 -40.76)
-		(end -12.76 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -12.76 40.76)
-		(end 12.76 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -10.27 -40.7)
 		(end -10.27 40.7)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 12.76 -40.76)
-		(end -12.76 -40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 12.76 40.76)
-		(end 12.76 -40.76)
+	(fp_rect
+		(start -12.76 -40.76)
+		(end 12.76 40.76)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -12.95 -40.95)
-		(end -12.95 40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -12.95 40.95)
 		(end 12.95 40.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 12.95 -40.95)
-		(end -12.95 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 12.95 40.95)
-		(end 12.95 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -12.7 -40.7)
-		(end -12.7 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -12.7 40.7)
-		(end 12.7 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -11.175 -39.64)
 		(end -10.175 -40.64)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 12.7 -40.7)
-		(end -12.7 -40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 12.7 40.7)
-		(end 12.7 -40.7)
+	(fp_rect
+		(start -12.7 -40.7)
+		(end 12.7 40.7)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,325 +165,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -11.43 -39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -11.43 -36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -11.43 -34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -11.43 -31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -11.43 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -11.43 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -11.43 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -11.43 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -11.43 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -11.43 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -11.43 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -11.43 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -11.43 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -11.43 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -11.43 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -11.43 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -11.43 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -11.43 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -11.43 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -11.43 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -11.43 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -11.43 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -11.43 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -11.43 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -11.43 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -11.43 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -11.43 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -11.43 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -11.43 31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -11.43 34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -11.43 36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -11.43 39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 11.43 39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 11.43 36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 11.43 34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 11.43 31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 11.43 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 11.43 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 11.43 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 11.43 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 11.43 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 11.43 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 11.43 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 11.43 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 11.43 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 11.43 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 11.43 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 11.43 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 11.43 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 11.43 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 11.43 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 11.43 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 11.43 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 11.43 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 11.43 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 11.43 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 11.43 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 11.43 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 11.43 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 11.43 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 11.43 -31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 11.43 -34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 11.43 -36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 11.43 -39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-64_W22.86mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-64_W22.86mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-64_W22.86mm_Socket.kicad_mod
index feed7b82e..864b973cb 100644
--- a/Package_DIP.pretty/DIP-64_W22.86mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W22.86mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 80.13)
-		(end 24.19 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 80.07)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 24.19 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 24.19 80.13)
-		(end 24.19 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 24.19 80.13)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 80.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 80.32)
 		(end 24.38 80.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 24.38 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 24.38 80.32)
-		(end 24.38 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 80.07)
-		(end 24.13 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 24.13 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 24.13 80.07)
-		(end 24.13 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 24.13 80.07)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W22.86mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W22.86mm_Socket_LongPads.kicad_mod
index 47bcb7853..afadda0c2 100644
--- a/Package_DIP.pretty/DIP-64_W22.86mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W22.86mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 80.13)
-		(end 24.3 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 80.07)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 24.3 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 24.3 80.13)
-		(end 24.3 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 24.3 80.13)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 80.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 80.32)
 		(end 24.38 80.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 24.38 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 24.38 80.32)
-		(end 24.38 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 80.07)
-		(end 24.13 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 24.13 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 24.13 80.07)
-		(end 24.13 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 24.13 80.07)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W24.13mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W24.13mm_SMDSocket_LongPads.kicad_mod
index 9fc85a170..2899c5f2d 100644
--- a/Package_DIP.pretty/DIP-64_W24.13mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W24.13mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -13.855 -40.76)
-		(end -13.855 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -13.855 40.76)
-		(end 13.855 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -10.155 -40.7)
 		(end -10.155 40.7)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 13.855 -40.76)
-		(end -13.855 -40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 13.855 40.76)
-		(end 13.855 -40.76)
+	(fp_rect
+		(start -13.855 -40.76)
+		(end 13.855 40.76)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -13.87 -40.95)
-		(end -13.87 40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -13.87 40.95)
 		(end 13.87 40.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 13.87 -40.95)
-		(end -13.87 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 13.87 40.95)
-		(end 13.87 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -12.7 -40.7)
-		(end -12.7 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -12.7 40.7)
-		(end 12.7 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -11.175 -39.64)
 		(end -10.175 -40.64)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 12.7 -40.7)
-		(end -12.7 -40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 12.7 40.7)
-		(end 12.7 -40.7)
+	(fp_rect
+		(start -12.7 -40.7)
+		(end 12.7 40.7)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,325 +165,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -12.065 -39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -12.065 -36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -12.065 -34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -12.065 -31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -12.065 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -12.065 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -12.065 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -12.065 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -12.065 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -12.065 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -12.065 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -12.065 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -12.065 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -12.065 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -12.065 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -12.065 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -12.065 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -12.065 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -12.065 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -12.065 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -12.065 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -12.065 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -12.065 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -12.065 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -12.065 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -12.065 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -12.065 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -12.065 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -12.065 31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -12.065 34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -12.065 36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -12.065 39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 12.065 39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 12.065 36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 12.065 34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 12.065 31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 12.065 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 12.065 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 12.065 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 12.065 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 12.065 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 12.065 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 12.065 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 12.065 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 12.065 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 12.065 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 12.065 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 12.065 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 12.065 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 12.065 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 12.065 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 12.065 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 12.065 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 12.065 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 12.065 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 12.065 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 12.065 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 12.065 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 12.065 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 12.065 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 12.065 -31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 12.065 -34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 12.065 -36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 12.065 -39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-64_W24.13mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-64_W25.4mm.kicad_mod b/Package_DIP.pretty/DIP-64_W25.4mm.kicad_mod
index 21d14a8a5..94c84e048 100644
--- a/Package_DIP.pretty/DIP-64_W25.4mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W25.4mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 80.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 80.26)
 		(end 26.45 80.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.45 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.45 80.26)
-		(end 26.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W25.4mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W25.4mm_LongPads.kicad_mod
index 22ea06c9e..7782b7d02 100644
--- a/Package_DIP.pretty/DIP-64_W25.4mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W25.4mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 80.26)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 80.26)
 		(end 26.85 80.26)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.85 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.85 80.26)
-		(end 26.85 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W25.4mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-64_W25.4mm_SMDSocket_SmallPads.kicad_mod
index 70ee11609..099401ded 100644
--- a/Package_DIP.pretty/DIP-64_W25.4mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W25.4mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -14.03 -40.76)
-		(end -14.03 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -14.03 40.76)
-		(end 14.03 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -11.54 -40.7)
 		(end -11.54 40.7)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 14.03 -40.76)
-		(end -14.03 -40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 14.03 40.76)
-		(end 14.03 -40.76)
+	(fp_rect
+		(start -14.03 -40.76)
+		(end 14.03 40.76)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -14.22 -40.95)
-		(end -14.22 40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -14.22 40.95)
 		(end 14.22 40.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 14.22 -40.95)
-		(end -14.22 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 14.22 40.95)
-		(end 14.22 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -13.97 -40.7)
-		(end -13.97 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -13.97 40.7)
-		(end 13.97 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -12.445 -39.64)
 		(end -11.445 -40.64)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 13.97 -40.7)
-		(end -13.97 -40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 13.97 40.7)
-		(end 13.97 -40.7)
+	(fp_rect
+		(start -13.97 -40.7)
+		(end 13.97 40.7)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,325 +165,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -12.7 -39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -12.7 -36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -12.7 -34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -12.7 -31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -12.7 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -12.7 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -12.7 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -12.7 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -12.7 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -12.7 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -12.7 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -12.7 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -12.7 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -12.7 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -12.7 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -12.7 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -12.7 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -12.7 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -12.7 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -12.7 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -12.7 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -12.7 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -12.7 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -12.7 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -12.7 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -12.7 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -12.7 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -12.7 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -12.7 31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -12.7 34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -12.7 36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -12.7 39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 12.7 39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 12.7 36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 12.7 34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 12.7 31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 12.7 29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 12.7 26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 12.7 24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 12.7 21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 12.7 19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 12.7 16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 12.7 13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 12.7 11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 12.7 8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 12.7 6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 12.7 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 12.7 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 12.7 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 12.7 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 12.7 -6.35)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 12.7 -8.89)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 12.7 -11.43)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 12.7 -13.97)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 12.7 -16.51)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 12.7 -19.05)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 12.7 -21.59)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 12.7 -24.13)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 12.7 -26.67)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 12.7 -29.21)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 12.7 -31.75)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 12.7 -34.29)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 12.7 -36.83)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 12.7 -39.37)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-64_W25.4mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-64_W25.4mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-64_W25.4mm_Socket.kicad_mod
index b8a7c1cbe..a214a4f8b 100644
--- a/Package_DIP.pretty/DIP-64_W25.4mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W25.4mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 80.13)
-		(end 26.73 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 80.07)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 26.73 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 26.73 80.13)
-		(end 26.73 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 26.73 80.13)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 80.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 80.32)
 		(end 26.92 80.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 26.92 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.92 80.32)
-		(end 26.92 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 80.07)
-		(end 26.67 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 26.67 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 26.67 80.07)
-		(end 26.67 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 26.67 80.07)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W25.4mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W25.4mm_Socket_LongPads.kicad_mod
index a0ea1beeb..0abe83ebb 100644
--- a/Package_DIP.pretty/DIP-64_W25.4mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W25.4mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 80.13)
-		(end 26.84 80.13)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 80.07)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 26.84 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 26.84 80.13)
-		(end 26.84 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 26.84 80.13)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 80.32)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 80.32)
 		(end 26.92 80.32)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 26.92 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 26.92 80.32)
-		(end 26.92 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 80.07)
-		(end 26.67 80.07)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.255 -0.27)
 		(end 1.255 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 26.67 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 26.67 80.07)
-		(end 26.67 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 26.67 80.07)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-64_W26.67mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-64_W26.67mm_SMDSocket_LongPads.kicad_mod
index 737c4eaf2..dd2ba0f43 100644
--- a/Package_DIP.pretty/DIP-64_W26.67mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-64_W26.67mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -15.125 -40.76)
-		(end -15.125 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -15.125 40.76)
-		(end 15.125 40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -11.425 -40.7)
 		(end -11.425 40.7)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 15.125 -40.76)
-		(end -15.125 -40.76)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 15.125 40.76)
-		(end 15.125 -40.76)
+	(fp_rect
+		(start -15.125 -40.76)
+		(end 15.125 40.76)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -15.14 -40.95)
-		(end -15.14 40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -15.14 40.95)
 		(end 15.14 40.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 15.14 -40.95)
-		(end -15.14 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 15.14 40.95)
-		(end 15.14 -40.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -13.97 -40.7)
-		(end -13.97 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -13.97 40.7)
-		(end 13.97 40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -12.445 -39.64)
 		(end -11.445 -40.64)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 13.97 -40.7)
-		(end -13.97 -40.7)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 13.97 40.7)
-		(end 13.97 -40.7)
+	(fp_rect
+		(start -13.97 -40.7)
+		(end 13.97 40.7)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,325 +165,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -13.335 -39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -13.335 -36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -13.335 -34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -13.335 -31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -13.335 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -13.335 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -13.335 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -13.335 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -13.335 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -13.335 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -13.335 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -13.335 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -13.335 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -13.335 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -13.335 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -13.335 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -13.335 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -13.335 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -13.335 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -13.335 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -13.335 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -13.335 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -13.335 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -13.335 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -13.335 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -13.335 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -13.335 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -13.335 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -13.335 31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -13.335 34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -13.335 36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -13.335 39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 13.335 39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 13.335 36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 13.335 34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 13.335 31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 13.335 29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 13.335 26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 13.335 24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 13.335 21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 13.335 19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 13.335 16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 13.335 13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 13.335 11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 13.335 8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 13.335 6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 13.335 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 13.335 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 13.335 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 13.335 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 13.335 -6.35)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 13.335 -8.89)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 13.335 -11.43)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 13.335 -13.97)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 13.335 -16.51)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 13.335 -19.05)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 13.335 -21.59)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 13.335 -24.13)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 13.335 -26.67)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 13.335 -29.21)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 13.335 -31.75)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 13.335 -34.29)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 13.335 -36.83)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 13.335 -39.37)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-64_W26.67mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-6_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-6_W10.16mm.kicad_mod
index aebfc7e52..6e6bb2b52 100644
--- a/Package_DIP.pretty/DIP-6_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 6.6)
 		(end 11.21 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 6.6)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-6_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-6_W10.16mm_LongPads.kicad_mod
index 5e46e1dc9..51ac0f518 100644
--- a/Package_DIP.pretty/DIP-6_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 6.6)
 		(end 11.61 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 6.6)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-6_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-6_W7.62mm.kicad_mod
index e0cf6f214..7113179b6 100644
--- a/Package_DIP.pretty/DIP-6_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 6.6)
 		(end 8.67 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 6.6)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-6_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-6_W7.62mm_LongPads.kicad_mod
index dc7a70c5b..a662adc96 100644
--- a/Package_DIP.pretty/DIP-6_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 6.6)
 		(end 9.07 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 6.6)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-6_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-6_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 18a6ff0b6..653e64a47 100644
--- a/Package_DIP.pretty/DIP-6_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -3.93)
-		(end -5.14 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 3.93)
-		(end 5.14 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -3.87)
 		(end -2.65 3.87)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -3.93)
-		(end -5.14 -3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 3.93)
-		(end 5.14 -3.93)
+	(fp_rect
+		(start -5.14 -3.93)
+		(end 5.14 3.93)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -4.12)
-		(end -5.33 4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 4.12)
 		(end 5.33 4.12)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -4.12)
-		(end -5.33 -4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 4.12)
-		(end 5.33 -4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -3.87)
-		(end -5.08 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 3.87)
-		(end 5.08 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -2.81)
 		(end -2.175 -3.81)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -3.87)
-		(end -5.08 -3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 3.87)
-		(end 5.08 -3.87)
+	(fp_rect
+		(start -5.08 -3.87)
+		(end 5.08 3.87)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,35 +165,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 0)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 -2.54)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-6_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-6_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-6_W7.62mm_Socket.kicad_mod
index 520287b14..fc39d863b 100644
--- a/Package_DIP.pretty/DIP-6_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 6.47)
-		(end 8.95 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 6.41)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 6.47)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 6.47)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 6.66)
 		(end 9.14 6.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 6.66)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 6.41)
-		(end 8.89 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 6.41)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 6.41)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-6_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-6_W7.62mm_Socket_LongPads.kicad_mod
index b288bca5c..f3a5836e4 100644
--- a/Package_DIP.pretty/DIP-6_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 6.47)
-		(end 9.06 6.47)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 6.41)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 6.47)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 6.47)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 6.66)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 6.66)
 		(end 9.14 6.66)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 6.66)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 6.41)
-		(end 8.89 6.41)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 6.41)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 6.41)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-6_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-6_W8.89mm_SMDSocket_LongPads.kicad_mod
index 510faba34..8f53b6c0d 100644
--- a/Package_DIP.pretty/DIP-6_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-6_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -3.93)
-		(end -6.235 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 3.93)
-		(end 6.235 3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -3.87)
 		(end -2.535 3.87)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -3.93)
-		(end -6.235 -3.93)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 3.93)
-		(end 6.235 -3.93)
+	(fp_rect
+		(start -6.235 -3.93)
+		(end 6.235 3.93)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -4.12)
-		(end -6.25 4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 4.12)
 		(end 6.25 4.12)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -4.12)
-		(end -6.25 -4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 4.12)
-		(end 6.25 -4.12)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -3.87)
-		(end -5.08 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 3.87)
-		(end 5.08 3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -2.81)
 		(end -2.175 -3.81)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -3.87)
-		(end -5.08 -3.87)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 3.87)
-		(end 5.08 -3.87)
+	(fp_rect
+		(start -5.08 -3.87)
+		(end 5.08 3.87)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,35 +165,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.445 2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.445 0)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.445 -2.54)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-6_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-8-16_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-8-16_W7.62mm.kicad_mod
index ae652ce13..f4d722bae 100644
--- a/Package_DIP.pretty/DIP-8-16_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-8-16_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 19.3)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 19.3)
 		(end 8.67 19.3)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 19.3)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket.kicad_mod
index c40db844d..03c5b740c 100644
--- a/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -3.87)
-		(end -1.33 21.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 21.65)
-		(end 8.95 21.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 19.11)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -3.87)
-		(end -1.33 -3.87)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 21.65)
-		(end 8.95 -3.87)
+	(fp_rect
+		(start -1.33 -3.87)
+		(end 8.95 21.65)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -4.06)
-		(end -1.52 21.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 21.84)
 		(end 9.14 21.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -4.06)
-		(end -1.52 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 21.84)
-		(end 9.14 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -3.81)
-		(end -1.27 21.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 21.59)
-		(end 8.89 21.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -3.81)
-		(end -1.27 -3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 21.59)
-		(end 8.89 -3.81)
+	(fp_rect
+		(start -1.27 -3.81)
+		(end 8.89 21.59)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket_LongPads.kicad_mod
index ca0cfb8b7..081fe6aad 100644
--- a/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-8-16_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -3.87)
-		(end -1.44 21.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 21.65)
-		(end 9.06 21.65)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 19.11)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -3.87)
-		(end -1.44 -3.87)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 21.65)
-		(end 9.06 -3.87)
+	(fp_rect
+		(start -1.44 -3.87)
+		(end 9.06 21.65)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -4.06)
-		(end -1.52 21.84)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 21.84)
 		(end 9.14 21.84)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -4.06)
-		(end -1.52 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 21.84)
-		(end 9.14 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -3.81)
-		(end -1.27 21.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 21.59)
-		(end 8.89 21.59)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -3.81)
-		(end -1.27 -3.81)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 21.59)
-		(end 8.89 -3.81)
+	(fp_rect
+		(start -1.27 -3.81)
+		(end 8.89 21.59)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W10.16mm.kicad_mod b/Package_DIP.pretty/DIP-8_W10.16mm.kicad_mod
index 1d1e52626..23e546e19 100644
--- a/Package_DIP.pretty/DIP-8_W10.16mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W10.16mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.05 -1.52)
-		(end -1.05 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.05 9.14)
 		(end 11.21 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 -1.52)
-		(end -1.05 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.21 9.14)
-		(end 11.21 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W10.16mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-8_W10.16mm_LongPads.kicad_mod
index 37de3c78b..c1669dd0b 100644
--- a/Package_DIP.pretty/DIP-8_W10.16mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W10.16mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.46 -1.52)
-		(end -1.46 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.46 9.14)
 		(end 11.61 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 -1.52)
-		(end -1.46 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 11.61 9.14)
-		(end 11.61 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W7.62mm.kicad_mod b/Package_DIP.pretty/DIP-8_W7.62mm.kicad_mod
index 62b5544ff..0c02b672e 100644
--- a/Package_DIP.pretty/DIP-8_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.06 -1.52)
-		(end -1.06 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.06 9.14)
 		(end 8.67 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 -1.52)
-		(end -1.06 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.67 9.14)
-		(end 8.67 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W7.62mm_LongPads.kicad_mod b/Package_DIP.pretty/DIP-8_W7.62mm_LongPads.kicad_mod
index 0b5a70f5c..8a1101cb8 100644
--- a/Package_DIP.pretty/DIP-8_W7.62mm_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W7.62mm_LongPads.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.45 -1.52)
-		(end -1.45 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.45 9.14)
 		(end 9.07 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 -1.52)
-		(end -1.45 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.07 9.14)
-		(end 9.07 -1.52)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,12 +145,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W7.62mm_SMDSocket_SmallPads.kicad_mod b/Package_DIP.pretty/DIP-8_W7.62mm_SMDSocket_SmallPads.kicad_mod
index 92919bb80..9d53ffa95 100644
--- a/Package_DIP.pretty/DIP-8_W7.62mm_SMDSocket_SmallPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W7.62mm_SMDSocket_SmallPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -5.14 -5.2)
-		(end -5.14 5.2)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -5.14 5.2)
-		(end 5.14 5.2)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.65 -5.14)
 		(end -2.65 5.14)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 5.14 -5.2)
-		(end -5.14 -5.2)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 5.14 5.2)
-		(end 5.14 -5.2)
+	(fp_rect
+		(start -5.14 -5.2)
+		(end 5.14 5.2)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.33 -5.39)
-		(end -5.33 5.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.33 5.39)
 		(end 5.33 5.39)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 5.33 -5.39)
-		(end -5.33 -5.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.33 5.39)
-		(end 5.33 -5.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -5.14)
-		(end -5.08 5.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 5.14)
-		(end 5.08 5.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -4.08)
 		(end -2.175 -5.08)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -5.14)
-		(end -5.08 -5.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 5.14)
-		(end 5.08 -5.14)
+	(fp_rect
+		(start -5.08 -5.14)
+		(end 5.08 5.14)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,45 +165,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 -1.27)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 -3.81)
 		(size 1.6 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-8_W7.62mm_SMDSocket_SmallPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/DIP-8_W7.62mm_Socket.kicad_mod b/Package_DIP.pretty/DIP-8_W7.62mm_Socket.kicad_mod
index 48e96464f..aa517bdd2 100644
--- a/Package_DIP.pretty/DIP-8_W7.62mm_Socket.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W7.62mm_Socket.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.33 -1.39)
-		(end -1.33 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.33 9.01)
-		(end 8.95 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.16 -1.33)
 		(end 1.16 8.95)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 8.95 -1.39)
-		(end -1.33 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 8.95 9.01)
-		(end 8.95 -1.39)
+	(fp_rect
+		(start -1.33 -1.39)
+		(end 8.95 9.01)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 9.2)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 9.2)
 		(end 9.14 9.2)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 9.2)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 8.95)
-		(end 8.89 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 8.95)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 8.95)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 1.6 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole circle
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W7.62mm_Socket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-8_W7.62mm_Socket_LongPads.kicad_mod
index 87e57e4e4..dcf31e9b2 100644
--- a/Package_DIP.pretty/DIP-8_W7.62mm_Socket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W7.62mm_Socket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr through_hole)
-	(fp_line
-		(start -1.44 -1.39)
-		(end -1.44 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -1.44 9.01)
-		(end 9.06 9.01)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start 1.56 -1.33)
 		(end 1.56 8.95)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 9.06 -1.39)
-		(end -1.44 -1.39)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 9.06 9.01)
-		(end 9.06 -1.39)
+	(fp_rect
+		(start -1.44 -1.39)
+		(end 9.06 9.01)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -1.52 -1.58)
-		(end -1.52 9.2)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.52 9.2)
 		(end 9.14 9.2)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 9.14 -1.58)
-		(end -1.52 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 9.14 9.2)
-		(end 9.14 -1.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -1.27 -1.33)
-		(end -1.27 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -1.27 8.95)
-		(end 8.89 8.95)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start 0.635 -0.27)
 		(end 1.635 -1.27)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 8.89 -1.33)
-		(end -1.27 -1.33)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 8.89 8.95)
-		(end 8.89 -1.33)
+	(fp_rect
+		(start -1.27 -1.33)
+		(end 8.89 8.95)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,12 +165,13 @@
 			)
 		)
 	)
-	(pad "1" thru_hole rect
+	(pad "1" thru_hole roundrect
 		(at 0 0)
 		(size 2.4 1.6)
 		(drill 0.8)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
+		(roundrect_rratio 0.15625)
 	)
 	(pad "2" thru_hole oval
 		(at 0 2.54)
diff --git a/Package_DIP.pretty/DIP-8_W8.89mm_SMDSocket_LongPads.kicad_mod b/Package_DIP.pretty/DIP-8_W8.89mm_SMDSocket_LongPads.kicad_mod
index 1d69ec69c..73d0545d6 100644
--- a/Package_DIP.pretty/DIP-8_W8.89mm_SMDSocket_LongPads.kicad_mod
+++ b/Package_DIP.pretty/DIP-8_W8.89mm_SMDSocket_LongPads.kicad_mod
@@ -25,24 +25,6 @@
 		)
 	)
 	(attr smd)
-	(fp_line
-		(start -6.235 -5.2)
-		(end -6.235 5.2)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start -6.235 5.2)
-		(end 6.235 5.2)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
 	(fp_line
 		(start -2.535 -5.14)
 		(end -2.535 5.14)
@@ -88,22 +70,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
-		(start 6.235 -5.2)
-		(end -6.235 -5.2)
-		(stroke
-			(width 0.12)
-			(type solid)
-		)
-		(layer "F.SilkS")
-	)
-	(fp_line
-		(start 6.235 5.2)
-		(end 6.235 -5.2)
+	(fp_rect
+		(start -6.235 -5.2)
+		(end 6.235 5.2)
 		(stroke
 			(width 0.12)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.SilkS")
 	)
 	(fp_arc
@@ -116,60 +90,16 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.25 -5.39)
-		(end -6.25 5.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.25 5.39)
 		(end 6.25 5.39)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
-	(fp_line
-		(start 6.25 -5.39)
-		(end -6.25 -5.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.25 5.39)
-		(end 6.25 -5.39)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.08 -5.14)
-		(end -5.08 5.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start -5.08 5.14)
-		(end 5.08 5.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
 	(fp_line
 		(start -3.175 -4.08)
 		(end -2.175 -5.08)
@@ -215,22 +145,14 @@
 		)
 		(layer "F.Fab")
 	)
-	(fp_line
-		(start 5.08 -5.14)
-		(end -5.08 -5.14)
-		(stroke
-			(width 0.1)
-			(type solid)
-		)
-		(layer "F.Fab")
-	)
-	(fp_line
-		(start 5.08 5.14)
-		(end 5.08 -5.14)
+	(fp_rect
+		(start -5.08 -5.14)
+		(end 5.08 5.14)
 		(stroke
 			(width 0.1)
 			(type solid)
 		)
+		(fill none)
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
@@ -243,45 +165,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.445 3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.445 1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.445 -1.27)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.445 -3.81)
 		(size 3.1 1.6)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.15625)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-8_W8.89mm_SMDSocket_LongPads.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-10_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-10_W11.48mm.kicad_mod
index 3ddaa0aca..7a221edc4 100644
--- a/Package_DIP.pretty/SMDIP-10_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-10_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -6.6)
-		(end -6.99 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 6.6)
 		(end 6.99 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -6.6)
-		(end -6.99 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 6.6)
-		(end 6.99 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,55 +145,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-10_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-10_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-10_W7.62mm.kicad_mod
index 7df9c6446..f9547c073 100644
--- a/Package_DIP.pretty/SMDIP-10_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-10_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -6.6)
-		(end -5.07 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 6.6)
 		(end 5.07 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -6.6)
-		(end -5.07 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 6.6)
-		(end 5.07 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,55 +145,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-10_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-10_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-10_W9.53mm.kicad_mod
index a70d7a9f5..e4a4d67bf 100644
--- a/Package_DIP.pretty/SMDIP-10_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-10_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -6.6)
-		(end -6.02 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 6.6)
 		(end 6.02 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -6.6)
-		(end -6.02 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 6.6)
-		(end 6.02 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,55 +145,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-10_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-10_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-10_W9.53mm_Clearance8mm.kicad_mod
index e2b610bbf..de544810a 100644
--- a/Package_DIP.pretty/SMDIP-10_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-10_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -6.6)
-		(end -5.77 6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 6.6)
 		(end 5.77 6.6)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -6.6)
-		(end -5.77 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 6.6)
-		(end 5.77 -6.6)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,55 +145,65 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-10_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-12_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-12_W11.48mm.kicad_mod
index 0d62cc599..6ff37c4c5 100644
--- a/Package_DIP.pretty/SMDIP-12_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-12_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -7.87)
-		(end -6.99 7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 7.87)
 		(end 6.99 7.87)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -7.87)
-		(end -6.99 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 7.87)
-		(end 6.99 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,65 +145,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-12_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-12_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-12_W7.62mm.kicad_mod
index 93095027c..26f11e2dd 100644
--- a/Package_DIP.pretty/SMDIP-12_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-12_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -7.87)
-		(end -5.07 7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 7.87)
 		(end 5.07 7.87)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -7.87)
-		(end -5.07 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 7.87)
-		(end 5.07 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,65 +145,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-12_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-12_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-12_W9.53mm.kicad_mod
index 45b8f0561..1a4e68dad 100644
--- a/Package_DIP.pretty/SMDIP-12_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-12_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -7.87)
-		(end -6.02 7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 7.87)
 		(end 6.02 7.87)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -7.87)
-		(end -6.02 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 7.87)
-		(end 6.02 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,65 +145,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-12_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-12_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-12_W9.53mm_Clearance8mm.kicad_mod
index 1ad732f35..5f5050bc7 100644
--- a/Package_DIP.pretty/SMDIP-12_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-12_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -7.87)
-		(end -5.77 7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 7.87)
 		(end 5.77 7.87)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -7.87)
-		(end -5.77 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 7.87)
-		(end 5.77 -7.87)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,65 +145,77 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.765 6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 -6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-12_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-14_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-14_W11.48mm.kicad_mod
index 69534d6e7..63d286dad 100644
--- a/Package_DIP.pretty/SMDIP-14_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-14_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -9.14)
-		(end -6.99 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 9.14)
 		(end 6.99 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -9.14)
-		(end -6.99 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 9.14)
-		(end 6.99 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,75 +145,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 5.74 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.74 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-14_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-14_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-14_W7.62mm.kicad_mod
index 40f9063c1..90cc56f02 100644
--- a/Package_DIP.pretty/SMDIP-14_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-14_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -9.14)
-		(end -5.07 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 9.14)
 		(end 5.07 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -9.14)
-		(end -5.07 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 9.14)
-		(end 5.07 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,75 +145,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-14_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-14_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-14_W9.53mm.kicad_mod
index ea0f5ae12..779a6aba7 100644
--- a/Package_DIP.pretty/SMDIP-14_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-14_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -9.14)
-		(end -6.02 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 9.14)
 		(end 6.02 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -9.14)
-		(end -6.02 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 9.14)
-		(end 6.02 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,75 +145,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-14_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-14_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-14_W9.53mm_Clearance8mm.kicad_mod
index b4b789754..19232da63 100644
--- a/Package_DIP.pretty/SMDIP-14_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-14_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -9.14)
-		(end -5.77 9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 9.14)
 		(end 5.77 9.14)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -9.14)
-		(end -5.77 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 9.14)
-		(end 5.77 -9.14)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,75 +145,89 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 -7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-14_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-16_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-16_W11.48mm.kicad_mod
index cef1bdd65..57147bf42 100644
--- a/Package_DIP.pretty/SMDIP-16_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-16_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -10.41)
-		(end -6.99 10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 10.41)
 		(end 6.99 10.41)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -10.41)
-		(end -6.99 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 10.41)
-		(end 6.99 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,85 +145,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-16_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-16_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-16_W7.62mm.kicad_mod
index a8d3478d2..c53c830a5 100644
--- a/Package_DIP.pretty/SMDIP-16_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-16_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -10.41)
-		(end -5.07 10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 10.41)
 		(end 5.07 10.41)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -10.41)
-		(end -5.07 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 10.41)
-		(end 5.07 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,85 +145,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-16_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-16_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-16_W9.53mm.kicad_mod
index 3bd87d573..0958ebf17 100644
--- a/Package_DIP.pretty/SMDIP-16_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-16_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -10.41)
-		(end -6.02 10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 10.41)
 		(end 6.02 10.41)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -10.41)
-		(end -6.02 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 10.41)
-		(end 6.02 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,85 +145,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-16_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-16_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-16_W9.53mm_Clearance8mm.kicad_mod
index 6e713a5d8..c1657fe47 100644
--- a/Package_DIP.pretty/SMDIP-16_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-16_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -10.41)
-		(end -5.77 10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 10.41)
 		(end 5.77 10.41)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -10.41)
-		(end -5.77 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 10.41)
-		(end 5.77 -10.41)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,85 +145,101 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at 4.765 8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 -6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 -8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-16_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-18_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-18_W11.48mm.kicad_mod
index 00b2f6bce..2af22b309 100644
--- a/Package_DIP.pretty/SMDIP-18_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-18_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -11.68)
-		(end -6.99 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 11.68)
 		(end 6.99 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -11.68)
-		(end -6.99 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 11.68)
-		(end 6.99 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,95 +145,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.74 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.74 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 5.74 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 5.74 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.74 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.74 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-18_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-18_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-18_W7.62mm.kicad_mod
index 69de7eeab..0223d8271 100644
--- a/Package_DIP.pretty/SMDIP-18_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-18_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -11.68)
-		(end -5.07 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 11.68)
 		(end 5.07 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -11.68)
-		(end -5.07 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 11.68)
-		(end 5.07 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,95 +145,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 3.81 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-18_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-18_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-18_W9.53mm.kicad_mod
index bd8520a68..910a69ac7 100644
--- a/Package_DIP.pretty/SMDIP-18_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-18_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -11.68)
-		(end -6.02 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 11.68)
 		(end 6.02 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -11.68)
-		(end -6.02 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 11.68)
-		(end 6.02 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,95 +145,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-18_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-18_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-18_W9.53mm_Clearance8mm.kicad_mod
index 8f023408d..a0f9361c9 100644
--- a/Package_DIP.pretty/SMDIP-18_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-18_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -11.68)
-		(end -5.77 11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 11.68)
 		(end 5.77 11.68)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -11.68)
-		(end -5.77 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 11.68)
-		(end 5.77 -11.68)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,95 +145,113 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at 4.765 10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 -7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 -10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-18_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-20_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-20_W11.48mm.kicad_mod
index 504bec8f1..e8234d22f 100644
--- a/Package_DIP.pretty/SMDIP-20_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-20_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -12.95)
-		(end -6.99 12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 12.95)
 		(end 6.99 12.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -12.95)
-		(end -6.99 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 12.95)
-		(end 6.99 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,105 +145,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.74 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 5.74 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.74 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-20_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-20_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-20_W7.62mm.kicad_mod
index 65e9e5a21..56a142136 100644
--- a/Package_DIP.pretty/SMDIP-20_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-20_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -12.95)
-		(end -5.07 12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 12.95)
 		(end 5.07 12.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -12.95)
-		(end -5.07 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 12.95)
-		(end 5.07 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,105 +145,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 3.81 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-20_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-20_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-20_W9.53mm.kicad_mod
index 1d3f740f4..797e6572f 100644
--- a/Package_DIP.pretty/SMDIP-20_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-20_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -12.95)
-		(end -6.02 12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 12.95)
 		(end 6.02 12.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -12.95)
-		(end -6.02 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 12.95)
-		(end 6.02 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,105 +145,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.765 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.765 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-20_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-20_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-20_W9.53mm_Clearance8mm.kicad_mod
index 445649137..075e150a0 100644
--- a/Package_DIP.pretty/SMDIP-20_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-20_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -12.95)
-		(end -5.77 12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 12.95)
 		(end 5.77 12.95)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -12.95)
-		(end -5.77 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 12.95)
-		(end 5.77 -12.95)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,105 +145,125 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -11.43)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.765 11.43)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at 4.765 11.43)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 -6.35)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.765 -8.89)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.765 -11.43)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-20_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-22_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-22_W11.48mm.kicad_mod
index 48f847131..60065020a 100644
--- a/Package_DIP.pretty/SMDIP-22_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-22_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -14.22)
-		(end -6.99 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 14.22)
 		(end 6.99 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -14.22)
-		(end -6.99 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 14.22)
-		(end 6.99 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,115 +145,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.74 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.74 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.74 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 5.74 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.74 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.74 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.74 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.74 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.74 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.74 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.74 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-22_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-22_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-22_W7.62mm.kicad_mod
index 1bd52ff29..e1eb97684 100644
--- a/Package_DIP.pretty/SMDIP-22_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-22_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -14.22)
-		(end -5.07 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 14.22)
 		(end 5.07 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -14.22)
-		(end -5.07 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 14.22)
-		(end 5.07 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,115 +145,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.81 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 3.81 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.81 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.81 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-22_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-22_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-22_W9.53mm.kicad_mod
index 711d92b21..c14cdaa21 100644
--- a/Package_DIP.pretty/SMDIP-22_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-22_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -14.22)
-		(end -6.02 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 14.22)
 		(end 6.02 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -14.22)
-		(end -6.02 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 14.22)
-		(end 6.02 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,115 +145,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.765 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.765 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.765 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.765 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.765 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.765 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-22_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-22_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-22_W9.53mm_Clearance8mm.kicad_mod
index f6cd1bb9d..4dcd77002 100644
--- a/Package_DIP.pretty/SMDIP-22_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-22_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -14.22)
-		(end -5.77 14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 14.22)
 		(end 5.77 14.22)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -14.22)
-		(end -5.77 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 14.22)
-		(end 5.77 -14.22)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,115 +145,137 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -12.7)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.765 10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.765 12.7)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at 4.765 12.7)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.765 -5.08)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.765 -7.62)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.765 -10.16)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.765 -12.7)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-22_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-24_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-24_W11.48mm.kicad_mod
index d0fe057e6..31c04424e 100644
--- a/Package_DIP.pretty/SMDIP-24_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-24_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -15.49)
-		(end -6.99 15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 15.49)
 		(end 6.99 15.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -15.49)
-		(end -6.99 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 15.49)
-		(end 6.99 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,125 +145,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.74 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -5.74 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 5.74 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 5.74 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 5.74 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 5.74 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-24_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-24_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-24_W15.24mm.kicad_mod
index 72a9c6f1c..f5637cb9b 100644
--- a/Package_DIP.pretty/SMDIP-24_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-24_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -15.49)
-		(end -8.88 15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 15.49)
 		(end 8.88 15.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -15.49)
-		(end -8.88 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 15.49)
-		(end 8.88 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,125 +145,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-24_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-24_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-24_W7.62mm.kicad_mod
index ace28bb30..a74278dc4 100644
--- a/Package_DIP.pretty/SMDIP-24_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-24_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -15.49)
-		(end -5.07 15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 15.49)
 		(end 5.07 15.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -15.49)
-		(end -5.07 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 15.49)
-		(end 5.07 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,125 +145,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.81 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -3.81 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 3.81 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 3.81 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 3.81 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 3.81 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-24_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-24_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-24_W9.53mm.kicad_mod
index 20b63fefa..81d36681c 100644
--- a/Package_DIP.pretty/SMDIP-24_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-24_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -15.49)
-		(end -6.02 15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 15.49)
 		(end 6.02 15.49)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -15.49)
-		(end -6.02 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 15.49)
-		(end 6.02 -15.49)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,125 +145,149 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.765 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -4.765 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at 4.765 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at 4.765 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 4.765 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 4.765 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-24_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-28_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-28_W15.24mm.kicad_mod
index 3eb088e28..83999a85a 100644
--- a/Package_DIP.pretty/SMDIP-28_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-28_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -18.04)
-		(end -8.88 18.04)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 18.04)
 		(end 8.88 18.04)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -18.04)
-		(end -8.88 -18.04)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 18.04)
-		(end 8.88 -18.04)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,145 +145,173 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at 7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at 7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-28_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-32_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-32_W11.48mm.kicad_mod
index e36d1b98b..bd7269141 100644
--- a/Package_DIP.pretty/SMDIP-32_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-32_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -20.58)
-		(end -6.99 20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 20.58)
 		(end 6.99 20.58)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -20.58)
-		(end -6.99 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 20.58)
-		(end 6.99 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,165 +145,197 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -5.74 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -5.74 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -5.74 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -5.74 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 5.74 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 5.74 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 5.74 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 5.74 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 5.74 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 5.74 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 5.74 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 5.74 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 5.74 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 5.74 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 5.74 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 5.74 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-32_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-32_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-32_W15.24mm.kicad_mod
index 40cdc44bb..433ba20f4 100644
--- a/Package_DIP.pretty/SMDIP-32_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-32_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -20.58)
-		(end -8.88 20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 20.58)
 		(end 8.88 20.58)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -20.58)
-		(end -8.88 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 20.58)
-		(end 8.88 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,165 +145,197 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-32_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-32_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-32_W7.62mm.kicad_mod
index f553af6e6..55fc23ec3 100644
--- a/Package_DIP.pretty/SMDIP-32_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-32_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -20.58)
-		(end -5.07 20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 20.58)
 		(end 5.07 20.58)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -20.58)
-		(end -5.07 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 20.58)
-		(end 5.07 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,165 +145,197 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -3.81 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -3.81 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -3.81 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -3.81 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 3.81 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 3.81 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 3.81 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 3.81 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 3.81 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 3.81 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 3.81 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 3.81 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 3.81 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 3.81 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 3.81 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 3.81 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-32_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-32_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-32_W9.53mm.kicad_mod
index f4985205a..b03404451 100644
--- a/Package_DIP.pretty/SMDIP-32_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-32_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -20.58)
-		(end -6.02 20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 20.58)
 		(end 6.02 20.58)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -20.58)
-		(end -6.02 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 20.58)
-		(end 6.02 -20.58)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,165 +145,197 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -4.765 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -4.765 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -4.765 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -4.765 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at 4.765 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at 4.765 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at 4.765 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at 4.765 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 4.765 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 4.765 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 4.765 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 4.765 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 4.765 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 4.765 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 4.765 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 4.765 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-32_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-40_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-40_W15.24mm.kicad_mod
index d645ec153..9e93a3ffb 100644
--- a/Package_DIP.pretty/SMDIP-40_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-40_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -25.65)
-		(end -8.88 25.65)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 25.65)
 		(end 8.88 25.65)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -25.65)
-		(end -8.88 -25.65)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 25.65)
-		(end 8.88 -25.65)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,205 +145,245 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 7.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-40_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-40_W25.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-40_W25.24mm.kicad_mod
index eb2a71d9b..47ee89cd2 100644
--- a/Package_DIP.pretty/SMDIP-40_W25.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-40_W25.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -13.87 -25.65)
-		(end -13.87 25.65)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -13.87 25.65)
 		(end 13.87 25.65)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 13.87 -25.65)
-		(end -13.87 -25.65)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 13.87 25.65)
-		(end 13.87 -25.65)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,205 +145,245 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -12.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -12.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -12.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -12.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -12.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -12.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -12.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -12.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -12.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -12.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -12.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -12.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -12.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -12.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -12.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -12.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -12.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -12.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -12.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -12.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at 12.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 12.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 12.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 12.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 12.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 12.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 12.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 12.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 12.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 12.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 12.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 12.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 12.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 12.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 12.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 12.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 12.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 12.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 12.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 12.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-40_W25.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-42_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-42_W15.24mm.kicad_mod
index 290a0b8aa..760909d62 100644
--- a/Package_DIP.pretty/SMDIP-42_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-42_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -26.92)
-		(end -8.88 26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 26.92)
 		(end 8.88 26.92)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -26.92)
-		(end -8.88 -26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 26.92)
-		(end 8.88 -26.92)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,215 +145,257 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -25.4)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -22.86)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -20.32)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -17.78)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -15.24)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 15.24)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 17.78)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 20.32)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 22.86)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -7.62 25.4)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at 7.62 25.4)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at 7.62 22.86)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at 7.62 20.32)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 17.78)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 15.24)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 -5.08)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 -7.62)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 -10.16)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 -12.7)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 -15.24)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 -17.78)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 -20.32)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 7.62 -22.86)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 7.62 -25.4)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-42_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-48_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-48_W15.24mm.kicad_mod
index 046e1c24c..af3afb5f5 100644
--- a/Package_DIP.pretty/SMDIP-48_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-48_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -30.74)
-		(end -8.88 30.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 30.74)
 		(end 8.88 30.74)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -30.74)
-		(end -8.88 -30.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 30.74)
-		(end 8.88 -30.74)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,245 +145,293 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -7.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -7.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -7.62 26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -7.62 29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at 7.62 29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at 7.62 26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at 7.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at 7.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at 7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at 7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at 7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at 7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 7.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 7.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 7.62 -26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 7.62 -29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-48_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-4_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-4_W11.48mm.kicad_mod
index fe2a389ce..090a11be8 100644
--- a/Package_DIP.pretty/SMDIP-4_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-4_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -2.79)
-		(end -6.99 2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 2.79)
 		(end 6.99 2.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -2.79)
-		(end -6.99 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 2.79)
-		(end 6.99 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,25 +145,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-4_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-4_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-4_W7.62mm.kicad_mod
index cdfa32833..4dd7ea171 100644
--- a/Package_DIP.pretty/SMDIP-4_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-4_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -2.79)
-		(end -5.07 2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 2.79)
 		(end 5.07 2.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -2.79)
-		(end -5.07 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 2.79)
-		(end 5.07 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,25 +145,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-4_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-4_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-4_W9.53mm.kicad_mod
index 434bf8045..0b068ace4 100644
--- a/Package_DIP.pretty/SMDIP-4_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-4_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -2.79)
-		(end -6.02 2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 2.79)
 		(end 6.02 2.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -2.79)
-		(end -6.02 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 2.79)
-		(end 6.02 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,25 +145,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-4_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-4_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-4_W9.53mm_Clearance8mm.kicad_mod
index 1ebac10fb..1050075a4 100644
--- a/Package_DIP.pretty/SMDIP-4_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-4_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -2.79)
-		(end -5.77 2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 2.79)
 		(end 5.77 2.79)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -2.79)
-		(end -5.77 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 2.79)
-		(end 5.77 -2.79)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,25 +145,29 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at 4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-4_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-64_W15.24mm.kicad_mod b/Package_DIP.pretty/SMDIP-64_W15.24mm.kicad_mod
index 2c0f1c9a1..1f4f00ddc 100644
--- a/Package_DIP.pretty/SMDIP-64_W15.24mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-64_W15.24mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -8.88 -40.89)
-		(end -8.88 40.89)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -8.88 40.89)
 		(end 8.88 40.89)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 -40.89)
-		(end -8.88 -40.89)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 8.88 40.89)
-		(end 8.88 -40.89)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,325 +145,389 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -7.62 -39.37)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -7.62 -36.83)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -7.62 -34.29)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -7.62 -31.75)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at -7.62 -29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at -7.62 -26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at -7.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at -7.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "9" smd rect
+	(pad "9" smd roundrect
 		(at -7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "10" smd rect
+	(pad "10" smd roundrect
 		(at -7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "11" smd rect
+	(pad "11" smd roundrect
 		(at -7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "12" smd rect
+	(pad "12" smd roundrect
 		(at -7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "13" smd rect
+	(pad "13" smd roundrect
 		(at -7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "14" smd rect
+	(pad "14" smd roundrect
 		(at -7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "15" smd rect
+	(pad "15" smd roundrect
 		(at -7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "16" smd rect
+	(pad "16" smd roundrect
 		(at -7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "17" smd rect
+	(pad "17" smd roundrect
 		(at -7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "18" smd rect
+	(pad "18" smd roundrect
 		(at -7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "19" smd rect
+	(pad "19" smd roundrect
 		(at -7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "20" smd rect
+	(pad "20" smd roundrect
 		(at -7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "21" smd rect
+	(pad "21" smd roundrect
 		(at -7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "22" smd rect
+	(pad "22" smd roundrect
 		(at -7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "23" smd rect
+	(pad "23" smd roundrect
 		(at -7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "24" smd rect
+	(pad "24" smd roundrect
 		(at -7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "25" smd rect
+	(pad "25" smd roundrect
 		(at -7.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "26" smd rect
+	(pad "26" smd roundrect
 		(at -7.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "27" smd rect
+	(pad "27" smd roundrect
 		(at -7.62 26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "28" smd rect
+	(pad "28" smd roundrect
 		(at -7.62 29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "29" smd rect
+	(pad "29" smd roundrect
 		(at -7.62 31.75)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "30" smd rect
+	(pad "30" smd roundrect
 		(at -7.62 34.29)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "31" smd rect
+	(pad "31" smd roundrect
 		(at -7.62 36.83)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "32" smd rect
+	(pad "32" smd roundrect
 		(at -7.62 39.37)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "33" smd rect
+	(pad "33" smd roundrect
 		(at 7.62 39.37)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "34" smd rect
+	(pad "34" smd roundrect
 		(at 7.62 36.83)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "35" smd rect
+	(pad "35" smd roundrect
 		(at 7.62 34.29)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "36" smd rect
+	(pad "36" smd roundrect
 		(at 7.62 31.75)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "37" smd rect
+	(pad "37" smd roundrect
 		(at 7.62 29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "38" smd rect
+	(pad "38" smd roundrect
 		(at 7.62 26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "39" smd rect
+	(pad "39" smd roundrect
 		(at 7.62 24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "40" smd rect
+	(pad "40" smd roundrect
 		(at 7.62 21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "41" smd rect
+	(pad "41" smd roundrect
 		(at 7.62 19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "42" smd rect
+	(pad "42" smd roundrect
 		(at 7.62 16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "43" smd rect
+	(pad "43" smd roundrect
 		(at 7.62 13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "44" smd rect
+	(pad "44" smd roundrect
 		(at 7.62 11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "45" smd rect
+	(pad "45" smd roundrect
 		(at 7.62 8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "46" smd rect
+	(pad "46" smd roundrect
 		(at 7.62 6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "47" smd rect
+	(pad "47" smd roundrect
 		(at 7.62 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "48" smd rect
+	(pad "48" smd roundrect
 		(at 7.62 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "49" smd rect
+	(pad "49" smd roundrect
 		(at 7.62 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "50" smd rect
+	(pad "50" smd roundrect
 		(at 7.62 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "51" smd rect
+	(pad "51" smd roundrect
 		(at 7.62 -6.35)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "52" smd rect
+	(pad "52" smd roundrect
 		(at 7.62 -8.89)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "53" smd rect
+	(pad "53" smd roundrect
 		(at 7.62 -11.43)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "54" smd rect
+	(pad "54" smd roundrect
 		(at 7.62 -13.97)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "55" smd rect
+	(pad "55" smd roundrect
 		(at 7.62 -16.51)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "56" smd rect
+	(pad "56" smd roundrect
 		(at 7.62 -19.05)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "57" smd rect
+	(pad "57" smd roundrect
 		(at 7.62 -21.59)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "58" smd rect
+	(pad "58" smd roundrect
 		(at 7.62 -24.13)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "59" smd rect
+	(pad "59" smd roundrect
 		(at 7.62 -26.67)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "60" smd rect
+	(pad "60" smd roundrect
 		(at 7.62 -29.21)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "61" smd rect
+	(pad "61" smd roundrect
 		(at 7.62 -31.75)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "62" smd rect
+	(pad "62" smd roundrect
 		(at 7.62 -34.29)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "63" smd rect
+	(pad "63" smd roundrect
 		(at 7.62 -36.83)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "64" smd rect
+	(pad "64" smd roundrect
 		(at 7.62 -39.37)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-64_W15.24mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-6_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-6_W11.48mm.kicad_mod
index 217c4a633..84fdf5491 100644
--- a/Package_DIP.pretty/SMDIP-6_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-6_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -4.06)
-		(end -6.99 4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 4.06)
 		(end 6.99 4.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -4.06)
-		(end -6.99 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 4.06)
-		(end 6.99 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,35 +145,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 5.74 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 5.74 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 5.74 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-6_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-6_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-6_W7.62mm.kicad_mod
index fb3035585..cc57c3f3f 100644
--- a/Package_DIP.pretty/SMDIP-6_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-6_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -4.06)
-		(end -5.07 4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 4.06)
 		(end 5.07 4.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -4.06)
-		(end -5.07 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 4.06)
-		(end 5.07 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,35 +145,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 3.81 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-6_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-6_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-6_W9.53mm.kicad_mod
index 7e6257ce8..428fe85fe 100644
--- a/Package_DIP.pretty/SMDIP-6_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-6_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -4.06)
-		(end -6.02 4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 4.06)
 		(end 6.02 4.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -4.06)
-		(end -6.02 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 4.06)
-		(end 6.02 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,35 +145,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.765 2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.765 0)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.765 -2.54)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-6_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-6_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-6_W9.53mm_Clearance8mm.kicad_mod
index 575c63302..013816703 100644
--- a/Package_DIP.pretty/SMDIP-6_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-6_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -4.06)
-		(end -5.77 4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 4.06)
 		(end 5.77 4.06)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -4.06)
-		(end -5.77 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 4.06)
-		(end 5.77 -4.06)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,35 +145,41 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at 4.765 2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.765 0)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.765 -2.54)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-6_W9.53mm_Clearance8mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-8_W11.48mm.kicad_mod b/Package_DIP.pretty/SMDIP-8_W11.48mm.kicad_mod
index ee0e478aa..afd62d2cf 100644
--- a/Package_DIP.pretty/SMDIP-8_W11.48mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-8_W11.48mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.99 -5.33)
-		(end -6.99 5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.99 5.33)
 		(end 6.99 5.33)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 -5.33)
-		(end -6.99 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.99 5.33)
-		(end 6.99 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,45 +145,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 5.74 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 5.74 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 5.74 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 5.74 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-8_W11.48mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-8_W7.62mm.kicad_mod b/Package_DIP.pretty/SMDIP-8_W7.62mm.kicad_mod
index e9bf9aec8..d9a40107b 100644
--- a/Package_DIP.pretty/SMDIP-8_W7.62mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-8_W7.62mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.07 -5.33)
-		(end -5.07 5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.07 5.33)
 		(end 5.07 5.33)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 -5.33)
-		(end -5.07 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.07 5.33)
-		(end 5.07 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,45 +145,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 3.81 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 3.81 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 3.81 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 3.81 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-8_W7.62mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-8_W9.53mm.kicad_mod b/Package_DIP.pretty/SMDIP-8_W9.53mm.kicad_mod
index 109cd1a3c..73b38bd2e 100644
--- a/Package_DIP.pretty/SMDIP-8_W9.53mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-8_W9.53mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -6.02 -5.33)
-		(end -6.02 5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -6.02 5.33)
 		(end 6.02 5.33)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 -5.33)
-		(end -6.02 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 6.02 5.33)
-		(end 6.02 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,45 +145,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.765 3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.765 1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.765 -1.27)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 -3.81)
 		(size 2 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.140449)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-8_W9.53mm.wrl"
 		(offset
diff --git a/Package_DIP.pretty/SMDIP-8_W9.53mm_Clearance8mm.kicad_mod b/Package_DIP.pretty/SMDIP-8_W9.53mm_Clearance8mm.kicad_mod
index 5c098bde9..10bd974db 100644
--- a/Package_DIP.pretty/SMDIP-8_W9.53mm_Clearance8mm.kicad_mod
+++ b/Package_DIP.pretty/SMDIP-8_W9.53mm_Clearance8mm.kicad_mod
@@ -80,40 +80,14 @@
 		)
 		(layer "F.SilkS")
 	)
-	(fp_line
+	(fp_rect
 		(start -5.77 -5.33)
-		(end -5.77 5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start -5.77 5.33)
 		(end 5.77 5.33)
 		(stroke
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 -5.33)
-		(end -5.77 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
-		(layer "F.CrtYd")
-	)
-	(fp_line
-		(start 5.77 5.33)
-		(end 5.77 -5.33)
-		(stroke
-			(width 0.05)
-			(type solid)
-		)
+		(fill none)
 		(layer "F.CrtYd")
 	)
 	(fp_line
@@ -171,45 +145,53 @@
 			)
 		)
 	)
-	(pad "1" smd rect
+	(pad "1" smd roundrect
 		(at -4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "2" smd rect
+	(pad "2" smd roundrect
 		(at -4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "3" smd rect
+	(pad "3" smd roundrect
 		(at -4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "4" smd rect
+	(pad "4" smd roundrect
 		(at -4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "5" smd rect
+	(pad "5" smd roundrect
 		(at 4.765 3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "6" smd rect
+	(pad "6" smd roundrect
 		(at 4.765 1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "7" smd rect
+	(pad "7" smd roundrect
 		(at 4.765 -1.27)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
-	(pad "8" smd rect
+	(pad "8" smd roundrect
 		(at 4.765 -3.81)
 		(size 1.5 1.78)
 		(layers "F.Cu" "F.Paste" "F.Mask")
+		(roundrect_rratio 0.166667)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Housings_DIP.3dshapes/SMDIP-8_W9.53mm_Clearance8mm.wrl"
 		(offset