Adjusted all the colors, and made a few minor tweaks