diff --git a/Hardware/ProDOS ROM-Drive Back.jpg b/Hardware/ProDOS ROM-Drive Back.jpg
index 2fcbad5..7da6a1a 100644
Binary files a/Hardware/ProDOS ROM-Drive Back.jpg and b/Hardware/ProDOS ROM-Drive Back.jpg differ
diff --git a/Hardware/ProDOS ROM-Drive Front.jpg b/Hardware/ProDOS ROM-Drive Front.jpg
index c39b591..c960c8f 100644
Binary files a/Hardware/ProDOS ROM-Drive Front.jpg and b/Hardware/ProDOS ROM-Drive Front.jpg differ
diff --git a/Hardware/ProDOS ROM-Drive-B_Cu.gbr b/Hardware/ProDOS ROM-Drive-B_Cu.gbr
index f32a0fa..fa6488f 100644
--- a/Hardware/ProDOS ROM-Drive-B_Cu.gbr	
+++ b/Hardware/ProDOS ROM-Drive-B_Cu.gbr	
@@ -1,34 +1,16 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:27-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:27*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-G04 Aperture macros list*
-%AMRoundRect*
-0 Rectangle with rounded corners*
-0 $1 Rounding radius*
-0 $2 $3 $4 $5 $6 $7 $8 $9 X,Y pos of 4 corners*
-0 Add a 4 corners polygon primitive as box body*
-4,1,4,$2,$3,$4,$5,$6,$7,$8,$9,$2,$3,0*
-0 Add four circle primitives for the rounded corners*
-1,1,$1+$1,$2,$3*
-1,1,$1+$1,$4,$5*
-1,1,$1+$1,$6,$7*
-1,1,$1+$1,$8,$9*
-0 Add four rect primitives between the rounded corners*
-20,1,$1+$1,$2,$3,$4,$5,0*
-20,1,$1+$1,$4,$5,$6,$7,0*
-20,1,$1+$1,$6,$7,$8,$9,0*
-20,1,$1+$1,$8,$9,$2,$3,0*%
-G04 Aperture macros list end*
 %ADD10C,0.149860*%
 G04 #@! TA.AperFunction,NonConductor*
 %ADD11C,0.149860*%
@@ -39,23 +21,20 @@ G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
 %ADD13O,1.600000X1.600000*%
 G04 #@! TD*
-G04 #@! TA.AperFunction,ConnectorPad*
-%ADD14RoundRect,0.317500X-0.317500X-3.492500X0.317500X-3.492500X0.317500X3.492500X-0.317500X3.492500X0*%
-G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD15C,1.600000*%
+%ADD14C,1.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD16C,1.270000*%
+%ADD15C,1.270000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD17C,0.762000*%
+%ADD16C,0.762000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD18C,0.812800*%
+%ADD17C,0.812800*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD19C,0.177800*%
+%ADD18C,0.177800*%
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
@@ -1719,32 +1698,656 @@ X105526840Y-34104580D03*
 X105526840Y-31564580D03*
 X105526840Y-29024580D03*
 X105526840Y-26484580D03*
-D14*
-X116702840Y-72966580D03*
-X114162840Y-72966580D03*
-X111622840Y-72966580D03*
-X109082840Y-72966580D03*
-X106542840Y-72966580D03*
-X104002840Y-72966580D03*
-X101462840Y-72966580D03*
-X98922840Y-72966580D03*
-X96382840Y-72966580D03*
-X93842840Y-72966580D03*
-X91302840Y-72966580D03*
-X88762840Y-72966580D03*
-X86222840Y-72966580D03*
-X83682840Y-72966580D03*
-X81142840Y-72966580D03*
-X78602840Y-72966580D03*
-X76062840Y-72966580D03*
-X73522840Y-72966580D03*
-X70982840Y-72966580D03*
-X68442840Y-72966580D03*
-X65902840Y-72966580D03*
-X63362840Y-72966580D03*
-X60822840Y-72966580D03*
-X58282840Y-72966580D03*
-X55742840Y-72966580D03*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X116067840Y-76459080D02*
+X116067840Y-69474080D01*
+G75*
+G02*
+X116385340Y-69156580I317500J0D01*
+G01*
+X117020340Y-69156580D01*
+G75*
+G02*
+X117337840Y-69474080I0J-317500D01*
+G01*
+X117337840Y-76459080D01*
+G75*
+G02*
+X117020340Y-76776580I-317500J0D01*
+G01*
+X116385340Y-76776580D01*
+G75*
+G02*
+X116067840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X113527840Y-76459080D02*
+X113527840Y-69474080D01*
+G75*
+G02*
+X113845340Y-69156580I317500J0D01*
+G01*
+X114480340Y-69156580D01*
+G75*
+G02*
+X114797840Y-69474080I0J-317500D01*
+G01*
+X114797840Y-76459080D01*
+G75*
+G02*
+X114480340Y-76776580I-317500J0D01*
+G01*
+X113845340Y-76776580D01*
+G75*
+G02*
+X113527840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X110987840Y-76459080D02*
+X110987840Y-69474080D01*
+G75*
+G02*
+X111305340Y-69156580I317500J0D01*
+G01*
+X111940340Y-69156580D01*
+G75*
+G02*
+X112257840Y-69474080I0J-317500D01*
+G01*
+X112257840Y-76459080D01*
+G75*
+G02*
+X111940340Y-76776580I-317500J0D01*
+G01*
+X111305340Y-76776580D01*
+G75*
+G02*
+X110987840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X108447840Y-76459080D02*
+X108447840Y-69474080D01*
+G75*
+G02*
+X108765340Y-69156580I317500J0D01*
+G01*
+X109400340Y-69156580D01*
+G75*
+G02*
+X109717840Y-69474080I0J-317500D01*
+G01*
+X109717840Y-76459080D01*
+G75*
+G02*
+X109400340Y-76776580I-317500J0D01*
+G01*
+X108765340Y-76776580D01*
+G75*
+G02*
+X108447840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X105907840Y-76459080D02*
+X105907840Y-69474080D01*
+G75*
+G02*
+X106225340Y-69156580I317500J0D01*
+G01*
+X106860340Y-69156580D01*
+G75*
+G02*
+X107177840Y-69474080I0J-317500D01*
+G01*
+X107177840Y-76459080D01*
+G75*
+G02*
+X106860340Y-76776580I-317500J0D01*
+G01*
+X106225340Y-76776580D01*
+G75*
+G02*
+X105907840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X103367840Y-76459080D02*
+X103367840Y-69474080D01*
+G75*
+G02*
+X103685340Y-69156580I317500J0D01*
+G01*
+X104320340Y-69156580D01*
+G75*
+G02*
+X104637840Y-69474080I0J-317500D01*
+G01*
+X104637840Y-76459080D01*
+G75*
+G02*
+X104320340Y-76776580I-317500J0D01*
+G01*
+X103685340Y-76776580D01*
+G75*
+G02*
+X103367840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X100827840Y-76459080D02*
+X100827840Y-69474080D01*
+G75*
+G02*
+X101145340Y-69156580I317500J0D01*
+G01*
+X101780340Y-69156580D01*
+G75*
+G02*
+X102097840Y-69474080I0J-317500D01*
+G01*
+X102097840Y-76459080D01*
+G75*
+G02*
+X101780340Y-76776580I-317500J0D01*
+G01*
+X101145340Y-76776580D01*
+G75*
+G02*
+X100827840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X98287840Y-76459080D02*
+X98287840Y-69474080D01*
+G75*
+G02*
+X98605340Y-69156580I317500J0D01*
+G01*
+X99240340Y-69156580D01*
+G75*
+G02*
+X99557840Y-69474080I0J-317500D01*
+G01*
+X99557840Y-76459080D01*
+G75*
+G02*
+X99240340Y-76776580I-317500J0D01*
+G01*
+X98605340Y-76776580D01*
+G75*
+G02*
+X98287840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X95747840Y-76459080D02*
+X95747840Y-69474080D01*
+G75*
+G02*
+X96065340Y-69156580I317500J0D01*
+G01*
+X96700340Y-69156580D01*
+G75*
+G02*
+X97017840Y-69474080I0J-317500D01*
+G01*
+X97017840Y-76459080D01*
+G75*
+G02*
+X96700340Y-76776580I-317500J0D01*
+G01*
+X96065340Y-76776580D01*
+G75*
+G02*
+X95747840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X93207840Y-76459080D02*
+X93207840Y-69474080D01*
+G75*
+G02*
+X93525340Y-69156580I317500J0D01*
+G01*
+X94160340Y-69156580D01*
+G75*
+G02*
+X94477840Y-69474080I0J-317500D01*
+G01*
+X94477840Y-76459080D01*
+G75*
+G02*
+X94160340Y-76776580I-317500J0D01*
+G01*
+X93525340Y-76776580D01*
+G75*
+G02*
+X93207840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X90667840Y-76459080D02*
+X90667840Y-69474080D01*
+G75*
+G02*
+X90985340Y-69156580I317500J0D01*
+G01*
+X91620340Y-69156580D01*
+G75*
+G02*
+X91937840Y-69474080I0J-317500D01*
+G01*
+X91937840Y-76459080D01*
+G75*
+G02*
+X91620340Y-76776580I-317500J0D01*
+G01*
+X90985340Y-76776580D01*
+G75*
+G02*
+X90667840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X88127840Y-76459080D02*
+X88127840Y-69474080D01*
+G75*
+G02*
+X88445340Y-69156580I317500J0D01*
+G01*
+X89080340Y-69156580D01*
+G75*
+G02*
+X89397840Y-69474080I0J-317500D01*
+G01*
+X89397840Y-76459080D01*
+G75*
+G02*
+X89080340Y-76776580I-317500J0D01*
+G01*
+X88445340Y-76776580D01*
+G75*
+G02*
+X88127840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X85587840Y-76459080D02*
+X85587840Y-69474080D01*
+G75*
+G02*
+X85905340Y-69156580I317500J0D01*
+G01*
+X86540340Y-69156580D01*
+G75*
+G02*
+X86857840Y-69474080I0J-317500D01*
+G01*
+X86857840Y-76459080D01*
+G75*
+G02*
+X86540340Y-76776580I-317500J0D01*
+G01*
+X85905340Y-76776580D01*
+G75*
+G02*
+X85587840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X83047840Y-76459080D02*
+X83047840Y-69474080D01*
+G75*
+G02*
+X83365340Y-69156580I317500J0D01*
+G01*
+X84000340Y-69156580D01*
+G75*
+G02*
+X84317840Y-69474080I0J-317500D01*
+G01*
+X84317840Y-76459080D01*
+G75*
+G02*
+X84000340Y-76776580I-317500J0D01*
+G01*
+X83365340Y-76776580D01*
+G75*
+G02*
+X83047840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X80507840Y-76459080D02*
+X80507840Y-69474080D01*
+G75*
+G02*
+X80825340Y-69156580I317500J0D01*
+G01*
+X81460340Y-69156580D01*
+G75*
+G02*
+X81777840Y-69474080I0J-317500D01*
+G01*
+X81777840Y-76459080D01*
+G75*
+G02*
+X81460340Y-76776580I-317500J0D01*
+G01*
+X80825340Y-76776580D01*
+G75*
+G02*
+X80507840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X77967840Y-76459080D02*
+X77967840Y-69474080D01*
+G75*
+G02*
+X78285340Y-69156580I317500J0D01*
+G01*
+X78920340Y-69156580D01*
+G75*
+G02*
+X79237840Y-69474080I0J-317500D01*
+G01*
+X79237840Y-76459080D01*
+G75*
+G02*
+X78920340Y-76776580I-317500J0D01*
+G01*
+X78285340Y-76776580D01*
+G75*
+G02*
+X77967840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X75427840Y-76459080D02*
+X75427840Y-69474080D01*
+G75*
+G02*
+X75745340Y-69156580I317500J0D01*
+G01*
+X76380340Y-69156580D01*
+G75*
+G02*
+X76697840Y-69474080I0J-317500D01*
+G01*
+X76697840Y-76459080D01*
+G75*
+G02*
+X76380340Y-76776580I-317500J0D01*
+G01*
+X75745340Y-76776580D01*
+G75*
+G02*
+X75427840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X72887840Y-76459080D02*
+X72887840Y-69474080D01*
+G75*
+G02*
+X73205340Y-69156580I317500J0D01*
+G01*
+X73840340Y-69156580D01*
+G75*
+G02*
+X74157840Y-69474080I0J-317500D01*
+G01*
+X74157840Y-76459080D01*
+G75*
+G02*
+X73840340Y-76776580I-317500J0D01*
+G01*
+X73205340Y-76776580D01*
+G75*
+G02*
+X72887840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X70347840Y-76459080D02*
+X70347840Y-69474080D01*
+G75*
+G02*
+X70665340Y-69156580I317500J0D01*
+G01*
+X71300340Y-69156580D01*
+G75*
+G02*
+X71617840Y-69474080I0J-317500D01*
+G01*
+X71617840Y-76459080D01*
+G75*
+G02*
+X71300340Y-76776580I-317500J0D01*
+G01*
+X70665340Y-76776580D01*
+G75*
+G02*
+X70347840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X67807840Y-76459080D02*
+X67807840Y-69474080D01*
+G75*
+G02*
+X68125340Y-69156580I317500J0D01*
+G01*
+X68760340Y-69156580D01*
+G75*
+G02*
+X69077840Y-69474080I0J-317500D01*
+G01*
+X69077840Y-76459080D01*
+G75*
+G02*
+X68760340Y-76776580I-317500J0D01*
+G01*
+X68125340Y-76776580D01*
+G75*
+G02*
+X67807840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X65267840Y-76459080D02*
+X65267840Y-69474080D01*
+G75*
+G02*
+X65585340Y-69156580I317500J0D01*
+G01*
+X66220340Y-69156580D01*
+G75*
+G02*
+X66537840Y-69474080I0J-317500D01*
+G01*
+X66537840Y-76459080D01*
+G75*
+G02*
+X66220340Y-76776580I-317500J0D01*
+G01*
+X65585340Y-76776580D01*
+G75*
+G02*
+X65267840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X62727840Y-76459080D02*
+X62727840Y-69474080D01*
+G75*
+G02*
+X63045340Y-69156580I317500J0D01*
+G01*
+X63680340Y-69156580D01*
+G75*
+G02*
+X63997840Y-69474080I0J-317500D01*
+G01*
+X63997840Y-76459080D01*
+G75*
+G02*
+X63680340Y-76776580I-317500J0D01*
+G01*
+X63045340Y-76776580D01*
+G75*
+G02*
+X62727840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X60187840Y-76459080D02*
+X60187840Y-69474080D01*
+G75*
+G02*
+X60505340Y-69156580I317500J0D01*
+G01*
+X61140340Y-69156580D01*
+G75*
+G02*
+X61457840Y-69474080I0J-317500D01*
+G01*
+X61457840Y-76459080D01*
+G75*
+G02*
+X61140340Y-76776580I-317500J0D01*
+G01*
+X60505340Y-76776580D01*
+G75*
+G02*
+X60187840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X57647840Y-76459080D02*
+X57647840Y-69474080D01*
+G75*
+G02*
+X57965340Y-69156580I317500J0D01*
+G01*
+X58600340Y-69156580D01*
+G75*
+G02*
+X58917840Y-69474080I0J-317500D01*
+G01*
+X58917840Y-76459080D01*
+G75*
+G02*
+X58600340Y-76776580I-317500J0D01*
+G01*
+X57965340Y-76776580D01*
+G75*
+G02*
+X57647840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X55107840Y-76459080D02*
+X55107840Y-69474080D01*
+G75*
+G02*
+X55425340Y-69156580I317500J0D01*
+G01*
+X56060340Y-69156580D01*
+G75*
+G02*
+X56377840Y-69474080I0J-317500D01*
+G01*
+X56377840Y-76459080D01*
+G75*
+G02*
+X56060340Y-76776580I-317500J0D01*
+G01*
+X55425340Y-76776580D01*
+G75*
+G02*
+X55107840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
 D12*
 X36873180Y-25057100D03*
 D13*
