diff --git a/README.md b/README.md
index 22b7adf..8e97d97 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ There are no releases at the moment, but experimental builds are currently avail
 
 ### Supported Game Versions
 
-I have only tested Novus on 6.x (Endwalker) so far, and it has limited support for 7.x (Dawntrail) except for the new renderer.
+I have only tested Novus on 6.x (Endwalker) so far, and it has limited support for 7.x (Dawntrail) except for the new renderer. If you're using Novus against Dawntrail, make sure to set the `NOVUS_IS_DAWNTRAIL=1` environment variable.
 
 ## Building
 
diff --git a/renderer/include/gamerenderer.h b/renderer/include/gamerenderer.h
index f7f9c78..bbb1fb2 100644
--- a/renderer/include/gamerenderer.h
+++ b/renderer/include/gamerenderer.h
@@ -107,4 +107,7 @@ private:
     VkSampler m_normalSampler;
     Buffer m_dummyBuffer;
     Texture m_placeholderTileNormal;
+
+    // Dawntrail changes part of the rendering system
+    bool m_dawntrailMode = false;
 };
\ No newline at end of file
diff --git a/renderer/src/gamerenderer.cpp b/renderer/src/gamerenderer.cpp
index db12825..3746919 100644
--- a/renderer/src/gamerenderer.cpp
+++ b/renderer/src/gamerenderer.cpp
@@ -58,6 +58,8 @@ GameRenderer::GameRenderer(Device &device, GameData *data)
     : m_device(device)
     , m_data(data)
 {
+    m_dawntrailMode = qgetenv("NOVUS_IS_DAWNTRAIL") == QByteArrayLiteral("1");
+
     m_dummyTex = m_device.createDummyTexture();
     m_dummyBuffer = m_device.createDummyBuffer();
 
@@ -82,6 +84,7 @@ GameRenderer::GameRenderer(Device &device, GameData *data)
 
         InstanceParameter instanceParameter{};
         instanceParameter.g_InstanceParameter.m_MulColor = glm::vec4(1.0f);
+        instanceParameter.g_InstanceParameter.m_EnvParameter = glm::vec4(1.0f);
 
         const float wetnessMin = 0.0f;
         const float wetnessMax = 1.0f;
@@ -268,20 +271,37 @@ void GameRenderer::render(VkCommandBuffer commandBuffer, uint32_t imageIndex, Ca
                     }
 
                     std::vector<uint32_t> systemKeys;
-                    if (renderMaterial.type == MaterialType::Skin) {
+                    // Dawntrail has no more decode depth buffers it seems
+                    if (renderMaterial.type == MaterialType::Skin && !m_dawntrailMode) {
                         systemKeys.push_back(physis_shpk_crc("DecodeDepthBuffer_RAWZ"));
                     }
                     std::vector<uint32_t> sceneKeys;
-                    if (model.skinned) {
-                        sceneKeys.push_back(physis_shpk_crc("TransformViewSkin"));
-                    } else {
-                        sceneKeys.push_back(physis_shpk_crc("TransformViewRigid"));
-                    }
+                    if (m_dawntrailMode) {
+                        sceneKeys.push_back(physis_shpk_crc("ApplyDitherClipOff"));
+                        sceneKeys.push_back(physis_shpk_crc("ApplyDissolveColorOff"));
+                        sceneKeys.push_back(physis_shpk_crc("GetCustumizeColorAuraOff"));
 
-                    sceneKeys.push_back(physis_shpk_crc("GetAmbientLight_SH"));
-                    sceneKeys.push_back(physis_shpk_crc("GetReflectColor_Texture"));
-                    sceneKeys.push_back(physis_shpk_crc("GetAmbientOcclusion_None"));
-                    sceneKeys.push_back(physis_shpk_crc("ApplyDitherClipOff"));
+                        if (model.skinned) {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewSkin"));
+                        } else {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewRigid"));
+                        }
+
+                        sceneKeys.push_back(physis_shpk_crc("ApplyVertexMovementOff"));
+                        sceneKeys.push_back(physis_shpk_crc("CalculateInstancingPosition_Off"));
+
+                    } else {
+                        if (model.skinned) {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewSkin"));
+                        } else {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewRigid"));
+                        }
+
+                        sceneKeys.push_back(physis_shpk_crc("GetAmbientLight_SH"));
+                        sceneKeys.push_back(physis_shpk_crc("GetReflectColor_Texture"));
+                        sceneKeys.push_back(physis_shpk_crc("GetAmbientOcclusion_None"));
+                        sceneKeys.push_back(physis_shpk_crc("ApplyDitherClipOff"));
+                    }
 
                     std::vector<uint32_t> materialKeys;
                     for (int j = 0; j < renderMaterial.shaderPackage.num_material_keys; j++) {
@@ -350,9 +370,10 @@ void GameRenderer::render(VkCommandBuffer commandBuffer, uint32_t imageIndex, Ca
             // first we need to generate the view positions with createviewpositions
             beginPass(imageIndex, commandBuffer, "PASS_LIGHTING_OPAQUE_VIEWPOSITION");
             {
-                std::vector<uint32_t> systemKeys = {
-                    physis_shpk_crc("DecodeDepthBuffer_RAWZ"),
-                };
+                std::vector<uint32_t> systemKeys = {};
+                if (!m_dawntrailMode) {
+                    systemKeys.push_back(physis_shpk_crc("DecodeDepthBuffer_RAWZ"));
+                }
                 std::vector<uint32_t> subviewKeys = {
                     physis_shpk_crc("Default"),
                     physis_shpk_crc("SUB_VIEW_MAIN"),
@@ -399,9 +420,10 @@ void GameRenderer::render(VkCommandBuffer commandBuffer, uint32_t imageIndex, Ca
             beginPass(imageIndex, commandBuffer, pass);
             // then run the directionallighting shader
             {
-                std::vector<uint32_t> systemKeys = {
-                    physis_shpk_crc("DecodeDepthBuffer_RAWZ"),
-                };
+                std::vector<uint32_t> systemKeys = {};
+                if (!m_dawntrailMode) {
+                    systemKeys.push_back(physis_shpk_crc("DecodeDepthBuffer_RAWZ"));
+                }
                 std::vector<uint32_t> sceneKeys = {
                     physis_shpk_crc("GetDirectionalLight_Enable"),
                     physis_shpk_crc("GetFakeSpecular_Disable"),
@@ -469,20 +491,36 @@ void GameRenderer::render(VkCommandBuffer commandBuffer, uint32_t imageIndex, Ca
                     }
 
                     std::vector<uint32_t> systemKeys;
-                    if (renderMaterial.type == MaterialType::Skin) {
+                    if (renderMaterial.type == MaterialType::Skin && !m_dawntrailMode) {
                         systemKeys.push_back(physis_shpk_crc("DecodeDepthBuffer_RAWZ"));
                     }
                     std::vector<uint32_t> sceneKeys;
-                    if (model.skinned) {
-                        sceneKeys.push_back(physis_shpk_crc("TransformViewSkin"));
-                    } else {
-                        sceneKeys.push_back(physis_shpk_crc("TransformViewRigid"));
-                    }
+                    if (m_dawntrailMode) {
+                        sceneKeys.push_back(physis_shpk_crc("ApplyDitherClipOff"));
+                        sceneKeys.push_back(physis_shpk_crc("ApplyDissolveColorOff"));
+                        sceneKeys.push_back(physis_shpk_crc("GetCustumizeColorAuraOff"));
 
-                    sceneKeys.push_back(physis_shpk_crc("GetAmbientLight_SH"));
-                    sceneKeys.push_back(physis_shpk_crc("GetReflectColor_Texture"));
-                    sceneKeys.push_back(physis_shpk_crc("GetAmbientOcclusion_None"));
-                    sceneKeys.push_back(physis_shpk_crc("ApplyDitherClipOff"));
+                        if (model.skinned) {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewSkin"));
+                        } else {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewRigid"));
+                        }
+
+                        sceneKeys.push_back(physis_shpk_crc("ApplyVertexMovementOff"));
+                        sceneKeys.push_back(physis_shpk_crc("CalculateInstancingPosition_Off"));
+
+                    } else {
+                        if (model.skinned) {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewSkin"));
+                        } else {
+                            sceneKeys.push_back(physis_shpk_crc("TransformViewRigid"));
+                        }
+
+                        sceneKeys.push_back(physis_shpk_crc("GetAmbientLight_SH"));
+                        sceneKeys.push_back(physis_shpk_crc("GetReflectColor_Texture"));
+                        sceneKeys.push_back(physis_shpk_crc("GetAmbientOcclusion_None"));
+                        sceneKeys.push_back(physis_shpk_crc("ApplyDitherClipOff"));
+                    }
 
                     std::vector<uint32_t> materialKeys;
                     for (int j = 0; j < renderMaterial.shaderPackage.num_material_keys; j++) {
@@ -1066,7 +1104,9 @@ VkShaderModule GameRenderer::convertShaderModule(const physis_Shader &shader, sp
     // Here you can also set up decorations if you want (binding = #N).
     i = 0;
     for (auto texture : resources.separate_images) {
-        glsl.set_name(texture.id, shader.resource_parameters[i].name);
+        if (i < shader.num_resource_parameters) {
+            glsl.set_name(texture.id, shader.resource_parameters[i].name);
+        }
         i++;
     }
 
@@ -1152,7 +1192,7 @@ GameRenderer::createDescriptorFor(const DrawObject *object, const CachedPipeline
                 auto info = &imageInfo.emplace_back();
                 descriptorWrite.pImageInfo = info;
 
-                if (binding.stageFlags == VK_SHADER_STAGE_FRAGMENT_BIT) {
+                if (binding.stageFlags == VK_SHADER_STAGE_FRAGMENT_BIT && p < pipeline.pixelShader.num_resource_parameters) {
                     auto name = pipeline.pixelShader.resource_parameters[p].name;
                     qInfo() << "Requesting image" << name << "at" << j;
                     if (strcmp(name, "g_SamplerGBuffer") == 0) {