Cleaned up a tiny bit and changed the colors around