@@ -1801,7 +2404,7 @@ X71363840Y-54932580D03*
 X68823840Y-54932580D03*
 X66283840Y-54932580D03*
 X63743840Y-54932580D03*
-D15*
+D14*
 X59552840Y-59758580D03*
 X59552840Y-57258580D03*
 X114035840Y-59758580D03*
@@ -1818,10 +2421,10 @@ X63743840Y-52392580D03*
 X66243840Y-52392580D03*
 X112003840Y-50106580D03*
 X114503840Y-50106580D03*
-D16*
+D15*
 X96850200Y-59055000D03*
 X89397841Y-41772841D03*
-D17*
+D16*
 X110327440Y-59489340D03*
 X83593851Y-60142120D03*
 X56642000Y-42926000D03*
@@ -1921,7 +2524,7 @@ X79364840Y-56243220D03*
 X111622840Y-68267580D03*
 X114162840Y-68013580D03*
 X115277900Y-54211220D03*
-D18*
+D17*
 X63743840Y-52392580D02*
 X63743840Y-54932580D01*
 X95620840Y-57825640D02*
@@ -2016,7 +2619,7 @@ X110860840Y-60433580D02*
 X114035840Y-57258580D01*
 X38879780Y-65163700D02*
 X53261114Y-65163700D01*
-D19*
+D18*
 X110860840Y-31262518D02*
 X110860840Y-39956764D01*
 X110860840Y-39956764D02*
diff --git a/Hardware/ProDOS ROM-Drive-B_Mask.gbr b/Hardware/ProDOS ROM-Drive-B_Mask.gbr
index 3774b82..23c257a 100644
--- a/Hardware/ProDOS ROM-Drive-B_Mask.gbr	
+++ b/Hardware/ProDOS ROM-Drive-B_Mask.gbr	
@@ -1,40 +1,19 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:28-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:28*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-G04 Aperture macros list*
-%AMRoundRect*
-0 Rectangle with rounded corners*
-0 $1 Rounding radius*
-0 $2 $3 $4 $5 $6 $7 $8 $9 X,Y pos of 4 corners*
-0 Add a 4 corners polygon primitive as box body*
-4,1,4,$2,$3,$4,$5,$6,$7,$8,$9,$2,$3,0*
-0 Add four circle primitives for the rounded corners*
-1,1,$1+$1,$2,$3*
-1,1,$1+$1,$4,$5*
-1,1,$1+$1,$6,$7*
-1,1,$1+$1,$8,$9*
-0 Add four rect primitives between the rounded corners*
-20,1,$1+$1,$2,$3,$4,$5,0*
-20,1,$1+$1,$4,$5,$6,$7,0*
-20,1,$1+$1,$6,$7,$8,$9,0*
-20,1,$1+$1,$8,$9,$2,$3,0*%
-G04 Aperture macros list end*
 %ADD10C,0.150000*%
-%ADD11RoundRect,0.051000X-0.800000X-0.800000X0.800000X-0.800000X0.800000X0.800000X-0.800000X0.800000X0*%
-%ADD12O,1.702000X1.702000*%
-%ADD13RoundRect,0.051000X0.800000X-0.800000X0.800000X0.800000X-0.800000X0.800000X-0.800000X-0.800000X0*%
-%ADD14RoundRect,0.368500X-0.317500X-3.492500X0.317500X-3.492500X0.317500X3.492500X-0.317500X3.492500X0*%
-%ADD15C,1.702000*%
+%ADD11O,1.702000X1.702000*%
+%ADD12C,1.702000*%
 G04 APERTURE END LIST*
 D10*
 X118607840Y-76776580D02*
@@ -79,9 +58,31 @@ X53837840Y-76776580D01*
 X53837840Y-69156580D01*
 X118607840Y-69156580D01*
 X118607840Y-76776580D01*
+G36*
+G01*
+X108485840Y-32618580D02*
+X108485840Y-31018580D01*
+G75*
+G02*
+X108536840Y-30967580I51000J0D01*
+G01*
+X110136840Y-30967580D01*
+G75*
+G02*
+X110187840Y-31018580I0J-51000D01*
+G01*
+X110187840Y-32618580D01*
+G75*
+G02*
+X110136840Y-32669580I-51000J0D01*
+G01*
+X108536840Y-32669580D01*
+G75*
+G02*
+X108485840Y-32618580I0J51000D01*
+G01*
+G37*
 D11*
-X109336840Y-31818580D03*
-D12*
 X109336840Y-34358580D03*
 X109336840Y-36898580D03*
 X109336840Y-39438580D03*
@@ -95,9 +96,30 @@ X116956840Y-39438580D03*
 X116956840Y-36898580D03*
 X116956840Y-34358580D03*
 X116956840Y-31818580D03*
-D13*
-X95620840Y-62425580D03*
-D12*
+G36*
+G01*
+X96420840Y-63276580D02*
+X94820840Y-63276580D01*
+G75*
+G02*
+X94769840Y-63225580I0J51000D01*
+G01*
+X94769840Y-61625580D01*
+G75*
+G02*
+X94820840Y-61574580I51000J0D01*
+G01*
+X96420840Y-61574580D01*
+G75*
+G02*
+X96471840Y-61625580I0J-51000D01*
+G01*
+X96471840Y-63225580D01*
+G75*
+G02*
+X96420840Y-63276580I-51000J0D01*
+G01*
+G37*
 X98160840Y-62425580D03*
 X100700840Y-62425580D03*
 X103240840Y-62425580D03*
