Refactored shaders