Refactor Effects, add shaders