diff --git a/openrndr-demos/build.gradle.kts b/openrndr-demos/build.gradle.kts
index 87d63611..165cbc35 100644
--- a/openrndr-demos/build.gradle.kts
+++ b/openrndr-demos/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     demoImplementation(project(":orx-jvm:orx-gui"))
     demoImplementation(project(":orx-shader-phrases"))
     demoImplementation(project(":orx-camera"))
+    demoImplementation(project(":orx-shapes"))
     demoImplementation(libs.slf4j.simple)
     demoImplementation(libs.openrndr.ffmpeg)
     demoImplementation(libs.openrndr.svg)
diff --git a/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt b/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt
index f448aef7..fdaed550 100644
--- a/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt
@@ -2,10 +2,10 @@
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.math.CatmullRomChain2
+import org.openrndr.extra.shapes.splines.CatmullRomChain2
+import org.openrndr.extra.shapes.splines.toContour
 import org.openrndr.math.Polar
 import org.openrndr.shape.ShapeContour
-import org.openrndr.shape.toContour
 
 fun main() = application {
     program {
diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts
index d0389489..737cfdef 100644
--- a/orx-fx/build.gradle.kts
+++ b/orx-fx/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
     inputDir.set(file("$projectDir/src/shaders/glsl"))
-    outputDir.set(file("$buildDir/generated/shaderKotlin"))
+    outputDir.set(layout.buildDirectory.dir("generated/shaderKotlin"))
     defaultPackage.set("org.openrndr.extra.fx")
     defaultVisibility.set("internal")
     namePrefix.set("fx_")
@@ -14,7 +14,7 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
 kotlin {
     kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
     sourceSets {
-@Suppress("UNUSED_VARIABLE")
+        @Suppress("UNUSED_VARIABLE")
         val commonMain by getting {
             dependencies {
 
diff --git a/orx-jumpflood/build.gradle.kts b/orx-jumpflood/build.gradle.kts
index 06f86ff9..f9be9770 100644
--- a/orx-jumpflood/build.gradle.kts
+++ b/orx-jumpflood/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
     inputDir.set(file("$projectDir/src/shaders/glsl"))
-    outputDir.set(file("$buildDir/generated/shaderKotlin"))
+    outputDir.set(layout.buildDirectory.dir("generated/shaderKotlin"))
     defaultPackage.set("org.openrndr.extra.jumpflood")
     defaultVisibility.set("internal")
     namePrefix.set("jf_")
diff --git a/orx-noise/build.gradle.kts b/orx-noise/build.gradle.kts
index 5d2a55d0..97398c1d 100644
--- a/orx-noise/build.gradle.kts
+++ b/orx-noise/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
     inputDir.set(file("$projectDir/src/shaders/glsl"))
-    outputDir.set(file("$buildDir/generated/shaderKotlin"))
+    outputDir.set(layout.buildDirectory.dir("generated/shaderKotlin"))
     defaultPackage.set("org.openrndr.extra.noise.filters")
     defaultVisibility.set("internal")
     namePrefix.set("noise_")
diff --git a/orx-shader-phrases/build.gradle.kts b/orx-shader-phrases/build.gradle.kts
index a1d2706c..dfbe498a 100644
--- a/orx-shader-phrases/build.gradle.kts
+++ b/orx-shader-phrases/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
     inputDir.set(file("$projectDir/src/shaders/glsl"))
-    outputDir.set(file("$buildDir/generated/shaderKotlin"))
+    outputDir.set(layout.buildDirectory.dir("generated/shaderKotlin"))
     defaultPackage.set("org.openrndr.shaderphrases.phrases")
 }.get()