More Shader Generator work