diff --git a/Package_TO_SOT_THT.pretty/SIPAK-1EP_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/SIPAK-1EP_Horizontal_TabDown.kicad_mod
index 6d803e749..5e330ce06 100644
--- a/Package_TO_SOT_THT.pretty/SIPAK-1EP_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/SIPAK-1EP_Horizontal_TabDown.kicad_mod
@@ -246,22 +246,22 @@
 		(at 0 0)
 		(size 1.7145 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.286 0)
 		(size 1.7145 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.572 0)
 		(size 1.7145 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" smd rect
 		(at 2.286 -6.073333)
diff --git a/Package_TO_SOT_THT.pretty/SIPAK_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/SIPAK_Vertical.kicad_mod
index 91b48547d..c8fad427f 100644
--- a/Package_TO_SOT_THT.pretty/SIPAK_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/SIPAK_Vertical.kicad_mod
@@ -219,22 +219,22 @@
 		(at 0 0)
 		(size 1.7145 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.286 0)
 		(size 1.7145 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.572 0)
 		(size 1.7145 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/SIPAK_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-100-10.kicad_mod b/Package_TO_SOT_THT.pretty/TO-100-10.kicad_mod
index 582688bf3..bdb09a78f 100644
--- a/Package_TO_SOT_THT.pretty/TO-100-10.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-100-10.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,71 +159,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-100-10.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-100-10_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-100-10_Window.kicad_mod
index 2746628e6..5ab6906ea 100644
--- a/Package_TO_SOT_THT.pretty/TO-100-10_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-100-10_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,71 +304,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-100-10_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-11-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-11-2.kicad_mod
index 0f50e20de..062b1700f 100644
--- a/Package_TO_SOT_THT.pretty/TO-11-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-11-2.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,15 +159,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-11-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-11-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-11-2_Window.kicad_mod
index 865257267..15b114dfc 100644
--- a/Package_TO_SOT_THT.pretty/TO-11-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-11-2_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,15 +304,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-11-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-11-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-11-3.kicad_mod
index 3c8876000..32391c63d 100644
--- a/Package_TO_SOT_THT.pretty/TO-11-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-11-3.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,22 +159,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-11-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-11-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-11-3_Window.kicad_mod
index f9244ed25..545d3fb7a 100644
--- a/Package_TO_SOT_THT.pretty/TO-11-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-11-3_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,22 +304,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-11-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-12-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-12-4.kicad_mod
index 52f77f121..22b5dbe88 100644
--- a/Package_TO_SOT_THT.pretty/TO-12-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-12-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-12-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-12-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-12-4_Window.kicad_mod
index 2f4f84c1e..51767803d 100644
--- a/Package_TO_SOT_THT.pretty/TO-12-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-12-4_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,29 +304,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-12-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabDown.kicad_mod
index e7bfe36ae..1e13063dd 100644
--- a/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabDown.kicad_mod
@@ -176,8 +176,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -16.12 0)
@@ -199,15 +199,15 @@
 		(at 0 0)
 		(size 1.8 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-126-2_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabUp.kicad_mod
index d674355e8..2757c47af 100644
--- a/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-126-2_Horizontal_TabUp.kicad_mod
@@ -176,8 +176,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 16.12 0)
@@ -199,15 +199,15 @@
 		(at 0 0)
 		(size 1.8 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-126-2_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-126-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-126-2_Vertical.kicad_mod
index 4eaf04315..5945a9697 100644
--- a/Package_TO_SOT_THT.pretty/TO-126-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-126-2_Vertical.kicad_mod
@@ -201,15 +201,15 @@
 		(at 0 0)
 		(size 1.8 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-126-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabDown.kicad_mod
index 525b6c2a6..640f5ead1 100644
--- a/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabDown.kicad_mod
@@ -194,8 +194,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.28 -16.12 0)
@@ -217,22 +217,22 @@
 		(at 0 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.28 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.56 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-126-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabUp.kicad_mod
index 606e9fe45..d2376b13f 100644
--- a/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-126-3_Horizontal_TabUp.kicad_mod
@@ -194,8 +194,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.28 16.12 0)
@@ -217,22 +217,22 @@
 		(at 0 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.28 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.56 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-126-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-126-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-126-3_Vertical.kicad_mod
index 7d194cbd4..754b14115 100644
--- a/Package_TO_SOT_THT.pretty/TO-126-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-126-3_Vertical.kicad_mod
@@ -201,22 +201,22 @@
 		(at 0 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.28 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.56 0)
 		(size 1.71 1.8)
 		(drill 1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-126-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-17-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-17-4.kicad_mod
index 983889f50..1d84e43dc 100644
--- a/Package_TO_SOT_THT.pretty/TO-17-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-17-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0.9 -3.72 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.2 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.9 0.9)
 		(size 0.9 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 1.8 0)
 		(size 0.9 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 0.9 -0.9)
 		(size 0.9 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-17-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-17-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-17-4_Window.kicad_mod
index 47993ee59..d74eca6d1 100644
--- a/Package_TO_SOT_THT.pretty/TO-17-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-17-4_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 0.9 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0.9 -3.72 0)
@@ -250,29 +250,29 @@
 		(at 0 0)
 		(size 1.2 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.9 0.9)
 		(size 0.9 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 1.8 0)
 		(size 0.9 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 0.9 -0.9)
 		(size 0.9 0.9)
 		(drill 0.6)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-17-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-2.kicad_mod
index 8898b13e7..2cea1a71e 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-2.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,15 +159,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-2_Lens.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-2_Lens.kicad_mod
index c58135097..23d756091 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-2_Lens.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-2_Lens.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,15 +250,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-2_Lens.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-2_Window.kicad_mod
index 5cc3b6015..29065acfc 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-2_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,15 +250,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-3.kicad_mod
index fdd3444a0..88d7a1249 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-3.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,22 +159,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-3_Lens.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-3_Lens.kicad_mod
index ebac803a3..cb4811372 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-3_Lens.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-3_Lens.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,22 +250,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-3_Lens.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-3_Window.kicad_mod
index d4e855f33..3acd43c72 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-3_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,22 +250,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-4.kicad_mod
index ea4b9cc21..0b072d2a6 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-4_Lens.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-4_Lens.kicad_mod
index 89a87df61..6e3e43e20 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-4_Lens.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-4_Lens.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,29 +250,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-4_Lens.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-18-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-18-4_Window.kicad_mod
index 00a2aba46..5d7bbb8ce 100644
--- a/Package_TO_SOT_THT.pretty/TO-18-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-18-4_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,29 +250,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-18-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabDown.kicad_mod
index cbecb3fda..7aad088b5 100644
--- a/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabDown.kicad_mod
@@ -212,8 +212,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.475 -23.45 0)
@@ -235,15 +235,15 @@
 		(at 0 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.95 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-218-2_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabUp.kicad_mod
index 2495fa902..c1b7d4f64 100644
--- a/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-218-2_Horizontal_TabUp.kicad_mod
@@ -347,8 +347,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.475 23.45 0)
@@ -370,15 +370,15 @@
 		(at 0 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.95 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-218-2_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-218-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-218-2_Vertical.kicad_mod
index 4852caaea..378c19ca2 100644
--- a/Package_TO_SOT_THT.pretty/TO-218-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-218-2_Vertical.kicad_mod
@@ -237,15 +237,15 @@
 		(at 0 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.95 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-218-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabDown.kicad_mod
index 42e415b59..b26766fb5 100644
--- a/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabDown.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.475 -23.45 0)
@@ -253,22 +253,22 @@
 		(at 0 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.475 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.95 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-218-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabUp.kicad_mod
index 0f091c245..4b0cceef7 100644
--- a/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-218-3_Horizontal_TabUp.kicad_mod
@@ -365,8 +365,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.475 23.45 0)
@@ -388,22 +388,22 @@
 		(at 0 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.475 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.95 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-218-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-218-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-218-3_Vertical.kicad_mod
index 872bf6a00..2f8ba57de 100644
--- a/Package_TO_SOT_THT.pretty/TO-218-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-218-3_Vertical.kicad_mod
@@ -255,22 +255,22 @@
 		(at 0 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.475 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.95 0)
 		(size 2.5 3.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-218-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod
index 54b2d3837..8e02c93f9 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-11, Horizontal, RM 1.7mm, Multiwatt11, staggered type-2, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
-	(tags "TO-220-11 Horizontal RM 1.7mm staggered type-2 Multiwatt-11")
+	(descr "TO-220-11, Horizontal, RM 1.7mm, Multiwatt-11, staggered type-2, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
+	(tags "TO-220-11 Horizontal RM 1.7mm Multiwatt-11 staggered type-2")
 	(property "Reference" "REF**"
 		(at 8.5 -21.92 0)
 		(layer "F.SilkS")
-		(uuid "55f1660f-94da-4e68-aff8-a1200e16b3ab")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown"
 		(at 8.5 4.44 0)
 		(layer "F.Fab")
-		(uuid "194ffe84-78d5-4e68-9d39-5918fe881410")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "b174d9c6-d08f-439e-9184-8f2536a096bd")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0d9d38fc-ad0b-4ff4-abb2-caad098839aa")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "cf5baebf-f98e-418b-8831-7e0ee7205381")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.72 -20.92)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f573660b-55cd-4088-807d-d2ac012c181a")
 	)
 	(fp_line
 		(start -1.72 -20.92)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "321492ff-2bfd-4225-bb55-6e710153a37f")
 	)
 	(fp_line
 		(start -1.72 -3.18)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a329cd21-6d94-443d-bc09-9c57ca89f34c")
 	)
 	(fp_line
 		(start 0 -3.18)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8280f266-d98f-49d5-9814-6177e7086501")
 	)
 	(fp_line
 		(start 1.7 -3.18)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1c41c9d3-8fc8-4e53-9735-ac2f37f1fd2d")
 	)
 	(fp_line
 		(start 3.4 -3.18)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "600e50b9-f037-457b-b0fc-78986ffd296a")
 	)
 	(fp_line
 		(start 5.1 -3.18)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2d3b760b-8845-4d53-ae46-9cec8fb5b580")
 	)
 	(fp_line
 		(start 6.8 -3.18)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "17e5ee36-ffe7-4aae-90d9-06670fb896c0")
 	)
 	(fp_line
 		(start 8.5 -3.18)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f76f0b07-f4dc-4526-8ae2-b605f8509894")
 	)
 	(fp_line
 		(start 10.2 -3.18)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6108b53d-e2f1-495e-993a-1a2c2f4c352d")
 	)
 	(fp_line
 		(start 11.9 -3.18)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "06ae9df6-16cd-4468-91bb-82fc27e3f6b3")
 	)
 	(fp_line
 		(start 13.6 -3.18)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "07929230-4041-4906-acaf-c75e70b2cd7a")
 	)
 	(fp_line
 		(start 15.3 -3.18)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "82da721d-0562-49d1-87aa-82218438dc7c")
 	)
 	(fp_line
 		(start 17 -3.18)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "58ab0e82-e3a1-4083-8084-568673e08e3b")
 	)
 	(fp_line
 		(start 18.72 -20.92)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "30696275-01d2-437d-ab2e-bee4041decd2")
 	)
 	(fp_line
 		(start -1.85 -21.05)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "50567a59-0db8-4438-94a6-b89ca4b16418")
 	)
 	(fp_line
 		(start -1.85 3.69)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "38cfab39-006f-4ec3-a413-5d25dd8e5f95")
 	)
 	(fp_line
 		(start 18.85 -21.05)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6ab00e43-bdba-4852-bfc0-fb60049ea395")
 	)
 	(fp_line
 		(start 18.85 3.69)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "08223369-0a1e-4573-8537-2724866fa1c3")
 	)
 	(fp_line
 		(start -1.6 -18.55)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "96622ebb-9e62-4d93-908f-2a94416815cf")
 	)
 	(fp_line
 		(start -1.6 -14)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9c8472fa-dfdb-4225-87eb-2ef737dee87e")
 	)
 	(fp_line
 		(start -1.6 -14)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "17fc0872-4553-4eda-9b1a-0bf28224d533")
 	)
 	(fp_line
 		(start -1.6 -3.3)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ce0edb05-0c9d-43ff-9922-e561bb22643e")
 	)
 	(fp_line
 		(start 0 -3.3)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "56782c50-77cb-48e0-a8db-edafe387434e")
 	)
 	(fp_line
 		(start 0.651 -20.8)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "87c6a8ca-a44b-44a5-9960-b45e2c0e9f8b")
 	)
 	(fp_line
 		(start 1.7 -3.3)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "07cb819c-fb5e-4bc8-b018-6eb4f0b615b6")
 	)
 	(fp_line
 		(start 3.4 -3.3)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "07c105f7-2b37-4bd3-bea0-fd218a353920")
 	)
 	(fp_line
 		(start 5.1 -3.3)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "67dd650c-b1c7-452a-8b14-00f88e014ca4")
 	)
 	(fp_line
 		(start 6.8 -3.3)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "81816f81-2fdb-49fb-b998-19c4a23a778f")
 	)
 	(fp_line
 		(start 8.5 -3.3)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2bf8f91d-bf7e-4ee3-a803-af4aee55446e")
 	)
 	(fp_line
 		(start 10.2 -3.3)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "58dcc584-9a15-4241-9493-a4884575e523")
 	)
 	(fp_line
 		(start 11.9 -3.3)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "45e2904c-f53e-4f9d-883b-7c7e816f11f0")
 	)
 	(fp_line
 		(start 13.6 -3.3)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a13a444f-edc9-4c76-baa7-2df705e62736")
 	)
 	(fp_line
 		(start 15.3 -3.3)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b89699db-e36f-42d8-8de3-030e622948fe")
 	)
 	(fp_line
 		(start 16.351 -20.8)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "281e464d-061e-4b0f-aa84-a9cda014414f")
 	)
 	(fp_line
 		(start 17 -3.3)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "25957d73-8cee-4cec-9974-066fdce8b62d")
 	)
 	(fp_line
 		(start 18.6 -18.55)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9f418b75-d9c4-4655-9ed1-53e8b8a4ff3c")
 	)
 	(fp_line
 		(start 18.6 -14)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e374d83a-5b2c-43f4-901c-27a148dc0319")
 	)
 	(fp_line
 		(start 18.6 -14)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bee1bdd9-c7e4-4c00-8615-48367d568363")
 	)
 	(fp_line
 		(start 18.6 -3.3)
@@ -465,7 +384,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5162d95c-a6cb-4bc2-af6a-06f34c03df79")
 	)
 	(fp_circle
 		(center 8.5 -18)
@@ -476,12 +394,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "dedd0ddc-8016-4259-97e9-d5f15a758950")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.5 -21.92 0)
 		(layer "F.Fab")
-		(uuid "e45f9c9b-49ad-4594-81bd-53395d9fd478")
 		(effects
 			(font
 				(size 1 1)
@@ -489,12 +405,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 8.5 -18)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "e1972653-7c8c-422f-97dc-fb52a3b0f30b")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -502,87 +417,76 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bee1cb4e-f61c-4378-8c3d-2abac915b3e5")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "86d8551e-b239-4dc3-8d48-3396b54e7c99")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "26bed814-abaf-4465-bec7-4f0091f4aec5")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6a927c30-b8df-4666-8b37-62d55721b74a")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7539b063-4801-4518-8d03-6f420ecb14f1")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 8.5 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "816bbb4e-6ffc-4ffc-9aa3-6a09baab2ab5")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 10.2 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7c293ad5-099c-4a09-a7d0-79772945d9b1")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 11.9 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6795cfe7-da15-4c69-a985-e247459ac566")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 13.6 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "75e32e8f-dc0b-4ffc-99bb-6fa80c0e37ac")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 15.3 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f11f575d-bb89-4449-861b-72a3a12f6f8e")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 17 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "838990bd-d00d-4786-998e-ed9daa953fe2")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-11_P3.4x2.54mm_StaggerEven_Lead5.84mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod
index f1e70d804..6e2f84085 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-11, Horizontal, RM 1.7mm, Multiwatt11, staggered type-1, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
-	(tags "TO-220-11 Horizontal RM 1.7mm staggered type-1 Multiwatt-11")
+	(descr "TO-220-11, Horizontal, RM 1.7mm, Multiwatt-11, staggered type-1, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
+	(tags "TO-220-11 Horizontal RM 1.7mm Multiwatt-11 staggered type-1")
 	(property "Reference" "REF**"
 		(at 8.5 -24.46 0)
 		(layer "F.SilkS")
-		(uuid "9751ca5b-aefd-408d-94d5-7c46b75597e4")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown"
 		(at 8.5 1.9 0)
 		(layer "F.Fab")
-		(uuid "d8c69c37-0055-4935-a8b2-cb6eed18559e")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "095127c3-0136-449b-84da-132cd97b10f0")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "e781e8c8-3cad-4794-a2f8-ff354b0fb15c")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0ffd01e5-52c8-44ff-8a48-1a4108fba9e3")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.72 -23.46)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6037b74c-0ca4-4bc1-841e-ec6c5f61e870")
 	)
 	(fp_line
 		(start -1.72 -23.46)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4327ed9f-27c9-4676-90ec-653e1efa0c77")
 	)
 	(fp_line
 		(start -1.72 -5.72)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "97771c9d-53ae-4866-99dd-b43b5bae9c42")
 	)
 	(fp_line
 		(start 0 -5.72)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b17702cb-59e7-41d0-a965-fe18b9e7aa26")
 	)
 	(fp_line
 		(start 1.7 -5.72)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b1fbb33d-e3a1-47e1-9535-ce0a647eb402")
 	)
 	(fp_line
 		(start 3.4 -5.72)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c8f0bad7-98fc-4489-9b9c-089f86323dae")
 	)
 	(fp_line
 		(start 5.1 -5.72)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ef7c46df-277b-415e-86e3-042b580e7e89")
 	)
 	(fp_line
 		(start 6.8 -5.72)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bcc53f68-3e96-41ce-a1db-7d963ee7a896")
 	)
 	(fp_line
 		(start 8.5 -5.72)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d8ae5b63-d9d6-43ef-8e85-134e80c13da1")
 	)
 	(fp_line
 		(start 10.2 -5.72)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3d55e167-eb38-4ae0-b47e-42dd3fbc95f9")
 	)
 	(fp_line
 		(start 11.9 -5.72)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2ae165a7-dd7c-4e09-8bb4-1254ce1f9e3e")
 	)
 	(fp_line
 		(start 13.6 -5.72)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "de7843fb-e7ff-4070-ac9d-e4e475eaca30")
 	)
 	(fp_line
 		(start 15.3 -5.72)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b37fa459-3088-44ab-b4ae-4479515cb9f5")
 	)
 	(fp_line
 		(start 17 -5.72)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fae8b76c-ad00-4082-aae4-7a19accd6105")
 	)
 	(fp_line
 		(start 18.72 -23.46)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "94fa2c70-a5f7-4e27-a718-058ca4a986e4")
 	)
 	(fp_line
 		(start -1.85 -23.59)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2b48131c-c4f0-4950-858a-f33b53652531")
 	)
 	(fp_line
 		(start -1.85 1.15)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "406e65a4-eb97-44a3-a025-a601a2f9bb07")
 	)
 	(fp_line
 		(start 18.85 -23.59)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6b8459fc-d08e-40ae-8ecc-1c8777e76d8a")
 	)
 	(fp_line
 		(start 18.85 1.15)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "21db4a6c-cf35-4c6c-aa65-1db6b5122735")
 	)
 	(fp_line
 		(start -1.6 -21.09)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d8a0acc9-c3a8-4c39-afc3-0fa0fc3c5278")
 	)
 	(fp_line
 		(start -1.6 -16.54)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "eef9196c-3126-4cb6-9481-c122fa5fe41b")
 	)
 	(fp_line
 		(start -1.6 -16.54)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d104b812-5af2-416e-95c3-ab9bcfac4cdf")
 	)
 	(fp_line
 		(start -1.6 -5.84)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e5f632e6-2f2e-4f95-be99-e10766a336d2")
 	)
 	(fp_line
 		(start 0 -5.84)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "504cca48-0bd6-4571-9910-009f81fd5869")
 	)
 	(fp_line
 		(start 0.651 -23.34)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3ae09743-35d4-409f-9bd5-92260ee29a76")
 	)
 	(fp_line
 		(start 1.7 -5.84)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "65bfc2f1-bc4c-4977-bbf2-16387d7d58b6")
 	)
 	(fp_line
 		(start 3.4 -5.84)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7f8eed5a-9895-4a96-96bf-9e5b79d303c8")
 	)
 	(fp_line
 		(start 5.1 -5.84)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "337c5f25-cdc1-48eb-9705-812634a4dc69")
 	)
 	(fp_line
 		(start 6.8 -5.84)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5259fd48-338b-40fd-a0e2-aa8657d1dac9")
 	)
 	(fp_line
 		(start 8.5 -5.84)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1438b8b0-6fdc-4140-93ba-0f454e421873")
 	)
 	(fp_line
 		(start 10.2 -5.84)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7822b9d3-09eb-4bc5-86c7-6a50acf895d8")
 	)
 	(fp_line
 		(start 11.9 -5.84)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b227d96c-a665-4ba7-ac38-45114c4d2166")
 	)
 	(fp_line
 		(start 13.6 -5.84)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "66b98be2-88f0-45bf-9699-cda646fca853")
 	)
 	(fp_line
 		(start 15.3 -5.84)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "72c6ade0-e921-485b-88f7-580e0e4a3a2f")
 	)
 	(fp_line
 		(start 16.351 -23.34)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0b526e5e-1c1a-4fb4-86ec-a38eb334a428")
 	)
 	(fp_line
 		(start 17 -5.84)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "50a95471-26be-43b8-b074-3cb70fad1782")
 	)
 	(fp_line
 		(start 18.6 -21.09)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "65ed0504-7654-46ea-9ccf-e3c88a7efb37")
 	)
 	(fp_line
 		(start 18.6 -16.54)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "86d6aeb1-4708-4a14-bafd-65bf0ba4283e")
 	)
 	(fp_line
 		(start 18.6 -16.54)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e1db8676-8b21-4b70-bf87-46eb05dda0c3")
 	)
 	(fp_line
 		(start 18.6 -5.84)
@@ -465,7 +384,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "49378180-e779-4b66-9422-4466b5e5e2ea")
 	)
 	(fp_circle
 		(center 8.5 -20.54)
@@ -476,12 +394,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "16abf41a-afb7-4e5f-a223-2c80153e21fa")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.5 -24.46 0)
 		(layer "F.Fab")
-		(uuid "4896d243-6cfa-4f48-9997-2a52e29840b7")
 		(effects
 			(font
 				(size 1 1)
@@ -489,12 +405,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 8.5 -20.54)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "4d9f5c64-49af-4c69-aa5d-ceac6ab5509a")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -502,87 +417,76 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e071ea70-1483-49d3-8578-de735bee44d3")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e16b315a-9e71-492f-aba0-1b6e88a359f6")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4122209c-21e4-4284-9fa1-4b77be614ef0")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a736e527-2308-4f84-8fa9-c4231dd180fc")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5bc4cd38-173f-4ec6-8951-7e124dc6b179")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 8.5 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c51fc02b-ab95-4299-85b2-9f6decf607bb")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 10.2 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "608e81be-34ac-408d-86c1-7628c63d0618")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 11.9 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d5779a65-00bc-4545-8e86-95978a0d6576")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 13.6 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d02537b2-900f-49ba-b5dd-6f80cdad987a")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 15.3 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e28c4bc9-27df-4a67-b11e-6bce2ffede06")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 17 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "20d4d8d2-ee7d-4ac6-a91a-88ad90efd81a")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-11_P3.4x2.54mm_StaggerOdd_Lead5.84mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod
index 2419ab7a5..8981bb83f 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-11, Vertical, RM 1.7mm, Multiwatt11, staggered type-2, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
-	(tags "TO-220-11 Vertical RM 1.7mm staggered type-2 Multiwatt-11")
+	(descr "TO-220-11, Vertical, RM 1.7mm, Multiwatt-11, staggered type-2, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
+	(tags "TO-220-11 Vertical RM 1.7mm Multiwatt-11 staggered type-2")
 	(property "Reference" "REF**"
 		(at 8.5 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "1f62cd3f-db45-44b4-8a5c-18a73abe980b")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical"
 		(at 8.5 7.23 0)
 		(layer "F.Fab")
-		(uuid "97d35e21-345f-4554-a982-058d578ba2f1")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "a16879f1-47f4-4a19-b2ca-797e181d84d8")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "76d75bfa-bb96-4d56-ba9b-3b2c06f56bbd")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "c44afaf2-a1ee-4bf7-bff0-23480095f4de")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.72 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a4ff5340-0315-4595-8ef9-ae993685d445")
 	)
 	(fp_line
 		(start -1.72 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9652b410-3cdc-46db-9ced-4083e714d268")
 	)
 	(fp_line
 		(start -1.72 -2.78)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1fa187cf-a1fd-4322-af7f-f1d6f250709a")
 	)
 	(fp_line
 		(start -1.72 0.621)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "99024fd7-a528-4c62-a185-4cf36309fa6d")
 	)
 	(fp_line
 		(start 1.05 0.621)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d3f621fe-465d-4e13-ba64-a4a09219ae6a")
 	)
 	(fp_line
 		(start 1.7 0.621)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6d4c4d85-d2ee-47d0-aa9f-5b9402400b3c")
 	)
 	(fp_line
 		(start 4.325 0.621)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f54095f6-8e8c-4d64-ad77-fa1603cabd87")
 	)
 	(fp_line
 		(start 5.1 0.621)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "624cb3fe-49f8-4295-8d7f-e878e032872b")
 	)
 	(fp_line
 		(start 6.65 -4.62)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bb01b7a7-da8a-4026-b02b-ad38c90e3b68")
 	)
 	(fp_line
 		(start 7.725 0.621)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cc817d51-e1fb-484e-aac5-02496e7e44a6")
 	)
 	(fp_line
 		(start 8.5 0.621)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4295e048-cff0-4a4c-89f2-34583d4e3d95")
 	)
 	(fp_line
 		(start 10.35 -4.62)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3c1346e9-2572-4339-af9e-12d1343b0a1a")
 	)
 	(fp_line
 		(start 11.125 0.621)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "56ddadf3-e5dc-4d06-a4e3-3a5f4769e820")
 	)
 	(fp_line
 		(start 11.9 0.621)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "beb8e8c1-117a-48e4-9690-c5ef1e766eb9")
 	)
 	(fp_line
 		(start 14.525 0.621)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3088a4e1-8b8e-4e5c-82dd-6180b36d8a4d")
 	)
 	(fp_line
 		(start 15.3 0.621)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ad033c33-fd9a-49ae-a704-3367854440d5")
 	)
 	(fp_line
 		(start 17.925 0.621)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "53bd155d-dbd6-48ea-a03d-514002d4bbbd")
 	)
 	(fp_line
 		(start 18.72 -4.62)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "dd9e3692-e2e2-443e-a0c2-b377d7fd279a")
 	)
 	(fp_line
 		(start -1.85 -4.75)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "efe7f221-e2d4-4fc2-bc73-8d0a71a70148")
 	)
 	(fp_line
 		(start -1.85 6.23)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "56643e32-cc6e-4b93-bbca-b47fb8a48959")
 	)
 	(fp_line
 		(start 18.85 -4.75)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ff20ecea-20cf-49b3-8fb0-d1f6e78fc13d")
 	)
 	(fp_line
 		(start 18.85 6.23)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "aca4d218-67bb-4096-8b58-ffdd14388cd3")
 	)
 	(fp_line
 		(start -1.6 -4.5)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "77a6ec64-fac1-4605-83b7-52a065ffbb5b")
 	)
 	(fp_line
 		(start -1.6 -2.9)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "00e33265-e05f-4008-a2de-9441f59f416f")
 	)
 	(fp_line
 		(start -1.6 0.5)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "644f5d25-d741-46a9-9269-e8247bffec62")
 	)
 	(fp_line
 		(start 1.7 0.5)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cf34ac0d-6819-4313-bfd4-1e9bea349118")
 	)
 	(fp_line
 		(start 5.1 0.5)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "25b2c9ca-0b34-4a04-a11e-a71fa69b2891")
 	)
 	(fp_line
 		(start 6.65 -4.5)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "62574560-6bbf-49bc-af41-1c542c1e8567")
 	)
 	(fp_line
 		(start 8.5 0.5)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "21e30f1d-2711-4eff-9083-b01dd1128298")
 	)
 	(fp_line
 		(start 10.35 -4.5)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e78ef5e2-1100-4f24-9145-69fb6b084af5")
 	)
 	(fp_line
 		(start 11.9 0.5)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "14e04829-559f-451f-98df-e5c76c971b24")
 	)
 	(fp_line
 		(start 15.3 0.5)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "77e47aa3-9389-42ae-8a40-41c42c74c67d")
 	)
 	(fp_line
 		(start 18.6 -4.5)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "201c5d11-5ac9-48ab-b153-7d527b56fb54")
 	)
 	(fp_line
 		(start 18.6 0.5)
@@ -405,12 +330,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "379c4c6b-957a-4a90-9a35-c3f3c34af17c")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.5 -5.62 0)
 		(layer "F.Fab")
-		(uuid "de6f08cd-bcae-4496-8de0-745e38b58f2f")
 		(effects
 			(font
 				(size 1 1)
@@ -424,87 +347,76 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "8f86c17d-7b2f-4f49-b23b-8876d4edd1a0")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "20a85d60-46b2-4865-9e05-b0c39b6f9849")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1d14fc49-3438-471e-9476-5674488c480d")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d757fd43-725f-4d58-b68b-21c8bc65f13c")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "01642ac9-436d-4306-9149-08400035a424")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 8.5 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fae730f1-f865-439c-b4dd-78010fff8eb7")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 10.2 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5eb68b8d-0f27-4b8e-a0a4-18834d935d4c")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 11.9 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6e6c88d2-a84f-465f-92b6-b49d01b9b5aa")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 13.6 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e76f559c-7efc-48a2-8458-d1021ebfb46c")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 15.3 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "39269b74-1933-4b0e-8f6a-648283b71bf5")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 17 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "03c935ef-6868-4d41-9828-acee39ca763a")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-11_P3.4x5.08mm_StaggerEven_Lead4.58mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod
index 1f3017530..358b3ec40 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-11, Vertical, RM 1.7mm, Multiwatt11, staggered type-1, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
-	(tags "TO-220-11 Vertical RM 1.7mm staggered type-1 Multiwatt-11")
+	(descr "TO-220-11, Vertical, RM 1.7mm, Multiwatt-11, staggered type-1, see http://www.st.com/resource/en/datasheet/tda7391lv.pdf")
+	(tags "TO-220-11 Vertical RM 1.7mm Multiwatt-11 staggered type-1")
 	(property "Reference" "REF**"
 		(at 8.5 -10.7 0)
 		(layer "F.SilkS")
-		(uuid "1f7dc64e-c5ab-4100-9b8f-147f78c8338e")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical"
 		(at 8.5 2.15 0)
 		(layer "F.Fab")
-		(uuid "ec47459a-823d-4ab2-8157-e15395cd63db")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "29e1bf4c-b9c2-46d9-8370-4092bd3d6f17")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "6044db9c-4a08-4692-aef0-bf2d2a6fefae")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "997a23ab-457c-4e37-91f6-55c035c32181")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.72 -9.7)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8f24a976-b426-4622-ae1a-e7fc80efab6b")
 	)
 	(fp_line
 		(start -1.72 -9.7)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fbee8fad-fb79-4d15-995b-918a23f832eb")
 	)
 	(fp_line
 		(start -1.72 -7.86)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e1d9d802-055c-49ed-bda5-e7ec7891c580")
 	)
 	(fp_line
 		(start -1.72 -4.459)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a0b00077-8504-40af-989d-39b7c6896b06")
 	)
 	(fp_line
 		(start 0 -4.459)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4916aa31-5fc7-4986-9258-2e351059a0c1")
 	)
 	(fp_line
 		(start 2.625 -4.459)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b4ecc541-4d8d-4403-a8c7-69598ab64f10")
 	)
 	(fp_line
 		(start 3.4 -4.459)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e53fd323-18a5-45eb-8074-32eb83fb6d6b")
 	)
 	(fp_line
 		(start 6.025 -4.459)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fa706fc4-7bd7-4fd9-98b1-2c8216a5b103")
 	)
 	(fp_line
 		(start 6.65 -9.7)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "abe04096-ba8f-4f5f-9ee7-8a04570e1dad")
 	)
 	(fp_line
 		(start 6.8 -4.459)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "574e1877-2169-4fce-be00-9b4dba56ce6e")
 	)
 	(fp_line
 		(start 9.425 -4.459)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0e5ce84d-b72b-4cea-a954-c016f86445f9")
 	)
 	(fp_line
 		(start 10.2 -4.459)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "272862bb-493b-415c-9ca8-dd5fd36bf3d4")
 	)
 	(fp_line
 		(start 10.35 -9.7)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1216fe6f-d917-4474-8afd-d6a5f63ee213")
 	)
 	(fp_line
 		(start 12.825 -4.459)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ba04d17c-78c8-4638-afa6-7341bbaeef9d")
 	)
 	(fp_line
 		(start 13.6 -4.459)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "508e306e-74dc-4a57-9b4f-e74fcefa6213")
 	)
 	(fp_line
 		(start 16.225 -4.459)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4e6e299c-db5e-4bec-990d-337ee4cb3062")
 	)
 	(fp_line
 		(start 17 -4.459)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2008babe-8494-4c30-8ac1-67affb6e73e1")
 	)
 	(fp_line
 		(start 18.72 -9.7)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cafd9dc0-b3d3-49d4-a619-1c5328971504")
 	)
 	(fp_line
 		(start -1.85 -9.83)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6255503e-dce0-4264-8823-c00ed287dc68")
 	)
 	(fp_line
 		(start -1.85 1.16)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "617182d5-fabe-4093-a94e-945fa9673e73")
 	)
 	(fp_line
 		(start 18.85 -9.83)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e72d4a82-1602-4944-9d0b-220fa8f4a158")
 	)
 	(fp_line
 		(start 18.85 1.16)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "212ef5e2-85b1-468f-b4ba-6d1c2e00e45a")
 	)
 	(fp_line
 		(start -1.6 -9.58)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "41281489-267c-4dd8-9bde-29d47077fc9e")
 	)
 	(fp_line
 		(start -1.6 -7.98)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "096232f7-830a-4070-aa16-228b4e6934ba")
 	)
 	(fp_line
 		(start -1.6 -4.58)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a1cd61a8-b71d-4cf7-a8e1-1ad4ebbe8b94")
 	)
 	(fp_line
 		(start 0 -4.58)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "32d21453-cb3c-463f-bd14-f5555a7410f6")
 	)
 	(fp_line
 		(start 3.4 -4.58)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a259a651-4839-4a90-8fb3-f613661d3514")
 	)
 	(fp_line
 		(start 6.65 -9.58)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "eb5094e0-3ffb-4687-9c2a-c6c737f9f9c8")
 	)
 	(fp_line
 		(start 6.8 -4.58)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7fcbf8e3-09b8-4685-a86d-8785ca784439")
 	)
 	(fp_line
 		(start 10.2 -4.58)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f6e2f58d-734e-4955-8043-23bba138ca48")
 	)
 	(fp_line
 		(start 10.35 -9.58)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4144d64e-3dbe-4c5e-a400-1a6c34872973")
 	)
 	(fp_line
 		(start 13.6 -4.58)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6e772d84-6115-4d71-805e-3aafc494524f")
 	)
 	(fp_line
 		(start 17 -4.58)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a3ac5575-5bdb-4c23-9b06-bdd80ed46fd2")
 	)
 	(fp_line
 		(start 18.6 -9.58)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f53cd8b2-37fd-402d-88a4-d929f2190b47")
 	)
 	(fp_line
 		(start 18.6 -4.58)
@@ -415,12 +339,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b0990912-52e0-4242-b942-a2dd8c582583")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.5 -10.7 0)
 		(layer "F.Fab")
-		(uuid "3b2ea618-0e6b-48c3-95ea-ac4365c0ba9a")
 		(effects
 			(font
 				(size 1 1)
@@ -434,87 +356,76 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "8089e0ac-938e-4bcc-946c-23df414e4f0d")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bfee61c1-4331-42bf-bd05-077cd9a7748d")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "434c88e6-7a2c-4cd6-9c64-636e1047be2e")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ccb21ef5-a3fe-4e13-8638-5e13e604eab6")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c402dc6b-32bb-41b4-9037-04db5ad7d5ca")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 8.5 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9f5be4b1-420c-4c81-8546-5fdb6721c23c")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 10.2 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "94a1a9f9-6910-4206-b098-06acdb9ce764")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 11.9 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9da598f5-a497-4bcb-8ebe-33f88b469fac")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 13.6 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "86227213-5f85-4157-870f-1156c4501a01")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 15.3 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ac997d3f-97b2-4556-9525-0fb6ec844813")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 17 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4e793989-35d5-41be-a4a6-a634b4e613d9")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-11_P3.4x5.08mm_StaggerOdd_Lead4.58mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod
index bd1f79d0c..916ebd199 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-15, Horizontal, RM 1.27mm, Multiwatt15, staggered type-2, see http://www.st.com/resource/en/datasheet/l298.pdf")
-	(tags "TO-220-15 Horizontal RM 1.27mm staggered type-2 Multiwatt-15")
+	(descr "TO-220-15, Horizontal, RM 1.27mm, Multiwatt-15, staggered type-2, see http://www.st.com/resource/en/datasheet/l298.pdf")
+	(tags "TO-220-15 Horizontal RM 1.27mm Multiwatt-15 staggered type-2")
 	(property "Reference" "REF**"
 		(at 8.89 -21.92 0)
 		(layer "F.SilkS")
-		(uuid "ba21331d-3568-4f45-9dff-07e769cd6335")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown"
 		(at 8.89 4.44 0)
 		(layer "F.Fab")
-		(uuid "5ecf866e-484e-4ca8-b141-b1c26570904b")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "37b385bd-2d08-4502-90ae-5394709539b5")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "7a3d0505-f5c2-4c7b-a387-075156e80cab")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "e88918eb-35ac-40d7-ac72-f7779130d451")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.33 -20.92)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7bbcdb0a-c5ca-4283-952f-aee43d50215b")
 	)
 	(fp_line
 		(start -1.33 -20.92)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fd1072bc-deec-4076-b520-c5b57839a754")
 	)
 	(fp_line
 		(start -1.33 -3.18)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7c7df3fd-9df2-46a7-b2ea-2a9693299734")
 	)
 	(fp_line
 		(start 0 -3.18)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "05c9e9d5-0f38-4e81-a38d-718c93f065a2")
 	)
 	(fp_line
 		(start 1.27 -3.18)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "090a313f-7c07-48b0-8a12-95699c8efc45")
 	)
 	(fp_line
 		(start 2.54 -3.18)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "632388e2-b900-482b-84ba-89b0371c1e3e")
 	)
 	(fp_line
 		(start 3.81 -3.18)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b2dc9b0f-c1f6-4dac-a16b-1dc46214b1cf")
 	)
 	(fp_line
 		(start 5.08 -3.18)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "492ab54c-d3af-4bf9-a5a1-a4498a87bada")
 	)
 	(fp_line
 		(start 6.35 -3.18)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "424f6dd3-d51b-415d-a0b9-ca8dc4692958")
 	)
 	(fp_line
 		(start 7.62 -3.18)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a5e446c7-6d6c-402a-9663-a94d4cf2fa77")
 	)
 	(fp_line
 		(start 8.89 -3.18)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a8eac0b9-adba-4dcb-bef2-b60076ecb5ba")
 	)
 	(fp_line
 		(start 10.16 -3.18)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "37c0863b-77b4-4335-bfea-2b1859c27f2a")
 	)
 	(fp_line
 		(start 11.43 -3.18)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5f7d9fdc-89d7-464f-8eab-750502a690d7")
 	)
 	(fp_line
 		(start 12.7 -3.18)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cd0028e4-7eb7-4a13-a06b-55d27532a236")
 	)
 	(fp_line
 		(start 13.97 -3.18)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6793ed46-8505-4c8e-8617-dea869550519")
 	)
 	(fp_line
 		(start 15.24 -3.18)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a8584443-e2b8-4b92-93d0-9bbefc4be3fc")
 	)
 	(fp_line
 		(start 16.51 -3.18)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "703a0b6c-c0fa-4cad-a32c-b24a388f32a2")
 	)
 	(fp_line
 		(start 17.78 -3.18)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d92a9b52-88dc-439e-9a88-21e34ae9d115")
 	)
 	(fp_line
 		(start 19.11 -20.92)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9069c0c4-952a-4cdd-ad9d-6965eb45a135")
 	)
 	(fp_line
 		(start -1.46 -21.05)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "528eb979-5ce8-4c57-a8e0-b194f10a81d8")
 	)
 	(fp_line
 		(start -1.46 3.69)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "25dbfa18-ee71-4ff4-936d-b17b9232317e")
 	)
 	(fp_line
 		(start 19.25 -21.05)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "3753a289-74dd-4c78-9ebf-b83055707626")
 	)
 	(fp_line
 		(start 19.25 3.69)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "d8c3a97c-082b-40c2-b11c-d1f23e5b3a06")
 	)
 	(fp_line
 		(start -1.21 -18.55)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1acda967-5822-4a08-83dc-eebdc14cccfd")
 	)
 	(fp_line
 		(start -1.21 -14)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d80327e9-f95f-4c8f-b1c5-0e665d869f8b")
 	)
 	(fp_line
 		(start -1.21 -14)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fde7fd51-680c-4639-85c6-3a67a763f3e3")
 	)
 	(fp_line
 		(start -1.21 -3.3)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1f801ef2-8447-4d25-bcc3-e56ecc921685")
 	)
 	(fp_line
 		(start 0 -3.3)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c3168adb-a5e4-45b4-8ee5-c5c273a81323")
 	)
 	(fp_line
 		(start 1.041 -20.8)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "113e0e96-7c70-4b9e-9aac-7c9da8f3ccc6")
 	)
 	(fp_line
 		(start 1.27 -3.3)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2e0ce78a-c432-4b7f-a0cb-1413be4cf8e2")
 	)
 	(fp_line
 		(start 2.54 -3.3)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3c02670b-3dae-4a7d-ad92-45c3354757a6")
 	)
 	(fp_line
 		(start 3.81 -3.3)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b2ff2018-a8b7-4f0e-a0d5-917c19ddcf85")
 	)
 	(fp_line
 		(start 5.08 -3.3)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "210ffabe-1233-4182-aeb2-7c809e90f7c1")
 	)
 	(fp_line
 		(start 6.35 -3.3)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "03bac69b-2550-49e0-bda2-2e7d3da920de")
 	)
 	(fp_line
 		(start 7.62 -3.3)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "355a38f5-d575-4062-a20d-42e384af0dc8")
 	)
 	(fp_line
 		(start 8.89 -3.3)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b928049f-bff0-446f-a101-5cd3647d3e1f")
 	)
 	(fp_line
 		(start 10.16 -3.3)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7e02a15a-a99c-40cc-b384-070b3965e135")
 	)
 	(fp_line
 		(start 11.43 -3.3)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "06469b4b-31ee-41eb-bb70-58187df6d0cc")
 	)
 	(fp_line
 		(start 12.7 -3.3)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "905a12c3-aa4f-4fa3-a4fe-c7b1b202410a")
 	)
 	(fp_line
 		(start 13.97 -3.3)
@@ -465,7 +384,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "48f48469-9374-4706-926b-e1a95726673b")
 	)
 	(fp_line
 		(start 15.24 -3.3)
@@ -475,7 +393,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ccc94c5c-12f6-4f74-a501-e72e2368d577")
 	)
 	(fp_line
 		(start 16.51 -3.3)
@@ -485,7 +402,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "313761c9-52fa-4733-9a07-7c3b4d83de69")
 	)
 	(fp_line
 		(start 16.74 -20.8)
@@ -495,7 +411,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3ad6e61f-7a0d-4b45-9c21-2109461de5b5")
 	)
 	(fp_line
 		(start 17.78 -3.3)
@@ -505,7 +420,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "35dd9a0c-c10f-4667-a5ed-290aa20a141b")
 	)
 	(fp_line
 		(start 18.99 -18.55)
@@ -515,7 +429,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f9a88c6f-618f-41c7-97bc-a084dc96e1db")
 	)
 	(fp_line
 		(start 18.99 -14)
@@ -525,7 +438,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6dcda773-51b4-47d2-b9f8-8bfbc63aa7b4")
 	)
 	(fp_line
 		(start 18.99 -14)
@@ -535,7 +447,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6cfc549c-1949-481d-b921-e9a4517c8ed4")
 	)
 	(fp_line
 		(start 18.99 -3.3)
@@ -545,7 +456,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c28a5154-a7b7-4ad5-8cd2-5c5ec34c79e9")
 	)
 	(fp_circle
 		(center 8.89 -18)
@@ -556,12 +466,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "09486882-d907-4ae0-aa07-b45cb35d9237")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 -21.92 0)
 		(layer "F.Fab")
