diff --git a/rev2/5x6.kicad_pcb b/rev2/5x6.kicad_pcb
index bf39f48..d3877a6 100644
--- a/rev2/5x6.kicad_pcb
+++ b/rev2/5x6.kicad_pcb
@@ -37,7 +37,7 @@
 		(pad_to_mask_clearance 0)
 		(allow_soldermask_bridges_in_footprints no)
 		(tenting front back)
-		(grid_origin 78.25 46.1)
+		(grid_origin 143 119.35)
 		(pcbplotparams
 			(layerselection 0x00000000_00000000_55555555_5755f5ff)
 			(plot_on_all_layers_selection 0x00000000_00000000_00000000_00000000)
@@ -181,7 +181,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW19"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "21c555e8-e16b-49b8-9047-2ed33dedde2c")
 			(effects
@@ -507,31 +507,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "05edf07c-e70d-489d-96ec-c88f4a6c36fc")
-		(at -24.709755 92.055189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 144.4 73.1 180)
 		(property "Reference" "D16"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "656f9f4f-a8bb-4156-92f0-70d115eb354d")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "f38a06d0-0f3e-43a0-b568-b0c655bf0f54")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -564,306 +561,120 @@
 		(path "/2196d7c8-fd48-4a09-bae1-a83d7b297823")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a6c0dd59-50d4-4482-addc-b9a2e3571f4d")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "474f7141-4a1d-4087-b17f-83dacdefc544")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4bcbc74f-a78f-4077-adaa-48e139386f66")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "38dacc70-85ff-4c62-9bf8-6aea0c637936")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3ac31cd8-4c29-4c23-8757-4f55ec5f52a3")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "83be5738-7313-46fa-a718-11062cbffd9d")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f8d9eda2-bc08-4c94-9315-4f64b4853621")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8bdaf02b-381f-46c2-822a-b430b89ee26c")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "0eee1257-9d7d-4a7f-9254-5dd25fd6fd14")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "6df0767b-1fa8-4b92-8e7d-7915a5683dde")
+			(uuid "77820946-54f2-4e79-94f9-1cdfde38ebc4")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f9a9976d-d040-4885-a7a4-3e4360ec597e")
+			(uuid "1b5b6876-843f-4b61-9e09-541a00973a33")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "d92b12b1-95ef-4d18-aba1-7bdf38838ae4")
+			(uuid "330dbfde-8a26-49d8-9241-61559b32411d")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "3abcfa6a-19e6-48c8-b9ac-9b6b63b55569")
+			(uuid "21557559-7b88-408d-bb82-84f7e1792e82")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "43335e06-7a29-4953-8b06-78420fcf91ed")
+			(uuid "ad8be654-9c72-479e-bead-892688f879c3")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "e658deb1-667e-4c75-a669-91d012d1c3bb")
+			(uuid "ccc2f1ad-9572-49e4-9d3f-3e72730dcfca")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "cec92286-70ee-47fe-8e81-7930dcf79b38")
+			(uuid "faba0dd7-5c00-4306-9c01-ac9fa9b8bfef")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ccf74263-b454-4ad9-991b-b5251da2cecd")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "efd2eb02-1f86-4b60-8d37-e5a84c20967f")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ce5aec96-8937-45bf-9d19-67c1380e7335")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d7f6095d-5dab-4413-8b58-ffe299141732")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1fc29e3b-44cb-4d07-a8a0-e15110f54404")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "162af8f1-acb9-40fe-8908-0687e7c93a19")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "af287685-dd86-4af8-92a2-9c1308d4613f")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "3f7dd81a-fb73-4053-aa40-698330ddecd8")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "25c0ed6b-23af-4fff-906d-02f06dd65c99")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "87d0c856-f1f3-40c2-882c-b4b19e964b8a")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 13 "row2")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "b270e528-aa51-464e-8c94-6a99b1f29e6f")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 13 "row2")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "b270e528-aa51-464e-8c94-6a99b1f29e6f")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 45 "Net-(D16-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "5b86e651-339c-445d-a505-86d13a72b7bd")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 45 "Net-(D16-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "5b86e651-339c-445d-a505-86d13a72b7bd")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -872,7 +683,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW26"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "5a4e8c2e-4212-4a1a-a33a-40e6a0d0d289")
 			(effects
@@ -1205,7 +1016,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW6"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "628f1199-57e4-4f19-88c1-b25fc6d08207")
 			(effects
@@ -1531,37 +1342,34 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "0d72dfe2-440f-433f-a381-f4310bba1fd4")
-		(at -60.709755 71.305189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 106 83.1 180)
 		(property "Reference" "D8"
-			(at 3.81 2 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "d28094c3-d5d2-4a79-a313-901f7c0daeeb")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "55f42ead-656f-47c6-9371-3d708df70a6d")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "7240f289-425b-47fa-bfd5-5e786b6bb423")
@@ -1573,7 +1381,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "9e43e678-3000-4a41-a905-3593ba346bed")
@@ -1588,306 +1396,120 @@
 		(path "/b6137899-8bd1-4d0b-9c24-2812a290503b")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "60b2a4dc-c590-44a4-a37b-b4680149109c")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ce4bca7d-0a68-49bd-adf4-4cdc9b61cf64")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2a48bef8-966c-4e51-a1a5-9c77fe7ce16b")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f79ec896-4946-42d1-b9d5-4fb554b162b2")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "524ca83e-7e40-4383-851e-64fc7e71322f")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c7a6c5e9-acc0-4fdf-8711-f9cfd7d8f7df")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4b4aa25d-f650-4005-aaa8-a75b819bef59")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "9cbb802b-8251-40b6-b043-9cc708206f17")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f59b7246-80f6-4d16-b76a-b4226ea0dc68")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "209d1407-ac9a-4a1f-9b38-811b611cd9f4")
+			(uuid "8ad2b2d5-3196-458e-b8e9-39e48e0aa9a2")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "b730485c-e8a1-4fab-8a7e-082910fa1393")
+			(uuid "9854cb33-d783-483f-8857-12464897eab1")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "1b561fcb-0fab-4f29-8943-1458999d6b58")
+			(uuid "2b02b0f8-045f-4c2e-9b93-d7e2c97f80cf")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "d57d68ae-cea4-46f5-b03a-fe02c2e617c1")
+			(uuid "314b347a-1938-472b-9550-07a943e64557")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "71cd9433-bdd2-4a07-861d-b520592867d4")
+			(uuid "786f005a-215e-48db-a480-0d755dca05d8")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "4e5205c2-a8c8-4fcc-9224-bf0eb9398406")
+			(uuid "b65adfe1-5bcd-4215-a59a-7342432baf48")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "4f0ea7f6-c0eb-4f78-8f67-dd93800c5006")
+			(uuid "96a2f504-23ce-4ddd-a525-909bedbfb05b")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "67019b71-6200-4523-b100-309c4454998f")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b1c1b6cc-9067-4fed-a9bf-0a723a62bf4e")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "6fa4a46c-34fb-4e7c-a29f-1ba62bb99ea3")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b2c173ec-ae44-45f1-8586-9fc9816f8213")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "295b3417-7c28-4961-967e-16b46f586935")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1ef50f5c-3606-4151-8d4e-f59e5518bf05")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5532413d-40b6-4861-b47f-76c065b22a8c")
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.SilkS")
-			(uuid "540c4dcf-85e1-4e7f-9efe-16cef0ffd5bf")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.Fab")
-			(uuid "0784f087-ae65-4ad8-a707-9a8083fb2760")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "94f3a5ae-55f9-4a6d-aa7d-145d1ea5bd82")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 27 "row1")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "d1da8be1-b164-4fab-b030-aafd867f8225")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 27 "row1")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "d1da8be1-b164-4fab-b030-aafd867f8225")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 37 "Net-(D8-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "26caf405-5298-464f-987c-c542ad2720b8")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 37 "Net-(D8-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "26caf405-5298-464f-987c-c542ad2720b8")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -1896,7 +1518,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW27"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "f52432f9-569a-44ae-89db-7d608787e00a")
 			(effects
@@ -2222,31 +1844,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "1344ae05-d583-471f-ace2-978c4b7e20d9")
-		(at -4.209755 71.305189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 162.9 78.1)
 		(property "Reference" "D11"
-			(at 3.69 -2 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "c310c8c1-f323-40ac-a23c-f226f98e1da7")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "10bd8146-a6f5-4ea6-a220-605db13c32d0")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -2279,338 +1898,149 @@
 		(path "/180f7ce5-cfc6-4de8-8e50-6353b9f41bc6")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1df5c43b-30bc-4dca-9762-3ca0ae4b505c")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "dfd11875-53d1-4b64-b754-12195614a014")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a019a8fe-16fb-47be-815d-4284cf42b1a3")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d53f6cc8-2e22-42a5-8d07-085ab1782a70")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c3778e56-703f-4ab5-a09a-276f92f1cd08")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "991c1265-8699-4534-9b99-4b03659a8043")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "833d83d3-bb53-4735-b700-d9260dfaf455")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c06ba133-00a3-41ca-98a2-97e348ad5fc8")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "05935cf5-07bf-40ee-8c1c-c4c8c1d9f73c")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "36467cdb-4d96-4e64-8aa4-e2671d0f1bf7")
+			(uuid "0054c82f-2761-4817-a207-48db86a1a4d4")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "9b5713a7-b363-4178-81b3-90835455e6f1")
+			(uuid "4d438821-0c8a-48b0-a436-e574dc051cfc")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "847752f3-ea4a-4961-9d25-9951adaf6cc9")
+			(uuid "31ebbee6-64de-4198-be26-ecdecc58f477")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "1d6fbe6e-9fd5-4053-82c6-aaa231cfd202")
+			(uuid "e55f9ed1-dd89-4e1d-bebb-35606934e510")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "b020bf40-2bce-443b-b007-5ed3242c6045")
+			(uuid "17c88fe5-ccb9-4ba3-941f-ba33f840a30e")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "34a8720f-5bd5-4a95-a354-3add37536b4e")
+			(uuid "08757b99-5496-41d0-8af0-f40d900eb348")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "416cba9d-0b71-4c33-aa7b-f788eb7a4a4e")
+			(uuid "b9b75f77-9e91-414a-b2cf-540e6407f20e")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4d07733d-ef0a-48d0-8042-3db8f7f39b5c")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "00c7c4ca-973f-41c0-86d4-a801720485b1")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "27aae98e-d79b-40fe-b800-5efe41f8ba0f")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4b39a506-59e9-43ad-8527-fb1d3781ecc2")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "da848bbf-2745-4ebe-8a0a-930ce51c93ab")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "eefcbd7c-096d-4175-a4a6-953c6fd472bb")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "0b3cf827-9f5c-46d9-9fbb-f66bc546b665")
-		)
-		(fp_text user "K"
-			(at 0 -2 0)
-			(layer "F.SilkS")
-			(uuid "47bc2a76-8ddf-4ad9-8aa4-bc2370165b1d")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 3.99 21.45 0)
-			(layer "F.Fab")
-			(uuid "618d2b8d-a49b-44ee-b128-62005f02a8cc")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -2 0)
-			(layer "F.Fab")
-			(uuid "e9b60012-e7b0-443a-82f7-e90008e49c53")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 27 "row1")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "f3c294d5-7b2e-444c-b71a-e34a9aa3f0c2")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 27 "row1")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "f3c294d5-7b2e-444c-b71a-e34a9aa3f0c2")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 40 "Net-(D11-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "48f22760-e924-4efb-aac4-d975c63cf7ce")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 40 "Net-(D11-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "48f22760-e924-4efb-aac4-d975c63cf7ce")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "201eebd2-1b58-4741-b425-ce868af38c79")
-		(at -40.209755 71.305189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 123.1 78.1 180)
 		(property "Reference" "D9"
-			(at 3.5 2 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "c9ac7357-b1bc-4351-af2a-a7ad61d2b8dc")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "44c31073-3c0d-487e-9951-4693195896ff")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "42edd7b4-19bf-4389-981e-df8a5524ef70")
@@ -2622,7 +2052,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "b73be1d9-2188-4b3d-b03f-bbb134bbb83d")
@@ -2637,338 +2067,149 @@
 		(path "/0b61983b-027e-4303-aad3-9fcc0989f091")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5fe87f72-b656-49b0-a99e-7c66c28c2463")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "867d2c6c-8a09-462a-99e9-c57574e0e7f4")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "34b4f841-febd-4c3a-8622-86a8f7d51ac0")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a15700ba-62dc-4195-9524-bff656b3c429")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2d0c2159-7cfd-4161-b773-b84070ba41de")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "aed6b2eb-91df-4d47-8178-9735f29cd622")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "00e901fe-e29c-4c54-ac3a-972779dc41e9")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3122e1ef-355b-49d2-8baa-82e0555f3b52")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8d67085e-092f-40d5-8af1-2deebcc8d64a")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "0f84081c-a0c3-4f2b-89bf-106bded1d806")
+			(uuid "6feb0b8e-55f4-4fbb-b0c5-ef9ea01a3fd8")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "5cc01332-a49b-460d-8d53-ed25eb50bf69")
+			(uuid "6c8719b7-2e44-48ec-b36b-f08cfe21b4f6")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "31d7ef62-66ed-45ba-8426-5d805ac4834e")
+			(uuid "65305868-deba-4f97-9fd4-7b57974762a4")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "83d29f76-bbbd-419c-93a2-7321b0ba968a")
+			(uuid "85874030-bf83-4acd-a9af-1919387caa2f")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "c3f9fbd4-5615-424e-9fdc-e239b1310c63")
+			(uuid "362a96d1-8336-4ca7-9367-40450b379eff")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "d8afcaf5-8c8d-40ee-866c-969fa7f7a649")
+			(uuid "7ef4dc81-d56a-4253-a90a-fb2623e33c4f")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "70f2f1c8-c510-4490-9674-5045243ec926")
+			(uuid "b0292491-ae2f-44a7-b855-4c60298d4a0f")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "053c1734-9c68-49f4-b2e0-e3126f7d80f4")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a385cbad-a5d8-423e-a64a-b73c064c9533")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b7e1e1b8-0e1d-49f6-9ce0-a6db693da5c8")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "7a825ef6-a5cb-477b-8b20-3fd11411de6f")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "3eff1b2f-4090-4eb0-b598-a92301f28162")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "c7b07722-fa7e-4985-af25-405252524cca")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "8aabe458-316d-47ae-ba9f-3cc3e88ab9e0")
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.SilkS")
-			(uuid "2cbc876c-62ea-4252-b570-2257480ebcc4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.Fab")
-			(uuid "82f07c6a-c1f5-41b5-8c1c-9a907057bf17")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "c67dfaa0-0822-4fd9-8f38-cacf7799fbf6")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 27 "row1")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "19847768-751a-4fc7-a328-fc6abaafb343")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 27 "row1")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "19847768-751a-4fc7-a328-fc6abaafb343")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 38 "Net-(D9-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "48f58947-fa13-49ef-b2df-1095f965d827")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 38 "Net-(D9-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "48f58947-fa13-49ef-b2df-1095f965d827")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "20343fd4-b4e0-483c-aaea-a542500cbeeb")
-		(at -60.649755 112.555189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 104.6 120.1 180)
 		(property "Reference" "D20"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "7f153303-f1d2-41db-99c3-9fae95f9e4f8")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "804f441d-8fde-49f4-98ed-b660d6eb78ff")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "bf60bff8-04a2-47b2-9d1d-ae12d6001b1b")
@@ -2980,7 +2221,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "ee53781e-e89e-42bb-8d3a-7cb82d226482")
@@ -2995,338 +2236,149 @@
 		(path "/3e0354c3-197a-45ca-9432-45f1fa2aea63")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "10793940-30c9-4e54-9a62-69f7d3f38327")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8f63cbd7-fba5-4e11-99da-b7ba307c3dda")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "21dda3a4-bede-458d-849c-57f8747b2ffe")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6bc846dd-ea26-412c-b429-2f8c5ab23473")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6736d600-fcd0-4037-9bff-15593b1c7f32")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "99b8bf2a-183d-418e-9377-895038e7fe8f")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "46d8447d-f649-41ef-9f71-75bcd739a928")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ce7c0be3-f0df-4889-a49e-8d97b198417d")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5f580939-6369-4129-9324-423aa4c422f3")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "e2f8fb4f-6a34-485b-a9d1-c347bc36f60b")
