diff --git a/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.cpp b/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.cpp
index 2ae2cfae275..770447f33bd 100644
--- a/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.cpp
+++ b/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.cpp
@@ -54,42 +54,12 @@ void cEnvMapReflect_SetUp::Setup(iGpuProgram *apProgram, cRenderSettings *apRend
 void cEnvMapReflect_SetUp::SetupMatrix(cMatrixf *apModelMatrix, cRenderSettings *apRenderSettings) {
 	// Put here so it is updated with every matrix, just aswell...
 	if (apModelMatrix)
-		apRenderSettings->mpVertexProgram->SetMatrixf("objectWorldMatrix", *apModelMatrix);
+		apRenderSettings->gpuProgram->SetMatrixf("objectWorldMatrix", *apModelMatrix);
 	else {
-		apRenderSettings->mpVertexProgram->SetMatrixf("objectWorldMatrix", cMatrixf::Identity);
+		apRenderSettings->gpuProgram->SetMatrixf("objectWorldMatrix", cMatrixf::Identity);
 	}
 }
 
-//-----------------------------------------------------------------------
-
-static cEnvMapReflect_SetUp gEnvMaterialSetup;
-
-//////////////////////////////////////////////////////////////////////////
-// FRAGEMENT SETUP
-//////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------
-
-cGLState_EnvMapReflect::cGLState_EnvMapReflect()
-	: iGLStateProgram("Internal_Diffuse") {
-}
-
-void cGLState_EnvMapReflect::Bind() {
-	mpLowGfx->SetActiveTextureUnit(1);
-	mpLowGfx->SetTextureEnv(eTextureParam_ColorFunc, eTextureFunc_Interpolate);
-	mpLowGfx->SetTextureEnv(eTextureParam_ColorSource2, eTextureSource_Previous);
-	mpLowGfx->SetTextureEnv(eTextureParam_ColorOp2, eTextureOp_Alpha);
-}
-
-void cGLState_EnvMapReflect::UnBind() {
-	mpLowGfx->SetActiveTextureUnit(1);
-	mpLowGfx->SetTextureEnv(eTextureParam_ColorFunc, eTextureFunc_Modulate);
-}
-
-//-----------------------------------------------------------------------
-
-cGLState_EnvMapReflect gGLState_EnvMapReflect;
-
 //////////////////////////////////////////////////////////////////////////
 // CONSTRUCTORS
 //////////////////////////////////////////////////////////////////////////
@@ -102,27 +72,21 @@ cMaterial_EnvMap_Reflect::cMaterial_EnvMap_Reflect(const tString &asName, iLowLe
 												   eMaterialPicture aPicture, cRenderer3D *apRenderer3D)
 	: iMaterial(asName, apLowLevelGraphics, apImageManager, apTextureManager, apRenderer, apProgramManager,
 				aPicture, apRenderer3D) {
-	error("cMaterial_EnvMap_Reflect not implemented");
 	mbIsTransperant = false;
 	mbIsGlowing = false;
 	mbUsesLights = false;
 
-	gGLState_EnvMapReflect.SetUp(apLowLevelGraphics);
-
-	///////////////////////////////////////////
-	// Load the Z pass vertex program
-	iGpuProgram *pVtxProg = mpProgramManager->CreateProgram("Diffuse_Color_vp.cg", "main", eGpuProgramType_Vertex);
-	SetProgram(pVtxProg, eGpuProgramType_Vertex, 0);
-
-	///////////////////////////////////////////
-	// Load the Z pass vertex program
-	pVtxProg = mpProgramManager->CreateProgram("Diffuse_EnvMap_Reflect_vp.cg", "main", eGpuProgramType_Vertex);
-	SetProgram(pVtxProg, eGpuProgramType_Vertex, 1);
+	_diffuseProgram = mpProgramManager->CreateProgram("Diffuse_Color", "Diffuse_Color");
+	_diffuseReflectProgram = mpProgramManager->CreateProgram("Diffuse_EnvMap_Reflect", "Diffuse_EnvMap_Reflect");
 }
 
 //-----------------------------------------------------------------------
 
 cMaterial_EnvMap_Reflect::~cMaterial_EnvMap_Reflect() {
+	if (_diffuseProgram)
+		mpProgramManager->Destroy(_diffuseProgram);
+	if (_diffuseReflectProgram)
+		mpProgramManager->Destroy(_diffuseReflectProgram);
 }
 
 //-----------------------------------------------------------------------
@@ -133,11 +97,17 @@ cMaterial_EnvMap_Reflect::~cMaterial_EnvMap_Reflect() {
 
 //-----------------------------------------------------------------------
 
-iGpuProgram *cMaterial_EnvMap_Reflect::GetVertexProgram(eMaterialRenderType aType, int alPass, iLight3D *apLight) {
+iGpuProgram *cMaterial_EnvMap_Reflect::getGpuProgram(const eMaterialRenderType aType, const int alPass, iLight3D *apLight) {
 	if (aType == eMaterialRenderType_Z)
-		return mpProgram[eGpuProgramType_Vertex][0];
-	else
-		return mpProgram[eGpuProgramType_Vertex][1];
+		return _diffuseProgram;
+	return _diffuseReflectProgram;
+}
+
+iMaterialProgramSetup *cMaterial_EnvMap_Reflect::getGpuProgramSetup(const eMaterialRenderType aType, const int alPass, iLight3D *apLight) {
+	static cEnvMapReflect_SetUp envMaterialSetup;
+	if (aType == eMaterialRenderType_Diffuse)
+		return &envMaterialSetup;
+	return nullptr;
 }
 
 bool cMaterial_EnvMap_Reflect::VertexProgramUsesLight(eMaterialRenderType aType, int alPass, iLight3D *apLight) {
@@ -148,19 +118,6 @@ bool cMaterial_EnvMap_Reflect::VertexProgramUsesEye(eMaterialRenderType aType, i
 	return false;
 }
 
-iMaterialProgramSetup *cMaterial_EnvMap_Reflect::GetVertexProgramSetup(eMaterialRenderType aType, int alPass, iLight3D *apLight) {
-	if (aType == eMaterialRenderType_Diffuse)
-		return &gEnvMaterialSetup;
-
-	return NULL;
-}
-
-iGpuProgram *cMaterial_EnvMap_Reflect::GetFragmentProgram(eMaterialRenderType aType, int alPass, iLight3D *apLight) {
-	if (aType == eMaterialRenderType_Diffuse)
-		return &gGLState_EnvMapReflect;
-	return NULL;
-}
-
 eMaterialAlphaMode cMaterial_EnvMap_Reflect::GetAlphaMode(eMaterialRenderType aType, int alPass, iLight3D *apLight) {
 	return eMaterialAlphaMode_Solid;
 }
diff --git a/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h b/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
index 4ff9246a3fa..46829692322 100644
--- a/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
+++ b/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
@@ -42,19 +42,6 @@ public:
 
 //----------------------------------------------------
 
-class cGLState_EnvMapReflect : public iGLStateProgram {
-public:
-	cGLState_EnvMapReflect();
-
-	void Bind();
-	void UnBind();
-
-private:
-	void InitData() {}
-};
-
-//----------------------------------------------------
-
 class cMaterial_EnvMap_Reflect : public iMaterial {
 public:
 	cMaterial_EnvMap_Reflect(const tString &asName, iLowLevelGraphics *apLowLevelGraphics,
@@ -68,14 +55,12 @@ public:
 
 	bool UsesType(eMaterialRenderType aType);
 
-	iGpuProgram *GetVertexProgram(eMaterialRenderType aType, int alPass, iLight3D *apLight);
+	iGpuProgram *getGpuProgram(const eMaterialRenderType aType, const int alPass, iLight3D *apLight);
+	iMaterialProgramSetup *getGpuProgramSetup(const eMaterialRenderType aType, const int alPass, iLight3D *apLight);
+
 	bool VertexProgramUsesLight(eMaterialRenderType aType, int alPass, iLight3D *apLight);
 	bool VertexProgramUsesEye(eMaterialRenderType aType, int alPass, iLight3D *apLight);
 
-	iMaterialProgramSetup *GetVertexProgramSetup(eMaterialRenderType aType, int alPass, iLight3D *apLight);
-
-	iGpuProgram *GetFragmentProgram(eMaterialRenderType aType, int alPass, iLight3D *apLight);
-
 	eMaterialAlphaMode GetAlphaMode(eMaterialRenderType aType, int alPass, iLight3D *apLight);
 	eMaterialBlendMode GetBlendMode(eMaterialRenderType aType, int alPass, iLight3D *apLight);
 	eMaterialChannelMode GetChannelMode(eMaterialRenderType aType, int alPass, iLight3D *apLight);
@@ -96,6 +81,11 @@ public:
 	eMaterialType GetType(eMaterialRenderType aType) { return eMaterialType_Diffuse; }
 	void EditVertexes(eMaterialRenderType aType, iCamera *apCam, iLight *pLight,
 					  tVertexVec *apVtxVec, cVector3f *apTransform, unsigned int alIndexAdd) {}
+
+private:
+	iGpuProgram *_diffuseProgram;
+	iGpuProgram *_diffuseReflectProgram;
+
 };
 
 class cMaterialType_EnvMap_Reflect : public iMaterialType {
diff --git a/engines/hpl1/engine/impl/shaders/Diffuse_EnvMap_Reflect.fragment b/engines/hpl1/engine/impl/shaders/Diffuse_EnvMap_Reflect.fragment
new file mode 100644
index 00000000000..0353622cb3e
--- /dev/null
+++ b/engines/hpl1/engine/impl/shaders/Diffuse_EnvMap_Reflect.fragment
@@ -0,0 +1,16 @@
+// Diffuse_EnvMap_Reflect.fragment
+
+in vec3 vColor;
+in vec3 vUv;
+in vec3 vUv2;
+
+OUTPUT
+
+uniform sampler2D tex0; // diffuse
+uniform samplerCube tex1;
+
+void main() {
+	vec4 diffuseColor = texture(tex0, vUv.st);
+	vec4 col2 = textureCube(tex1, vUv2);
+	outColor = vec4(diffuseColor.xyz, diffuseColor.a * ( 1.0 - col2.a));
+}
\ No newline at end of file