diff --git a/Source/engine/render/blit_impl.hpp b/Source/engine/render/blit_impl.hpp
index c336ea0b1..4dd8f9472 100644
--- a/Source/engine/render/blit_impl.hpp
+++ b/Source/engine/render/blit_impl.hpp
@@ -26,13 +26,13 @@ DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitFillDirect(uint8_t *dst, unsigned l
 	std::memset(dst, color, length);
 }
 
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsDirect(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, unsigned length)
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsDirect(uint8_t *dst, const uint8_t *src, unsigned length)
 {
 	std::memcpy(dst, src, length);
 }
 
 struct BlitDirect {
-	DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void operator()(BlitCommand cmd, uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src)
+	DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void operator()(BlitCommand cmd, uint8_t *dst, const uint8_t *src)
 	{
 		switch (cmd.type) {
 		case BlitType::Fill:
@@ -47,72 +47,22 @@ struct BlitDirect {
 	}
 };
 
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitFillWithMap(uint8_t *dst, unsigned length, uint8_t color, const uint8_t *DVL_RESTRICT colorMap)
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitFillWithMap(uint8_t *dst, unsigned length, uint8_t color, const uint8_t *colorMap)
 {
 	assert(length != 0);
 	std::memset(dst, colorMap[color], length);
 }
 
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsWithMap(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, unsigned length, const uint8_t *DVL_RESTRICT colorMap)
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsWithMap(uint8_t *dst, const uint8_t *src, unsigned length, const uint8_t *colorMap)
 {
-	assert(length != 0);
-	const uint8_t *end = src + length;
-	while (src + 3 < end) {
-		*dst++ = colorMap[*src++];
-		*dst++ = colorMap[*src++];
-		*dst++ = colorMap[*src++];
-		*dst++ = colorMap[*src++];
-	}
-	while (src < end) {
+	while (length-- > 0)
 		*dst++ = colorMap[*src++];
-	}
-}
-
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitFillBlended(uint8_t *dst, unsigned length, uint8_t color)
-{
-	assert(length != 0);
-	const uint8_t *end = dst + length;
-	const uint8_t *const tbl = paletteTransparencyLookup[color];
-	while (dst + 3 < end) {
-		*dst = tbl[*dst];
-		++dst;
-		*dst = tbl[*dst];
-		++dst;
-		*dst = tbl[*dst];
-		++dst;
-		*dst = tbl[*dst];
-		++dst;
-	}
-	while (dst < end) {
-		*dst = tbl[*dst];
-		++dst;
-	}
-}
-
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsBlended(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, unsigned length)
-{
-	assert(length != 0);
-	const uint8_t *end = src + length;
-	while (src + 3 < end) {
-		*dst = paletteTransparencyLookup[*dst][*src++];
-		++dst;
-		*dst = paletteTransparencyLookup[*dst][*src++];
-		++dst;
-		*dst = paletteTransparencyLookup[*dst][*src++];
-		++dst;
-		*dst = paletteTransparencyLookup[*dst][*src++];
-		++dst;
-	}
-	while (src < end) {
-		*dst = paletteTransparencyLookup[*dst][*src++];
-		++dst;
-	}
 }
 
 struct BlitWithMap {
-	const uint8_t *DVL_RESTRICT colorMap;
+	const uint8_t *colorMap;
 
-	DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void operator()(BlitCommand cmd, uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src) const
+	DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void operator()(BlitCommand cmd, uint8_t *dst, const uint8_t *src) const
 	{
 		switch (cmd.type) {
 		case BlitType::Fill:
@@ -127,21 +77,18 @@ struct BlitWithMap {
 	}
 };
 
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsBlendedWithMap(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, unsigned length, const uint8_t *DVL_RESTRICT colorMap)
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitFillBlendedWithMap(uint8_t *dst, unsigned length, uint8_t color, const uint8_t *colorMap)
 {
-	assert(length != 0);
-	const uint8_t *end = src + length;
-	while (src + 3 < end) {
-		*dst = paletteTransparencyLookup[*dst][colorMap[*src++]];
-		++dst;
-		*dst = paletteTransparencyLookup[*dst][colorMap[*src++]];
-		++dst;
-		*dst = paletteTransparencyLookup[*dst][colorMap[*src++]];
-		++dst;
-		*dst = paletteTransparencyLookup[*dst][colorMap[*src++]];
+	color = colorMap[color];
+	while (length-- > 0) {
+		*dst = paletteTransparencyLookup[*dst][color];
 		++dst;
 	}
-	while (src < end) {
+}
+
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsBlendedWithMap(uint8_t *dst, const uint8_t *src, unsigned length, const uint8_t *colorMap)
+{
+	while (length-- > 0) {
 		*dst = paletteTransparencyLookup[*dst][colorMap[*src++]];
 		++dst;
 	}
@@ -150,11 +97,11 @@ DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void BlitPixelsBlendedWithMap(uint8_t *DVL_R
 struct BlitBlendedWithMap {
 	const uint8_t *colorMap;
 
-	DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void operator()(BlitCommand cmd, uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src) const
+	DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void operator()(BlitCommand cmd, uint8_t *dst, const uint8_t *src) const
 	{
 		switch (cmd.type) {
 		case BlitType::Fill:
-			BlitFillBlended(dst, cmd.length, colorMap[cmd.color]);
+			BlitFillBlendedWithMap(dst, cmd.length, cmd.color, colorMap);
 			return;
 		case BlitType::Pixels:
 			BlitPixelsBlendedWithMap(dst, src, cmd.length, colorMap);
diff --git a/Source/engine/render/dun_render.cpp b/Source/engine/render/dun_render.cpp
index 23cdd925c..0cd413eee 100644
--- a/Source/engine/render/dun_render.cpp
+++ b/Source/engine/render/dun_render.cpp
@@ -18,7 +18,6 @@
 #include <climits>
 #include <cstdint>
 
-#include "engine/render/blit_impl.hpp"
 #include "lighting.h"
 #include "options.h"
 #include "utils/attributes.h"
@@ -152,64 +151,55 @@ enum class LightType : uint8_t {
 };
 
 template <LightType Light>
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineOpaque(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, const uint8_t *DVL_RESTRICT tbl);
-
-template <>
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineOpaque<LightType::FullyDark>(uint8_t *DVL_RESTRICT dst, [[maybe_unused]] const uint8_t *DVL_RESTRICT src, uint_fast8_t n, [[maybe_unused]] const uint8_t *DVL_RESTRICT tbl)
-{
-	BlitFillDirect(dst, n, 0);
-}
-
-template <>
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineOpaque<LightType::FullyLit>(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, [[maybe_unused]] const uint8_t *DVL_RESTRICT tbl)
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineOpaque(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, const uint8_t *DVL_RESTRICT tbl)
 {
+	if (Light == LightType::FullyDark) {
+		memset(dst, 0, n);
+	} else if (Light == LightType::FullyLit) {
 #ifndef DEBUG_RENDER_COLOR
-	BlitPixelsDirect(dst, src, n);
+		memcpy(dst, src, n);
 #else
-	BlitFillDirect(dst, n, DBGCOLOR);
+		memset(dst, DBGCOLOR, n);
 #endif
-}
-
-template <>
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineOpaque<LightType::PartiallyLit>(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, const uint8_t *DVL_RESTRICT tbl)
-{
+	} else { // Partially lit
 #ifndef DEBUG_RENDER_COLOR
-	BlitPixelsWithMap(dst, src, n, tbl);
+		while (n-- != 0) {
+			*dst++ = tbl[*src++];
+		}
 #else
-	BlitFillDirect(dst, n, tbl[DBGCOLOR]);
+		memset(dst, tbl[DBGCOLOR], n);
 #endif
+	}
 }
 
-#ifndef DEBUG_RENDER_COLOR
-template <LightType Light>
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineTransparent(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, const uint8_t *DVL_RESTRICT tbl);
-
-template <>
-void RenderLineTransparent<LightType::FullyDark>(uint8_t *DVL_RESTRICT dst, [[maybe_unused]] const uint8_t *DVL_RESTRICT src, uint_fast8_t n, [[maybe_unused]] const uint8_t *DVL_RESTRICT tbl)
-{
-	BlitFillBlended(dst, n, 0);
-}
-
-template <>
-void RenderLineTransparent<LightType::FullyLit>(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, [[maybe_unused]] const uint8_t *DVL_RESTRICT tbl)
-{
-	BlitPixelsBlended(dst, src, n);
-}
-
-template <>
-void RenderLineTransparent<LightType::PartiallyLit>(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, const uint8_t *DVL_RESTRICT tbl)
-{
-	BlitPixelsBlendedWithMap(dst, src, n, tbl);
-}
-#else // DEBUG_RENDER_COLOR
 template <LightType Light>
 DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineTransparent(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t n, const uint8_t *DVL_RESTRICT tbl)
 {
+#ifndef DEBUG_RENDER_COLOR
+	if (Light == LightType::FullyDark) {
+		while (n-- != 0) {
+			*dst = paletteTransparencyLookup[0][*dst];
+			++dst;
+		}
+	} else if (Light == LightType::FullyLit) {
+		while (n-- != 0) {
+			*dst = paletteTransparencyLookup[*dst][*src];
+			++dst;
+			++src;
+		}
+	} else { // Partially lit
+		while (n-- != 0) {
+			*dst = paletteTransparencyLookup[*dst][tbl[*src]];
+			++dst;
+			++src;
+		}
+	}
+#else
 	for (size_t i = 0; i < n; i++) {
 		dst[i] = paletteTransparencyLookup[dst[i]][tbl[DBGCOLOR + 4]];
 	}
-}
 #endif
+}
 
 template <LightType Light, bool Transparent>
 DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineTransparentOrOpaque(uint8_t *DVL_RESTRICT dst, const uint8_t *DVL_RESTRICT src, uint_fast8_t width, const uint8_t *DVL_RESTRICT tbl)