Rework of shaders architecture