-		(uuid "b524abcd-7bbe-48a1-a222-2d1ab320cbdf")
 		(effects
 			(font
 				(size 1 1)
@@ -569,12 +477,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 8.89 -18)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "8484f06f-57df-44db-8dae-0488a1469cd4")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -582,119 +489,104 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5d69cdfe-ed29-4618-aa76-05ca7fa0d6a9")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a9c4f573-e672-4338-b1b2-a8f66dc0e9aa")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "32ad1eea-2b74-4512-b15f-763ec3795cbd")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "37183d55-edd4-4368-a12f-c6cef0632581")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "13d91946-ddd7-4e17-b1f3-2d38e50d5a4a")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d362e707-cc24-4099-8f0b-63c4e3ffc9cc")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "885f6fc5-916b-44f7-9796-063e3230b5bc")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 8.89 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "84c4fcdd-0e85-4e2f-8e50-1168d7923f78")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 10.16 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e331fa2e-3605-48c5-b3df-38928e06a047")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 11.43 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "80da764b-7c73-4dc9-91c7-ad2e990acc81")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 12.7 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a47607f2-9fce-4952-8186-2ef3f26d93c7")
 	)
-	(pad "12" thru_hole oval
+	(pad "12" thru_hole circle
 		(at 13.97 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "528be579-29b6-425c-8878-2925e1672255")
 	)
-	(pad "13" thru_hole oval
+	(pad "13" thru_hole circle
 		(at 15.24 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "61f1fe0f-babb-4828-a04b-8d40ebe601a4")
 	)
-	(pad "14" thru_hole oval
+	(pad "14" thru_hole circle
 		(at 16.51 2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6d6e12fc-3877-47de-bdb8-e43fb4c775f3")
 	)
-	(pad "15" thru_hole oval
+	(pad "15" thru_hole circle
 		(at 17.78 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6b92d98e-a384-4e78-bfa1-5f42ac9ddca3")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-15_P2.54x2.54mm_StaggerEven_Lead5.84mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod
index 1e432412a..d32b447d7 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-15, Horizontal, RM 1.27mm, Multiwatt15, staggered type-1, see http://www.st.com/resource/en/datasheet/l298.pdf")
-	(tags "TO-220-15 Horizontal RM 1.27mm staggered type-1 Multiwatt-15")
+	(descr "TO-220-15, Horizontal, RM 1.27mm, Multiwatt-15, staggered type-1, see http://www.st.com/resource/en/datasheet/l298.pdf")
+	(tags "TO-220-15 Horizontal RM 1.27mm Multiwatt-15 staggered type-1")
 	(property "Reference" "REF**"
 		(at 8.89 -24.46 0)
 		(layer "F.SilkS")
-		(uuid "08929a56-ca11-4693-8063-3b3b15790aa5")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown"
 		(at 8.89 1.9 0)
 		(layer "F.Fab")
-		(uuid "c94f8d1e-1802-4e8f-9515-c24f4d150862")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "b1202afa-f696-4a71-b14f-578b2126fdcf")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "a5825260-963f-4cd4-8a29-f1d457305f46")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "be79b212-6de7-4340-9566-4e59525f7ec1")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.33 -23.46)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4cdc04cf-b985-4ab5-a7b6-cb13332fc443")
 	)
 	(fp_line
 		(start -1.33 -23.46)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f2ee43e2-1cea-44c8-8649-b764a6d6efa7")
 	)
 	(fp_line
 		(start -1.33 -5.72)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0a4fa52d-be40-46a8-9e6c-85579d5b8f79")
 	)
 	(fp_line
 		(start 0 -5.72)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1471ec1f-52f3-4d26-9504-ab028fcd7249")
 	)
 	(fp_line
 		(start 1.27 -5.72)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "691f2908-b4b1-4de5-be3b-5586e34b8464")
 	)
 	(fp_line
 		(start 2.54 -5.72)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1f4fa37b-8fe9-43ea-895b-1e5dfe9c224c")
 	)
 	(fp_line
 		(start 3.81 -5.72)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "30faa13d-2f16-4b7e-9af5-f07ab9d26e7b")
 	)
 	(fp_line
 		(start 5.08 -5.72)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "04c45d4b-33fe-487a-839d-9b8ab778ff4f")
 	)
 	(fp_line
 		(start 6.35 -5.72)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "956373d3-0291-49c7-b004-b8dcd4fc21d7")
 	)
 	(fp_line
 		(start 7.62 -5.72)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "18e27ee2-abc1-4bbf-a783-c59445e36df3")
 	)
 	(fp_line
 		(start 8.89 -5.72)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a296766e-9370-4bee-87b1-27b8f4458317")
 	)
 	(fp_line
 		(start 10.16 -5.72)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d3310829-a01e-4b2c-b45e-a475992ae16b")
 	)
 	(fp_line
 		(start 11.43 -5.72)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e5181cfa-4229-4b23-818e-cc8ec8f9d479")
 	)
 	(fp_line
 		(start 12.7 -5.72)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4978e550-a5bd-413c-b0ef-4ad16c3218b4")
 	)
 	(fp_line
 		(start 13.97 -5.72)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7d33e1ba-219e-4310-a9ee-98a5b74e50d7")
 	)
 	(fp_line
 		(start 15.24 -5.72)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3115795f-e91c-44c5-831b-c943fa4df1ea")
 	)
 	(fp_line
 		(start 16.51 -5.72)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "82e6d917-419e-4ee4-a399-fd96dfa5ccb6")
 	)
 	(fp_line
 		(start 17.78 -5.72)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2f0a7aaa-d063-4171-9fbc-691aa80a8f20")
 	)
 	(fp_line
 		(start 19.11 -23.46)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c61cb57e-90eb-4e94-8462-c09854262f4f")
 	)
 	(fp_line
 		(start -1.46 -23.59)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "71f41b10-0ccb-47b3-8602-8548a54d75df")
 	)
 	(fp_line
 		(start -1.46 1.15)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "80e43a15-02a6-470c-828e-4ccaf9299ca7")
 	)
 	(fp_line
 		(start 19.25 -23.59)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "9cf7b1c6-6640-4bc8-ba71-a8c7a7811f8c")
 	)
 	(fp_line
 		(start 19.25 1.15)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ac0fcc23-638a-4131-a882-4c35d80c0700")
 	)
 	(fp_line
 		(start -1.21 -21.09)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9c30c94a-0707-44d3-99b8-8e1852ec82b4")
 	)
 	(fp_line
 		(start -1.21 -16.54)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9f8e98f5-7af5-4062-822c-e29ffdaf7f1a")
 	)
 	(fp_line
 		(start -1.21 -16.54)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "33f84a45-aec0-4cc7-acda-76ef3a9fed8c")
 	)
 	(fp_line
 		(start -1.21 -5.84)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1e05e06e-c7a1-4cba-8665-c235044dff8a")
 	)
 	(fp_line
 		(start 0 -5.84)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d2abbdd0-c06a-4b05-9786-c784d86899c6")
 	)
 	(fp_line
 		(start 1.041 -23.34)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "12b22767-aa58-499d-8113-4606c05e1b2e")
 	)
 	(fp_line
 		(start 1.27 -5.84)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6a79a8e1-b3aa-4c03-96f6-8f5f1c613202")
 	)
 	(fp_line
 		(start 2.54 -5.84)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "07bc7bf5-deea-484e-898e-beef666c47fa")
 	)
 	(fp_line
 		(start 3.81 -5.84)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a739f135-e156-437b-9a5e-0e66cfb8ba87")
 	)
 	(fp_line
 		(start 5.08 -5.84)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "00f66e0c-6fb2-419b-bf3c-31394d7e53c4")
 	)
 	(fp_line
 		(start 6.35 -5.84)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "93d31651-d193-4b3c-926b-b56fc0255df7")
 	)
 	(fp_line
 		(start 7.62 -5.84)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2335bafa-c960-4565-88fa-cbac3c473a32")
 	)
 	(fp_line
 		(start 8.89 -5.84)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "56273c98-1e6c-4fc6-81dd-4cc86c7b62eb")
 	)
 	(fp_line
 		(start 10.16 -5.84)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f815c1b3-c81e-4a17-b003-a083c133068a")
 	)
 	(fp_line
 		(start 11.43 -5.84)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "816f8952-743f-4338-8c24-1faa80cdf81e")
 	)
 	(fp_line
 		(start 12.7 -5.84)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "37d906be-a12b-4064-a8fc-061743b9a909")
 	)
 	(fp_line
 		(start 13.97 -5.84)
@@ -465,7 +384,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5b5f1e94-6a3a-4d0b-8e74-1fde403ea04d")
 	)
 	(fp_line
 		(start 15.24 -5.84)
@@ -475,7 +393,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "624549c9-7712-4de9-81ed-cc286e19024c")
 	)
 	(fp_line
 		(start 16.51 -5.84)
@@ -485,7 +402,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e559644d-d715-40a9-9850-c67e5eea40e0")
 	)
 	(fp_line
 		(start 16.74 -23.34)
@@ -495,7 +411,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "663693bd-6822-48e9-a8de-d8d73074a779")
 	)
 	(fp_line
 		(start 17.78 -5.84)
@@ -505,7 +420,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "33446317-a8c9-4b3d-b0f6-a8b559e7c93e")
 	)
 	(fp_line
 		(start 18.99 -21.09)
@@ -515,7 +429,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e76350ee-7c98-4627-840c-ecf2a28fd7a8")
 	)
 	(fp_line
 		(start 18.99 -16.54)
@@ -525,7 +438,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b62cca61-75bd-4b41-b3d4-73b648934ead")
 	)
 	(fp_line
 		(start 18.99 -16.54)
@@ -535,7 +447,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f4f4df15-82e7-4b90-95da-cc3e778b7f36")
 	)
 	(fp_line
 		(start 18.99 -5.84)
@@ -545,7 +456,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ad44a39d-bd4c-44ac-a6ff-b0c1c58a112e")
 	)
 	(fp_circle
 		(center 8.89 -20.54)
@@ -556,12 +466,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "4027fcb0-a45b-4d48-a6b9-528a8ad51384")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 -24.46 0)
 		(layer "F.Fab")
-		(uuid "7a17b6bd-7247-4cf8-90d3-0a73811dced1")
 		(effects
 			(font
 				(size 1 1)
@@ -569,12 +477,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 8.89 -20.54)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "c28f456e-9870-44e0-906f-48f50fa1e496")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -582,119 +489,104 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "003b514e-649b-486a-9370-58b3d66ac8f1")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c4861a35-9a4e-4c13-a51d-90dcba4f0957")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a2b125bf-6aae-415c-a076-0e8220e08148")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d7a7d435-b5ac-4cd1-8af3-47d50026edb0")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fe01e7b9-c9fc-4bba-91db-017914067208")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b69dfdd6-6b3d-4a20-88fc-25949aed1382")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b53c0656-a1de-481f-95bb-bbc0f6e8eeb1")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 8.89 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b948a4fe-8a4f-4809-bb7b-71a21f944fca")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 10.16 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "60171c01-f08e-4b94-8bae-956f0fc870d7")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 11.43 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "87df93df-b6cb-4afa-8e05-c46ad79a4a6b")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 12.7 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "82c4fb8e-c92e-4f12-8204-c458d8d3c6db")
 	)
-	(pad "12" thru_hole oval
+	(pad "12" thru_hole circle
 		(at 13.97 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "24fd6425-0caa-4652-8712-32e4dc57a6af")
 	)
-	(pad "13" thru_hole oval
+	(pad "13" thru_hole circle
 		(at 15.24 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b442ea83-c842-4a92-9fb5-bc2d7238217d")
 	)
-	(pad "14" thru_hole oval
+	(pad "14" thru_hole circle
 		(at 16.51 -2.54)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "02ff5401-f54e-47e8-9e03-5bbe8526b4f9")
 	)
-	(pad "15" thru_hole oval
+	(pad "15" thru_hole circle
 		(at 17.78 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "701c7d28-3109-4260-bfc9-b4a021e8c1b8")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-15_P2.54x2.54mm_StaggerOdd_Lead5.84mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod
index 050b3693a..14c742225 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-15, Vertical, RM 1.27mm, Multiwatt15, staggered type-2, see http://www.st.com/resource/en/datasheet/l298.pdf")
-	(tags "TO-220-15 Vertical RM 1.27mm staggered type-2 Multiwatt-15")
+	(descr "TO-220-15, Vertical, RM 1.27mm, Multiwatt-15, staggered type-2, see http://www.st.com/resource/en/datasheet/l298.pdf")
+	(tags "TO-220-15 Vertical RM 1.27mm Multiwatt-15 staggered type-2")
 	(property "Reference" "REF**"
 		(at 8.89 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "75de8a98-109e-4752-9715-31cf99ee98bf")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical"
 		(at 8.89 7.23 0)
 		(layer "F.Fab")
-		(uuid "a933c117-1ad0-4e39-ac04-298934a73096")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "1fcd6fa9-4ee0-4be8-9381-e1ed66f55519")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4d6a6931-710a-49d1-b0cc-17a643526203")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "b535b2d6-b1b5-40aa-a4a7-b6b655935115")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.33 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b2d1d8b1-818d-4472-95c2-6d75f56dfee0")
 	)
 	(fp_line
 		(start -1.33 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0a28f002-58b9-4a68-bce7-dea315f48a83")
 	)
 	(fp_line
 		(start -1.33 -2.78)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "036c60d9-20e2-4e44-81b1-83053a4e1ef5")
 	)
 	(fp_line
 		(start -1.33 0.621)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e90b68c6-3c9e-4a8c-89c1-748a86190454")
 	)
 	(fp_line
 		(start 1.05 0.621)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "75c6e89b-e1d6-439b-b325-41e01bb057db")
 	)
 	(fp_line
 		(start 1.27 0.621)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "852e0643-d480-4d66-8d46-da352f2ef831")
 	)
 	(fp_line
 		(start 3.465 0.621)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "211910fe-1c98-46a9-bbcf-7ffb588cc53b")
 	)
 	(fp_line
 		(start 3.81 0.621)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "639f37f7-de74-4c07-bc6a-22843d9bf149")
 	)
 	(fp_line
 		(start 6.005 0.621)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cb6fcb4b-1b68-4d1b-a1b9-ece46afd644b")
 	)
 	(fp_line
 		(start 6.35 0.621)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "010e4675-3bd6-424b-a276-c5f15a8763a0")
 	)
 	(fp_line
 		(start 7.041 -4.62)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "85fcd928-8690-4171-b9c5-b733da1f7cde")
 	)
 	(fp_line
 		(start 8.545 0.621)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f1f66cd5-ccd4-415a-886d-ad0366653d30")
 	)
 	(fp_line
 		(start 8.89 0.621)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "387f1f02-e0e0-4a2e-b719-d70a31b68ab0")
 	)
 	(fp_line
 		(start 10.74 -4.62)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3c7ce3c1-ff09-4556-81a9-346f1f140d95")
 	)
 	(fp_line
 		(start 11.085 0.621)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "55ec5729-9b88-4722-91db-a0968bb0ecd0")
 	)
 	(fp_line
 		(start 11.43 0.621)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d3cb3112-3d1a-4620-b318-bf69f9b949ea")
 	)
 	(fp_line
 		(start 13.625 0.621)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9a72efe3-b2f5-4345-8730-1c287ef1663b")
 	)
 	(fp_line
 		(start 13.97 0.621)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fef8b96b-38da-4b7f-b3fa-a21180af78d1")
 	)
 	(fp_line
 		(start 16.165 0.621)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5d600a80-10b2-4135-bff2-bdeee88ff3b5")
 	)
 	(fp_line
 		(start 16.51 0.621)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "79601c98-407c-438a-b330-548277ed1485")
 	)
 	(fp_line
 		(start 18.705 0.621)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fafa8de7-6829-42d5-8349-80cccb8134fa")
 	)
 	(fp_line
 		(start 19.11 -4.62)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "21a69eb7-9fd7-4357-a1b7-6632fbfe9077")
 	)
 	(fp_line
 		(start -1.46 -4.75)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e4a4b52e-cba9-410e-915e-5c3b16477656")
 	)
 	(fp_line
 		(start -1.46 6.23)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2888e643-e654-47e0-a377-3047ff9ebdf6")
 	)
 	(fp_line
 		(start 19.25 -4.75)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "3ae8245e-736f-4da8-a485-b6332b7d3672")
 	)
 	(fp_line
 		(start 19.25 6.23)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "577d1c9c-7377-4764-890a-3ce6415bd79e")
 	)
 	(fp_line
 		(start -1.21 -4.5)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a73a4921-10ec-4758-95e8-8b3bc014b965")
 	)
 	(fp_line
 		(start -1.21 -2.9)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5fcb08b9-badb-41f3-9e50-144dc035c41e")
 	)
 	(fp_line
 		(start -1.21 0.5)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "293a3a12-124d-449d-9222-3e68bf6afc62")
 	)
 	(fp_line
 		(start 1.27 0.5)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "07792ea7-740d-4b70-a1b3-e7dac8fd88b1")
 	)
 	(fp_line
 		(start 3.81 0.5)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "463b8d1c-a28d-46f7-9078-701d1e28c3f8")
 	)
 	(fp_line
 		(start 6.35 0.5)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "64440f07-b960-4e77-949b-6cb612a65e2a")
 	)
 	(fp_line
 		(start 7.04 -4.5)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "53996754-9a07-457a-9b91-10e95ae19a97")
 	)
 	(fp_line
 		(start 8.89 0.5)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "18d4a7b1-0c18-4081-8306-2bb63ee8be4c")
 	)
 	(fp_line
 		(start 10.74 -4.5)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e67f4b22-f59d-4525-bacc-2c38e1b85b5b")
 	)
 	(fp_line
 		(start 11.43 0.5)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "473a6cee-bebe-4ce5-9a62-f4ee7474cfb6")
 	)
 	(fp_line
 		(start 13.97 0.5)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "33baf536-3d57-49ac-971c-131d45a57933")
 	)
 	(fp_line
 		(start 16.51 0.5)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c55fca7d-d99f-4217-aeba-a81ecac48086")
 	)
 	(fp_line
 		(start 18.99 -4.5)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "27badc6c-7a45-4234-be1d-2606f0825d1f")
 	)
 	(fp_line
 		(start 18.99 0.5)
@@ -465,12 +384,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c271eab4-24f0-4fbe-9c8c-9fe893048c31")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 -5.62 0)
 		(layer "F.Fab")
-		(uuid "ba5a6815-9cdd-4eb2-b3d2-66389a6adab3")
 		(effects
 			(font
 				(size 1 1)
@@ -484,119 +401,104 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "dabc937a-8d88-40e0-b960-a5fe526c69df")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "cdcdb250-87c2-49e3-a6ee-1b56f8ccb004")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7f206206-7248-4d12-a0bd-5ed2f585ce0a")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "be53bb1c-111f-4170-8e62-6d9b1fdfe68e")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5aa9a153-b05b-4957-9207-6e3d879de37b")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6b7c04fd-2967-4334-89cc-8f0fee916dfc")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "3c5132ca-e507-485c-a96e-d143ab2ba10b")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 8.89 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a71e03a1-5599-4ed0-9bbd-69f6aeaa827e")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 10.16 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0ab24f60-200e-4859-ab91-b2a0695505bb")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 11.43 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fc537cae-a41a-4fea-ac93-8421e426ce1c")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 12.7 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4cc7e7aa-f60b-4588-a064-51e6e0f74fc0")
 	)
-	(pad "12" thru_hole oval
+	(pad "12" thru_hole circle
 		(at 13.97 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a49a4867-12e6-42c9-8fa0-f12c4b985785")
 	)
-	(pad "13" thru_hole oval
+	(pad "13" thru_hole circle
 		(at 15.24 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ff33a1fe-fe43-4355-bfbe-701bc903e97b")
 	)
-	(pad "14" thru_hole oval
+	(pad "14" thru_hole circle
 		(at 16.51 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9894c930-d91d-4df3-8275-ac8c33e2ad4e")
 	)
-	(pad "15" thru_hole oval
+	(pad "15" thru_hole circle
 		(at 17.78 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "de09d1ca-085e-4357-9e5e-c4d55ff6585b")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-15_P2.54x5.08mm_StaggerEven_Lead4.58mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod
index 0adced7e7..d27c5bd32 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
-	(descr "TO-220-15, Vertical, RM 1.27mm, staggered type-1, Multiwatt15, see http://www.st.com/resource/en/datasheet/l298.pdf")
-	(tags "TO-220-15 Vertical RM 1.27mm staggered type-1 Multiwatt-15")
+	(descr "TO-220-15, Vertical, RM 1.27mm, Multiwatt-15, staggered type-1, see http://www.st.com/resource/en/datasheet/l298.pdf")
+	(tags "TO-220-15 Vertical RM 1.27mm Multiwatt-15 staggered type-1")
 	(property "Reference" "REF**"
 		(at 8.89 -10.7 0)
 		(layer "F.SilkS")
-		(uuid "180f97ee-7e70-469e-9149-4a9226b8b9d2")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical"
 		(at 8.89 2.15 0)
 		(layer "F.Fab")
-		(uuid "4ee6b148-125c-4480-95f7-29a6e30040a2")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4136f4bb-2e8c-47c9-acd8-a616eea2530e")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "c11d7f0c-5d4f-4862-b17f-a26e23f9cd78")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "61e3a48e-fb99-4094-99bd-b78d398516e6")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.33 -9.7)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ac120a1b-346c-46c3-bf4c-02e84d939639")
 	)
 	(fp_line
 		(start -1.33 -9.7)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0644ce49-ca26-4b46-858e-0e288659c629")
 	)
 	(fp_line
 		(start -1.33 -7.86)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a8731436-e4f1-4413-bc7b-04c6898837d7")
 	)
 	(fp_line
 		(start -1.33 -4.459)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c4b80483-1842-4a57-837d-d780dea3f7b4")
 	)
 	(fp_line
 		(start 0 -4.459)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "df466324-7111-4b85-9e49-13cc792a4ce9")
 	)
 	(fp_line
 		(start 2.195 -4.459)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f0af4d9d-d9bf-4907-8173-c7662be582a6")
 	)
 	(fp_line
 		(start 2.54 -4.459)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "89a413a0-250c-4b05-bd80-ce92202256a0")
 	)
 	(fp_line
 		(start 4.735 -4.459)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "103c02b2-1449-4d45-8226-2aafcfbec7e2")
 	)
 	(fp_line
 		(start 5.08 -4.459)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "473af9cc-eb9e-4cd0-9ee4-040dc6e658a8")
 	)
 	(fp_line
 		(start 7.041 -9.7)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cbf9a5da-562f-4ad1-abd1-481f575740da")
 	)
 	(fp_line
 		(start 7.275 -4.459)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5c1fbb15-104f-4d68-817d-fc480a1d82a4")
 	)
 	(fp_line
 		(start 7.62 -4.459)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7f889153-f9ae-4903-97a7-9f75d8d3daee")
 	)
 	(fp_line
 		(start 9.815 -4.459)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "08cc954a-f86f-4973-ab18-af89c9589abc")
 	)
 	(fp_line
 		(start 10.16 -4.459)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8611543a-7c79-401e-956e-147a0258d3af")
 	)
 	(fp_line
 		(start 10.74 -9.7)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d5c46f52-ea83-478d-9287-b1cb0607995d")
 	)
 	(fp_line
 		(start 12.355 -4.459)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "99f9cdc2-d0ef-4ef5-86b8-4008c13fccf4")
 	)
 	(fp_line
 		(start 12.7 -4.459)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1b30b485-0608-44bd-b33f-154c00eda4bd")
 	)
 	(fp_line
 		(start 14.895 -4.459)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "35324c91-f291-4263-8782-4289e01c697b")
 	)
 	(fp_line
 		(start 15.24 -4.459)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3d48b95f-5972-48b6-86bc-5240c48f2be0")
 	)
 	(fp_line
 		(start 17.435 -4.459)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d7b1100f-ba3a-4cfa-bd2e-3aa412baf5fb")
 	)
 	(fp_line
 		(start 17.78 -4.459)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a99c92d0-ff3b-461b-b651-08d27a16ce60")
 	)
 	(fp_line
 		(start 19.11 -9.7)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "841cbfd6-6e13-408e-9728-c9224c395031")
 	)
 	(fp_line
 		(start -1.46 -9.83)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "3ff705b7-4af7-4cc2-bc5e-d69a7c10e1a7")
 	)
 	(fp_line
 		(start -1.46 1.16)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "f8b89195-b250-41ea-a276-a488876afc6a")
 	)
 	(fp_line
 		(start 19.25 -9.83)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e48b5078-c450-42de-8209-87df470d3e6e")
 	)
 	(fp_line
 		(start 19.25 1.16)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "3a371f48-8062-4067-b83d-b458565bfebb")
 	)
 	(fp_line
 		(start -1.21 -9.58)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cebf97c7-b79a-4f9f-b918-24d701746e51")
 	)
 	(fp_line
 		(start -1.21 -7.98)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5563ac14-3b3c-4872-82e9-95bba92e13ed")
 	)
 	(fp_line
 		(start -1.21 -4.58)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3596407f-edb3-4195-b73e-cc0f2302ce0c")
 	)
 	(fp_line
 		(start 0 -4.58)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0107022e-50e6-433c-adbe-92d7a99eda83")
 	)
 	(fp_line
 		(start 2.54 -4.58)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "edc6194d-d1bb-4a3f-82dd-82cc1c645445")
 	)
 	(fp_line
 		(start 5.08 -4.58)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ae773389-dfff-4fd7-8734-50a5f375bb30")
 	)
 	(fp_line
 		(start 7.04 -9.58)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7b16d352-7a45-4e9f-a95b-38b1f1962b0c")
 	)
 	(fp_line
 		(start 7.62 -4.58)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9e2828c8-1862-4aea-a1d0-dd1165cdf8dd")
 	)
 	(fp_line
 		(start 10.16 -4.58)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c6894aab-8903-4959-b0c6-a044db54a463")
 	)
 	(fp_line
 		(start 10.74 -9.58)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6f93e014-c394-4f58-8049-e42355549c4a")
 	)
 	(fp_line
 		(start 12.7 -4.58)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "62e8ee80-5e3f-411d-ac23-8039bded151d")
 	)
 	(fp_line
 		(start 15.24 -4.58)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f9382194-577d-436e-96a8-830e61ddebd1")
 	)
 	(fp_line
 		(start 17.78 -4.58)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0cb894f5-7157-47d9-a317-a23e36183732")
 	)
 	(fp_line
 		(start 18.99 -9.58)
@@ -465,7 +384,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5e9e7aba-070e-4f9b-aa24-e4ddb36ca804")
 	)
 	(fp_line
 		(start 18.99 -4.58)
@@ -475,12 +393,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "929e4ea7-ae7d-45cd-996c-b58e2c64bacc")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 -10.7 0)
 		(layer "F.Fab")
-		(uuid "03424228-35b9-453c-81ce-da5450d60372")
 		(effects
 			(font
 				(size 1 1)
@@ -494,119 +410,104 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c9f5abf9-6ec4-4007-a884-a5bfd906154c")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ecbdb910-4644-423d-a714-850107b97f35")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fbae43fb-9436-489d-be3f-067c0e849678")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "73b7c17a-cde6-4ac0-96d3-afbf792a30ef")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2c8c996a-94f9-4c0d-96c2-36f90afc8dcb")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "feb6bc59-d3c5-4ba3-8263-0b20ffa759e5")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5fe3cbc6-2724-4bbf-94c6-d1d06e6b27cf")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 8.89 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f0a499ea-bcb8-4c4a-9b7a-8853d7802f5f")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 10.16 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9c80eb4b-9469-4c8d-8ab3-ef867507595c")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 11.43 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c08fedea-c87a-49ad-b5e2-dd3435c640b5")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 12.7 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a1a15816-5a27-4601-b0a8-74c9f77930ea")
 	)