+			(uuid "df131592-801b-4c6a-9680-6c111bf3179e")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f16e6560-ca2c-4fd2-8cf4-893ee58cc417")
+			(uuid "e165c3a2-3b7a-484c-8778-e1bc12edd417")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "2be1c138-af6a-44ce-a5e0-704bb6fe8463")
+			(uuid "a7472c3c-26a5-4abb-adc8-eba6f0431ba0")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ebe39519-29af-4291-9a88-affbdb2c3093")
+			(uuid "157b0aa2-ada1-4321-bfa5-27dc35669256")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "0a340344-70b2-4a94-a324-8f825361b546")
+			(uuid "7b8d51a5-1791-4307-8a6d-de67e5f823a8")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "aac424e7-f6d6-4809-a4d4-7c3c9e60c10d")
+			(uuid "a3e8f240-1d48-4133-a5a2-968da4e6e26f")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "bc60a1c4-001e-458d-ac62-b8d55889f255")
+			(uuid "7217ff0b-f3e2-4520-a210-8752c6cfcfbe")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4b3c0ec4-6e96-4528-8ebe-da4071e93c58")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "3b86a685-1e00-4f04-be00-dc97659e9a0f")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4f6d7ade-b8f1-4ea1-9a74-562785eb39a3")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d55efc6c-06af-46d0-a827-02134abc9ca5")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "0927f0c5-278f-441a-bf35-98bc90e60e0e")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5aedda34-d0bf-4e53-98e5-c9d934224ed7")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "c6dce3ea-16f8-48ba-ac0b-d1697ce37408")
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.SilkS")
-			(uuid "b599e6b6-f1e3-4fef-bb0c-960a4b3e666e")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "36bb0444-ad8a-458e-81b1-f928cc5f3e66")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.Fab")
-			(uuid "e253a906-8f07-42a0-b18d-bfa7add91aa5")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "row3")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "1e75dbbf-292c-4186-ac3a-ec9f605f2c9a")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 10 "row3")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "1e75dbbf-292c-4186-ac3a-ec9f605f2c9a")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 49 "Net-(D20-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "d73415e1-910c-48d8-816c-b8632c346259")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 49 "Net-(D20-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "d73415e1-910c-48d8-816c-b8632c346259")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "267faa75-7af6-4ec6-bdf6-126976fb659a")
-		(at -81.339755 71.305189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 86.1 83.1 180)
 		(property "Reference" "D7"
-			(at 3.81 2 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "e6fd6f17-ac34-4dcc-ae6b-88a5882f2c04")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "d9aaa5bf-8497-49c4-bb57-fcab5bdcfd16")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "c691b31a-d963-4b48-a4c7-79a68855b871")
@@ -3338,7 +2390,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "a39c62a0-6d28-4d24-85f6-f5c2b7ed4725")
@@ -3353,313 +2405,127 @@
 		(path "/2abbd608-2f89-463b-b008-27157c764079")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "aeff20c6-5cf1-4729-bbd5-eb9cc7108a82")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e9ee78b5-e7b2-487c-8059-bed4e3fcaa39")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c5becbe6-3f74-4f0a-a7d0-a79dec801b7a")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "9a280876-150b-45f5-8594-b0731cf14b78")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6e80b834-7437-4491-819d-92baade29c87")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bf97cf15-8575-4670-a65e-2cc1197eb5d9")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3f92e770-efb1-4e74-b8f6-56ebe2d2cbd6")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "df8596e9-1926-4149-92b6-45529ddc5441")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "0677c4ee-ea57-4822-8eac-e0acb1013c32")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "6ca4662e-3d78-48c9-a2fd-4b3f42addeca")
+			(uuid "bb0402ae-2bbf-4918-81d7-6d1180271ff3")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "60fbfff0-39f9-42fa-a631-b1aea2a955a3")
+			(uuid "7079bbc3-7f2b-40c9-bea2-ac6ca7b77086")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "2246e025-a818-44aa-8d35-79cc2c4ccee3")
+			(uuid "b5123dd5-506e-478f-b370-6991552fc48d")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f3d8d59f-3e4a-4b55-a315-8e322a0fe118")
+			(uuid "ed65f52f-e280-4a65-814f-b6f7937e10bc")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ecbe96d8-d6f0-46a5-88af-3c0fa38e6ef2")
+			(uuid "7ce27dac-11b3-496e-b9e0-23fd70d58122")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "b580ebfe-a354-47ca-b696-0d386f7ade5d")
+			(uuid "942b7e2b-f322-40a7-a98d-da7288874b5b")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "204b3d54-2633-42f1-8bfe-f96c24b16b0e")
+			(uuid "c476a9c0-8466-4fea-946c-837329f0aafb")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b02607ef-4f62-4996-b6f6-8e0ab499db35")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "cf7f75b8-1983-4d45-92fa-6e7f69bbf287")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "bd0039df-258e-4eb4-a019-8a26b512c159")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b198835a-a739-4062-a84c-ef30e0e8aa22")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ec1c4fad-1331-4756-b35e-878c62fd9849")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ddfa4e5e-f872-459a-8a5e-b28ec0c56269")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b34e7414-475e-4b4f-85d1-6c2e4bb2bc99")
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.SilkS")
-			(uuid "ffc6e283-adaf-4619-94e5-c09d454f2580")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.Fab")
-			(uuid "9875bad1-5feb-498f-9d03-e6eec109c493")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "ad134a0a-3ecd-4337-b4e1-448809cc96b1")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 27 "row1")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "d5267372-1ba2-4c63-bd25-ebbb7b581bdd")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 27 "row1")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "d5267372-1ba2-4c63-bd25-ebbb7b581bdd")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 36 "Net-(D7-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "9011daf2-0826-4317-817a-e250dbf8d65f")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 36 "Net-(D7-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "9011daf2-0826-4317-817a-e250dbf8d65f")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:raspberry_pi_pico_SMD"
 		(layer "F.Cu")
 		(uuid "2a5314d4-cfc9-4c31-be58-8995ea4ba19c")
 		(at 161.501761 67.930598)
 		(property "Reference" "A2"
-			(at 0.6 -10.6 0)
+			(at -0.001761 -8.330598 0)
 			(layer "F.SilkS")
 			(uuid "824260c7-546c-49cb-b00d-071fccd281e3")
 			(effects
@@ -4350,31 +3216,28 @@
 		)
 		(embedded_fonts no)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "2b2006a3-8f78-4719-825a-8e01e98e334e")
-		(at -4.269755 132.905189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 160.1 115.1)
 		(property "Reference" "D29"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
-			(uuid "a85d57de-998f-4e00-8a34-36bea394af1a")
+			(uuid "d58ec7f2-74df-4428-973b-180eec365caf")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
-			(uuid "446f7f5b-3b13-40a1-aa55-eeb7eb38be94")
+			(uuid "23e18b3f-6bab-49f7-b7c4-64e32392f256")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -4383,7 +3246,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "774f36c8-e4d1-4df6-a39e-22e31ba009fb")
+			(uuid "4ccd7e93-fcb9-4f85-bd3a-06d45a71465d")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4395,7 +3258,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "a5833203-12cc-43b5-bdda-36aa517dcd5c")
+			(uuid "181e61b9-c9b3-4613-9ddb-36c2b6555a1d")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4407,306 +3270,120 @@
 		(path "/ce0b8f84-0f97-4c42-9ad4-0dce115b7b17")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f44b3003-5d9a-46b6-90f4-957f44960625")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a8fde2ca-c7fc-47ad-8a43-3b8314bebc6b")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c3a357fa-9d72-4d33-b37f-3c616d9d453e")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a749ccb0-8584-4468-a736-a2f9357b9431")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a871744a-a543-41bd-ad92-f2daa606746d")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f43f84d0-97de-4dfe-9e07-04a14ec2a13c")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5cb44406-4fb4-4459-97ca-ca1ac31a710d")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b822563d-8025-45a6-96fc-ce95985fbaf7")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b69b846b-4671-4395-bc80-57abb4c82585")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "addc057d-bc31-4b94-aae8-b3769dee8754")
+			(uuid "c017a5f4-2775-4c95-b895-31887f1d35dd")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "6a5b4cbf-5b43-43ea-ab34-8758975473ca")
+			(uuid "8f0feb2c-11a0-4cb5-ba85-80bcd472ddf8")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "cd06655e-c9c4-4763-96bd-ac2bd6858060")
+			(uuid "5e374518-c930-4658-9360-e821ac4dc0bd")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "e4b199f4-15f2-46d5-a1a9-f8be042debc1")
+			(uuid "fee8213c-57f9-464f-a193-29a52b86aa1c")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "47b80225-5245-45c1-90ea-80940b6f084e")
+			(uuid "93e712ef-1739-4897-8a97-440d9bd4431a")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "b9067fba-d5bb-4de4-854c-a3e18a8b8874")
+			(uuid "84d05396-3d52-45f1-9b07-9586bb8c32ac")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "e2b4eec6-f7cd-442a-bb26-5d80e7aa2c8c")
+			(uuid "8d39fed2-a4a5-46f4-91fd-c83913cbe324")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1dbb6121-08d9-4a7b-a381-5a227994c057")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "9dd89ca0-30fa-4ed3-95f4-34a656830a23")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "64dfb2ae-0bad-48d1-a7e9-55028727876a")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "fdcc864c-0d4d-40bc-89f7-42b2e312c809")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "6e98b237-8fdf-440d-a0d7-57157b338e3a")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b8f99f22-5151-4528-a6e8-7a24c87f6601")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "989612f5-1969-4bf7-8cdb-6bbbd5d791fd")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "13bf39f4-22fd-4cb4-9235-36665e718c0f")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "cfdc13d1-832a-4443-9278-e32cb3ae18d2")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "ec5b61ef-1fa7-414f-83b4-22615edfaeb4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 16 "row4")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "a32b27ab-238b-4150-92ed-dcf7a37debc6")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 16 "row4")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "a32b27ab-238b-4150-92ed-dcf7a37debc6")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 58 "Net-(D29-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "2d50b598-cb95-4b9c-a31d-f7525e3b4c9c")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 58 "Net-(D29-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "2d50b598-cb95-4b9c-a31d-f7525e3b4c9c")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -4715,7 +3392,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW30"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "5ac6bad6-8e45-4c8e-b8fc-b9f204b3b354")
 			(effects
@@ -5041,37 +3718,34 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "2fabf302-67b3-42ab-a2b9-2ac4d716fbed")
-		(at -81.149755 112.555189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 86.1 120.1 180)
 		(property "Reference" "D19"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "77683717-a29a-434c-bc9a-571dcd2c495a")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "f99c7fc4-9774-43cf-8006-392131e99f30")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "1363b1b8-81a3-4071-b16a-082e5b41ad66")
@@ -5083,7 +3757,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "0b5f7008-e64a-41f1-8081-57fc35a69155")
@@ -5098,338 +3772,149 @@
 		(path "/c2f667cd-10c3-4271-b7a9-e8ced9fefa1f")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b54645cf-b2c2-41e5-a801-1e64f782d81b")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "87a37e68-302c-43fd-b978-b7f1c43da728")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f2f0c78f-6abc-48b1-ab9f-03e02746ca4e")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4ad82181-0e9d-4cb0-9795-214a6e19b37d")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5454f0db-feeb-4425-b863-7043e556e95d")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2dacb697-f100-42b5-90c6-99424c6c6388")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2db1d40d-92ae-4b06-8722-1185dc2ff968")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "9c1a3436-6f2a-4fab-be98-d3f6c06626bc")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "84da3dc7-5223-4a19-b0b7-f3c2131e8653")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "3ce1fe56-e220-4874-bc9b-0dbbec7b48b4")
+			(uuid "d0710feb-ce7c-48a6-8871-c621861a5152")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "17d82d21-5df5-49d8-a281-9c3a07750802")
+			(uuid "4ca66c07-3e48-4ff3-816f-1fbc8b92d054")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "49841e71-c073-4996-b715-f7dc1057f7f8")
+			(uuid "bc3762e9-114b-4a15-9c89-0bfd5c0de7b4")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "fd1ae2bc-4552-4c96-9bdc-8f6cbfb89c0e")
+			(uuid "f6312d24-a37e-439c-a362-a3ca28f4b183")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "040eb8ae-2a08-45fc-a21b-0c9779146f4b")
+			(uuid "3a09d203-9b6c-4eed-8a70-81dfc13c04e9")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "a0a30840-aa63-4f29-b279-19f95ef12daf")
+			(uuid "6ca37564-5ff5-4025-8506-82d5b9c989a8")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "a6776392-aecc-45da-9801-32c82dc95bd3")
+			(uuid "a7ebefd3-0d5f-415e-bf0c-c1e8747cad38")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "7ce4fa0a-8aef-4249-91d3-b7abff9d04ee")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5e8b9b41-a223-428d-9c0a-dd5fb3378f0f")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b42363a0-d3c2-40bd-818c-d90f8fa4059c")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d5e4ab9e-c783-4de9-a78d-cae70587e228")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "bfdc64b7-b3b4-4049-bc29-27f21dd87fec")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "97d28a97-f512-4763-9482-72e885e02257")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "3086944f-b5d6-4402-b5e7-9878d5320e90")
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.SilkS")
-			(uuid "a9663327-759b-47a2-8e03-07bda620381b")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "3e4e26ee-9026-48c4-84b7-06c69f2db574")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.Fab")
-			(uuid "f9b61b69-bfd1-47c2-bf03-99f129036a04")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "row3")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "3ece8d14-61ac-4a03-93df-145ef226a8f9")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 10 "row3")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "3ece8d14-61ac-4a03-93df-145ef226a8f9")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 48 "Net-(D19-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "06ef55cb-bb0b-4942-a647-45fbc3e9656b")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 48 "Net-(D19-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "06ef55cb-bb0b-4942-a647-45fbc3e9656b")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "325b2db2-cd7d-4def-abff-483b043ae227")
-		(at -40.149755 50.805189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 123.1 59.6 180)
 		(property "Reference" "D3"
-			(at 3.81 2 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "d9c2533d-fdac-4717-86d2-407ea7a82ccb")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "499cdb53-2ac8-48a0-a567-ce99b35c2a0d")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "c9eafb69-038b-457e-9e4a-1df5ffaabb7d")
@@ -5441,7 +3926,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "1e89cf55-c0a0-4296-813b-8af657685c0f")
@@ -5456,306 +3941,120 @@
 		(path "/910957b6-a74c-49f7-a7eb-b89eec0b7f60")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bb93e56b-f95c-4985-820f-72a55c327db7")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "82b6d7c6-0f68-4570-8743-3202955a48ab")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e1ab83fe-b135-4c02-ab1b-6e52ad93fe4a")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1ad73226-2934-4725-b042-c9ff5e194d1f")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "beeed586-c1e1-4d3b-b374-70db65bf3f45")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f43ac22c-ecaf-44f0-9bfd-8c2fc6712f8c")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "0b5a6765-1575-4a77-ba7c-7eba58517863")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2603cb7d-76ff-47de-a568-dc207cdad4f1")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c83f44e5-3ba9-4697-96b9-1d2f0c5c9106")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "244c33ef-0639-48a2-81e7-b3b639e7fbe3")
