diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Cu.gbl b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Cu.gbl
index 3486dd6..6802ae9 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Cu.gbl
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Cu.gbl
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Copper,L2,Bot*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Copper,L2,Bot*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Fab.gbr b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Fab.gbr
index 8547a49..1598225 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Fab.gbr
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Fab.gbr
@@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Other,Fab,Bot*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Other,Fab,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Mask.gbs b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Mask.gbs
index 0265882..d658bfb 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Mask.gbs
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Mask.gbs
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Soldermask,Bot*%
-%TF.FilePolarity,Negative*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Soldermask,Bot*
+G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Paste.gbp b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Paste.gbp
index ef6f0ad..1a8fe68 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Paste.gbp
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_Paste.gbp
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Paste,Bot*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Paste,Bot*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_SilkS.gbo b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_SilkS.gbo
index 3b3640e..7b29b06 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_SilkS.gbo
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-B_SilkS.gbo
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Legend,Bot*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Legend,Bot*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-Edge_Cuts.gm1 b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-Edge_Cuts.gm1
index 3bfb0d4..f95a1f5 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-Edge_Cuts.gm1
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-Edge_Cuts.gm1
@@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Profile,NP*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Cu.gtl b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Cu.gtl
index 00a2de0..544d437 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Cu.gtl
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Cu.gtl
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Copper,L1,Top*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Copper,L1,Top*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
@@ -34,7 +34,7 @@ G04 APERTURE LIST*
 %ADD31C,1.270000*%
 %ADD32C,0.330200*%
 G04 APERTURE END LIST*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D10*
 G36*
 X42286958Y-96840710D02*
@@ -108,8 +108,8 @@ X41927500Y-96840000D01*
 X42272500Y-96840000D01*
 X42286958Y-96840710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42286958Y-95870710D02*
 G01*
@@ -182,7 +182,7 @@ X41927500Y-95870000D01*
 X42272500Y-95870000D01*
 X42286958Y-95870710D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D11*
 X39225000Y-80500000D03*
 X39225000Y-83200000D03*
@@ -247,7 +247,7 @@ X41050000Y-100150000D03*
 X42050000Y-100150000D03*
 X42050000Y-100700000D03*
 X42050000Y-101250000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D10*
 G36*
 X43836958Y-84120710D02*
@@ -321,8 +321,8 @@ X43477500Y-84120000D01*
 X43822500Y-84120000D01*
 X43836958Y-84120710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X43836958Y-85090710D02*
 G01*
@@ -395,8 +395,8 @@ X43477500Y-85090000D01*
 X43822500Y-85090000D01*
 X43836958Y-85090710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46546958Y-89380710D02*
 G01*
@@ -469,8 +469,8 @@ X46237500Y-89380000D01*
 X46532500Y-89380000D01*
 X46546958Y-89380710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45576958Y-89380710D02*
 G01*
@@ -543,8 +543,8 @@ X45267500Y-89380000D01*
 X45562500Y-89380000D01*
 X45576958Y-89380710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45886958Y-91340710D02*
 G01*
@@ -617,8 +617,8 @@ X45527500Y-91340000D01*
 X45872500Y-91340000D01*
 X45886958Y-91340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45886958Y-90370710D02*
 G01*
@@ -691,8 +691,8 @@ X45527500Y-90370000D01*
 X45872500Y-90370000D01*
 X45886958Y-90370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45836958Y-114340710D02*
 G01*
@@ -765,8 +765,8 @@ X45477500Y-114340000D01*
 X45822500Y-114340000D01*
 X45836958Y-114340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45836958Y-113370710D02*
 G01*
@@ -839,8 +839,8 @@ X45477500Y-113370000D01*
 X45822500Y-113370000D01*
 X45836958Y-113370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32935779Y-93876144D02*
 G01*
@@ -913,8 +913,8 @@ X32337500Y-93875000D01*
 X32912500Y-93875000D01*
 X32935779Y-93876144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34685779Y-93876144D02*
 G01*