@@ -111,9 +133,30 @@ X103240840Y-54805580D03*
 X100700840Y-54805580D03*
 X98160840Y-54805580D03*
 X95620840Y-54805580D03*
-D11*
-X61203840Y-26484580D03*
-D12*
+G36*
+G01*
+X60352840Y-27284580D02*
+X60352840Y-25684580D01*
+G75*
+G02*
+X60403840Y-25633580I51000J0D01*
+G01*
+X62003840Y-25633580D01*
+G75*
+G02*
+X62054840Y-25684580I0J-51000D01*
+G01*
+X62054840Y-27284580D01*
+G75*
+G02*
+X62003840Y-27335580I-51000J0D01*
+G01*
+X60403840Y-27335580D01*
+G75*
+G02*
+X60352840Y-27284580I0J51000D01*
+G01*
+G37*
 X61203840Y-29024580D03*
 X61203840Y-31564580D03*
 X61203840Y-34104580D03*
@@ -133,9 +176,30 @@ X68823840Y-34104580D03*
 X68823840Y-31564580D03*
 X68823840Y-29024580D03*
 X68823840Y-26484580D03*
-D11*
-X85841840Y-26484580D03*
-D12*
+G36*
+G01*
+X84990840Y-27284580D02*
+X84990840Y-25684580D01*
+G75*
+G02*
+X85041840Y-25633580I51000J0D01*
+G01*
+X86641840Y-25633580D01*
+G75*
+G02*
+X86692840Y-25684580I0J-51000D01*
+G01*
+X86692840Y-27284580D01*
+G75*
+G02*
+X86641840Y-27335580I-51000J0D01*
+G01*
+X85041840Y-27335580D01*
+G75*
+G02*
+X84990840Y-27284580I0J51000D01*
+G01*
+G37*
 X85841840Y-29024580D03*
 X85841840Y-31564580D03*
 X85841840Y-34104580D03*
@@ -155,9 +219,30 @@ X93461840Y-34104580D03*
 X93461840Y-31564580D03*
 X93461840Y-29024580D03*
 X93461840Y-26484580D03*
-D11*
-X73776840Y-26484580D03*
-D12*
+G36*
+G01*
+X72925840Y-27284580D02*
+X72925840Y-25684580D01*
+G75*
+G02*
+X72976840Y-25633580I51000J0D01*
+G01*
+X74576840Y-25633580D01*
+G75*
+G02*
+X74627840Y-25684580I0J-51000D01*
+G01*
+X74627840Y-27284580D01*
+G75*
+G02*
+X74576840Y-27335580I-51000J0D01*
+G01*
+X72976840Y-27335580D01*
+G75*
+G02*
+X72925840Y-27284580I0J51000D01*
+G01*
+G37*
 X73776840Y-29024580D03*
 X73776840Y-31564580D03*
 X73776840Y-34104580D03*
@@ -177,9 +262,30 @@ X81396840Y-34104580D03*
 X81396840Y-31564580D03*
 X81396840Y-29024580D03*
 X81396840Y-26484580D03*
-D11*
-X97906840Y-26484580D03*
-D12*
+G36*
+G01*
+X97055840Y-27284580D02*
+X97055840Y-25684580D01*
+G75*
+G02*
+X97106840Y-25633580I51000J0D01*
+G01*
+X98706840Y-25633580D01*
+G75*
+G02*
+X98757840Y-25684580I0J-51000D01*
+G01*
+X98757840Y-27284580D01*
+G75*
+G02*
+X98706840Y-27335580I-51000J0D01*
+G01*
+X97106840Y-27335580D01*
+G75*
+G02*
+X97055840Y-27284580I0J51000D01*
+G01*
+G37*
 X97906840Y-29024580D03*
 X97906840Y-31564580D03*
 X97906840Y-34104580D03*
@@ -199,35 +305,630 @@ X105526840Y-34104580D03*
 X105526840Y-31564580D03*
 X105526840Y-29024580D03*
 X105526840Y-26484580D03*
