last two

I also fixed the colors on some of them.