diff --git a/my_additions.pretty/Heatsink_120x80x55.kicad_mod b/my_additions.pretty/Heatsink_120x80x55.kicad_mod
index 61bd8da..a2a9e70 100644
--- a/my_additions.pretty/Heatsink_120x80x55.kicad_mod
+++ b/my_additions.pretty/Heatsink_120x80x55.kicad_mod
@@ -5,7 +5,6 @@
 	(layer "F.Cu")
 	(property "Reference" "REF**"
 		(at -61 10.5 90)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "4f7392e0-6d20-45fb-8271-b9d0476c8a0f")
 		(effects
@@ -18,7 +17,6 @@
 	)
 	(property "Value" "Heatsink_120x80x55"
 		(at 0 -10 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "7ca7dd13-a137-4770-b53d-06b73f6e0ec4")
 		(effects
@@ -185,7 +183,6 @@
 	)
 	(fp_text user "PCB Edge"
 		(at 0 -1 0)
-		(unlocked yes)
 		(layer "Cmts.User")
 		(uuid "7bb95fe5-9a87-497d-baa1-177ce7cddb4f")
 		(effects
@@ -197,7 +194,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 -11.5 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "26d34c51-08b6-4ef9-84da-ffc062a2d701")
 		(effects
diff --git a/my_additions.pretty/Heatsink_120x80x55_off_pcb.kicad_mod b/my_additions.pretty/Heatsink_120x80x55_off_pcb.kicad_mod
index 75ca4cd..5a50626 100644
--- a/my_additions.pretty/Heatsink_120x80x55_off_pcb.kicad_mod
+++ b/my_additions.pretty/Heatsink_120x80x55_off_pcb.kicad_mod
@@ -5,7 +5,6 @@
 	(layer "F.Cu")
 	(property "Reference" "REF**"
 		(at -61 9.3 90)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "4f7392e0-6d20-45fb-8271-b9d0476c8a0f")
 		(effects
@@ -18,7 +17,6 @@
 	)
 	(property "Value" "Heatsink_120x80x55_off_pcb"
 		(at 0 -10 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "7ca7dd13-a137-4770-b53d-06b73f6e0ec4")
 		(effects
@@ -262,7 +260,6 @@
 	)
 	(fp_text user "PCB Edge"
 		(at 0 -1 0)
-		(unlocked yes)
 		(layer "Cmts.User")
 		(uuid "7bb95fe5-9a87-497d-baa1-177ce7cddb4f")
 		(effects
@@ -274,7 +271,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 -11.5 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "26d34c51-08b6-4ef9-84da-ffc062a2d701")
 		(effects
@@ -298,6 +294,54 @@
 		(layers "F&B.Cu" "*.Mask")
 		(uuid "aff6d5c1-baaa-4cd8-bda7-542a93dbb5f1")
 	)
+	(zone
+		(net 0)
+		(net_name "")
+		(layers "F.Cu" "B.Cu")
+		(uuid "9d5cdae0-b793-4f62-a121-74ae8b57e04f")
+		(name "KeepOutScrew")
+		(hatch edge 0.5)
+		(connect_pads
+			(clearance 0)
+		)
+		(min_thickness 0.25)
+		(filled_areas_thickness no)
+		(keepout
+			(tracks not_allowed)
+			(vias not_allowed)
+			(pads not_allowed)
+			(copperpour not_allowed)
+			(footprints allowed)
+		)
+		(placement
+			(enabled no)
+			(sheetname "")
+		)
+		(fill
+			(thermal_gap 0.5)
+			(thermal_bridge_width 0.5)
+		)
+		(polygon
+			(pts
+				(xy -52.703975 4.838077) (xy -52.735718 4.515789) (xy -52.798897 4.198165) (xy -52.892905 3.888263)
+				(xy -53.016835 3.589068) (xy -53.169496 3.303461) (xy -53.349415 3.034192) (xy -53.554861 2.783855)
+				(xy -53.783855 2.554861) (xy -54.034192 2.349415) (xy -54.303461 2.169496) (xy -54.589068 2.016835)
+				(xy -54.888263 1.892905) (xy -55.198165 1.798897) (xy -55.515789 1.735718) (xy -55.838077 1.703975)
+				(xy -56.161923 1.703975) (xy -56.484211 1.735718) (xy -56.801835 1.798897) (xy -57.111737 1.892905)
+				(xy -57.410932 2.016835) (xy -57.696539 2.169496) (xy -57.965808 2.349415) (xy -58.216145 2.554861)
+				(xy -58.445139 2.783855) (xy -58.650585 3.034192) (xy -58.830504 3.303461) (xy -58.983165 3.589068)
+				(xy -59.107095 3.888263) (xy -59.201103 4.198165) (xy -59.264282 4.515789) (xy -59.296025 4.838077)
+				(xy -59.296025 5.161923) (xy -59.264282 5.484211) (xy -59.201103 5.801835) (xy -59.107095 6.111737)
+				(xy -58.983165 6.410932) (xy -58.830504 6.696539) (xy -58.650585 6.965808) (xy -58.445139 7.216145)
+				(xy -58.216145 7.445139) (xy -57.965808 7.650585) (xy -57.696539 7.830504) (xy -57.410932 7.983165)
+				(xy -57.111737 8.107095) (xy -56.801835 8.201103) (xy -56.484211 8.264282) (xy -56.161923 8.296025)
+				(xy -55.838077 8.296025) (xy -55.515789 8.264282) (xy -55.198165 8.201103) (xy -54.888263 8.107095)
+				(xy -54.589068 7.983165) (xy -54.303461 7.830504) (xy -54.034192 7.650585) (xy -53.783855 7.445139)
+				(xy -53.554861 7.216145) (xy -53.349415 6.965808) (xy -53.169496 6.696539) (xy -53.016835 6.410932)
+				(xy -52.892905 6.111737) (xy -52.798897 5.801835) (xy -52.735718 5.484211) (xy -52.703975 5.161923)
+			)
+		)
+	)
 	(zone
 		(net 0)
 		(net_name "")
@@ -346,55 +390,6 @@
 			)
 		)
 	)
-	(zone
-		(net 0)
-		(net_name "")
-		(layers "F.Cu" "B.Cu")
-		(uuid "9d5cdae0-b793-4f62-a121-74ae8b57e04f")
-		(name "KeepOutScrew")
-		(hatch edge 0.5)
-		(connect_pads
-			(clearance 0)
-		)
-		(min_thickness 0.25)
-		(filled_areas_thickness no)
-		(keepout
-			(tracks not_allowed)
-			(vias not_allowed)
-			(pads not_allowed)
-			(copperpour not_allowed)
-			(footprints allowed)
-		)
-		(placement
-			(enabled no)
-			(sheetname "")
-		)
-		(fill
-			(thermal_gap 0.5)
-			(thermal_bridge_width 0.5)
-		)
-		(polygon
-			(pts
-				(xy -52.703975 4.838077) (xy -52.735718 4.515789) (xy -52.798897 4.198165) (xy -52.892905 3.888263)
-				(xy -53.016835 3.589068) (xy -53.169496 3.303461) (xy -53.349415 3.034192) (xy -53.554861 2.783855)
-				(xy -53.783855 2.554861) (xy -54.034192 2.349415) (xy -54.303461 2.169496) (xy -54.589068 2.016835)
-				(xy -54.888263 1.892905) (xy -55.198165 1.798897) (xy -55.515789 1.735718) (xy -55.838077 1.703975)
-				(xy -56.161923 1.703975) (xy -56.484211 1.735718) (xy -56.801835 1.798897) (xy -57.111737 1.892905)
-				(xy -57.410932 2.016835) (xy -57.696539 2.169496) (xy -57.965808 2.349415) (xy -58.216145 2.554861)
-				(xy -58.445139 2.783855) (xy -58.650585 3.034192) (xy -58.830504 3.303461) (xy -58.983165 3.589068)
-				(xy -59.107095 3.888263) (xy -59.201103 4.198165) (xy -59.264282 4.515789) (xy -59.296025 4.838077)
-				(xy -59.296025 5.161923) (xy -59.264282 5.484211) (xy -59.201103 5.801835) (xy -59.107095 6.111737)
-				(xy -58.983165 6.410932) (xy -58.830504 6.696539) (xy -58.650585 6.965808) (xy -58.445139 7.216145)
-				(xy -58.216145 7.445139) (xy -57.965808 7.650585) (xy -57.696539 7.830504) (xy -57.410932 7.983165)
-				(xy -57.111737 8.107095) (xy -56.801835 8.201103) (xy -56.484211 8.264282) (xy -56.161923 8.296025)
-				(xy -55.838077 8.296025) (xy -55.515789 8.264282) (xy -55.198165 8.201103) (xy -54.888263 8.107095)
-				(xy -54.589068 7.983165) (xy -54.303461 7.830504) (xy -54.034192 7.650585) (xy -53.783855 7.445139)
-				(xy -53.554861 7.216145) (xy -53.349415 6.965808) (xy -53.169496 6.696539) (xy -53.016835 6.410932)
-				(xy -52.892905 6.111737) (xy -52.798897 5.801835) (xy -52.735718 5.484211) (xy -52.703975 5.161923)
-				(xy -52.703975 4.838077)
-			)
-		)
-	)
 	(embedded_fonts no)
 	(model "${my_additions}/Heatsink_120x80x55.step"
 		(offset
diff --git a/my_additions.pretty/Heatsink_40x40x30_waffle_off_pcb.kicad_mod b/my_additions.pretty/Heatsink_40x40x30_waffle_off_pcb.kicad_mod
index ac4d327..71a5637 100644
--- a/my_additions.pretty/Heatsink_40x40x30_waffle_off_pcb.kicad_mod
+++ b/my_additions.pretty/Heatsink_40x40x30_waffle_off_pcb.kicad_mod
@@ -5,7 +5,6 @@
 	(layer "F.Cu")
 	(property "Reference" "REF**"
 		(at -21 9.3 90)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "89369431-f420-4c16-8eae-60f6d31f3fdb")
 		(effects
@@ -18,7 +17,6 @@
 	)
 	(property "Value" "Heatsink_40x40x30_waffle_off_pcb"
 		(at 0 -10 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "cee6b582-dbd4-497e-86f4-555d439c75ff")
 		(effects
@@ -262,7 +260,6 @@
 	)
 	(fp_text user "PCB Edge"
 		(at 0 -1 0)
-		(unlocked yes)
 		(layer "Cmts.User")
 		(uuid "7bb95fe5-9a87-497d-baa1-177ce7cddb4f")
 		(effects
@@ -274,7 +271,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 -11.5 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "26d34c51-08b6-4ef9-84da-ffc062a2d701")
 		(effects
diff --git a/my_additions.pretty/KF55C-10.0-02P.kicad_mod b/my_additions.pretty/KF55C-10.0-02P.kicad_mod
index 6aad395..1ab9fca 100644
--- a/my_additions.pretty/KF55C-10.0-02P.kicad_mod
+++ b/my_additions.pretty/KF55C-10.0-02P.kicad_mod
@@ -7,7 +7,6 @@
 	(tags "screw terminal block")
 	(property "Reference" "REF**"
 		(at -6.7 -8.5 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "033f0bcb-3ea7-408e-8721-cb2f01bdb32d")
 		(effects
@@ -20,7 +19,6 @@
 	)
 	(property "Value" "KF55C-10.0-02P"
 		(at 5 -8.6 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "82cff7f3-1a44-4686-9013-e08aa92885a4")
 		(effects
@@ -173,7 +171,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5 -10.1 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "66592ce1-2620-4991-b410-505e7ae86874")
 		(effects
diff --git a/my_additions.pretty/KF55C-10.0-03P.kicad_mod b/my_additions.pretty/KF55C-10.0-03P.kicad_mod
index 60d416d..e3b48f4 100644
--- a/my_additions.pretty/KF55C-10.0-03P.kicad_mod
+++ b/my_additions.pretty/KF55C-10.0-03P.kicad_mod
@@ -7,7 +7,6 @@
 	(tags "screw terminal block")
 	(property "Reference" "REF**"
 		(at -6.7 -8.5 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "033f0bcb-3ea7-408e-8721-cb2f01bdb32d")
 		(effects
@@ -20,7 +19,6 @@
 	)
 	(property "Value" "KF55C-10.0-03P"
 		(at 5 -8.6 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "82cff7f3-1a44-4686-9013-e08aa92885a4")
 		(effects
@@ -208,7 +206,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5 -10.1 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "66592ce1-2620-4991-b410-505e7ae86874")
 		(effects
diff --git a/my_additions.pretty/KF55C-10.0-04P.kicad_mod b/my_additions.pretty/KF55C-10.0-04P.kicad_mod
index 4954014..e43dc3b 100644
--- a/my_additions.pretty/KF55C-10.0-04P.kicad_mod
+++ b/my_additions.pretty/KF55C-10.0-04P.kicad_mod
@@ -7,7 +7,6 @@
 	(tags "screw terminal block")
 	(property "Reference" "REF**"
 		(at -6.7 -8.5 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "033f0bcb-3ea7-408e-8721-cb2f01bdb32d")
 		(effects
@@ -20,7 +19,6 @@
 	)
 	(property "Value" "KF55C-10.0-04P"
 		(at 5 -8.6 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "82cff7f3-1a44-4686-9013-e08aa92885a4")
 		(effects
@@ -243,7 +241,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 5 -10.1 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "66592ce1-2620-4991-b410-505e7ae86874")
 		(effects
diff --git a/my_additions.pretty/R_BPR_5W_BOX-AXIAL-Combined.kicad_mod b/my_additions.pretty/R_BPR_5W_BOX-AXIAL-Combined.kicad_mod
index 8019f3f..2ce07ba 100644
--- a/my_additions.pretty/R_BPR_5W_BOX-AXIAL-Combined.kicad_mod
+++ b/my_additions.pretty/R_BPR_5W_BOX-AXIAL-Combined.kicad_mod
@@ -6,7 +6,6 @@
 	(tags "5W Ceramic boxed resistor")
 	(property "Reference" "REF**"
 		(at -8.3 -5.6 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "a2b743c5-6a7c-421f-b4fb-b5317db03f5f")
 		(effects
@@ -19,7 +18,6 @@
 	)
 	(property "Value" "BPR_5W_BOX-AXIAL"
 		(at 0 3.2 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "20194f47-18f7-47e4-97bf-38905a560097")
 		(effects
@@ -113,7 +111,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 1.7 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "d3851413-bd4e-4711-ab08-c7265d47f387")
 		(effects
diff --git a/my_additions.pretty/R_BPR_5W_BOX_L16.0_W8.0_H18.0_P9.0.kicad_mod b/my_additions.pretty/R_BPR_5W_BOX_L16.0_W8.0_H18.0_P9.0.kicad_mod
index 7d1be0d..9f02791 100644
--- a/my_additions.pretty/R_BPR_5W_BOX_L16.0_W8.0_H18.0_P9.0.kicad_mod
+++ b/my_additions.pretty/R_BPR_5W_BOX_L16.0_W8.0_H18.0_P9.0.kicad_mod
@@ -6,7 +6,6 @@
 	(tags "5W Ceramic boxed resistor")
 	(property "Reference" "REF**"
 		(at -8.4 -4.8 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "a2b743c5-6a7c-421f-b4fb-b5317db03f5f")
 		(effects
@@ -19,7 +18,6 @@
 	)
 	(property "Value" "BPR_5W_BOX"
 		(at 0 3.2 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "20194f47-18f7-47e4-97bf-38905a560097")
 		(effects
@@ -91,7 +89,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 1.7 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "d3851413-bd4e-4711-ab08-c7265d47f387")
 		(effects
diff --git a/my_additions.pretty/R_Rx24_25W_heatsink_mounted.kicad_mod b/my_additions.pretty/R_Rx24_25W_heatsink_mounted.kicad_mod
index aae6e45..3e3b068 100644
--- a/my_additions.pretty/R_Rx24_25W_heatsink_mounted.kicad_mod
+++ b/my_additions.pretty/R_Rx24_25W_heatsink_mounted.kicad_mod
@@ -6,7 +6,6 @@
 	(tags "resistor 25W heatsink")
 	(property "Reference" "REF**"
 		(at -14.4 16 90)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "2a6936d1-59a4-4de0-9605-6f412c28a6eb")
 		(effects
@@ -19,7 +18,6 @@
 	)
 	(property "Value" "R_Rx24_25W_heatsink_mounted"
 		(at 0 8.5 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "9c85f8ed-e250-4379-93c8-cf22572f220e")
 		(effects
@@ -221,7 +219,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 7 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "f05a62a7-3ce3-424c-8bc0-3875c5a5b476")
 		(effects
diff --git a/my_additions.pretty/R_Rx24_25W_with_heatsink.kicad_mod b/my_additions.pretty/R_Rx24_25W_with_heatsink.kicad_mod
index 959bbbe..f7df40b 100644
--- a/my_additions.pretty/R_Rx24_25W_with_heatsink.kicad_mod
+++ b/my_additions.pretty/R_Rx24_25W_with_heatsink.kicad_mod
@@ -6,7 +6,6 @@
 	(tags "resistor 25W heatsink")
 	(property "Reference" "REF**"
 		(at -13.9 -8.8 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "08e828dc-8bd5-4537-9f71-e0fc7a3bfa33")
 		(effects
@@ -19,7 +18,6 @@
 	)
 	(property "Value" "R_Rx24_25W_with_heatsink"
 		(at 0 0.7 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "b2d0faa9-474a-46fa-bebe-3a6586bd6ea0")
 		(effects
@@ -338,7 +336,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 -0.8 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "f05a62a7-3ce3-424c-8bc0-3875c5a5b476")
 		(effects
diff --git a/my_additions.pretty/R_SQP_5W_AXIAL_L22.0_W9.5_H9.5_P1000mil.kicad_mod b/my_additions.pretty/R_SQP_5W_AXIAL_L22.0_W9.5_H9.5_P1000mil.kicad_mod
index 80bd5f0..f2fec4d 100644
--- a/my_additions.pretty/R_SQP_5W_AXIAL_L22.0_W9.5_H9.5_P1000mil.kicad_mod
+++ b/my_additions.pretty/R_SQP_5W_AXIAL_L22.0_W9.5_H9.5_P1000mil.kicad_mod
@@ -6,7 +6,6 @@
 	(tags "5W Ceramic boxed resistor")
 	(property "Reference" "REF**"
 		(at -11.4 -5.6 0)
-		(unlocked yes)
 		(layer "F.SilkS")
 		(uuid "a2b743c5-6a7c-421f-b4fb-b5317db03f5f")
 		(effects
@@ -19,7 +18,6 @@
 	)
 	(property "Value" "R_SQP_5W_AXIAL"
 		(at 0 0.8 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "20194f47-18f7-47e4-97bf-38905a560097")
 		(effects
@@ -91,7 +89,6 @@
 	)
 	(fp_text user "${REFERENCE}"
 		(at 0 -0.7 0)
-		(unlocked yes)
 		(layer "F.Fab")
 		(uuid "d3851413-bd4e-4711-ab08-c7265d47f387")
 		(effects