-D14*
-X116702840Y-72966580D03*
-X114162840Y-72966580D03*
-X111622840Y-72966580D03*
-X109082840Y-72966580D03*
-X106542840Y-72966580D03*
-X104002840Y-72966580D03*
-X101462840Y-72966580D03*
-X98922840Y-72966580D03*
-X96382840Y-72966580D03*
-X93842840Y-72966580D03*
-X91302840Y-72966580D03*
-X88762840Y-72966580D03*
-X86222840Y-72966580D03*
-X83682840Y-72966580D03*
-X81142840Y-72966580D03*
-X78602840Y-72966580D03*
-X76062840Y-72966580D03*
-X73522840Y-72966580D03*
-X70982840Y-72966580D03*
-X68442840Y-72966580D03*
-X65902840Y-72966580D03*
-X63362840Y-72966580D03*
-X60822840Y-72966580D03*
-X58282840Y-72966580D03*
-X55742840Y-72966580D03*
-D11*
-X36873180Y-25057100D03*
-D12*
+G36*
+G01*
+X116016840Y-76459080D02*
+X116016840Y-69474080D01*
+G75*
+G02*
+X116385340Y-69105580I368500J0D01*
+G01*
+X117020340Y-69105580D01*
+G75*
+G02*
+X117388840Y-69474080I0J-368500D01*
+G01*
+X117388840Y-76459080D01*
+G75*
+G02*
+X117020340Y-76827580I-368500J0D01*
+G01*
+X116385340Y-76827580D01*
+G75*
+G02*
+X116016840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X113476840Y-76459080D02*
+X113476840Y-69474080D01*
+G75*
+G02*
+X113845340Y-69105580I368500J0D01*
+G01*
+X114480340Y-69105580D01*
+G75*
+G02*
+X114848840Y-69474080I0J-368500D01*
+G01*
+X114848840Y-76459080D01*
+G75*
+G02*
+X114480340Y-76827580I-368500J0D01*
+G01*
+X113845340Y-76827580D01*
+G75*
+G02*
+X113476840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X110936840Y-76459080D02*
+X110936840Y-69474080D01*
+G75*
+G02*
+X111305340Y-69105580I368500J0D01*
+G01*
+X111940340Y-69105580D01*
+G75*
+G02*
+X112308840Y-69474080I0J-368500D01*
+G01*
+X112308840Y-76459080D01*
+G75*
+G02*
+X111940340Y-76827580I-368500J0D01*
+G01*
+X111305340Y-76827580D01*
+G75*
+G02*
+X110936840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X108396840Y-76459080D02*
+X108396840Y-69474080D01*
+G75*
+G02*
+X108765340Y-69105580I368500J0D01*
+G01*
+X109400340Y-69105580D01*
+G75*
+G02*
+X109768840Y-69474080I0J-368500D01*
+G01*
+X109768840Y-76459080D01*
+G75*
+G02*
+X109400340Y-76827580I-368500J0D01*
+G01*
+X108765340Y-76827580D01*
+G75*
+G02*
+X108396840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X105856840Y-76459080D02*
+X105856840Y-69474080D01*
+G75*
+G02*
+X106225340Y-69105580I368500J0D01*
+G01*
+X106860340Y-69105580D01*
+G75*
+G02*
+X107228840Y-69474080I0J-368500D01*
+G01*
+X107228840Y-76459080D01*
+G75*
+G02*
+X106860340Y-76827580I-368500J0D01*
+G01*
+X106225340Y-76827580D01*
+G75*
+G02*
+X105856840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X103316840Y-76459080D02*
+X103316840Y-69474080D01*
+G75*
+G02*
+X103685340Y-69105580I368500J0D01*
+G01*
+X104320340Y-69105580D01*
+G75*
+G02*
+X104688840Y-69474080I0J-368500D01*
+G01*
+X104688840Y-76459080D01*
+G75*
+G02*
+X104320340Y-76827580I-368500J0D01*
+G01*
+X103685340Y-76827580D01*
+G75*
+G02*
+X103316840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X100776840Y-76459080D02*
+X100776840Y-69474080D01*
+G75*
+G02*
+X101145340Y-69105580I368500J0D01*
+G01*
+X101780340Y-69105580D01*
+G75*
+G02*
+X102148840Y-69474080I0J-368500D01*
+G01*
+X102148840Y-76459080D01*
+G75*
+G02*
+X101780340Y-76827580I-368500J0D01*
+G01*
+X101145340Y-76827580D01*
+G75*
+G02*
+X100776840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X98236840Y-76459080D02*
+X98236840Y-69474080D01*
+G75*
+G02*
+X98605340Y-69105580I368500J0D01*
+G01*
+X99240340Y-69105580D01*
+G75*
+G02*
+X99608840Y-69474080I0J-368500D01*
+G01*
+X99608840Y-76459080D01*
+G75*
+G02*
+X99240340Y-76827580I-368500J0D01*
+G01*
+X98605340Y-76827580D01*
+G75*
+G02*
+X98236840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X95696840Y-76459080D02*
+X95696840Y-69474080D01*
+G75*
+G02*
+X96065340Y-69105580I368500J0D01*
+G01*
+X96700340Y-69105580D01*
+G75*
+G02*
+X97068840Y-69474080I0J-368500D01*
+G01*
+X97068840Y-76459080D01*
+G75*
+G02*
+X96700340Y-76827580I-368500J0D01*
+G01*
+X96065340Y-76827580D01*
+G75*
+G02*
+X95696840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X93156840Y-76459080D02*
+X93156840Y-69474080D01*
+G75*
+G02*
+X93525340Y-69105580I368500J0D01*
+G01*
+X94160340Y-69105580D01*
+G75*
+G02*
+X94528840Y-69474080I0J-368500D01*
+G01*
+X94528840Y-76459080D01*
+G75*
+G02*
+X94160340Y-76827580I-368500J0D01*
+G01*
+X93525340Y-76827580D01*
+G75*
+G02*
+X93156840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X90616840Y-76459080D02*
+X90616840Y-69474080D01*
+G75*
+G02*
+X90985340Y-69105580I368500J0D01*
+G01*
+X91620340Y-69105580D01*
+G75*
+G02*
+X91988840Y-69474080I0J-368500D01*
+G01*
+X91988840Y-76459080D01*
+G75*
+G02*
+X91620340Y-76827580I-368500J0D01*
+G01*
+X90985340Y-76827580D01*
+G75*
+G02*
+X90616840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X88076840Y-76459080D02*
+X88076840Y-69474080D01*
+G75*
+G02*
+X88445340Y-69105580I368500J0D01*
+G01*
+X89080340Y-69105580D01*
+G75*
+G02*
+X89448840Y-69474080I0J-368500D01*
+G01*
+X89448840Y-76459080D01*
+G75*
+G02*
+X89080340Y-76827580I-368500J0D01*
+G01*
+X88445340Y-76827580D01*
+G75*
+G02*
+X88076840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X85536840Y-76459080D02*
+X85536840Y-69474080D01*
+G75*
+G02*
+X85905340Y-69105580I368500J0D01*
+G01*
+X86540340Y-69105580D01*
+G75*
+G02*
+X86908840Y-69474080I0J-368500D01*
+G01*
+X86908840Y-76459080D01*
+G75*
+G02*
+X86540340Y-76827580I-368500J0D01*
+G01*
+X85905340Y-76827580D01*
+G75*
+G02*
+X85536840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X82996840Y-76459080D02*
+X82996840Y-69474080D01*
+G75*
+G02*
+X83365340Y-69105580I368500J0D01*
+G01*
+X84000340Y-69105580D01*
+G75*
+G02*
+X84368840Y-69474080I0J-368500D01*
+G01*
+X84368840Y-76459080D01*
+G75*
+G02*
+X84000340Y-76827580I-368500J0D01*
+G01*
+X83365340Y-76827580D01*
+G75*
+G02*
+X82996840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X80456840Y-76459080D02*
+X80456840Y-69474080D01*
+G75*
+G02*
+X80825340Y-69105580I368500J0D01*
+G01*
+X81460340Y-69105580D01*
+G75*
+G02*
+X81828840Y-69474080I0J-368500D01*
+G01*
+X81828840Y-76459080D01*
+G75*
+G02*
+X81460340Y-76827580I-368500J0D01*
+G01*
+X80825340Y-76827580D01*
+G75*
+G02*
+X80456840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X77916840Y-76459080D02*
+X77916840Y-69474080D01*
+G75*
+G02*
+X78285340Y-69105580I368500J0D01*
+G01*
+X78920340Y-69105580D01*
+G75*
+G02*
+X79288840Y-69474080I0J-368500D01*
+G01*
+X79288840Y-76459080D01*
+G75*
+G02*
+X78920340Y-76827580I-368500J0D01*
+G01*
+X78285340Y-76827580D01*
+G75*
+G02*
+X77916840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X75376840Y-76459080D02*
+X75376840Y-69474080D01*
+G75*
+G02*
+X75745340Y-69105580I368500J0D01*
+G01*
+X76380340Y-69105580D01*
+G75*
+G02*
+X76748840Y-69474080I0J-368500D01*
+G01*
+X76748840Y-76459080D01*
+G75*
+G02*
+X76380340Y-76827580I-368500J0D01*
+G01*
+X75745340Y-76827580D01*
+G75*
+G02*
+X75376840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X72836840Y-76459080D02*
+X72836840Y-69474080D01*
+G75*
+G02*
+X73205340Y-69105580I368500J0D01*
+G01*
+X73840340Y-69105580D01*
+G75*
+G02*
+X74208840Y-69474080I0J-368500D01*
+G01*
+X74208840Y-76459080D01*
+G75*
+G02*
+X73840340Y-76827580I-368500J0D01*
+G01*
+X73205340Y-76827580D01*
+G75*
+G02*
+X72836840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X70296840Y-76459080D02*
+X70296840Y-69474080D01*
+G75*
+G02*
+X70665340Y-69105580I368500J0D01*
+G01*
+X71300340Y-69105580D01*
+G75*
+G02*
+X71668840Y-69474080I0J-368500D01*
+G01*
+X71668840Y-76459080D01*
+G75*
+G02*
+X71300340Y-76827580I-368500J0D01*
+G01*
+X70665340Y-76827580D01*
+G75*
+G02*
+X70296840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X67756840Y-76459080D02*
+X67756840Y-69474080D01*
+G75*
+G02*
+X68125340Y-69105580I368500J0D01*
+G01*
+X68760340Y-69105580D01*
+G75*
+G02*
+X69128840Y-69474080I0J-368500D01*
+G01*
+X69128840Y-76459080D01*
+G75*
+G02*
+X68760340Y-76827580I-368500J0D01*
+G01*
+X68125340Y-76827580D01*
+G75*
+G02*
+X67756840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X65216840Y-76459080D02*
+X65216840Y-69474080D01*
+G75*
+G02*
+X65585340Y-69105580I368500J0D01*
+G01*
+X66220340Y-69105580D01*
+G75*
+G02*
+X66588840Y-69474080I0J-368500D01*
+G01*
+X66588840Y-76459080D01*
+G75*
+G02*
+X66220340Y-76827580I-368500J0D01*
+G01*
+X65585340Y-76827580D01*
+G75*
+G02*
+X65216840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X62676840Y-76459080D02*
+X62676840Y-69474080D01*
+G75*
+G02*
+X63045340Y-69105580I368500J0D01*
+G01*
+X63680340Y-69105580D01*
+G75*
+G02*
+X64048840Y-69474080I0J-368500D01*
+G01*
+X64048840Y-76459080D01*
+G75*
+G02*
+X63680340Y-76827580I-368500J0D01*
+G01*
+X63045340Y-76827580D01*
+G75*
+G02*
+X62676840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X60136840Y-76459080D02*
+X60136840Y-69474080D01*
+G75*
+G02*
+X60505340Y-69105580I368500J0D01*
+G01*
+X61140340Y-69105580D01*
+G75*
+G02*
+X61508840Y-69474080I0J-368500D01*
+G01*
+X61508840Y-76459080D01*
+G75*
+G02*
+X61140340Y-76827580I-368500J0D01*
+G01*
+X60505340Y-76827580D01*
+G75*
+G02*
+X60136840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X57596840Y-76459080D02*
+X57596840Y-69474080D01*
+G75*
+G02*
+X57965340Y-69105580I368500J0D01*
+G01*
+X58600340Y-69105580D01*
+G75*
+G02*
+X58968840Y-69474080I0J-368500D01*
+G01*
+X58968840Y-76459080D01*
+G75*
+G02*
+X58600340Y-76827580I-368500J0D01*
+G01*
+X57965340Y-76827580D01*
+G75*
+G02*
+X57596840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X55056840Y-76459080D02*
+X55056840Y-69474080D01*
+G75*
+G02*
+X55425340Y-69105580I368500J0D01*
+G01*
+X56060340Y-69105580D01*
+G75*
+G02*
+X56428840Y-69474080I0J-368500D01*
+G01*
+X56428840Y-76459080D01*
+G75*
+G02*
+X56060340Y-76827580I-368500J0D01*
+G01*
+X55425340Y-76827580D01*
+G75*
+G02*
+X55056840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X36022180Y-25857100D02*
+X36022180Y-24257100D01*
+G75*
+G02*
+X36073180Y-24206100I51000J0D01*
+G01*
+X37673180Y-24206100D01*
+G75*
+G02*
+X37724180Y-24257100I0J-51000D01*
+G01*
+X37724180Y-25857100D01*
+G75*
+G02*
+X37673180Y-25908100I-51000J0D01*
+G01*
+X36073180Y-25908100D01*
+G75*
+G02*
+X36022180Y-25857100I0J51000D01*
+G01*
+G37*
 X36873180Y-27597100D03*
 X36873180Y-30137100D03*
 X36873180Y-32677100D03*
@@ -259,9 +960,30 @@ X52113180Y-32677100D03*
 X52113180Y-30137100D03*
 X52113180Y-27597100D03*
 X52113180Y-25057100D03*
-D13*
-X63743840Y-62552580D03*
-D12*
+G36*
+G01*
+X64543840Y-63403580D02*
+X62943840Y-63403580D01*
+G75*
+G02*
+X62892840Y-63352580I0J51000D01*
+G01*
+X62892840Y-61752580D01*
+G75*
+G02*
+X62943840Y-61701580I51000J0D01*
+G01*
+X64543840Y-61701580D01*
+G75*
+G02*
+X64594840Y-61752580I0J-51000D01*
+G01*
+X64594840Y-63352580D01*
+G75*
+G02*
+X64543840Y-63403580I-51000J0D01*
+G01*
+G37*
 X66283840Y-62552580D03*
 X68823840Y-62552580D03*
 X71363840Y-62552580D03*
@@ -281,7 +1003,7 @@ X71363840Y-54932580D03*
 X68823840Y-54932580D03*
 X66283840Y-54932580D03*
 X63743840Y-54932580D03*
-D15*
+D12*
 X59552840Y-59758580D03*
 X59552840Y-57258580D03*
 X114035840Y-59758580D03*
diff --git a/Hardware/ProDOS ROM-Drive-B_Silkscreen.gbr b/Hardware/ProDOS ROM-Drive-B_Silkscreen.gbr
index 85fa873..88272ec 100644
--- a/Hardware/ProDOS ROM-Drive-B_Silkscreen.gbr	
+++ b/Hardware/ProDOS ROM-Drive-B_Silkscreen.gbr	
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:27-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:27*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Hardware/ProDOS ROM-Drive-Edge_Cuts.gbr b/Hardware/ProDOS ROM-Drive-Edge_Cuts.gbr
index 80093ec..f704150 100644
--- a/Hardware/ProDOS ROM-Drive-Edge_Cuts.gbr	
+++ b/Hardware/ProDOS ROM-Drive-Edge_Cuts.gbr	
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:28-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:28*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Hardware/ProDOS ROM-Drive-F_Cu.gbr b/Hardware/ProDOS ROM-Drive-F_Cu.gbr
index 95e8076..ad65b4f 100644
--- a/Hardware/ProDOS ROM-Drive-F_Cu.gbr	
+++ b/Hardware/ProDOS ROM-Drive-F_Cu.gbr	
@@ -1,57 +1,36 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:27-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:27*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-G04 Aperture macros list*
-%AMRoundRect*
-0 Rectangle with rounded corners*
-0 $1 Rounding radius*
-0 $2 $3 $4 $5 $6 $7 $8 $9 X,Y pos of 4 corners*
-0 Add a 4 corners polygon primitive as box body*
-4,1,4,$2,$3,$4,$5,$6,$7,$8,$9,$2,$3,0*
-0 Add four circle primitives for the rounded corners*
-1,1,$1+$1,$2,$3*
-1,1,$1+$1,$4,$5*
-1,1,$1+$1,$6,$7*
-1,1,$1+$1,$8,$9*
-0 Add four rect primitives between the rounded corners*
-20,1,$1+$1,$2,$3,$4,$5,0*
-20,1,$1+$1,$4,$5,$6,$7,0*
-20,1,$1+$1,$6,$7,$8,$9,0*
-20,1,$1+$1,$8,$9,$2,$3,0*%
-G04 Aperture macros list end*
 G04 #@! TA.AperFunction,ComponentPad*
 %ADD10R,1.600000X1.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
 %ADD11O,1.600000X1.600000*%
 G04 #@! TD*