@@ -987,8 +987,8 @@ X34087500Y-93875000D01*
 X34662500Y-93875000D01*
 X34685779Y-93876144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X50385779Y-94126144D02*
 G01*
@@ -1061,8 +1061,8 @@ X49787500Y-94125000D01*
 X50362500Y-94125000D01*
 X50385779Y-94126144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X48635779Y-94126144D02*
 G01*
@@ -1135,8 +1135,8 @@ X48037500Y-94125000D01*
 X48612500Y-94125000D01*
 X48635779Y-94126144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46036958Y-117290710D02*
 G01*
@@ -1209,8 +1209,8 @@ X45677500Y-117290000D01*
 X46022500Y-117290000D01*
 X46036958Y-117290710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46036958Y-116320710D02*
 G01*
@@ -1283,8 +1283,8 @@ X45677500Y-116320000D01*
 X46022500Y-116320000D01*
 X46036958Y-116320710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45986958Y-111540710D02*
 G01*
@@ -1357,8 +1357,8 @@ X45627500Y-111540000D01*
 X45972500Y-111540000D01*
 X45986958Y-111540710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45986958Y-110570710D02*
 G01*
@@ -1431,8 +1431,8 @@ X45627500Y-110570000D01*
 X45972500Y-110570000D01*
 X45986958Y-110570710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27446958Y-90680710D02*
 G01*
@@ -1505,8 +1505,8 @@ X27137500Y-90680000D01*
 X27432500Y-90680000D01*
 X27446958Y-90680710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26476958Y-90680710D02*
 G01*
@@ -1579,8 +1579,8 @@ X26167500Y-90680000D01*
 X26462500Y-90680000D01*
 X26476958Y-90680710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27446958Y-89330710D02*
 G01*
@@ -1653,8 +1653,8 @@ X27137500Y-89330000D01*
 X27432500Y-89330000D01*
 X27446958Y-89330710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26476958Y-89330710D02*
 G01*
@@ -1727,8 +1727,8 @@ X26167500Y-89330000D01*
 X26462500Y-89330000D01*
 X26476958Y-89330710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27446958Y-88230710D02*
 G01*
@@ -1801,8 +1801,8 @@ X27137500Y-88230000D01*
 X27432500Y-88230000D01*
 X27446958Y-88230710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26476958Y-88230710D02*
 G01*
@@ -1875,8 +1875,8 @@ X26167500Y-88230000D01*
 X26462500Y-88230000D01*
 X26476958Y-88230710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41836958Y-102865710D02*
 G01*
@@ -1949,8 +1949,8 @@ X41477500Y-102865000D01*
 X41822500Y-102865000D01*
 X41836958Y-102865710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41836958Y-101895710D02*
 G01*
@@ -2023,8 +2023,8 @@ X41477500Y-101895000D01*
 X41822500Y-101895000D01*
 X41836958Y-101895710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27446958Y-86980710D02*
 G01*
@@ -2097,8 +2097,8 @@ X27137500Y-86980000D01*
 X27432500Y-86980000D01*
 X27446958Y-86980710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26476958Y-86980710D02*
 G01*
@@ -2171,8 +2171,8 @@ X26167500Y-86980000D01*
 X26462500Y-86980000D01*
 X26476958Y-86980710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41896958Y-121330710D02*
 G01*
@@ -2245,8 +2245,8 @@ X41587500Y-121330000D01*
 X41882500Y-121330000D01*
 X41896958Y-121330710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40926958Y-121330710D02*
 G01*
@@ -2319,8 +2319,8 @@ X40617500Y-121330000D01*
 X40912500Y-121330000D01*
 X40926958Y-121330710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27446958Y-85830710D02*
 G01*
@@ -2393,8 +2393,8 @@ X27137500Y-85830000D01*
 X27432500Y-85830000D01*
 X27446958Y-85830710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26476958Y-85830710D02*
 G01*
@@ -2467,8 +2467,8 @@ X26167500Y-85830000D01*
 X26462500Y-85830000D01*
 X26476958Y-85830710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40736958Y-101920710D02*
 G01*
