Closes #477 by altering all the colors to the new d3 colors