-G04 #@! TA.AperFunction,ConnectorPad*
-%ADD12RoundRect,0.317500X-0.317500X-3.492500X0.317500X-3.492500X0.317500X3.492500X-0.317500X3.492500X0*%
-G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD13C,1.600000*%
+%ADD12C,1.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD14C,1.270000*%
+%ADD13C,1.270000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD15C,0.762000*%
+%ADD14C,0.762000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD16C,0.812800*%
+%ADD15C,0.812800*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD17C,0.177800*%
+%ADD16C,0.177800*%
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
@@ -174,32 +153,656 @@ X105526840Y-34104580D03*
 X105526840Y-31564580D03*
 X105526840Y-29024580D03*
 X105526840Y-26484580D03*
-D12*
-X55742840Y-72966580D03*
-X58282840Y-72966580D03*
-X60822840Y-72966580D03*
-X63362840Y-72966580D03*
-X65902840Y-72966580D03*
-X68442840Y-72966580D03*
-X70982840Y-72966580D03*
-X73522840Y-72966580D03*
-X76062840Y-72966580D03*
-X78602840Y-72966580D03*
-X81142840Y-72966580D03*
-X83682840Y-72966580D03*
-X86222840Y-72966580D03*
-X88762840Y-72966580D03*
-X91302840Y-72966580D03*
-X93842840Y-72966580D03*
-X96382840Y-72966580D03*
-X98922840Y-72966580D03*
-X101462840Y-72966580D03*
-X104002840Y-72966580D03*
-X106542840Y-72966580D03*
-X109082840Y-72966580D03*
-X111622840Y-72966580D03*
-X114162840Y-72966580D03*
-X116702840Y-72966580D03*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X55107840Y-76459080D02*
+X55107840Y-69474080D01*
+G75*
+G02*
+X55425340Y-69156580I317500J0D01*
+G01*
+X56060340Y-69156580D01*
+G75*
+G02*
+X56377840Y-69474080I0J-317500D01*
+G01*
+X56377840Y-76459080D01*
+G75*
+G02*
+X56060340Y-76776580I-317500J0D01*
+G01*
+X55425340Y-76776580D01*
+G75*
+G02*
+X55107840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X57647840Y-76459080D02*
+X57647840Y-69474080D01*
+G75*
+G02*
+X57965340Y-69156580I317500J0D01*
+G01*
+X58600340Y-69156580D01*
+G75*
+G02*
+X58917840Y-69474080I0J-317500D01*
+G01*
+X58917840Y-76459080D01*
+G75*
+G02*
+X58600340Y-76776580I-317500J0D01*
+G01*
+X57965340Y-76776580D01*
+G75*
+G02*
+X57647840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X60187840Y-76459080D02*
+X60187840Y-69474080D01*
+G75*
+G02*
+X60505340Y-69156580I317500J0D01*
+G01*
+X61140340Y-69156580D01*
+G75*
+G02*
+X61457840Y-69474080I0J-317500D01*
+G01*
+X61457840Y-76459080D01*
+G75*
+G02*
+X61140340Y-76776580I-317500J0D01*
+G01*
+X60505340Y-76776580D01*
+G75*
+G02*
+X60187840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X62727840Y-76459080D02*
+X62727840Y-69474080D01*
+G75*
+G02*
+X63045340Y-69156580I317500J0D01*
+G01*
+X63680340Y-69156580D01*
+G75*
+G02*
+X63997840Y-69474080I0J-317500D01*
+G01*
+X63997840Y-76459080D01*
+G75*
+G02*
+X63680340Y-76776580I-317500J0D01*
+G01*
+X63045340Y-76776580D01*
+G75*
+G02*
+X62727840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X65267840Y-76459080D02*
+X65267840Y-69474080D01*
+G75*
+G02*
+X65585340Y-69156580I317500J0D01*
+G01*
+X66220340Y-69156580D01*
+G75*
+G02*
+X66537840Y-69474080I0J-317500D01*
+G01*
+X66537840Y-76459080D01*
+G75*
+G02*
+X66220340Y-76776580I-317500J0D01*
+G01*
+X65585340Y-76776580D01*
+G75*
+G02*
+X65267840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X67807840Y-76459080D02*
+X67807840Y-69474080D01*
+G75*
+G02*
+X68125340Y-69156580I317500J0D01*
+G01*
+X68760340Y-69156580D01*
+G75*
+G02*
+X69077840Y-69474080I0J-317500D01*
+G01*
+X69077840Y-76459080D01*
+G75*
+G02*
+X68760340Y-76776580I-317500J0D01*
+G01*
+X68125340Y-76776580D01*
+G75*
+G02*
+X67807840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X70347840Y-76459080D02*
+X70347840Y-69474080D01*
+G75*
+G02*
+X70665340Y-69156580I317500J0D01*
+G01*
+X71300340Y-69156580D01*
+G75*
+G02*
+X71617840Y-69474080I0J-317500D01*
+G01*
+X71617840Y-76459080D01*
+G75*
+G02*
+X71300340Y-76776580I-317500J0D01*
+G01*
+X70665340Y-76776580D01*
+G75*
+G02*
+X70347840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X72887840Y-76459080D02*
+X72887840Y-69474080D01*
+G75*
+G02*
+X73205340Y-69156580I317500J0D01*
+G01*
+X73840340Y-69156580D01*
+G75*
+G02*
+X74157840Y-69474080I0J-317500D01*
+G01*
+X74157840Y-76459080D01*
+G75*
+G02*
+X73840340Y-76776580I-317500J0D01*
+G01*
+X73205340Y-76776580D01*
+G75*
+G02*
+X72887840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X75427840Y-76459080D02*
+X75427840Y-69474080D01*
+G75*
+G02*
+X75745340Y-69156580I317500J0D01*
+G01*
+X76380340Y-69156580D01*
+G75*
+G02*
+X76697840Y-69474080I0J-317500D01*
+G01*
+X76697840Y-76459080D01*
+G75*
+G02*
+X76380340Y-76776580I-317500J0D01*
+G01*
+X75745340Y-76776580D01*
+G75*
+G02*
+X75427840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X77967840Y-76459080D02*
+X77967840Y-69474080D01*
+G75*
+G02*
+X78285340Y-69156580I317500J0D01*
+G01*
+X78920340Y-69156580D01*
+G75*
+G02*
+X79237840Y-69474080I0J-317500D01*
+G01*
+X79237840Y-76459080D01*
+G75*
+G02*
+X78920340Y-76776580I-317500J0D01*
+G01*
+X78285340Y-76776580D01*
+G75*
+G02*
+X77967840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X80507840Y-76459080D02*
+X80507840Y-69474080D01*
+G75*
+G02*
+X80825340Y-69156580I317500J0D01*
+G01*
+X81460340Y-69156580D01*
+G75*
+G02*
+X81777840Y-69474080I0J-317500D01*
+G01*
+X81777840Y-76459080D01*
+G75*
+G02*
+X81460340Y-76776580I-317500J0D01*
+G01*
+X80825340Y-76776580D01*
+G75*
+G02*
+X80507840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X83047840Y-76459080D02*
+X83047840Y-69474080D01*
+G75*
+G02*
+X83365340Y-69156580I317500J0D01*
+G01*
+X84000340Y-69156580D01*
+G75*
+G02*
+X84317840Y-69474080I0J-317500D01*
+G01*
+X84317840Y-76459080D01*
+G75*
+G02*
+X84000340Y-76776580I-317500J0D01*
+G01*
+X83365340Y-76776580D01*
+G75*
+G02*
+X83047840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X85587840Y-76459080D02*
+X85587840Y-69474080D01*
+G75*
+G02*
+X85905340Y-69156580I317500J0D01*
+G01*
+X86540340Y-69156580D01*
+G75*
+G02*
+X86857840Y-69474080I0J-317500D01*
+G01*
+X86857840Y-76459080D01*
+G75*
+G02*
+X86540340Y-76776580I-317500J0D01*
+G01*
+X85905340Y-76776580D01*
+G75*
+G02*
+X85587840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X88127840Y-76459080D02*
+X88127840Y-69474080D01*
+G75*
+G02*
+X88445340Y-69156580I317500J0D01*
+G01*
+X89080340Y-69156580D01*
+G75*
+G02*
+X89397840Y-69474080I0J-317500D01*
+G01*
+X89397840Y-76459080D01*
+G75*
+G02*
+X89080340Y-76776580I-317500J0D01*
+G01*
+X88445340Y-76776580D01*
+G75*
+G02*
+X88127840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X90667840Y-76459080D02*
+X90667840Y-69474080D01*
+G75*
+G02*
+X90985340Y-69156580I317500J0D01*
+G01*
+X91620340Y-69156580D01*
+G75*
+G02*
+X91937840Y-69474080I0J-317500D01*
+G01*
+X91937840Y-76459080D01*
+G75*
+G02*
+X91620340Y-76776580I-317500J0D01*
+G01*
+X90985340Y-76776580D01*
+G75*
+G02*
+X90667840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X93207840Y-76459080D02*
+X93207840Y-69474080D01*
+G75*
+G02*
+X93525340Y-69156580I317500J0D01*
+G01*
+X94160340Y-69156580D01*
+G75*
+G02*
+X94477840Y-69474080I0J-317500D01*
+G01*
+X94477840Y-76459080D01*
+G75*
+G02*
+X94160340Y-76776580I-317500J0D01*
+G01*
+X93525340Y-76776580D01*
+G75*
+G02*
+X93207840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X95747840Y-76459080D02*
+X95747840Y-69474080D01*
+G75*
+G02*
+X96065340Y-69156580I317500J0D01*
+G01*
+X96700340Y-69156580D01*
+G75*
+G02*
+X97017840Y-69474080I0J-317500D01*
+G01*
+X97017840Y-76459080D01*
+G75*
+G02*
+X96700340Y-76776580I-317500J0D01*
+G01*
+X96065340Y-76776580D01*
+G75*
+G02*
+X95747840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X98287840Y-76459080D02*
+X98287840Y-69474080D01*
+G75*
+G02*
+X98605340Y-69156580I317500J0D01*
+G01*
+X99240340Y-69156580D01*
+G75*
+G02*
+X99557840Y-69474080I0J-317500D01*
+G01*
+X99557840Y-76459080D01*
+G75*
+G02*
+X99240340Y-76776580I-317500J0D01*
+G01*
+X98605340Y-76776580D01*
+G75*
+G02*
+X98287840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X100827840Y-76459080D02*
+X100827840Y-69474080D01*
+G75*
+G02*
+X101145340Y-69156580I317500J0D01*
+G01*
+X101780340Y-69156580D01*
+G75*
+G02*
+X102097840Y-69474080I0J-317500D01*
+G01*
+X102097840Y-76459080D01*
+G75*
+G02*
+X101780340Y-76776580I-317500J0D01*
+G01*
+X101145340Y-76776580D01*
+G75*
+G02*
+X100827840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X103367840Y-76459080D02*
+X103367840Y-69474080D01*
+G75*
+G02*
+X103685340Y-69156580I317500J0D01*
+G01*
+X104320340Y-69156580D01*
+G75*
+G02*
+X104637840Y-69474080I0J-317500D01*
+G01*
+X104637840Y-76459080D01*
+G75*
+G02*
+X104320340Y-76776580I-317500J0D01*
+G01*
+X103685340Y-76776580D01*
+G75*
+G02*
+X103367840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X105907840Y-76459080D02*
+X105907840Y-69474080D01*
+G75*
+G02*
+X106225340Y-69156580I317500J0D01*
+G01*
+X106860340Y-69156580D01*
+G75*
+G02*
+X107177840Y-69474080I0J-317500D01*
+G01*
+X107177840Y-76459080D01*
+G75*
+G02*
+X106860340Y-76776580I-317500J0D01*
+G01*
+X106225340Y-76776580D01*
+G75*
+G02*
+X105907840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X108447840Y-76459080D02*
+X108447840Y-69474080D01*
+G75*
+G02*
+X108765340Y-69156580I317500J0D01*
+G01*
+X109400340Y-69156580D01*
+G75*
+G02*
+X109717840Y-69474080I0J-317500D01*
+G01*
+X109717840Y-76459080D01*
+G75*
+G02*
+X109400340Y-76776580I-317500J0D01*
+G01*
+X108765340Y-76776580D01*
+G75*
+G02*
+X108447840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X110987840Y-76459080D02*
+X110987840Y-69474080D01*
+G75*
+G02*
+X111305340Y-69156580I317500J0D01*
+G01*
+X111940340Y-69156580D01*
+G75*
+G02*
+X112257840Y-69474080I0J-317500D01*
+G01*
+X112257840Y-76459080D01*
+G75*
+G02*
+X111940340Y-76776580I-317500J0D01*
+G01*
+X111305340Y-76776580D01*
+G75*
+G02*
+X110987840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X113527840Y-76459080D02*
+X113527840Y-69474080D01*
+G75*
+G02*
+X113845340Y-69156580I317500J0D01*
+G01*
+X114480340Y-69156580D01*
+G75*
+G02*
+X114797840Y-69474080I0J-317500D01*
+G01*
+X114797840Y-76459080D01*
+G75*
+G02*
+X114480340Y-76776580I-317500J0D01*
+G01*
+X113845340Y-76776580D01*
+G75*
+G02*
+X113527840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,ConnectorPad*
+G36*
+G01*
+X116067840Y-76459080D02*
+X116067840Y-69474080D01*
+G75*
+G02*
+X116385340Y-69156580I317500J0D01*
+G01*
+X117020340Y-69156580D01*
+G75*
+G02*
+X117337840Y-69474080I0J-317500D01*
+G01*
+X117337840Y-76459080D01*
+G75*
+G02*
+X117020340Y-76776580I-317500J0D01*
+G01*
+X116385340Y-76776580D01*
+G75*
+G02*
+X116067840Y-76459080I0J317500D01*
+G01*
+G37*
+G04 #@! TD.AperFunction*
 D10*
 X36873180Y-25057100D03*
 D11*