@@ -2541,8 +2541,8 @@ X40377500Y-101920000D01*
 X40722500Y-101920000D01*
 X40736958Y-101920710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40736958Y-102890710D02*
 G01*
@@ -2615,8 +2615,8 @@ X40377500Y-102890000D01*
 X40722500Y-102890000D01*
 X40736958Y-102890710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44635779Y-98176144D02*
 G01*
@@ -2689,8 +2689,8 @@ X44037500Y-98175000D01*
 X44612500Y-98175000D01*
 X44635779Y-98176144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46385779Y-98176144D02*
 G01*
@@ -2763,8 +2763,8 @@ X45787500Y-98175000D01*
 X46362500Y-98175000D01*
 X46385779Y-98176144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28760779Y-100001144D02*
 G01*
@@ -2837,8 +2837,8 @@ X28262500Y-100000000D01*
 X28737500Y-100000000D01*
 X28760779Y-100001144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28760779Y-98251144D02*
 G01*
@@ -2911,8 +2911,8 @@ X28262500Y-98250000D01*
 X28737500Y-98250000D01*
 X28760779Y-98251144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46546958Y-88430710D02*
 G01*
@@ -2985,8 +2985,8 @@ X46237500Y-88430000D01*
 X46532500Y-88430000D01*
 X46546958Y-88430710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45576958Y-88430710D02*
 G01*
@@ -3059,8 +3059,8 @@ X45267500Y-88430000D01*
 X45562500Y-88430000D01*
 X45576958Y-88430710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44886958Y-91340710D02*
 G01*
@@ -3133,8 +3133,8 @@ X44527500Y-91340000D01*
 X44872500Y-91340000D01*
 X44886958Y-91340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44886958Y-90370710D02*
 G01*
@@ -3207,8 +3207,8 @@ X44527500Y-90370000D01*
 X44872500Y-90370000D01*
 X44886958Y-90370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42936958Y-102890710D02*
 G01*
@@ -3281,8 +3281,8 @@ X42577500Y-102890000D01*
 X42922500Y-102890000D01*
 X42936958Y-102890710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42936958Y-101920710D02*
 G01*
@@ -3355,8 +3355,8 @@ X42577500Y-101920000D01*
 X42922500Y-101920000D01*
 X42936958Y-101920710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39586958Y-102940710D02*
 G01*
@@ -3429,8 +3429,8 @@ X39227500Y-102940000D01*
 X39572500Y-102940000D01*
 X39586958Y-102940710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39586958Y-101970710D02*
 G01*
@@ -3503,8 +3503,8 @@ X39227500Y-101970000D01*
 X39572500Y-101970000D01*
 X39586958Y-101970710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45696958Y-127130710D02*
 G01*
@@ -3577,8 +3577,8 @@ X45387500Y-127130000D01*
 X45682500Y-127130000D01*
 X45696958Y-127130710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44726958Y-127130710D02*
 G01*
@@ -3651,8 +3651,8 @@ X44417500Y-127130000D01*
 X44712500Y-127130000D01*
 X44726958Y-127130710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41886958Y-120365710D02*
 G01*
@@ -3725,8 +3725,8 @@ X41527500Y-120365000D01*
 X41872500Y-120365000D01*
 X41886958Y-120365710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41886958Y-119395710D02*
 G01*
@@ -3799,8 +3799,8 @@ X41527500Y-119395000D01*
 X41872500Y-119395000D01*
 X41886958Y-119395710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41911958Y-117340710D02*
 G01*
@@ -3873,8 +3873,8 @@ X41552500Y-117340000D01*
 X41897500Y-117340000D01*
 X41911958Y-117340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41911958Y-116370710D02*
 G01*
@@ -3947,8 +3947,8 @@ X41552500Y-116370000D01*
 X41897500Y-116370000D01*
 X41911958Y-116370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41861958Y-111940710D02*
 G01*