-	(pad "12" thru_hole oval
+	(pad "12" thru_hole circle
 		(at 13.97 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0e9760aa-d5c2-487c-8e72-9c683ec28f41")
 	)
-	(pad "13" thru_hole oval
+	(pad "13" thru_hole circle
 		(at 15.24 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "36a2a824-ac16-432d-8adb-9e98f19a9282")
 	)
-	(pad "14" thru_hole oval
+	(pad "14" thru_hole circle
 		(at 16.51 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "543698db-3d60-42f2-8b51-7eb0d0c8597c")
 	)
-	(pad "15" thru_hole oval
+	(pad "15" thru_hole circle
 		(at 17.78 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6fbbc91d-9063-4569-bb90-954e8d2f7ac4")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-15_P2.54x5.08mm_StaggerOdd_Lead4.58mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabDown.kicad_mod
index d65ca571f..470570810 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabDown.kicad_mod
@@ -212,8 +212,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -20.58 0)
@@ -235,15 +235,15 @@
 		(at 0 0)
 		(size 2 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 2 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-2_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabUp.kicad_mod
index 3a5f7071d..b296f86cf 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-2_Horizontal_TabUp.kicad_mod
@@ -311,8 +311,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 20.58 0)
@@ -334,15 +334,15 @@
 		(at 0 0)
 		(size 2 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 2 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-2_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-2_Vertical.kicad_mod
index 6e4fe483b..45212c2e3 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-2_Vertical.kicad_mod
@@ -201,15 +201,15 @@
 		(at 0 0)
 		(size 2 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 2 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabDown.kicad_mod
index 8742dd4c0..f9f225c69 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabDown.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -20.58 0)
@@ -253,22 +253,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabUp.kicad_mod
index 4422a93ce..697bb640e 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-3_Horizontal_TabUp.kicad_mod
@@ -329,8 +329,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 20.58 0)
@@ -352,22 +352,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-3_Vertical.kicad_mod
index 0262ea242..4a4e4f020 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-3_Vertical.kicad_mod
@@ -201,22 +201,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabDown.kicad_mod
index 7ac43ed87..afa078f8b 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabDown.kicad_mod
@@ -248,8 +248,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -20.58 0)
@@ -271,29 +271,29 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabUp.kicad_mod
index 6cded7dc1..8c4a9bc2d 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_Horizontal_TabUp.kicad_mod
@@ -347,8 +347,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 20.58 0)
@@ -370,29 +370,29 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
index 575389f85..f2fe2b844 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-4, Vertical, RM 2.54mm, staggered type-2")
 	(tags "TO-220-4 Vertical RM 2.54mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.81 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "617438d9-586d-415e-8e99-177bb49b5ae3")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical"
 		(at 3.81 5.85 0)
 		(layer "F.Fab")
-		(uuid "9eaba561-de53-491e-b1bf-b3a69b001462")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4bdb7b7b-08fe-4eee-9087-4b02a0b059c4")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "bc6f70f9-acf4-496d-8f7b-7713da10762e")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4dc21ea4-37c0-4510-b21b-4bbaa9be4c65")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.31 -4.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "795f043f-f852-4b52-bfca-dad421098820")
 	)
 	(fp_line
 		(start -1.31 -4.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d8110cda-a307-4c74-899f-3e809d5f002f")
 	)
 	(fp_line
 		(start -1.31 -3.111)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3c2b462a-5fc5-4f5e-ad28-d114c79c5126")
 	)
 	(fp_line
 		(start -1.31 0.021)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "876bc9c8-3aaf-459e-bbe4-db2ce545496a")
 	)
 	(fp_line
 		(start 1.05 0.021)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "84b5954b-5d5b-46c8-bbbd-e5810b8a9fb4")
 	)
 	(fp_line
 		(start 1.96 -4.62)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "930f3a1c-c1e2-433f-afc8-ad84823b6810")
 	)
 	(fp_line
 		(start 2.54 0.021)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8a0483f1-e304-4f65-9571-545c5546e316")
 	)
 	(fp_line
 		(start 5.66 -4.62)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "67d62492-226e-4625-8cb4-3f619d8f3c11")
 	)
 	(fp_line
 		(start 6.145 0.021)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "824d6e56-4eb1-4335-89fb-5fcad5e9483b")
 	)
 	(fp_line
 		(start 7.62 0.021)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "efb89806-4fa5-431c-ac45-306d91cf8ca7")
 	)
 	(fp_line
 		(start 8.93 -4.62)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b591a927-20b8-4b76-b910-33d72874811d")
 	)
 	(fp_line
 		(start -1.44 -4.75)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7098496f-fbe8-4b1b-b731-ab387d2ac425")
 	)
 	(fp_line
 		(start -1.44 4.85)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "1cde7f8e-08f9-46d8-95c9-98b070e40d0e")
 	)
 	(fp_line
 		(start 9.06 -4.75)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "a1d0cebe-0d30-434a-bdb3-a29e0402af58")
 	)
 	(fp_line
 		(start 9.06 4.85)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "d06f3332-5351-4e08-865b-b4ca8f357ac5")
 	)
 	(fp_line
 		(start -1.19 -4.5)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0a542170-01b3-49dc-b9e6-ec60ad5f525b")
 	)
 	(fp_line
 		(start -1.19 -3.23)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a8a00068-3058-4cbb-b489-c0714bb1b633")
 	)
 	(fp_line
 		(start -1.19 -0.1)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e5a02542-4f94-4795-905d-8bee5020f5a7")
 	)
 	(fp_line
 		(start 0 -0.1)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2c9a996b-03f1-4dd4-8500-e6ab07158fea")
 	)
 	(fp_line
 		(start 1.96 -4.5)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "316a8a58-7d2e-4bcc-a6e3-705a0fc53060")
 	)
 	(fp_line
 		(start 2.54 -0.1)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "758157f0-8508-481a-afc5-a73c960e01a8")
 	)
 	(fp_line
 		(start 5.08 -0.1)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9be4d91b-d812-45ef-aa2e-fa93d7ce90c1")
 	)
 	(fp_line
 		(start 5.66 -4.5)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "322a8201-a574-4cdd-8248-98cf4dc9b41e")
 	)
 	(fp_line
 		(start 7.62 -0.1)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a2040090-69ba-4bca-a9e5-9ad5146daa20")
 	)
 	(fp_line
 		(start 8.81 -4.5)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1f565027-a64a-438e-b4ad-25d06e26f739")
 	)
 	(fp_line
 		(start 8.81 -0.1)
@@ -322,12 +258,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "50a6f893-224a-426d-bc09-969fe5d4fa53")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -5.62 0)
 		(layer "F.Fab")
-		(uuid "94a9de36-d255-4bca-8e5d-a1378f0f6f9e")
 		(effects
 			(font
 				(size 1 1)
@@ -341,31 +275,27 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2a738a53-b3af-4d1a-a4b9-fc19fff869b3")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "35c94d43-1e1b-4d90-abd3-b62ee318057d")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6a962877-4c38-4ed3-b388-99f28d55ec9c")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e1066403-0254-4150-be5d-31bea6a2205c")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_P5.08x3.7mm_StaggerEven_Lead3.8mm_Vertical.wrl"
 		(offset
@@ -378,4 +308,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
index 208b4231d..fc421f364 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-4, Vertical, RM 2.54mm, staggered type-1")
 	(tags "TO-220-4 Vertical RM 2.54mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.81 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "e9929a2c-97cb-42bd-bcfa-183d785a0751")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical"
 		(at 3.81 2.15 0)
 		(layer "F.Fab")
-		(uuid "b53e2ff3-5ee9-4db6-9ea4-24c00751e960")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "9ac29255-8680-4960-ba11-18af0880c311")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "cca082b7-cd76-4c38-a817-47eb23f68129")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "e8bddd17-ba14-40ec-a533-cecdad9ba08b")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.31 -8.32)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1196bc9a-10a4-4fea-b24a-80f444219008")
 	)
 	(fp_line
 		(start -1.31 -8.32)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d6f48f4c-c993-4b6b-bc1a-8526f0dd7785")
 	)
 	(fp_line
 		(start -1.31 -6.811)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cc892ab2-2eb3-44a9-abe8-61ee230b18b8")
 	)
 	(fp_line
 		(start -1.31 -3.679)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9d37790c-07b4-4c1a-94c2-7af3b6121a71")
 	)
 	(fp_line
 		(start 0 -3.679)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9c0885ef-eafa-4575-99f1-10aa8d8d2b41")
 	)
 	(fp_line
 		(start 1.96 -8.32)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6779a631-249c-4919-bddb-5ccd4d7a7841")
 	)
 	(fp_line
 		(start 3.605 -3.679)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8d2c20cf-15b9-4684-af38-a3bde6c1a16b")
 	)
 	(fp_line
 		(start 5.08 -3.679)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "79a318a6-d727-4803-89f7-f40519f4c59c")
 	)
 	(fp_line
 		(start 5.66 -8.32)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5b530316-9d83-4aaa-99be-efb88c5df59e")
 	)
 	(fp_line
 		(start 8.685 -3.679)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0eecb6f2-6c16-413a-8dd1-18afadd2aad5")
 	)
 	(fp_line
 		(start 8.93 -8.32)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d77b3b0f-0007-401a-9bb4-06cd3302f870")
 	)
 	(fp_line
 		(start -1.44 -8.45)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2eadec14-1cbb-4b03-9e85-5366bb955f34")
 	)
 	(fp_line
 		(start -1.44 1.15)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "cd0b5d0c-5d7d-46a0-82c8-ec7e3cd0e743")
 	)
 	(fp_line
 		(start 9.06 -8.45)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7efd9518-490d-497f-be0e-68f59d78b7ff")
 	)
 	(fp_line
 		(start 9.06 1.15)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "c4a59d47-c072-4a66-ad6b-06ab23e0e292")
 	)
 	(fp_line
 		(start -1.19 -8.2)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "08235835-c8c0-4a11-bc56-a8892c122d38")
 	)
 	(fp_line
 		(start -1.19 -6.93)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "83b38c9b-fc01-47d1-8c2c-09775c202ba0")
 	)
 	(fp_line
 		(start -1.19 -3.8)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "04b299c0-4582-4bf0-b018-1a0cc136e847")
 	)
 	(fp_line
 		(start 0 -3.8)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "40303b19-9509-4503-998d-ba56ba10a4b3")
 	)
 	(fp_line
 		(start 1.96 -8.2)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "de07e12f-8a37-4674-9f83-32a4ac3d59b5")
 	)
 	(fp_line
 		(start 2.54 -3.8)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b60ce9ff-109e-4085-9d40-4f853790734a")
 	)
 	(fp_line
 		(start 5.08 -3.8)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a7f6f5f7-cb8a-4a55-83c6-2268e8491c94")
 	)
 	(fp_line
 		(start 5.66 -8.2)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9771999d-2fb3-4b96-bd8b-c515d43a40e0")
 	)
 	(fp_line
 		(start 7.62 -3.8)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bbe102f3-88e9-404a-a2e3-5f732c835218")
 	)
 	(fp_line
 		(start 8.81 -8.2)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f6501b9f-4ddf-4c06-bc41-8da80a5b2a0f")
 	)
 	(fp_line
 		(start 8.81 -3.8)
@@ -322,12 +258,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "aaa7a802-82e7-47f2-aa0c-8d6583adac42")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -9.32 0)
 		(layer "F.Fab")
-		(uuid "f1369cfd-78bc-45e1-8424-84713c892cad")
 		(effects
 			(font
 				(size 1 1)
@@ -341,31 +275,27 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "cdd517d2-cab5-4e11-b5bf-096cd7daf80c")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 -3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "8ca38f33-6456-4ac6-839d-eda60f8bad7f")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "cbcb29d3-d527-4b32-b757-f8a1942b6ef7")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 -3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "aa4ab3c2-11f1-4924-9b68-79115bab2046")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_P5.08x3.7mm_StaggerOdd_Lead3.8mm_Vertical.wrl"
 		(offset
@@ -378,4 +308,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod
index e57f27a38..276f3f020 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-4, Horizontal, RM 2.54mm, staggered type-2")
 	(tags "TO-220-4 Horizontal RM 2.54mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.81 -18.82 0)
 		(layer "F.SilkS")
-		(uuid "8772f0f5-8a90-40cd-b4ed-7d8668b1c271")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown"
 		(at 3.81 5.7 0)
 		(layer "F.Fab")
-		(uuid "a5dda605-820c-4731-903c-80fdc6966c97")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "cb1a9964-4939-4912-b0b5-96559bc0528b")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "b740935e-19e4-4846-bea7-b3703df4930f")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "a0a7776c-b71f-4ae1-8beb-09624b50b0ea")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.31 -17.82)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a97325cc-b8df-452f-b2aa-0eba59c7305a")
 	)
 	(fp_line
 		(start -1.31 -17.82)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "82b276f7-3b8f-4118-a42f-fb343a2018ca")
 	)
 	(fp_line
 		(start -1.31 -1.93)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1fb30b68-8619-480d-a90c-c38962985477")
 	)
 	(fp_line
 		(start 0 -1.93)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "85f7ca02-2b19-4527-9593-a09f86256a7f")
 	)
 	(fp_line
 		(start 2.54 -1.93)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8af51e8c-cafb-4c7b-96f8-f1895af06b47")
 	)
 	(fp_line
 		(start 5.08 -1.93)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "981de037-464e-481a-8a26-c5d4f51ddb37")
 	)
 	(fp_line
 		(start 7.62 -1.93)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2f94bed5-2420-437e-9ef3-97ebb50f5813")
 	)
 	(fp_line
 		(start 8.93 -17.82)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6d2f6a93-e176-418d-924b-99b7fb4fb9a7")
 	)
 	(fp_line
 		(start -1.44 -17.95)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "18ea0f0e-2a7d-4891-b1b5-58f2b1802caa")
 	)
 	(fp_line
 		(start -1.44 4.95)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "cf1f3ca5-b981-4451-af0d-368134d2e12f")
 	)
 	(fp_line
 		(start 9.06 -17.95)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7bcb8c63-75f8-450e-b23b-d00e3539cf7b")
 	)
 	(fp_line
 		(start 9.06 4.95)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ff8a692c-fe92-4e1b-9135-b95b61fddff0")
 	)
 	(fp_line
 		(start -1.19 -17.7)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "51427c60-b501-45ae-8ef6-c9af57829fe6")
 	)
 	(fp_line
 		(start -1.19 -11.3)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0c20791b-05fa-4d36-8bd7-c50150651cfd")
 	)
 	(fp_line
 		(start -1.19 -11.3)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6adbedbb-7915-4a43-8e56-cde18e4a555b")
 	)
 	(fp_line
 		(start -1.19 -2.05)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a0db16df-3a8f-4a12-b327-c1f3c03e6990")
 	)
 	(fp_line
 		(start 0 -2.05)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0379abb6-8c30-4120-beaa-1d0d6749b0d3")
 	)
 	(fp_line
 		(start 2.54 -2.05)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c4cb702c-d0c5-4f8f-8a1a-d96feb669af0")
 	)
 	(fp_line
 		(start 5.08 -2.05)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5c869af2-84db-4558-a4c2-8da489f71466")
 	)
 	(fp_line
 		(start 7.62 -2.05)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b2626394-0581-4281-9a3c-cae3415075c3")
 	)
 	(fp_line
 		(start 8.81 -17.7)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "61b075ab-a6f6-4417-b31b-379eb3d2e2d5")
 	)
 	(fp_line
 		(start 8.81 -11.3)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d03cb6d5-6b67-4bf3-a418-2112a8cd7a14")
 	)
 	(fp_line
 		(start 8.81 -11.3)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "10003b70-d7ae-4b57-90bb-3d644f5af6e1")
 	)
 	(fp_line
 		(start 8.81 -2.05)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1c45876c-06cc-4fec-9144-efd961ccdfcf")
 	)
 	(fp_circle
 		(center 3.81 -14.9)
@@ -313,12 +250,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "b8054534-d1ae-48cb-862a-c84be7b72bcc")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -18.82 0)
 		(layer "F.Fab")
-		(uuid "ab966091-d531-4a37-ada2-afede081032e")
 		(effects
 			(font
 				(size 1 1)
@@ -326,12 +261,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 3.81 -14.9)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "271c2368-597f-46fc-bc64-bb3285187f94")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -339,31 +273,27 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e5f42f0c-9e58-46f5-8acc-3e581c46abaa")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b4b81dd5-b60c-4e73-bba2-57aba33a5c90")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "38e98cae-4d4a-4751-94be-3ebbee60a7ea")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "06da1fae-d1ba-4b06-930a-5f1726d65b85")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_P5.08x3.8mm_StaggerEven_Lead5.85mm_TabDown.wrl"
 		(offset
@@ -376,4 +306,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod
index bd0507a55..c1d4e9b59 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-4, Horizontal, RM 2.54mm, staggered type-1")
 	(tags "TO-220-4 Horizontal RM 2.54mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.81 -22.62 0)
 		(layer "F.SilkS")
-		(uuid "ca7714da-3f3f-408e-b8c6-aea4614e15ef")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown"
 		(at 3.81 1.9 0)
 		(layer "F.Fab")
-		(uuid "acf86131-02e1-4c7e-bdc9-010273899807")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d8e8d1c6-615a-4316-82bd-8ab7e0e5091a")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "07e62de2-92cd-4199-87d9-2ed1995077cb")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "5d99de05-70c0-4243-b78a-fcca5ef1bd9a")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.31 -21.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9c6bdf0a-96cf-42f2-a70f-76b7b64d8e56")
 	)
 	(fp_line
 		(start -1.31 -21.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ef2812b0-e505-48a2-84ec-3000c85f4dd6")
 	)
 	(fp_line
 		(start -1.31 -5.73)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6a0d8f29-673a-41eb-9f11-a823b085cd82")
 	)
 	(fp_line
 		(start 0 -5.73)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8a1b5611-01fd-43ce-9a9b-46315f176607")
 	)
 	(fp_line
 		(start 2.54 -5.73)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6c42715a-80e4-40b0-91cb-126d5253417e")
 	)
 	(fp_line
 		(start 5.08 -5.73)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9f205779-c4e7-45fb-9ad3-c3b20f37fe91")
 	)
 	(fp_line
 		(start 7.62 -5.73)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "816f9976-202f-49ad-8c53-cb17d606279e")
 	)
 	(fp_line
 		(start 8.93 -21.62)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2a02060d-7392-4cb2-86f6-b9ea2c26ba46")
 	)
 	(fp_line
 		(start -1.44 -21.75)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "bae77a35-c91a-4225-bee6-f606c0ebd3cb")
 	)
 	(fp_line
 		(start -1.44 1.15)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "30bb0006-27d2-40ae-88a4-0c173da81372")
 	)
 	(fp_line
 		(start 9.06 -21.75)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "450ac96d-91ae-405a-8dfd-51b49fd5ce06")
 	)
 	(fp_line
 		(start 9.06 1.15)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "d34cf782-7158-4c7e-9dfb-f3d6b8bf228e")
 	)
 	(fp_line
 		(start -1.19 -21.5)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "445f321b-6753-4ea6-af3e-c41034cd42b2")
 	)
 	(fp_line
 		(start -1.19 -15.1)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "827329e3-3660-42de-81e6-edb0a8ce3104")
 	)
 	(fp_line
 		(start -1.19 -15.1)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6c29195c-65c5-4d70-97aa-a5676104d533")
 	)
 	(fp_line
 		(start -1.19 -5.85)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f2df4dba-44ae-4a43-893e-74674fdb2f99")
 	)
 	(fp_line
 		(start 0 -5.85)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3a09d7fb-a57f-4809-bacc-1c3076b48e7d")
 	)
 	(fp_line
 		(start 2.54 -5.85)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4ac96321-7e9c-4080-87d0-42607fff03bd")
 	)
 	(fp_line
 		(start 5.08 -5.85)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6130e4d2-06e8-4fdb-b4e2-9877d5035b10")
 	)
 	(fp_line
 		(start 7.62 -5.85)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "59777381-a86e-4c0c-9c14-95d832efbcb6")
 	)
 	(fp_line
 		(start 8.81 -21.5)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e2164b97-d346-4c39-8e83-2999e3611a89")
 	)
 	(fp_line
 		(start 8.81 -15.1)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "eeea547c-bec8-409e-a5b5-8513c6269d6c")
 	)
 	(fp_line
 		(start 8.81 -15.1)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a61c08be-95c9-4503-b9fc-a328324206ef")
 	)
 	(fp_line
 		(start 8.81 -5.85)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "862e385f-7756-4a1d-b2d7-f591ecd1225c")
 	)
 	(fp_circle
 		(center 3.81 -18.7)
@@ -313,12 +250,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "6215ae8c-9995-409b-9674-90f261ff57be")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -22.62 0)
 		(layer "F.Fab")
-		(uuid "444add91-0dc1-4136-89cc-b5f8c2e62623")
 		(effects
 			(font
 				(size 1 1)
@@ -326,12 +261,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 3.81 -18.7)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "eff096eb-025d-40a0-b06d-b834cb0737ba")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -339,31 +273,27 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c9d28669-2fb6-4b93-a746-996d66cd13df")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 -3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "42c47889-1a9b-4d98-9b12-a565cd67b4de")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0d90b713-a83d-473e-b670-08de4cb371f7")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 -3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6e26554b-140f-494b-bb38-b22e6aef77e9")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_P5.08x3.8mm_StaggerOdd_Lead5.85mm_TabDown.wrl"
 		(offset
@@ -376,4 +306,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220-4_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-4_Vertical.kicad_mod
index 9952fd573..85896a923 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-4_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-4_Vertical.kicad_mod
@@ -201,29 +201,29 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-4_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabDown.kicad_mod
index 49b37f223..346b2fa03 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_Horizontal_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Horizontal, RM 1.7mm, Pentawatt, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421_straight_lead.pdf")
 	(tags "TO-220-5 Horizontal RM 1.7mm Pentawatt")
 	(property "Reference" "REF**"
 		(at 3.4 -20.58 0)
 		(layer "F.SilkS")
-		(uuid "8feaecf7-dd99-47ca-84e8-272eebbeab88")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_Horizontal_TabDown"
 		(at 3.4 1.9 0)
 		(layer "F.Fab")
-		(uuid "cd1c3ebd-9017-4ca9-a48f-62e48fbb1257")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "e3d05d49-223c-498d-918b-e1fd9972dcc4")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "bd7ea0e1-56de-4901-a305-15ae43f401ce")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0ddc1093-36e2-4265-b96c-e07c472f6a11")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 -19.58)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f3d753a5-c468-46e8-bdd5-4d6e781bf704")
 	)
 	(fp_line
 		(start -1.721 -19.58)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "60bd5519-0e27-422a-b532-23020df27b4a")
 	)
 	(fp_line
 		(start -1.721 -3.69)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f5af63c5-d4bd-4095-a4ca-1b49477111b4")
 	)
 	(fp_line
 		(start 0 -3.69)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4e9bbd0e-1ce8-4481-a8c3-6e1d02d9fdcd")
 	)
 	(fp_line
 		(start 1.7 -3.69)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "19b0ee41-6565-4423-80dc-184a6b92f57e")
 	)
 	(fp_line
 		(start 3.4 -3.69)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "42cde59e-72e8-43d6-bec1-05faf347052b")
 	)
 	(fp_line
 		(start 5.1 -3.69)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "43be8466-6e0b-48cb-9c96-ee94095a7e6a")
 	)
 	(fp_line
 		(start 6.8 -3.69)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "af45d57c-cb0d-4b80-81a4-63136de59ffc")
 	)
 	(fp_line
 		(start 8.52 -19.58)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "73be15e6-f328-410f-ab8b-e9c10cd1a408")
 	)
 	(fp_line
 		(start -1.85 -19.71)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "07c38d8b-451e-4258-9ee6-0890785650b6")
 	)
 	(fp_line
 		(start -1.85 1.15)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "3642cfc3-309f-4580-a429-adfdbd7adf58")
 	)
 	(fp_line
 		(start 8.65 -19.71)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "a4d7ec60-e658-4b29-a7c9-0c95c8fad921")
 	)
 	(fp_line
 		(start 8.65 1.15)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "29ce9c64-2c3a-4143-a818-5fe732ab7736")
 	)
 	(fp_line
 		(start -1.6 -19.46)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e34c3a2c-8ec3-4472-849c-5ae096caf87c")
 	)
 	(fp_line
 		(start -1.6 -13.06)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d7495c79-40cd-4610-b582-577eaadcbce5")
 	)
 	(fp_line
 		(start -1.6 -13.06)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "85ba2f7f-3a11-4af4-99d0-6f085a015fc2")
 	)
 	(fp_line
 		(start -1.6 -3.81)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4bee73ab-b714-41e1-8565-2e0287b0579c")
 	)
 	(fp_line
 		(start 0 -3.81)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a98cdee3-d21b-44c4-aaca-8696617d6686")
 	)
 	(fp_line
 		(start 1.7 -3.81)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6f8d84ce-e8a6-47ee-b27a-7e04751362a1")
 	)
 	(fp_line
 		(start 3.4 -3.81)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0adc78db-0be9-41d2-8833-a41373af3746")
 	)
 	(fp_line
 		(start 5.1 -3.81)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "93709a6a-5ab0-4dcf-878a-983ab3fc5235")
 	)
 	(fp_line
 		(start 6.8 -3.81)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e93b6b74-623a-4ae4-a99d-a577429b08f8")
 	)
 	(fp_line
 		(start 8.4 -19.46)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "48008170-8b27-47a9-a743-37f60c99cd64")
 	)
 	(fp_line
 		(start 8.4 -13.06)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ae2d243d-47b0-49dc-a96c-679b26413789")
 	)
 	(fp_line
 		(start 8.4 -13.06)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ed02fd2c-2d1b-4dc9-8b92-1c6ca52211f2")
 	)
 	(fp_line
 		(start 8.4 -3.81)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "95e856a9-a33f-41da-9373-60b41b35fc01")
 	)
 	(fp_circle
 		(center 3.4 -16.66)
@@ -333,12 +268,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "2398cd74-b340-4502-9f64-1ca90fdc43ca")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -20.58 0)
 		(layer "F.Fab")
-		(uuid "7b7cbbc0-b241-4742-9281-971334c28c76")
 		(effects
 			(font
 				(size 1 1)
@@ -351,7 +284,6 @@
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "11ed0d76-41f1-4c0e-879d-aa548eb728bd")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -359,7 +291,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "42ab31ef-e1e6-4a5e-9daa-571209ea0cdb")
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
@@ -367,7 +298,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0a785cad-d609-45b0-a276-ed8b584843e3")
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
@@ -375,7 +305,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f2a41f72-d3b3-4ae6-b5ac-8bf85b32a317")
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
@@ -383,7 +312,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "afb3ef15-5dba-42ec-bffb-ad78f723d551")
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
@@ -391,7 +319,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c15ce294-81b5-4e71-9abe-5dff4d7ffd33")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabUp.kicad_mod
index 5ac429f11..1e7e57770 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_Horizontal_TabUp.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_Horizontal_TabUp"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Horizontal, RM 1.7mm, Pentawatt, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421_straight_lead.pdf")
 	(tags "TO-220-5 Horizontal RM 1.7mm Pentawatt")
 	(property "Reference" "REF**"
 		(at 3.4 20.58 0)
 		(layer "F.SilkS")
-		(uuid "bc454ad2-ffde-463b-8253-61c0e0ceb694")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_Horizontal_TabUp"
 		(at 3.4 -1.9 0)
 		(layer "F.Fab")
-		(uuid "206c3403-91b3-48ee-8394-df0191ea1e0f")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "537be3fe-a4dc-4920-9be4-5ed7ad654b3b")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "34322c3e-9ab3-4f1f-b2ef-23d011450add")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "42f397ff-4f65-4367-b96f-3df0f23ed0fc")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 3.69)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "455830b6-a9e4-4340-8f7b-8fb219edd1b4")
 	)
 	(fp_line
 		(start -1.721 3.69)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bb27d1a5-bbe6-443a-8c12-0210a2a77c66")
 	)
 	(fp_line
 		(start -1.721 13.18)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0bc37377-7753-40c6-a8b0-22a4d76efb21")
 	)
 	(fp_line
 		(start -1.721 13.42)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3b784a6e-4d29-40df-8673-8805d5a3c865")
 	)
 	(fp_line
 		(start -1.721 15.82)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "624559f7-9d34-4db2-bd2a-0ec3e3014c4c")
 	)
 	(fp_line
 		(start -1.721 18.22)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e5af2528-7fe4-45c9-998e-40c4c0022c0c")
 	)
 	(fp_line
 		(start -1.721 19.58)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7c64428e-974a-4eb5-bc86-492d55684dff")
 	)
 	(fp_line
 		(start 0 1.05)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ba33cf41-9a33-4b06-844a-620c4b1dcae2")
 	)
 	(fp_line
 		(start 0.68 19.58)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "10701100-6ff0-4d20-b19d-db32dd74bc0f")
 	)
 	(fp_line
 		(start 1.7 1.05)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6163ceba-74c1-4b1c-bbd4-f33251e9131f")
 	)
 	(fp_line
 		(start 3.08 19.58)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b646b7a3-28c8-4917-97df-301cd79c8d51")
 	)
 	(fp_line
 		(start 3.4 1.05)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4afeea4a-c8de-49f7-b1dd-c033ee2c3ef4")
 	)
 	(fp_line
 		(start 5.1 1.05)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "188986ed-62c7-4651-889e-aaf818a921fd")
 	)
 	(fp_line
 		(start 5.48 19.58)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1e1a5bdf-a0a1-43fc-a005-49e08bc90b62")
 	)
 	(fp_line
 		(start 6.8 1.05)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7514bd8c-3cea-4620-afe6-73ac701db3fd")
 	)
 	(fp_line
 		(start 7.88 19.58)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "34c6aeb6-b1a4-4b77-b6d2-f479e4b3a8fa")
 	)
 	(fp_line
 		(start 8.52 3.69)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bc40fc8e-58e6-4d27-805b-aa5a8937e19d")
 	)
 	(fp_line
 		(start 8.52 13.42)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d82e5a86-a8f7-406e-b838-12e70f661519")
 	)
 	(fp_line
 		(start 8.52 15.82)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3aa06858-e579-4b4c-8563-005048564453")
 	)
 	(fp_line
 		(start 8.52 18.22)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "89a69264-cb2a-4139-bcbf-265bf1f59dfb")
 	)
 	(fp_line
 		(start -1.85 -1.15)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "5d7a6ab2-a7fd-4d90-ac6f-cbc4abe92d75")
 	)
 	(fp_line
 		(start -1.85 19.71)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "d99d2032-73a3-4de9-a547-b307851499a5")
 	)
 	(fp_line
 		(start 8.65 -1.15)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "76e1692a-f184-4699-8b06-bd360cdea3b0")
 	)
 	(fp_line
 		(start 8.65 19.71)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "1cf4cf27-23e8-47d3-af96-d6c35ab55c35")
 	)
 	(fp_line
 		(start -1.6 3.81)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "155c7b76-a5c4-4b4c-ba32-daf457afb131")
 	)
 	(fp_line
 		(start -1.6 13.06)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "27108fdd-24aa-43bf-b099-ad65332b6af7")
 	)
 	(fp_line
 		(start -1.6 13.06)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f4a1a2f4-5500-4a07-9ee5-71134800104c")
 	)
 	(fp_line
 		(start -1.6 19.46)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "278daec4-dcde-4be7-a95e-d82beb3db59a")
 	)
 	(fp_line
 		(start 0 3.81)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "51a98f70-ac46-432e-92c5-094a19085397")
 	)
 	(fp_line
 		(start 1.7 3.81)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "240d14dc-89dd-45c9-b791-86691f8f6fdc")
 	)
 	(fp_line
 		(start 3.4 3.81)
@@ -372,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5ec45d47-076b-4ad8-980f-c8c4bb2d4dfc")
 	)
 	(fp_line
 		(start 5.1 3.81)
@@ -382,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "17ff3db6-70d1-432e-9364-ebabc2a25ec0")
 	)
 	(fp_line
 		(start 6.8 3.81)
@@ -392,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ab876ff3-e63a-4546-998a-bd746ca217c9")
 	)
 	(fp_line
 		(start 8.4 3.81)
@@ -402,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f11a71c0-9837-4eb6-8207-8a5d50eb94fc")
 	)
 	(fp_line
 		(start 8.4 13.06)
@@ -412,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ec74fb59-439b-49a8-bbac-958f593ceaaf")
 	)
 	(fp_line
 		(start 8.4 13.06)
@@ -422,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bd0f5e4b-9060-4125-8430-f172c62b6457")
 	)
 	(fp_line
 		(start 8.4 19.46)
@@ -432,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7800c90b-4e52-451b-accb-8123355b1eea")
 	)
 	(fp_circle
 		(center 3.4 16.66)
@@ -443,12 +367,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "f7e5a38f-93cf-414c-b96d-d9db7e925186")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 20.58 0)
 		(layer "F.Fab")
-		(uuid "379f267f-0961-443f-b82e-62f93fd68e6f")
 		(effects
 			(font
 				(size 1 1)
@@ -461,7 +383,6 @@
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "9fcef0c9-cd3e-49e7-85b5-5ca87fb4d380")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -469,7 +390,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e62b6ce5-1602-4dbc-9008-6ed49a35ee51")
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
@@ -477,7 +397,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f85980cf-20f9-4610-b85a-dcc2b2b42100")
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
@@ -485,7 +404,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fb061e66-785b-42df-a7fd-1dbedd6f900d")
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
@@ -493,7 +411,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7d20c0bc-729f-4d76-80c4-fb2ea4627839")
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
@@ -501,7 +418,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "86d42de2-a291-4ad9-97db-83b5939b4760")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
index 89df79232..79b5cf4db 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Vertical, RM 1.7mm, Pentawatt, staggered type-2, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421.pdf?domain=www.linear.com, https://www.diodes.com/assets/Package-Files/TO220-5.pdf")
 	(tags "TO-220-5 Vertical RM 1.7mm Pentawatt staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.4 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "af04e438-c2fa-41ff-8cae-f744fd36d445")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical"
 		(at 3.4 5.85 0)
 		(layer "F.Fab")
-		(uuid "7776201a-2a0c-4ebc-8809-f10bc1badee7")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "756ecd3f-011f-496f-b890-b9b1bbddd79c")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "3dd3ffdf-91ac-4d61-8229-7c2998f1f013")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "aa279cfc-9976-4a68-984d-9edcb5013b63")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ba036934-76ac-48af-8112-8ee70b5a1d71")
 	)
 	(fp_line
 		(start -1.721 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b93e7ed9-ecfc-47e4-a250-120bb1b0a473")
 	)
 	(fp_line
 		(start -1.721 -3.111)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bb10839a-80b7-4532-8ec7-dbe6f9b40d9c")
 	)
 	(fp_line
 		(start -1.721 0.021)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a7e745cd-86a4-4867-8bc7-d7f4cf1cbda6")
 	)
 	(fp_line
 		(start 1.05 0.021)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9862be7b-0f50-4c11-9756-af7918698765")
 	)
 	(fp_line
 		(start 1.55 -4.62)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4939827b-a3b9-4d09-b374-72594a7313ea")
 	)
 	(fp_line
 		(start 1.7 0.021)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8ae4dbf9-932c-439b-bc5a-361c59bf6afb")
 	)
 	(fp_line
 		(start 4.465 0.021)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "904bd446-b7a1-4384-a755-eb7247933b23")
 	)
 	(fp_line
 		(start 5.1 0.021)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "37ced11e-48bb-4f09-96ee-c253f9ebc660")
 	)
 	(fp_line
 		(start 5.25 -4.62)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b08f6e8e-8b74-4991-b7f0-1748ab1cdaa0")
 	)
 	(fp_line
 		(start 7.865 0.021)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3ba82d33-726c-4072-bf33-ce2169b92103")
 	)
 	(fp_line
 		(start 8.52 -4.62)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5ea6d963-920f-49db-be92-df6eeb646840")
 	)
 	(fp_line
 		(start -1.85 -4.75)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "0b61d6ed-ab8f-4b27-af3b-63217bbee606")
 	)
 	(fp_line
 		(start -1.85 4.85)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "efc7f7c7-430e-41f0-8d83-c087d5f6b4f0")
 	)
 	(fp_line
 		(start 8.65 -4.75)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "b0eb809e-3142-46ec-b215-96cac4513b1e")
 	)
 	(fp_line
 		(start 8.65 4.85)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "14b08a7e-6430-4abc-a309-7a0210cdbb3d")
 	)
 	(fp_line
 		(start -1.6 -4.5)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "37bd648f-dd56-40f1-9a3e-496b57ecb843")
 	)
 	(fp_line
 		(start -1.6 -3.23)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0c26df84-aa76-4b5b-b31a-c2294281087f")
 	)
 	(fp_line
 		(start -1.6 -0.1)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d6c9a9d9-51a8-4049-bfeb-332ef3ce3d1a")
 	)
 	(fp_line
 		(start 0 -0.1)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1e49b8e7-e864-4f89-bba8-1b63e2f6cc82")
 	)
 	(fp_line
 		(start 1.55 -4.5)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3f74ffa5-87c7-4516-942f-e7678483190d")
 	)
 	(fp_line
 		(start 1.7 -0.1)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ebe2441f-e45c-4141-8a14-16756b55bb4a")
 	)
 	(fp_line
 		(start 3.4 -0.1)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "22d599b7-55a4-4749-a478-f2d3d61008ef")
 	)
 	(fp_line
 		(start 5.1 -0.1)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4b040f85-0208-40aa-9ae0-16ba5da40c1d")
 	)
 	(fp_line
 		(start 5.25 -4.5)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3801da34-dfff-4acf-b9dd-c52ea4e1fdb0")
 	)
 	(fp_line
 		(start 6.8 -0.1)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bc30e2b2-7100-4773-a7d2-e046dc6eb38e")
 	)
 	(fp_line
 		(start 8.4 -4.5)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "17cbec98-6009-4c79-add5-02fc1823bacd")
 	)
 	(fp_line
 		(start 8.4 -0.1)
@@ -345,12 +276,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cacbfc55-ee74-4bb5-91a9-8662bd6cedcd")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -5.62 0)
 		(layer "F.Fab")
-		(uuid "fea65f63-4a57-4634-9420-55c46f141fc0")
 		(effects
 			(font
 				(size 1 1)
@@ -364,39 +293,34 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "089e90f8-9903-465b-8284-aca44b2d4170")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2a900475-9503-44c7-9965-787da2f37ae7")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7b01ee22-fb77-4a4d-92ad-1f3d4af5672a")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "faf440e3-72e6-4500-a710-30335af90071")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "116552c1-aa05-41c3-9d74-0abbacbf3b0b")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_P3.4x3.7mm_StaggerEven_Lead3.8mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
index 8b21e9cfa..243fea33f 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Vertical, RM 1.7mm, Pentawatt, staggered type-1, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421.pdf?domain=www.linear.com, https://www.diodes.com/assets/Package-Files/TO220-5.pdf")
 	(tags "TO-220-5 Vertical RM 1.7mm Pentawatt staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.4 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "f40171c2-119e-4376-bbe7-1718f763ceba")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical"
 		(at 3.4 2.15 0)
 		(layer "F.Fab")
-		(uuid "a8296baa-e60f-46a1-bed9-2d82d25440d7")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d3ff020b-83a3-4ffd-9158-c8e9cf86a7e9")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "2ef1cfe1-b581-4ea5-a5ff-33fa052a0db1")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "95a69ed8-aa5d-481e-b555-5879499ba73f")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 -8.32)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7e13975b-3c58-4e40-a619-afb451845c1a")
 	)
 	(fp_line
 		(start -1.721 -8.32)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "419210a5-cd70-4710-a0b2-5e2e10545aee")
 	)
 	(fp_line
 		(start -1.721 -6.811)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "14107b2f-2c04-4920-a388-bd5e3bcae498")
 	)
 	(fp_line
 		(start -1.721 -3.679)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ea8ab30d-a3a6-4ecd-ad1c-37370372fa49")
 	)
 	(fp_line
 		(start 0 -3.679)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bbce2bc5-5978-4e86-8e2b-99edb4d0fbbc")
 	)
 	(fp_line
 		(start 1.55 -8.32)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "563088cf-084a-4ba7-8d62-7bf35feee7ba")
 	)
 	(fp_line
 		(start 2.765 -3.679)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "78ed3826-b98d-4c09-93b0-6d9981851dea")
 	)
 	(fp_line
 		(start 3.4 -3.679)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b9b50fcf-7310-4e26-bcaa-e296876fcac8")
 	)
 	(fp_line
 		(start 5.25 -8.32)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a2440740-ce2d-4421-8a24-179f25da672d")
 	)
 	(fp_line
 		(start 6.165 -3.679)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cd2fc6ea-852a-4156-b99c-fa92d8b04ff1")
 	)
 	(fp_line
 		(start 6.8 -3.679)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "838ff801-a1a3-4a00-970b-e57cf921317b")
 	)
 	(fp_line
 		(start 8.52 -8.32)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2613a19c-eabd-472a-bf54-334a16af645a")
 	)
 	(fp_line
 		(start -1.85 -8.45)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "60cdd254-8bd4-4eae-aff9-daaa279caee7")
 	)
 	(fp_line
 		(start -1.85 1.15)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "4fa5b311-e7ef-45f8-b6c8-962c76b0d853")
 	)
 	(fp_line
 		(start 8.65 -8.45)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ad2d8d91-59a6-4002-aaf6-809e9a58d356")
 	)
 	(fp_line
 		(start 8.65 1.15)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "0854cb32-4299-4112-8d21-cab594d8540d")
 	)
 	(fp_line
 		(start -1.6 -8.2)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3a186ec7-79f5-4d59-a79c-be19ea204e8e")
 	)
 	(fp_line
 		(start -1.6 -6.93)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b4a9ba88-3eee-4c5b-b274-787c7fe0e47a")
 	)
 	(fp_line
 		(start -1.6 -3.8)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3825c02e-f7e9-42f7-8bf8-be8578b2a3b4")
 	)
 	(fp_line
 		(start 0 -3.8)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e733724b-7ec3-4f1b-b7fc-01e0bd99fd95")
 	)
 	(fp_line
 		(start 1.55 -8.2)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f0fdcfa3-e818-4eed-9e67-001b8ea8ffbf")
 	)
 	(fp_line
 		(start 1.7 -3.8)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "76977c01-7350-433f-be43-960d5974aa5b")
 	)
 	(fp_line
 		(start 3.4 -3.8)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "05fb2079-26bb-426e-839f-3ac17c10f7d3")
 	)
 	(fp_line
 		(start 5.1 -3.8)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "63e7a32a-b7a1-430a-87eb-e86aa7557765")
 	)
 	(fp_line
 		(start 5.25 -8.2)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bb0aa014-6927-4c49-a5f9-6fa04bb7a758")
 	)
 	(fp_line
 		(start 6.8 -3.8)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0499d906-9a74-4e51-9d4e-b28d35f4aa76")
 	)
 	(fp_line
 		(start 8.4 -8.2)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c4a21b59-a7a6-40da-98fb-db5de0b47f30")
 	)
 	(fp_line
 		(start 8.4 -3.8)
@@ -345,12 +276,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "db8f4375-684f-4cf4-95b1-e808aec4b3ad")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -9.32 0)
 		(layer "F.Fab")