+			(uuid "4a479b43-aacd-454f-9f8a-da897f24baa9")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "69f0efa2-9ff1-4802-b8c9-7fdb0640defe")
+			(uuid "743a0216-9327-472e-b9bc-7eb747281c98")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "641ac9d4-67e8-4af5-8a0a-d12a3df3f1aa")
+			(uuid "1a3092d7-ae61-4961-917c-317eb19e2229")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ea03a769-0441-4821-89d1-0a680f5dfed8")
+			(uuid "2094fa19-b723-4baf-afc5-6fe219a7bda9")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "bba39967-3576-4344-ae57-ea9f86c55454")
+			(uuid "6f1bd4fa-d02a-4940-81cc-20681cc83059")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "98d8e4de-546e-46a1-98ea-a35f0504dac5")
+			(uuid "0b171f3e-53cd-4f02-bad2-1ab60e61a9f0")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "7e48c181-babb-4016-a989-39c6bba23597")
+			(uuid "0ad0137e-7b27-4e6c-8405-ab054e64bd30")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "95ce6e82-d4b4-458b-8e1d-555a1fd5e28d")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ff869337-919a-485c-986b-05280669f626")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "023673eb-0093-4fb7-93c4-f4fb905300b3")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "fafed1e2-78c3-4b99-af25-96f0e68e205a")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "71263e79-33a3-4f35-b36e-d6213275be11")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e06c7e10-4f68-4e92-a3cf-ff210fe7c9af")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e73b5a97-c227-422e-93c7-e9820b6ccbf5")
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.SilkS")
-			(uuid "b4ac136f-13cd-41e2-ac53-bf53674abdea")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.Fab")
-			(uuid "077e5ddb-0b0e-4f69-b481-c4d91844dd13")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "8cec3009-8484-4363-8245-5d28cabacf44")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "row0")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "4af61d01-1b13-498b-b5db-69f1ba522509")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 4 "row0")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "4af61d01-1b13-498b-b5db-69f1ba522509")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 32 "Net-(D3-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "e40dc92e-d22c-4949-b68d-b287619698b2")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 32 "Net-(D3-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "e40dc92e-d22c-4949-b68d-b287619698b2")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -5764,7 +4063,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW5"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "7dd21374-b189-4ac4-8f3e-e85aecc87267")
 			(effects
@@ -6097,7 +4396,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW18"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "1ac62ea6-d1d8-4465-b669-db06ecd823b6")
 			(effects
@@ -7179,7 +5478,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW17"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "ab9426b2-544e-44d1-8e70-b9cfadf3ace3")
 			(effects
@@ -7512,7 +5811,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW16"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "3f15dba1-3718-4c52-8fcf-b1119d53498d")
 			(effects
@@ -7845,7 +6144,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW15"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "b630d5de-aaa7-413c-9dee-a122061e64d9")
 			(effects
@@ -8178,7 +6477,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW1"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "553143fc-c062-4dac-b2fb-8faf72f479cd")
 			(effects
@@ -8511,7 +6810,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW20"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "a5d87783-d328-4768-93ad-4e1892eb2dff")
 			(effects
@@ -8837,31 +7136,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "7ab6effd-dced-4e09-a499-6cb6aa58d3fe")
-		(at -24.579755 71.305189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 144.4 54.6 180)
 		(property "Reference" "D10"
-			(at 3.87 -2 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "9ba990e7-40a0-4f1c-af3a-4b06558ae777")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "2e72420f-de01-4706-a711-54737d25e958")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -8894,332 +7190,143 @@
 		(path "/975c9d57-bc9d-49b2-8254-24c486513154")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a0c02f84-72c7-4200-a68e-fe8041e8cd22")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "7e337652-95cc-4927-842c-1452ea114214")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f4a37f3f-a8d7-4596-ac80-50634fa7f541")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1d36d38d-0dff-4bf2-b56e-bcb49e55c616")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "65874fae-a035-4649-aded-3ce750cff57b")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1d771a98-1958-49a2-82e2-465792dd7d04")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bc748420-b15b-4f17-8600-ee2760997850")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "888676d3-1958-438d-a527-40d2985506ea")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "7ff0aeb7-a5c9-43a5-8647-e7554ea49a67")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "2058f42e-9455-42e7-afce-26963ec66abe")
+			(uuid "84aa7e61-eece-4315-aca8-7fe66d7337a5")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "0ab1cf8d-c8a0-4564-a105-62831c84c020")
+			(uuid "04785dc3-bb58-43c7-ad02-2826349386b2")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f9494389-a2d9-4709-8999-8475ac122bc0")
+			(uuid "9730e17c-564b-410f-a982-a517b96b8bce")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "80e5de16-f8bf-4389-b9ed-91f5b95e611f")
+			(uuid "328d8b67-a97f-4266-ac8f-de965cbdd42b")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "89b7295f-cdff-4255-a0a5-e7a9301f2bbe")
+			(uuid "d59ac8c5-582c-4581-9828-e7c62554558f")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "cdabf47e-d022-4fd4-9a9f-b17779d6cca4")
+			(uuid "9b3aa33a-5ee0-4b8e-ad97-de2544e5b106")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "c974fb87-3d2a-4ccb-94be-359ad2de83f6")
+			(uuid "bfbeba40-f7bf-452b-82c7-9ee1d788a623")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "37a4d244-9adb-457e-8ea0-a950bc053334")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "3f5cbd38-3cfd-44be-945d-6185ff57e858")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "81105535-063f-4655-836d-593ea0223ced")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "29e3e014-9158-4bda-a587-bcfba5a03972")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a5a1bc06-7619-4421-9df0-b2ff46397a9a")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4ef59f6b-fe9a-4f66-932b-e3ff164abc4a")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "955e5597-2e59-4c9f-a498-3d1f2d5277e6")
-		)
-		(fp_text user "K"
-			(at -0.08 -2 0)
-			(layer "F.SilkS")
-			(uuid "a0f42f6b-4fc0-4eb0-a7f9-a0cf06c44008")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 3.99 21.45 0)
-			(layer "F.Fab")
-			(uuid "47b414f3-9a0b-4728-8c0a-4989586773f2")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at -0.08 -2 0)
-			(layer "F.Fab")
-			(uuid "c897dbfa-faa6-482d-afde-bd372cb75a21")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 27 "row1")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "4c86daa6-262a-44fc-9f30-f694f875dd39")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 27 "row1")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "4c86daa6-262a-44fc-9f30-f694f875dd39")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 39 "Net-(D10-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "1cf5eded-0aa4-4082-9e1b-25ede52d67b6")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 39 "Net-(D10-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "1cf5eded-0aa4-4082-9e1b-25ede52d67b6")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "7e03efbd-4c37-45f8-95a4-f9d4d2b0105b")
-		(at -24.769755 132.905189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 144.4 110.1 180)
 		(property "Reference" "D28"
-			(at 3.56 -2.25 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "52695695-8ca6-4c92-ae28-37cfaf51a87b")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "e1c577a2-0773-4213-b51f-53775d2f8a60")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -9252,306 +7359,120 @@
 		(path "/4ca98a57-d174-47c9-91e3-09a9016200c1")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "969a3ae8-ee35-441f-bade-5287e3bcc235")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4d7757fe-9481-47ca-84bc-46dc757dc117")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "549abd84-a04a-407a-9886-5a3b3b8d6439")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d5f74b89-6b16-4c4e-86d2-aebe8c8b0846")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1fa1550d-d732-467e-8b13-dc8ee4f6433b")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "44cc9649-29aa-4c0e-af00-72e1020a842d")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "026cbb88-68ef-4a36-86af-6870bd341093")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "12cf459c-567e-4879-808d-19f6f14c3888")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "103fe815-6f3f-4a31-bbd3-7afcd3d78d7c")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "b856f76c-3ad9-4f1f-80db-446e631b57dc")
+			(uuid "40cdbe48-bb70-438b-81cf-939a9924798e")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "b0259b83-b569-49e1-aa3f-0bda2498ad9e")
+			(uuid "6b7c57df-ce11-450f-8978-4b1f6e4efd88")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "1656662c-4e6b-4b92-82b7-521204c424ba")
+			(uuid "02f781b0-862f-40ee-bae5-09c6bb4da6f3")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "4c860ace-e2a8-4830-8d1e-fdc778e487e2")
+			(uuid "e66fbcb2-f168-43a3-a26b-f49ac9fc3276")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "e31fdf22-e9fd-40e1-87ca-3f8c4d35e74f")
+			(uuid "7aeb9eeb-e24c-4616-b52f-96f6e3dd5b2f")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "afb294da-89f3-49b3-8b07-54d235e647ef")
+			(uuid "9dd22a67-91f5-4c8a-825a-fd5530929e85")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "0b357b97-0c1b-48a8-a89e-22023c0e67f9")
+			(uuid "a1f43254-479d-4ba3-b99a-d35ce8d1cd19")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ab83fb1e-32e4-44bd-bc95-0d0a9f7457f8")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5afb5c15-6dc0-4e86-814b-74f88dc74fb7")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2e7af99e-a2cc-4277-a603-bb3679fc7741")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "9ba49a13-f507-48a3-87cd-d84599c6fa82")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "20c2629f-c186-40ec-8dc4-d12cb94e8bf5")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "419256c9-6247-4a81-9eed-5630f0637eae")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e4b5fb95-ccc0-46c0-91a0-5dafc0004785")
-		)
-		(fp_text user "K"
-			(at 0.06 -1.75 0)
-			(layer "F.SilkS")
-			(uuid "c5634e45-62bd-4d2d-aed3-5fdde7003827")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "dd357f75-9f53-44e6-bb2f-f2f05fae41f8")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0.06 -1.75 0)
-			(layer "F.Fab")
-			(uuid "e2edc141-0fb0-4cff-be63-d71ef2bcd38f")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 16 "row4")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "e83f0a27-bca5-4362-86d5-572ae4086ae3")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 16 "row4")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "e83f0a27-bca5-4362-86d5-572ae4086ae3")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 57 "Net-(D28-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "98cbdb81-8474-4a0a-a11b-4d8ae3dcee7d")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 57 "Net-(D28-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "98cbdb81-8474-4a0a-a11b-4d8ae3dcee7d")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -9560,7 +7481,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW12"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "be100287-4bf6-4369-bc1c-cac33ff9b820")
 			(effects
@@ -9886,31 +7807,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "8780c5f2-f324-4842-bbd4-5e58ff287038")
-		(at -24.769755 112.555189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 144.4 91.6 180)
 		(property "Reference" "D22"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "ef505a7f-884f-478e-be23-c3fac737790e")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "ae56d117-5c77-445a-9f44-07b70b9b5367")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -9943,306 +7861,120 @@
 		(path "/63169afd-aa5d-4250-97e4-4d2cc00e12b1")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "820a8a8c-730a-4d76-b67a-5f13df4c96d9")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "21ec6344-1413-464d-88b1-737d60c6b7c2")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "748ce14b-0ac4-4043-8e72-12337ea3b1fc")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e8d462c7-d632-461a-8af2-1e3b607d505e")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b3782cfa-7b1a-466c-9661-86bc40afd96a")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "0e136f00-ca65-4f7c-aa8e-b561c6fbd6b7")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c9fcb551-321f-4f8b-bcd3-01685e66ceb8")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c846e5a9-5ad5-4ab2-8b35-5fa3f15f0c36")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1c8f80fe-79aa-47ff-9d65-83c7944bf212")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "46c835b4-d641-414f-b214-6a8df99269e8")
+			(uuid "a29e5c52-62d6-40bc-ac45-cecf26ba7a20")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "65d6c654-880d-476f-adef-2b2cb60640e7")
+			(uuid "ffe03cdc-a885-411f-9f3f-1dc3113c9280")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "bc927cfa-7554-4926-a875-b33fd4ebff6a")
+			(uuid "0a121701-3ca6-483e-91af-68e624e4b997")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "89541c06-e02f-4a18-ad36-3b4deb1bf321")
+			(uuid "3958247a-9b8f-49fa-b88d-e6001684712a")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "8f04b939-e9a9-4ccb-91ac-1bcdb612ccdb")
+			(uuid "764680a3-6ca0-4890-b0a2-0458be5147e3")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "6f6fb7a3-c8e9-4b59-9c75-5572e7e4437e")
+			(uuid "1948fd40-de6b-4629-9f2a-f9b0bcd14f25")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "e05d38e2-2e03-4c33-8573-a4f1ea73ba29")
+			(uuid "2d3f719f-b9b9-4330-9968-ad56acc36886")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "11bd83b9-c782-4f96-90e7-82991a87373e")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "79378ba8-ebc3-4a3c-9653-459df52d4e7c")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "630bcc3b-2a2f-4ddd-8e51-060c16b789c0")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "6ccc9e63-848b-471b-913e-eb88c59cb25d")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "655ad036-7193-47fb-9fd0-9ac7d4fde236")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f1ce9ba0-e56b-478f-a6db-5a899ff14827")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "dcdcecf6-3db9-4542-a1eb-2bf420345719")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "a7654b18-37ef-4c14-8989-728bbbd9d325")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "96a38930-2f6b-4980-91a7-b2a7f999c7a9")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "ec99e82b-d5ce-428d-be9d-b225e9aa1028")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "row3")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "a66e671b-123b-4438-9ace-4704fbf5ec11")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 10 "row3")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "a66e671b-123b-4438-9ace-4704fbf5ec11")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 51 "Net-(D22-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "c2116a8d-f588-4610-ba03-94222682d103")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 51 "Net-(D22-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "c2116a8d-f588-4610-ba03-94222682d103")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -10251,7 +7983,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW14"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "859d008f-b22d-4039-8c3d-a03880157fe5")
 			(effects
@@ -10577,37 +8309,34 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "9067edbb-98cb-440f-8636-bd167b076e2a")
-		(at -60.649755 50.805189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 104.6 64.6 180)
 		(property "Reference" "D2"
-			(at 3.81 2 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "41fefbfe-beea-485b-8c65-4c98fd81008f")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "437795a8-bf69-41c9-b85b-42455fcebe8d")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "f9d47383-f55c-42cd-a6c1-ab6308889b4f")
@@ -10619,7 +8348,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "3373349f-90b9-417b-9917-9429e6adf349")
@@ -10634,332 +8363,143 @@
 		(path "/6981dea5-acd8-418a-9028-25ee91f1c3eb")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1ab270b7-ea89-464e-90be-bd0b9ba16cf9")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ba11d07a-262a-4c62-9f85-cd6d5dd0a236")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "09d791e0-9692-4361-9439-11ca70d43444")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2be7a5bf-6cc3-42d4-867f-953084456921")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "638fe114-0f74-4359-bc82-ab9778f3317c")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "32162e45-9a20-4e9d-8a96-a7a7e7bca4fc")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ff96af4a-c79e-4f1a-938a-c1c896ed8293")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d4e862ea-5cdb-4f72-862e-19265bfa7585")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "89557c37-6ba3-4fb4-a449-f072feff40e7")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "cd42c589-b48f-48b7-9ab2-86bd5aace65f")
+			(uuid "8f5088b8-cb3c-4bdf-9a0d-fcc0d97ecb5e")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "8fcd8ce0-bde3-4588-8e29-b086083c3ae9")
+			(uuid "6748f4fe-6843-481e-aabd-05cfb6d8d521")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "6c8c9d17-8eef-4f45-91e6-1e7edc8a599c")
+			(uuid "a3644de9-b367-452d-b946-2f06d0c33cd4")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "4faaa8f3-1cd0-4831-b6ec-996559615af2")
+			(uuid "43cd67c2-de2c-4282-b1ec-9253d84a3187")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "aca91965-d6d2-4363-95b2-45149f960a7e")
+			(uuid "c5b2f4cb-ac36-4681-ae67-855f7f974ec2")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "143cf528-f93a-4704-a5de-5dfc34bbaaf7")
+			(uuid "a1296ced-1efd-493c-b883-b7c0909c7251")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "4b364532-8b0d-42f1-8e78-18736af8ee0b")
+			(uuid "ad6a2389-5089-4d85-bc3a-b4871ce1f67c")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2073d0ea-9be7-4a39-bdbb-83acdd95dbb8")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "34dfb96b-7670-449e-be35-79518a2ae6a8")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "8383332a-a8fc-4993-bcfa-147a05a908fa")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "37067d41-e00b-47cf-b70a-5737c7c8853b")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "18d87b74-994f-4c81-aa35-b2c5b9243d66")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d65b7773-d73c-42be-82a8-3a238eaac55d")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5682b8af-95d1-4ec8-94b2-c15b549b56a6")
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.SilkS")
-			(uuid "74ac2507-c270-4597-9139-9d611de56d4e")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.Fab")
-			(uuid "051c738d-98a9-437b-88b6-e65b1fd9c854")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "ac149f1a-332d-41ff-ad9e-38ec57531793")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "row0")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "3dc3be61-8a87-4c95-a720-8b51e7ae79e3")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 4 "row0")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "3dc3be61-8a87-4c95-a720-8b51e7ae79e3")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 31 "Net-(D2-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "4b5c270e-1494-4244-9d31-4d879fad5605")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 31 "Net-(D2-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "4b5c270e-1494-4244-9d31-4d879fad5605")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "93cbdc39-0074-477a-97c9-44770bdf5bb0")
-		(at -4.269755 112.555189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 162.9 115.1)
 		(property "Reference" "D23"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "41a8293f-2e92-4b0b-ae5a-66b13cff08a2")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "7a7eda46-f4e1-43ee-b385-18e1fdb4caba")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -10992,332 +8532,143 @@
 		(path "/21165a9f-b6a3-4f21-ab45-3aac1dd0c546")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5a6ec107-ded6-418c-b4b9-2b0ccd7190b0")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5f1b652d-08f8-44a6-8427-c7805f0e8252")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "36e256f2-5063-4cae-89ea-3ec50242536a")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "08029f8d-9775-436b-be24-f9ab28e7d3b9")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "adddf147-fd17-45b9-8001-dd860345b731")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "27358236-6c6f-49b6-8717-56de9793737e")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "16f56fb0-af74-4049-a026-f38395123b88")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b630884d-b0e4-477c-85d0-856205c96d87")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e9620382-0266-420a-a679-ad2cce3cbb95")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "58b4a227-5755-4d49-b9ef-09b877b9e9ce")