@@ -4021,8 +4021,8 @@ X41502500Y-111940000D01*
 X41847500Y-111940000D01*
 X41861958Y-111940710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41861958Y-110970710D02*
 G01*
@@ -4095,8 +4095,8 @@ X41502500Y-110970000D01*
 X41847500Y-110970000D01*
 X41861958Y-110970710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41861958Y-108865710D02*
 G01*
@@ -4169,8 +4169,8 @@ X41502500Y-108865000D01*
 X41847500Y-108865000D01*
 X41861958Y-108865710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41861958Y-107895710D02*
 G01*
@@ -4243,8 +4243,8 @@ X41502500Y-107895000D01*
 X41847500Y-107895000D01*
 X41861958Y-107895710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42286958Y-98815710D02*
 G01*
@@ -4317,8 +4317,8 @@ X41927500Y-98815000D01*
 X42272500Y-98815000D01*
 X42286958Y-98815710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42286958Y-97845710D02*
 G01*
@@ -4391,8 +4391,8 @@ X41927500Y-97845000D01*
 X42272500Y-97845000D01*
 X42286958Y-97845710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40936958Y-120365710D02*
 G01*
@@ -4465,8 +4465,8 @@ X40577500Y-120365000D01*
 X40922500Y-120365000D01*
 X40936958Y-120365710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40936958Y-119395710D02*
 G01*
@@ -4539,8 +4539,8 @@ X40577500Y-119395000D01*
 X40922500Y-119395000D01*
 X40936958Y-119395710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40936958Y-117340710D02*
 G01*
@@ -4613,8 +4613,8 @@ X40577500Y-117340000D01*
 X40922500Y-117340000D01*
 X40936958Y-117340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40936958Y-116370710D02*
 G01*
@@ -4687,8 +4687,8 @@ X40577500Y-116370000D01*
 X40922500Y-116370000D01*
 X40936958Y-116370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40886958Y-111940710D02*
 G01*
@@ -4761,8 +4761,8 @@ X40527500Y-111940000D01*
 X40872500Y-111940000D01*
 X40886958Y-111940710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40886958Y-110970710D02*
 G01*
@@ -4835,8 +4835,8 @@ X40527500Y-110970000D01*
 X40872500Y-110970000D01*
 X40886958Y-110970710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40911958Y-108865710D02*
 G01*
@@ -4909,8 +4909,8 @@ X40552500Y-108865000D01*
 X40897500Y-108865000D01*
 X40911958Y-108865710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40911958Y-107895710D02*
 G01*
@@ -4983,8 +4983,8 @@ X40552500Y-107895000D01*
 X40897500Y-107895000D01*
 X40911958Y-107895710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41336958Y-98815710D02*
 G01*
@@ -5057,8 +5057,8 @@ X40977500Y-98815000D01*
 X41322500Y-98815000D01*
 X41336958Y-98815710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41336958Y-97845710D02*
 G01*
@@ -5131,8 +5131,8 @@ X40977500Y-97845000D01*
 X41322500Y-97845000D01*
 X41336958Y-97845710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42286958Y-94790710D02*
 G01*
@@ -5205,8 +5205,8 @@ X41927500Y-94790000D01*
 X42272500Y-94790000D01*
 X42286958Y-94790710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42286958Y-93820710D02*
 G01*
@@ -5279,8 +5279,8 @@ X41927500Y-93820000D01*
 X42272500Y-93820000D01*
 X42286958Y-93820710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41336958Y-94790710D02*
 G01*
@@ -5353,8 +5353,8 @@ X40977500Y-94790000D01*
 X41322500Y-94790000D01*
 X41336958Y-94790710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41336958Y-93820710D02*
 G01*
@@ -5427,7 +5427,7 @@ X40977500Y-93820000D01*
 X41322500Y-93820000D01*
 X41336958Y-93820710D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D19*
 X50050000Y-118550000D03*
 X50100000Y-110750000D03*
@@ -5441,7 +5441,7 @@ X19950000Y-84180000D03*
 X19950000Y-81640000D03*
 D19*
 X19950000Y-79100000D03*
