renamed and moved around the shaders a bunch