@@ -256,7 +859,7 @@ X71363840Y-54932580D03*
 X68823840Y-54932580D03*
 X66283840Y-54932580D03*
 X63743840Y-54932580D03*
-D13*
+D12*
 X59552840Y-59758580D03*
 X59552840Y-57258580D03*
 X114035840Y-59758580D03*
@@ -273,10 +876,10 @@ X63743840Y-52392580D03*
 X66243840Y-52392580D03*
 X112003840Y-50106580D03*
 X114503840Y-50106580D03*
-D14*
+D13*
 X96850200Y-59055000D03*
 X89397841Y-41772841D03*
-D15*
+D14*
 X110327440Y-59489340D03*
 X83593851Y-60142120D03*
 X56642000Y-42926000D03*
@@ -376,7 +979,7 @@ X79364840Y-56243220D03*
 X111622840Y-68267580D03*
 X114162840Y-68013580D03*
 X115277900Y-54211220D03*
-D16*
+D15*
 X89349580Y-41724580D02*
 X89397841Y-41772841D01*
 X116702840Y-62425580D02*
@@ -503,7 +1106,7 @@ X87960840Y-49344580D02*
 X91008840Y-52392580D01*
 X80290030Y-51173390D02*
 X78943840Y-52519580D01*
-D17*
+D16*
 X63743840Y-62552580D02*
 X64721640Y-62552580D01*
 X65915341Y-61358879D02*
diff --git a/Hardware/ProDOS ROM-Drive-F_Mask.gbr b/Hardware/ProDOS ROM-Drive-F_Mask.gbr
index 72ae1d9..5e459a6 100644
--- a/Hardware/ProDOS ROM-Drive-F_Mask.gbr	
+++ b/Hardware/ProDOS ROM-Drive-F_Mask.gbr	
@@ -1,40 +1,19 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:27-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:27*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-G04 Aperture macros list*
-%AMRoundRect*
-0 Rectangle with rounded corners*
-0 $1 Rounding radius*
-0 $2 $3 $4 $5 $6 $7 $8 $9 X,Y pos of 4 corners*
-0 Add a 4 corners polygon primitive as box body*
-4,1,4,$2,$3,$4,$5,$6,$7,$8,$9,$2,$3,0*
-0 Add four circle primitives for the rounded corners*
-1,1,$1+$1,$2,$3*
-1,1,$1+$1,$4,$5*
-1,1,$1+$1,$6,$7*
-1,1,$1+$1,$8,$9*
-0 Add four rect primitives between the rounded corners*
-20,1,$1+$1,$2,$3,$4,$5,0*
-20,1,$1+$1,$4,$5,$6,$7,0*
-20,1,$1+$1,$6,$7,$8,$9,0*
-20,1,$1+$1,$8,$9,$2,$3,0*%
-G04 Aperture macros list end*
 %ADD10C,0.150000*%
-%ADD11RoundRect,0.051000X-0.800000X-0.800000X0.800000X-0.800000X0.800000X0.800000X-0.800000X0.800000X0*%
-%ADD12O,1.702000X1.702000*%
-%ADD13RoundRect,0.051000X0.800000X-0.800000X0.800000X0.800000X-0.800000X0.800000X-0.800000X-0.800000X0*%
-%ADD14RoundRect,0.368500X-0.317500X-3.492500X0.317500X-3.492500X0.317500X3.492500X-0.317500X3.492500X0*%
-%ADD15C,1.702000*%
+%ADD11O,1.702000X1.702000*%
+%ADD12C,1.702000*%
 G04 APERTURE END LIST*
 D10*
 X118607840Y-76776580D02*
@@ -79,9 +58,31 @@ X53837840Y-76776580D01*
 X53837840Y-69156580D01*
 X118607840Y-69156580D01*
 X118607840Y-76776580D01*
+G36*
+G01*
+X108485840Y-32618580D02*
+X108485840Y-31018580D01*
+G75*
+G02*
+X108536840Y-30967580I51000J0D01*
+G01*
+X110136840Y-30967580D01*
+G75*
+G02*
+X110187840Y-31018580I0J-51000D01*
+G01*
+X110187840Y-32618580D01*
+G75*
+G02*
+X110136840Y-32669580I-51000J0D01*
+G01*
+X108536840Y-32669580D01*
+G75*
+G02*
+X108485840Y-32618580I0J51000D01*
+G01*
+G37*
 D11*
-X109336840Y-31818580D03*
-D12*
 X109336840Y-34358580D03*
 X109336840Y-36898580D03*
 X109336840Y-39438580D03*
@@ -95,9 +96,30 @@ X116956840Y-39438580D03*
 X116956840Y-36898580D03*
 X116956840Y-34358580D03*
 X116956840Y-31818580D03*
-D13*
-X95620840Y-62425580D03*
-D12*
+G36*
+G01*
+X96420840Y-63276580D02*
+X94820840Y-63276580D01*
+G75*
+G02*
+X94769840Y-63225580I0J51000D01*
+G01*
+X94769840Y-61625580D01*
+G75*
+G02*
+X94820840Y-61574580I51000J0D01*
+G01*
+X96420840Y-61574580D01*
+G75*
+G02*
+X96471840Y-61625580I0J-51000D01*
+G01*
+X96471840Y-63225580D01*
+G75*
+G02*
+X96420840Y-63276580I-51000J0D01*
+G01*
+G37*
 X98160840Y-62425580D03*
 X100700840Y-62425580D03*
 X103240840Y-62425580D03*
@@ -111,9 +133,30 @@ X103240840Y-54805580D03*
 X100700840Y-54805580D03*
 X98160840Y-54805580D03*
 X95620840Y-54805580D03*
-D11*
-X61203840Y-26484580D03*
-D12*
+G36*
+G01*
+X60352840Y-27284580D02*
+X60352840Y-25684580D01*
+G75*
+G02*
+X60403840Y-25633580I51000J0D01*
+G01*
+X62003840Y-25633580D01*
+G75*
+G02*
+X62054840Y-25684580I0J-51000D01*
+G01*
+X62054840Y-27284580D01*
+G75*
+G02*
+X62003840Y-27335580I-51000J0D01*
+G01*
+X60403840Y-27335580D01*
+G75*
+G02*
+X60352840Y-27284580I0J51000D01*
+G01*
+G37*
 X61203840Y-29024580D03*
 X61203840Y-31564580D03*
 X61203840Y-34104580D03*
@@ -133,9 +176,30 @@ X68823840Y-34104580D03*
 X68823840Y-31564580D03*
 X68823840Y-29024580D03*
 X68823840Y-26484580D03*
-D11*
-X85841840Y-26484580D03*
-D12*
+G36*
+G01*
+X84990840Y-27284580D02*
+X84990840Y-25684580D01*
+G75*
+G02*
+X85041840Y-25633580I51000J0D01*
+G01*
+X86641840Y-25633580D01*
+G75*
+G02*
+X86692840Y-25684580I0J-51000D01*
+G01*
+X86692840Y-27284580D01*
+G75*
+G02*
+X86641840Y-27335580I-51000J0D01*
+G01*
+X85041840Y-27335580D01*
+G75*
+G02*
+X84990840Y-27284580I0J51000D01*
+G01*
+G37*
 X85841840Y-29024580D03*
 X85841840Y-31564580D03*
 X85841840Y-34104580D03*
@@ -155,9 +219,30 @@ X93461840Y-34104580D03*
 X93461840Y-31564580D03*
 X93461840Y-29024580D03*
 X93461840Y-26484580D03*
