diff --git a/classes.cpp b/classes.cpp
index 922f6f70..98767353 100644
--- a/classes.cpp
+++ b/classes.cpp
@@ -1213,9 +1213,10 @@ itemtype iinf[ittypes] = {
   { '!', 0x80FF00, "Glowing Crystal", crystaldesc},
   { '!', 0x80FF80, "Snake Oil", NODESCYET},
   { '*', 0x80FF80, "Sea Glass", NODESCYET},
-  { '*', 0xD0D8ED, "Chalcedony", NODESCYET},
-  { '*', 0x80FF80, "Monopole", NODESCYET},
   { '*', 0xBBCC99, "Chrysoberyl", NODESCYET},
+//  { '*', 0xD0D8ED, "Chalcedony", NODESCYET},
+  { '*', 0x80FF80, "Monopole", NODESCYET},
+  { '*', 0xFF00FF, "Agate", NODESCYET},
   { 'o', 0x80FF80, "Orb of Phasing", NODESCYET},
   { 'o', 0xFFFF80, "Orb of Magnetism", NODESCYET},
   { 'o', 0x202020, "Orb of Slaying", NODESCYET},
diff --git a/graph.cpp b/graph.cpp
index d2db887d..13b7bd3b 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -664,6 +664,7 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks,
     
     if(it == itZebra) icol = 0xFFFFFF;
     if(it == itLotus) icol = 0x101010;
+    if(it == itSwitch) icol = minf[passive_switch].color;
     
     transmatrix V2 = V * spin(ticks / 1500.);
   
@@ -678,6 +679,8 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks,
 
     if(it == itZebra)
       queuepolyat(V * spin(ticks / 1500. + M_PI/(ct6+6)), *xsh, darkena(0x202020, 0, hidden ? 0x40 : 0xF0), PPR_ITEMb);
+    if(it == itSwitch)
+      queuepolyat(V * spin(ticks / 1500. + M_PI/(ct6+6)), *xsh, darkena(minf[active_switch()].color, 0, hidden ? 0x40 : 0xF0), PPR_ITEMb);
     }
   
   else if(xch == 'o' || it == itInventory) {