-		(uuid "0e75ff82-3b88-4232-a103-a72cd5dfae02")
 		(effects
 			(font
 				(size 1 1)
@@ -364,39 +293,34 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7a22f1b1-2ffd-4f40-9f64-b0541ee964b2")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c797d812-091c-4bb3-ad29-7a971663befd")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f97da4d1-04ac-4f1d-9e6b-a0c0e379cb6c")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -3.7)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "69b9c53e-df47-4f5e-94d7-d6c615475c64")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "16853104-5f4c-4fc7-b5fd-9e6d7a6b1313")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown.kicad_mod
index b8edf9c44..d44b004a2 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Horizontal, RM 1.7mm, Pentawatt, staggered type-2, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421.pdf?domain=www.linear.com, https://www.diodes.com/assets/Package-Files/TO220-5.pdf")
 	(tags "TO-220-5 Horizontal RM 1.7mm Pentawatt staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.4 -20.1 0)
 		(layer "F.SilkS")
-		(uuid "18229a37-7435-4391-8fbe-d536e298fb9b")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown"
 		(at 3.4 5.7 0)
 		(layer "F.Fab")
-		(uuid "3ce8c6c6-c290-4838-a0c2-3591579b1ca7")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "7799caaf-f140-4e5a-b49a-496a5bfac9f9")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "bbeff038-b750-4676-a03b-fd62a6420113")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4d8bd21c-e4ff-406b-8465-b873a723bbdc")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 -19.1)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8e641fb5-97fe-4739-aa01-bfbe2afa2dbd")
 	)
 	(fp_line
 		(start -1.721 -19.1)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "03c655e4-0470-4ac3-852a-2486fbd07428")
 	)
 	(fp_line
 		(start -1.721 -3.21)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7d80cbd8-c342-475a-b381-d35759af6cff")
 	)
 	(fp_line
 		(start 0 -3.21)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "471162e3-dd49-48c3-9d3d-06a7556928d5")
 	)
 	(fp_line
 		(start 1.7 -3.21)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "641698fd-0950-41be-b5e7-8704133ae09b")
 	)
 	(fp_line
 		(start 3.4 -3.21)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1ab95fc3-e784-4017-8cd6-766ce958904c")
 	)
 	(fp_line
 		(start 5.1 -3.21)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8a964f0c-fa58-41c3-be13-5a01a8a04893")
 	)
 	(fp_line
 		(start 6.8 -3.21)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ff9a2b28-4e67-4f92-820e-f44537ba8f83")
 	)
 	(fp_line
 		(start 8.52 -19.1)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8c4879fc-a289-455a-95af-5f087f3c7d9e")
 	)
 	(fp_line
 		(start -1.85 -19.23)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "5fe096ae-8d8a-43c3-a7c4-b9c9099daa62")
 	)
 	(fp_line
 		(start -1.85 4.95)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "400d857b-4504-4c02-9d4c-cc0c193b48fc")
 	)
 	(fp_line
 		(start 8.65 -19.23)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "c2a421d7-53ca-4cd9-a19e-23ad9c93c09e")
 	)
 	(fp_line
 		(start 8.65 4.95)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "28243c5e-6571-4113-945b-37a66d72885c")
 	)
 	(fp_line
 		(start -1.6 -18.98)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "eebe8ebc-6e44-4d18-8544-012f99fe8f9a")
 	)
 	(fp_line
 		(start -1.6 -12.58)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5a0f36d3-7246-4f60-9512-33df0691b1e1")
 	)
 	(fp_line
 		(start -1.6 -12.58)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2f404b6c-200b-40eb-a0fa-7537e2febea9")
 	)
 	(fp_line
 		(start -1.6 -3.33)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "65a3cbe0-7ff1-4049-94be-07a499d4f4c9")
 	)
 	(fp_line
 		(start 0 -3.33)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e6721a4e-af7f-4ded-91bc-13a1dc2eb3df")
 	)
 	(fp_line
 		(start 1.7 -3.33)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5ae42f4c-4f72-4f56-8ba8-5d3bb28799b9")
 	)
 	(fp_line
 		(start 3.4 -3.33)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e82a0f70-8fe5-40f8-a879-186fd6f09c70")
 	)
 	(fp_line
 		(start 5.1 -3.33)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "91a49403-7bd1-49b8-88d1-9770e861491c")
 	)
 	(fp_line
 		(start 6.8 -3.33)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "14c9c53f-6c2d-4008-a4e6-00d8f44cbcdc")
 	)
 	(fp_line
 		(start 8.4 -18.98)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cd9d168c-2a6c-4265-9c07-c87d6af253bf")
 	)
 	(fp_line
 		(start 8.4 -12.58)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3410c448-433c-4a2c-baa0-66f450277013")
 	)
 	(fp_line
 		(start 8.4 -12.58)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d4a8cc10-ea26-4662-b610-661b391f2e4f")
 	)
 	(fp_line
 		(start 8.4 -3.33)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "067cff7c-c623-4493-8381-060c68226d67")
 	)
 	(fp_circle
 		(center 3.4 -16.18)
@@ -336,12 +268,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "05b1218d-48dd-4ff6-8dc7-41b41c019c4f")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -20.1 0)
 		(layer "F.Fab")
-		(uuid "0fb742d4-2709-42a5-a11f-bb8a31d20645")
 		(effects
 			(font
 				(size 1 1)
@@ -349,12 +279,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 3.4 -16.18)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "a0426813-8625-4951-af45-b3092d8f2f71")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -362,39 +291,34 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2f0bc751-cdc0-47a6-96d7-a539b3e3d616")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "64613248-32ce-430f-9b57-70b526899566")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f8071f9c-dcea-4254-a593-2fa609d1d9f3")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6f725c84-acd4-4658-a1de-5e535387158c")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "735d2516-4093-41dc-ae53-3ad727f916c6")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_P3.4x3.8mm_StaggerEven_Lead7.13mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown.kicad_mod
index e4edcd8d5..e5d05a26c 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Horizontal, RM 1.7mm, Pentawatt, staggered type-1, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421.pdf?domain=www.linear.com, https://www.diodes.com/assets/Package-Files/TO220-5.pdf")
 	(tags "TO-220-5 Horizontal RM 1.7mm Pentawatt staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.4 -23.9 0)
 		(layer "F.SilkS")
-		(uuid "7d27aa58-1e26-41b8-8f6a-22331f1ff1a1")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown"
 		(at 3.4 1.9 0)
 		(layer "F.Fab")
-		(uuid "9dd7b0fb-a440-4867-8f92-22a20983eafe")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "b61ec9ec-a799-43bb-aa72-e315b1a0eb66")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4e7940af-6a0c-4390-8a0a-111d65312f45")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "59540ca3-0737-41aa-b328-ec7048ede5b6")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 -22.9)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fffa0d60-d0ac-4986-8eb3-e0f3148981de")
 	)
 	(fp_line
 		(start -1.721 -22.9)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f52297c7-5517-4844-9741-191bcdc877b4")
 	)
 	(fp_line
 		(start -1.721 -7.01)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4fb55fb6-128a-4c41-ba85-0a2dd703e72c")
 	)
 	(fp_line
 		(start 0 -7.01)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fbac8583-aaa1-4626-9f9a-a2787410bd5b")
 	)
 	(fp_line
 		(start 1.7 -7.01)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7aca832c-f439-40f3-b1b3-1010fabeebce")
 	)
 	(fp_line
 		(start 3.4 -7.01)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e0b37002-85f2-40d0-b24a-17ab2bb885d3")
 	)
 	(fp_line
 		(start 5.1 -7.01)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fe334bce-0e04-4ab1-9e36-4bf1b673fd45")
 	)
 	(fp_line
 		(start 6.8 -7.01)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f7a82935-f77f-4745-b571-2fde7ebd9e38")
 	)
 	(fp_line
 		(start 8.52 -22.9)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e227b0b7-04ec-46db-8325-eac99279827a")
 	)
 	(fp_line
 		(start -1.85 -23.03)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ee4ffbd2-9dc5-4d02-8515-e75ddbd4177a")
 	)
 	(fp_line
 		(start -1.85 1.15)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "03215137-281f-4b27-8454-1170b61477a5")
 	)
 	(fp_line
 		(start 8.65 -23.03)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "21cc9a5e-ac3e-4f70-8436-f9a5cb071d22")
 	)
 	(fp_line
 		(start 8.65 1.15)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "49c117fe-b2b4-4e5c-88c9-07c909ee8346")
 	)
 	(fp_line
 		(start -1.6 -22.78)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "681b6941-2f47-49bf-9a2a-ebd2fc051065")
 	)
 	(fp_line
 		(start -1.6 -16.38)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1612bcc2-7be5-4518-93a5-736961707126")
 	)
 	(fp_line
 		(start -1.6 -16.38)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a3f51af0-9470-4e70-89bd-04db4876e185")
 	)
 	(fp_line
 		(start -1.6 -7.13)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9ffbb82e-f66c-4a5f-8a56-b67b1707d54b")
 	)
 	(fp_line
 		(start 0 -7.13)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fe816000-d086-4f56-b332-af3653d29bcc")
 	)
 	(fp_line
 		(start 1.7 -7.13)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b98d0dc0-abd4-4461-b2cf-7a3d20ae53a8")
 	)
 	(fp_line
 		(start 3.4 -7.13)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "28b3284b-b7cc-4e35-8c0a-a3d1395de584")
 	)
 	(fp_line
 		(start 5.1 -7.13)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c44f0453-dafc-4d61-a4ec-258cd7cc34e2")
 	)
 	(fp_line
 		(start 6.8 -7.13)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c57fdad0-6968-48cd-9900-9facb3490aa5")
 	)
 	(fp_line
 		(start 8.4 -22.78)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ecda2b8a-9ee0-4212-8eaf-91b4f3cb4884")
 	)
 	(fp_line
 		(start 8.4 -16.38)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ec2335d8-701b-4ee1-86a3-370cef8e86df")
 	)
 	(fp_line
 		(start 8.4 -16.38)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "32777037-4ae9-48a3-9ced-d19d94830df9")
 	)
 	(fp_line
 		(start 8.4 -7.13)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "853d235a-0f39-48f8-b213-13c188c8aefc")
 	)
 	(fp_circle
 		(center 3.4 -19.98)
@@ -336,12 +268,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "8e1c3eb7-8c79-45fc-b849-be75ad14610b")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -23.9 0)
 		(layer "F.Fab")
-		(uuid "cee8d9d6-0abd-420d-9ca5-2574bcdb4db2")
 		(effects
 			(font
 				(size 1 1)
@@ -349,12 +279,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 3.4 -19.98)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "2ad9c346-6e2a-4206-a8ab-9fbd9829960d")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -362,39 +291,34 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fede3bb0-c28c-4deb-bae7-6ee1d1fea2ee")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c92ca786-cdf4-429e-a2b5-3f0f7d66962c")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ffa16cd7-7f1a-4222-9988-6a388144cd0a")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -3.8)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d16992fd-44c8-4eb6-9378-712c45898bed")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "160487f8-f8c3-4800-8940-4b36995a9c6e")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_P3.4x3.8mm_StaggerOdd_Lead7.13mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-5_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-5_Vertical.kicad_mod
index 6ef2737ed..256225372 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-5_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-5_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-5_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-5, Vertical, RM 1.7mm, Pentawatt, see http://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/ltc-legacy-to-220/to-220_5_05-08-1421_straight_lead.pdf")
 	(tags "TO-220-5 Vertical RM 1.7mm Pentawatt")
 	(property "Reference" "REF**"
 		(at 3.4 -4.27 0)
 		(layer "F.SilkS")
-		(uuid "119faef1-260f-469a-b625-3295b44e52a4")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-5_Vertical"
 		(at 3.4 2.5 0)
 		(layer "F.Fab")
-		(uuid "c5b859bb-9161-419c-8c91-dbce08d8c5c1")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "19acd9a4-015e-4145-878a-065d4b82cf81")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "57c6e8b2-6782-47ec-b368-ea0f3ac08fe8")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "c18d7995-6b8e-431a-a8f4-aa722fe8e524")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.721 -3.27)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "37418b58-487c-400e-8a78-8d6c01dcdf85")
 	)
 	(fp_line
 		(start -1.721 -3.27)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "167dbeff-7229-4e2d-a7e6-95d7bed5fc50")
 	)
 	(fp_line
 		(start -1.721 -1.76)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "325e9d92-ddfd-4b8b-816d-7cbeae00d46f")
 	)
 	(fp_line
 		(start -1.721 1.371)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "909d8306-2c9d-4a51-8af3-78c1a7f07c7e")
 	)
 	(fp_line
 		(start 1.55 -3.27)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "eb78e22f-a330-4957-9172-d73283b384fc")
 	)
 	(fp_line
 		(start 5.25 -3.27)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6c80ddad-d5de-4f97-bd72-d3b6c2f1c6c5")
 	)
 	(fp_line
 		(start 8.52 -3.27)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c8b2c902-75a9-4f06-8320-bd3e7e08cf64")
 	)
 	(fp_line
 		(start -1.85 -3.4)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "de62fa64-8cc2-4753-a7f9-3056f39b78ff")
 	)
 	(fp_line
 		(start -1.85 1.51)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "141929ef-08fa-4881-a6e7-b672c5e1acfd")
 	)
 	(fp_line
 		(start 8.65 -3.4)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "941bf60f-9aee-4e3d-8bb2-2a9ac24da295")
 	)
 	(fp_line
 		(start 8.65 1.51)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6c23c4d5-0118-4e32-baa8-4eabff7d6c24")
 	)
 	(fp_line
 		(start -1.6 -3.15)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cdc182c3-19bc-404b-892a-d4b819c1bd64")
 	)
 	(fp_line
 		(start -1.6 -1.88)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9f7ff562-2e23-49d0-aba8-3524e36ecb2b")
 	)
 	(fp_line
 		(start -1.6 1.25)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f8a58b54-6628-49ec-b959-003f557da6c8")
 	)
 	(fp_line
 		(start 1.55 -3.15)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6f118008-ab5c-4504-867a-cbe47be29836")
 	)
 	(fp_line
 		(start 5.25 -3.15)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d242698f-829f-4ec7-817e-6f9c63329a03")
 	)
 	(fp_line
 		(start 8.4 -3.15)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0566a87b-6597-4880-ba5d-d74d65e5b334")
 	)
 	(fp_line
 		(start 8.4 1.25)
@@ -242,12 +186,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0078794f-2016-43c3-b9a4-c47b5f3fd326")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -4.27 0)
 		(layer "F.Fab")
-		(uuid "5361f065-f9e2-4c2d-a7c8-e607221d6e42")
 		(effects
 			(font
 				(size 1 1)
@@ -261,7 +203,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bcfb9ae7-3b27-4a0b-b831-f881a0e43528")
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
@@ -269,7 +210,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4035e630-88b1-43af-8080-03d0ff6a313b")
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
@@ -277,7 +217,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "eea02b54-67c1-4751-9303-64f6976b90b3")
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
@@ -285,7 +224,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2d97170d-19b3-47e6-a32a-343bb1366008")
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
@@ -293,7 +231,6 @@
 		(drill 1.1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "feadb0ea-64c4-44fa-8ec5-b7b98e70a388")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-5_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.08mm_StaggerOdd_Lead3.08mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.08mm_StaggerOdd_Lead3.08mm_Vertical.kicad_mod
index af82eaccf..40386dd6e 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.08mm_StaggerOdd_Lead3.08mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.08mm_StaggerOdd_Lead3.08mm_Vertical.kicad_mod
@@ -3,7 +3,7 @@
 	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-7, Vertical, RM 1.27mm, Heptawatt-V, NDZ0007B, staggered type-1, see https://www.mouser.com/datasheet/2/389/cd00000076-1795191.pdf#page=14, https://www.jedec.org/system/files/docs/TO-220L-01.pdf")
-	(tags "TO-220-7 Vertical RM 1.27mm Heptawatt NDZ0007B staggered type-1")
+	(tags "TO-220-7 Vertical RM 1.27mm Heptawatt-V NDZ0007B staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.81 -9 0)
 		(layer "F.SilkS")
diff --git a/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.1mm_StaggerOdd_Lead8.025mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.1mm_StaggerOdd_Lead8.025mm_TabDown.kicad_mod
index 4f3d8cadd..c99a68c29 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.1mm_StaggerOdd_Lead8.025mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-7_P2.54x5.1mm_StaggerOdd_Lead8.025mm_TabDown.kicad_mod
@@ -5,7 +5,7 @@
 	(descr "TO-220-7, Horizontal, RM 1.27mm, Heptawatt-H, staggered type-1, see https://www.mouser.com/datasheet/2/389/cd00000076-1795191.pdf#page=14, https://www.jedec.org/system/files/docs/TO-220L-01.pdf")
 	(tags "TO-220-7 Horizontal RM 1.27mm Heptawatt-H staggered type-1")
 	(property "Reference" "REF**"
-		(at 3.81 -24.595 0)
+		(at 3.81 -24.645 0)
 		(layer "F.SilkS")
 		(effects
 			(font
@@ -26,7 +26,7 @@
 	)
 	(attr through_hole)
 	(fp_line
-		(start -1.39 -23.595)
+		(start -1.39 -23.645)
 		(end -1.39 -7.906)
 		(stroke
 			(width 0.12)
@@ -35,8 +35,8 @@
 		(layer "F.SilkS")
 	)
 	(fp_line
-		(start -1.39 -23.595)
-		(end 9.01 -23.595)
+		(start -1.39 -23.645)
+		(end 9.01 -23.645)
 		(stroke
 			(width 0.12)
 			(type solid)
@@ -116,7 +116,7 @@
 		(layer "F.SilkS")
 	)
 	(fp_line
-		(start 9.01 -23.595)
+		(start 9.01 -23.645)
 		(end 9.01 -7.906)
 		(stroke
 			(width 0.12)
@@ -125,8 +125,8 @@
 		(layer "F.SilkS")
 	)
 	(fp_line
-		(start -1.52 -23.73)
-		(end -1.52 1.16)
+		(start -1.52 -23.78)
+		(end -1.52 1.15)
 		(stroke
 			(width 0.05)
 			(type solid)
@@ -134,8 +134,8 @@
 		(layer "F.CrtYd")
 	)
 	(fp_line
-		(start -1.52 1.16)
-		(end 9.14 1.16)
+		(start -1.52 1.15)
+		(end 9.14 1.15)
 		(stroke
 			(width 0.05)
 			(type solid)
@@ -143,8 +143,8 @@
 		(layer "F.CrtYd")
 	)
 	(fp_line
-		(start 9.14 -23.73)
-		(end -1.52 -23.73)
+		(start 9.14 -23.78)
+		(end -1.52 -23.78)
 		(stroke
 			(width 0.05)
 			(type solid)
@@ -152,8 +152,8 @@
 		(layer "F.CrtYd")
 	)
 	(fp_line
-		(start 9.14 1.16)
-		(end 9.14 -23.73)
+		(start 9.14 1.15)
+		(end 9.14 -23.78)
 		(stroke
 			(width 0.05)
 			(type solid)
@@ -161,8 +161,8 @@
 		(layer "F.CrtYd")
 	)
 	(fp_line
-		(start -1.27 -23.475)
-		(end 8.89 -23.475)
+		(start -1.27 -23.525)
+		(end 8.89 -23.525)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -171,7 +171,7 @@
 	)
 	(fp_line
 		(start -1.27 -17.175)
-		(end -1.27 -23.475)
+		(end -1.27 -23.525)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -260,7 +260,7 @@
 		(layer "F.Fab")
 	)
 	(fp_line
-		(start 8.89 -23.475)
+		(start 8.89 -23.525)
 		(end 8.89 -17.175)
 		(stroke
 			(width 0.1)
@@ -268,6 +268,15 @@
 		)
 		(layer "F.Fab")
 	)
+	(fp_line
+		(start 8.89 -17.175)
+		(end -1.27 -17.175)
+		(stroke
+			(width 0.1)
+			(type solid)
+		)
+		(layer "F.Fab")
+	)
 	(fp_line
 		(start 8.89 -17.175)
 		(end 8.89 -8.025)
@@ -287,8 +296,8 @@
 		(layer "F.Fab")
 	)
 	(fp_circle
-		(center 3.81 -20.675)
-		(end 5.685 -20.675)
+		(center 3.81 -20.725)
+		(end 5.685 -20.725)
 		(stroke
 			(width 0.1)
 			(type solid)
@@ -297,7 +306,7 @@
 		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
-		(at 3.81 -24.595 0)
+		(at 3.81 -24.645 0)
 		(layer "F.Fab")
 		(effects
 			(font
@@ -307,7 +316,7 @@
 		)
 	)
 	(pad "" np_thru_hole circle
-		(at 3.81 -20.675)
+		(at 3.81 -20.725)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
diff --git a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
index 46d4c2a6a..cf1eede1d 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-9, Vertical, RM 0.97mm, staggered type-2")
 	(tags "TO-220-9 Vertical RM 0.97mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.88 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "87419eb0-b238-44b7-ae4a-a1e83b05c066")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical"
 		(at 3.88 5.7 0)
 		(layer "F.Fab")
-		(uuid "d575076e-fd18-47b5-9f60-1a2437cbc09f")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "809d19ab-0b67-4ad8-92d0-509852556ae4")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "1cf1bc8e-b0f4-43bc-a7d0-07f9c98cfa7d")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "90979264-1908-47a2-8552-f205efdbe300")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.241 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ad8ffd34-d3a1-4eae-9ba0-e1fed6423202")
 	)
 	(fp_line
 		(start -1.241 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "879f2180-89a6-4cee-862e-9e9a1056b5da")
 	)
 	(fp_line
 		(start -1.241 -3.111)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "36d9cdb6-0748-4df3-8819-41e0f52f1002")
 	)
 	(fp_line
 		(start -1.241 0.021)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8aae49fc-9531-4388-8eaf-ab01ecc4c282")
 	)
 	(fp_line
 		(start 0.9 0.021)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "18502a0f-e92f-47a9-9758-552ebff5a1a5")
 	)
 	(fp_line
 		(start 0.97 0.021)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "94fcf6d8-d853-413a-aedb-9996698f4e19")
 	)
 	(fp_line
 		(start 2.03 -4.62)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5a450413-b5d7-42b6-bc88-cdf0cf63cffc")
 	)
 	(fp_line
 		(start 2.855 0.021)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c52c5634-c0de-41ec-b855-4df282e54fb4")
 	)
 	(fp_line
 		(start 2.91 0.021)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c31d366d-38d4-4d4c-afbe-c4e10f5cbeeb")
 	)
 	(fp_line
 		(start 4.795 0.021)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2e529828-5f00-44e3-bcf2-6a8a1259eb79")
 	)
 	(fp_line
 		(start 4.85 0.021)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "05b1c5d7-d413-42d2-8eeb-64e877cc547c")
 	)
 	(fp_line
 		(start 5.73 -4.62)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ec48039a-0055-4d01-99ca-e926ac6ab30d")
 	)
 	(fp_line
 		(start 6.735 0.021)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a3fe4f79-4092-4fe6-a488-39f9d4790661")
 	)
 	(fp_line
 		(start 6.79 0.021)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c1d026f7-c18b-4226-95b7-6e6cbce7740e")
 	)
 	(fp_line
 		(start 8.675 0.021)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "17bd5bdb-5458-46c5-982e-76e9d3752db8")
 	)
 	(fp_line
 		(start 9 -4.62)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2652b8ea-8c56-46e2-b806-1363510dcbd4")
 	)
 	(fp_line
 		(start -1.37 -4.75)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2442934d-dcc5-4141-880b-949150329cbf")
 	)
 	(fp_line
 		(start -1.37 4.7)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "a666cd82-2f9c-4427-9e68-40fa3f5ccfce")
 	)
 	(fp_line
 		(start 9.13 -4.75)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "4554157a-9de1-4733-a2f4-37b721a73718")
 	)
 	(fp_line
 		(start 9.13 4.7)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "1bd801f9-e39a-4621-a4fa-54bab3f22b22")
 	)
 	(fp_line
 		(start -1.12 -4.5)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4ad42c01-5b3c-4766-a727-5b3038df5352")
 	)
 	(fp_line
 		(start -1.12 -3.23)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9da228d1-a996-4878-81a3-f1c382f94df0")
 	)
 	(fp_line
 		(start -1.12 -0.1)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b1ffe7e0-5754-4f27-9f85-adf86b25ccca")
 	)
 	(fp_line
 		(start 0 -0.1)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bb0bdc00-8a13-4d09-ab35-99262411b84f")
 	)
 	(fp_line
 		(start 0.97 -0.1)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0871796c-bf85-492a-b9fd-c2b1365ece73")
 	)
 	(fp_line
 		(start 1.94 -0.1)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e4bd76dd-af91-43ec-800e-a04dfb3cf6db")
 	)
 	(fp_line
 		(start 2.03 -4.5)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9e6ee95b-e946-4458-9600-8b8fb3a819cb")
 	)
 	(fp_line
 		(start 2.91 -0.1)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b34bb241-3c00-4f82-8bde-69cb6f5c875d")
 	)
 	(fp_line
 		(start 3.88 -0.1)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c6ad537b-48a8-42be-90fd-d9d9d720381b")
 	)
 	(fp_line
 		(start 4.85 -0.1)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d3280aae-5f75-4103-8343-50ae1a1d7b49")
 	)
 	(fp_line
 		(start 5.73 -4.5)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2f682688-bc56-4252-8662-0c85a0b9727c")
 	)
 	(fp_line
 		(start 5.82 -0.1)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1c418c9d-41bc-4dda-925c-3c185945c0d6")
 	)
 	(fp_line
 		(start 6.79 -0.1)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "53590ced-e8f2-4915-8f64-846e7333f7df")
 	)
 	(fp_line
 		(start 7.76 -0.1)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f9af2f7d-4155-4fee-b8bd-bafff950d45c")
 	)
 	(fp_line
 		(start 8.88 -4.5)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f9bc4de3-1db0-49bc-9948-fa7eb6535d98")
 	)
 	(fp_line
 		(start 8.88 -0.1)
@@ -425,12 +348,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "39702a93-41e8-45cc-b161-2dbdb055f9d2")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.88 -5.62 0)
 		(layer "F.Fab")
-		(uuid "c84a3560-72df-4bd9-a198-10eada2b4968")
 		(effects
 			(font
 				(size 1 1)
@@ -444,71 +365,62 @@
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2fd70484-6c73-4018-b0ff-dc0965082c14")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 0.97 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6cdf8a1a-029f-490f-831d-4622533e4187")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 1.94 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1e877223-a347-4f9d-8a34-20d4aa97479d")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 2.91 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d62ba50a-ec9d-4890-ab82-7042fdb4d2c7")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 3.88 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e8c69e45-7ac8-4f29-a5e2-80abab0e763c")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 4.85 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "66bb45f1-30c5-4195-87c4-25968d12e2bb")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 5.82 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "66746fa8-ad57-4f83-bd52-68d57f0d59ae")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 6.79 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "18b7e929-2708-4af7-b0ae-6c4f32a26995")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 7.76 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e39bfce8-a729-4089-95fa-2bb06522a018")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-9_P1.94x3.7mm_StaggerEven_Lead3.8mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
index aad835b67..6bd88d292 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-9, Vertical, RM 0.97mm, staggered type-1")
 	(tags "TO-220-9 Vertical RM 0.97mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.88 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "34bc2e37-2aa2-4392-ba15-7ed7ca10c3ef")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical"
 		(at 3.88 2 0)
 		(layer "F.Fab")
-		(uuid "daa4962a-df0f-4f0c-a2e4-8e5eb7438e6e")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "c8c0c892-6b8d-4a13-95a0-1b5867003641")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "963513ba-682c-4cd9-b444-a89d5ded3725")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "468d34b1-b3db-46a5-b0b8-19047b385791")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.241 -8.32)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d036976c-6f1d-41a6-b46d-907a82c3e08d")
 	)
 	(fp_line
 		(start -1.241 -8.32)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0286ed86-96ef-48b2-8170-3c15f55453fd")
 	)
 	(fp_line
 		(start -1.241 -6.811)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b505143d-1029-4133-9787-97ea8066d43f")
 	)
 	(fp_line
 		(start -1.241 -3.679)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "95577a2b-a2f5-4df9-9a8f-af13c2ada51a")
 	)
 	(fp_line
 		(start 0 -3.679)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "078804f1-0964-4fbe-a848-9ccba3af840b")
 	)
 	(fp_line
 		(start 1.885 -3.679)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1ffb9822-29cc-4c54-b3dd-658ce75ad183")
 	)
 	(fp_line
 		(start 1.94 -3.679)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7b2fbd11-4c1f-47f4-bc00-5909927c80e1")
 	)
 	(fp_line
 		(start 2.03 -8.32)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "29731db6-c3c6-42da-bd67-dc693fd8b8f3")
 	)
 	(fp_line
 		(start 3.825 -3.679)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bdc11dfa-b413-4c8a-8c8b-af662b345643")
 	)
 	(fp_line
 		(start 3.88 -3.679)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "58625dfb-1b43-4006-b7d6-bdb8fa36dca3")
 	)
 	(fp_line
 		(start 5.73 -8.32)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3675afeb-0aac-4539-a9a5-9037d7215c3b")
 	)
 	(fp_line
 		(start 5.765 -3.679)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3eb0708d-3da0-4cbf-846d-d9a3c2952ac0")
 	)
 	(fp_line
 		(start 5.82 -3.679)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f865d206-1bfd-4b2a-90fc-35f9c2c085b1")
 	)
 	(fp_line
 		(start 7.705 -3.679)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "42fd4d65-faa2-4b6d-ad96-892bb87f823f")
 	)
 	(fp_line
 		(start 7.76 -3.679)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "89556669-9dbe-4ef6-b988-bf6a0ad124af")
 	)
 	(fp_line
 		(start 9 -8.32)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ad77e79c-fe9a-485a-ad14-99f6fbd10ad2")
 	)
 	(fp_line
 		(start -1.37 -8.45)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "fb7b80c1-c73d-4353-8cb0-60ecf12ea10d")
 	)
 	(fp_line
 		(start -1.37 1)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "a40d1782-34e5-4efb-af29-5bc0acc52cde")
 	)
 	(fp_line
 		(start 9.13 -8.45)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "96263326-6021-47eb-872a-b13e7bae2b20")
 	)
 	(fp_line
 		(start 9.13 1)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ce1720fa-d377-43c4-950e-4b4df610b536")
 	)
 	(fp_line
 		(start -1.12 -8.2)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "457314fc-43ef-46e8-a2d0-e8d52a2e89aa")
 	)
 	(fp_line
 		(start -1.12 -6.93)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f1a87825-7154-48cc-b6d1-45f543fdb349")
 	)
 	(fp_line
 		(start -1.12 -3.8)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f7808bb0-58c3-4cae-955f-89d123c0c197")
 	)
 	(fp_line
 		(start 0 -3.8)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "16d0e81c-f68d-487f-88a0-837e00127b2a")
 	)
 	(fp_line
 		(start 0.97 -3.8)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0791101f-12d6-4967-8ad5-0bd378e0835a")
 	)
 	(fp_line
 		(start 1.94 -3.8)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cc557e3c-fa82-4fec-a569-2592a4ab1a73")
 	)
 	(fp_line
 		(start 2.03 -8.2)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e631b09e-ea44-42b3-bbb4-050ecad3bd8b")
 	)
 	(fp_line
 		(start 2.91 -3.8)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "83f23fd4-a6f9-4a2b-90b5-50ba9aa6cbec")
 	)
 	(fp_line
 		(start 3.88 -3.8)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7066f008-eeaa-4589-afb4-3fbf877920a9")
 	)
 	(fp_line
 		(start 4.85 -3.8)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "61cec0c9-52f3-4829-9ca3-c0955a7bd37f")
 	)
 	(fp_line
 		(start 5.73 -8.2)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "efc6399c-2185-447f-9e2c-7484f2523556")
 	)
 	(fp_line
 		(start 5.82 -3.8)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2d4b9d98-03f9-404b-b2ce-d730895fd2b7")
 	)
 	(fp_line
 		(start 6.79 -3.8)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "34f85d51-c1dc-41ab-b2d5-eec6be6f1b1f")
 	)
 	(fp_line
 		(start 7.76 -3.8)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fabe8a26-ef9b-4b88-8363-832cd3b24af3")
 	)
 	(fp_line
 		(start 8.88 -8.2)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b97d98ad-9760-4d7c-9be4-9224485c52b0")
 	)
 	(fp_line
 		(start 8.88 -3.8)
@@ -425,12 +348,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0f5b6fc9-fcb3-4ed1-b801-6b3d935a10e4")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.88 -9.32 0)
 		(layer "F.Fab")
-		(uuid "10c66bff-573c-4d10-9df7-873bdf2c30ca")
 		(effects
 			(font
 				(size 1 1)
@@ -444,71 +365,62 @@
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fb1ab704-cfc1-45f7-80c7-caf233ffffea")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 0.97 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "70f5fb70-c514-4cda-af4d-cf4594986ddc")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 1.94 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "89c973c9-07cf-4313-83d5-26aa650a700c")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 2.91 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "43e51f91-fb82-420b-839b-65a7c72a0728")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 3.88 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1368e4b3-fbdd-414d-b795-6bfc3910217a")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 4.85 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "699c94d0-522f-4a2f-aae7-4657155f74b8")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 5.82 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "05d16f0f-c652-48b6-a737-18c58675a089")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 6.79 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "60a33005-dddd-475a-b29d-402d9dabc22f")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 7.76 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bf455240-a8ca-41e3-a748-678d07ae4207")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-9_P1.94x3.7mm_StaggerOdd_Lead3.8mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod
index dfc1582ff..2e33a8888 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-9, Horizontal, RM 0.97mm, staggered type-2")
 	(tags "TO-220-9 Horizontal RM 0.97mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.88 -18.82 0)
 		(layer "F.SilkS")
-		(uuid "4e850dc6-4ec7-4ef4-9812-4b666c9ebd78")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown"
 		(at 3.88 5.55 0)
 		(layer "F.Fab")
-		(uuid "c2f74164-0075-4adb-99a1-0f793464d005")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "199b5f31-789b-47c3-9d3f-fa9d09ef2a41")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "9279a62a-beac-4953-bf9e-95d17e81696a")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "09fa4e02-1b35-4d72-b70d-4dd2fa4fc542")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.241 -17.82)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "23399665-a7ea-4846-9ec0-32a4aeb42560")
 	)
 	(fp_line
 		(start -1.241 -17.82)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "743f4ce8-fe14-4b93-ad49-2a8aca483b23")
 	)
 	(fp_line
 		(start -1.241 -1.93)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "58b8cb37-7f1c-4df8-994e-72edc7fbdb1b")
 	)
 	(fp_line
 		(start 0 -1.93)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "65e6ad06-139f-409f-a1c0-71dbab1e7778")
 	)
 	(fp_line
 		(start 0.97 -1.93)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "aec77047-0ac4-4c56-a278-55e2a37aab81")
 	)
 	(fp_line
 		(start 1.94 -1.93)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5a822e04-2f25-476e-8a0f-028f77febde6")
 	)
 	(fp_line
 		(start 2.91 -1.93)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bdd775f4-8e0e-4037-a28f-06c197578f30")
 	)
 	(fp_line
 		(start 3.88 -1.93)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b556a163-99da-4ce6-b516-79b515f04727")
 	)
 	(fp_line
 		(start 4.85 -1.93)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "52d087ed-3977-456a-bc53-63bea7043cd8")
 	)
 	(fp_line
 		(start 5.82 -1.93)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5d04b839-b104-40c4-bdde-66e74dd6943c")
 	)
 	(fp_line
 		(start 6.79 -1.93)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "25724d70-fc8b-4699-bddf-ece32a741a38")
 	)
 	(fp_line
 		(start 7.76 -1.93)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9ab80f10-57df-463e-9131-2a11e8826b35")
 	)
 	(fp_line
 		(start 9 -17.82)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "890daa7c-c1ab-4560-aa39-a89345b700c8")
 	)
 	(fp_line
 		(start -1.37 -17.95)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "8285f808-b8ef-48ca-bd28-ddcfdb7c34bc")
 	)
 	(fp_line
 		(start -1.37 4.81)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "954515ef-ca88-4fd2-b014-0568c0ab92b6")
 	)
 	(fp_line
 		(start 9.13 -17.95)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "43402a44-e294-406a-aa3f-1a0976a2e200")
 	)
 	(fp_line
 		(start 9.13 4.81)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "f7410eb8-858e-486b-8248-79d29fccfa93")
 	)
 	(fp_line
 		(start -1.12 -17.7)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "56252197-23ba-43e4-823e-6df29211d6a2")
 	)
 	(fp_line
 		(start -1.12 -11.3)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "dac191bd-bc97-46d9-b6fc-c1050bd448cf")
 	)
 	(fp_line
 		(start -1.12 -11.3)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f9b615dc-69c3-4648-8e3b-210711f0b386")
 	)
 	(fp_line
 		(start -1.12 -2.05)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "06b70d67-fca0-4df7-a539-780eb7c9152c")
 	)
 	(fp_line
 		(start 0 -2.05)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "15d3912a-e4aa-4d97-a78a-1a711094fde6")
 	)
 	(fp_line
 		(start 0.97 -2.05)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9e0be6ff-3c34-4df1-b2a3-0806be2295bd")
 	)
 	(fp_line
 		(start 1.94 -2.05)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bd451d0c-b0bc-4c17-9017-8e0ba2d9a980")
 	)
 	(fp_line
 		(start 2.91 -2.05)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "dc304cbe-a9cd-4c08-b92a-d4a96b08e4da")
 	)
 	(fp_line
 		(start 3.88 -2.05)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bb54e6e9-b89b-4578-a9a8-14c0675a3e20")
 	)
 	(fp_line
 		(start 4.85 -2.05)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "922b0e6c-814a-415a-b89e-784759705a98")
 	)
 	(fp_line
 		(start 5.82 -2.05)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6d59b831-49ee-4def-a65d-8029a4fc8f81")
 	)
 	(fp_line
 		(start 6.79 -2.05)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "746ba260-f04f-4357-a9f8-b274571e726f")
 	)
 	(fp_line
 		(start 7.76 -2.05)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "34f22848-b29a-49aa-9e4e-a4d91a680d07")
 	)
 	(fp_line
 		(start 8.88 -17.7)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "dbbfa60e-ff2c-4edd-9d61-7c301083e430")
 	)
 	(fp_line
 		(start 8.88 -11.3)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ba2c207c-7d02-4102-9a2f-8146031c6dff")
 	)
 	(fp_line
 		(start 8.88 -11.3)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5d2308e0-8647-4393-ae2a-3431047fd2a9")
 	)
 	(fp_line
 		(start 8.88 -2.05)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bbed361e-263b-42e6-a570-34850bd168a0")
 	)
 	(fp_circle
 		(center 3.88 -14.9)
@@ -416,12 +340,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "429d34c5-9b58-41ea-9677-84c1d83c9671")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.88 -18.82 0)
 		(layer "F.Fab")
