added missing green colors and removed cruft