diff --git a/laf b/laf
index 58723a95b..fd237c17b 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 58723a95b3a8809bdd4621e5dea88632b0a4f5bf
+Subproject commit fd237c17bbdf458fdcab6fe75f093daa26830ed9
diff --git a/src/app/render/shader_renderer.cpp b/src/app/render/shader_renderer.cpp
index 832f9a335..ff53da0f6 100644
--- a/src/app/render/shader_renderer.cpp
+++ b/src/app/render/shader_renderer.cpp
@@ -423,7 +423,7 @@ void ShaderRenderer::drawImage(SkCanvas* canvas,
   switch (srcImage->colorMode()) {
 
     case doc::ColorMode::RGB: {
-      auto skImg = SkImage::MakeRasterData(
+      auto skImg = SkImages::RasterFromData(
         SkImageInfo::Make(srcImage->width(),
                           srcImage->height(),
                           kRGBA_8888_SkColorType,
@@ -444,7 +444,7 @@ void ShaderRenderer::drawImage(SkCanvas* canvas,
 
     case doc::ColorMode::GRAYSCALE: {
       // We use kR8G8_unorm_SkColorType to access gray and alpha
-      auto skImg = SkImage::MakeRasterData(
+      auto skImg = SkImages::RasterFromData(
         SkImageInfo::Make(srcImage->width(),
                           srcImage->height(),
                           kR8G8_unorm_SkColorType,
@@ -472,7 +472,7 @@ void ShaderRenderer::drawImage(SkCanvas* canvas,
 
     case doc::ColorMode::INDEXED: {
       // We use kAlpha_8_SkColorType to access to the index value through the alpha channel
-      auto skImg = SkImage::MakeRasterData(
+      auto skImg = SkImages::RasterFromData(
         SkImageInfo::Make(srcImage->width(),
                           srcImage->height(),
                           kAlpha_8_SkColorType,
@@ -486,7 +486,7 @@ void ShaderRenderer::drawImage(SkCanvas* canvas,
       auto skPalData = SkData::MakeWithoutCopy(
         (const void*)m_palette.rawColorsData(),
         palSize);
-      auto skPal = SkImage::MakeRasterData(
+      auto skPal = SkImages::RasterFromData(
         SkImageInfo::Make(m_palette.size(), 1,
                           kRGBA_8888_SkColorType,
                           kUnpremul_SkAlphaType),
diff --git a/src/app/ui/color_spectrum.cpp b/src/app/ui/color_spectrum.cpp
index bbb230a79..74aac1f05 100644
--- a/src/app/ui/color_spectrum.cpp
+++ b/src/app/ui/color_spectrum.cpp
@@ -40,16 +40,16 @@ ColorSpectrum::ColorSpectrum()
 const char* ColorSpectrum::getMainAreaShader()
 {
   if (m_mainShader.empty()) {
-    m_mainShader += "uniform half3 iRes;"
-                    "uniform half4 iHsl;";
-    m_mainShader += kHSL_to_RGB_sksl;
     m_mainShader += R"(
+uniform half3 iRes;
+uniform half4 iHsl;
+
 half4 main(vec2 fragcoord) {
  vec2 d = fragcoord.xy / iRes.xy;
  half hue = d.x;
  half sat = iHsl.y;
  half lit = 1.0 - d.y;
- return hsl_to_rgb(half3(hue, sat, lit)).rgb1;
+ return $hsl_to_rgb(half3(hue, sat, lit)).rgb1;
 }
 )";
   }
@@ -59,13 +59,13 @@ half4 main(vec2 fragcoord) {
 const char* ColorSpectrum::getBottomBarShader()
 {
   if (m_bottomShader.empty()) {
-    m_bottomShader += "uniform half3 iRes;"
-                      "uniform half4 iHsl;";
-    m_bottomShader += kHSL_to_RGB_sksl;
     m_bottomShader += R"(
+uniform half3 iRes;
+uniform half4 iHsl;
+
 half4 main(vec2 fragcoord) {
  half s = (fragcoord.x / iRes.x);
- return hsl_to_rgb(half3(iHsl.x, s, iHsl.z)).rgb1;
+ return $hsl_to_rgb(half3(iHsl.x, s, iHsl.z)).rgb1;
 }
 )";
   }
diff --git a/src/app/util/shader_helpers.h b/src/app/util/shader_helpers.h
index b122b34d1..414ef6a28 100644
--- a/src/app/util/shader_helpers.h
+++ b/src/app/util/shader_helpers.h
@@ -15,9 +15,6 @@
 
 #include "include/core/SkM44.h"
 
-// To include kRGB_to_HSL_sksl and kHSL_to_RGB_sksl
-#include "src/core/SkRuntimeEffectPriv.h"
-
 namespace app {
 
 // rgb_to_hsl() and hsv_to_hsl() functions by Sam Hocevar licensed
diff --git a/src/ui/paint.cpp b/src/ui/paint.cpp
index 085336437..bd75f5436 100644
--- a/src/ui/paint.cpp
+++ b/src/ui/paint.cpp
@@ -14,6 +14,8 @@
 
 #if LAF_SKIA
   #include "include/core/SkBitmap.h"
+  #include "include/core/SkShader.h"
+  #include "include/core/SkTileMode.h"
 #endif
 
 namespace ui {