Darkened green and yellow, removed some unused lines