diff --git a/readme.md b/readme.md
index 260a7a4..fe20496 100644
--- a/readme.md
+++ b/readme.md
@@ -1721,6 +1721,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
| 1 | ```pcb(DuetE)``` | Duet 2 Ethernet electronics |
| 1 | ```pcb(Duex2)``` | Duex2 expansion board |
| 1 | ```pcb(Duex5)``` | Duex5 expasnion board |
+| 1 | ```pcb(EnviroPlus)``` | Enviro+ |
| 1 | ```pcb(ExtruderPCB)``` | Extruder connection PCB |
| 1 | ```pcb(Keyes5p1)``` | Keyes5.1 Arduino Uno expansion board |
| 1 | ```pcb(Melzi)``` | Melzi electronics |
@@ -1728,7 +1729,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
| 1 | ```molex_254(2)``` | Molex KK header 2 way |
| 1 | ```molex_254(3)``` | Molex KK header 3 way |
| 16 | ```nut(M2_nut, nyloc = true)``` | Nut M2 x 1.6mm nyloc |
-| 24 | ```nut(M2p5_nut, nyloc = true)``` | Nut M2.5 x 2.2mm nyloc |
+| 28 | ```nut(M2p5_nut, nyloc = true)``` | Nut M2.5 x 2.2mm nyloc |
| 12 | ```nut(M3_nut, nyloc = true)``` | Nut M3 x 2.4mm nyloc |
| 12 | ```nut(M4_nut, nyloc = true)``` | Nut M4 x 3.2mm nyloc |
| 1 | ```pcb(PI_IO)``` | PI_IO V2 |
@@ -1741,22 +1742,21 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
| 1 | ```pin_socket(2p54header, 13, 2, right_angle = true)``` | Pin socket 13 x 2 right_angle |
| 1 | ```pcb(RPI3)``` | Raspberry Pi 3 |
| 1 | ```pcb(RPI0)``` | Raspberry Pi Zero |
-| 4 | ```screw(M2_cap_screw, 20)``` | Screw M2 cap x 20mm |
-| 12 | ```screw(M2_cap_screw, 25)``` | Screw M2 cap x 25mm |
+| 16 | ```screw(M2_cap_screw, 25)``` | Screw M2 cap x 25mm |
| 4 | ```screw(M2p5_cap_screw, 16)``` | Screw M2.5 cap x 16mm |
-| 4 | ```screw(M2p5_cap_screw, 20)``` | Screw M2.5 cap x 20mm |
-| 12 | ```screw(M2p5_pan_screw, 20)``` | Screw M2.5 pan x 20mm |
+| 8 | ```screw(M2p5_cap_screw, 20)``` | Screw M2.5 cap x 20mm |
+| 8 | ```screw(M2p5_pan_screw, 20)``` | Screw M2.5 pan x 20mm |
+| 4 | ```screw(M2p5_pan_screw, 25)``` | Screw M2.5 pan x 25mm |
| 4 | ```screw(M2p5_pan_screw, 35)``` | Screw M2.5 pan x 35mm |
-| 4 | ```screw(M3_cap_screw, 25)``` | Screw M3 cap x 25mm |
-| 4 | ```screw(M3_cap_screw, 30)``` | Screw M3 cap x 30mm |
+| 8 | ```screw(M3_cap_screw, 30)``` | Screw M3 cap x 30mm |
| 4 | ```screw(M3_cap_screw, 35)``` | Screw M3 cap x 35mm |
-| 8 | ```screw(M4_cap_screw, 30)``` | Screw M4 cap x 30mm |
-| 4 | ```screw(M4_cap_screw, 35)``` | Screw M4 cap x 35mm |
+| 4 | ```screw(M4_cap_screw, 30)``` | Screw M4 cap x 30mm |
+| 8 | ```screw(M4_cap_screw, 35)``` | Screw M4 cap x 35mm |
| 3 | ```terminal_35(2)``` | Terminal block 2 way 3.5mm |
| 2 | ```green_terminal(gt_2p54, 4)``` | Terminal block 4 way 0.1" |
| 1 | | USB A to Mini B lead |
| 16 | ```washer(M2_washer)``` | Washer M2 x 5mm x 0.3mm |
-| 24 | ```washer(M2p5_washer)``` | Washer M2.5 x 5.9mm x 0.5mm |
+| 28 | ```washer(M2p5_washer)``` | Washer M2.5 x 5.9mm x 0.5mm |
| 12 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm |
| 12 | ```washer(M4_washer)``` | Washer M4 x 9mm x 0.8mm |
| 1 | ```pcb(ZC_A0591)``` | ZC-A0591 ULN2003 driver PCB |
@@ -1764,22 +1764,23 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
### Printed
| Qty | Filename |
| ---:|:--- |
-| 4 | pcb_spacer20120.stl |
| 4 | pcb_spacer20130.stl |
| 4 | pcb_spacer20140.stl |
| 4 | pcb_spacer20150.stl |
+| 4 | pcb_spacer20160.stl |
| 4 | pcb_spacer25100_2.stl |
| 4 | pcb_spacer25110_2.stl |
-| 4 | pcb_spacer25220.stl |
+| 4 | pcb_spacer25120_2.stl |
+| 4 | pcb_spacer25230.stl |
| 4 | pcb_spacer2570.stl |
| 4 | pcb_spacer2580.stl |
-| 4 | pcb_spacer2590_2.stl |
-| 4 | pcb_spacer30160.stl |
+| 4 | pcb_spacer2590.stl |
| 4 | pcb_spacer30170.stl |
-| 4 | pcb_spacer30210.stl |
-| 4 | pcb_spacer40180.stl |
+| 4 | pcb_spacer30180.stl |
+| 4 | pcb_spacer30220.stl |
| 4 | pcb_spacer40190.stl |
| 4 | pcb_spacer40200.stl |
+| 4 | pcb_spacer40210.stl |
Top
diff --git a/tests/png/pcbs.png b/tests/png/pcbs.png
index 19da6c4..4d2d90e 100644
Binary files a/tests/png/pcbs.png and b/tests/png/pcbs.png differ
diff --git a/vitamins/pcbs.scad b/vitamins/pcbs.scad
index e6278ce..c64c9f3 100644
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -214,16 +214,23 @@ RPI3 = ["RPI3", "Raspberry Pi 3", 85, 56, 1.4, 3, 2.75, 6, "green"
RPI0 = ["RPI0", "Raspberry Pi Zero", 65, 30, 1.4, 3, 2.75, 6, "green", false, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]],
[//[32.5, -3.5, 0, "2p54header", 20, 2],
- [25.5, 13, 0, "chip", 12, 12, 1.2],
- [12.4, 3.4, -90, "mini_hdmi"],
- [54, 2, -90, "usb_uA"],
- [41.4, 2, -90, "usb_uA"],
+ [25.5, 13, 0, "chip", 12, 12, 1.2],
+ [12.4, 3.4, -90, "mini_hdmi"],
+ [54, 2, -90, "usb_uA"],
+ [41.4, 2, -90, "usb_uA"],
[7.25, 16.7, 180, "uSD", [12, 11.5, 1.28]],
[-1.3, 15, 0, "flat_flex"],
],
[": Micro SD card"],
[32.5 - 9.5 * 2.54, 26.5 - 1.27, 20, 2]];
+EnviroPlus = ["EnviroPlus", "Enviro+", 65, 30, 1.6, 3, 2.75, 6, "white", false, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]],
+ [[32.5, -3.5, 0, "-2p54socket", 20, 2, false, 5, true],
+ ],
+ [],
+ []];
+
+
ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
[[30.226, -2.54, 0, "2p54socket", 10, 1],
[54.61, -2.54, 0, "2p54socket", 8, 1],
@@ -330,6 +337,6 @@ PERF74x51 = ["PERF74x51", "Perfboard 74 x 51mm", 74, 51, 1.0, 0, 3.0, 0, "sienna
PSU12V1A = ["PSU12V1A", "PSU 12V 1A", 67, 31, 1.7, 0, 3.9, 0, "green", true, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]], [], []];
-pcbs = [ExtruderPCB, PI_IO, RPI0, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];
+pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];
use