-		(uuid "c4964e5b-c1f7-4249-9646-82c3c12f006a")
 		(effects
 			(font
 				(size 1 1)
@@ -429,12 +351,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 3.88 -14.9)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "bbe23ef9-214e-4ab5-9ffb-0678ed76903c")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -442,71 +363,62 @@
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ce7fd86e-3fd5-4710-bd59-1933ecf4cde5")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 0.97 3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a5f0b656-43e7-4bae-b1df-5779ca7a342c")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 1.94 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "03a5e5cc-e3d0-4b9d-bca8-b452b59309e4")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 2.91 3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6bac6221-334b-4731-bc58-846eb2be7b5c")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 3.88 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bda55dee-5f11-4483-a575-90574cba1102")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 4.85 3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4cd6499d-59db-4c71-b3f0-1ef3f085a361")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 5.82 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "3d80828a-70e6-482d-aa0f-569dfd9002fd")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 6.79 3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ecadd6bb-5b69-4cc7-8a9a-a7688a6180b8")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 7.76 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a84e45a2-972a-4b35-b9ad-93cf62dc4e40")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-9_P1.94x3.8mm_StaggerEven_Lead5.85mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod
index 9962e0331..d9db87574 100644
--- a/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220-9, Horizontal, RM 0.97mm, staggered type-1")
 	(tags "TO-220-9 Horizontal RM 0.97mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.88 -22.62 0)
 		(layer "F.SilkS")
-		(uuid "ea61f6b4-6f42-4412-994b-094cb909265c")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown"
 		(at 3.88 1.75 0)
 		(layer "F.Fab")
-		(uuid "4fdaeae3-0042-4fb7-80a3-71f9c490ee59")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "7845707b-467b-4a11-8121-803a95d18fa9")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "02c54a16-d34e-4f3f-aaa3-02fc3de287ba")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "cff4061f-239d-4dd8-b34b-fab39c6e63ab")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.241 -21.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cf679f00-2982-4021-afec-c4435da944c2")
 	)
 	(fp_line
 		(start -1.241 -21.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f6b03fbe-36fa-4815-9ae9-f9c5189c3270")
 	)
 	(fp_line
 		(start -1.241 -5.73)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "05d03a53-78b5-4ba0-af57-bc806b1616ae")
 	)
 	(fp_line
 		(start 0 -5.73)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f6e0160f-179a-4449-81fe-8c618a92edea")
 	)
 	(fp_line
 		(start 0.97 -5.73)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "32e2c308-1f3a-4fe4-8672-802a1ba9088e")
 	)
 	(fp_line
 		(start 1.94 -5.73)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "db09357e-cb54-4931-9a91-f9b70310a8dd")
 	)
 	(fp_line
 		(start 2.91 -5.73)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "676afc8d-d6b9-4536-a90e-aff01c9c158d")
 	)
 	(fp_line
 		(start 3.88 -5.73)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d1399575-34cf-4334-a109-ddaa09cbe188")
 	)
 	(fp_line
 		(start 4.85 -5.73)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "16ff9490-c042-423b-a606-85fe7e1fb503")
 	)
 	(fp_line
 		(start 5.82 -5.73)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fbb09b2f-be4c-481f-80ee-607dc966473d")
 	)
 	(fp_line
 		(start 6.79 -5.73)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c22ecc6d-8519-44a4-95e2-0c2e86fb80ef")
 	)
 	(fp_line
 		(start 7.76 -5.73)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "68b72f3c-29bb-4284-bbc8-abbf5a0518ae")
 	)
 	(fp_line
 		(start 9 -21.62)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3dc0811b-6483-4238-9291-c6f150cefb02")
 	)
 	(fp_line
 		(start -1.37 -21.75)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "42ee5f9f-5880-4a50-b5ae-953c77db13d6")
 	)
 	(fp_line
 		(start -1.37 1.01)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "877dfcfb-7665-4e29-97f6-10016cee7847")
 	)
 	(fp_line
 		(start 9.13 -21.75)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "290cef69-70b1-4f7c-b5ff-a2a94d9ca636")
 	)
 	(fp_line
 		(start 9.13 1.01)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "8fb70a1c-4fcc-42f3-8296-6d4fdf238c2e")
 	)
 	(fp_line
 		(start -1.12 -21.5)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ca7c6b2d-9b27-4fb3-91b1-20d256a5c42c")
 	)
 	(fp_line
 		(start -1.12 -15.1)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1d8fb11f-aa48-466e-8265-3ea2c0645b47")
 	)
 	(fp_line
 		(start -1.12 -15.1)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "87ec12fc-14b5-4c2d-b8db-1de699e844e4")
 	)
 	(fp_line
 		(start -1.12 -5.85)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2e4b1a1a-3cbd-40bb-9c53-f8f2c45eeb00")
 	)
 	(fp_line
 		(start 0 -5.85)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3b92ee44-7886-43a3-8f78-692f5b9266dd")
 	)
 	(fp_line
 		(start 0.97 -5.85)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "777e623f-5f98-46ba-b65b-b6e41b99384a")
 	)
 	(fp_line
 		(start 1.94 -5.85)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f84970dc-04dd-4ab9-9512-9f440e13850e")
 	)
 	(fp_line
 		(start 2.91 -5.85)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5d80f3f4-d69c-4faa-9c13-f2d2d747d620")
 	)
 	(fp_line
 		(start 3.88 -5.85)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "09eac4d7-bc67-40e8-8095-27875a22cfc9")
 	)
 	(fp_line
 		(start 4.85 -5.85)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "017ed9d7-3d09-4d17-abde-56169b88dcd8")
 	)
 	(fp_line
 		(start 5.82 -5.85)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cb6f4a46-c8e8-4447-aec3-988775509f42")
 	)
 	(fp_line
 		(start 6.79 -5.85)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "94b80f94-7b1a-44b6-a7c3-59711ef445c7")
 	)
 	(fp_line
 		(start 7.76 -5.85)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "13848649-f2bd-4754-b386-e0a0c1fa575c")
 	)
 	(fp_line
 		(start 8.88 -21.5)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "94b852b0-83dc-4699-9936-918596aedeed")
 	)
 	(fp_line
 		(start 8.88 -15.1)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fa414d3e-e9e5-4450-875a-bb78b26051f3")
 	)
 	(fp_line
 		(start 8.88 -15.1)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9b58e099-c17d-4ae3-a10d-70aec2ab0628")
 	)
 	(fp_line
 		(start 8.88 -5.85)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d9644e86-1833-4b0e-8dea-f2856dcbda15")
 	)
 	(fp_circle
 		(center 3.88 -18.7)
@@ -416,12 +340,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "527dd667-9e04-42d9-a7b0-ddb3afcabec0")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.88 -22.62 0)
 		(layer "F.Fab")
-		(uuid "6ceca128-622a-4d61-9582-303713ab9cf7")
 		(effects
 			(font
 				(size 1 1)
@@ -429,12 +351,11 @@
 			)
 		)
 	)
-	(pad "" np_thru_hole oval
+	(pad "" np_thru_hole circle
 		(at 3.88 -18.7)
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "991630d8-dfc3-4543-aa36-9c713f269d21")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -442,71 +363,62 @@
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fd1927d8-0747-429b-aacf-894db0ea8be5")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 0.97 -3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "296223d4-a7f2-4024-91fe-9eb45c61594f")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 1.94 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "829d9f5b-0f26-4330-b550-29e2539afc13")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 2.91 -3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "035701e4-67bd-495f-a20e-f769ceb12613")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 3.88 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "26350e96-3ce2-4b07-879e-ba55ba83590a")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 4.85 -3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "95ae071d-b5c3-4f92-888e-e60dea18b4d0")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 5.82 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "19ec5c7c-583e-4a06-8f7f-46da838dc6af")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 6.79 -3.8)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6a81dcda-d267-47a1-83eb-1c585602c88b")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 7.76 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "231acd2b-e2dd-4bd0-84a5-c3cb202b6b6b")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220-9_P1.94x3.8mm_StaggerOdd_Lead5.85mm_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod
index aa98f5263..4fe4cb2b4 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-11, Vertical, RM 1.7mm, MultiwattF-11, staggered type-2, see http://www.ti.com/lit/ds/symlink/lm3886.pdf")
 	(tags "TO-220F-11 Vertical RM 1.7mm MultiwattF-11 staggered type-2")
 	(property "Reference" "REF**"
 		(at 8.5 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "818df6bb-9f13-40df-af68-6b89325c9906")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical"
 		(at 8.5 7.23 0)
 		(layer "F.Fab")
-		(uuid "b6d36137-e940-4c17-824b-653897a873c2")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d0dcc26f-7af7-4feb-ade4-587c6837d6a5")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "c9a368ec-f81d-476d-a853-9bc9f5a29531")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0338a2d3-7204-452c-a114-0d7273ebe03c")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.63 -4.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a900d2d2-70e2-42e9-a446-c6c9e4a87fbb")
 	)
 	(fp_line
 		(start -1.63 -4.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0dd3c758-e1de-468c-b05f-1c351b4145c6")
 	)
 	(fp_line
 		(start -1.63 -1.08)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0b791fba-1f7b-43db-aa9a-9bf290ee58d2")
 	)
 	(fp_line
 		(start -1.63 0.121)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ebe2ed6c-4c24-43da-b71f-11185c2fd2e3")
 	)
 	(fp_line
 		(start 1.05 0.121)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f99d2b1a-8994-433e-8bb2-c56914c05947")
 	)
 	(fp_line
 		(start 1.7 0.121)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a98596bd-7c7b-4119-a15e-c1e8b3b07366")
 	)
 	(fp_line
 		(start 4.465 0.121)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2ca5cd7e-062f-4197-98e0-46e577dff99c")
 	)
 	(fp_line
 		(start 5.1 0.121)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "eb9d6aaa-cf77-496d-8fe0-316f732ac15d")
 	)
 	(fp_line
 		(start 6.65 -4.62)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ab917cc4-9a71-4403-9c66-73fc6d183f1d")
 	)
 	(fp_line
 		(start 7.865 0.121)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "29a205df-8e2b-4ed9-97a2-ceee60d0bd0d")
 	)
 	(fp_line
 		(start 8.5 0.121)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7019c4fc-f579-4ae9-b8d2-5e2f8f6e5576")
 	)
 	(fp_line
 		(start 10.35 -4.62)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "94bfe4eb-736e-4cb5-a4d6-1eedb723a54c")
 	)
 	(fp_line
 		(start 11.265 0.121)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "705a8e06-e0ab-415d-b984-0d84a6b203ed")
 	)
 	(fp_line
 		(start 11.9 0.121)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e4a99550-5db5-4041-80ad-06fd3246ef0f")
 	)
 	(fp_line
 		(start 14.665 0.121)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "91cd3cb6-6f76-4fa6-a560-5761e4d0829c")
 	)
 	(fp_line
 		(start 15.3 0.121)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e5aa3cdc-25fe-49c8-9814-df1045f4ee8e")
 	)
 	(fp_line
 		(start 18.065 0.121)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9f260619-d198-477f-ba3c-39c1200c8d18")
 	)
 	(fp_line
 		(start 18.63 -4.62)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "266e80cf-c7ad-4312-9163-aed20892d986")
 	)
 	(fp_line
 		(start -1.76 -4.75)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "c93260a7-969d-45aa-9f7e-68596c5a0dc8")
 	)
 	(fp_line
 		(start -1.76 6.23)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "be650d31-5f69-46b8-b21f-6caf7a56d8fb")
 	)
 	(fp_line
 		(start 18.76 -4.75)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "b849a2d7-40c6-4047-8c44-e0bcb020a89d")
 	)
 	(fp_line
 		(start 18.76 6.23)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "90911fc6-bb56-41e9-b0b5-aa7f9523a88f")
 	)
 	(fp_line
 		(start -1.51 -4.5)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c6f1db8c-4762-4e49-aa9a-385ffa0be2ba")
 	)
 	(fp_line
 		(start -1.51 -1.2)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1928d7f0-8003-4ea2-b968-80a3391edadb")
 	)
 	(fp_line
 		(start -1.51 0)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7ef6b1a2-5a4c-466c-8beb-c909e5450e56")
 	)
 	(fp_line
 		(start 1.7 0)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "525e525c-d551-48c4-83f6-5d708b2921a1")
 	)
 	(fp_line
 		(start 5.1 0)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "483ac6be-f906-4471-9aad-711481c2ed87")
 	)
 	(fp_line
 		(start 6.65 -4.5)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5b2787a2-cd8a-47c5-af09-c691d855f892")
 	)
 	(fp_line
 		(start 8.5 0)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "01f71627-5d89-414c-86ad-a8db4d9a4873")
 	)
 	(fp_line
 		(start 10.35 -4.5)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ff81abbd-ceb0-44ef-ad51-32a7f5899497")
 	)
 	(fp_line
 		(start 11.9 0)
@@ -372,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c9a7c2f8-2359-4f3e-b67d-1dec7d5a434a")
 	)
 	(fp_line
 		(start 15.3 0)
@@ -382,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c280514b-e722-4c4d-9fdc-820140d33336")
 	)
 	(fp_line
 		(start 18.51 -4.5)
@@ -392,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "82c39cea-6c89-441d-9c52-2fc109bd904c")
 	)
 	(fp_line
 		(start 18.51 0)
@@ -402,12 +330,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "8b5e09b7-ee6e-4a88-9dc6-18c95952b9f4")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.5 -5.62 0)
 		(layer "F.Fab")
-		(uuid "432fb509-d673-4336-bece-7160c9aa350a")
 		(effects
 			(font
 				(size 1 1)
@@ -421,87 +347,76 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e9a93c42-13ec-428e-a382-af4366fc46b7")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "59373493-fac2-4553-b57c-d6e5f3260043")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "62ba46cd-0511-4f70-a998-57c4c824680e")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e8108a3b-2a09-4c6c-9919-49969477b4c7")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bff37e5f-20c0-43f4-8747-e9318654de67")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 8.5 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5eaf9d13-b62a-4bcc-9bfd-7ee4d2659f9a")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 10.2 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7af8ba20-02c5-4233-abab-0e0a8bc90959")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 11.9 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a800580c-6e6c-4fb9-aeb5-d811f0d6519c")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 13.6 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "918648c9-12b3-4837-9a88-b68598b8e7e9")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 15.3 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "26bccc59-5263-471e-97a0-215fa22121ec")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 17 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "244e6f07-f328-4181-9689-c4fd080cab7d")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-11_P3.4x5.08mm_StaggerEven_Lead5.08mm_Vertical.wrl"
 		(offset
@@ -514,4 +429,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod
index 83299489e..627729491 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-11, Vertical, RM 1.7mm, MultiwattF-11, staggered type-1, see http://www.ti.com/lit/ds/symlink/lm3886.pdf")
 	(tags "TO-220F-11 Vertical RM 1.7mm MultiwattF-11 staggered type-1")
 	(property "Reference" "REF**"
 		(at 8.5 -10.7 0)
 		(layer "F.SilkS")
-		(uuid "80f6672a-18f3-4a59-9b28-a279192c4e04")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical"
 		(at 8.5 2.15 0)
 		(layer "F.Fab")
-		(uuid "80ec5453-87cb-45e5-906a-13a1f145bd0e")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "cc963345-fc80-4919-9657-2f3ff866d03d")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "96245d3a-e567-4d23-a329-860457c5c2fc")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "fb4efc64-0f18-45de-a6f6-5ffa784d537e")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.63 -9.7)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "164831a7-cd78-4e22-8dab-6f67ab85a54f")
 	)
 	(fp_line
 		(start -1.63 -9.7)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c5417862-a9f6-4c54-b001-d7d63828d8ff")
 	)
 	(fp_line
 		(start -1.63 -6.16)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e1de04c4-5baf-4d5c-b1ca-f3ef0c47611c")
 	)
 	(fp_line
 		(start -1.63 -4.959)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "91d706e5-d9ff-4d47-8709-34054fccf9de")
 	)
 	(fp_line
 		(start 0 -4.959)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "faf7f937-a06d-4b25-a9fe-45cf75c0e389")
 	)
 	(fp_line
 		(start 2.765 -4.959)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cf2a64b4-54e9-4ef8-9127-39a8a3d5fbfa")
 	)
 	(fp_line
 		(start 3.4 -4.959)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3db6076e-07ad-41c3-8876-756e8995ea06")
 	)
 	(fp_line
 		(start 6.165 -4.959)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "40edf74c-f60e-43cf-8e54-8d2591030515")
 	)
 	(fp_line
 		(start 6.65 -9.7)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "05208471-da8e-42aa-877b-cedcbc86fa8d")
 	)
 	(fp_line
 		(start 6.8 -4.959)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "94cd5b93-6421-46dc-a7c7-310861dee861")
 	)
 	(fp_line
 		(start 9.566 -4.959)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d8348139-f499-4dba-8e5c-b31e49541c42")
 	)
 	(fp_line
 		(start 10.2 -4.959)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c43a7c11-fc5d-494a-a258-1b34f4617996")
 	)
 	(fp_line
 		(start 10.35 -9.7)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "67a23918-e304-477d-b1cf-c5deb8e7186c")
 	)
 	(fp_line
 		(start 12.965 -4.959)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b18802bd-b2c3-45a2-a0f0-6e035964aaf7")
 	)
 	(fp_line
 		(start 13.6 -4.959)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0f9e5d55-995f-4e0a-ad3b-f00107cedfbb")
 	)
 	(fp_line
 		(start 16.365 -4.959)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "74dcb260-6276-4f4e-9a7f-833f7e8143f3")
 	)
 	(fp_line
 		(start 17 -4.959)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9b5a3847-6d66-4731-aa39-8d006347ea91")
 	)
 	(fp_line
 		(start 18.63 -9.7)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a63db2be-d38e-4caa-b268-9d045cfbaec7")
 	)
 	(fp_line
 		(start -1.76 -9.83)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "67df7bee-3da9-42b3-a8a6-8910d4a83993")
 	)
 	(fp_line
 		(start -1.76 1.16)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "67ec1529-b538-4029-9379-248f7a94bb4e")
 	)
 	(fp_line
 		(start 18.76 -9.83)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "28b64e2e-73cc-42f2-b31f-10e928bb3a6e")
 	)
 	(fp_line
 		(start 18.76 1.16)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2d552ba7-7540-4ec8-b44d-414a6b0b3411")
 	)
 	(fp_line
 		(start -1.51 -9.58)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3e0c7c9b-fc8a-401b-a106-9cf92c4f5e57")
 	)
 	(fp_line
 		(start -1.51 -6.28)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0375ecb8-bf48-44c3-87de-c38b14e21304")
 	)
 	(fp_line
 		(start -1.51 -5.08)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e18a0a28-e434-4d0d-b2b5-6b5ff745b417")
 	)
 	(fp_line
 		(start 0 -5.08)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1068f259-f207-42de-bb84-3c8adafc003c")
 	)
 	(fp_line
 		(start 3.4 -5.08)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d0409c96-5a5c-46b9-9d7d-0af9bafe1050")
 	)
 	(fp_line
 		(start 6.65 -9.58)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ea022490-de66-442b-a030-74f4b87903db")
 	)
 	(fp_line
 		(start 6.8 -5.08)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b479e4cc-0f37-4276-a121-0622c6746167")
 	)
 	(fp_line
 		(start 10.2 -5.08)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "32880dd0-a58d-4927-b566-94cb99fe0f6e")
 	)
 	(fp_line
 		(start 10.35 -9.58)
@@ -372,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f9e8297d-321b-4833-a38b-e3155f71c650")
 	)
 	(fp_line
 		(start 13.6 -5.08)
@@ -382,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4eeb14df-0bda-4d25-9a86-c954929d8612")
 	)
 	(fp_line
 		(start 17 -5.08)
@@ -392,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c58e1098-af00-4c1b-aa64-335fb2ae8e6a")
 	)
 	(fp_line
 		(start 18.51 -9.58)
@@ -402,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "96c764cb-f530-4816-9b18-86f3d605ea1a")
 	)
 	(fp_line
 		(start 18.51 -5.08)
@@ -412,12 +339,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7d834f82-1bac-464d-aecb-5cf5c04997c1")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.5 -10.7 0)
 		(layer "F.Fab")
-		(uuid "2cbf5e9b-7931-4472-8091-aeab7ec515df")
 		(effects
 			(font
 				(size 1 1)
@@ -431,87 +356,76 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5be7e68c-ec36-4d71-bf85-2de5f441d51d")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1b80e9b7-828e-4464-9fa5-50e29b0ab95e")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4807d988-1061-45dc-809d-ec342a4afaff")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "92c75f35-1601-4f63-aae4-92a8f50e03b6")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "50d65d10-41ba-4ba2-b180-1e134f702e7f")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 8.5 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1b3545d9-6779-4ad8-b383-62fcbd053911")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 10.2 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "8c76bc4c-e643-4098-974d-b07b1ca5f208")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 11.9 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "525d489f-f556-409a-a4e2-f3288200e963")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 13.6 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4f466374-20b2-4d4b-ae0d-728aa01d9b04")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 15.3 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "92b7c8cd-5add-4443-aeb8-d26fdb5bd549")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 17 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9c6c19fc-d000-4100-a6ed-4242f1c330c2")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-11_P3.4x5.08mm_StaggerOdd_Lead5.08mm_Vertical.wrl"
 		(offset
@@ -524,4 +438,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod
index 64980ebca..b411351e5 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-15, Vertical, RM 1.27mm, MultiwattF-15, staggered type-2")
 	(tags "TO-220F-15 Vertical RM 1.27mm MultiwattF-15 staggered type-2")
 	(property "Reference" "REF**"
 		(at 8.89 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "e24c6876-3ad0-417d-a971-8a2694aa8644")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical"
 		(at 8.89 7.23 0)
 		(layer "F.Fab")
-		(uuid "2a1facb8-ab4c-4dc7-bd86-53b039401a37")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0646b3ff-79e1-48bb-b4db-30b5b30a9f7c")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "529f8bbb-5d91-4589-8c7c-96c6044478ce")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4a6883a9-48a5-4a0f-a19b-03f68b7fd57a")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.24 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5e441973-3580-4b72-89fe-3e0028319b51")
 	)
 	(fp_line
 		(start -1.24 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ebaf028d-842c-4ef5-a7cf-e4608579adf2")
 	)
 	(fp_line
 		(start -1.24 -1.08)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f9239760-eeb2-4dd8-9620-e73db9c00875")
 	)
 	(fp_line
 		(start -1.24 0.121)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9b71fb59-a572-47c9-b548-0e08ad6577bc")
 	)
 	(fp_line
 		(start 1.05 0.121)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "36da23df-7cb3-4e0e-b5d7-d9d433a3618f")
 	)
 	(fp_line
 		(start 1.27 0.121)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2eddbf90-0538-4093-99b9-fa8ea14a3a4d")
 	)
 	(fp_line
 		(start 3.605 0.121)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e0451d70-723a-4a11-96a8-d748d138e78c")
 	)
 	(fp_line
 		(start 3.81 0.121)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "85974f12-cdb9-4728-9866-502e261ea76d")
 	)
 	(fp_line
 		(start 6.145 0.121)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7a8eb93e-dbbd-44e5-8ea7-de322ffe3c17")
 	)
 	(fp_line
 		(start 6.35 0.121)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2da8556d-c72b-48db-9ea9-d23a2e5dd9ad")
 	)
 	(fp_line
 		(start 7.041 -4.62)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "12814e55-316d-453d-9327-257b5ab3273c")
 	)
 	(fp_line
 		(start 8.685 0.121)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2daf6709-7679-456d-a0a8-52dd228a6f2c")
 	)
 	(fp_line
 		(start 8.89 0.121)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d384802a-8a93-4b84-9c24-faa3a70a340e")
 	)
 	(fp_line
 		(start 10.74 -4.62)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b4edd79d-9516-4937-bae2-c0f260c7ace6")
 	)
 	(fp_line
 		(start 11.225 0.121)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "79ae6fe2-407b-4247-a5b5-59c6b8760a84")
 	)
 	(fp_line
 		(start 11.43 0.121)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f5635567-7d30-45ed-a9e1-bb94aedb043d")
 	)
 	(fp_line
 		(start 13.765 0.121)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "39bf3144-6028-4b65-bbf6-291d5ad09e9a")
 	)
 	(fp_line
 		(start 13.97 0.121)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0f160043-abea-4b64-8890-e04e59dfd282")
 	)
 	(fp_line
 		(start 16.305 0.121)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5df2b114-e61d-45eb-8572-bd40b7b57a06")
 	)
 	(fp_line
 		(start 16.51 0.121)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "214049b1-a047-450f-9318-dbdab1240de5")
 	)
 	(fp_line
 		(start 18.845 0.121)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f252e7ff-cce8-4090-a1ba-1038bd60965a")
 	)
 	(fp_line
 		(start 19.02 -4.62)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7a344065-9e23-4560-8f77-818795502758")
 	)
 	(fp_line
 		(start -1.37 -4.75)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "96b600aa-c5eb-4282-a0ef-554e993b09f9")
 	)
 	(fp_line
 		(start -1.37 6.23)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "f6c50fe8-72eb-4fe2-82d3-7b4d18ea374d")
 	)
 	(fp_line
 		(start 19.15 -4.75)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "d6615787-96c6-43a5-8900-6ec2de2f5238")
 	)
 	(fp_line
 		(start 19.15 6.23)
@@ -325,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e1945cba-693a-4757-866b-ffd02eb1e6b0")
 	)
 	(fp_line
 		(start -1.12 -4.5)
@@ -335,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a62a7e53-94c7-4e6a-b8d2-0cc9fea05bf9")
 	)
 	(fp_line
 		(start -1.12 -1.2)
@@ -345,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b2d19c7f-053b-4d33-ad00-afe6554d9afd")
 	)
 	(fp_line
 		(start -1.12 0)
@@ -355,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "60939a47-d18b-474b-bf9b-e8c58951b6cc")
 	)
 	(fp_line
 		(start 1.27 0)
@@ -365,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a8af6a7f-5356-4c42-98a2-05ea75e1c151")
 	)
 	(fp_line
 		(start 3.81 0)
@@ -375,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5e4b67e8-19a9-460c-8d7a-68f9afb961a9")
 	)
 	(fp_line
 		(start 6.35 0)
@@ -385,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "58131c3f-f3f7-4f66-96cf-b5588c6c7724")
 	)
 	(fp_line
 		(start 7.04 -4.5)
@@ -395,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "327e46f0-0f6f-4a9f-83f9-1d97a65c5e03")
 	)
 	(fp_line
 		(start 8.89 0)
@@ -405,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ce581ca7-f453-4c34-8fd0-4f267e6ae637")
 	)
 	(fp_line
 		(start 10.74 -4.5)
@@ -415,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9b332dfd-8935-4d9d-89f9-e5f9780ef66a")
 	)
 	(fp_line
 		(start 11.43 0)
@@ -425,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e09954f7-4731-40f5-a764-fb76a8ef71a0")
 	)
 	(fp_line
 		(start 13.97 0)
@@ -435,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "72d1c370-8860-49d4-b786-3633a412a4a4")
 	)
 	(fp_line
 		(start 16.51 0)
@@ -445,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "dae68aef-f5c3-4157-8d6e-37b66fb31b2c")
 	)
 	(fp_line
 		(start 18.9 -4.5)
@@ -455,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e649ce81-f9e9-4ea7-b84c-0d79cdb8e562")
 	)
 	(fp_line
 		(start 18.9 0)
@@ -465,12 +384,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a279c826-9816-4632-85e4-a09f85ca022f")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 -5.62 0)
 		(layer "F.Fab")
-		(uuid "8f4de89b-1d5e-4026-b6b2-fd686c419f86")
 		(effects
 			(font
 				(size 1 1)
@@ -484,119 +401,104 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9199f6be-a7d3-4001-ab18-97cbe1cdce56")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "01c16cc3-8d0f-4d88-a2a6-448a14a6cadc")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "3ebfab4b-f006-4dd6-9299-1772433b3610")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a9cae10c-aa17-406d-ab51-9d03a991cb49")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "3fad6835-3040-4b7b-b152-aa307ad020ab")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ff7bbf81-8a72-440c-a30a-1ead490b9055")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6c091ef0-7eaa-44b8-ad32-e6be5ee71508")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 8.89 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "495740f1-d294-4925-9327-54edf14d7a72")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 10.16 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d616ed6c-4333-482e-90a7-49f27deb8fcd")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 11.43 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "846757e2-67d6-4b77-b3d6-57cd622ab43d")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 12.7 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "efecb87e-49d0-4c5f-a101-dc5626e79969")
 	)
