Mconti material overhaul v3
Okay fixed the issues brought up in the last merge request.
Everything is CC0, and fixed JSON formatting so it is consistent with no trailing spaces.
Also sorry this keeps getting put into new branches/merge requests. The web ide deleting my original merge request every time I make a new change