diff --git a/Runtime/Graphics/CMakeLists.txt b/Runtime/Graphics/CMakeLists.txt
index 3b4e136e2..fe19fc8ff 100644
--- a/Runtime/Graphics/CMakeLists.txt
+++ b/Runtime/Graphics/CMakeLists.txt
@@ -64,4 +64,5 @@ runtime_add_hsh(Graphics
         Shaders/CElementGenShaders.cpp
         Shaders/CEnvFxShaders.cpp
         Shaders/CFogVolumeFilter.cpp
+        Shaders/CMapSurfaceShader.cpp
         )
diff --git a/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp b/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp
index 54a28524e..c158fc5b1 100644
--- a/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp
+++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp
@@ -1,15 +1,24 @@
 #include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
 
-#include <array>
-
 #include "Runtime/Graphics/CGraphics.hpp"
 
-namespace urde {
+#include "CMapSurfaceShader.cpp.hshhead"
 
-CMapSurfaceShader::CMapSurfaceShader(hsh::vertex_buffer<Vert> vbo,
-                                     hsh::index_buffer<uint32_t> ibo) {
+namespace urde {
+using namespace hsh::pipeline;
+
+struct CMapSurfaceShaderPipeline : pipeline<topology<hsh::TriangleStrip>, BlendAttachment<>, depth_compare<hsh::GEqual>,
+                                            depth_write<false>, cull_mode<hsh::CullBack>> {
+  CMapSurfaceShaderPipeline(hsh::uniform_buffer<CMapSurfaceShader::Uniform> uniBuf,
+                            hsh::vertex_buffer<CMapSurfaceShader::Vert> vbo, hsh::index_buffer<uint32_t> ibo) {
+    this->position = uniBuf->mtx * hsh::float4(vbo->pos, 1.f);
+    this->color_out[0] = uniBuf->color;
+  }
+};
+
+CMapSurfaceShader::CMapSurfaceShader(hsh::vertex_buffer<Vert> vbo, hsh::index_buffer<uint32_t> ibo) {
   m_uniBuf = hsh::create_dynamic_uniform_buffer<Uniform>();
-  m_dataBind.hsh_bind(m_uniBuf.get(), vbo, ibo);
+  m_dataBind.hsh_bind(CMapSurfaceShaderPipeline(m_uniBuf.get(), vbo, ibo));
 }
 
 void CMapSurfaceShader::draw(const zeus::CColor& color, u32 start, u32 count) {