-	(pad "12" thru_hole oval
+	(pad "12" thru_hole circle
 		(at 13.97 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1d31159a-2a3f-48f4-a19f-dc6d3df3077f")
 	)
-	(pad "13" thru_hole oval
+	(pad "13" thru_hole circle
 		(at 15.24 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0ace561e-9aa6-4b20-ba86-ad10d7e28d03")
 	)
-	(pad "14" thru_hole oval
+	(pad "14" thru_hole circle
 		(at 16.51 5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b9e5a54e-3f4a-4a8b-8a4f-6532e534d369")
 	)
-	(pad "15" thru_hole oval
+	(pad "15" thru_hole circle
 		(at 17.78 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ec851fd0-66fd-4d2b-ba9e-cd2061a7454d")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-15_P2.54x5.08mm_StaggerEven_Lead5.08mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod
index 2b7290a45..44e444873 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-15, Vertical, RM 1.27mm, MultiwattF-15, staggered type-1")
 	(tags "TO-220F-15 Vertical RM 1.27mm MultiwattF-15 staggered type-1")
 	(property "Reference" "REF**"
 		(at 8.89 -10.7 0)
 		(layer "F.SilkS")
-		(uuid "87b9f11f-20cd-4a9d-9c78-c6dcff9157b4")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical"
 		(at 8.89 2.15 0)
 		(layer "F.Fab")
-		(uuid "53cc665a-8803-475d-bc48-5e972fc71a88")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "20c3f110-fee7-4092-b7de-c473c080aa02")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "60da4aed-b0ee-4f1e-9f5c-d3c9f27c8452")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d3382c18-952a-403c-a5e4-6137ab90cb44")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.24 -9.7)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4cc06b1b-aac0-4223-a048-b75f3707da95")
 	)
 	(fp_line
 		(start -1.24 -9.7)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1a1de270-31c0-4ecf-878e-956a5a76966f")
 	)
 	(fp_line
 		(start -1.24 -6.16)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d0be5dd9-1f50-44c6-9f7b-0e0641b32d74")
 	)
 	(fp_line
 		(start -1.24 -4.959)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "75f6b119-6990-41ca-9d95-19987cda0d60")
 	)
 	(fp_line
 		(start 0 -4.959)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e250d16a-dba8-44ef-8a10-0c67ee559864")
 	)
 	(fp_line
 		(start 2.336 -4.959)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d80133d9-b276-4dfa-b7a1-36abfddd696c")
 	)
 	(fp_line
 		(start 2.54 -4.959)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6579eeaa-c4f5-40a2-81e1-8f2e1fd5ac3d")
 	)
 	(fp_line
 		(start 4.875 -4.959)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "01644d44-8e4b-401e-8672-d3cd4b7ae17e")
 	)
 	(fp_line
 		(start 5.08 -4.959)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f234f7dc-e208-458b-920f-0e2fdba86a13")
 	)
 	(fp_line
 		(start 7.041 -9.7)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "63a7fd05-934f-4754-bea8-2831a58a4f28")
 	)
 	(fp_line
 		(start 7.415 -4.959)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "15d9ef87-555e-4a04-b3e3-7520bfa4a87e")
 	)
 	(fp_line
 		(start 7.62 -4.959)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b7d6b476-81b3-4564-97ad-d99c6400f058")
 	)
 	(fp_line
 		(start 9.955 -4.959)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6c1c4c7d-8b5d-48ed-95af-3c921a17532c")
 	)
 	(fp_line
 		(start 10.16 -4.959)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "66897515-4fc6-492f-b700-5e3c4bfc0196")
 	)
 	(fp_line
 		(start 10.74 -9.7)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "485d1dac-5e3a-4c9d-a26d-478593081269")
 	)
 	(fp_line
 		(start 12.495 -4.959)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fd9b45e7-f297-46f4-a105-794b0726fe43")
 	)
 	(fp_line
 		(start 12.7 -4.959)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f5c1b2f1-c8d8-4f93-8da8-e6c5f89e3a89")
 	)
 	(fp_line
 		(start 15.035 -4.959)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "56a54f84-1941-46ba-8146-e6de83850a38")
 	)
 	(fp_line
 		(start 15.24 -4.959)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "acffbb79-b672-4a17-880a-fee929946f31")
 	)
 	(fp_line
 		(start 17.575 -4.959)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9b800e87-1db4-4fa4-9fbb-7a62f9d03b69")
 	)
 	(fp_line
 		(start 17.78 -4.959)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c3ca4044-ff9c-4ffd-b33f-9153ccdc98bf")
 	)
 	(fp_line
 		(start 19.02 -9.7)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8a899466-668a-4b3b-b5b6-a44609042d08")
 	)
 	(fp_line
 		(start -1.37 -9.83)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e4f48e3a-27c3-4ed3-9fc1-8b67d3398703")
 	)
 	(fp_line
 		(start -1.37 1.16)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "433b964e-1fb9-41e9-8f38-c9270d05cea5")
 	)
 	(fp_line
 		(start 19.15 -9.83)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "685352d6-d09f-4c51-825a-5199d10ef5e1")
 	)
 	(fp_line
 		(start 19.15 1.16)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "b5d0615e-e533-447f-b10a-59874ec01b74")
 	)
 	(fp_line
 		(start -1.12 -9.58)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e5bab234-e621-4f4c-a1db-fd4107725414")
 	)
 	(fp_line
 		(start -1.12 -6.28)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "56736557-2901-4a0b-bf8a-5a3d3ee39099")
 	)
 	(fp_line
 		(start -1.12 -5.08)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "419e931f-3896-4f3b-9b93-2c91f2584a0f")
 	)
 	(fp_line
 		(start 0 -5.08)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7b5bd99c-91ef-46c4-9af4-aeb5686842a8")
 	)
 	(fp_line
 		(start 2.54 -5.08)
@@ -372,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "db27584d-6980-4c35-9830-d775a4c46834")
 	)
 	(fp_line
 		(start 5.08 -5.08)
@@ -382,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "95450f41-01af-47e8-911a-a3045a8b5ec5")
 	)
 	(fp_line
 		(start 7.04 -9.58)
@@ -392,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d447534e-3acd-41ce-b956-e32cc2245651")
 	)
 	(fp_line
 		(start 7.62 -5.08)
@@ -402,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fa23904b-cfeb-44df-bd75-0c90a608322c")
 	)
 	(fp_line
 		(start 10.16 -5.08)
@@ -412,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "00d1e44e-3c49-4958-8c98-b8688855f45f")
 	)
 	(fp_line
 		(start 10.74 -9.58)
@@ -422,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2abe478c-8e36-41f1-8871-013d220c69fe")
 	)
 	(fp_line
 		(start 12.7 -5.08)
@@ -432,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ec2439ec-1fe7-4afd-916c-46661a99aa46")
 	)
 	(fp_line
 		(start 15.24 -5.08)
@@ -442,7 +366,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "eba64e33-4b2e-4b05-9d59-c63834bcad0d")
 	)
 	(fp_line
 		(start 17.78 -5.08)
@@ -452,7 +375,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9684ef81-c520-4d05-ade2-021ed764bfd7")
 	)
 	(fp_line
 		(start 18.9 -9.58)
@@ -462,7 +384,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9d3feb8e-e442-4575-9b42-934359e6808f")
 	)
 	(fp_line
 		(start 18.9 -5.08)
@@ -472,12 +393,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ba9bbdb9-e850-45dc-a5f8-324296b9ca6e")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 8.89 -10.7 0)
 		(layer "F.Fab")
-		(uuid "95f99eff-5dbc-4ee8-a7b6-d626fe580eef")
 		(effects
 			(font
 				(size 1 1)
@@ -491,119 +410,104 @@
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f312200f-c797-457f-b6ff-b98fd5f6f4e3")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "caa3fe42-574a-4652-afe4-c72201b97311")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "5a0f19b4-1004-4b54-8b02-881853d9fd4a")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "53dc5af3-b64e-4937-9619-40bcf228bbe5")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2e62f26f-8fe0-43b2-b7f4-6b08a8c4edbe")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f0e16c77-8944-48bc-821a-cb8a4c179463")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "39dd0ff7-3ac2-42f3-bc46-bc333b8eb43b")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 8.89 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "714c6252-ea5e-4d95-8611-9bdaf32eecca")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 10.16 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "253c02fa-8d04-4674-bda6-7d3fc69d20f6")
 	)
-	(pad "10" thru_hole oval
+	(pad "10" thru_hole circle
 		(at 11.43 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "8fa4fd70-a4a3-44c2-a10d-51b8ea593f28")
 	)
-	(pad "11" thru_hole oval
+	(pad "11" thru_hole circle
 		(at 12.7 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d1eeba5b-fe7d-4b8b-b06b-b15f29e07649")
 	)
-	(pad "12" thru_hole oval
+	(pad "12" thru_hole circle
 		(at 13.97 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "85a2713d-1631-4d8e-b4d0-137d1a497b21")
 	)
-	(pad "13" thru_hole oval
+	(pad "13" thru_hole circle
 		(at 15.24 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "458e4076-1fd2-4793-a575-e10c1862463c")
 	)
-	(pad "14" thru_hole oval
+	(pad "14" thru_hole circle
 		(at 16.51 -5.08)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c560c5c5-675d-4c31-b46d-e20097dae117")
 	)
-	(pad "15" thru_hole oval
+	(pad "15" thru_hole circle
 		(at 17.78 0)
 		(size 1.8 1.8)
 		(drill 1)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4a3020db-9bf7-49a5-b64b-29d301ec7b7e")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-15_P2.54x5.08mm_StaggerOdd_Lead5.08mm_Vertical.wrl"
 		(offset
@@ -616,4 +520,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabDown.kicad_mod
index 2c778c2ba..b8c2d6216 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabDown.kicad_mod
@@ -212,8 +212,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -20.22 0)
@@ -235,15 +235,15 @@
 		(at 0 0)
 		(size 2 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 2 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-2_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabUp.kicad_mod
index d8bfd31ce..10af8f677 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-2_Horizontal_TabUp.kicad_mod
@@ -311,8 +311,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 20.22 0)
@@ -334,15 +334,15 @@
 		(at 0 0)
 		(size 2 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 2 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-2_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-2_Vertical.kicad_mod
index 7ede20271..19f41df53 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-2_Vertical.kicad_mod
@@ -219,15 +219,15 @@
 		(at 0 0)
 		(size 2 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 2 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabDown.kicad_mod
index c3642bf9a..0feda7bf1 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabDown.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -20.22 0)
@@ -253,22 +253,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabUp.kicad_mod
index d25501da4..36a8b62cd 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-3_Horizontal_TabUp.kicad_mod
@@ -329,8 +329,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 20.22 0)
@@ -352,22 +352,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-3_Vertical.kicad_mod
index 4a55942d9..4512a0210 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-3_Vertical.kicad_mod
@@ -228,22 +228,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabDown.kicad_mod
index d51fd022e..01672b1b0 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabDown.kicad_mod
@@ -248,8 +248,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -20.22 0)
@@ -271,29 +271,29 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabUp.kicad_mod
index 049605fb3..17d81170d 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_Horizontal_TabUp.kicad_mod
@@ -347,8 +347,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 20.22 0)
@@ -370,29 +370,29 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical.kicad_mod
index 40f0e0a52..13e483c61 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-4, Vertical, RM 2.54mm, staggered type-2, see https://www.njr.com/semicon/PDF/package/TO-220F-4_E.pdf")
 	(tags "TO-220F-4 Vertical RM 2.54mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.81 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "41c174eb-9499-478c-a355-40e7280a8deb")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical"
 		(at 3.81 4.2 0)
 		(layer "F.Fab")
-		(uuid "9baaf3e2-c568-4393-bb71-ce0bc3e30d4a")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "22a85d37-48ef-4f89-9a68-f0409fe8a6d7")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "715bb74e-a9db-4671-a6db-4987c85c6ff6")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "810796d8-57da-40b4-b1ca-9582c06fb54f")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.44 -4.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4eae1bb1-3e43-4291-97d4-5ce18ada86da")
 	)
 	(fp_line
 		(start -1.44 -4.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a9713bfb-7e6c-4e8c-b04e-ad72d03bba38")
 	)
 	(fp_line
 		(start -1.44 -1.861)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e80f1379-cdb4-48af-9022-7197173263a7")
 	)
 	(fp_line
 		(start -1.44 0.321)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6501d442-027f-4cf6-8ba9-373ffbd84cbd")
 	)
 	(fp_line
 		(start 1.05 0.321)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9fbf332b-ecb6-4af5-80fe-b74e1c6fae8b")
 	)
 	(fp_line
 		(start 1.96 -4.62)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8bba7c33-50fe-45b7-a1a5-59c4192cfdeb")
 	)
 	(fp_line
 		(start 2.54 0.321)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6eddb0d1-3fbc-4b9b-abbb-74fc9be415b3")
 	)
 	(fp_line
 		(start 5.66 -4.62)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "150b1359-ca77-4a05-9cd1-bd4ec3e4285d")
 	)
 	(fp_line
 		(start 6.112 0.321)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4f0a4166-e4f2-4610-a7ea-78156ff62089")
 	)
 	(fp_line
 		(start 7.62 0.321)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "07cee234-ab4d-4447-8dd1-869a6f2f4944")
 	)
 	(fp_line
 		(start 9.06 -4.62)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0fd46b95-aa5f-4178-b690-d0acf3da93a0")
 	)
 	(fp_line
 		(start -1.57 -4.75)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "5d82420f-5c87-483b-9679-a1cf4596923c")
 	)
 	(fp_line
 		(start -1.57 3.2)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "c76c9cf1-2e5e-4789-a68e-c9f0ee7d7d2a")
 	)
 	(fp_line
 		(start 9.19 -4.75)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ed41d87e-83db-40b4-8075-a4819d7c0b3f")
 	)
 	(fp_line
 		(start 9.19 3.2)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "47c6b13e-f71a-4e7d-802b-cd6a9ce883ad")
 	)
 	(fp_line
 		(start -1.32 -4.5)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "96395d8b-8e13-4708-97c2-71e2bee225fa")
 	)
 	(fp_line
 		(start -1.32 -1.98)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fa028a16-1bd7-4343-adec-96bb22bec23a")
 	)
 	(fp_line
 		(start -1.32 0.2)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "235af747-c3f1-43b9-a139-7dad8a0fd664")
 	)
 	(fp_line
 		(start 1.96 -4.5)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f6e12a10-3c02-44f9-b9a1-23cfd6b96cd7")
 	)
 	(fp_line
 		(start 2.54 0.2)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "8b9c7a8d-2645-4fa5-b5c1-3acf549e3108")
 	)
 	(fp_line
 		(start 5.66 -4.5)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9103b035-1fec-480e-a00f-761a6522f1ea")
 	)
 	(fp_line
 		(start 7.62 0.2)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4603469c-03b5-4231-b31f-d60165ac2123")
 	)
 	(fp_line
 		(start 8.94 -4.5)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "674c83c3-3daa-4e18-a2cd-121c29c6bbd1")
 	)
 	(fp_line
 		(start 8.94 0.2)
@@ -302,12 +240,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6fb576e7-4e10-4a28-bbeb-2f16506af3b9")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -5.62 0)
 		(layer "F.Fab")
-		(uuid "5a4788e9-350b-4e0a-8d14-369ce6f80b88")
 		(effects
 			(font
 				(size 1 1)
@@ -321,31 +257,27 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b88fb0bb-4b49-4d33-ad8b-10119cd1b484")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 2.05)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ca242a2d-8ff7-4898-8e3e-450b682dec62")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "72dcc0d8-c20f-4125-8aaa-e08cd838667c")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 2.05)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6153f0e7-a8b1-4ca0-882f-a7456c180774")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_P5.08x2.05mm_StaggerEven_Lead1.85mm_Vertical.wrl"
 		(offset
@@ -358,4 +290,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical.kicad_mod
index 11423cca6..27c8d846b 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-4, Vertical, RM 2.54mm, staggered type-1, see https://www.njr.com/semicon/PDF/package/TO-220F-4_E.pdf")
 	(tags "TO-220F-4 Vertical RM 2.54mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.81 -7.67 0)
 		(layer "F.SilkS")
-		(uuid "304237b6-768e-4c6a-8703-b215d5bc7404")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical"
 		(at 3.81 2.15 0)
 		(layer "F.Fab")
-		(uuid "c9beab3c-ad58-4308-aa47-6d751c4cc471")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "88914135-0961-4085-91e2-383865f52a4b")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "2773a20c-8ab8-4044-87d3-981d648143a2")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "50208a84-1639-4b0b-8d07-6ad8c2cc9ff2")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.44 -6.67)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "79ed738a-bb87-4235-a825-5b7b087a1b15")
 	)
 	(fp_line
 		(start -1.44 -6.67)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b397dd0f-3175-48e6-9887-8ce04507a81e")
 	)
 	(fp_line
 		(start -1.44 -3.911)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "148048b8-d8dc-419e-a123-d2b7238e6729")
 	)
 	(fp_line
 		(start -1.44 -1.729)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "689ac9c3-25a1-42da-a822-c6b8374e6e47")
 	)
 	(fp_line
 		(start 0 -1.729)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6dce8750-8a5a-4205-962c-74cd660fee83")
 	)
 	(fp_line
 		(start 1.96 -6.67)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "71dd3613-c80b-4ca6-b50b-269bbb9cb956")
 	)
 	(fp_line
 		(start 3.572 -1.729)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cb4e10f6-0812-46dd-bf63-966b847a8622")
 	)
 	(fp_line
 		(start 5.08 -1.729)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7987bc9a-0721-4f80-be47-a5c4a27f6914")
 	)
 	(fp_line
 		(start 5.66 -6.67)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "94c1f975-267d-4eff-b083-cd107fc6ee9d")
 	)
 	(fp_line
 		(start 8.652 -1.729)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b4c3edab-57d8-4447-9966-08d53ee8f998")
 	)
 	(fp_line
 		(start 9.06 -6.67)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2f4e687f-ec8e-4db6-a64d-6be86a20636e")
 	)
 	(fp_line
 		(start -1.57 -6.8)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7985eb64-fe28-4798-b96d-53399a249d88")
 	)
 	(fp_line
 		(start -1.57 1.16)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "21b31e67-fccd-42ab-af9d-0fc5e0250a7f")
 	)
 	(fp_line
 		(start 9.19 -6.8)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "657fac98-b2a8-4dc9-8dff-9bb471c885d9")
 	)
 	(fp_line
 		(start 9.19 1.16)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "737868b7-a2b6-461c-baeb-b300f2095b42")
 	)
 	(fp_line
 		(start -1.32 -6.55)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ba30b429-d0e8-4bad-a333-6f44326a6120")
 	)
 	(fp_line
 		(start -1.32 -4.03)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c21ba5d6-3e4f-4ce2-a1ad-9a20c78b0a7a")
 	)
 	(fp_line
 		(start -1.32 -1.85)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bb82b5c6-6c92-49a9-ae9f-79479921ea1d")
 	)
 	(fp_line
 		(start 0 -1.85)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "83634851-2eed-40da-8763-833306db5e62")
 	)
 	(fp_line
 		(start 1.96 -6.55)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fd3f8bf1-53bd-4881-9580-c61aff3b0bde")
 	)
 	(fp_line
 		(start 5.08 -1.85)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0ccacaab-6077-45a5-9d27-14ca54538cbd")
 	)
 	(fp_line
 		(start 5.66 -6.55)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4985b508-a453-4e4e-92c2-1965950588d8")
 	)
 	(fp_line
 		(start 8.94 -6.55)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "92d43c89-ac83-42c6-9a8f-6406cb55d4e9")
 	)
 	(fp_line
 		(start 8.94 -1.85)
@@ -302,12 +240,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "50c05b8d-bb54-4e41-ac21-927681ac06c5")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -7.67 0)
 		(layer "F.Fab")
-		(uuid "995a0811-001e-4531-a1b5-399106660617")
 		(effects
 			(font
 				(size 1 1)
@@ -321,31 +257,27 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f5f3559b-aa27-4ac8-a9d7-bd0b0b793e54")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 -2.05)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f9a3403c-098e-4133-a298-6fb2497deca0")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "da89c090-1c6f-48a2-a787-b41593ae0042")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 -2.05)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d43345dc-e322-47ee-81e7-69fc98b9b02e")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_P5.08x2.05mm_StaggerOdd_Lead1.85mm_Vertical.wrl"
 		(offset
@@ -358,4 +290,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
index a1e4210d6..34a827d02 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-4, Vertical, RM 2.54mm, staggered type-2, see https://www.njr.com/semicon/PDF/package/TO-220F-4_E.pdf")
 	(tags "TO-220F-4 Vertical RM 2.54mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.81 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "b47223f3-693b-463a-b5cd-07a9c211a025")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 		(at 3.81 5.85 0)
 		(layer "F.Fab")
-		(uuid "f33cd001-1814-443c-9331-de25f8faa0fe")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4bd8028b-5559-4fe4-a1a7-11936ad4d424")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0182dda4-56f3-449c-b23d-73f0bb469170")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "61a46cc2-cf2d-4b24-8730-e9034b6d4bef")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.44 -4.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "466f389c-c305-4c83-8f06-469bfe8b5000")
 	)
 	(fp_line
 		(start -1.44 -4.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "558a07d2-d3e8-4032-a52d-141e2ffe0124")
 	)
 	(fp_line
 		(start -1.44 -1.861)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "4d61f1b1-cc60-471f-936a-7d67dfa69817")
 	)
 	(fp_line
 		(start -1.44 0.321)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0767383f-1feb-4455-97dc-1343acdd0aad")
 	)
 	(fp_line
 		(start 1.05 0.321)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e1623fd2-b4ef-48ce-86a6-17e3164d8717")
 	)
 	(fp_line
 		(start 1.96 -4.62)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ba9418fb-cda3-48b4-a7d1-2583278bc5f9")
 	)
 	(fp_line
 		(start 2.54 0.321)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d6865ecf-3ecb-4bbd-8277-cf848e2bf9ad")
 	)
 	(fp_line
 		(start 5.66 -4.62)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ca0246ad-f9be-4fd5-89a9-f8144522c7d7")
 	)
 	(fp_line
 		(start 6.112 0.321)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f36d6543-8226-44fc-82fe-d2e0edfffc51")
 	)
 	(fp_line
 		(start 7.62 0.321)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1de51062-4b76-4e24-a864-636554d564b0")
 	)
 	(fp_line
 		(start 9.06 -4.62)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3b3823d2-3929-44a7-ae00-611f026d3e13")
 	)
 	(fp_line
 		(start -1.57 -4.75)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2e704f95-7d9f-4017-ac9a-55faded829fb")
 	)
 	(fp_line
 		(start -1.57 4.85)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "9fbe09a2-9320-4034-ac9b-e44daed18cff")
 	)
 	(fp_line
 		(start 9.19 -4.75)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2ea6c749-53c8-4832-bc57-8095f5df7f84")
 	)
 	(fp_line
 		(start 9.19 4.85)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "0073b285-2b1e-4241-9c59-1cee987535fc")
 	)
 	(fp_line
 		(start -1.32 -4.5)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4ed31371-1a1c-40c4-a28d-f43a77f75e11")
 	)
 	(fp_line
 		(start -1.32 -1.98)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3e16b98d-8683-49e3-b1f9-00edab08f5b2")
 	)
 	(fp_line
 		(start -1.32 0.2)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c0ea4a0d-d4ea-4da3-a4ed-9fb073251097")
 	)
 	(fp_line
 		(start 1.96 -4.5)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "954df468-2ea3-4f0a-8cf7-15cdd0f6c6d0")
 	)
 	(fp_line
 		(start 2.54 0.2)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "26313bdd-34b8-4528-9f74-514acd47a30b")
 	)
 	(fp_line
 		(start 5.66 -4.5)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7eb146cf-66fe-413c-ad3c-acdba2680852")
 	)
 	(fp_line
 		(start 7.62 0.2)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "05587412-837f-49e6-b937-6c40235f589c")
 	)
 	(fp_line
 		(start 8.94 -4.5)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "05b8d927-943a-4243-a09a-8b2d2ef64f8c")
 	)
 	(fp_line
 		(start 8.94 0.2)
@@ -302,12 +240,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "816f7ace-2384-4a6d-b0c2-35f953798661")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -5.62 0)
 		(layer "F.Fab")
-		(uuid "53073b14-36be-4fb3-b455-e3f05ca7f748")
 		(effects
 			(font
 				(size 1 1)
@@ -321,31 +257,27 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "3bbd8df8-d4a0-4291-9eac-6c6fe13a78be")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b459ebe9-8891-4da2-834e-f5f6044cbfdb")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d7c87fc6-3df6-472c-90fc-1d7815b1d9d0")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "7d678829-51a7-45c2-ba55-d30c034d9b40")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_P5.08x3.7mm_StaggerEven_Lead3.5mm_Vertical.wrl"
 		(offset
@@ -358,4 +290,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
index dd91dc596..a9294676f 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-4, Vertical, RM 2.54mm, staggered type-1, see https://www.njr.com/semicon/PDF/package/TO-220F-4_E.pdf")
 	(tags "TO-220F-4 Vertical RM 2.54mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.81 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "db5a8014-7787-4451-861b-fecc4d382fec")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 		(at 3.81 2.15 0)
 		(layer "F.Fab")
-		(uuid "da8b0559-3fb3-4158-aa5c-f82c2855eeff")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "0e20cfc3-7c37-4f69-bb61-e9bf351256dd")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "65874de6-3759-48fc-b103-a69752321138")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "64e25594-7ee7-4d88-9a4e-80256b575c5a")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.44 -8.32)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "25b536f1-783e-47f3-82be-523682e83244")
 	)
 	(fp_line
 		(start -1.44 -8.32)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "33e2d2cb-bb95-4c23-88fd-2141be95a007")
 	)
 	(fp_line
 		(start -1.44 -5.561)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3f02071a-6259-43f3-a356-1f4d5355abf7")
 	)
 	(fp_line
 		(start -1.44 -3.379)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c7d4b5bc-3b2b-448a-927c-270264310bfe")
 	)
 	(fp_line
 		(start 0 -3.379)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ee981030-c36e-4334-85b0-4227b3baeec8")
 	)
 	(fp_line
 		(start 1.96 -8.32)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "13017166-af46-4851-aab9-da4ffcf00141")
 	)
 	(fp_line
 		(start 3.572 -3.379)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "23c16a0e-ae17-417b-a3dc-fcc0976981dd")
 	)
 	(fp_line
 		(start 5.08 -3.379)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "265715f9-b816-4618-914b-2ab849213934")
 	)
 	(fp_line
 		(start 5.66 -8.32)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a5ae7f42-1754-403d-950d-829cd5e002d1")
 	)
 	(fp_line
 		(start 8.652 -3.379)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a006a5bf-3400-432f-9c69-579a2844c363")
 	)
 	(fp_line
 		(start 9.06 -8.32)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "51e5a6f3-befd-4f16-a7ff-b80476a7b7b7")
 	)
 	(fp_line
 		(start -1.57 -8.45)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "4e27210b-25af-438d-8eb4-f584546e526d")
 	)
 	(fp_line
 		(start -1.57 1.15)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "4b6b663c-f98f-45bf-b019-6169c8811ac2")
 	)
 	(fp_line
 		(start 9.19 -8.45)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "59c1f545-39dc-4b92-a293-e9139443c975")
 	)
 	(fp_line
 		(start 9.19 1.15)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "0d9bda19-1266-4be9-b79d-834c68475140")
 	)
 	(fp_line
 		(start -1.32 -8.2)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7cf62f72-512d-43a0-a592-bc9b14f52af7")
 	)
 	(fp_line
 		(start -1.32 -5.68)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c9b64aab-17b6-475a-882c-4c585f6a8630")
 	)
 	(fp_line
 		(start -1.32 -3.5)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "547f001a-b57e-4faa-9dd0-7adf5719ab1a")
 	)
 	(fp_line
 		(start 0 -3.5)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2b1312d2-ded3-448b-a602-012af927ee27")
 	)
 	(fp_line
 		(start 1.96 -8.2)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "add47695-34b9-4519-9beb-500d881bf670")
 	)
 	(fp_line
 		(start 5.08 -3.5)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0a0e8ae5-d4d7-49fb-9805-baadd9091650")
 	)
 	(fp_line
 		(start 5.66 -8.2)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b6a2f710-cd24-4df7-ad67-c6ca1e5bd43e")
 	)
 	(fp_line
 		(start 8.94 -8.2)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5fde708f-32ba-4faf-801c-467a6398bc31")
 	)
 	(fp_line
 		(start 8.94 -3.5)
@@ -302,12 +240,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ab93e870-fd69-4f27-be15-1a1b9798cf0b")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -9.32 0)
 		(layer "F.Fab")
-		(uuid "970e9a64-5fd9-40f6-88c6-26be059c1734")
 		(effects
 			(font
 				(size 1 1)
@@ -321,31 +257,27 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ea9900c0-be3a-4bf0-84b8-fddeff8a1799")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 2.54 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f91606c0-a3ae-4559-be7a-b0d3b7292e0c")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "903c7601-63a5-4da5-aa2a-5291b32862bb")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 7.62 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "aeea1685-bd55-4b43-b377-ba5f200cbf0c")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_P5.08x3.7mm_StaggerOdd_Lead3.5mm_Vertical.wrl"
 		(offset
@@ -358,4 +290,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-4_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-4_Vertical.kicad_mod
index c92d371e0..60f42ece2 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-4_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-4_Vertical.kicad_mod
@@ -237,29 +237,29 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 2)
 		(drill 1.2)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-4_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabDown.kicad_mod
index 024e9b936..803482eea 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabDown.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_Horizontal_TabDown"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Horizontal, RM 1.7mm, PentawattF")
 	(tags "TO-220F-5 Horizontal RM 1.7mm PentawattF")
 	(property "Reference" "REF**"
 		(at 3.4 -20.22 0)
 		(layer "F.SilkS")
-		(uuid "372b80de-ee80-4f68-bd2b-b030a1e8fed6")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_Horizontal_TabDown"
 		(at 3.4 1.9 0)
 		(layer "F.Fab")
-		(uuid "a4ae7f14-80e1-410d-a8b2-976060b88673")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "2b74c2f6-08da-4443-b5a1-419348c8be23")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "48ef2759-f6d0-4bbe-b75f-93a7f8523a26")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "371884d8-ff8c-4e12-bdf4-5c5321ca3ed2")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 -19.22)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "42acb04f-996a-488e-b88f-358f93b02fe3")
 	)
 	(fp_line
 		(start -1.85 -19.22)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "eff39c77-ab75-44af-ae9f-2e3eaacfeda5")
 	)
 	(fp_line
 		(start -1.85 -3.11)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "45db5934-7656-43e0-9805-8d8578746128")
 	)
 	(fp_line
 		(start 0 -3.11)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "07d8cfff-2e1a-49e8-b658-21cdf035fb32")
 	)
 	(fp_line
 		(start 1.7 -3.11)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "131cd677-82ff-41eb-83ae-5ecb4144fafd")
 	)
 	(fp_line
 		(start 3.4 -3.11)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3b3f62a8-1aeb-4eaa-b90d-e8375a71493b")
 	)
 	(fp_line
 		(start 5.1 -3.11)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "20e910b7-2834-4955-90ee-d26a57af2993")
 	)
 	(fp_line
 		(start 6.8 -3.11)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "891be4b5-931d-42b0-a5d4-061f056a358a")
 	)
 	(fp_line
 		(start 8.65 -19.22)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a98de536-ce5d-41d1-9b17-cc24eea7f53c")
 	)
 	(fp_line
 		(start -1.98 -19.35)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "0884ec37-6622-440a-b073-5508fb21509f")
 	)
 	(fp_line
 		(start -1.98 1.15)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "95edbf80-bd24-486e-b70c-429aef91f08f")
 	)
 	(fp_line
 		(start 8.78 -19.35)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2dc42cd9-acb9-416d-9ed8-e5dc7c59f2f0")
 	)
 	(fp_line
 		(start 8.78 1.15)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ffae6f97-1f5f-47b3-b9f1-6f3823c8c318")
 	)
 	(fp_line
 		(start -1.73 -19.1)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b4522ad3-d558-418e-ac96-1456b5973bad")
 	)
 	(fp_line
 		(start -1.73 -12.42)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ad031afe-7949-41d4-bad5-015cdde917a1")
 	)
 	(fp_line
 		(start -1.73 -12.42)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c8eff305-30fd-40be-bc95-4a6916d9d8dd")
 	)
 	(fp_line
 		(start -1.73 -3.23)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0c5eb34e-3fdc-47b4-a910-cbbce76c2030")
 	)
 	(fp_line
 		(start 0 -3.23)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f963b6f0-834a-46d8-9198-068360528395")
 	)
 	(fp_line
 		(start 1.7 -3.23)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bc65bb4a-cc1b-45ef-85c4-9652f55e720c")
 	)
 	(fp_line
 		(start 3.4 -3.23)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6aa96c25-4609-419d-8ca2-bd6743f61da1")
 	)
 	(fp_line
 		(start 5.1 -3.23)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "feeb8b69-1f44-4b63-a4b0-204b2f42ad57")
 	)
 	(fp_line
 		(start 6.8 -3.23)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "32922539-c8ea-45af-82a8-654b3205ba3f")
 	)
 	(fp_line
 		(start 8.53 -19.1)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cd55c02f-2b1e-4d64-a485-616c2c899cda")
 	)
 	(fp_line
 		(start 8.53 -12.42)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "24fe3a32-59b1-473b-9f5a-6a464303906a")
 	)
 	(fp_line
 		(start 8.53 -12.42)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1588b490-fb97-40f1-a738-785f327405d7")
 	)
 	(fp_line
 		(start 8.53 -3.23)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "780bc6e3-f4c4-468e-8b21-5adf96df4861")
 	)
 	(fp_circle
 		(center 3.4 -15.8)
@@ -333,12 +268,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "de6d17f2-f8c8-4101-9b6c-d23370c25be8")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -20.22 0)
 		(layer "F.Fab")
-		(uuid "f904d03d-4c4a-4c88-b60b-c7f593791881")
 		(effects
 			(font
 				(size 1 1)
@@ -351,7 +284,6 @@
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "7486ec00-774c-4e70-9418-98914c6c97b6")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -359,7 +291,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ecd47a26-0d4b-43ca-a8a8-e64c7918be3b")
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
@@ -367,7 +298,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "8822cdb4-13e2-436b-82f1-fbb004d671d7")
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
@@ -375,7 +305,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1814a72f-397b-400d-96a2-3cc726a6043a")
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
@@ -383,7 +312,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f6873b81-c152-4a30-baf7-1977e9f7ced0")
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
@@ -391,7 +319,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "3c8faea8-3cd8-4948-bf1e-13e45d06044d")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabUp.kicad_mod
index 11af5f16d..73362b511 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_Horizontal_TabUp.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_Horizontal_TabUp"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Horizontal, RM 1.7mm, PentawattF")
 	(tags "TO-220F-5 Horizontal RM 1.7mm PentawattF")
 	(property "Reference" "REF**"
 		(at 3.4 20.22 0)
 		(layer "F.SilkS")
-		(uuid "390095d0-5ff3-41ee-a491-44c73efb1577")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_Horizontal_TabUp"
 		(at 3.4 -1.9 0)
 		(layer "F.Fab")
-		(uuid "8c18ad7d-8e28-4a80-980c-673c3eeffe70")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "e63fdfd7-b7bd-42df-b68e-30c404d45cc8")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "fa542c68-3473-4c9e-9a67-427831eb4916")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "c3f24e49-8e3f-47a6-b3eb-a246bbb15b25")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 3.11)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "302912e8-8d95-43eb-826e-46cbb4faded4")
 	)
 	(fp_line
 		(start -1.85 3.11)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6ed66548-9b7b-4ae5-b1ae-1a4584b0fa16")
 	)
 	(fp_line
 		(start -1.85 12.54)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0ce216d6-1c22-44d9-84be-ed499c4bc9fc")
 	)
 	(fp_line
 		(start -1.85 12.78)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "401380ba-a703-4369-8de1-08a3d0fc07ae")
 	)
 	(fp_line
 		(start -1.85 15.18)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d88b1cb5-f163-4f23-9eeb-7ec554212b5d")
 	)
 	(fp_line
 		(start -1.85 17.58)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c5a20848-960c-4cb4-b61e-40caef9d42a5")
 	)
 	(fp_line
 		(start -1.85 19.22)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "94ad6e5e-2169-4b97-8955-4f94a49f49c0")
 	)
 	(fp_line
 		(start 0 1.05)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d6b944b7-6ff1-428e-887d-42b8fa200d33")
 	)
 	(fp_line
 		(start 0.55 19.22)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f505cf6a-217a-43ba-817f-24a9e1b27dee")
 	)
 	(fp_line
 		(start 1.7 1.05)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c65fb5c3-feb4-40a1-8619-6925c0e39761")
 	)
 	(fp_line
 		(start 2.95 19.22)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2f31e6d6-5cbb-4486-a54c-d1980ff69062")
 	)
 	(fp_line
 		(start 3.4 1.05)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cfb801ed-0485-45d7-ae04-095536d5dd1b")
 	)
 	(fp_line
 		(start 5.1 1.05)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "27138a85-82c0-4ed2-8e0b-b519bed41a0c")
 	)
 	(fp_line
 		(start 5.35 19.22)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d29ff30e-b4b5-495e-b450-0f95030f26d9")
 	)
 	(fp_line
 		(start 6.8 1.05)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fc843b8d-2482-4b2b-892b-bde0969d392e")
 	)
 	(fp_line
 		(start 7.75 19.22)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "bb071cf9-51ae-4487-ae7d-4e99cbaf7ac4")
 	)
 	(fp_line
 		(start 8.65 3.11)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2602965c-30b5-4754-8c96-927a0c1ccabc")
 	)
 	(fp_line
 		(start 8.65 12.78)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1e0c931f-75ca-4b53-b34e-0ad10a8374a3")
 	)
 	(fp_line
 		(start 8.65 15.18)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "644934cb-ec8c-46a6-9380-73392bda3e6c")
 	)
 	(fp_line
 		(start 8.65 17.58)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5e07f462-01a8-452c-a522-afd7cb24802a")
 	)
 	(fp_line
 		(start -1.98 -1.15)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "8ccb4936-a788-4b7a-aa1b-7ff697296c4c")
 	)
 	(fp_line
 		(start -1.98 19.35)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6364fb44-e6db-4ee7-8301-8174ced383c7")
 	)
 	(fp_line
 		(start 8.78 -1.15)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7e4c7570-e3d4-4df3-9280-1071a6a1e3b9")
 	)
 	(fp_line
 		(start 8.78 19.35)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "31803f40-198a-4965-94d0-76ff82eab698")
 	)
 	(fp_line
 		(start -1.73 3.23)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0c1e2990-5089-48f6-8413-2697be764994")
 	)
 	(fp_line
 		(start -1.73 12.42)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "eb8e651f-0496-4fba-bdbf-ccd94d2517fe")
 	)
 	(fp_line
 		(start -1.73 12.42)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "188aa7c7-64d5-46ce-925b-08fb43c221f2")
 	)
 	(fp_line
 		(start -1.73 19.1)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a298e588-2d79-41c0-9e77-1b5158674282")
 	)
 	(fp_line
 		(start 0 3.23)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e93918b1-4ba4-4131-b6f7-90720540452e")
 	)
 	(fp_line
 		(start 1.7 3.23)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7b18c768-4cb4-4b0c-8ad9-fa037ea422f6")
 	)
 	(fp_line
 		(start 3.4 3.23)
@@ -372,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6aaec7f1-8de8-4edc-b2ba-b28020f43259")
 	)
 	(fp_line
 		(start 5.1 3.23)
@@ -382,7 +312,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "50aa7750-3389-47e2-b384-981f94784153")
 	)
 	(fp_line
 		(start 6.8 3.23)
@@ -392,7 +321,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "839e8cb3-921a-4ecb-9d20-c301546211a8")
 	)
 	(fp_line
 		(start 8.53 3.23)
@@ -402,7 +330,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d4ff98d5-9af8-4b16-b1fd-695b1e554c11")
 	)
 	(fp_line
 		(start 8.53 12.42)
@@ -412,7 +339,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "d675af82-6a92-4437-81c2-66a2186784b0")
 	)
 	(fp_line
 		(start 8.53 12.42)
@@ -422,7 +348,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e755368e-f56b-41e9-807a-1e76bee7e8d8")
 	)
 	(fp_line
 		(start 8.53 19.1)
@@ -432,7 +357,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "bb2266ec-ce8f-45e0-a502-95ffe2dec3af")
 	)
 	(fp_circle
 		(center 3.4 15.8)
@@ -443,12 +367,10 @@
 		)
 		(fill none)
 		(layer "F.Fab")
-		(uuid "495cb6c8-0c61-4453-8647-9fe954d723ed")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 20.22 0)
 		(layer "F.Fab")
