switched toon and gvars to edrosten versions from github