-%TA.AperFunction,Conductor*%
+G04 #@! TA.AperFunction,Conductor*
 D10*
 G36*
 X36410000Y-130580000D02*
@@ -5457,8 +5457,8 @@ X38810000Y-136120000D01*
 X36410000Y-136120000D01*
 X36410000Y-130580000D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41570000Y-130580000D02*
 G01*
@@ -5467,8 +5467,8 @@ X43310000Y-135700000D01*
 X40690000Y-135700000D01*
 X41570000Y-130580000D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,Conductor*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,Conductor*
 G36*
 X44660000Y-135710000D02*
 G01*
@@ -5483,14 +5483,14 @@ X47580000Y-136120000D01*
 X45180000Y-136120000D01*
 X44660000Y-135710000D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D21*
 X37618500Y-138535000D03*
 D22*
 X42000000Y-138535000D03*
 D21*
 X46381500Y-138535000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D10*
 G36*
 X43308100Y-135954900D02*
@@ -5500,7 +5500,7 @@ X40857000Y-136120000D01*
 X40691900Y-135954900D01*
 X43308100Y-135954900D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D23*
 X42000000Y-135827900D03*
 D24*
@@ -5516,7 +5516,7 @@ X39005000Y-105400000D03*
 X41995000Y-105400000D03*
 D26*
 X40500000Y-106925000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D10*
 G36*
 X42524505Y-83251204D02*
@@ -5590,8 +5590,8 @@ X41599999Y-83250000D01*
 X42500001Y-83250000D01*
 X42524505Y-83251204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42524505Y-85301204D02*
 G01*
@@ -5664,8 +5664,8 @@ X41599999Y-85300000D01*
 X42500001Y-85300000D01*
 X42524505Y-85301204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45331958Y-87280710D02*
 G01*
@@ -5738,8 +5738,8 @@ X45022500Y-87280000D01*
 X45317500Y-87280000D01*
 X45331958Y-87280710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44361958Y-87280710D02*
 G01*
@@ -5812,8 +5812,8 @@ X44052500Y-87280000D01*
 X44347500Y-87280000D01*
 X44361958Y-87280710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31336958Y-92770710D02*
 G01*
@@ -5886,8 +5886,8 @@ X30977500Y-92770000D01*
 X31322500Y-92770000D01*
 X31336958Y-92770710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31336958Y-93740710D02*
 G01*
@@ -5960,8 +5960,8 @@ X30977500Y-93740000D01*
 X31322500Y-93740000D01*
 X31336958Y-93740710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X50524505Y-92051204D02*
 G01*
@@ -6034,8 +6034,8 @@ X49849999Y-92050000D01*
 X50500001Y-92050000D01*
 X50524505Y-92051204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X48474505Y-92051204D02*
 G01*
@@ -6108,8 +6108,8 @@ X47799999Y-92050000D01*
 X48450001Y-92050000D01*
 X48474505Y-92051204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32935779Y-92226144D02*
 G01*
@@ -6182,8 +6182,8 @@ X32337500Y-92225000D01*
 X32912500Y-92225000D01*
 X32935779Y-92226144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34685779Y-92226144D02*
 G01*
@@ -6256,8 +6256,8 @@ X34087500Y-92225000D01*
 X34662500Y-92225000D01*
 X34685779Y-92226144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41871958Y-118330710D02*
 G01*
@@ -6330,8 +6330,8 @@ X41562500Y-118330000D01*
 X41857500Y-118330000D01*
 X41871958Y-118330710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40901958Y-118330710D02*
 G01*
@@ -6404,8 +6404,8 @@ X40592500Y-118330000D01*
 X40887500Y-118330000D01*
 X40901958Y-118330710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41846958Y-109830710D02*
 G01*
@@ -6478,8 +6478,8 @@ X41537500Y-109830000D01*
 X41832500Y-109830000D01*
 X41846958Y-109830710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40876958Y-109830710D02*
 G01*
