diff --git a/fab.kicad_sym b/fab.kicad_sym
index 9e2cb4aa57720c4b51eb4d8072669657584a0476..21b3a725a61d5eb0870521f04bfc45e2b0c7e7c9 100644
--- a/fab.kicad_sym
+++ b/fab.kicad_sym
@@ -9309,7 +9309,7 @@
     (property "Value" "SWITCH_AYZ0102AGRLC" (id 1) (at 0 -5.08 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "fab:Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm" (id 2) (at 0 0 0)
+    (property "Footprint" "fab:Switch_SPDT_CnK_AYZ0102AGRLC_7.2x3mm_P2.5mm" (id 2) (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://www.ckswitches.com/media/1431/ayz.pdf" (id 3) (at 0 0 0)
@@ -9321,7 +9321,7 @@
     (property "ki_description" "Switch, single pole double throw, Slide Switch SPDT Surface Mount, Right Angle" (id 5) (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "ki_fp_filters" "Switch_*" (id 6) (at 0 0 0)
+    (property "ki_fp_filters" "*Switch*CnK*AYZ0102AGRLC*" (id 6) (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (symbol "SWITCH_AYZ0102AGRLC_0_0"
diff --git a/fab.pretty/Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod b/fab.pretty/Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
deleted file mode 100644
index 4bf6fe55c43441fbd120e2a21ec08fdeecc182e0..0000000000000000000000000000000000000000
--- a/fab.pretty/Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
+++ /dev/null
@@ -1,52 +0,0 @@
-(module Switch_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm (layer F.Cu) (tedit 5EC6693D)
-  (descr http://www.ckswitches.com/media/1422/js.pdf)
-  (tags "switch spdt")
-  (attr smd)
-  (fp_text reference REF** (at -0.01 -5.15) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value Switch_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm (at 0 -2.9) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 3.5 -4.29) (end -3.5 -4.29) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.5 2.5) (end -1.5 1.5) (layer F.Fab) (width 0.1))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -3.6 -1.5) (end -3.6 1.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.6 1.5) (end -3.6 1.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.6 -1.5) (end 3.6 1.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.6 -1.5) (end 3.6 -1.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 0 2.5) (end 0 1.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.5 2.5) (end 0 2.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.5 2.5) (end 1.5 1.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.5 -4.29) (end 3.5 -1.83) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.5 -1.83) (end 3.95 -1.83) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.99 -1.89) (end -3.5 -1.89) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.5 -1.89) (end -3.5 -4.29) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.95 -1.83) (end 3.95 1.82) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.95 1.82) (end 1.86 1.82) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.86 1.82) (end 1.86 2.91) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.86 2.91) (end -1.93 2.91) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.93 2.91) (end -1.93 1.84) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.93 1.84) (end -3.99 1.84) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.99 1.84) (end -3.99 -1.89) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4 -1.56) (end -4 1.73) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.96 -1.6) (end 3.96 1.67) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.97 1.84) (end -1.97 2.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.97 2.78) (end 1.82 2.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.82 2.78) (end 1.82 1.84) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.68 -1.78) (end -0.83 -1.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.8 -1.77) (end 1.67 -1.77) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.02 1.82) (end -0.02 2.77) (layer F.SilkS) (width 0.12))
-  (pad "" np_thru_hole circle (at 1.5 0) (size 0.9 0.9) (drill 0.85) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -1.5 0) (size 0.9 0.9) (drill 0.85) (layers *.Cu *.Mask))
-  (pad 3 smd rect (at 2.5 -2.75) (size 1.5 2.5) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 0 -2.75) (size 1.5 2.5) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at -2.5 -2.75) (size 1.5 2.5) (layers F.Cu F.Paste F.Mask))
-  (model ${KISYS3DMOD}/Buttons_Switches_SMD.3dshapes/SW_SPDT_CK-JS102011SAQN.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
diff --git a/fab.pretty/Switch_SPDT_CnK_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod b/fab.pretty/Switch_SPDT_CnK_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..174283d1f8c6c2fe406989b06c65df43cf2e08c0
--- /dev/null
+++ b/fab.pretty/Switch_SPDT_CnK_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
@@ -0,0 +1,57 @@
+(footprint "Switch_SPDT_CnK_AYZ0102AGRLC_7.2x3mm_P2.5mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5EC6693D)
+  (descr "http://www.ckswitches.com/media/1422/js.pdf")
+  (tags "switch spdt")
+  (attr smd)
+  (fp_text reference "REF**" (at -0.01 -5.15) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 22999e73-da32-43a5-9163-4b3a41614f25)
+  )
+  (fp_text value "Switch_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm" (at 0 -2.9) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 6e68f0cd-800e-4167-9553-71fc59da1eeb)
+  )
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp cb614b23-9af3-4aec-bed8-c1374e001510)
+  )
+  (fp_line (start -1.68 -1.78) (end -0.83 -1.78) (layer "F.SilkS") (width 0.12) (tstamp 009a4fb4-fcc0-4623-ae5d-c1bae3219583))
+  (fp_line (start -0.02 1.82) (end -0.02 2.77) (layer "F.SilkS") (width 0.12) (tstamp 2dc54bac-8640-4dd7-b8ed-3c7acb01a8ea))
+  (fp_line (start -1.97 2.78) (end 1.82 2.78) (layer "F.SilkS") (width 0.12) (tstamp 37f31dec-63fc-4634-a141-5dc5d2b60fe4))
+  (fp_line (start -1.97 1.84) (end -1.97 2.78) (layer "F.SilkS") (width 0.12) (tstamp 88668202-3f0b-4d07-84d4-dcd790f57272))
+  (fp_line (start 1.82 2.78) (end 1.82 1.84) (layer "F.SilkS") (width 0.12) (tstamp 91c1eb0a-67ae-4ef0-95ce-d060a03a7313))
+  (fp_line (start -4 -1.56) (end -4 1.73) (layer "F.SilkS") (width 0.12) (tstamp c106154f-d948-43e5-abfa-e1b96055d91b))
+  (fp_line (start 3.96 -1.6) (end 3.96 1.67) (layer "F.SilkS") (width 0.12) (tstamp c24d6ac8-802d-4df3-a210-9cb1f693e865))
+  (fp_line (start 0.8 -1.77) (end 1.67 -1.77) (layer "F.SilkS") (width 0.12) (tstamp cf386a39-fc62-49dd-8ec5-e044f6bd67ce))
+  (fp_line (start -3.5 -1.89) (end -3.5 -4.29) (layer "F.CrtYd") (width 0.05) (tstamp 071522c0-d0ed-49b9-906e-6295f67fb0dc))
+  (fp_line (start 3.95 -1.83) (end 3.95 1.82) (layer "F.CrtYd") (width 0.05) (tstamp 2846428d-39de-4eae-8ce2-64955d56c493))
+  (fp_line (start -3.99 -1.89) (end -3.5 -1.89) (layer "F.CrtYd") (width 0.05) (tstamp 4e315e69-0417-463a-8b7f-469a08d1496e))
+  (fp_line (start 3.95 1.82) (end 1.86 1.82) (layer "F.CrtYd") (width 0.05) (tstamp 4fa10683-33cd-4dcd-8acc-2415cd63c62a))
+  (fp_line (start 3.5 -4.29) (end -3.5 -4.29) (layer "F.CrtYd") (width 0.05) (tstamp 503dbd88-3e6b-48cc-a2ea-a6e28b52a1f7))
+  (fp_line (start 3.5 -1.83) (end 3.95 -1.83) (layer "F.CrtYd") (width 0.05) (tstamp 6a2b20ae-096c-4d9f-92f8-2087c865914f))
+  (fp_line (start 1.86 2.91) (end -1.93 2.91) (layer "F.CrtYd") (width 0.05) (tstamp 8bc2c25a-a1f1-4ce8-b96a-a4f8f4c35079))
+  (fp_line (start 1.86 1.82) (end 1.86 2.91) (layer "F.CrtYd") (width 0.05) (tstamp 9cbf35b8-f4d3-42a3-bb16-04ffd03fd8fd))
+  (fp_line (start -1.93 2.91) (end -1.93 1.84) (layer "F.CrtYd") (width 0.05) (tstamp b1ddb058-f7b2-429c-9489-f4e2242ad7e5))
+  (fp_line (start 3.5 -4.29) (end 3.5 -1.83) (layer "F.CrtYd") (width 0.05) (tstamp d39d813e-3e64-490c-ba5c-a64bb5ad6bd0))
+  (fp_line (start -1.93 1.84) (end -3.99 1.84) (layer "F.CrtYd") (width 0.05) (tstamp eee16674-2d21-45b6-ab5e-d669125df26c))
+  (fp_line (start -3.99 1.84) (end -3.99 -1.89) (layer "F.CrtYd") (width 0.05) (tstamp f449bd37-cc90-4487-aee6-2a20b8d2843a))
+  (fp_line (start -3.6 -1.5) (end -3.6 1.5) (layer "F.Fab") (width 0.1) (tstamp 20cca02e-4c4d-4961-b6b4-b40a1731b220))
+  (fp_line (start 3.6 1.5) (end -3.6 1.5) (layer "F.Fab") (width 0.1) (tstamp 5487601b-81d3-4c70-8f3d-cf9df9c63302))
+  (fp_line (start -1.5 2.5) (end -1.5 1.5) (layer "F.Fab") (width 0.1) (tstamp 592f25e6-a01b-47fd-8172-3da01117d00a))
+  (fp_line (start 0 2.5) (end 0 1.5) (layer "F.Fab") (width 0.1) (tstamp 597a11f2-5d2c-4a65-ac95-38ad106e1367))
+  (fp_line (start 1.5 2.5) (end 1.5 1.5) (layer "F.Fab") (width 0.1) (tstamp 59ec3156-036e-4049-89db-91a9dd07095f))
+  (fp_line (start -1.5 2.5) (end 0 2.5) (layer "F.Fab") (width 0.1) (tstamp 926001fd-2747-4639-8c0f-4fc46ff7218d))
+  (fp_line (start 3.6 -1.5) (end 3.6 1.5) (layer "F.Fab") (width 0.1) (tstamp a29f8df0-3fae-4edf-8d9c-bd5a875b13e3))
+  (fp_line (start -3.6 -1.5) (end 3.6 -1.5) (layer "F.Fab") (width 0.1) (tstamp e3fc1e69-a11c-4c84-8952-fefb9372474e))
+  (pad "" np_thru_hole circle (at -1.5 0) (size 0.9 0.9) (drill 0.85) (layers *.Cu *.Mask) (tstamp 40b14a16-fb82-4b9d-89dd-55cd98abb5cc))
+  (pad "" np_thru_hole circle (at 1.5 0) (size 0.9 0.9) (drill 0.85) (layers *.Cu *.Mask) (tstamp 658dad07-97fd-466c-8b49-21892ac96ea4))
+  (pad "1" smd rect (at -2.5 -2.75) (size 1.5 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 240c10af-51b5-420e-a6f4-a2c8f5db1db5))
+  (pad "2" smd rect (at 0 -2.75) (size 1.5 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2d697cf0-e02e-4ed1-a048-a704dab0ee43))
+  (pad "3" smd rect (at 2.5 -2.75) (size 1.5 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c09938fd-06b9-4771-9f63-2311626243b3))
+  (model "${KISYS3DMOD}/Buttons_Switches_SMD.3dshapes/SW_SPDT_CK-JS102011SAQN.wrl"
+    (offset (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)