Shader cleanup and add two more shaders