@@ -6552,8 +6552,8 @@ X40567500Y-109830000D01*
 X40862500Y-109830000D01*
 X40876958Y-109830710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41336958Y-96840710D02*
 G01*
@@ -6626,8 +6626,8 @@ X40977500Y-96840000D01*
 X41322500Y-96840000D01*
 X41336958Y-96840710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41336958Y-95870710D02*
 G01*
@@ -6700,8 +6700,8 @@ X40977500Y-95870000D01*
 X41322500Y-95870000D01*
 X41336958Y-95870710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45846958Y-96880710D02*
 G01*
@@ -6774,8 +6774,8 @@ X45537500Y-96880000D01*
 X45832500Y-96880000D01*
 X45846958Y-96880710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44876958Y-96880710D02*
 G01*
@@ -6848,8 +6848,8 @@ X44567500Y-96880000D01*
 X44862500Y-96880000D01*
 X44876958Y-96880710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45846958Y-95830710D02*
 G01*
@@ -6922,8 +6922,8 @@ X45537500Y-95830000D01*
 X45832500Y-95830000D01*
 X45846958Y-95830710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44876958Y-95830710D02*
 G01*
@@ -6996,8 +6996,8 @@ X44567500Y-95830000D01*
 X44862500Y-95830000D01*
 X44876958Y-95830710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46535779Y-94276144D02*
 G01*
@@ -7070,8 +7070,8 @@ X45937500Y-94275000D01*
 X46512500Y-94275000D01*
 X46535779Y-94276144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44785779Y-94276144D02*
 G01*
@@ -7144,8 +7144,8 @@ X44187500Y-94275000D01*
 X44762500Y-94275000D01*
 X44785779Y-94276144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46535779Y-92676144D02*
 G01*
@@ -7218,8 +7218,8 @@ X45937500Y-92675000D01*
 X46512500Y-92675000D01*
 X46535779Y-92676144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44785779Y-92676144D02*
 G01*
@@ -7292,8 +7292,8 @@ X44187500Y-92675000D01*
 X44762500Y-92675000D01*
 X44785779Y-92676144D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36486958Y-90090710D02*
 G01*
@@ -7366,8 +7366,8 @@ X36127500Y-90090000D01*
 X36472500Y-90090000D01*
 X36486958Y-90090710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36486958Y-89120710D02*
 G01*
@@ -7440,8 +7440,8 @@ X36127500Y-89120000D01*
 X36472500Y-89120000D01*
 X36486958Y-89120710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37636958Y-90040710D02*
 G01*
@@ -7514,8 +7514,8 @@ X37277500Y-90040000D01*
 X37622500Y-90040000D01*
 X37636958Y-90040710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37636958Y-89070710D02*
 G01*
@@ -7588,8 +7588,8 @@ X37277500Y-89070000D01*
 X37622500Y-89070000D01*
 X37636958Y-89070710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37276958Y-78030710D02*
 G01*
@@ -7662,8 +7662,8 @@ X36967500Y-78030000D01*
 X37262500Y-78030000D01*
 X37276958Y-78030710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38246958Y-78030710D02*
 G01*
@@ -7736,8 +7736,8 @@ X37937500Y-78030000D01*
 X38232500Y-78030000D01*
 X38246958Y-78030710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31839189Y-98648989D02*
 G01*
@@ -7810,8 +7810,8 @@ X31810273Y-98648989D01*
 X31824731Y-98648279D01*
 X31839189Y-98648989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32525083Y-99334883D02*
 G01*
@@ -7884,8 +7884,8 @@ X32496167Y-99334883D01*
 X32510625Y-99334173D01*
 X32525083Y-99334883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X30939189Y-99498989D02*
 G01*
@@ -7958,8 +7958,8 @@ X30910273Y-99498989D01*
 X30924731Y-99498279D01*
 X30939189Y-99498989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31625083Y-100184883D02*
 G01*
@@ -8032,8 +8032,8 @@ X31596167Y-100184883D01*
 X31610625Y-100184173D01*
 X31625083Y-100184883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32769206Y-97223695D02*
 G01*