+			(uuid "9944c67f-98a2-42b0-b5d7-583033d57090")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "545315fc-5b20-458b-8a4c-a42327b56c5e")
+			(uuid "a3126f83-1ced-4908-9278-6e0b51ed702a")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "cceb0a69-9a13-4152-991b-148c4761897f")
+			(uuid "854bc281-a8a4-44ee-94a0-ad12db3da3eb")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "b397a39c-4571-42fb-8ddc-8baaedc7da77")
+			(uuid "3cae7e95-3de1-4c12-91c3-54dfd7990fce")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ebbbc8c6-a52d-41e0-b98b-07ff4bc9df30")
+			(uuid "d24efd22-7477-48fd-9dcd-95a3eeef5090")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "ccc5e530-5ddc-4787-92ad-55f0c631587a")
+			(uuid "c4b5884f-f864-4197-ba70-68e8f811a3a8")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "322b4147-93e0-4878-ba45-a916d7cc36f3")
+			(uuid "e62014ca-3c22-4b30-a301-0171e1b1a126")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "c808bf0b-4dcb-45db-a513-778c63c97b14")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2578e8b2-86f9-46c0-96cf-9a26a6293aa4")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ef95a682-e490-46a6-bb1b-880dde311be8")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "085a670a-b4d6-445f-a784-61cba733c0ce")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5c5041aa-81dd-4898-8922-e0c7f03923fe")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a283da4a-9775-4160-af96-826fd07c7f7f")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "0c928575-1904-4987-af89-7785f885cdca")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "dc3b7396-c1bc-4b4d-8db3-e93674fb6e60")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "1399f9d3-9c74-4db1-a7ac-6976a48bc8ac")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "53789d71-91d4-41b8-89fb-ee6771121496")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "row3")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "8996ce70-c61f-49a1-99e1-2c95469c70db")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 10 "row3")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "8996ce70-c61f-49a1-99e1-2c95469c70db")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 52 "Net-(D23-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "8e28807e-7d04-4bcb-95a0-e74310ace059")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 52 "Net-(D23-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "8e28807e-7d04-4bcb-95a0-e74310ace059")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "941ecefc-efab-401c-a313-fa20f65ca8a5")
-		(at -81.149755 133.055189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 88.9 120.1 180)
 		(property "Reference" "D25"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
-			(uuid "7fd57260-7b78-4f36-a827-74ea45077031")
+			(uuid "9864317e-336b-41ad-8860-ac65cb493f21")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
-			(uuid "e6b32dbb-425a-4480-b661-7559b20a9841")
+			(uuid "dd5da982-895e-418e-9642-f9486bf0d093")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -11326,7 +8677,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "ebf261c6-dd5f-4ede-a505-cd40cd7b35a6")
+			(uuid "95655e1a-d191-4a15-8fe6-e143ed627665")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11338,7 +8689,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "0e8b5683-ab55-48a4-b0dd-e8411819c7b2")
+			(uuid "bff3c68c-48cd-4758-ab9e-608fdccf0b98")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11350,332 +8701,143 @@
 		(path "/96b47f72-2750-44f5-bffd-f67f9ff0e365")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4ee7be48-bd4c-4d72-9705-b930a0e367ca")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "417366bd-9b0e-4945-8761-256b4e18ef47")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bd95ac50-87a0-4fb5-a6f1-dabb43951f59")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "194dd162-4264-4c66-a988-ef1803cda91b")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2e91ef0e-2279-4f8c-9aff-80c5cb668632")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e9cd5ac2-015c-4db7-b5d1-1c7a88ba0397")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "7ddd8c0d-1499-4bc6-a4a4-da2c88d732ea")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "60aa28d1-2826-43e5-af65-45b7a33850f4")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "7f3224a7-db79-49c3-8c84-2364fd0bbbad")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "3d08445a-63fb-4f3b-b628-0c1945df9d1e")
+			(uuid "a9bfea7f-a31d-41e1-b35a-62f67a644075")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "3b7ea21c-0cb0-42d8-b3f5-cc785076abf2")
+			(uuid "3f668b38-596f-499e-ae89-bcfe6eef80d2")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "b0b2e4e5-e200-4468-b937-edcd89b3ec84")
+			(uuid "709e5b16-6d50-4cf1-b205-ea5a3f15f504")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "de4b7d46-ceba-4308-a4c8-6489b406c9e8")
+			(uuid "20a28c51-899a-4ce4-b30e-327d38788d56")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "74fbe055-c8f0-40ba-a693-89ad1d6d9f4d")
+			(uuid "fc0abae2-a16d-4591-901f-242349dbc195")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "861a7d88-c915-4a5e-b0ca-6c5a50b00d44")
+			(uuid "658edb9e-a026-4fd7-8c43-0980ab82e4bf")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "7a79d2e5-7f27-4df1-a516-350344080bd5")
+			(uuid "4376f829-3419-453f-b1e6-6dbb88c38a1b")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "258787cb-597e-4e2e-b8e3-0344027cc492")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "abf415f3-e0aa-473c-b5dd-7bb51ed2f363")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b905ca6a-99a9-48b8-8787-8b70e24b71ef")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "64d3ee99-21da-4999-b63f-537b3866f037")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1a80411f-ee20-4abd-85bc-cc3333a567db")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "78b871ac-0d9e-486f-a309-f47903b9e562")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "c68f9e44-4e54-41ad-8b51-3a8c58952789")
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.SilkS")
-			(uuid "1fea6cf7-aac7-42c2-aeaf-061cca7d38e7")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.Fab")
-			(uuid "2780f12a-45de-4af9-bfe6-4336bfa7066d")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "58422402-867a-4199-942c-06d7168c9613")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 16 "row4")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "cfaae487-a170-4ce9-9747-1999e791a684")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 16 "row4")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "cfaae487-a170-4ce9-9747-1999e791a684")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 54 "Net-(D25-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "0bff3c54-a2ba-4131-b445-99989f9d0850")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 54 "Net-(D25-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "0bff3c54-a2ba-4131-b445-99989f9d0850")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "9b4c1821-a8a2-47d5-93c3-ad53353ad5ae")
-		(at 16.040245 50.805189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 178.6 78.1)
 		(property "Reference" "D6"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "992a9ce2-7779-453e-9728-5a14bfb7fe95")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "a25e8bff-8e50-45ad-8e19-491b218e336b")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -11708,338 +8870,149 @@
 		(path "/fdbac54a-8abf-4bc1-bf33-fa593d902e4e")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c55cf749-89dd-46e4-84e4-8826e6eb413a")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "abfd3486-9240-48d4-bb29-772acace6827")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "7aeb8151-fb96-4b66-824e-7d0cfd978fe1")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b3ac9524-91b3-495e-b855-4364ab997087")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6eb13b81-4355-4527-b935-bcf23b946adc")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d7657a60-9083-47c7-ad0f-207818aed114")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "12e84d9b-e6c3-40ab-94b2-0f75a2582b4c")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b98a03e9-0c02-4586-8260-1c13bf50baf2")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "88d0e620-0d20-4e28-897b-75562e8ee7c8")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "2352e2c7-18ae-4ca6-8782-5ea10f71577c")
+			(uuid "15739176-2e01-4f0f-94c3-bc04eaef0d77")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "3099191f-394e-4b8b-a386-d1801099297a")
+			(uuid "94fd0424-b3db-4705-9a6a-393234078fcd")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "6104e4e6-a317-4f2c-a7ec-22a14035e9c6")
+			(uuid "d5be4d1f-b672-48a5-b580-3135881ba0e1")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f427c963-33ea-4ffb-bd58-640ba7cbd7a1")
+			(uuid "752c988b-7fc8-43fc-9bb6-46dd76934749")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "c1905e2b-05e4-4e06-8c36-8236998f0772")
+			(uuid "7ac84e92-dfdc-472b-9940-406e49d8eefa")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "56c3fc06-7bc4-4c4a-b893-3badea962c35")
+			(uuid "072836ec-8c91-4b6d-8ef3-0a16ff9db2e8")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "73fe4036-a260-4f68-83eb-5a91b558f233")
+			(uuid "be0232c2-eedc-41b2-8bfd-5e114cad5fae")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "18d1dae8-dba5-43e9-98ba-0120b4746746")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "63186ee3-68e7-4554-8422-6d1f5fe8db8b")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "7225f43d-2c16-49bb-a84e-3c46b498a400")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ddce32b0-515f-4d10-9ab6-ac2dac9ced4d")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "17aeb42f-6c33-4fbe-bf9b-65f9859cf44f")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ac50135e-6a5e-48b4-9f5c-d44b5efae155")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "45591572-b5e8-4e61-b3d1-62ff4decedb4")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "9549502c-eea6-4bb9-a36d-7a1ac50140d6")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "41d5d91d-062b-4f30-a36f-15b49934f64b")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "4ce488e6-4bb4-4bfe-bd8b-745b5879cbcb")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "row0")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "8b2a4700-5dd5-4817-9de5-875ca2046d6b")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 4 "row0")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "8b2a4700-5dd5-4817-9de5-875ca2046d6b")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 35 "Net-(D6-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "8fddd25b-ad2f-457d-8c47-b49aa8c4d1e1")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 35 "Net-(D6-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "8fddd25b-ad2f-457d-8c47-b49aa8c4d1e1")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "9df6a7cd-05b5-4204-92a1-9f602692146d")
-		(at -40.209755 92.055189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 123.1 96.6 180)
 		(property "Reference" "D15"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "2b116bca-4ea8-4b6d-a416-0ec68e3b92d2")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "99d9631b-5fcc-4f46-b744-4ea9a01a9f8b")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "9eda7d3e-1968-46f9-a436-25efec6fcaad")
@@ -12051,7 +9024,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "9ceb607c-ad5b-487e-8f5d-c0b2348374d0")
@@ -12066,306 +9039,120 @@
 		(path "/3c2dcc2a-8721-48b7-823b-640e38d0fc24")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "fbbf2efb-7e31-4473-8c36-3f8e4264f2b8")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2d93ddbc-ae53-409a-aab8-1f8fe0575fb9")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "eaad3343-4f3e-4768-ad48-aa6bbe48ac00")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f0d11dbb-b827-4117-90d4-d44bef575a52")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f2434e1e-6f39-4617-903e-cc761d7c3953")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "79b7eb3e-88a7-4e15-a50a-d8f3e5ee751a")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2747812f-a749-4662-846e-db07e5331c03")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "126ad041-949a-4ef4-bec4-50def701eb30")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8f4d0c5d-31d0-48b8-8a6e-27beabf576db")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "ff3db7e7-a5c3-459a-b040-18a93661f749")
+			(uuid "2effffa7-d70e-40c6-8e77-720e5f872ea1")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "33ecb029-3c54-409a-b112-93c7cdd0eeff")
+			(uuid "90fbc77b-74f5-4706-a49f-c1d0ce73cf56")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "5509504a-3901-4353-a123-cfc944d1e6aa")
+			(uuid "89232f6d-236b-4dd8-b299-136a7474fec3")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "9fa29731-b762-404c-83a9-74310e4761c8")
+			(uuid "6d039ef7-3803-4d09-a1d5-5805fd62ce51")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "79c7f65b-27b0-41dd-861d-e49c981154c4")
+			(uuid "e3029642-ec57-46a9-b43c-dc9418b5b2d4")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "6e23c239-d78a-4f51-900e-48655daaba68")
+			(uuid "588fe459-f720-41b6-966f-e84fa29dad04")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "779b53e9-0c87-4f42-aa87-82e01d0208e1")
+			(uuid "bab63676-a931-4285-b115-5de4b3b2a6c1")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2a5b4d39-eebf-42af-9c5c-b44bd4c5c127")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f64119b8-071b-4feb-85fb-e33c2e667727")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f6a873b9-3113-4228-ba09-af3f72a9dd17")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "74a76cbf-ef58-4f87-8e56-13c1497b2fec")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "9bd153ec-5b1d-466e-a3d1-0ca1f70d0db1")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4ef5222d-b3ba-48c7-aa02-4d744002dab8")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b2e121b1-f414-4ee1-8fd0-f58bea9150df")
-		)
-		(fp_text user "K"
-			(at 0 2.25 0)
-			(layer "F.SilkS")
-			(uuid "51e4d537-c2f0-49fb-98f3-6e4e4d73c109")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "96198990-bb99-43b1-b163-405299b432ab")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2.25 0)
-			(layer "F.Fab")
-			(uuid "e08a70b0-3511-4000-9454-dd5c0a2f1fa6")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 13 "row2")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "cad9a56d-31c3-43b4-a929-d076c702ad95")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 13 "row2")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "cad9a56d-31c3-43b4-a929-d076c702ad95")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 44 "Net-(D15-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "11846a7a-721e-4b02-9e7e-d73a4c02c12a")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 44 "Net-(D15-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "11846a7a-721e-4b02-9e7e-d73a4c02c12a")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -12374,7 +9161,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW9"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "3a79cfb6-b731-4751-baed-57ef8578ac54")
 			(effects
@@ -12700,37 +9487,34 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "a3f5c6a8-beae-411c-89f0-762d873e2654")
-		(at -81.149755 50.805189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 86.1 64.6 180)
 		(property "Reference" "D1"
-			(at 3.56 2 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "c741a467-9938-4ae7-83d1-0a9ddd9e1177")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "7947ca43-056e-49f7-9902-aec33233f36e")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "4ce4c835-9579-4caf-899d-f5b44f852148")
@@ -12742,7 +9526,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "b56fd648-1c92-4f3e-b197-262e6d5d26cb")
@@ -12757,306 +9541,120 @@
 		(path "/22a0c9f8-305d-49e3-bd05-089932c6985c")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "9f64d61a-3584-4938-8dc4-0ff6401ee8e7")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "52a1a683-d3c0-40e6-856e-db31f50a2035")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "70b80210-8a79-405a-9c3a-9fbc7c3eb8b2")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4e3ec84e-c887-4e23-9168-e13e95695df2")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "580ce4a7-abff-4ae0-8c00-2c415aa6581c")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "24594bce-ea62-4102-bcfa-602249fe6b62")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f899222c-c669-4245-bbf7-9d51f43f1db7")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "93c167fc-a457-4675-b376-3c658a1d6d6d")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1ca80e96-5ea0-4e8d-abc7-770536f5b268")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "3dd6793c-2111-4226-9a37-9b63241ce5df")