-D11*
-X73776840Y-26484580D03*
-D12*
+G36*
+G01*
+X72925840Y-27284580D02*
+X72925840Y-25684580D01*
+G75*
+G02*
+X72976840Y-25633580I51000J0D01*
+G01*
+X74576840Y-25633580D01*
+G75*
+G02*
+X74627840Y-25684580I0J-51000D01*
+G01*
+X74627840Y-27284580D01*
+G75*
+G02*
+X74576840Y-27335580I-51000J0D01*
+G01*
+X72976840Y-27335580D01*
+G75*
+G02*
+X72925840Y-27284580I0J51000D01*
+G01*
+G37*
 X73776840Y-29024580D03*
 X73776840Y-31564580D03*
 X73776840Y-34104580D03*
@@ -177,9 +262,30 @@ X81396840Y-34104580D03*
 X81396840Y-31564580D03*
 X81396840Y-29024580D03*
 X81396840Y-26484580D03*
-D11*
-X97906840Y-26484580D03*
-D12*
+G36*
+G01*
+X97055840Y-27284580D02*
+X97055840Y-25684580D01*
+G75*
+G02*
+X97106840Y-25633580I51000J0D01*
+G01*
+X98706840Y-25633580D01*
+G75*
+G02*
+X98757840Y-25684580I0J-51000D01*
+G01*
+X98757840Y-27284580D01*
+G75*
+G02*
+X98706840Y-27335580I-51000J0D01*
+G01*
+X97106840Y-27335580D01*
+G75*
+G02*
+X97055840Y-27284580I0J51000D01*
+G01*
+G37*
 X97906840Y-29024580D03*
 X97906840Y-31564580D03*
 X97906840Y-34104580D03*
@@ -199,35 +305,630 @@ X105526840Y-34104580D03*
 X105526840Y-31564580D03*
 X105526840Y-29024580D03*
 X105526840Y-26484580D03*
-D14*
-X55742840Y-72966580D03*
-X58282840Y-72966580D03*
-X60822840Y-72966580D03*
-X63362840Y-72966580D03*
-X65902840Y-72966580D03*
-X68442840Y-72966580D03*
-X70982840Y-72966580D03*
-X73522840Y-72966580D03*
-X76062840Y-72966580D03*
-X78602840Y-72966580D03*
-X81142840Y-72966580D03*
-X83682840Y-72966580D03*
-X86222840Y-72966580D03*
-X88762840Y-72966580D03*
-X91302840Y-72966580D03*
-X93842840Y-72966580D03*
-X96382840Y-72966580D03*
-X98922840Y-72966580D03*
-X101462840Y-72966580D03*
-X104002840Y-72966580D03*
-X106542840Y-72966580D03*
-X109082840Y-72966580D03*
-X111622840Y-72966580D03*
-X114162840Y-72966580D03*
-X116702840Y-72966580D03*
-D11*
-X36873180Y-25057100D03*
-D12*
+G36*
+G01*
+X55056840Y-76459080D02*
+X55056840Y-69474080D01*
+G75*
+G02*
+X55425340Y-69105580I368500J0D01*
+G01*
+X56060340Y-69105580D01*
+G75*
+G02*
+X56428840Y-69474080I0J-368500D01*
+G01*
+X56428840Y-76459080D01*
+G75*
+G02*
+X56060340Y-76827580I-368500J0D01*
+G01*
+X55425340Y-76827580D01*
+G75*
+G02*
+X55056840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X57596840Y-76459080D02*
+X57596840Y-69474080D01*
+G75*
+G02*
+X57965340Y-69105580I368500J0D01*
+G01*
+X58600340Y-69105580D01*
+G75*
+G02*
+X58968840Y-69474080I0J-368500D01*
+G01*
+X58968840Y-76459080D01*
+G75*
+G02*
+X58600340Y-76827580I-368500J0D01*
+G01*
+X57965340Y-76827580D01*
+G75*
+G02*
+X57596840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X60136840Y-76459080D02*
+X60136840Y-69474080D01*
+G75*
+G02*
+X60505340Y-69105580I368500J0D01*
+G01*
+X61140340Y-69105580D01*
+G75*
+G02*
+X61508840Y-69474080I0J-368500D01*
+G01*
+X61508840Y-76459080D01*
+G75*
+G02*
+X61140340Y-76827580I-368500J0D01*
+G01*
+X60505340Y-76827580D01*
+G75*
+G02*
+X60136840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X62676840Y-76459080D02*
+X62676840Y-69474080D01*
+G75*
+G02*
+X63045340Y-69105580I368500J0D01*
+G01*
+X63680340Y-69105580D01*
+G75*
+G02*
+X64048840Y-69474080I0J-368500D01*
+G01*
+X64048840Y-76459080D01*
+G75*
+G02*
+X63680340Y-76827580I-368500J0D01*
+G01*
+X63045340Y-76827580D01*
+G75*
+G02*
+X62676840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X65216840Y-76459080D02*
+X65216840Y-69474080D01*
+G75*
+G02*
+X65585340Y-69105580I368500J0D01*
+G01*
+X66220340Y-69105580D01*
+G75*
+G02*
+X66588840Y-69474080I0J-368500D01*
+G01*
+X66588840Y-76459080D01*
+G75*
+G02*
+X66220340Y-76827580I-368500J0D01*
+G01*
+X65585340Y-76827580D01*
+G75*
+G02*
+X65216840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X67756840Y-76459080D02*
+X67756840Y-69474080D01*
+G75*
+G02*
+X68125340Y-69105580I368500J0D01*
+G01*
+X68760340Y-69105580D01*
+G75*
+G02*
+X69128840Y-69474080I0J-368500D01*
+G01*
+X69128840Y-76459080D01*
+G75*
+G02*
+X68760340Y-76827580I-368500J0D01*
+G01*
+X68125340Y-76827580D01*
+G75*
+G02*
+X67756840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X70296840Y-76459080D02*
+X70296840Y-69474080D01*
+G75*
+G02*
+X70665340Y-69105580I368500J0D01*
+G01*
+X71300340Y-69105580D01*
+G75*
+G02*
+X71668840Y-69474080I0J-368500D01*
+G01*
+X71668840Y-76459080D01*
+G75*
+G02*
+X71300340Y-76827580I-368500J0D01*
+G01*
+X70665340Y-76827580D01*
+G75*
+G02*
+X70296840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X72836840Y-76459080D02*
+X72836840Y-69474080D01*
+G75*
+G02*
+X73205340Y-69105580I368500J0D01*
+G01*
+X73840340Y-69105580D01*
+G75*
+G02*
+X74208840Y-69474080I0J-368500D01*
+G01*
+X74208840Y-76459080D01*
+G75*
+G02*
+X73840340Y-76827580I-368500J0D01*
+G01*
+X73205340Y-76827580D01*
+G75*
+G02*
+X72836840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X75376840Y-76459080D02*
+X75376840Y-69474080D01*
+G75*
+G02*
+X75745340Y-69105580I368500J0D01*
+G01*
+X76380340Y-69105580D01*
+G75*
+G02*
+X76748840Y-69474080I0J-368500D01*
+G01*
+X76748840Y-76459080D01*
+G75*
+G02*
+X76380340Y-76827580I-368500J0D01*
+G01*
+X75745340Y-76827580D01*
+G75*
+G02*
+X75376840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X77916840Y-76459080D02*
+X77916840Y-69474080D01*
+G75*
+G02*
+X78285340Y-69105580I368500J0D01*
+G01*
+X78920340Y-69105580D01*
+G75*
+G02*
+X79288840Y-69474080I0J-368500D01*
+G01*
+X79288840Y-76459080D01*
+G75*
+G02*
+X78920340Y-76827580I-368500J0D01*
+G01*
+X78285340Y-76827580D01*
+G75*
+G02*
+X77916840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X80456840Y-76459080D02*
+X80456840Y-69474080D01*
+G75*
+G02*
+X80825340Y-69105580I368500J0D01*
+G01*
+X81460340Y-69105580D01*
+G75*
+G02*
+X81828840Y-69474080I0J-368500D01*
+G01*
+X81828840Y-76459080D01*
+G75*
+G02*
+X81460340Y-76827580I-368500J0D01*
+G01*
+X80825340Y-76827580D01*
+G75*
+G02*
+X80456840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X82996840Y-76459080D02*
+X82996840Y-69474080D01*
+G75*
+G02*
+X83365340Y-69105580I368500J0D01*
+G01*
+X84000340Y-69105580D01*
+G75*
+G02*
+X84368840Y-69474080I0J-368500D01*
+G01*
+X84368840Y-76459080D01*
+G75*
+G02*
+X84000340Y-76827580I-368500J0D01*
+G01*
+X83365340Y-76827580D01*
+G75*
+G02*
+X82996840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X85536840Y-76459080D02*
+X85536840Y-69474080D01*
+G75*
+G02*
+X85905340Y-69105580I368500J0D01*
+G01*
+X86540340Y-69105580D01*
+G75*
+G02*
+X86908840Y-69474080I0J-368500D01*
+G01*
+X86908840Y-76459080D01*
+G75*
+G02*
+X86540340Y-76827580I-368500J0D01*
+G01*
+X85905340Y-76827580D01*
+G75*
+G02*
+X85536840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X88076840Y-76459080D02*
+X88076840Y-69474080D01*
+G75*
+G02*
+X88445340Y-69105580I368500J0D01*
+G01*
+X89080340Y-69105580D01*
+G75*
+G02*
+X89448840Y-69474080I0J-368500D01*
+G01*
+X89448840Y-76459080D01*
+G75*
+G02*
+X89080340Y-76827580I-368500J0D01*
+G01*
+X88445340Y-76827580D01*
+G75*
+G02*
+X88076840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X90616840Y-76459080D02*
+X90616840Y-69474080D01*
+G75*
+G02*
+X90985340Y-69105580I368500J0D01*
+G01*
+X91620340Y-69105580D01*
+G75*
+G02*
+X91988840Y-69474080I0J-368500D01*
+G01*
+X91988840Y-76459080D01*
+G75*
+G02*
+X91620340Y-76827580I-368500J0D01*
+G01*
+X90985340Y-76827580D01*
+G75*
+G02*
+X90616840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X93156840Y-76459080D02*
+X93156840Y-69474080D01*
+G75*
+G02*
+X93525340Y-69105580I368500J0D01*
+G01*
+X94160340Y-69105580D01*
+G75*
+G02*
+X94528840Y-69474080I0J-368500D01*
+G01*
+X94528840Y-76459080D01*
+G75*
+G02*
+X94160340Y-76827580I-368500J0D01*
+G01*
+X93525340Y-76827580D01*
+G75*
+G02*
+X93156840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X95696840Y-76459080D02*
+X95696840Y-69474080D01*
+G75*
+G02*
+X96065340Y-69105580I368500J0D01*
+G01*
+X96700340Y-69105580D01*
+G75*
+G02*
+X97068840Y-69474080I0J-368500D01*
+G01*
+X97068840Y-76459080D01*
+G75*
+G02*
+X96700340Y-76827580I-368500J0D01*
+G01*
+X96065340Y-76827580D01*
+G75*
+G02*
+X95696840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X98236840Y-76459080D02*
+X98236840Y-69474080D01*
+G75*
+G02*
+X98605340Y-69105580I368500J0D01*
+G01*
+X99240340Y-69105580D01*
+G75*
+G02*
+X99608840Y-69474080I0J-368500D01*
+G01*
+X99608840Y-76459080D01*
+G75*
+G02*
+X99240340Y-76827580I-368500J0D01*
+G01*
+X98605340Y-76827580D01*
+G75*
+G02*
+X98236840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X100776840Y-76459080D02*
+X100776840Y-69474080D01*
+G75*
+G02*
+X101145340Y-69105580I368500J0D01*
+G01*
+X101780340Y-69105580D01*
+G75*
+G02*
+X102148840Y-69474080I0J-368500D01*
+G01*
+X102148840Y-76459080D01*
+G75*
+G02*
+X101780340Y-76827580I-368500J0D01*
+G01*
+X101145340Y-76827580D01*
+G75*
+G02*
+X100776840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X103316840Y-76459080D02*
+X103316840Y-69474080D01*
+G75*
+G02*
+X103685340Y-69105580I368500J0D01*
+G01*
+X104320340Y-69105580D01*
+G75*
+G02*
+X104688840Y-69474080I0J-368500D01*
+G01*
+X104688840Y-76459080D01*
+G75*
+G02*
+X104320340Y-76827580I-368500J0D01*
+G01*
+X103685340Y-76827580D01*
+G75*
+G02*
+X103316840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X105856840Y-76459080D02*
+X105856840Y-69474080D01*
+G75*
+G02*
+X106225340Y-69105580I368500J0D01*
+G01*
+X106860340Y-69105580D01*
+G75*
+G02*
+X107228840Y-69474080I0J-368500D01*
+G01*
+X107228840Y-76459080D01*
+G75*
+G02*
+X106860340Y-76827580I-368500J0D01*
+G01*
+X106225340Y-76827580D01*
+G75*
+G02*
+X105856840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X108396840Y-76459080D02*
+X108396840Y-69474080D01*
+G75*
+G02*
+X108765340Y-69105580I368500J0D01*
+G01*
+X109400340Y-69105580D01*
+G75*
+G02*
+X109768840Y-69474080I0J-368500D01*
+G01*
+X109768840Y-76459080D01*
+G75*
+G02*
+X109400340Y-76827580I-368500J0D01*
+G01*
+X108765340Y-76827580D01*
+G75*
+G02*
+X108396840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X110936840Y-76459080D02*
+X110936840Y-69474080D01*
+G75*
+G02*
+X111305340Y-69105580I368500J0D01*
+G01*
+X111940340Y-69105580D01*
+G75*
+G02*
+X112308840Y-69474080I0J-368500D01*
+G01*
+X112308840Y-76459080D01*
+G75*
+G02*
+X111940340Y-76827580I-368500J0D01*
+G01*
+X111305340Y-76827580D01*
+G75*
+G02*
+X110936840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X113476840Y-76459080D02*
+X113476840Y-69474080D01*
+G75*
+G02*
+X113845340Y-69105580I368500J0D01*
+G01*
+X114480340Y-69105580D01*
+G75*
+G02*
+X114848840Y-69474080I0J-368500D01*
+G01*
+X114848840Y-76459080D01*
+G75*
+G02*
+X114480340Y-76827580I-368500J0D01*
+G01*
+X113845340Y-76827580D01*
+G75*
+G02*
+X113476840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X116016840Y-76459080D02*
+X116016840Y-69474080D01*
+G75*
+G02*
+X116385340Y-69105580I368500J0D01*
+G01*
+X117020340Y-69105580D01*
+G75*
+G02*
+X117388840Y-69474080I0J-368500D01*
+G01*
+X117388840Y-76459080D01*
+G75*
+G02*
+X117020340Y-76827580I-368500J0D01*
+G01*
+X116385340Y-76827580D01*
+G75*
+G02*
+X116016840Y-76459080I0J368500D01*
+G01*
+G37*
+G36*
+G01*
+X36022180Y-25857100D02*
+X36022180Y-24257100D01*
+G75*
+G02*
+X36073180Y-24206100I51000J0D01*
+G01*
+X37673180Y-24206100D01*
+G75*
+G02*
+X37724180Y-24257100I0J-51000D01*
+G01*
+X37724180Y-25857100D01*
+G75*
+G02*
+X37673180Y-25908100I-51000J0D01*
+G01*
+X36073180Y-25908100D01*
+G75*
+G02*
+X36022180Y-25857100I0J51000D01*
+G01*
+G37*
 X36873180Y-27597100D03*
 X36873180Y-30137100D03*
 X36873180Y-32677100D03*
