Minor refactor
Covert to built-in shaders