New data, formatting, colors

Included reformatted new data, working data, and reformatted some other
things and changed a few colors