-		(uuid "cc99afa5-617c-433f-b340-2ccc8b2c4fc8")
 		(effects
 			(font
 				(size 1 1)
@@ -461,7 +383,6 @@
 		(size 3.5 3.5)
 		(drill 3.5)
 		(layers "*.Cu" "*.Mask")
-		(uuid "4efb7f5d-1c76-48cd-9f42-2d5f5dbae8e9")
 	)
 	(pad "1" thru_hole rect
 		(at 0 0)
@@ -469,7 +390,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6e3cc1d5-fe20-4df0-bbd0-6b7d4caa8df9")
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
@@ -477,7 +397,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "482a587a-49f7-437c-9a94-0c350dab0b39")
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
@@ -485,7 +404,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "34ccfb21-3f02-43ee-9a14-625f3e8c858a")
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
@@ -493,7 +411,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "29ea3a14-3aac-4c76-8bb9-48dcfd24a356")
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
@@ -501,7 +418,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "818d9f41-b139-42ef-86da-db155b6588a2")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical.kicad_mod
index 141924548..c5f566f0e 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Vertical, RM 1.7mm, PentawattF, staggered type-2")
 	(tags "TO-220F-5 Vertical RM 1.7mm PentawattF staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.4 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "6a50dd56-de82-4fea-879d-acf4df789904")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical"
 		(at 3.4 4.21 0)
 		(layer "F.Fab")
-		(uuid "1ef06504-7b39-4790-9f02-e6a23d2ea8b6")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "bfca9f65-c3e3-48e8-8a9b-addf5f05a5d0")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "ab89d2a2-c14d-4c6c-a2ce-daf836bd0262")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4f372098-b551-491c-a02a-75a42743f219")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "427f73ce-766b-428d-b3ad-51d66af40aaa")
 	)
 	(fp_line
 		(start -1.85 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8a1cd2ae-9fd0-4d86-b737-0bcac01a7bdc")
 	)
 	(fp_line
 		(start -1.85 -1.861)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "09189444-16f9-4ca3-a77f-b2eaf3a1f0e8")
 	)
 	(fp_line
 		(start -1.85 0.321)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1608b7cb-c2ab-4d24-bc47-170294fc5375")
 	)
 	(fp_line
 		(start 1.05 0.321)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "683bda5f-a71d-4df6-942e-bec17b7c8555")
 	)
 	(fp_line
 		(start 1.55 -4.62)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "158f875d-152e-44ad-94ba-0c5b45a2890d")
 	)
 	(fp_line
 		(start 1.7 0.321)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0bfc1f35-5ac2-496f-a370-db959955f4c5")
 	)
 	(fp_line
 		(start 4.432 0.321)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d2611e2f-d424-4805-a91f-df6272189014")
 	)
 	(fp_line
 		(start 5.1 0.321)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "86a2a8a8-a74b-4749-b4f4-35bb1ca6d59f")
 	)
 	(fp_line
 		(start 5.25 -4.62)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f0ea8df3-96f6-4d0b-95a0-7ea8a709bba4")
 	)
 	(fp_line
 		(start 7.832 0.321)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d34f6306-9bca-4063-917e-80d209ca4b6f")
 	)
 	(fp_line
 		(start 8.65 -4.62)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "08cbd45d-4964-4316-8e1f-340c0073d651")
 	)
 	(fp_line
 		(start -1.98 -4.75)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "57dbd596-0b9a-4df7-ac6d-dd7f72c0c402")
 	)
 	(fp_line
 		(start -1.98 3.22)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "85a1a9c6-fd7f-4e8f-89a0-dab1da9d96ef")
 	)
 	(fp_line
 		(start 8.78 -4.75)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "cd595ebe-c6b4-4101-990c-4448025d1551")
 	)
 	(fp_line
 		(start 8.78 3.22)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "79ea200d-2aa7-4508-982c-6b58baa214a7")
 	)
 	(fp_line
 		(start -1.73 -4.5)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c561242a-1a6f-4715-b352-b4d485b55c94")
 	)
 	(fp_line
 		(start -1.73 -1.98)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a6f87f04-d9e3-443d-800d-c34cc23b5448")
 	)
 	(fp_line
 		(start -1.73 0.2)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "030a7afb-f2fd-4d7c-ba50-1cc05074a37b")
 	)
 	(fp_line
 		(start 1.55 -4.5)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f5673847-e8c0-45a2-b447-eac84dab6f20")
 	)
 	(fp_line
 		(start 1.7 0.2)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fdaa6187-8f35-490d-b753-9033e6df7c01")
 	)
 	(fp_line
 		(start 5.1 0.2)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "dce52e10-b350-4dc9-aaff-bd2ccf873401")
 	)
 	(fp_line
 		(start 5.25 -4.5)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a171d460-f1d2-4f33-a693-0990ae5eeafe")
 	)
 	(fp_line
 		(start 8.53 -4.5)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "86ea79ce-a379-4612-b533-71c11b176b75")
 	)
 	(fp_line
 		(start 8.53 0.2)
@@ -315,12 +249,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9bc1e817-f8af-4226-82d1-482f9bc5d288")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -5.62 0)
 		(layer "F.Fab")
-		(uuid "aa52564c-acb2-464a-ade6-e7b959ae50b9")
 		(effects
 			(font
 				(size 1 1)
@@ -334,39 +266,34 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d114981a-f372-410a-85eb-31a9bb42c418")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 2.06)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "2eab9c00-c8a7-43bb-bfb9-92aafa679ccb")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6ab0cf8c-e1dc-45f1-9382-32984eaea71e")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 2.06)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e9b5a33a-78ae-49f1-a18f-3ce59c3ea894")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fb9569a9-b69e-475d-a7b5-ad58b7f15c09")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_P3.4x2.06mm_StaggerEven_Lead1.86mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical.kicad_mod
index 3b3ec8bf8..bb124b7d7 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Vertical, RM 1.7mm, PentawattF, staggered type-1")
 	(tags "TO-220F-5 Vertical RM 1.7mm PentawattF staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.4 -7.68 0)
 		(layer "F.SilkS")
-		(uuid "b44d3af1-022c-4a93-ae23-0ce2b66f0f47")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical"
 		(at 3.4 2.15 0)
 		(layer "F.Fab")
-		(uuid "b72cd686-ca46-42dc-b2bf-33168123c347")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "8598b7d8-b1e1-48b1-b691-878dc49b0aee")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "b7a05053-f301-49b3-b02d-9d2c37734782")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "37823298-7e04-407e-8bc9-a248998f6aa6")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 -6.68)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "74235456-2ec3-4f17-8ee6-90b954dba246")
 	)
 	(fp_line
 		(start -1.85 -6.68)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7fe4105a-5eaa-4024-9f0e-f88a36f4ed83")
 	)
 	(fp_line
 		(start -1.85 -3.921)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "78c0e1b0-ee11-4803-ac1b-d3468a2a6e2a")
 	)
 	(fp_line
 		(start -1.85 -1.739)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3261ba78-7edf-43f7-ab4c-0b1aa2f61d56")
 	)
 	(fp_line
 		(start 0 -1.739)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7baeca3f-fc05-408f-b893-51723825611f")
 	)
 	(fp_line
 		(start 1.55 -6.68)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "67f9bd2c-a013-4168-9049-6e4e1d5a9978")
 	)
 	(fp_line
 		(start 2.732 -1.739)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b8842760-353f-4c64-a475-370d15f82e44")
 	)
 	(fp_line
 		(start 3.4 -1.739)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "dc20e3ee-f88b-4740-8dbc-f6099addf927")
 	)
 	(fp_line
 		(start 5.25 -6.68)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5165a751-e2cb-4b4c-9c24-4186392c51ba")
 	)
 	(fp_line
 		(start 6.132 -1.739)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6f55667c-ac3e-425e-b741-054fb10b7bad")
 	)
 	(fp_line
 		(start 6.8 -1.739)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "32e22587-a80a-47a8-b9b6-bb510a97f95c")
 	)
 	(fp_line
 		(start 8.65 -6.68)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "62a1e862-88e9-4947-aabb-07f889e8305c")
 	)
 	(fp_line
 		(start -1.98 -6.81)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6227c963-c509-4801-98fd-688109af97dc")
 	)
 	(fp_line
 		(start -1.98 1.16)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e332d832-2550-44e3-900f-b766bee79c6f")
 	)
 	(fp_line
 		(start 8.78 -6.81)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "1d16bb68-5ac1-4e93-a48a-d4a21b66c2dc")
 	)
 	(fp_line
 		(start 8.78 1.16)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "a9d9513a-3176-457f-8938-faee0820e9ed")
 	)
 	(fp_line
 		(start -1.73 -6.56)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "727c775a-ec14-4d74-ac54-a465a76b2b77")
 	)
 	(fp_line
 		(start -1.73 -4.04)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e21dbd76-31bb-4538-bec6-5e4c7199c306")
 	)
 	(fp_line
 		(start -1.73 -1.86)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5fa48e3f-f58a-48b4-9ff6-3ab4b84413b9")
 	)
 	(fp_line
 		(start 0 -1.86)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "abe3f2b7-3829-4f68-b465-d60acb4184d7")
 	)
 	(fp_line
 		(start 1.55 -6.56)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "76498698-4fbd-423b-87c1-bc36d5210c8b")
 	)
 	(fp_line
 		(start 3.4 -1.86)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "143d9697-655b-4fe1-a1d2-6e8589194f5b")
 	)
 	(fp_line
 		(start 5.25 -6.56)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6ac05724-5d04-4af9-961c-c75feee6f6c0")
 	)
 	(fp_line
 		(start 6.8 -1.86)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a92d427f-1c03-406c-826d-55a3769bf244")
 	)
 	(fp_line
 		(start 8.53 -6.56)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "247cf89d-e44a-4e5d-bf93-66c6a4d9b371")
 	)
 	(fp_line
 		(start 8.53 -1.86)
@@ -325,12 +258,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "3fef5ce8-a93e-4803-adce-100f84233356")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -7.68 0)
 		(layer "F.Fab")
-		(uuid "8dfb56bb-f5e5-4f3c-8dd5-13f7da65894e")
 		(effects
 			(font
 				(size 1 1)
@@ -344,39 +275,34 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "974a1416-f8f0-47e6-8e64-2724c9bf0c68")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -2.06)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c3f8fb92-de3f-4c6f-8500-46fd8e085a25")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "29e6ab37-49ca-4ade-9a50-a0437b3f0b85")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -2.06)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "b938ec1a-d813-4456-a21e-ef19d2f865da")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "975a0794-3ca9-4fa5-8d5f-6b82449acb95")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_P3.4x2.06mm_StaggerOdd_Lead1.86mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
index 613363feb..1446851e7 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Vertical, RM 1.7mm, PentawattF, staggered type-2")
 	(tags "TO-220F-5 Vertical RM 1.7mm PentawattF staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.4 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "cc530957-619f-4faa-88df-76c9d2f79184")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 		(at 3.4 5.85 0)
 		(layer "F.Fab")
-		(uuid "b159347e-500b-4171-b39c-e0aba9533161")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "8d84a3ae-02f9-4d64-a847-8b720a1e7e78")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "13ecae2a-9942-4789-8d35-66ea393dd832")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "4e372ec5-b610-4009-b784-63752cae6bc6")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 -4.62)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "22c4a6a2-8c21-4735-862d-f0a9f6a6c55a")
 	)
 	(fp_line
 		(start -1.85 -4.62)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8ba91839-dbea-45b8-9a3e-6935f396c985")
 	)
 	(fp_line
 		(start -1.85 -1.861)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "500a01ff-0512-4ab0-bd82-debf229661b2")
 	)
 	(fp_line
 		(start -1.85 0.321)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "fd21e409-520e-4d97-b668-bff4820b2aa9")
 	)
 	(fp_line
 		(start 1.05 0.321)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c9f02a2d-bd10-4ee4-933f-918bfb422f1d")
 	)
 	(fp_line
 		(start 1.55 -4.62)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "71434731-de8d-403c-8b4f-6a1270464ee9")
 	)
 	(fp_line
 		(start 1.7 0.321)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "73c8d7c3-a270-43a2-97d9-770114d5aa66")
 	)
 	(fp_line
 		(start 4.432 0.321)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9981efed-8c41-4380-a98a-d87de6376834")
 	)
 	(fp_line
 		(start 5.1 0.321)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5b8a9ff6-5c0a-4641-8e93-f736382c1873")
 	)
 	(fp_line
 		(start 5.25 -4.62)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f33ab0d2-dc0b-4090-891c-eee11496f295")
 	)
 	(fp_line
 		(start 7.832 0.321)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "416018c0-f0fa-4abb-9620-43267929719f")
 	)
 	(fp_line
 		(start 8.65 -4.62)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7e8db13e-f5d7-42d8-8132-06f5819aff03")
 	)
 	(fp_line
 		(start -1.98 -4.75)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6ddbf676-4b65-4cbd-8cd2-f17eb3567f33")
 	)
 	(fp_line
 		(start -1.98 4.85)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "f2a6a1ae-6006-4a13-a1fc-19829cdc8d1b")
 	)
 	(fp_line
 		(start 8.78 -4.75)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "67f4eee4-3e4f-4509-9d13-81635f9f656b")
 	)
 	(fp_line
 		(start 8.78 4.85)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "ab694495-9e71-4ebb-9ab7-ff3f2e421a6f")
 	)
 	(fp_line
 		(start -1.73 -4.5)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e3aaaff0-f29b-4566-b6b6-3a6242dcfea7")
 	)
 	(fp_line
 		(start -1.73 -1.98)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2d8bf667-2959-4094-ba2f-bcdcdd417f82")
 	)
 	(fp_line
 		(start -1.73 0.2)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4ce17b1d-94ec-4fac-a97c-9e7975137017")
 	)
 	(fp_line
 		(start 1.55 -4.5)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "8d59f90e-4ccc-4ebb-888e-3e5e57dafb08")
 	)
 	(fp_line
 		(start 1.7 0.2)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "968d5d80-48c0-457e-aec9-bf647a715e56")
 	)
 	(fp_line
 		(start 5.1 0.2)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "97ce873b-ce8a-42c6-be56-e8e2b958694a")
 	)
 	(fp_line
 		(start 5.25 -4.5)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9ecaaa06-5838-4d35-a4ac-2759ae8badfe")
 	)
 	(fp_line
 		(start 8.53 -4.5)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ba293036-f463-4bf3-b76c-980bec8e0103")
 	)
 	(fp_line
 		(start 8.53 0.2)
@@ -315,12 +249,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b4e2081c-5ced-44e5-955e-91db8501b366")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -5.62 0)
 		(layer "F.Fab")
-		(uuid "ab008654-699e-4374-8899-b82d11edf768")
 		(effects
 			(font
 				(size 1 1)
@@ -334,39 +266,34 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4fed19cd-fd89-43b8-85ac-448213fa92d9")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f7bf68bc-dd6a-4d09-b3e4-ae8f9f324dee")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bc5fc5c1-ee78-4a85-9095-23ca28b76633")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a045490f-0a7f-46ed-98a2-90129585a911")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "c02a6591-4364-4886-a659-5633dfb498ad")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_P3.4x3.7mm_StaggerEven_Lead3.5mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
index fa5957a5a..140937bfc 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Vertical, RM 1.7mm, PentawattF, staggered type-1")
 	(tags "TO-220F-5 Vertical RM 1.7mm PentawattF staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.4 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "9fdf2255-20ae-4dd7-8f08-d257748026f0")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 		(at 3.4 2.15 0)
 		(layer "F.Fab")
-		(uuid "f1190626-649c-43c2-a975-62c151f8ca4d")
 		(effects
 			(font
 				(size 1 1)
@@ -27,45 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "694d01b3-0bcc-4065-b169-52f069592a13")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "cb2c6d7b-c3e2-4e0f-a19c-ffcb45d11c76")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "be66b80e-e24f-4d13-b927-fb4bf0838e8a")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 -8.32)
@@ -75,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "797125fa-0b30-45d3-8841-2c5a9dc7372f")
 	)
 	(fp_line
 		(start -1.85 -8.32)
@@ -85,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6ab6f46d-f133-486a-916a-2f4fc4328c6d")
 	)
 	(fp_line
 		(start -1.85 -5.561)
@@ -95,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "aea0be5b-54f5-4815-9b74-d9ea8c1372b8")
 	)
 	(fp_line
 		(start -1.85 -3.379)
@@ -105,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3fb455eb-8ae7-4796-89f8-7a1b9b620afd")
 	)
 	(fp_line
 		(start 0 -3.379)
@@ -115,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b57ede45-893a-406a-89ff-8afc5b1360d2")
 	)
 	(fp_line
 		(start 1.55 -8.32)
@@ -125,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "cd4bfab9-10a3-48ae-b1c2-cce7dc5904ea")
 	)
 	(fp_line
 		(start 2.732 -3.379)
@@ -135,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "30a286c3-fdb2-498e-bd21-f11f8310ccf4")
 	)
 	(fp_line
 		(start 3.4 -3.379)
@@ -145,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "56ee7598-d254-4615-bf34-c707b403a325")
 	)
 	(fp_line
 		(start 5.25 -8.32)
@@ -155,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "28475c80-2bcf-44a0-9fa4-ffc4c48c9b73")
 	)
 	(fp_line
 		(start 6.132 -3.379)
@@ -165,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f3a1d2dd-dc49-4ce4-9d62-785f57654fed")
 	)
 	(fp_line
 		(start 6.8 -3.379)
@@ -175,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "53e845be-c9c4-4907-9eb6-21f0a9523084")
 	)
 	(fp_line
 		(start 8.65 -8.32)
@@ -185,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e63b357a-acd5-4eb7-b172-177767e44efa")
 	)
 	(fp_line
 		(start -1.98 -8.45)
@@ -195,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "29a0ddba-3417-45e9-a352-f5dc6401e927")
 	)
 	(fp_line
 		(start -1.98 1.15)
@@ -205,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "91538db1-afca-4e6c-9057-19f9117ec1a3")
 	)
 	(fp_line
 		(start 8.78 -8.45)
@@ -215,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "829a4fd4-5833-4d28-a37a-66de9520d1dd")
 	)
 	(fp_line
 		(start 8.78 1.15)
@@ -225,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "488ff1d2-c44d-4543-886e-6baff6148d9e")
 	)
 	(fp_line
 		(start -1.73 -8.2)
@@ -235,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9774a603-7c23-4b97-8ac3-e2d0cf3f333d")
 	)
 	(fp_line
 		(start -1.73 -5.68)
@@ -245,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c56893c8-da6d-4b52-861c-391741a20dc3")
 	)
 	(fp_line
 		(start -1.73 -3.5)
@@ -255,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ff2866f6-64a1-4801-9216-baa82eea5e82")
 	)
 	(fp_line
 		(start 0 -3.5)
@@ -265,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "e26d8d55-696c-4e26-8318-1170599cb9d2")
 	)
 	(fp_line
 		(start 1.55 -8.2)
@@ -275,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "78307738-5274-4bb2-8450-ab5d55fa1fe0")
 	)
 	(fp_line
 		(start 3.4 -3.5)
@@ -285,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "a45f50d9-b663-4827-a2af-3b1bcc01c1de")
 	)
 	(fp_line
 		(start 5.25 -8.2)
@@ -295,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "67dbe3fc-ba21-47cb-ae5a-2376b098d8c6")
 	)
 	(fp_line
 		(start 6.8 -3.5)
@@ -305,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fa6fa932-907f-47a1-876e-269de84968e4")
 	)
 	(fp_line
 		(start 8.53 -8.2)
@@ -315,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b5210aa6-294c-4bee-aebc-b0ed64103b23")
 	)
 	(fp_line
 		(start 8.53 -3.5)
@@ -325,12 +258,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "52205675-daca-4952-9171-b75ad929d427")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -9.32 0)
 		(layer "F.Fab")
-		(uuid "d03e7710-5140-43db-a350-81f43e8ded48")
 		(effects
 			(font
 				(size 1 1)
@@ -344,39 +275,34 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "aa99e269-9c59-41af-a767-3ab315d30245")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.7 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "011dff9d-8df3-47d6-b521-9eceb509ce55")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 3.4 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1e2ab95a-5684-4e81-b911-8e8c8ddba60b")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 5.1 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0d09dfba-5cd8-40d8-bd39-02882919a53c")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 6.8 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "552227de-1327-498a-a22a-d1ce5749b47d")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_P3.4x3.7mm_StaggerOdd_Lead3.5mm_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-5_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-5_Vertical.kicad_mod
index 76314d7dc..94c660ad0 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-5_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-5_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-5_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-5, Vertical, RM 1.7mm, PentawattF")
 	(tags "TO-220F-5 Vertical RM 1.7mm PentawattF")
 	(property "Reference" "REF**"
 		(at 3.4 -4.1675 0)
 		(layer "F.SilkS")
-		(uuid "f81f5c98-2169-42db-b118-a5e8558a8a8d")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-5_Vertical"
 		(at 3.4 2.9025 0)
 		(layer "F.Fab")
-		(uuid "ee027ba9-7704-44da-8d47-81c1caf346aa")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "7263034c-a345-47ba-a779-16617d522762")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "3fa13b66-4e13-49de-bfc5-764e09dbd205")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d668c292-2b50-4a34-bac8-21bc6513d173")
-		(effects
-			(font
-				(size 1.27 1.27)
-				(thickness 0.15)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.85 -3.168)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "091130fe-945e-4647-bd85-81e8a377bfd7")
 	)
 	(fp_line
 		(start -1.85 -3.168)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6e41925d-a3c1-467a-a56d-b404a7e25c16")
 	)
 	(fp_line
 		(start -1.85 -0.408)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3796fb16-c489-4f2a-910e-afdb0e20cde1")
 	)
 	(fp_line
 		(start -1.85 1.773)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8532bca4-ffec-4c51-9664-821e4216bc9e")
 	)
 	(fp_line
 		(start 0.788 -0.408)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "eb1f263b-7c51-42ac-9aa5-5398b55ccfd3")
 	)
 	(fp_line
 		(start 1.55 -3.168)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "42855cc3-0ed2-4afa-a429-866e8cee9792")
 	)
 	(fp_line
 		(start 2.488 -0.408)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f576e461-120d-43a6-a830-5ac0fa1b63e4")
 	)
 	(fp_line
 		(start 4.188 -0.408)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0c8f14b0-c450-4ae4-8abe-a6f843e672d2")
 	)
 	(fp_line
 		(start 5.25 -3.168)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a8862f01-901d-4ed4-9e80-11b2c9a64b8f")
 	)
 	(fp_line
 		(start 5.888 -0.408)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1f2c311e-b578-451e-9394-651be9b8ffa7")
 	)
 	(fp_line
 		(start 7.588 -0.408)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3d7c1ca2-9bed-41d0-9274-19d9da5b17ae")
 	)
 	(fp_line
 		(start 8.65 -3.168)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8725aafc-c737-4327-9ef2-ec811cd6d71a")
 	)
 	(fp_line
 		(start -1.98 -3.3)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "cee054de-5b22-433e-8ec4-253b622c2184")
 	)
 	(fp_line
 		(start -1.98 1.91)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "1ec36e82-7173-42f5-b503-e3e5ddc8b667")
 	)
 	(fp_line
 		(start 8.78 -3.3)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "25582609-7d8a-4254-a464-0be88d70e8c8")
 	)
 	(fp_line
 		(start 8.78 1.91)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "0574913c-5caa-4b39-ac90-136dde0509f4")
 	)
 	(fp_line
 		(start -1.73 -3.0475)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2e912d3b-9ca3-4f84-b44e-2053dbce3306")
 	)
 	(fp_line
 		(start -1.73 -0.5275)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "47eb70c3-1589-4443-bbe0-de62174aaab0")
 	)
 	(fp_line
 		(start -1.73 1.6525)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "8c2d0b62-599c-4afa-8e6f-3a5bc0b06ffb")
 	)
 	(fp_line
 		(start 1.55 -3.0475)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1ec85615-2d2d-482b-a578-191800c1eb48")
 	)
 	(fp_line
 		(start 5.25 -3.0475)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "38f3e30e-6b2c-47da-ba71-cf39f8a110d4")
 	)
 	(fp_line
 		(start 8.53 -3.0475)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6e3176cb-09e1-4d3d-bac0-9292eb2ac041")
 	)
 	(fp_line
 		(start 8.53 1.6525)
@@ -292,12 +231,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "28022881-d45a-4b08-bfa6-005854dcdfd6")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.4 -4.1675 0)
 		(layer "F.Fab")
-		(uuid "a9a4cee1-fc64-4aaf-9d42-5a52318aebde")
 		(effects
 			(font
 				(size 1 1)
@@ -311,7 +248,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1b459579-b5e6-4ba0-a3b6-04cc7b016cd0")
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
@@ -319,7 +255,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "eb1a7728-1c42-4205-a050-75f6a4920f3e")
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
@@ -327,7 +262,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d62606f2-0935-4533-8cb1-9197cacec8ff")
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
@@ -335,7 +269,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "aa5ad978-f575-4ff5-b6f1-760b281955f0")
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
@@ -343,7 +276,6 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "846aa936-6a3d-4baf-9a32-418412f1c4a2")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-5_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
index 357ab92d8..9f8ee1b9e 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-7, Vertical, RM 1.27mm, staggered type-2")
 	(tags "TO-220F-7 Vertical RM 1.27mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.81 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "cf7ec361-cba0-40d3-89e1-06c7964e1c55")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 		(at 3.81 5.85 0)
 		(layer "F.Fab")
-		(uuid "051de963-9cf5-4f98-9385-8ef4a5d77885")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "7455802b-8f4c-4fa2-9caf-38a4a206b7a3")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "24453a33-b7d3-4f86-a39b-159d5e8efe67")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "bfc6a375-2471-4e3f-9723-53a45f9e454a")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.44 -4.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "764d2ce5-6432-48b5-8ac9-99a20d35af52")
 	)
 	(fp_line
 		(start -1.44 -4.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "24970539-4da5-4605-b943-fc4c57895d23")
 	)
 	(fp_line
 		(start -1.44 -1.861)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "d5d7096b-b7c5-4534-b629-4538133cb04a")
 	)
 	(fp_line
 		(start -1.44 0.321)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "eeb3bae2-1ac4-40fd-9429-e93fd84e86bd")
 	)
 	(fp_line
 		(start 1.05 0.321)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "494da847-601e-478e-b2b8-635599a4dcf8")
 	)
 	(fp_line
 		(start 1.27 0.321)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "43c41dc7-fd6c-4042-953f-e60a9fd66992")
 	)
 	(fp_line
 		(start 1.96 -4.62)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "46ae4d92-52a1-4257-902f-d1affcbb2271")
 	)
 	(fp_line
 		(start 3.572 0.321)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "da8b9298-f495-4e46-a64f-1780491bc5cc")
 	)
 	(fp_line
 		(start 3.81 0.321)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a4bfc349-152f-4c6c-b9cd-a0ff796413d2")
 	)
 	(fp_line
 		(start 5.66 -4.62)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ad799a6c-40bd-47eb-b141-2e6d7b226427")
 	)
 	(fp_line
 		(start 6.112 0.321)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "7e6d6278-36d1-42b1-9198-02485b5032d5")
 	)
 	(fp_line
 		(start 6.35 0.321)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "386a1c6c-0b99-49f7-b5b0-4cf0ebd0d835")
 	)
 	(fp_line
 		(start 8.652 0.321)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ba01e194-2eb8-4579-a8be-068856668354")
 	)
 	(fp_line
 		(start 9.06 -4.62)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "aab04734-cdaf-43e7-aff9-2c0f74a4c692")
 	)
 	(fp_line
 		(start -1.57 -4.75)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "e7aa1dd6-d65a-40eb-b3a2-0308a93723f2")
 	)
 	(fp_line
 		(start -1.57 4.85)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7a69ceed-9b52-4263-bd7d-8dcaa6fec83b")
 	)
 	(fp_line
 		(start 9.19 -4.75)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "cd6b2142-d8b6-40df-bc1a-790b46fcb45d")
 	)
 	(fp_line
 		(start 9.19 4.85)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "03f8ae99-35fb-4bfb-afed-f8d88f7489e8")
 	)
 	(fp_line
 		(start -1.32 -4.5)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f407af5d-98fd-43f3-b59e-7de095fa25c7")
 	)
 	(fp_line
 		(start -1.32 -1.98)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5c7f0a6e-cdd1-4cdb-a17b-e42702e53b6c")
 	)
 	(fp_line
 		(start -1.32 0.2)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "9bd7f461-dafc-4fc1-ad6a-e8c5648f59a3")
 	)
 	(fp_line
 		(start 1.27 0.2)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "6d30cdde-e92a-4747-8f5c-0fe876ac8560")
 	)
 	(fp_line
 		(start 1.96 -4.5)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7d62df4e-aecf-40ba-abee-1ed69c292eb1")
 	)
 	(fp_line
 		(start 3.81 0.2)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "53801ba3-d481-47f3-bc07-d73153961564")
 	)
 	(fp_line
 		(start 5.66 -4.5)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "44d9f8e0-3cf8-47db-9e99-512051d90b29")
 	)
 	(fp_line
 		(start 6.35 0.2)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ff8beace-9a64-44ed-b0fb-e555233519ce")
 	)
 	(fp_line
 		(start 8.94 -4.5)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0cb33e2b-d247-4b8e-88b0-eb817c5c2cda")
 	)
 	(fp_line
 		(start 8.94 0.2)
@@ -342,12 +276,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7c2cd74f-8e76-4e3e-af61-10bccd37df01")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -5.62 0)
 		(layer "F.Fab")
-		(uuid "db2f2412-e7cb-488f-ab38-ade63ea68a89")
 		(effects
 			(font
 				(size 1 1)
@@ -361,55 +293,48 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "54407d21-2098-41b4-9d30-3628262c2784")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "0bebb952-a230-466e-892c-94fd312b2217")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "28880138-8372-4640-a05b-6a92370d21b9")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "fa424dec-ed08-4e12-ab7a-a8d40d7942c3")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "bbe19e21-52fb-452d-8c1b-374b3bad1e86")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "75d7f425-4f82-4b50-860c-127012a04db2")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "a6a0f15d-d7a8-4e30-8dd6-99e3b30c7f30")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-7_P2.54x3.7mm_StaggerEven_Lead3.5mm_Vertical.wrl"
 		(offset
@@ -422,4 +347,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
index 48c7b61cf..874f06889 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-7, Vertical, RM 1.27mm, staggered type-1")
 	(tags "TO-220F-7 Vertical RM 1.27mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.81 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "70688818-790f-462d-8af5-5cef4f3f1ebd")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 		(at 3.81 2.15 0)
 		(layer "F.Fab")
-		(uuid "b7ac25cd-2b63-4854-bb17-733e6b9d765f")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "2f3cc21c-5c87-4e74-ae76-cae0ce72145a")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "02bb9005-3b8e-4548-ac96-8ab0ecf5ec9c")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d1126f47-9bce-4a65-9c45-7fb33837e09c")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.44 -8.32)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f856b18c-8979-4ee1-98bd-11a9ea3a2bca")
 	)
 	(fp_line
 		(start -1.44 -8.32)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3f58c752-2beb-4a27-b8ee-ece8d248a3c3")
 	)
 	(fp_line
 		(start -1.44 -5.561)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "32660abd-c454-413d-85b0-c98e0f7fc9c1")
 	)
 	(fp_line
 		(start -1.44 -3.379)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3c85aca1-08fc-4fdb-90d5-6a7185e6a552")
 	)
 	(fp_line
 		(start 0 -3.379)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1b2ac3ab-b496-4f06-8b68-74b6786b9f40")
 	)
 	(fp_line
 		(start 1.96 -8.32)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "30b7dec9-870d-4b47-9f34-2a882a45f6d9")
 	)
 	(fp_line
 		(start 2.302 -3.379)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "89378f56-7889-4835-b9c2-434413ee5627")
 	)
 	(fp_line
 		(start 2.54 -3.379)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a3b7ac21-e3fb-4ed2-ade8-2461b84e452e")
 	)
 	(fp_line
 		(start 4.842 -3.379)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "27b2e5fb-939b-45ec-adef-13d00164419a")
 	)
 	(fp_line
 		(start 5.08 -3.379)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "9c6d79e0-e627-4952-afdb-f42a1ee43024")
 	)
 	(fp_line
 		(start 5.66 -8.32)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2efcba4a-9829-4d1b-bb46-8d04b4ffff98")
 	)
 	(fp_line
 		(start 7.382 -3.379)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8e8e91f2-b9d4-43e4-8beb-64749aa5d53d")
 	)
 	(fp_line
 		(start 7.62 -3.379)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5ccbf94b-6c10-49f3-bfdb-4320d42c3551")
 	)
 	(fp_line
 		(start 9.06 -8.32)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "3f86e0b6-d527-4ff4-860f-732749b2640d")
 	)
 	(fp_line
 		(start -1.57 -8.45)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "b614e940-3886-42f1-81a5-abc6bbddbeea")
 	)
 	(fp_line
 		(start -1.57 1.15)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "f506cb3f-246a-4992-97e9-b2a488595bcd")
 	)
 	(fp_line
 		(start 9.19 -8.45)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "3c085e25-dd3e-406b-bc0b-d7bbecd36ea3")
 	)
 	(fp_line
 		(start 9.19 1.15)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "7ff53805-1708-4d5c-9061-4c8f26f93db3")
 	)
 	(fp_line
 		(start -1.32 -8.2)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4c9087a3-3711-4068-bd0c-c704e7d31839")
 	)
 	(fp_line
 		(start -1.32 -5.68)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "4dbccf95-6b60-49a7-b33d-4f56bbe2d867")
 	)
 	(fp_line
 		(start -1.32 -3.5)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "475e0b42-3514-4c35-b119-97e398ffd317")
 	)
 	(fp_line
 		(start 0 -3.5)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "587c8518-81a6-44c9-b0ce-9f5492415cc9")
 	)
 	(fp_line
 		(start 1.96 -8.2)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "198a3a65-9f66-48d2-b8d4-038c88af7238")
 	)
 	(fp_line
 		(start 2.54 -3.5)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c416378c-b25e-4762-b5b4-dd0ed41ab01c")
 	)
 	(fp_line
 		(start 5.08 -3.5)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7e461ae3-4e54-4eeb-9c64-e8b3fa5f8011")
 	)
 	(fp_line
 		(start 5.66 -8.2)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b31a26d8-e31e-4bea-9001-b5edd0d8bef9")
 	)
 	(fp_line
 		(start 7.62 -3.5)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "b53ea170-d8e2-49ec-b1b6-a8cc87a13075")
 	)
 	(fp_line
 		(start 8.94 -8.2)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1ae5da42-70db-4b6a-beca-931905d0120d")
 	)
 	(fp_line
 		(start 8.94 -3.5)
@@ -352,12 +285,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "51b9e92a-1138-43e0-b657-a4f8a31d0788")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.81 -9.32 0)
 		(layer "F.Fab")
-		(uuid "519f4194-eb26-4ecb-860f-e6b154df3ac3")
 		(effects
 			(font
 				(size 1 1)
@@ -371,55 +302,48 @@
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "ee55ddfe-5643-438e-8e8e-f590c2a5c6f4")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 1.27 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6d15c8dd-ab33-4430-b34b-8f11f6900dbe")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "e4f3e298-b2c2-4714-88f7-788176dd8d85")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 3.81 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "50410c79-81e4-4f0d-ac69-996a4d517e2e")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "94c73f9e-3100-45cd-894d-8ec1d89c34a9")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 6.35 -3.7)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "1a86548b-1c3b-4233-b44c-f737454b8736")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 7.62 0)
 		(size 1.8 1.8)
 		(drill 1.2)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "cdc1b196-0abb-43c3-a622-98e4af2fe32b")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-7_P2.54x3.7mm_StaggerOdd_Lead3.5mm_Vertical.wrl"
 		(offset
@@ -432,4 +356,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
index 18d435d45..92d28515a 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-9, Vertical, RM 0.9mm, staggered type-2")
 	(tags "TO-220F-9 Vertical RM 0.9mm staggered type-2")
 	(property "Reference" "REF**"
 		(at 3.6 -5.62 0)
 		(layer "F.SilkS")
-		(uuid "72de7fd2-bac3-4a13-934f-3eff907d92c4")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical"
 		(at 3.6 5.7 0)
 		(layer "F.Fab")
-		(uuid "932d4abb-c064-49a5-8adb-d4e7a40aa85e")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "5bd083f3-89c0-46c8-baf5-750bb336aeaf")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "d337df96-f248-4fde-b99f-1323d2bc7fde")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "8d8ec5a4-a7fd-4785-a3c6-f8e21cc26c3e")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.65 -4.62)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f8a81ca4-7bb8-422e-9adf-86f69fcddd12")
 	)
 	(fp_line
 		(start -1.65 -4.62)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0148bf95-14a8-49f0-95de-26ae4f5aa97e")
 	)
 	(fp_line
 		(start -1.65 -1.861)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "46f96644-c665-473d-a8c9-221e48ce0a98")
 	)
 	(fp_line
 		(start -1.65 0.321)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "672ed792-811d-402f-a4cb-f17f62fe7750")
 	)
 	(fp_line
 		(start 0.9 0.321)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "8560be15-167d-4e7a-952a-85bd3923dcbb")
 	)
 	(fp_line
 		(start 0.9 0.9)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c41f7d26-7653-4511-9493-cc2b9cb220cf")
 	)
 	(fp_line
 		(start 1.75 -4.62)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c7b38550-4f30-4223-8d7a-3c9a83d831da")
 	)
 	(fp_line
 		(start 2.687 0.321)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "5218257f-56fb-472e-b86a-d3ee5bcb6b21")
 	)
 	(fp_line
 		(start 2.7 0.321)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "22fa404a-387e-4989-8baf-8813c5c1c9c4")
 	)
 	(fp_line
 		(start 4.487 0.321)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0a042878-ae96-43ee-bd5b-738d48327f18")
 	)
 	(fp_line
 		(start 4.5 0.321)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "0704f4e4-6ed3-4865-b005-a5aa32bda9bd")
 	)
 	(fp_line
 		(start 5.45 -4.62)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f6157bd6-2239-4fbd-98cf-4c69932d9b3a")
 	)
 	(fp_line
 		(start 6.287 0.321)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "a4aaba63-6c56-4c78-8190-69300e2e17ed")
 	)
 	(fp_line
 		(start 6.301 0.321)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1c0496a6-24cf-4244-92be-73cced5b2e10")
 	)
 	(fp_line
 		(start 8.087 0.321)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "af52a708-a1c9-4248-b508-577e62fe733f")
 	)
 	(fp_line
 		(start 8.85 -4.62)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "ab88850c-f6d5-4a91-bce1-a27e652f75d4")
 	)
 	(fp_line
 		(start -1.78 -4.75)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "23f89a7c-edd8-4031-b06b-c73a34092d78")
 	)
 	(fp_line
 		(start -1.78 4.7)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "6fc72cf1-f041-4acf-8985-0f63ee530ccf")
 	)
 	(fp_line
 		(start 8.98 -4.75)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "467bba0e-0c20-4989-8dd6-d297bb02cd2f")
 	)
 	(fp_line
 		(start 8.98 4.7)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "2887c4f4-326b-445a-9306-2d1ddb9796a6")
 	)
 	(fp_line
 		(start -1.53 -4.5)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "dce0cc22-3a4a-4bc7-b199-b44d23aae705")
 	)
 	(fp_line
 		(start -1.53 -1.98)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "169b50d3-dc1e-4fd4-847f-7bc6a710c460")
 	)
 	(fp_line
 		(start -1.53 0.2)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "0dc2cdda-2435-431f-94ec-fea0c496b6ff")
 	)
 	(fp_line
 		(start 0.9 0.2)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "f0c9178d-7f68-4550-9c2e-606a843cfff2")
 	)
 	(fp_line
 		(start 1.75 -4.5)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "648a04ef-3413-4f6a-b8f1-9ddf7dada4dd")
 	)
 	(fp_line
 		(start 2.7 0.2)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5cd001e9-4a0e-48e6-af51-e5e48d05cf22")
 	)
 	(fp_line
 		(start 4.5 0.2)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2d6447bf-d3a4-4d02-be46-6b2291b4275e")
 	)
 	(fp_line
 		(start 5.45 -4.5)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ffdfc82d-1667-4db3-850e-29e8da6507a9")
 	)
 	(fp_line
 		(start 6.3 0.2)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2d0fd889-c031-4259-9da1-43606c1e6138")
 	)
 	(fp_line
 		(start 8.73 -4.5)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "c0c51b7e-93a5-45b3-bb08-cb408c64d4a5")
 	)
 	(fp_line
 		(start 8.73 0.2)
@@ -372,12 +303,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "29bb1f13-cf6f-4660-8c15-60184a1c6ce2")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.6 -5.62 0)
 		(layer "F.Fab")