+			(uuid "24d95bb0-92af-4f07-82f5-8925ee058fa5")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "cdd3e19e-1700-4923-825b-73d06a1bbda2")
+			(uuid "2451eb3d-72fb-43a6-a2f5-fb1c0e9ba2ef")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "524cb2a3-f28c-4e5b-bb4c-fcc515746685")
+			(uuid "8ba307f5-9926-4389-812f-69623e65becd")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "8b7ee5fd-5458-49cb-86a6-8f9acc971e9f")
+			(uuid "64fc5d2e-f396-4044-bba6-9c9d533c44cd")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "71c3f10f-9260-467e-9d3c-c619875e3b4f")
+			(uuid "c3ed9397-10e1-4114-850b-57dd596de73b")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "a62888ef-f849-48fc-a1e3-d36135bcf737")
+			(uuid "b715eb5a-1b3a-4d94-bbe1-9cbfdc1460f5")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "87ae5eb3-c729-4a7d-bcd7-c3383c52af83")
+			(uuid "3a8a5a06-1786-4eeb-9a97-032f8196b553")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "3e7e86de-66b1-4b94-a68e-e37d6b487394")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "56b09891-767f-4a9a-9316-666c044d0bb8")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "51769e5b-837c-4477-8167-55dc2c6f3174")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2c445834-27e5-465b-b71d-1a7e645faac9")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b7054f4e-5d4d-4372-b93d-86ec625bcf00")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b32a348c-d7ed-4a17-8707-57df01e357f0")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e7312eca-7466-4b95-b3d5-40496ae03835")
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.SilkS")
-			(uuid "6363e33c-3c87-411c-9f71-d3021516aefa")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2 0)
-			(layer "F.Fab")
-			(uuid "804db143-5dfe-4720-893f-0a44b066f5a4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "a7aab05f-72f0-402d-8131-8debb1e6841e")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "row0")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "01c6de58-ae05-4524-91bd-2528aefec92b")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 4 "row0")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "01c6de58-ae05-4524-91bd-2528aefec92b")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 30 "Net-(D1-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "2077583f-6073-43a2-ab39-71d7a0cc37a8")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 30 "Net-(D1-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "2077583f-6073-43a2-ab39-71d7a0cc37a8")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -13065,7 +9663,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW23"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "684c4708-54ba-403c-954c-43cec20289dc")
 			(effects
@@ -13391,37 +9989,34 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "a650ae38-12b7-4366-88f4-5b49f70e5a58")
-		(at -80.959755 92.055189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 86.1 101.6 180)
 		(property "Reference" "D13"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "92970e06-bb5b-4b3c-a478-7cb69048b238")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "e7d5f5cb-9455-4139-8571-ed0a134086dd")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "d7effa6b-2c46-4867-83c7-e70f68fd4bfc")
@@ -13433,7 +10028,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "a06fc7ab-1fcf-4bf1-805e-f223bc833e5d")
@@ -13448,306 +10043,120 @@
 		(path "/91f7adda-4230-46da-a3c7-a1b7a780f7d0")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "86def8ae-fb61-461d-bb97-9d516aa18f17")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "664b6251-6692-49fa-bc6e-32deba3611cf")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e2ac4b14-2f38-4c4a-96a0-9cdcea82a231")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ef401edc-eeca-4ae9-a263-6bbd49712698")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c516cdf5-1bfd-4aeb-8cf7-34ab74e43c05")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bc3a57c6-442c-4b6a-9154-5bfdc89e1297")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5f363b60-788b-48e3-ac2e-5bc1297581f9")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "10ba05ee-956b-4f6a-baed-6af852964798")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ac7a126f-53b9-4b50-a208-ed4c04a9dae1")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "48d02bd8-a33f-4b92-a5f7-234ce4747d30")
+			(uuid "13c1715d-1723-4957-b29e-dab967c3f622")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "59ae4c61-3bc8-41e2-84d8-69523191463f")
+			(uuid "452bf73a-65f3-40de-b08c-69ab9132320b")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "d23a465a-1aeb-4213-949f-ea15b33d7266")
+			(uuid "c23c9e90-8b40-4fda-b180-53dbb7e16c62")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ed255094-9f20-4158-aa30-9d4c44325204")
+			(uuid "f51a3289-5006-4b7f-a681-bbdfe8ed199f")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "fd1f89a5-0857-4b96-ace1-25d577b1f43b")
+			(uuid "00fbe82f-9ef0-4a06-b222-641078a0eee0")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "da6fca9e-232e-4079-90d6-2a92e2e28da9")
+			(uuid "e4e76055-e2b6-41cc-8a39-79274a0d53aa")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "6f974214-749e-4e43-a1df-d2648a6db0aa")
+			(uuid "484dac23-0b42-4d6b-8e6a-9ce4c23c2f8e")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "58e261d5-d015-453f-9513-e6942cb9664f")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "215a63e6-0a88-4566-afae-a76aafcee11d")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f2ae5dee-ca56-4f32-81f2-1cc681420957")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f1641553-a406-4f27-8f22-d881902b1729")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "9c7385b6-aca4-4f1a-9e68-743860f48458")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1966d222-15ef-477a-9963-d5fde0ec3476")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "3ab9bda2-7251-445d-874b-0db900c7eb85")
-		)
-		(fp_text user "K"
-			(at 0 2.25 0)
-			(layer "F.SilkS")
-			(uuid "b22a5711-f430-4287-91a6-9252c5d8a697")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2.25 0)
-			(layer "F.Fab")
-			(uuid "0863747c-e793-45ae-92e0-6145dbcae16a")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "4f8bd84e-aeeb-4240-83c8-a27575dd0439")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 13 "row2")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "a5d3c3ab-396b-4cc7-8e6e-076a86b604fe")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 13 "row2")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "a5d3c3ab-396b-4cc7-8e6e-076a86b604fe")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 42 "Net-(D13-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "962e9541-e0c7-4c66-b95b-63e123d341d3")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 42 "Net-(D13-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "962e9541-e0c7-4c66-b95b-63e123d341d3")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -13756,7 +10165,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW24"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "bc19eca0-7216-406c-bfd5-36101af00a09")
 			(effects
@@ -14275,7 +10684,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW8"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "6ddc1cc4-c5de-40a9-8856-0064f1fa2caf")
 			(effects
@@ -14601,31 +11010,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "b3c76f0f-b849-40a6-999a-8f5601912d59")
-		(at -4.209755 92.055189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 162.9 96.6)
 		(property "Reference" "D17"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "fa39df25-b9df-4b8d-b379-9016e6a22c3e")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "45f3a794-be3e-443b-822f-404383d6548a")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -14658,306 +11064,120 @@
 		(path "/55c1494a-1c6a-4a87-9c4f-436c66e3c646")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "0157bb9e-f58f-40b4-b50b-38b1b79c2623")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "10892e5c-ea3f-4f4a-9593-935c1fcaa5c7")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c81fc3be-23eb-49c1-b51b-101428647130")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8ffc3810-6726-4841-a7c5-879bfde7a9e4")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6f498385-c4ab-4174-8850-a7532bb91e41")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "66f27ab0-921d-4105-8c5e-4d0ab50afb5b")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4b088941-967a-4332-b541-6b06935d697b")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4231bf05-3c93-4ee5-b355-0e7c89ce68e5")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3214c309-39c7-438d-b2f0-e15be11ec8b6")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "026c4613-62a5-4501-88d4-9fe0e52f27f8")
+			(uuid "16bde525-a256-4871-9b28-e0da08f93e0d")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "2002b3cd-a04b-4b03-9f8b-7129e13ff185")
+			(uuid "78f71712-b0f3-4db6-9e3b-01648be321ec")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "d4254f1a-1d96-45f7-96db-045930e365a9")
+			(uuid "5bfd4afd-fd86-4901-b00d-211829628356")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "9d4f073f-25b2-4fd9-9906-f88789f32ac3")
+			(uuid "6e1bea78-3471-49b7-9d8e-dd1a6f2f4566")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "9340b456-65a7-465a-8607-2b547b3ada9a")
+			(uuid "3c60e01b-1df1-43ce-8bc8-46f749ef9654")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "77eca17b-daff-44a1-8b3f-51e1c5b8ef59")
+			(uuid "0a6f18cf-15c9-4f55-ad88-97f99d7f9c24")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "6114d5ff-91d0-41ee-83a1-d7b4badf6619")
+			(uuid "0d0746a1-9a4d-4a1c-b37e-d710cde105e0")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "03c51fc7-532e-477a-9aad-0ae627903d20")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e36734d1-3c4e-4e80-9d7e-acd5c05c4462")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1e3e0eec-c25b-4671-ac0e-6b51f632ae11")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e9ad9a5b-92e5-49d0-8ccd-25451dd42817")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "6dbdc97d-ebd4-4643-a727-546f4d94c8fb")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "42f6adfd-4c79-4f99-9f57-6b2decc3c018")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "0fca8f28-187e-4ae9-b1a6-aba6b7364ea4")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "bd7a5f08-ec5d-41cf-a21d-a66ab9a83e1a")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "bfa59f68-a9a6-4cba-87e9-4ec411657fd6")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "c467b55d-e054-4138-badf-669676f8754a")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 13 "row2")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "26e1c74a-ee9d-43ab-8383-90e515b9b492")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 13 "row2")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "26e1c74a-ee9d-43ab-8383-90e515b9b492")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 46 "Net-(D17-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "17022b74-8cee-4c65-b7a2-8bdd7b1a6ed1")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 46 "Net-(D17-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "17022b74-8cee-4c65-b7a2-8bdd7b1a6ed1")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:4ucon trrs 3.5 smd back"
 		(layer "F.Cu")
@@ -15148,31 +11368,28 @@
 		)
 		(embedded_fonts no)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "b8982376-9625-4a5b-8e43-3de50666e2aa")
-		(at -4.459755 50.805189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 162.9 59.6)
 		(property "Reference" "D5"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "5fed0ab3-80df-45a7-b426-9a929a8c35c1")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "e946b4ef-1fcf-4b0c-86d0-a9f63a0e8a01")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -15205,306 +11422,120 @@
 		(path "/45ece5c2-73e4-4f5d-81a7-65ad325917d9")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "aa85381b-0fb5-45a1-a5d3-8dd848c87a28")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "07733de9-b2c4-492d-b38a-bdc22b7188b5")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "561fd7d8-8f12-4b31-88b5-cf0d3cee0155")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "9d190505-09f2-49c5-866b-6eb9c8657264")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2a79bf3a-5e6a-4876-84c7-8dfc9b6882e2")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d61a153c-0c78-4cef-8775-8e45d4bdd3e3")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "605192ee-273a-4e64-8f6f-bf49bf9cc199")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5d2dfc89-d906-4476-b058-b00adbb09d31")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "471e92c8-8bbb-4d20-90b1-b898ec1296a4")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "64128a47-2dd2-4938-adf4-35ede2e6e214")
+			(uuid "a50ac9e1-d335-45e1-9e5c-1f31f6945aa3")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "0341bd14-6c83-4a2e-b24c-dc90c3f1ebc6")
+			(uuid "b306cede-2d0d-4da0-9e69-95ed87d7546e")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "59a7fb71-04e5-4fa9-9369-fe0201df1b24")
+			(uuid "14af4650-5767-43df-9b5b-831c207e7063")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "368fb3c2-b440-4da8-b8e9-de05712427fc")
+			(uuid "8ff0d031-ed00-4e69-abbf-ceabadc0da2f")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "020601ce-210a-4458-b913-0df5f93cc941")
+			(uuid "98025d04-90cc-4227-9c45-ab7783a9a20d")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "fde27f67-3af6-4f2e-894a-8b078234dde5")
+			(uuid "8312cf0e-89b9-43d3-967d-bedb68ec208f")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "840b7b3e-68f0-43d6-86f4-40771ca274af")
+			(uuid "c279d066-3fce-4758-a6ef-62ce3ce8d442")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "93f95781-ec83-41f4-9395-13069d7ebace")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "81b8e226-fc12-4033-aedf-564f3d3683dd")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "590e2ee7-19d5-4a44-b11a-2d496c705d4e")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "39e5c627-dea4-475a-b364-55f18e87cc04")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "8250302d-2ded-4119-9b11-2c4a82b80213")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2bf8296b-21b0-4a12-a501-7e61eede66b8")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ecd8d56c-72d1-41f5-ba7a-641d16158a9f")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "dbcea0da-cfb9-4412-ba16-af8f1b27545c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "31ea9054-27f5-4ece-a0a4-029a0859869d")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "7ec8bf06-278e-4587-8c19-1156e7a683ed")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "row0")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "a384001f-1f7b-453b-b721-4231a565c4b3")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 4 "row0")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "a384001f-1f7b-453b-b721-4231a565c4b3")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 34 "Net-(D5-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "970b68b9-5150-43f2-a02f-ba5e53519518")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 34 "Net-(D5-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "970b68b9-5150-43f2-a02f-ba5e53519518")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -15513,7 +11544,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW13"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "678a124c-e385-4e20-a108-2e7feb8c79e3")
 			(effects
@@ -15839,37 +11870,34 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "be2e7a17-a363-4ed5-86c5-1288f14fb67c")
-		(at -60.649755 92.055189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 104.6 101.6 180)
 		(property "Reference" "D14"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "da224e56-9867-42e1-b697-20ccec0e818d")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "f2574adc-af4d-4373-b690-d25440182f1d")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "f573ac05-ee62-47d2-8f51-5a02bdf9a793")
@@ -15881,7 +11909,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "615f921c-c552-436e-b19b-e8a41d9f5dbe")
@@ -15896,306 +11924,120 @@
 		(path "/1f549ce3-f5c3-4af5-8b0b-f759179b3a44")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a241a5e2-e520-4ae3-bea4-ca39fa9e8187")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "873a3da1-4949-472a-93cf-6d0cf7510020")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b9e1ab02-b4e0-480a-91dc-49956390dc84")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "acf2e51e-7a05-4c68-81de-145303f9c322")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "964df65a-aff3-4a5c-b20b-4289bd230619")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "7a735d32-fe72-4eef-b612-c3eef52b16a7")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "df0a7c2c-b36c-4ef1-90cf-de449667a3e5")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "990212e8-e329-4896-91dc-3054920e7dda")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3f9d78a2-c3d1-43aa-884b-b9ef284af247")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "0a96f491-5c05-45fd-a66b-ad03edc9f930")
