Updated shaders to match submission