-		(uuid "608c220c-bd7f-40d5-8bf1-fbdde1eb5265")
 		(effects
 			(font
 				(size 1 1)
@@ -391,71 +320,62 @@
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6e134632-bcfa-45de-ba24-1d3bc4b80549")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 0.9 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "99f67133-cf1c-4b3c-841e-c30ca9b790ae")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 1.8 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "872b21b4-a0c1-4897-93a4-45cf3aded682")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 2.7 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "45662a87-cf75-4e22-8bb6-18074d50026d")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 3.6 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "914b6a08-b5ba-48a7-bda1-9c10731827c4")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 4.5 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "aba57c98-ab1d-45d6-9112-5935d511e27a")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 5.4 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "88528d07-d3c7-478c-b252-37ac60bf92e0")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 6.3 3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "cd4c9a97-8b8d-4173-8f2e-c14bdcbce3ba")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 7.2 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9b6c4d12-55c4-4290-ad48-b746b8e93302")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-9_P1.8x3.7mm_StaggerEven_Lead3.5mm_Vertical.wrl"
 		(offset
@@ -468,4 +388,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
index a55338587..f14304e7e 100644
--- a/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical.kicad_mod
@@ -1,14 +1,12 @@
 (footprint "TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 	(version 20240108)
-	(generator "pcbnew")
-	(generator_version "8.0")
+	(generator "kicad-footprint-generator")
 	(layer "F.Cu")
 	(descr "TO-220F-9, Vertical, RM 0.9mm, staggered type-1")
 	(tags "TO-220F-9 Vertical RM 0.9mm staggered type-1")
 	(property "Reference" "REF**"
 		(at 3.6 -9.32 0)
 		(layer "F.SilkS")
-		(uuid "8fd034aa-38a3-4369-88a6-f3f5284a9367")
 		(effects
 			(font
 				(size 1 1)
@@ -19,7 +17,6 @@
 	(property "Value" "TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical"
 		(at 3.6 2 0)
 		(layer "F.Fab")
-		(uuid "8a6f1d31-4f22-4c70-bf79-5598cc5b10ed")
 		(effects
 			(font
 				(size 1 1)
@@ -27,42 +24,6 @@
 			)
 		)
 	)
-	(property "Footprint" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "6f390211-394f-489e-84c5-cbc8b790f0ad")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Datasheet" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "31303f57-224b-4302-89c0-16720b43f62b")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
-	(property "Description" ""
-		(at 0 0 0)
-		(unlocked yes)
-		(layer "F.Fab")
-		(hide yes)
-		(uuid "24aeb839-daca-4959-8608-b4566bc19674")
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-	)
 	(attr through_hole)
 	(fp_line
 		(start -1.65 -8.32)
@@ -72,7 +33,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "c0f291e1-8952-4d17-b0ca-1d2c43ecd18c")
 	)
 	(fp_line
 		(start -1.65 -8.32)
@@ -82,7 +42,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f83b747a-f4bc-470b-9009-c0a1d06f7027")
 	)
 	(fp_line
 		(start -1.65 -5.561)
@@ -92,7 +51,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "597f1f86-acf1-49be-b0d4-9101eaaad84b")
 	)
 	(fp_line
 		(start -1.65 -3.379)
@@ -102,7 +60,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "01a970f2-3f45-48ce-ba46-4afdd8c725db")
 	)
 	(fp_line
 		(start 0 -3.379)
@@ -112,7 +69,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "055a01e0-6dc5-401e-b632-7f74f590549c")
 	)
 	(fp_line
 		(start 1.75 -8.32)
@@ -122,7 +78,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "1326b0b9-fe1c-459e-9c99-3153e07ef5f7")
 	)
 	(fp_line
 		(start 1.787 -3.379)
@@ -132,7 +87,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "2f62c997-7f27-45b3-a06c-66a5d108cced")
 	)
 	(fp_line
 		(start 1.8 -3.379)
@@ -142,7 +96,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "73f6aa44-873d-43fe-9a76-ebc2c9714820")
 	)
 	(fp_line
 		(start 3.587 -3.379)
@@ -152,7 +105,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b8cd1421-6f8b-4260-b562-0a51ef88a5fe")
 	)
 	(fp_line
 		(start 3.6 -3.379)
@@ -162,7 +114,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "63c509ea-d305-4d0a-847e-2658951194bb")
 	)
 	(fp_line
 		(start 5.387 -3.379)
@@ -172,7 +123,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "867d5e92-a18a-4f0e-a5a2-f1f4f164d526")
 	)
 	(fp_line
 		(start 5.4 -3.379)
@@ -182,7 +132,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "164ab124-2e47-4a29-84e2-c1cdcd5f827f")
 	)
 	(fp_line
 		(start 5.45 -8.32)
@@ -192,7 +141,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "e3141acf-0980-45b4-bf67-82c91837360d")
 	)
 	(fp_line
 		(start 7.187 -3.379)
@@ -202,7 +150,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "b47ae56d-9154-4588-9cd8-73f160a60d21")
 	)
 	(fp_line
 		(start 7.201 -3.379)
@@ -212,7 +159,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "f59e2f14-5c8b-4522-a355-4f3a41dedd85")
 	)
 	(fp_line
 		(start 8.85 -8.32)
@@ -222,7 +168,6 @@
 			(type solid)
 		)
 		(layer "F.SilkS")
-		(uuid "6e07ce80-b73f-4835-9246-a83b5411815e")
 	)
 	(fp_line
 		(start -1.78 -8.45)
@@ -232,7 +177,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "c09b1b9f-84ed-41a7-988d-fc666d28f779")
 	)
 	(fp_line
 		(start -1.78 1)
@@ -242,7 +186,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "f2c29aa6-30ca-4fe5-b9e9-a3342ef27d62")
 	)
 	(fp_line
 		(start 8.98 -8.45)
@@ -252,7 +195,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "47cf4a48-7970-4ef9-9c4c-e0b1ee420afb")
 	)
 	(fp_line
 		(start 8.98 1)
@@ -262,7 +204,6 @@
 			(type solid)
 		)
 		(layer "F.CrtYd")
-		(uuid "af2cdfb5-e1b8-48d8-a9b0-c3f04586fa08")
 	)
 	(fp_line
 		(start -1.53 -8.2)
@@ -272,7 +213,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "ecbef0a4-0c81-4da9-9ca0-a62ddcdf7bc9")
 	)
 	(fp_line
 		(start -1.53 -5.68)
@@ -282,7 +222,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "da9f8238-82ee-4a9e-8481-f15fd9589157")
 	)
 	(fp_line
 		(start -1.53 -3.5)
@@ -292,7 +231,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "893fd19b-359a-45c5-acc0-2b8613b0f20f")
 	)
 	(fp_line
 		(start 0 -3.5)
@@ -302,7 +240,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "5d4eed98-fe32-48f2-bf9a-6cc9501615dc")
 	)
 	(fp_line
 		(start 1.75 -8.2)
@@ -312,7 +249,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "fa81be1e-105f-4afc-a31a-3b3f942b86a9")
 	)
 	(fp_line
 		(start 1.8 -3.5)
@@ -322,7 +258,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "59908943-bfde-40af-a643-0418aeb05041")
 	)
 	(fp_line
 		(start 3.6 -3.5)
@@ -332,7 +267,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "28c58849-8279-43a6-8fda-3c9dcb0dfded")
 	)
 	(fp_line
 		(start 5.4 -3.5)
@@ -342,7 +276,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "7487398f-ed71-4868-8245-cb7ac0ad8779")
 	)
 	(fp_line
 		(start 5.45 -8.2)
@@ -352,7 +285,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "65e3fa6c-33cb-4550-b1e6-81c19ec0c7b0")
 	)
 	(fp_line
 		(start 7.2 -3.5)
@@ -362,7 +294,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "2e690ade-903b-4983-ad84-e140e47c8145")
 	)
 	(fp_line
 		(start 8.73 -8.2)
@@ -372,7 +303,6 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "1da78379-35c0-4a36-9702-852990a930ee")
 	)
 	(fp_line
 		(start 8.73 -3.5)
@@ -382,12 +312,10 @@
 			(type solid)
 		)
 		(layer "F.Fab")
-		(uuid "cfba0cdf-3d58-43e4-a8af-b0dc1d6486ba")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.6 -9.32 0)
 		(layer "F.Fab")
-		(uuid "4ea8ebab-990b-4805-959b-ec406ee16252")
 		(effects
 			(font
 				(size 1 1)
@@ -401,71 +329,62 @@
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "64d4464a-48c4-4feb-a4f6-911da931a0e1")
 	)
-	(pad "2" thru_hole oval
+	(pad "2" thru_hole circle
 		(at 0.9 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "6939c1dd-d6f7-40e3-b147-f3c6f2975dc6")
 	)
-	(pad "3" thru_hole oval
+	(pad "3" thru_hole circle
 		(at 1.8 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "4c1ee835-57b1-498c-82ce-5193c160bf50")
 	)
-	(pad "4" thru_hole oval
+	(pad "4" thru_hole circle
 		(at 2.7 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "088ca8f4-02dd-4fc1-83eb-3e48f2793431")
 	)
-	(pad "5" thru_hole oval
+	(pad "5" thru_hole circle
 		(at 3.6 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "9ee62271-a9f5-46e7-b010-97700ecaac3b")
 	)
-	(pad "6" thru_hole oval
+	(pad "6" thru_hole circle
 		(at 4.5 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "99f00018-a28a-4390-a54a-1f3e9da09a8e")
 	)
-	(pad "7" thru_hole oval
+	(pad "7" thru_hole circle
 		(at 5.4 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "197c5411-4c7b-4bcd-a2ff-a6cd45751ca3")
 	)
-	(pad "8" thru_hole oval
+	(pad "8" thru_hole circle
 		(at 6.3 -3.7)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "f8627bfe-fd75-40f3-af52-9c1470ef1095")
 	)
-	(pad "9" thru_hole oval
+	(pad "9" thru_hole circle
 		(at 7.2 0)
 		(size 1.5 1.5)
 		(drill 0.7)
 		(layers "*.Cu" "*.Mask")
 		(remove_unused_layers no)
-		(uuid "d48b67e0-6513-4d1c-bebe-abc6350ab319")
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-220F-9_P1.8x3.7mm_StaggerOdd_Lead3.5mm_Vertical.wrl"
 		(offset
@@ -478,4 +397,4 @@
 			(xyz 0 0 0)
 		)
 	)
-)
\ No newline at end of file
+)
diff --git a/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabDown.kicad_mod
index 335e7815f..b64084a02 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabDown.kicad_mod
@@ -176,8 +176,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 -27.15 0)
@@ -199,15 +199,15 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-2_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabUp.kicad_mod
index 46bbaa7e4..6af6473df 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-2_Horizontal_TabUp.kicad_mod
@@ -176,8 +176,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 27.15 0)
@@ -199,15 +199,15 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-2_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-2_Vertical.kicad_mod
index 9b7b29860..462701bee 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-2_Vertical.kicad_mod
@@ -183,15 +183,15 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabDown.kicad_mod
index 95d55629f..3fbf21132 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabDown.kicad_mod
@@ -194,8 +194,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 -27.15 0)
@@ -217,22 +217,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabUp.kicad_mod
index 1ea674306..71728ce0e 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-3_Horizontal_TabUp.kicad_mod
@@ -194,8 +194,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 27.15 0)
@@ -217,22 +217,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-3_Vertical.kicad_mod
index 6c1966425..37a58bd78 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-3_Vertical.kicad_mod
@@ -183,22 +183,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabDown.kicad_mod
index fde0ad50e..a6c8dade5 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabDown.kicad_mod
@@ -212,8 +212,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.08 -27.15 0)
@@ -235,29 +235,29 @@
 		(at 0 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 10.16 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-4_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabUp.kicad_mod
index 66e92565a..aab285961 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-4_Horizontal_TabUp.kicad_mod
@@ -212,8 +212,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.08 27.15 0)
@@ -235,29 +235,29 @@
 		(at 0 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 10.16 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-4_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-4_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-4_Vertical.kicad_mod
index bb2424edf..feae63579 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-4_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-4_Vertical.kicad_mod
@@ -192,29 +192,29 @@
 		(at 0 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 10.16 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-4_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabDown.kicad_mod
index 91bd4e049..4b891e01b 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabDown.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.08 -27.15 0)
@@ -253,36 +253,36 @@
 		(at 0 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 10.16 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-5_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabUp.kicad_mod
index 0fd014d35..17cec698d 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-5_Horizontal_TabUp.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.08 27.15 0)
@@ -253,36 +253,36 @@
 		(at 0 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 10.16 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-5_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-247-5_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-247-5_Vertical.kicad_mod
index 4749c941f..95300b9fd 100644
--- a/Package_TO_SOT_THT.pretty/TO-247-5_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-247-5_Vertical.kicad_mod
@@ -201,36 +201,36 @@
 		(at 0 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 7.62 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 10.16 0)
 		(size 1.905 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-247-5_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-251-2-1EP_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-251-2-1EP_Horizontal_TabDown.kicad_mod
index 4db6206ae..124f0ba35 100644
--- a/Package_TO_SOT_THT.pretty/TO-251-2-1EP_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-251-2-1EP_Horizontal_TabDown.kicad_mod
@@ -228,15 +228,15 @@
 		(at 0 0)
 		(size 1.8 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 4.58 0)
 		(size 1.8 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" smd rect
 		(at 2.29 -7.433333)
diff --git a/Package_TO_SOT_THT.pretty/TO-251-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-251-2_Vertical.kicad_mod
index af0f06dba..1aee9f28c 100644
--- a/Package_TO_SOT_THT.pretty/TO-251-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-251-2_Vertical.kicad_mod
@@ -183,15 +183,15 @@
 		(at 0 0)
 		(size 1.8 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 4.58 0)
 		(size 1.8 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-251-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-251-3-1EP_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-251-3-1EP_Horizontal_TabDown.kicad_mod
index ad7f1bf85..4b0b1d48a 100644
--- a/Package_TO_SOT_THT.pretty/TO-251-3-1EP_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-251-3-1EP_Horizontal_TabDown.kicad_mod
@@ -246,22 +246,22 @@
 		(at 0 0)
 		(size 1.7175 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.29 0)
 		(size 1.7175 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.58 0)
 		(size 1.7175 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" smd rect
 		(at 2.29 -7.433333)
diff --git a/Package_TO_SOT_THT.pretty/TO-251-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-251-3_Vertical.kicad_mod
index da5b56c3c..f3e7a7d89 100644
--- a/Package_TO_SOT_THT.pretty/TO-251-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-251-3_Vertical.kicad_mod
@@ -192,22 +192,22 @@
 		(at 0 0)
 		(size 1.7175 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.29 0)
 		(size 1.7175 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 4.58 0)
 		(size 1.7175 1.8)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-251-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-262-3-1EP_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-262-3-1EP_Horizontal_TabDown.kicad_mod
index 67789b707..9889c2dc1 100644
--- a/Package_TO_SOT_THT.pretty/TO-262-3-1EP_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-262-3-1EP_Horizontal_TabDown.kicad_mod
@@ -228,22 +228,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" smd rect
 		(at 2.54 -10.983333)
diff --git a/Package_TO_SOT_THT.pretty/TO-262-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-262-3_Vertical.kicad_mod
index 262864029..41d72bd75 100644
--- a/Package_TO_SOT_THT.pretty/TO-262-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-262-3_Vertical.kicad_mod
@@ -165,22 +165,22 @@
 		(at 0 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 2.54 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 5.08 0)
 		(size 1.905 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-262-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-262-5-1EP_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-262-5-1EP_Horizontal_TabDown.kicad_mod
index 6eed76239..96f467801 100644
--- a/Package_TO_SOT_THT.pretty/TO-262-5-1EP_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-262-5-1EP_Horizontal_TabDown.kicad_mod
@@ -264,36 +264,36 @@
 		(at 0 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" smd rect
 		(at 3.4 -10.983333)
diff --git a/Package_TO_SOT_THT.pretty/TO-262-5_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-262-5_Vertical.kicad_mod
index 693c7055c..b37e831d4 100644
--- a/Package_TO_SOT_THT.pretty/TO-262-5_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-262-5_Vertical.kicad_mod
@@ -165,36 +165,36 @@
 		(at 0 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 1.7 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 3.4 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 5.1 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 6.8 0)
 		(size 1.275 2)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-262-5_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabDown.kicad_mod
index 1533ca883..a982f57e6 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabDown.kicad_mod
@@ -176,8 +176,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 -32.2 0)
@@ -199,15 +199,15 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-2_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabUp.kicad_mod
index 07f0cf32d..764d6066a 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-2_Horizontal_TabUp.kicad_mod
@@ -176,8 +176,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 32.2 0)
@@ -199,15 +199,15 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-2_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-2_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-2_Vertical.kicad_mod
index 6b7432ac8..96562806d 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-2_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-2_Vertical.kicad_mod
@@ -237,15 +237,15 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-2_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabDown.kicad_mod
index 23d8704ef..6336c2de8 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabDown.kicad_mod
@@ -194,8 +194,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 -32.2 0)
@@ -217,22 +217,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabUp.kicad_mod
index ee18ec632..6ee5d80ea 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-3_Horizontal_TabUp.kicad_mod
@@ -194,8 +194,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 32.2 0)
@@ -217,22 +217,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-3_Vertical.kicad_mod
index 6fa3390e7..d5abdcb8b 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-3_Vertical.kicad_mod
@@ -255,22 +255,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabDown.kicad_mod
index 21e5b8151..dd6d5288e 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabDown.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 7.62 -32.2 0)
@@ -253,36 +253,36 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 3.81 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 7.62 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 11.43 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 15.24 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-5_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabUp.kicad_mod
index 59ad5e505..43d9b6504 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-5_Horizontal_TabUp.kicad_mod
@@ -230,8 +230,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 7.62 32.2 0)
@@ -253,36 +253,36 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 3.81 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 7.62 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 11.43 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 15.24 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-5_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-264-5_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-264-5_Vertical.kicad_mod
index e54934346..b6e74d60a 100644
--- a/Package_TO_SOT_THT.pretty/TO-264-5_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-264-5_Vertical.kicad_mod
@@ -291,36 +291,36 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 3.81 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 7.62 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole oval
 		(at 11.43 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole oval
 		(at 15.24 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-264-5_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-33-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-33-4.kicad_mod
index 0e2ab3b6c..07d9bbdeb 100644
--- a/Package_TO_SOT_THT.pretty/TO-33-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-33-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-33-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-33-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-33-4_Window.kicad_mod
index 66a83f340..153262dcd 100644
--- a/Package_TO_SOT_THT.pretty/TO-33-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-33-4_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,29 +304,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-33-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-38-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-38-2.kicad_mod
index 5f7c1f7b5..c894606d7 100644
--- a/Package_TO_SOT_THT.pretty/TO-38-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-38-2.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 2.54 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -52,8 +52,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -62,8 +62,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -9.77 0)
@@ -79,15 +79,15 @@
 		(at 0 0)
 		(size 1.7 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.3 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-38-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-38-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-38-2_Window.kicad_mod
index 7891fdc47..f7710769a 100644
--- a/Package_TO_SOT_THT.pretty/TO-38-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-38-2_Window.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 2.54 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.46 -0.041)
@@ -232,8 +232,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -242,8 +242,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -252,8 +252,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -9.77 0)
@@ -269,15 +269,15 @@
 		(at 0 0)
 		(size 1.7 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.3 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-38-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-38-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-38-3.kicad_mod
index 7403f8484..4c3a3c483 100644
--- a/Package_TO_SOT_THT.pretty/TO-38-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-38-3.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 2.54 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -52,8 +52,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -62,8 +62,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -9.77 0)
@@ -79,22 +79,22 @@
 		(at 0 0)
 		(size 1.7 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.3 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.3 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-38-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-38-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-38-3_Window.kicad_mod
index a73e7a77f..cef711a74 100644
--- a/Package_TO_SOT_THT.pretty/TO-38-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-38-3_Window.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 2.54 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.46 -0.041)
@@ -232,8 +232,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -242,8 +242,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -252,8 +252,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -9.77 0)
@@ -269,22 +269,22 @@
 		(at 0 0)
 		(size 1.7 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.3 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.3 1.3)
 		(drill 0.8)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-38-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-10.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-10.kicad_mod
index fb444f949..c0511ec39 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-10.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-10.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,71 +159,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-10.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-10_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-10_Window.kicad_mod
index 5612a0365..f0cdb412b 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-10_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-10_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,71 +304,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-10_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-2.kicad_mod
index 1798d28dc..ea2eee7ae 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-2.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,15 +159,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-2_Window.kicad_mod
index bb2887607..f2d794eba 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-2_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,15 +304,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-3.kicad_mod
index a04df17b6..790fb5188 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-3.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,22 +159,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-3_Window.kicad_mod
index 6a56f7e40..4879fc5ae 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-3_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,22 +304,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-4.kicad_mod
index aa824c8db..81681be67 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-4_Window.kicad_mod
index 4b06d71bf..d311c77dd 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-4_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,29 +304,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-6.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-6.kicad_mod
index 9078f9975..2f482245d 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-6.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-6.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,43 +159,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-6.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-6_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-6_Window.kicad_mod
index eafd22263..a128f7f34 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-6_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-6_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,43 +304,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-6_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-8.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-8.kicad_mod
index f8fc75f21..cfc96a4b7 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-8.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-8.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,57 +159,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-8.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-39-8_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-39-8_Window.kicad_mod
index 0c7401caf..d127846c7 100644
--- a/Package_TO_SOT_THT.pretty/TO-39-8_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-39-8_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,57 +304,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-39-8_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabDown.kicad_mod
index 9d61a2572..63c540064 100644
--- a/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabDown.kicad_mod
@@ -257,8 +257,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 -24.12 0)
@@ -280,22 +280,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-3P-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabUp.kicad_mod
index 327dafbc2..d1c0d1eed 100644
--- a/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-3P-3_Horizontal_TabUp.kicad_mod
@@ -347,8 +347,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 24.12 0)
@@ -370,22 +370,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-3P-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-3P-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-3P-3_Vertical.kicad_mod
index 59d53e300..d21edd628 100644
--- a/Package_TO_SOT_THT.pretty/TO-3P-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-3P-3_Vertical.kicad_mod
@@ -255,22 +255,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-3P-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabDown.kicad_mod b/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabDown.kicad_mod
index 708676466..8b2d2908e 100644
--- a/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabDown.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabDown.kicad_mod
@@ -257,8 +257,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 -22.72 0)
@@ -280,22 +280,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-3PB-3_Horizontal_TabDown.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabUp.kicad_mod b/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabUp.kicad_mod
index 74d358c83..3227aa225 100644
--- a/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabUp.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-3PB-3_Horizontal_TabUp.kicad_mod
@@ -347,8 +347,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5.45 22.72 0)
@@ -370,22 +370,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-3PB-3_Horizontal_TabUp.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-3PB-3_Vertical.kicad_mod b/Package_TO_SOT_THT.pretty/TO-3PB-3_Vertical.kicad_mod
index 05d4c1c0a..db573337a 100644
--- a/Package_TO_SOT_THT.pretty/TO-3PB-3_Vertical.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-3PB-3_Vertical.kicad_mod
@@ -255,22 +255,22 @@
 		(at 0 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole oval
 		(at 5.45 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole oval
 		(at 10.9 0)
 		(size 2.5 4.5)
 		(drill 1.5)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-3PB-3_Vertical.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-46-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-46-2.kicad_mod
index a34f01cd9..ec3608afb 100644
--- a/Package_TO_SOT_THT.pretty/TO-46-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-46-2.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,15 +159,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-46-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-46-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-46-2_Window.kicad_mod
index 4e86173d7..de0187fb2 100644
--- a/Package_TO_SOT_THT.pretty/TO-46-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-46-2_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,15 +250,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-46-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-46-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-46-3.kicad_mod
index d1ebd9765..d0f3bc2cd 100644
--- a/Package_TO_SOT_THT.pretty/TO-46-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-46-3.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,22 +159,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-46-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-46-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-46-3_Window.kicad_mod
index 30597145a..b161316fc 100644
--- a/Package_TO_SOT_THT.pretty/TO-46-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-46-3_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,22 +250,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-46-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-46-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-46-4.kicad_mod
index f89ce1545..41d2d856e 100644
--- a/Package_TO_SOT_THT.pretty/TO-46-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-46-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-46-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-46-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-46-4_Window.kicad_mod
index c031d5e61..8c5a686b4 100644
--- a/Package_TO_SOT_THT.pretty/TO-46-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-46-4_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,29 +250,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-46-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-10.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-10.kicad_mod
index 4af2487c0..011cd2c94 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-10.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-10.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,71 +159,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-10.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-10_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-10_Window.kicad_mod
index 20308db29..ce356957a 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-10_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-10_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,71 +304,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-10_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-2.kicad_mod
index 96614c7c1..bb6ad5924 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-2.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,15 +159,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-2_Window.kicad_mod
index 779f752af..0ca1e11b1 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-2_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,15 +304,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-3.kicad_mod
index 22e74c937..2dbcaf380 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-3.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,22 +159,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-3_Window.kicad_mod
index 16c49ba9a..07c0fd02d 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-3_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,22 +304,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-4.kicad_mod
index 448582813..bffe4e002 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-4_Window.kicad_mod
index ebc3607b5..b0bd0375f 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-4_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,29 +304,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-6.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-6.kicad_mod
index 9055abfbc..173e9be4d 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-6.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-6.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,43 +159,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-6.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-6_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-6_Window.kicad_mod
index 83e239be0..36300113a 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-6_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-6_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,43 +304,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-6_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-8.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-8.kicad_mod
index f3db2c5e1..4970c3e89 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-8.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-8.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,57 +159,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-8.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08.kicad_mod
index c8adf93de..57be5460a 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,57 +159,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.336051 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.743949 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-8_PD5.08.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08_Window.kicad_mod
index 2108a2212..fec530bce 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-8_PD5.08_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,57 +304,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.336051 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.743949 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-8_PD5.08_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-5-8_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-5-8_Window.kicad_mod
index 707d7089d..cf509dae3 100644
--- a/Package_TO_SOT_THT.pretty/TO-5-8_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-5-8_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,57 +304,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-5-8_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-52-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-52-2.kicad_mod
index 5f2149afd..e921ba85c 100644
--- a/Package_TO_SOT_THT.pretty/TO-52-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-52-2.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,15 +159,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-52-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-52-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-52-2_Window.kicad_mod
index 6c96a7d3c..be16c1997 100644
--- a/Package_TO_SOT_THT.pretty/TO-52-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-52-2_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,15 +250,15 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-52-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-52-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-52-3.kicad_mod
index 18f90d6f0..0a106e3f3 100644
--- a/Package_TO_SOT_THT.pretty/TO-52-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-52-3.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,22 +159,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-52-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-52-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-52-3_Window.kicad_mod
index 3fad64add..80604b68d 100644
--- a/Package_TO_SOT_THT.pretty/TO-52-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-52-3_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,22 +250,22 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-52-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-72-4.kicad_mod b/Package_TO_SOT_THT.pretty/TO-72-4.kicad_mod
index d902126bf..cc4be8929 100644
--- a/Package_TO_SOT_THT.pretty/TO-72-4.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-72-4.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -159,29 +159,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-72-4.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-72-4_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-72-4_Window.kicad_mod
index fc6bd6279..89f393d5c 100644
--- a/Package_TO_SOT_THT.pretty/TO-72-4_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-72-4_Window.kicad_mod
@@ -223,8 +223,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 1.27 0)
@@ -233,8 +233,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 1.27 -4.02 0)
@@ -250,29 +250,29 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 1.27 1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 1.27 -1.27)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-72-4_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-75-6.kicad_mod b/Package_TO_SOT_THT.pretty/TO-75-6.kicad_mod
index 936c18bd3..755cee181 100644
--- a/Package_TO_SOT_THT.pretty/TO-75-6.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-75-6.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,43 +159,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-75-6.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-75-6_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-75-6_Window.kicad_mod
index b4756eb44..0e268f457 100644
--- a/Package_TO_SOT_THT.pretty/TO-75-6_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-75-6_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,43 +304,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-75-6_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-78-10.kicad_mod b/Package_TO_SOT_THT.pretty/TO-78-10.kicad_mod
index c49440428..da0310fa4 100644
--- a/Package_TO_SOT_THT.pretty/TO-78-10.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-78-10.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,71 +159,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-78-10.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-78-10_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-78-10_Window.kicad_mod
index 51d2cb5d4..36c8c56ad 100644
--- a/Package_TO_SOT_THT.pretty/TO-78-10_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-78-10_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,71 +304,71 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.55767 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.01767 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 3.82233 2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.28233 1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 5.28233 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 3.82233 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "9" thru_hole circle
 		(at 2.01767 -2.777085)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "10" thru_hole circle
 		(at 0.55767 -1.716333)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-78-10_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-78-6.kicad_mod b/Package_TO_SOT_THT.pretty/TO-78-6.kicad_mod
index 96a03a7d8..5353bcc09 100644
--- a/Package_TO_SOT_THT.pretty/TO-78-6.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-78-6.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,43 +159,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-78-6.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-78-6_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-78-6_Window.kicad_mod
index 87e8d315f..232b707c3 100644
--- a/Package_TO_SOT_THT.pretty/TO-78-6_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-78-6_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,43 +304,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-78-6_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-78-8.kicad_mod b/Package_TO_SOT_THT.pretty/TO-78-8.kicad_mod
index d5b788a28..e8c42b4dc 100644
--- a/Package_TO_SOT_THT.pretty/TO-78-8.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-78-8.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,57 +159,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-78-8.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-78-8_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-78-8_Window.kicad_mod
index d420435f2..f5877a57f 100644
--- a/Package_TO_SOT_THT.pretty/TO-78-8_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-78-8_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,57 +304,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-78-8_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-8-2.kicad_mod b/Package_TO_SOT_THT.pretty/TO-8-2.kicad_mod
index bb1f894f8..0b82bec62 100644
--- a/Package_TO_SOT_THT.pretty/TO-8-2.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-8-2.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 3.55 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -52,8 +52,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -62,8 +62,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.55 -8.32 0)
@@ -79,15 +79,15 @@
 		(at 0 0)
 		(size 2.1 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 7.1 0)
 		(size 1.6 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-8-2.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-8-2_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-8-2_Window.kicad_mod
index b1d95b02b..2d98c9f7c 100644
--- a/Package_TO_SOT_THT.pretty/TO-8-2_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-8-2_Window.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 3.55 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.908 0.2)
@@ -295,8 +295,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -305,8 +305,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -315,8 +315,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.55 -8.32 0)
@@ -332,15 +332,15 @@
 		(at 0 0)
 		(size 2.1 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 7.1 0)
 		(size 1.6 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-8-2_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-8-3.kicad_mod b/Package_TO_SOT_THT.pretty/TO-8-3.kicad_mod
index 0a2811c9c..f5a253970 100644
--- a/Package_TO_SOT_THT.pretty/TO-8-3.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-8-3.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 3.55 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -52,8 +52,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -62,8 +62,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.55 -8.32 0)
@@ -79,22 +79,22 @@
 		(at 0 0)
 		(size 2.1 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 3.55 3.55)
 		(size 1.6 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 7.1 0)
 		(size 1.6 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-8-3.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-8-3_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-8-3_Window.kicad_mod
index 5014dec10..88be7aae2 100644
--- a/Package_TO_SOT_THT.pretty/TO-8-3_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-8-3_Window.kicad_mod
@@ -32,8 +32,8 @@
 			(width 0.12)
 			(type solid)
 		)
-		(layer "F.SilkS")
 		(fill none)
+		(layer "F.SilkS")
 	)
 	(fp_circle
 		(center 3.55 -0.01)
@@ -42,8 +42,8 @@
 			(width 0.05)
 			(type solid)
 		)
-		(layer "F.CrtYd")
 		(fill none)
+		(layer "F.CrtYd")
 	)
 	(fp_line
 		(start -1.908 0.2)
@@ -295,8 +295,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -305,8 +305,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 3.55 0)
@@ -315,8 +315,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 3.55 -8.32 0)
@@ -332,22 +332,22 @@
 		(at 0 0)
 		(size 2.1 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 3.55 3.55)
 		(size 1.6 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 7.1 0)
 		(size 1.6 1.6)
 		(drill 1.1)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-8-3_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-99-6.kicad_mod b/Package_TO_SOT_THT.pretty/TO-99-6.kicad_mod
index e7a928772..38f6db631 100644
--- a/Package_TO_SOT_THT.pretty/TO-99-6.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-99-6.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -159,43 +159,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-99-6.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-99-6_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-99-6_Window.kicad_mod
index db470167e..f21a559e0 100644
--- a/Package_TO_SOT_THT.pretty/TO-99-6_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-99-6_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.54 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.54 -5.82 0)
@@ -304,43 +304,43 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.743949 1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.54 2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 5.08 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 4.336051 -1.796051)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 2.54 -2.54)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-99-6_Window.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-99-8.kicad_mod b/Package_TO_SOT_THT.pretty/TO-99-8.kicad_mod
index 6a378b71d..512635a0a 100644
--- a/Package_TO_SOT_THT.pretty/TO-99-8.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-99-8.kicad_mod
@@ -142,8 +142,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -159,57 +159,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-99-8.wrl"
 		(offset
diff --git a/Package_TO_SOT_THT.pretty/TO-99-8_Window.kicad_mod b/Package_TO_SOT_THT.pretty/TO-99-8_Window.kicad_mod
index ef991c2b7..554dbdff7 100644
--- a/Package_TO_SOT_THT.pretty/TO-99-8_Window.kicad_mod
+++ b/Package_TO_SOT_THT.pretty/TO-99-8_Window.kicad_mod
@@ -277,8 +277,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_circle
 		(center 2.92 0)
@@ -287,8 +287,8 @@
 			(width 0.1)
 			(type solid)
 		)
-		(layer "F.Fab")
 		(fill none)
+		(layer "F.Fab")
 	)
 	(fp_text user "${REFERENCE}"
 		(at 2.92 -5.82 0)
@@ -304,57 +304,57 @@
 		(at 0 0)
 		(size 1.6 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "2" thru_hole circle
 		(at 0.855248 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "3" thru_hole circle
 		(at 2.92 2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "4" thru_hole circle
 		(at 4.984752 2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "5" thru_hole circle
 		(at 5.84 0)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "6" thru_hole circle
 		(at 4.984752 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "7" thru_hole circle
 		(at 2.92 -2.92)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(pad "8" thru_hole circle
 		(at 0.855248 -2.064752)
 		(size 1.2 1.2)
 		(drill 0.7)
-		(remove_unused_layers no)
 		(layers "*.Cu" "*.Mask")
+		(remove_unused_layers no)
 	)
 	(model "${KICAD8_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-99-8_Window.wrl"
 		(offset