Fixed yellow styling based on Martin' changes, and removed the yellow/green and green/yellow color schemes