Added more colors; removed some dead code