diff --git a/Amber.3dshapes b/Amber.3dshapes
index ad223c5..7511db7 160000
--- a/Amber.3dshapes
+++ b/Amber.3dshapes
@@ -1 +1 @@
-Subproject commit ad223c59b1c9a5d21841bbc210277a8135aba6fe
+Subproject commit 7511db7fa878d131e934b5533029f94e071d0e71
diff --git a/Amber.kicad_pcb b/Amber.kicad_pcb
index fa5fa5a..4c9dad9 100644
--- a/Amber.kicad_pcb
+++ b/Amber.kicad_pcb
@@ -16201,37 +16201,51 @@
     )
   )
 
-  (footprint "Amber:Murata_DLW5B" (layer "F.Cu")
-    (tedit 6123FD99) (tstamp 98f361b9-084e-4c13-825b-034dcaff99b3)
+  (footprint "Amber:L_CommonModeChoke_Murata_DLW5B" (layer "F.Cu")
+    (tedit 6124CE97) (tstamp 98f361b9-084e-4c13-825b-034dcaff99b3)
     (at 37.72 61.7 90)
+    (descr "Murata DLW5B Series Common Mode Chokes/Fitlers")
+    (tags "surface mount common mode choke")
     (property "Config" "+PoE")
     (property "Manufacturer" "Murata Electronics")
     (property "PartNumber" "DLW5BTM102SQ2")
     (property "Sheetfile" "PoE.kicad_sch")
     (property "Sheetname" "PoE")
     (path "/6888556d-e390-44b5-977e-8a0092745a4b/59b3b2a4-69cc-4b91-a496-9a2aacf0b558")
-    (fp_text reference "FL1" (at 0 -3.2 90 unlocked) (layer "F.SilkS")
+    (fp_text reference "FL1" (at 0 -3.6 90 unlocked) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 217962a4-3dde-4faf-bb5e-a98a6ab45e0e)
+      (tstamp 76fd4dd3-8323-4fa1-b3b3-5f10e3712411)
     )
-    (fp_text value "1k@100MHz/500mA" (at 0 4.5 90 unlocked) (layer "F.Fab")
+    (fp_text value "1k@100MHz/500mA" (at 0 5 90 unlocked) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0b0af5c3-94cf-48e2-832b-9284f7774741)
+      (tstamp 81a6abfe-7523-4e3e-804d-14495b098bb0)
     )
-    (fp_text user "${REFERENCE}" (at 0 3.3 90 unlocked) (layer "F.Fab")
+    (fp_text user "${REFERENCE}" (at 0 3.6 90 unlocked) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp dd680aec-2ee6-44c7-b7a0-9ae643348fea)
+      (tstamp aeff2818-555b-462c-8d7c-3eb862c7a073)
     )
-    (fp_rect (start -2.5 -2.5) (end 2.5 2.5) (layer "F.SilkS") (width 0.12) (fill none) (tstamp 8dbfc258-3f07-48a0-a3f6-a65ad7b3b913))
-    (fp_rect (start -2.6 -2.6) (end 2.6 2.6) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 70cf4ac3-b0bc-4b90-aaab-8a5d91c48392))
+    (fp_line (start -2.8 -1.6) (end -2.8 -2.8) (layer "F.SilkS") (width 0.12) (tstamp 40f08091-5c5a-4580-aa8d-35be4c187920))
+    (fp_line (start -2.8 -2.8) (end -1.6 -2.8) (layer "F.SilkS") (width 0.12) (tstamp 65ee54e2-d8b9-4158-9b04-6ec90f2a4f4d))
+    (fp_rect (start -2.6 -2.6) (end 2.6 2.6) (layer "F.SilkS") (width 0.12) (fill none) (tstamp e79e91e5-21a4-4ccd-a23d-12e3181b1159))
+    (fp_rect (start -2.7 -2.7) (end 2.7 2.7) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp ca714071-c566-446a-9a73-7774286b78e3))
+    (fp_line (start -2 -2.5) (end 2.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp 3e9a9c1e-c7e2-4fd1-b9be-e0c606de7a2d))
+    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer "F.Fab") (width 0.1) (tstamp 55567406-37f7-4658-98e1-4aebaf8e2d77))
+    (fp_line (start -2.5 -2) (end -2 -2.5) (layer "F.Fab") (width 0.1) (tstamp 7a57d8ca-fed1-4989-90c7-e15637745f55))
+    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer "F.Fab") (width 0.1) (tstamp 99276936-41dc-467d-ad3d-e6d397930269))
+    (fp_line (start -2.5 2.5) (end -2.5 -2) (layer "F.Fab") (width 0.1) (tstamp df3760bd-fe30-4fd4-a561-b964de7f4299))
     (pad "1" smd roundrect (at -1.5 -1.1 90) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 113 "Net-(C110-Pad1)") (pinfunction "1") (pintype "passive") (tstamp 7237ed91-0d3a-4b3c-abdf-94374a3e7a9f))