@@ -8106,8 +8106,8 @@ X32722648Y-97223695D01*
 X32745927Y-97222551D01*
 X32769206Y-97223695D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34006642Y-98461131D02*
 G01*
@@ -8180,8 +8180,8 @@ X33960084Y-98461131D01*
 X33983363Y-98459987D01*
 X34006642Y-98461131D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34119206Y-96123695D02*
 G01*
@@ -8254,8 +8254,8 @@ X34072648Y-96123695D01*
 X34095927Y-96122551D01*
 X34119206Y-96123695D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35356642Y-97361131D02*
 G01*
@@ -8328,8 +8328,8 @@ X35310084Y-97361131D01*
 X35333363Y-97359987D01*
 X35356642Y-97361131D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36569206Y-93773695D02*
 G01*
@@ -8402,8 +8402,8 @@ X36522648Y-93773695D01*
 X36545927Y-93772551D01*
 X36569206Y-93773695D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37806642Y-95011131D02*
 G01*
@@ -8476,8 +8476,8 @@ X37760084Y-95011131D01*
 X37783363Y-95009987D01*
 X37806642Y-95011131D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37819206Y-92523695D02*
 G01*
@@ -8550,8 +8550,8 @@ X37772648Y-92523695D01*
 X37795927Y-92522551D01*
 X37819206Y-92523695D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39056642Y-93761131D02*
 G01*
@@ -8624,7 +8624,7 @@ X39010084Y-93761131D01*
 X39033363Y-93759987D01*
 X39056642Y-93761131D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D27*
 X45000000Y-132500000D03*
 X40000000Y-132500000D03*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Fab.gbr b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Fab.gbr
index 6c987d1..99a821a 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Fab.gbr
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Fab.gbr
@@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Other,Fab,Top*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Other,Fab,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Mask.gts b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Mask.gts
index 5d17af8..e040df6 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Mask.gts
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Mask.gts
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Soldermask,Top*%
-%TF.FilePolarity,Negative*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Soldermask,Top*
+G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Paste.gtp b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Paste.gtp
index b221da8..03a1136 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Paste.gtp
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_Paste.gtp
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Paste,Top*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Paste,Top*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_SilkS.gto b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_SilkS.gto
index 800c358..21bff99 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_SilkS.gto
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-F_SilkS.gto
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:10:48-05:00*%
-%TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Legend,Top*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:40:46-05:00*
+G04 #@! TF.ProjectId,test-mixer,74657374-2d6d-4697-9865-722e6b696361,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Legend,Top*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:10:48*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:40:46*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-NPTH.drl b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-NPTH.drl
index 847e9e1..2452576 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-NPTH.drl
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-NPTH.drl
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:10:59 AM EST
+; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:40:49 AM EST
 ; FORMAT={2:4/ absolute / inch / keep zeros}
-; #@! TF.CreationDate,2019-12-20T00:10:59-05:00
+; #@! TF.CreationDate,2019-12-20T00:40:49-05:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1
 ; #@! TF.FileFunction,NonPlated,1,2,NPTH
 FMAT,2
diff --git a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-PTH.drl b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-PTH.drl
index 8f6f4e2..df317ab 100644
--- a/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-PTH.drl
+++ b/pcb/discrete/test-mixer/test-mixer-gerbers/test-mixer-PTH.drl
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:10:59 AM EST
+; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:40:49 AM EST
 ; FORMAT={2:4/ absolute / inch / keep zeros}
-; #@! TF.CreationDate,2019-12-20T00:10:59-05:00
+; #@! TF.CreationDate,2019-12-20T00:40:49-05:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1
 ; #@! TF.FileFunction,Plated,1,2,PTH
 FMAT,2
