2.21 — 06.30.20: dunno where my last pass at this went, but I unstaggered the OLED holes.