+			(uuid "a26b08b3-0f3f-4aa6-be77-c1c754e60c1d")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ac8d7687-203c-40d2-9e49-b0e8314c7dbd")
+			(uuid "16c1d5a4-7762-4367-a0ac-412a9c3af2b0")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "18e2c88f-9656-4a28-800e-1b3aa3c23406")
+			(uuid "7cf348f3-3250-4756-a50b-30de7c764776")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "3a558865-dc86-4510-a81c-26dd623b5004")
+			(uuid "6d9a9f4f-81f8-4744-912d-b8051a0551fa")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "ec910891-693a-4aa6-a629-c1d6295dcd8f")
+			(uuid "9e67bae8-103e-47ad-908a-18ebd2be80c5")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "b83f93e8-920c-4a8e-ac6e-16dd128167aa")
+			(uuid "613bd6bf-bb54-492e-a78f-5590c7353e2d")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "91170629-0c23-4a10-8962-f4328951b154")
+			(uuid "533da8c6-e8d0-437a-9577-756e9ed68f83")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a0682eec-a6d8-4d94-aaf9-e73d6c01a653")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "dd8921db-9757-4469-a308-e600019b9140")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e2d97d94-e70d-4f26-8c4a-08cf8136d530")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "44eb75db-b290-4df0-ae2d-963039f99dbd")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f29c6302-3307-4a8f-8a4a-18621de5f2ad")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a7075bdc-7f79-4365-8ece-b091f8aa78be")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "adada647-3bb6-46d8-9f5f-da17b159d157")
-		)
-		(fp_text user "K"
-			(at 0 2.25 0)
-			(layer "F.SilkS")
-			(uuid "9624e587-1a94-4620-b2bb-30aee0cf99aa")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 2.25 0)
-			(layer "F.Fab")
-			(uuid "59e950f7-fc28-400f-8e52-9f0ebc9e11f1")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "fecc2641-de48-4064-9396-087015685804")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 13 "row2")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "fe624cf6-afdd-4609-8f47-23206d674d88")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 13 "row2")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "fe624cf6-afdd-4609-8f47-23206d674d88")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 43 "Net-(D14-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "b5e7ef28-4da9-468c-9963-192fdf1def8c")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 43 "Net-(D14-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "b5e7ef28-4da9-468c-9963-192fdf1def8c")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -16204,7 +12046,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW28"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "fb2e300c-c01b-4eb9-ad4e-b2fc5af6b65b")
 			(effects
@@ -16537,9 +12379,9 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW10"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
-			(uuid "14dce0f5-039b-4b85-b3da-d051aeaaf3dc")
+			(uuid "dfb04591-eaf7-4f3c-8e65-d960043682f4")
 			(effects
 				(font
 					(size 1 1)
@@ -16550,7 +12392,7 @@
 		(property "Value" "Push_Button"
 			(at 0 9 0)
 			(layer "F.Fab")
-			(uuid "694a54e2-551a-4adf-a06f-b469eb5a1797")
+			(uuid "5c5dd3a1-fc98-4142-b7be-14326e054cc1")
 			(effects
 				(font
 					(size 1 1)
@@ -16562,7 +12404,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "72119a0e-6945-479c-b553-2f169141b3ed")
+			(uuid "85d1acc0-2561-4341-a76d-d482f439fba2")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -16574,7 +12416,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "04d83f81-f669-4e2c-8fe4-a4d92e9db49a")
+			(uuid "299fab4b-eb94-4438-837f-21fd9275031b")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -16870,7 +12712,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW25"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "129e2b41-6f06-4eb0-9cac-2c80a0e3ca92")
 			(effects
@@ -17203,7 +13045,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW2"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "2ec217bf-155f-4fad-86ee-b27423f8f282")
 			(effects
@@ -17529,31 +13371,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "ca0b49ac-4de4-4220-9450-4863d45f159a")
-		(at -24.959755 50.805189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 141.6 54.6)
 		(property "Reference" "D4"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "17ced3cd-62c6-4b98-8e0b-610204271989")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "c15d1f39-ec33-40fa-a3a8-f446df9a80a5")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -17586,306 +13425,120 @@
 		(path "/f1b66235-da58-4574-bc67-d1522e42ee94")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d5b4a1eb-01ba-4755-912f-42df95553520")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "705781cf-9e2d-462a-a426-8676be5d52f2")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d7db8426-4080-48bc-874e-06a098ecfadb")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "cb407fe5-e564-4f39-ac2c-c37c61b9a0ee")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d508d9b5-ba04-4af1-b10e-ff2d6ccaf470")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "be175cfd-40fd-444f-982d-01c998b973c6")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b612f451-348d-4155-b8e2-08f13d9788c8")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f5f0c65f-8964-4ec8-ac54-0dff350e3fbf")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "83a786d3-4e98-44b5-bf5e-f4b6784dd2ad")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "72c8a713-6deb-4b9a-9a4b-864f005408a2")
+			(uuid "c558cb49-6c78-40ef-8043-9270e512a6c9")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "8478abe4-d2b2-43fc-80f1-32a89521af23")
+			(uuid "dc4f0d90-8221-4836-8f34-15dbed3d6b3b")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "e17d64f1-a83a-416a-96c1-5ff8621c8f07")
+			(uuid "1229ce0e-5b17-47aa-bfc2-c127499057b2")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "c9c2e46d-5309-409c-b1f6-11d161a17503")
+			(uuid "f6d0907c-c4c7-4854-92e8-efa2e7286adb")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "296df32e-3d88-4b78-aa2c-88adfffddd55")
+			(uuid "4d485409-1d5e-41e3-b348-fc2756abcd49")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "75172948-3396-4e40-b8af-c6b865c0c34c")
+			(uuid "079e70cb-b2a2-4302-aaa7-1036205ec167")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "3d219a5c-57b5-4cd1-ad7b-3fd2aaf9c381")
+			(uuid "d3099738-fa7c-422c-8a04-40ceeb81da94")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a30ffcb1-7f5b-44d8-9188-5b3abcea3704")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "423270d9-694d-46be-93d8-8d44682a7ea0")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f03b5137-d256-4db4-8334-a1a709aa61f7")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "637e51b8-511e-4fdf-b5b7-e97efc9e9477")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "711b6398-8baa-4db8-a24a-9d03c2306e18")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a0b5431b-33d7-4159-947a-d7e8413ee988")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "a6030018-e6ba-49d2-8e48-6b476139c5e4")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "d1b9856e-29e6-4ac9-91e3-61c3afe83967")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "37fe5dc3-0799-43ab-b50c-6bc80a29708c")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "bbadb422-6383-40b6-8d4e-62f0befc2dac")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 4 "row0")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "1b34607f-4f7f-4e13-b336-9777b69f19bf")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 4 "row0")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "1b34607f-4f7f-4e13-b336-9777b69f19bf")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 33 "Net-(D4-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "04473b6d-46fc-444f-987b-8f396c27ab03")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 33 "Net-(D4-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "04473b6d-46fc-444f-987b-8f396c27ab03")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -17894,7 +13547,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW22"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "473bd470-70a6-4619-93e0-313d6d2d3556")
 			(effects
@@ -18220,31 +13873,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "cf6307ad-389a-4e19-9fd4-844623f38de8")
-		(at 16.230245 71.305189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 181.4 78.1)
 		(property "Reference" "D12"
-			(at 4.06 -2 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "f5f3b3f6-d64b-4329-893c-b090a0d1a913")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "76372424-6356-4f8a-9b00-8274e73801ce")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -18277,306 +13927,120 @@
 		(path "/f1ad5bdd-5599-4931-be53-00f91bfa3b8d")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "64495512-1646-4732-a1f6-2916a2d9e286")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "34109e24-1265-4ceb-a197-102fa40add5b")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4d754f13-ba5f-4ca2-8afd-c4eb551316e3")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "07616dda-11a8-44da-9105-e7a03c9c5ea0")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "c2b53c47-4caa-4ceb-8908-07f882a7280a")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3eafb48e-4a75-4d6b-b990-aa6b6bba5a0e")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "27bf67e1-b345-446b-a6d6-105b3f4731b5")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "502b5dae-a2f6-47b1-b06d-861aa80494bc")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "28a55f5c-7087-41d3-b250-ef473631f9aa")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "f77a276c-70eb-405a-92c7-e39b83ad5b3d")
+			(uuid "05a0c769-4062-4d02-a7db-68aad6ea1717")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "5c5d4493-eb7c-43a6-897d-238e829bf26e")
+			(uuid "4c2ef1cf-a24c-423e-8f6c-450e1676091b")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "557de8e8-537a-4a11-977a-c11dfe665f85")
+			(uuid "70aab2b4-1f1b-4489-b78b-a83eb6180d7c")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "8d32196b-10ff-4de8-be2e-1ec5959bf110")
+			(uuid "a2a8d38a-e046-4513-a477-96ba6623c3aa")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "6139af43-b65b-47a9-bc30-c25b05eee041")
+			(uuid "75f9d422-e490-473c-9899-2c97941de2ec")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "62d89760-cf11-4f89-b4cb-71215783fe2a")
+			(uuid "00db66b5-388f-4a98-af18-143906e5465d")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "ca3e0484-b763-4270-ae9c-ac1364938f8a")
+			(uuid "a36317ce-8025-48ae-bd31-bc54619e3b9e")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "295ac75c-2e89-4e63-91b2-fe0a79373c53")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e2e8516c-5214-4a6c-97d1-6a977e465092")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2e4862f9-790e-43ac-843e-2d43abe99e56")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "8b68a3fd-f54c-4868-b988-02fb22618289")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "da62e47f-1edf-42e1-81e2-4e7bd0f60da8")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d9686617-9481-4932-bdcf-a6100db0617d")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "26f5b137-7345-411a-a3a4-5f4367d8b1e5")
-		)
-		(fp_text user "K"
-			(at -0.12 -2 0)
-			(layer "F.SilkS")
-			(uuid "6402a672-b574-4a75-9976-9ee634caaada")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 3.99 21.45 0)
-			(layer "F.Fab")
-			(uuid "84873390-659d-4889-bb59-013e84a54a23")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at -0.12 -2 0)
-			(layer "F.Fab")
-			(uuid "f98250fa-d537-483a-8566-49a9ad20f2d4")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 27 "row1")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "e7c8a16d-b5a0-4b9d-beac-f5aea2fcfd21")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 27 "row1")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "e7c8a16d-b5a0-4b9d-beac-f5aea2fcfd21")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 41 "Net-(D12-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "fb5628a0-b590-4402-8f58-587c5d20398d")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 41 "Net-(D12-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "fb5628a0-b590-4402-8f58-587c5d20398d")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -18585,7 +14049,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW29"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "550bad04-e2f9-4300-b46f-02d5c6415e43")
 			(effects
@@ -18911,31 +14375,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "d52aca5e-5889-409f-b092-3805ada6e4de")
-		(at -40.399755 132.905189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 125.9 115.1 180)
 		(property "Reference" "D27"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "e7dce315-c270-4a12-b66e-b75c0210faaf")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "325623c2-0c0c-40e6-8fd9-4f4012724f3a")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -18968,306 +14429,120 @@
 		(path "/c2a1df40-847d-4404-aa37-fdddca01b90f")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2f03f5c8-8ae0-4fc2-891d-bac09fd86616")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "51670858-b650-4d18-b74f-4e97f29dfe60")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2febf60d-970c-423b-9ef8-40d65ed49f78")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f329a27b-fe24-47b5-8cca-4523cd4396f4")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "89a0c7d2-b04c-4918-b606-24d514b8aa7e")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "e8fd2345-0461-45a4-8471-56d281b2dbdc")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f86e4bd1-95ba-43a8-b225-a1f8cabc671f")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "646fc194-9f90-4fe1-a3cd-0805115f0f9b")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2d13d6ed-9f59-4156-8517-e9d01c880de4")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "c8200691-105f-4012-8517-d4b18a11df67")
+			(uuid "61f024ef-b827-4449-8f7c-b1ae5e6d1ce2")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "1716ab7a-97f9-46fe-b187-5ede433f7a31")
+			(uuid "c5c94093-79c8-49c0-8d7f-3b30ccb3af45")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "67960330-8b68-40d8-87f9-35105dbf0628")
+			(uuid "860451fb-829d-43b6-9e17-d7c31afb7ad1")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f73f0fe2-8bbb-4bd4-979e-6ea822db4bf3")
+			(uuid "228b3fdb-2d45-447f-b097-3e422cfa840d")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "f7299467-e098-4183-9b78-ef734852e6bb")
+			(uuid "705a0b16-1181-45d1-83b0-a5a83cdbefb0")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "a2a6d10d-ee82-46e6-a267-9557b6950be0")
+			(uuid "19b79164-30e7-4c45-96ca-6149a632f990")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "7dfc00fd-77af-42b4-a093-dbc775175e3c")
+			(uuid "01225f49-615d-47f5-ae5c-944ac11121de")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "42d695a2-e7c8-4ccc-a5e2-7379df1f4ce6")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "48dcb8f6-1fda-49ed-a404-a2647f6bd33b")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e82852aa-1d09-4dcb-8ace-eb4c6ac9394f")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "cc37bd28-2aa1-4bfa-b678-cc72c4f26e84")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "353ce215-5814-45fc-bc92-f67a59f9daf8")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "be22070a-7eda-4c39-8127-93b2f1abbda1")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "8e31cecb-8164-45d2-8e2f-31f80e98777f")
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.SilkS")
-			(uuid "c290a765-d21b-4158-bb30-2a4e21a09973")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "1560f6ee-0e05-4703-9b5e-b01b607b1d96")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.Fab")
-			(uuid "aeff0eac-4e00-420b-9133-8f99c3356e51")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 16 "row4")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "db52d33e-7c34-482b-af05-74846634c708")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 16 "row4")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "db52d33e-7c34-482b-af05-74846634c708")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 56 "Net-(D27-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "2480dc94-61c2-4eb0-af58-d2e73d5a292b")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 56 "Net-(D27-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "2480dc94-61c2-4eb0-af58-d2e73d5a292b")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
@@ -19276,7 +14551,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW11"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "477fe320-306a-4c11-a020-d7f218a06115")
 			(effects
@@ -19609,7 +14884,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW3"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "0fca3110-6f21-42d7-abfc-98d758696665")
 			(effects
@@ -19942,7 +15217,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW7"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "8aa4c78f-b070-47c9-acf0-4de93cc353dc")
 			(effects
@@ -20275,7 +15550,7 @@
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW4"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "a917c309-ef30-4ee0-8d7f-43532550820c")
 			(effects
@@ -20601,31 +15876,28 @@
 			)
 		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "e180c5dd-381c-4e19-a033-2c8ee9cfde84")
-		(at 16.290245 92.055189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 181.4 96.6)
 		(property "Reference" "D18"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "d246b6a7-56e2-473a-8eff-de83e791a22e")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "7a1d0418-35ca-4a47-b43a-343de52ccc4f")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -20658,332 +15930,143 @@
 		(path "/d409da01-b78d-4571-834b-e3fc76352616")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "16a56dd8-2207-4ce2-9ac5-db54c18fc8e4")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8fa8d398-9b5f-4eab-a753-80fabd21b4d4")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b1241bec-f7ed-45e1-8b69-67283ef4fab4")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1788fc52-e79e-4ace-9a4e-d9f423625800")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "39f2028a-c42b-448c-be4a-fe582da3d6ae")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "173d1be0-7871-46c2-b438-17a201a07203")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4c1c0f4c-d445-4a22-8aa5-6167fb8d7508")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3aa67d7b-7e6b-42a1-941a-fba2527cd3a0")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "dd615033-f6da-4854-9019-17e8c66eb333")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "9fdfc315-1794-4426-afea-2f0272387f81")
+			(uuid "a52c4636-147c-4a0e-94ca-04c5db3ee5a8")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "be414611-cccf-4150-8bfa-14cc5978e693")
+			(uuid "9c80abd8-6166-4f6e-a8c4-6518ba0adb51")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "3b4d2d27-9e40-41da-970c-8881d18b9fcd")
+			(uuid "35c0ee97-a615-4c16-a206-728dde621d70")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "99dac68f-7473-4b31-ac06-cc3f8c828157")
+			(uuid "6bd7e463-f404-4290-9f57-229badc4fb47")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "c3eba3ea-cb95-4b94-a875-7129e46806a2")
+			(uuid "c4198105-672e-44d8-b36e-935ca66e0f8d")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "f470c231-07bc-431c-abd6-0aaf6c755091")
+			(uuid "ca9cbb30-70a9-4246-8997-644ad0fa8aff")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "89ea132e-b2a4-4f44-83b2-a4d2859ec977")
+			(uuid "abd75fe4-237c-4f94-8b9c-1d744dbc3f55")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "7f5cf6c8-bc9b-4eb9-a012-61c7a739d897")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "aa3a17d6-11c6-4354-b4cd-8900f361d5e1")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e7cc2853-075d-413a-b000-6838185111e7")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "185f16a3-e756-4131-95b9-41b6472db431")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "704fafe5-bf04-4bf7-a505-8a2a26de369e")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "19e6afdd-4d38-40b0-bff7-ddc76642d555")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "adb981c1-4a79-4a09-b9cc-163b77a4f6ce")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "fb9014d5-e1f9-47ac-82db-961d2081a101")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "13295c44-bb4d-4042-a54a-35b33cf466b8")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "5323959f-d741-4f8f-af1e-2588c7bafdf8")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 13 "row2")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "4018d8ad-b5a1-4f77-8b7c-2391fca7be38")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 13 "row2")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "4018d8ad-b5a1-4f77-8b7c-2391fca7be38")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 47 "Net-(D18-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "d30b7c98-ff54-4124-9313-4ae12414351b")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 47 "Net-(D18-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "d30b7c98-ff54-4124-9313-4ae12414351b")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "e4c96f91-d470-4f7d-907c-379a02f24929")
-		(at -60.589755 132.805189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 107.4 120.1 180)
 		(property "Reference" "D26"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
-			(uuid "5eca24b3-da0a-4d6b-b52a-4f9840efa701")
+			(uuid "4e82e5c2-ed48-4344-9cec-a36d05e86da0")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
-			(uuid "65ff7848-544f-4b2f-b20f-a42be0f794aa")
+			(uuid "58b065e2-d20b-46a2-a67b-2c9bb632385b")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -20992,7 +16075,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "ec1566be-2e63-4594-a737-1f3f266b6e3f")
+			(uuid "9035ac52-8868-47fa-9773-1c86bcbcaf23")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -21004,7 +16087,7 @@
 			(at 0 0 0)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "581c42b1-e2c9-42ce-a51d-d09644c8c2fc")
+			(uuid "aaab1508-9afa-4cd4-9b0d-f90c24edba9b")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -21016,338 +16099,149 @@
 		(path "/d7522b08-0e93-4d3e-b441-b1a0f9470bc2")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a6ad5a02-992f-477f-ae94-3c3f32e36da7")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2435c85d-b73b-4067-8503-8ce2f587310b")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "536651f7-5923-4746-b315-285302791a90")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1db4527f-0a58-4846-951e-1bb9f4c77a37")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "73d9478b-e557-4cd1-8e9a-13d5329e19ce")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3baaed4a-4780-4c4e-99d0-b66e712f1966")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "805671f1-968f-4453-a148-3ff9aec6beaa")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a78cda97-8bb3-4c0d-83c1-09caa0f53d8f")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3904d8cc-5436-40bb-9cc8-96ef9eb4bcae")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "ad6ca1c8-e934-4b91-a334-cc80e8be24ec")