diff --git a/pcb/discrete/test-mixer/test-mixer-rev1.zip b/pcb/discrete/test-mixer/test-mixer-rev1.zip
new file mode 100644
index 0000000..33f28b5
Binary files /dev/null and b/pcb/discrete/test-mixer/test-mixer-rev1.zip differ
diff --git a/pcb/discrete/test-mixer/test-mixer.kicad_pcb b/pcb/discrete/test-mixer/test-mixer.kicad_pcb
index 77bab73..ef86ba9 100644
--- a/pcb/discrete/test-mixer/test-mixer.kicad_pcb
+++ b/pcb/discrete/test-mixer/test-mixer.kicad_pcb
@@ -74,7 +74,7 @@
     (pcbplotparams
       (layerselection 0x310fc_ffffffff)
       (usegerberextensions true)
-      (usegerberattributes true)
+      (usegerberattributes false)
       (usegerberadvancedattributes false)
       (creategerberjobfile false)
       (excludeedgelayer true)
@@ -3482,7 +3482,7 @@
   (segment (start 42.04 129.835) (end 42.04 129.535) (width 0.508) (layer F.Cu) (net 52))
   (segment (start 42.04 129.535) (end 42.04 128.14) (width 0.508) (layer F.Cu) (net 52))
 
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5DFC5EE7) (hatch edge 0.508)
     (connect_pads yes (clearance 0.1524))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -4127,7 +4127,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 0) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5DFC5EE4) (hatch edge 0.508)
     (connect_pads yes (clearance 0.1524))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -4278,7 +4278,7 @@
       )
     )
   )
-  (zone (net 3) (net_name /+3V3) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
+  (zone (net 3) (net_name /+3V3) (layer F.Cu) (tstamp 5DFC5EE1) (hatch edge 0.508)
     (priority 1)
     (connect_pads yes (clearance 0.508))
     (min_thickness 0.254)
diff --git a/pcb/discrete/test-mixer/test-mixer.kicad_pcb-bak b/pcb/discrete/test-mixer/test-mixer.kicad_pcb-bak
index be607b6..77bab73 100644
--- a/pcb/discrete/test-mixer/test-mixer.kicad_pcb-bak
+++ b/pcb/discrete/test-mixer/test-mixer.kicad_pcb-bak
@@ -2,7 +2,7 @@
 
   (general
     (thickness 1.6)
-    (drawings 16)
+    (drawings 18)
     (tracks 461)
     (zones 0)
     (modules 81)
@@ -2975,6 +2975,30 @@
     )
   )
 
+  (dimension 65 (width 0.1524) (layer Dwgs.User)
+    (gr_text "65.000 mm" (at 59.5024 108.5 270) (layer Dwgs.User)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (feature1 (pts (xy 55 141) (xy 58.786421 141)))
+    (feature2 (pts (xy 55 76) (xy 58.786421 76)))
+    (crossbar (pts (xy 58.2 76) (xy 58.2 141)))
+    (arrow1a (pts (xy 58.2 141) (xy 57.613579 139.873496)))
+    (arrow1b (pts (xy 58.2 141) (xy 58.786421 139.873496)))
+    (arrow2a (pts (xy 58.2 76) (xy 57.613579 77.126504)))
+    (arrow2b (pts (xy 58.2 76) (xy 58.786421 77.126504)))
+  )
+  (dimension 38 (width 0.1524) (layer Dwgs.User)
+    (gr_text "38.000 mm" (at 36 70.9226) (layer Dwgs.User)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (feature1 (pts (xy 55 76) (xy 55 71.638579)))
+    (feature2 (pts (xy 17 76) (xy 17 71.638579)))
+    (crossbar (pts (xy 17 72.225) (xy 55 72.225)))
+    (arrow1a (pts (xy 55 72.225) (xy 53.873496 72.811421)))
+    (arrow1b (pts (xy 55 72.225) (xy 53.873496 71.638579)))
+    (arrow2a (pts (xy 17 72.225) (xy 18.126504 72.811421)))
+    (arrow2b (pts (xy 17 72.225) (xy 18.126504 71.638579)))
+  )
   (gr_text "Mixer test design\nRev 1" (at 24.275 129.875) (layer F.SilkS)
     (effects (font (size 1.016 1.016) (thickness 0.1524)) (justify left))
   )