diff --git a/tests/png/nuts.png b/tests/png/nuts.png
index 091a8f6..622ba4e 100644
Binary files a/tests/png/nuts.png and b/tests/png/nuts.png differ
diff --git a/tests/png/pillars.png b/tests/png/pillars.png
index 72234cf..778cdab 100644
Binary files a/tests/png/pillars.png and b/tests/png/pillars.png differ
diff --git a/vitamins/e3d.scad b/vitamins/e3d.scad
index f463c99..49c60a0 100644
--- a/vitamins/e3d.scad
+++ b/vitamins/e3d.scad
@@ -35,7 +35,7 @@ rad_len = 26;
 nozzle_h = 5;
 
 module e3d_nozzle(type) {
-    color("gold") {
+    color(brass) {
         rotate_extrude()
             polygon([
                 [0.2,  0],
diff --git a/vitamins/jhead.scad b/vitamins/jhead.scad
index a693419..94fa817 100644
--- a/vitamins/jhead.scad
+++ b/vitamins/jhead.scad
@@ -49,7 +49,7 @@ insulator_dia = 12;
 module heater_block(type, resistor, thermistor) {
     h = heater_height(type);
 
-    color("gold") {
+    color(brass) {
         render() difference() {
             rotate([90, 0, 0])
                 linear_extrude(height = heater_width(type), center = true) difference() {
diff --git a/vitamins/microswitch.scad b/vitamins/microswitch.scad
index 53bbb6e..d5c4ca4 100644
--- a/vitamins/microswitch.scad
+++ b/vitamins/microswitch.scad
@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 
-microswitch_contact_color        = "gold";
+microswitch_contact_color        =  brass;
 
 function microswitch_thickness(type) = type[2];     //! Body thickness
 function microswitch_width(type)     = type[3];     //! Body width
diff --git a/vitamins/nut.scad b/vitamins/nut.scad
index 16c7e0e..bb6a539 100644
--- a/vitamins/nut.scad
+++ b/vitamins/nut.scad
@@ -47,7 +47,7 @@ module nut(type, nyloc = false, brass = false, nylon = false) { //! Draw specifi
     if(exploded() && nyloc)
         cylinder(r = 0.2, h = 10);
 
-    color(brass? brass : nylon ? grey30: grey70) translate_z((exploded() && nyloc) ? 10 : 0) {
+    color(brass ? "gold" : nylon ? grey30: grey70) translate_z((exploded() && nyloc) ? 10 : 0) {
         linear_extrude(height = thickness)
             difference() {
                 circle(outer_rad, $fn = 6);
diff --git a/vitamins/pillars.scad b/vitamins/pillars.scad
index 540ad2d..2e98718 100644
--- a/vitamins/pillars.scad
+++ b/vitamins/pillars.scad
@@ -29,11 +29,11 @@
 //                                                                                                u         u         a   a
 //                                                            d                                   r         r         d   d
 //
-M2x16_brass_pillar     = ["M2x16_brass_pillar",     "nurled", 2, 16, 3.17,      3.17,       0, 0, "gold",   "gold",    3,-3];
+M2x16_brass_pillar     = ["M2x16_brass_pillar",     "nurled", 2, 16, 3.17,      3.17,       0, 0, brass,     brass,    3,-3];
 M3x13_hex_pillar       = ["M3x13_hex_pillar",       "hex",    3, 13, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -6, 6];
 M3x20_hex_pillar       = ["M3x20_hex_pillar",       "hex",    3, 20, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -6, 6];
-M3x20_nylon_pillar     = ["M3x20_nylon_pillar",     "nylon",  3, 20, 8,         5/cos(30),  0, 6, "white",  "yellow", -6, 6];
-M4x17_nylon_pillar     = ["M4x17_nylon_pillar",     "nylon",  4, 20, 8,         5/cos(30),  0, 6, "white",  "yellow", -6, 6];
+M3x20_nylon_pillar     = ["M3x20_nylon_pillar",     "nylon",  3, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
+M4x17_nylon_pillar     = ["M4x17_nylon_pillar",     "nylon",  4, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
 M3x20_nylon_hex_pillar = ["M3x20_nylon_hex_pillar", "nylon",  3, 20, 8/cos(30), 8/cos(30),  6, 6,  grey20,   grey20,  -6, 6];
 M3x10_nylon_hex_pillar = ["M3x10_nylon_hex_pillar", "nylon",  3, 10,5.5/cos(30),5.5/cos(30),6, 6,  grey20,   grey20,  -6, 6];