+			(uuid "21379e2d-5789-45c8-8b37-d8fd5d3d23cd")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "6fecfd67-2e04-451c-94f4-2574fb229261")
+			(uuid "a0fad818-f7d7-4180-a550-51c9f24dfb63")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "04382d8f-4521-41ae-9686-303511e0d1a8")
+			(uuid "2f499b1c-4225-451f-be34-ec8d0e8c693c")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "0fe2583b-d54f-4f28-b356-4476db5e9fd3")
+			(uuid "b3a566b4-3181-4694-b4aa-73020af34ff9")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "6e4b8dc6-5373-4b0b-9036-e19329933f2e")
+			(uuid "24016400-bd96-4088-886c-c3a124c28b04")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "cff95330-f2b8-4774-8636-0e7bd75fb911")
+			(uuid "6b3edcf3-ccc7-465e-81a6-44d96ebfe039")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "43e74b38-752a-47d2-a22c-b1faeb329d3b")
+			(uuid "eed163dc-5f60-4ff5-b7c1-0d9fa88870f5")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e18d61a0-4609-40a6-9b4d-869a61b92e59")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "f539d260-e0ce-4277-be12-10a6ce166d1b")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "095b4bd0-0127-479d-be3e-6f6a8527ef64")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "085e162c-7a17-464f-8e65-0314f0d4e4ac")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1a8b9b39-1c49-486f-b3e9-c422d12fd59b")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "7a96e116-5148-4d9d-8347-d23d0927ea21")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "320df523-97f4-41cd-a0f2-9852a71323ca")
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.SilkS")
-			(uuid "fe069227-99ea-4c5f-9065-ce4287809d60")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "5c57f4bb-487e-4add-b4be-d843385670f9")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.Fab")
-			(uuid "f07c8c42-0e8c-4e03-b7ef-f49a3d2e0b1a")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 16 "row4")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "fb111a11-ffdf-42f7-af7a-d86665301dd7")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 16 "row4")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "fb111a11-ffdf-42f7-af7a-d86665301dd7")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 55 "Net-(D26-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "0459e5fa-d2fb-4482-ad01-a9956e173c09")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 55 "Net-(D26-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "0459e5fa-d2fb-4482-ad01-a9956e173c09")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "ee04c3cc-c4e9-4a6a-a7c4-f021b31abb60")
-		(at -40.399755 112.555189 180)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 123.1 115.1 180)
 		(property "Reference" "D21"
-			(at 3.81 2.25 0)
+			(at -0.268433 0.621393 180)
 			(layer "F.SilkS")
 			(uuid "f6da046b-f3bd-437b-a452-5187e2b8f767")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 180)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "5ad2d35d-24cb-472c-a80d-8759acbf7315")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Datasheet" "https://datasheet.octopart.com/1N4148TR-ON-Semiconductor-datasheet-42765246.pdf"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "ebbc6147-d7b3-4f4e-a869-09f23f30aa19")
@@ -21359,7 +16253,7 @@
 			)
 		)
 		(property "Description" "DO-35 Diode, Small Signal, Fast Switching, 75V, 150mA, 4ns, Alternate KiCad Library"
-			(at 0 0 0)
+			(at 0 0 180)
 			(layer "F.Fab")
 			(hide yes)
 			(uuid "cf8b9247-bbe7-425f-a2ca-bcec7d4cfe9c")
@@ -21374,332 +16268,143 @@
 		(path "/bd790901-fd38-4367-832e-020931851567")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f83bfb1b-d5d7-409f-b3c2-d5ad1314a003")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "ca192bf1-1ccb-4faf-b238-d2b7a706b8e0")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "782c5c52-d0d9-4dff-b8b7-561821934f20")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1e67d498-c1cd-4400-b8b8-2e03c06a9d7e")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "10957009-662a-4ea1-8f1a-ec5497be44c3")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "6e7a1a09-5aab-4c2b-9164-a3426c5e4f76")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "f7cd6c7d-2bdc-4876-bc7a-3394eed42926")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "d7515bcd-a142-47f9-9677-4f95e358dc91")
-		)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "34d28db6-e5fc-429a-89eb-b7e3bcd1c662")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "e93a354f-7001-48f4-8511-f2d01cca4681")
+			(uuid "72bdc0c9-d9d5-4a5a-934e-a6956205e096")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "c5152dad-77cc-49f8-8788-9cfed4b0c15f")
+			(uuid "302f816b-a5d4-472c-8887-1b3b72947731")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "60557116-fcdb-4d25-9df1-46ad4aa568d7")
+			(uuid "73a24f14-286f-4359-a26a-ae9a89878613")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "76fe37b0-d9f2-477d-a2a7-583d5ad676f5")
+			(uuid "c688e27c-64b2-4cbb-bf86-4cc91dadf516")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "1c1e58d0-0014-4910-bb1a-d6ac0ed712df")
+			(uuid "cb5becb9-472b-4cda-a422-44ec7609099b")
 		)
 		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "a7b66ac9-c1fd-4ea5-815f-4152df3cced8")
+			(uuid "e70272f9-9f64-4b3e-9b72-e514daa53283")
 		)
 		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "516599de-21d7-46da-8395-bd0a3047a2a4")
+			(uuid "aa46de5c-b2b8-48d1-a6fa-6abae776ff86")
 		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d271d10e-534d-4381-a449-41e88833b93d")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "d892da2e-f758-4b86-8abd-025d73e26f08")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "95b08f98-5c0e-4273-8dbb-945b2289bf7b")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "80eeb3d0-6386-40ca-80bf-e164d13791e9")
-		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "b3f06974-1bda-402f-a236-23743ae185b7")
-		)
-		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "0211caa7-e8b4-45db-8c76-371fdccb0005")
-		)
-		(fp_line
-			(start 0 0)
-			(end 1.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "63d529ac-3150-4bf2-8c4b-aac0d31941ca")
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.SilkS")
-			(uuid "260f4828-6e63-4393-9a58-43780ff24f02")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 1.75 0)
-			(layer "F.Fab")
-			(uuid "1ee0da20-7283-4078-91d4-28bc370de545")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "6688f5c4-ca91-4f24-a2d1-43f4e530c0bb")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "row3")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "edfdf08c-7205-47cf-a04a-195512bbdcbb")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0 180)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 10 "row3")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "edfdf08c-7205-47cf-a04a-195512bbdcbb")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 50 "Net-(D21-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "e8d4df70-51e7-4372-922a-d90dedf811d8")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 50 "Net-(D21-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "e8d4df70-51e7-4372-922a-d90dedf811d8")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "f172814c-7420-49ef-a2d2-818032e82d55")
-		(at 16.230245 132.905189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 178.6 115.1)
 		(property "Reference" "D30"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "f9868726-0637-4b6b-9fa7-a4d61d9158a1")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "050f4351-1086-41c1-9f0e-8ea15d86c905")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -21732,332 +16437,143 @@
 		(path "/18804405-95e4-4d66-aaa4-2727b404004a")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "52b1c928-0317-4ad3-b7e2-2e5cd392c2e9")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "2458853e-d9b4-467b-a92b-eaf6c67745a8")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "3fb20b3d-1f9d-42fc-a640-15478e8ec623")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "33f01dc8-0b9f-4024-b71f-14049a5c1c26")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "34046794-33ab-44be-b20b-1bc9ae29a1ba")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "392fa8b1-286c-4c76-bfc4-655525b92321")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "bf930dd2-1278-4b68-adc2-6ff70d270cd5")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "5d88a3bb-b3bc-4897-9bc1-936262a786b2")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "00998825-ca99-4329-a3fb-04a74dcdbaaa")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "0f226e94-8e1d-4e81-a697-c55f1305855d")
+			(uuid "2a36889d-6dea-48f3-86ab-a3e28ac0fb02")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "cd189bcd-db8e-4d12-b440-9780479d619a")
+			(uuid "c41cfa66-174d-4178-942d-c8d1702073da")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "3b92fa04-f8f1-41c3-a283-b793903ec80f")
+			(uuid "67b0f818-6e51-4ad7-8a98-1e0182ab0a97")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "79547489-5653-4bf1-bad9-9cc07390ac17")
+			(uuid "6e55bef9-5531-4b90-893d-e721eb2626ce")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "8fb09e22-70e0-4e53-853d-1a63c991115c")
+			(uuid "335843dc-6646-4dad-85f5-794a641dac02")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "f8b6af77-4264-464a-ab50-991ca56af572")
+			(uuid "695cbe5d-367b-4ceb-98ee-41f8132c3204")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "9f994cf4-4e74-4f20-9516-8a47846b27ff")
+			(uuid "d12c5171-0ac7-4b45-a0c7-082cb1545681")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "407112bc-aeef-4c6f-bd94-2d3b27f3c529")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "ee43d96d-2cf4-4b0f-aa59-9ec6bb148337")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "5b419024-65eb-4d0f-bc0b-6a71b9e57111")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "e28853f4-1dae-45a2-a0e8-c9695c711082")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "9840f7fa-d6aa-45b7-9e08-1e49d87c468f")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "050f29d7-cbe2-4642-be46-0dbd9f1aa48a")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "2ab50b5d-ac53-4d04-9fbc-c4ffb62b8a0a")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "92265cd2-8d29-4d6f-b727-a17de5540a28")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "17786deb-86b4-421a-b5a2-19e693d1348c")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "f4b67036-d4e1-4670-95f4-2e875f3b9969")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 16 "row4")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "e41f05b2-c76c-4e5c-9f88-f9b6dbf2bdcc")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 16 "row4")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "e41f05b2-c76c-4e5c-9f88-f9b6dbf2bdcc")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 59 "Net-(D30-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "e738c1ef-7e69-4022-9f81-050e14e4a23d")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 59 "Net-(D30-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "e738c1ef-7e69-4022-9f81-050e14e4a23d")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
-	(footprint "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+	(footprint "footprints:SODFL2512X100N"
 		(layer "F.Cu")
 		(uuid "f22d0862-9041-4493-b8a4-a717809f96b9")
-		(at 16.230245 112.555189)
-		(descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf, Alternate KiCad Library")
-		(tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+		(at 181.4 115.1)
 		(property "Reference" "D24"
-			(at 3.81 -2.12 0)
+			(at -0.268433 0.621393 0)
 			(layer "F.SilkS")
 			(uuid "15ce087f-5ef9-4dd9-98c3-139e0ced46e4")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.641026 0.641026)
 					(thickness 0.15)
 				)
 			)
 		)
 		(property "Value" "1N4148"
-			(at 3.81 2.12 0)
+			(at 3.29389 1.46551 0)
 			(layer "F.Fab")
-			(hide yes)
 			(uuid "1bb8d1ff-df86-4123-9807-1a357cee09ca")
 			(effects
 				(font
-					(size 1 1)
+					(size 0.640835 0.640835)
 					(thickness 0.15)
 				)
 			)
@@ -22090,315 +16606,129 @@
 		(path "/dedfe3a7-b9de-4606-9513-69ca3d2d36ff")
 		(sheetname "/")
 		(sheetfile "5x6.kicad_sch")
-		(attr through_hole)
-		(fp_line
-			(start 1.04 0)
-			(end 1.69 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "45bcfc45-fd9f-44e4-bea2-55bc959f3545")
-		)
-		(fp_line
-			(start 1.651 0)
-			(end 3.048 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "a430a3ea-3dc3-4157-9c03-800dc200530b")
-		)
-		(fp_line
-			(start 1.69 -1.12)
-			(end 1.69 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "fc254f1f-68b0-4b6e-9159-6c677c286b39")
-		)
-		(fp_line
-			(start 1.69 1.12)
-			(end 5.93 1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "4fbe0c65-709f-4b29-8da3-7834559dc004")
-		)
-		(fp_line
-			(start 3.048 -0.889)
-			(end 3.048 0.889)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "63ea2580-fe53-4160-bdb7-8caa5d6a84f1")
-		)
-		(fp_line
-			(start 5.93 -1.12)
-			(end 1.69 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "8cb5ad4e-7ae0-42d6-ae2c-09862e7858a3")
-		)
-		(fp_line
-			(start 5.93 0)
-			(end 4.6355 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "b567e1e8-38d5-4f3f-8619-e3e1f1dff258")
-		)
-		(fp_line
-			(start 5.93 1.12)
-			(end 5.93 -1.12)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "1960b8bb-9e80-4d8b-8728-494987446702")
-		)
-		(fp_line
-			(start 6.58 0)
-			(end 5.93 0)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "F.SilkS")
-			(uuid "0e26463f-d82d-4e81-bb09-505da7b3469c")
-		)
+		(attr smd)
 		(fp_poly
 			(pts
-				(xy 4.572 0.889) (xy 3.048 0) (xy 4.572 -0.889)
+				(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
 			)
 			(stroke
-				(width 0.1)
+				(width 0.01)
 				(type solid)
 			)
 			(fill yes)
 			(layer "F.SilkS")
-			(uuid "12d522f7-b19a-481b-b605-0ff762f7005b")
+			(uuid "7c8e8866-16fb-4492-9156-85bb51ba94b1")
 		)
 		(fp_line
-			(start -1.05 -1.25)
-			(end -1.05 1.25)
+			(start -2.25 -0.9)
+			(end -2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "a331ae47-dc33-4a61-991d-74fca7274959")
+			(uuid "96c62ca5-cee0-4bb4-bd1f-7f6c8a3fad0b")
 		)
 		(fp_line
-			(start -1.05 1.25)
-			(end 8.67 1.25)
+			(start -2.25 0.9)
+			(end 2.25 0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "508120b1-dc58-4742-ba17-28cbcd3d54d9")
+			(uuid "f5cafeef-4d88-47de-b383-b93d428abe5b")
 		)
 		(fp_line
-			(start 8.67 -1.25)
-			(end -1.05 -1.25)
+			(start 2.25 -0.9)
+			(end -2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "5a4096c0-0f70-4f51-95a7-f636ae5dbcf5")
+			(uuid "73df69e3-20a8-4740-b483-f55307159f26")
 		)
 		(fp_line
-			(start 8.67 1.25)
-			(end 8.67 -1.25)
+			(start 2.25 0.9)
+			(end 2.25 -0.9)
 			(stroke
-				(width 0.05)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.CrtYd")
-			(uuid "78d3bb3e-8fd2-4f63-8dcf-a22ad5647f67")
+			(uuid "c2cf9678-2743-4c7e-a898-db48751456f7")
 		)
 		(fp_line
-			(start 0 0)
-			(end 1.81 0)
+			(start -0.85 0.625)
+			(end -0.85 -0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "5756230e-d8ff-4133-8284-626b9d9f92fe")
+			(uuid "73d5b7af-a277-4b2a-a673-75d65c64d156")
 		)
 		(fp_line
-			(start 1.81 -1)
-			(end 1.81 1)
+			(start 0.85 -0.625)
+			(end 0.85 0.625)
 			(stroke
-				(width 0.1)
+				(width 0.127)
 				(type solid)
 			)
 			(layer "F.Fab")
-			(uuid "87cb7670-b509-4249-a4ce-97a4b387092d")
+			(uuid "575e0c49-2a5e-477f-aee2-f2c711ddcca5")
 		)
-		(fp_line
-			(start 1.81 1)
-			(end 5.81 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "517887f7-735e-4f0d-9432-59bb80b9395d")
-		)
-		(fp_line
-			(start 2.31 -1)
-			(end 2.31 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "567279c3-b0b1-4bf8-8ee5-05b2a4b8543a")
-		)
-		(fp_line
-			(start 2.41 -1)
-			(end 2.41 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "bf286b71-184b-49ed-ad75-bc4931dd60db")
-		)
-		(fp_line
-			(start 2.51 -1)
-			(end 2.51 1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "4b106800-3a9a-474a-b542-5ffa2fb0778d")
-		)
-		(fp_line
-			(start 5.81 -1)
-			(end 1.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "c56206e6-606a-4c45-a670-097a3bdb3ae2")
-		)
-		(fp_line
-			(start 5.81 1)
-			(end 5.81 -1)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "6497dbab-3260-471b-a610-4f2fc6e64063")
-		)
-		(fp_line
-			(start 7.62 0)
-			(end 5.81 0)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "F.Fab")
-			(uuid "1e1c98b7-1ed3-4ddc-8a0e-f8f4d11ed5dd")
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.SilkS")
-			(uuid "dad3c29c-7760-4e77-9370-20eb6d4a8986")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "K"
-			(at 0 -1.8 0)
-			(layer "F.Fab")
-			(uuid "7aa58d4e-b2ec-4d96-85e0-d81bd756fe0e")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(fp_text user "${REFERENCE}"
-			(at 4.11 0 0)
-			(layer "F.Fab")
-			(uuid "9a9385db-8fc6-45af-928e-4c3074121ffc")
-			(effects
-				(font
-					(size 0.8 0.8)
-					(thickness 0.12)
-				)
-			)
-		)
-		(pad "1" thru_hole rect
-			(at 0 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 10 "row3")
 			(pinfunction "K")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "7c4af044-4e27-4b45-9dfc-17d29b782e59")
 		)