@@ -259,9 +960,30 @@ X52113180Y-32677100D03*
 X52113180Y-30137100D03*
 X52113180Y-27597100D03*
 X52113180Y-25057100D03*
-D13*
-X63743840Y-62552580D03*
-D12*
+G36*
+G01*
+X64543840Y-63403580D02*
+X62943840Y-63403580D01*
+G75*
+G02*
+X62892840Y-63352580I0J51000D01*
+G01*
+X62892840Y-61752580D01*
+G75*
+G02*
+X62943840Y-61701580I51000J0D01*
+G01*
+X64543840Y-61701580D01*
+G75*
+G02*
+X64594840Y-61752580I0J-51000D01*
+G01*
+X64594840Y-63352580D01*
+G75*
+G02*
+X64543840Y-63403580I-51000J0D01*
+G01*
+G37*
 X66283840Y-62552580D03*
 X68823840Y-62552580D03*
 X71363840Y-62552580D03*
@@ -281,7 +1003,7 @@ X71363840Y-54932580D03*
 X68823840Y-54932580D03*
 X66283840Y-54932580D03*
 X63743840Y-54932580D03*
-D15*
+D12*
 X59552840Y-59758580D03*
 X59552840Y-57258580D03*
 X114035840Y-59758580D03*
diff --git a/Hardware/ProDOS ROM-Drive-F_Silkscreen.gbr b/Hardware/ProDOS ROM-Drive-F_Silkscreen.gbr
index 888eaac..0e0e0ac 100644
--- a/Hardware/ProDOS ROM-Drive-F_Silkscreen.gbr	
+++ b/Hardware/ProDOS ROM-Drive-F_Silkscreen.gbr	
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.2-0)*
-G04 #@! TF.CreationDate,2022-02-25T13:53:27-05:00*
+G04 #@! TF.CreationDate,2022-03-19T10:19:41-04:00*
 G04 #@! TF.ProjectId,ProDOS ROM-Drive,50726f44-4f53-4205-924f-4d2d44726976,4.0*
 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 (6.0.2-0)) date 2022-02-25 13:53:27*
+G04 Created by KiCad (PCBNEW (6.0.2-0)) date 2022-03-19 10:19:41*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Hardware/ProDOS ROM-Drive-NPTH.drl b/Hardware/ProDOS ROM-Drive-NPTH.drl
index 943e6b9..d59821d 100644
--- a/Hardware/ProDOS ROM-Drive-NPTH.drl	
+++ b/Hardware/ProDOS ROM-Drive-NPTH.drl	
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad (6.0.2-0)} date Friday, February 25, 2022 at 01:53:32 pm
+; DRILL file {KiCad (6.0.2-0)} date Saturday, March 19, 2022 at 10:19:38 am
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2022-02-25T13:53:32-05:00
+; #@! TF.CreationDate,2022-03-19T10:19:38-04:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.2-0)
 ; #@! TF.FileFunction,NonPlated,1,2,NPTH
 FMAT,2
diff --git a/Hardware/ProDOS ROM-Drive-PTH.drl b/Hardware/ProDOS ROM-Drive-PTH.drl
index 366f178..743a7f8 100644
--- a/Hardware/ProDOS ROM-Drive-PTH.drl	
+++ b/Hardware/ProDOS ROM-Drive-PTH.drl	
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad (6.0.2-0)} date Friday, February 25, 2022 at 01:53:32 pm
+; DRILL file {KiCad (6.0.2-0)} date Saturday, March 19, 2022 at 10:19:38 am
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2022-02-25T13:53:32-05:00
+; #@! TF.CreationDate,2022-03-19T10:19:38-04:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.2-0)
 ; #@! TF.FileFunction,Plated,1,2,PTH
 FMAT,2
diff --git a/Hardware/ProDOS ROM-Drive.kicad_pcb b/Hardware/ProDOS ROM-Drive.kicad_pcb
index 321baf3..d6129fa 100644
--- a/Hardware/ProDOS ROM-Drive.kicad_pcb	
+++ b/Hardware/ProDOS ROM-Drive.kicad_pcb	
@@ -45,7 +45,7 @@
     (solder_mask_min_width 0.25)
     (pcbplotparams
       (layerselection 0x00010f0_ffffffff)
-      (disableapertmacros false)
+      (disableapertmacros true)
       (usegerberextensions false)
       (usegerberattributes false)
       (usegerberadvancedattributes false)
diff --git a/README.md b/README.md
index ab52b5b..1660628 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-# v3
-This is a new revision of the hardware, incompatible with previous firmware and drive image. If you have a v2.5 board, see the v2.5 tag [here](https://github.com/tjboldt/ProDOS-ROM-Drive/tree/v2.5)
+# v4.0
+This is a new revision of the hardware, incompatible with previous firmware and drive image before v3. If you have a v2.5 board, see the v2.5 tag [here](https://github.com/tjboldt/ProDOS-ROM-Drive/tree/v2.5). Note that all of v2.1, v2.5 and v3.0 have a small design mistake that didn't properly buffer the data bus the way it was intended in the original v1.0 version. This has been fixed for v4.0.
 
 # ProDOS ROM-Drive
 This is a peripheral card for the Apple ][ series computers that acts as a read-only solid state disk drive (SSD) all in EPROM. Although it won't run DOS, it is fully ProDOS compatible and will appear as a read-only hard drive even when booting from another drive. It holds 1024 KB of disk data with the 256 byte firmware stored in block 0001 where the SOS boot loader normally resides. The drive boots ProDOS and into BASIC in under 1.5 seconds. 
 
-![Image of Board](/Hardware/ProDOS%20ROM-Drive%203.0%20Front.jpg)
+![Image of Board](/Hardware/ProDOS%20ROM-Drive%20Front.jpg)
 
-You can order blank circuit boards from [PCBWay](https://www.pcbway.com/project/shareproject/ProDOS_ROM_Drive_v3_1903e388.html) or upload the provided gerber and drill files to any PCB manufacturer.
+You can order blank circuit boards from [PCBWay](https://www.pcbway.com/project/shareproject/ProDOS_ROM_Drive_v4_4fe0794f.html) or upload the provided gerber and drill files to any PCB manufacturer.
 
 ## History