+      (net 113 "Net-(C110-Pad1)") (pinfunction "1") (tstamp 65c0bf59-da8b-4b0a-81fd-f6e9c3e5a4eb))
     (pad "2" smd roundrect (at -1.5 1.1 90) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 32 "Net-(C74-Pad1)") (pinfunction "2") (pintype "passive") (tstamp 0019fdcc-7645-4fc1-9055-05fc9e5eac54))
+      (net 32 "Net-(C74-Pad1)") (pinfunction "2") (tstamp 0f6ba65e-cad8-4d40-a388-14421dd144fc))
     (pad "3" smd roundrect (at 1.5 1.1 90) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 42 "Net-(C74-Pad2)") (pinfunction "3") (pintype "passive") (tstamp cd79b714-97ec-4655-a315-c263a8cbc2da))
+      (net 42 "Net-(C74-Pad2)") (pinfunction "3") (tstamp 67181cf1-707a-495b-bd0e-dbf57fad3c51))
     (pad "4" smd roundrect (at 1.5 -1.1 90) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 114 "Net-(C110-Pad2)") (pinfunction "4") (pintype "passive") (tstamp f8393ae7-7f2f-4241-b5c5-a66c063baf5d))
+      (net 114 "Net-(C110-Pad2)") (pinfunction "4") (tstamp d6e82bf1-2d04-41f7-84d0-c3adfe7449ac))
+    (model "${KIPRJMOD}/Amber.3dshapes/L_CommonModeChoke_Murata_DLW5B.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
   )
 
   (footprint "Package_QFP:TQFP-48_7x7mm_P0.5mm" (layer "F.Cu")
diff --git a/Amber.pretty/L_CommonModeChoke_Murata_DLW5B.kicad_mod b/Amber.pretty/L_CommonModeChoke_Murata_DLW5B.kicad_mod
new file mode 100644
index 0000000..126a43d
--- /dev/null
+++ b/Amber.pretty/L_CommonModeChoke_Murata_DLW5B.kicad_mod
@@ -0,0 +1,35 @@
+(footprint "L_CommonModeChoke_Murata_DLW5B" (version 20210722) (generator pcbnew) (layer "F.Cu")
+  (tedit 6124CE97)
+  (descr "Murata DLW5B Series Common Mode Chokes/Fitlers")
+  (tags "surface mount common mode choke")
+  (fp_text reference "REF**" (at 0 -3.6 unlocked) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 6e2d850e-ae31-4ab1-92e0-69f9ad228ffe)
+  )
+  (fp_text value "L_CommonModeChoke_Murata_DLW5B" (at 0 5 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c84a6be0-e3d0-4613-82f1-584b6a13497e)
+  )
+  (fp_text user "${REFERENCE}" (at 0 3.6 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1432a0cf-3d9e-4302-bd7c-5e706dca22c9)
+  )
+  (fp_line (start -2.8 -1.6) (end -2.8 -2.8) (layer "F.SilkS") (width 0.12) (tstamp 5ac64d93-0584-4eea-8973-77572d1cf092))
+  (fp_line (start -2.8 -2.8) (end -1.6 -2.8) (layer "F.SilkS") (width 0.12) (tstamp f382fdcf-cb34-4fa6-92fa-a92c91d31564))
+  (fp_rect (start -2.6 -2.6) (end 2.6 2.6) (layer "F.SilkS") (width 0.12) (fill none) (tstamp 2d847872-2c1b-411f-b3e6-225796c42a8d))
+  (fp_rect (start -2.7 -2.7) (end 2.7 2.7) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 59f67454-dba3-4570-8737-dfd309d07590))
+  (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer "F.Fab") (width 0.1) (tstamp 43080e57-3248-4eb1-9215-7f42b505e9bc))
+  (fp_line (start -2.5 2.5) (end -2.5 -2) (layer "F.Fab") (width 0.1) (tstamp 92cedb1d-9aa3-4e89-8ba9-af082aef83a8))
+  (fp_line (start -2 -2.5) (end 2.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp 959cdf8e-87da-4871-bee5-dd11b8716ace))
+  (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer "F.Fab") (width 0.1) (tstamp b9c93258-b77e-4548-9023-9006088783a7))
+  (fp_line (start -2.5 -2) (end -2 -2.5) (layer "F.Fab") (width 0.1) (tstamp f2c3d12b-2aa3-4c9d-bade-66df696fbfca))
+  (pad "1" smd roundrect (at -1.5 -1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 02582e87-7f36-451a-8fdc-5e003e7b03c7))
+  (pad "2" smd roundrect (at -1.5 1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9fb17bd7-6f17-4efb-a2e5-2c1c01abe4f2))
+  (pad "3" smd roundrect (at 1.5 1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f7ca433b-e2fe-4728-8c74-c4df259907b7))
+  (pad "4" smd roundrect (at 1.5 -1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c2203508-36eb-479c-b89c-28088d985aba))
+  (model "${KIPRJMOD}/Amber.3dshapes/L_CommonModeChoke_Murata_DLW5B.wrl"
+    (offset (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/Amber.pretty/Murata_DLW5B.kicad_mod b/Amber.pretty/Murata_DLW5B.kicad_mod
deleted file mode 100644
index 6810c3d..0000000
--- a/Amber.pretty/Murata_DLW5B.kicad_mod
+++ /dev/null
@@ -1,21 +0,0 @@
-(footprint "Murata_DLW5B" (version 20210722) (generator pcbnew) (layer "F.Cu")
-  (tedit 6123FD99)
-  (fp_text reference "REF**" (at 0 -3.2 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6e2d850e-ae31-4ab1-92e0-69f9ad228ffe)
-  )
-  (fp_text value "Murata_DLW5B" (at 0 4.5 unlocked) (layer "F.Fab")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c84a6be0-e3d0-4613-82f1-584b6a13497e)
-  )
-  (fp_text user "${REFERENCE}" (at 0 3.3 unlocked) (layer "F.Fab")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1432a0cf-3d9e-4302-bd7c-5e706dca22c9)
-  )
-  (fp_rect (start -2.5 -2.5) (end 2.5 2.5) (layer "F.SilkS") (width 0.12) (fill none) (tstamp 2d847872-2c1b-411f-b3e6-225796c42a8d))
-  (fp_rect (start -2.6 -2.6) (end 2.6 2.6) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 59f67454-dba3-4570-8737-dfd309d07590))
-  (pad "1" smd roundrect (at -1.5 -1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 02582e87-7f36-451a-8fdc-5e003e7b03c7))
-  (pad "2" smd roundrect (at -1.5 1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9fb17bd7-6f17-4efb-a2e5-2c1c01abe4f2))
-  (pad "3" smd roundrect (at 1.5 1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f7ca433b-e2fe-4728-8c74-c4df259907b7))
-  (pad "4" smd roundrect (at 1.5 -1.1) (size 1.7 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c2203508-36eb-479c-b89c-28088d985aba))
-)