-		(pad "2" thru_hole oval
-			(at 7.62 0)
-			(size 1.6 1.6)
-			(drill 0.8)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
+		(pad "1" smd rect
+			(at -1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 10 "row3")
+			(pinfunction "K")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "7c4af044-4e27-4b45-9dfc-17d29b782e59")
+		)
+		(pad "2" smd rect
+			(at 1.4 0)
+			(size 1.05 0.6)
+			(layers "F.Cu" "F.Mask" "F.Paste")
 			(net 53 "Net-(D24-A)")
 			(pinfunction "A")
 			(pintype "passive")
+			(solder_mask_margin 0.102)
+			(uuid "2b5fda76-db54-4936-a829-8d20f5645ca8")
+		)
+		(pad "2" smd rect
+			(at 1.4 0 180)
+			(size 1.05 0.6)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 53 "Net-(D24-A)")
+			(pinfunction "A")
+			(pintype "passive")
+			(solder_mask_margin 0.102)
 			(uuid "2b5fda76-db54-4936-a829-8d20f5645ca8")
 		)
 		(embedded_fonts no)
-		(model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(footprint "footprints:SW_Kailh_Choc_V2_1.00u_double-sided"
 		(layer "F.Cu")
 		(uuid "f5657302-ae38-49ed-9126-ec589f2de636")
-		(at 124.25 105.85)
+		(at 124.5 105.85)
 		(descr "Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u")
 		(tags "Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u")
 		(property "Reference" "SW21"
-			(at 0 -9 0)
+			(at 0 4.625 0)
 			(layer "F.SilkS")
 			(uuid "56389011-281f-43ae-a592-9535e7a0dbe3")
 			(effects
@@ -22807,6 +17137,16 @@
 		(layer "Edge.Cuts")
 		(uuid "2b387afa-627a-4462-9a3a-a5fe939e84e2")
 	)
+	(gr_line
+		(start 188.25 41.1)
+		(end 153.25 41.1)
+		(stroke
+			(width 0.05)
+			(type default)
+		)
+		(layer "Edge.Cuts")
+		(uuid "4658e8f8-6c73-41fb-bdf2-4cdde21f38b6")
+	)
 	(gr_arc
 		(start 115.25 45.1)
 		(mid 114.957107 45.807107)
@@ -22871,16 +17211,6 @@
 		(layer "Edge.Cuts")
 		(uuid "59f5adb6-c0b1-46ba-8820-9945471bdedc")
 	)
-	(gr_line
-		(start 188.25 41.1)
-		(end 153.25 41.1)
-		(stroke
-			(width 0.05)
-			(type default)
-		)
-		(layer "Edge.Cuts")
-		(uuid "5fa9867e-480e-4ddc-a607-651be2cab816")
-	)
 	(gr_line
 		(start 152.25 129.6)
 		(end 152.25 132.6)
@@ -23072,10 +17402,6 @@
 			(justify left bottom)
 		)
 	)
-	(group ""
-		(uuid "53d90103-f59e-423a-906e-7653fb073745")
-		(members "2a5314d4-cfc9-4c31-be58-8995ea4ba19c" "4c8bb1be-f586-44e6-8892-5755c961713a")
-	)
 	(group ""
 		(uuid "994b1869-b2ef-4ae4-a0c2-ca68d58ad030")
 		(members "aedf58d1-0e55-46cd-b5a7-2806bc018a62" "b6325bb4-aca9-46b0-bdde-b2ebb51e059a")
diff --git a/rev2/5x6.kicad_prl b/rev2/5x6.kicad_prl
index c4d16d6..248957e 100644
--- a/rev2/5x6.kicad_prl
+++ b/rev2/5x6.kicad_prl
@@ -1,6 +1,6 @@
 {
   "board": {
-    "active_layer": 25,
+    "active_layer": 0,
     "active_layer_preset": "",
     "auto_track_width": false,
     "hidden_netclasses": [],
@@ -32,6 +32,7 @@
       "vias",
       "footprint_text",
       "footprint_anchors",
+      "ratsnest",
       "grid",
       "footprints_front",
       "footprints_back",
@@ -48,7 +49,7 @@
       "conflict_shadows",
       "shapes"
     ],
-    "visible_layers": "00000000_00000000_00000000_02000001",
+    "visible_layers": "00000000_00000000_00000000_82002223",
     "zone_display_mode": 1
   },
   "git": {
diff --git a/rev2/5x6.kicad_sch b/rev2/5x6.kicad_sch
index 2791720..f015f66 100644
--- a/rev2/5x6.kicad_sch
+++ b/rev2/5x6.kicad_sch
@@ -4306,7 +4306,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 125.73 90.17 0)
 			(effects
 				(font
@@ -4444,7 +4444,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 151.13 90.17 0)
 			(effects
 				(font
@@ -4516,7 +4516,7 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 163.83 148.59 0)
 			(effects
 				(font
@@ -4654,7 +4654,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 113.03 109.22 0)
 			(effects
 				(font
@@ -4792,7 +4792,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 151.13 129.54 0)
 			(effects
 				(font
@@ -4862,7 +4862,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 138.43 109.22 0)
 			(effects
 				(font
@@ -4932,7 +4932,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 100.33 69.85 0)
 			(effects
 				(font
@@ -5070,7 +5070,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 100.33 90.17 0)
 			(effects
 				(font
@@ -5140,7 +5140,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 125.73 109.22 0)
 			(effects
 				(font
@@ -5210,7 +5210,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 113.03 129.54 0)
 			(effects
 				(font
@@ -5348,7 +5348,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 151.13 69.85 0)
 			(effects
 				(font
@@ -5418,7 +5418,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 138.43 148.59 0)
 			(effects
 				(font
@@ -5488,7 +5488,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 151.13 109.22 0)
 			(effects
 				(font
@@ -5702,7 +5702,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 138.43 129.54 0)
 			(effects
 				(font
@@ -5840,7 +5840,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 113.03 69.85 0)
 			(effects
 				(font
@@ -6366,7 +6366,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 125.73 69.85 0)
 			(effects
 				(font
@@ -6436,7 +6436,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 100.33 109.22 0)
 			(effects
 				(font
@@ -6574,7 +6574,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 100.33 148.59 0)
 			(effects
 				(font
@@ -6644,7 +6644,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 138.43 90.17 0)
 			(effects
 				(font
@@ -7122,7 +7122,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 113.03 90.17 0)
 			(effects
 				(font
@@ -7444,7 +7444,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 125.73 129.54 0)
 			(effects
 				(font
@@ -7582,7 +7582,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 125.73 148.59 0)
 			(effects
 				(font
@@ -7652,7 +7652,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 100.33 129.54 0)
 			(effects
 				(font
@@ -7858,7 +7858,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 151.13 148.59 0)
 			(effects
 				(font
@@ -7998,7 +7998,7 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 163.83 109.22 0)
 			(effects
 				(font
@@ -8136,7 +8136,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 113.03 148.59 0)
 			(effects
 				(font
@@ -8344,7 +8344,7 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 163.83 129.54 0)
 			(effects
 				(font
@@ -8552,7 +8552,7 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 163.83 90.17 0)
 			(effects
 				(font
@@ -8622,7 +8622,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 138.43 69.85 0)
 			(effects
 				(font
@@ -8762,7 +8762,7 @@
 				(hide yes)
 			)
 		)
-		(property "Footprint" "PCM_Diode_THT_AKL:D_DO-35_SOD27_P7.62mm_Horizontal"
+		(property "Footprint" "footprints:SODFL2512X100N"
 			(at 163.83 69.85 0)
 			(effects
 				(font
diff --git a/rev2/footprints.pretty/SODFL2512X100N.kicad_mod b/rev2/footprints.pretty/SODFL2512X100N.kicad_mod
new file mode 100644
index 0000000..4290237
--- /dev/null
+++ b/rev2/footprints.pretty/SODFL2512X100N.kicad_mod
@@ -0,0 +1,154 @@
+(footprint "SODFL2512X100N"
+	(version 20241229)
+	(generator "pcbnew")
+	(generator_version "9.0")
+	(layer "F.Cu")
+	(property "Reference" "REF**"
+		(at -0.268433 0.621393 0)
+		(layer "F.SilkS")
+		(uuid "0199bfc4-a91e-40dc-80e9-8cd243bb4b8d")
+		(effects
+			(font
+				(size 0.641026 0.641026)
+				(thickness 0.15)
+			)
+		)
+	)
+	(property "Value" "SODFL2512X100N"
+		(at 3.29389 1.46551 0)
+		(layer "F.Fab")
+		(uuid "8556be5d-487b-4aa8-ac3e-9ce92a9cf725")
+		(effects
+			(font
+				(size 0.640835 0.640835)
+				(thickness 0.15)
+			)
+		)
+	)
+	(property "Datasheet" ""
+		(at 0 0 0)
+		(layer "F.Fab")
+		(hide yes)
+		(uuid "5f00a6ea-113a-4548-ac95-838ea71c0f94")
+		(effects
+			(font
+				(size 1.27 1.27)
+				(thickness 0.15)
+			)
+		)
+	)
+	(property "Description" ""
+		(at 0 0 0)
+		(layer "F.Fab")
+		(hide yes)
+		(uuid "88e5ebdd-079b-491c-a7d5-d891df416be3")
+		(effects
+			(font
+				(size 1.27 1.27)
+				(thickness 0.15)
+			)
+		)
+	)
+	(attr smd)
+	(fp_poly
+		(pts
+			(xy -0.625028 -0.625) (xy -0.2 -0.625) (xy -0.2 0.625028) (xy -0.625028 0.625028)
+		)
+		(stroke
+			(width 0.01)
+			(type solid)
+		)
+		(fill yes)
+		(layer "F.SilkS")
+		(uuid "11728349-eda9-43b1-8c7c-2ec89b078546")
+	)
+	(fp_line
+		(start -2.25 -0.9)
+		(end -2.25 0.9)
+		(stroke
+			(width 0.127)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+		(uuid "1562c5e4-0961-489f-93b6-d24b8e7c8386")
+	)
+	(fp_line
+		(start -2.25 0.9)
+		(end 2.25 0.9)
+		(stroke
+			(width 0.127)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+		(uuid "0abd2549-791b-43d2-979c-62172ad5d34b")
+	)
+	(fp_line
+		(start 2.25 -0.9)
+		(end -2.25 -0.9)
+		(stroke
+			(width 0.127)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+		(uuid "22063ff8-7a6b-4cf9-8ccc-a7b4dee732a0")
+	)
+	(fp_line
+		(start 2.25 0.9)
+		(end 2.25 -0.9)
+		(stroke
+			(width 0.127)
+			(type solid)
+		)
+		(layer "F.CrtYd")
+		(uuid "198feb51-b0a0-4efe-a731-42de2a2d0e9d")
+	)
+	(fp_line
+		(start -0.85 0.625)
+		(end -0.85 -0.625)
+		(stroke
+			(width 0.127)
+			(type solid)
+		)
+		(layer "F.Fab")
+		(uuid "c1c22fdc-89d8-4eb3-b5f4-8631969c70d1")
+	)
+	(fp_line
+		(start 0.85 -0.625)
+		(end 0.85 0.625)
+		(stroke
+			(width 0.127)
+			(type solid)
+		)
+		(layer "F.Fab")
+		(uuid "c021f000-ea68-4b21-a392-b22f6d747244")
+	)
+	(pad "1" smd rect
+		(at -1.4 0)
+		(size 1.05 0.6)
+		(layers "F.Cu" "F.Mask" "F.Paste")
+		(solder_mask_margin 0.102)
+		(uuid "4bb957a0-6b17-47a1-be58-ae36098820ca")
+	)
+	(pad "1" smd rect
+		(at -1.4 0 180)
+		(size 1.05 0.6)
+		(layers "B.Cu" "B.Mask" "B.Paste")
+		(solder_mask_margin 0.102)
+		(uuid "1e440ea1-c4fc-415a-92a9-ba2260865b05")
+	)
+	(pad "2" smd rect
+		(at 1.4 0)
+		(size 1.05 0.6)
+		(layers "F.Cu" "F.Mask" "F.Paste")
+		(solder_mask_margin 0.102)
+		(uuid "ab077e4e-218e-41ec-a860-a706ef6ccc39")
+	)
+	(pad "2" smd rect
+		(at 1.4 0 180)
+		(size 1.05 0.6)
+		(layers "B.Cu" "B.Mask" "B.Paste")
+		(solder_mask_margin 0.102)
+		(uuid "373ab534-3929-4fd1-a5a5-8e23419df1ec")
+	)
+	(embedded_fonts no)
+)
diff --git a/rev2/footprints.pretty/SW_Kailh_Choc_V2_1.00u_double-sided.kicad_mod b/rev2/footprints.pretty/SW_Kailh_Choc_V2_1.00u_double-sided.kicad_mod
index e95360b..ba07cf4 100644
--- a/rev2/footprints.pretty/SW_Kailh_Choc_V2_1.00u_double-sided.kicad_mod
+++ b/rev2/footprints.pretty/SW_Kailh_Choc_V2_1.00u_double-sided.kicad_mod
@@ -92,6 +92,46 @@
 		(layer "F.SilkS")
 		(uuid "10d68806-d206-447f-9ce8-62904796b3b3")
 	)
+	(fp_line
+		(start -7.599419 -7.599959)
+		(end 7.600581 -7.599959)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "B.SilkS")
+		(uuid "7677f921-9b5b-4033-8e16-eb32615bd71a")
+	)
+	(fp_line
+		(start -7.599419 7.600041)
+		(end -7.599419 -7.599959)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "B.SilkS")
+		(uuid "c00d1d4a-88d4-405c-b55f-59b59644dd6a")
+	)
+	(fp_line
+		(start 7.600581 -7.599959)
+		(end 7.600581 7.600041)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "B.SilkS")
+		(uuid "af0e83eb-1884-4856-8337-6ead13603504")
+	)
+	(fp_line
+		(start 7.600581 7.600041)
+		(end -7.599419 7.600041)
+		(stroke
+			(width 0.12)
+			(type solid)
+		)
+		(layer "B.SilkS")
+		(uuid "d36b041f-8684-49e1-8f6b-2f42458760b8")
+	)
 	(fp_line
 		(start -9 -8.5)
 		(end -9 8.5)
diff --git a/rev2/fp-info-cache b/rev2/fp-info-cache
index d95f61b..36e8104 100644
--- a/rev2/fp-info-cache
+++ b/rev2/fp-info-cache
@@ -1,4 +1,4 @@
-25268205456942764
+25269958414098362
 Audio_Module
 Reverb_BTDR-1H
 Digital Reverberation Unit, http://www.belton.co.kr/inc/downfile.php?seq=17&file=pdf (footprint from http://www.uk-electronic.de/PDF/BTDR-1.pdf)
@@ -101290,6 +101290,13 @@ footprints
 4
 4
 footprints
+SODFL2512X100N
+
+
+0
+4
+2
+footprints
 SW_Kailh_Choc_V2_1.00u_double-sided
 Kailh Choc keyswitch V2 CPG1353 V2 Keycap 1.00u
 Kailh Choc Keyswitch Switch CPG1353 V2 Cutout Keycap 1.00u