diff --git a/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt b/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt
index eb93afb4..1b9da509 100644
--- a/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt
@@ -2,7 +2,6 @@ import org.openrndr.animatable.Animatable
 import org.openrndr.animatable.easing.Easing
 import org.openrndr.application
 import org.openrndr.math.Vector2
-import org.openrndr.shape.contour
 
 fun main() = application {
     program {
diff --git a/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt b/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt
index 995bf765..ca972264 100644
--- a/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
-import org.openrndr.draw.*
-import org.openrndr.extra.camera.Orbital
-import org.openrndr.extra.meshgenerators.boxMesh
+import org.openrndr.draw.createEquivalent
+import org.openrndr.draw.loadImage
 
 fun main() = application {
     program {
diff --git a/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt b/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt
index 28df18fa..ff1260e0 100644
--- a/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt
@@ -1,6 +1,5 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.LineJoin
 import org.openrndr.math.Vector2
 import org.openrndr.shape.ShapeContour
 import org.openrndr.shape.intersections
diff --git a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt
index c58d979a..a11273f3 100644
--- a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt
@@ -5,7 +5,6 @@ import org.openrndr.draw.Shader
 import org.openrndr.extra.camera.Orbital
 import org.openrndr.extra.meshgenerators.boxMesh
 import org.openrndr.resourceText
-import org.openrndr.resourceUrl
 
 fun main() {
     application {
diff --git a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt
index e221ec92..4a06eb1c 100644
--- a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt
@@ -1,9 +1,9 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.*
-import org.openrndr.extra.meshgenerators.planeMesh
-import org.openrndr.internal.Driver
-import org.openrndr.math.Vector3
+import org.openrndr.draw.ImageAccess
+import org.openrndr.draw.colorBuffer
+import org.openrndr.draw.imageBinding
+import org.openrndr.draw.shadeStyle
 
 
 fun main() = application {
diff --git a/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt b/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt
index d3328157..b7d56e2b 100644
--- a/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt
@@ -1,9 +1,9 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.shadeStyle
-import org.openrndr.extensions.Screenshots
 import org.openrndr.math.Polar
 import org.openrndr.shape.contour
+
 fun main() = application {
     program {
         val style = shadeStyle {
diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt
index a881b667..e059d30e 100644
--- a/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt
@@ -1,9 +1,11 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.*
+import org.openrndr.draw.DrawPrimitive
+import org.openrndr.draw.Shader
+import org.openrndr.draw.vertexBuffer
+import org.openrndr.draw.vertexFormat
 import org.openrndr.math.Vector3
 import org.openrndr.resourceText
-import org.openrndr.resourceUrl
 
 fun main() {
     application {
diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt
index 89285ab6..6417b568 100644
--- a/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt
@@ -5,7 +5,6 @@ import org.openrndr.draw.Shader
 import org.openrndr.draw.vertexBuffer
 import org.openrndr.draw.vertexFormat
 import org.openrndr.resourceText
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Ellipse
 
 fun main() {
diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt
index 788dc5a9..2de5a999 100644
--- a/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt
@@ -5,7 +5,6 @@ import org.openrndr.draw.Shader
 import org.openrndr.draw.vertexBuffer
 import org.openrndr.draw.vertexFormat
 import org.openrndr.resourceText
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Ellipse
 
 fun main() {
diff --git a/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt b/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt
index fbb5e383..0acb8786 100644
--- a/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt
+++ b/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt
@@ -1,7 +1,9 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.*
-import org.openrndr.extensions.Screenshots
+import org.openrndr.draw.VolumeTexture
+import org.openrndr.draw.colorBuffer
+import org.openrndr.draw.isolatedWithTarget
+import org.openrndr.draw.renderTarget
 
 fun main() = application {
     program {
diff --git a/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt b/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt
index cbc20a9c..74cbc816 100644
--- a/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt
+++ b/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt
@@ -4,8 +4,6 @@
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.noise.Random
-import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
 
 fun main() = application {
diff --git a/orx-camera/src/commonMain/kotlin/OrbitalControls.kt b/orx-camera/src/commonMain/kotlin/OrbitalControls.kt
index 5b0b8702..51d77755 100644
--- a/orx-camera/src/commonMain/kotlin/OrbitalControls.kt
+++ b/orx-camera/src/commonMain/kotlin/OrbitalControls.kt
@@ -4,7 +4,6 @@ import org.openrndr.*
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.asRadians
-import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.tan
 
diff --git a/orx-camera/src/jvmDemo/kotlin/DemoParametricOrbital01.kt b/orx-camera/src/jvmDemo/kotlin/DemoParametricOrbital01.kt
index 6894cef1..2c92df0f 100644
--- a/orx-camera/src/jvmDemo/kotlin/DemoParametricOrbital01.kt
+++ b/orx-camera/src/jvmDemo/kotlin/DemoParametricOrbital01.kt
@@ -7,8 +7,6 @@ import org.openrndr.extra.camera.*
 import org.openrndr.extra.gui.GUI
 import org.openrndr.extra.gui.addTo
 import org.openrndr.extra.meshgenerators.boxMesh
-import org.openrndr.extra.meshgenerators.sphereMesh
-import org.openrndr.math.Vector3
 
 fun main() = application {
     configure {
@@ -34,4 +32,4 @@ fun main() = application {
             drawer.vertexBuffer(bm, DrawPrimitive.TRIANGLES)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt b/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt
index cc2c6fad..a290799e 100644
--- a/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt
+++ b/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt
@@ -11,7 +11,6 @@ import org.openrndr.extra.color.spaces.toOKHSLa
 import org.openrndr.extra.parameters.*
 import org.openrndr.math.Vector2
 import org.openrndr.math.clamp
-import org.openrndr.math.mod_
 import kotlin.math.*
 
 /*
diff --git a/orx-color/src/commonMain/kotlin/statistics/Histogram.kt b/orx-color/src/commonMain/kotlin/statistics/Histogram.kt
index 93832174..3744c4cf 100644
--- a/orx-color/src/commonMain/kotlin/statistics/Histogram.kt
+++ b/orx-color/src/commonMain/kotlin/statistics/Histogram.kt
@@ -2,9 +2,7 @@
 package org.openrndr.extra.color.statistics
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.ColorBuffer
 import kotlin.jvm.JvmName
-import kotlin.random.Random
 
 internal fun ColorRGBa.binIndex(binCount: Int): Triple<Int, Int, Int> {
     val rb = (r * binCount).toInt().coerceIn(0, binCount - 1)
diff --git a/orx-color/src/jvmDemo/kotlin/DemoColorPlane01.kt b/orx-color/src/jvmDemo/kotlin/DemoColorPlane01.kt
index d9218f0f..dcae0f4f 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoColorPlane01.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoColorPlane01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.camera.Orbital
 import org.openrndr.extra.color.spaces.ColorOKLCHa
 import org.openrndr.extra.meshgenerators.sphereMesh
diff --git a/orx-color/src/jvmDemo/kotlin/DemoColorPlane02.kt b/orx-color/src/jvmDemo/kotlin/DemoColorPlane02.kt
index f8a75015..318768d7 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoColorPlane02.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoColorPlane02.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.camera.Orbital
 import org.openrndr.extra.color.spaces.ColorOKLCHa
 import org.openrndr.extra.meshgenerators.sphereMesh
diff --git a/orx-color/src/jvmDemo/kotlin/DemoColorRange01.kt b/orx-color/src/jvmDemo/kotlin/DemoColorRange01.kt
index 44c2f048..ffd3e2a6 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoColorRange01.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoColorRange01.kt
@@ -3,7 +3,6 @@
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.palettes.rangeTo
 import org.openrndr.extra.color.spaces.toHSLUVa
 import org.openrndr.math.Vector2
diff --git a/orx-color/src/jvmDemo/kotlin/DemoColorRange02.kt b/orx-color/src/jvmDemo/kotlin/DemoColorRange02.kt
index c1261b24..e5cbdb97 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoColorRange02.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoColorRange02.kt
@@ -2,11 +2,7 @@
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.isolated
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.palettes.colorSequence
-import org.openrndr.extra.color.palettes.rangeTo
-import org.openrndr.extra.color.presets.CORAL
 import org.openrndr.extra.color.spaces.toHSLUVa
 
 fun main() = application {
diff --git a/orx-color/src/jvmDemo/kotlin/DemoColorRange04.kt b/orx-color/src/jvmDemo/kotlin/DemoColorRange04.kt
index 836ae957..9e03fa6e 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoColorRange04.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoColorRange04.kt
@@ -3,7 +3,6 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.DrawPrimitive
 import org.openrndr.draw.isolated
 import org.openrndr.draw.loadFont
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.camera.Orbital
 import org.openrndr.extra.color.palettes.rangeTo
 import org.openrndr.extra.color.spaces.toHSLUVa
diff --git a/orx-color/src/jvmDemo/kotlin/DemoHSLUV01.kt b/orx-color/src/jvmDemo/kotlin/DemoHSLUV01.kt
index 16d9296e..6e6f7eb3 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoHSLUV01.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoHSLUV01.kt
@@ -6,7 +6,6 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.color.rgb
 import org.openrndr.draw.isolated
 import org.openrndr.draw.loadFont
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.spaces.ColorHSLUVa
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
diff --git a/orx-color/src/jvmDemo/kotlin/DemoHSLUV02.kt b/orx-color/src/jvmDemo/kotlin/DemoHSLUV02.kt
index 12404e30..f42108cc 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoHSLUV02.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoHSLUV02.kt
@@ -2,7 +2,6 @@
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.spaces.toHSLUVa
 import org.openrndr.math.Polar
 import org.openrndr.math.Vector2
diff --git a/orx-color/src/jvmDemo/kotlin/DemoHistogram01.kt b/orx-color/src/jvmDemo/kotlin/DemoHistogram01.kt
index 249d4a3b..a2c9ca9d 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoHistogram01.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoHistogram01.kt
@@ -2,7 +2,6 @@
 
 import org.openrndr.application
 import org.openrndr.draw.loadImage
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.statistics.calculateHistogramRGB
 
 fun main() = application {
diff --git a/orx-color/src/jvmDemo/kotlin/DemoHistogram02.kt b/orx-color/src/jvmDemo/kotlin/DemoHistogram02.kt
index 97221b5c..f29800df 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoHistogram02.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoHistogram02.kt
@@ -2,7 +2,6 @@
 
 import org.openrndr.application
 import org.openrndr.draw.loadImage
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.statistics.calculateHistogramRGB
 import kotlin.math.pow
 
diff --git a/orx-color/src/jvmDemo/kotlin/DemoHistogram03.kt b/orx-color/src/jvmDemo/kotlin/DemoHistogram03.kt
index fad11a84..57f7e2f8 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoHistogram03.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoHistogram03.kt
@@ -2,7 +2,6 @@
 
 import org.openrndr.application
 import org.openrndr.draw.loadImage
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.statistics.calculateHistogramRGB
 
 fun main() = application {
diff --git a/orx-color/src/jvmDemo/kotlin/DemoHueTools01.kt b/orx-color/src/jvmDemo/kotlin/DemoHueTools01.kt
index 7e428aaa..25f9a6fa 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoHueTools01.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoHueTools01.kt
@@ -1,12 +1,9 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.isolated
-import org.openrndr.extra.color.presets.NAVY
 import org.openrndr.extra.color.spaces.OKHSV
-import org.openrndr.extra.color.tools.hue
 import org.openrndr.extra.color.tools.mixHue
 import org.openrndr.extra.color.tools.withHue
-import kotlin.math.cos
 
 fun main() {
     application {
diff --git a/orx-color/src/jvmDemo/kotlin/DemoXSLUV01.kt b/orx-color/src/jvmDemo/kotlin/DemoXSLUV01.kt
index 6a6c48c4..2a0ab059 100644
--- a/orx-color/src/jvmDemo/kotlin/DemoXSLUV01.kt
+++ b/orx-color/src/jvmDemo/kotlin/DemoXSLUV01.kt
@@ -2,7 +2,6 @@
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.spaces.ColorXSLUVa
 import org.openrndr.extra.color.spaces.toHSLUVa
 import org.openrndr.math.Polar
diff --git a/orx-compositor/src/jvmDemo/kotlin/DemoCompositor01.kt b/orx-compositor/src/jvmDemo/kotlin/DemoCompositor01.kt
index 3cf4b2d8..0ba206cd 100644
--- a/orx-compositor/src/jvmDemo/kotlin/DemoCompositor01.kt
+++ b/orx-compositor/src/jvmDemo/kotlin/DemoCompositor01.kt
@@ -2,7 +2,6 @@ import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.color.rgb
 import org.openrndr.draw.Drawer
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.compositor.compose
 import org.openrndr.extra.compositor.draw
 import org.openrndr.extra.compositor.layer
diff --git a/orx-envelopes/src/commonMain/kotlin/ADSR.kt b/orx-envelopes/src/commonMain/kotlin/ADSR.kt
index ac51bb01..f84fcbad 100644
--- a/orx-envelopes/src/commonMain/kotlin/ADSR.kt
+++ b/orx-envelopes/src/commonMain/kotlin/ADSR.kt
@@ -1,7 +1,6 @@
 package org.openrndr.extra.envelopes
 
 import org.openrndr.math.mix
-import kotlin.jvm.JvmRecord
 import kotlin.math.min
 
 data class ADSR(
diff --git a/orx-expression-evaluator-typed/build.gradle.kts b/orx-expression-evaluator-typed/build.gradle.kts
index dc4eca28..67cc0971 100644
--- a/orx-expression-evaluator-typed/build.gradle.kts
+++ b/orx-expression-evaluator-typed/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
-
 plugins {
     org.openrndr.extra.convention.`kotlin-multiplatform`
 }
diff --git a/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/Function2.kt b/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/Function2.kt
index 5f53a42a..615c25f5 100644
--- a/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/Function2.kt
+++ b/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/Function2.kt
@@ -5,10 +5,8 @@ import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.Vector4
 import org.openrndr.math.transforms.rotate
-import org.openrndr.math.transforms.translate
-import org.openrndr.math.min as min_
 import org.openrndr.math.max as max_
-
+import org.openrndr.math.min as min_
 import kotlin.math.max as max_
 import kotlin.math.min as min_
 
diff --git a/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/TypedExpressions.kt b/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/TypedExpressions.kt
index fad30a90..b3c356bd 100644
--- a/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/TypedExpressions.kt
+++ b/orx-expression-evaluator-typed/src/commonMain/kotlin/typed/TypedExpressions.kt
@@ -9,11 +9,10 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.expressions.parser.KeyLangLexer
 import org.openrndr.extra.expressions.parser.KeyLangParser
 import org.openrndr.extra.expressions.parser.KeyLangParserBaseListener
-import org.openrndr.extra.expressions.parser.KeyLangParserVisitor
-
 import org.openrndr.extra.noise.uniform
 import org.openrndr.math.*
-import kotlin.math.*
+import kotlin.math.PI
+import kotlin.math.roundToInt
 
 typealias TypedFunction0 = () -> Any
 typealias TypedFunction1 = (Any) -> Any
diff --git a/orx-expression-evaluator/src/jvmDemo/kotlin/DemoExpressionEvaluator02.kt b/orx-expression-evaluator/src/jvmDemo/kotlin/DemoExpressionEvaluator02.kt
index 99506085..879917a4 100644
--- a/orx-expression-evaluator/src/jvmDemo/kotlin/DemoExpressionEvaluator02.kt
+++ b/orx-expression-evaluator/src/jvmDemo/kotlin/DemoExpressionEvaluator02.kt
@@ -1,5 +1,4 @@
 import org.openrndr.application
-import org.openrndr.extra.expressions.evaluateExpression
 import org.openrndr.extra.expressions.watchingExpression1
 import org.openrndr.extra.gui.GUI
 import org.openrndr.extra.gui.addTo
diff --git a/orx-fcurve/src/commonMain/kotlin/FCurve.kt b/orx-fcurve/src/commonMain/kotlin/FCurve.kt
index f98f6faa..136bec9b 100644
--- a/orx-fcurve/src/commonMain/kotlin/FCurve.kt
+++ b/orx-fcurve/src/commonMain/kotlin/FCurve.kt
@@ -6,7 +6,6 @@ import org.openrndr.math.transforms.buildTransform
 import org.openrndr.shape.Segment2D
 import org.openrndr.shape.ShapeContour
 import org.openrndr.shape.bounds
-import kotlin.jvm.JvmRecord
 import kotlin.math.abs
 
 /**
diff --git a/orx-fft/src/jvmDemo/kotlin/DemoFFTShape01.kt b/orx-fft/src/jvmDemo/kotlin/DemoFFTShape01.kt
index d5ed5dae..3697fe6d 100644
--- a/orx-fft/src/jvmDemo/kotlin/DemoFFTShape01.kt
+++ b/orx-fft/src/jvmDemo/kotlin/DemoFFTShape01.kt
@@ -1,12 +1,11 @@
 import org.openrndr.application
-
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.fft.FFT
 import org.openrndr.extra.noise.scatter
 import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
-import org.openrndr.math.Vector2
 import org.openrndr.extra.shapes.splines.catmullRom
 import org.openrndr.extra.shapes.splines.toContour
+import org.openrndr.math.Vector2
 import org.openrndr.math.smoothstep
 import org.openrndr.math.transforms.buildTransform
 import org.openrndr.shape.LineSegment
diff --git a/orx-fx/src/commonMain/kotlin/FilterTools.kt b/orx-fx/src/commonMain/kotlin/FilterTools.kt
index a9b54de8..646e4f65 100644
--- a/orx-fx/src/commonMain/kotlin/FilterTools.kt
+++ b/orx-fx/src/commonMain/kotlin/FilterTools.kt
@@ -4,8 +4,6 @@ import org.openrndr.draw.ColorFormat
 import org.openrndr.draw.ColorType
 import org.openrndr.draw.Shader
 import org.openrndr.draw.filterShaderFromCode
-import org.openrndr.internal.Driver
-import org.openrndr.resourceUrl
 
 fun mppFilterShader(code: String, name: String) : Shader = filterShaderFromCode(code, name, includeShaderConfiguration = true)
 
diff --git a/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt b/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt
index 569fcb8b..5ca822b2 100644
--- a/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt
+++ b/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.antialias
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_fxaa
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt b/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt
index 8713756a..f0a04a36 100644
--- a/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt
+++ b/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.blend
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.Filter2to1
 import org.openrndr.extra.fx.*
diff --git a/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt b/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt
index d1da89f5..54692899 100644
--- a/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt
+++ b/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.blur
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.Filter2to1
 import org.openrndr.draw.Filter3to1
diff --git a/orx-fx/src/commonMain/kotlin/color/ColorMix.kt b/orx-fx/src/commonMain/kotlin/color/ColorMix.kt
index 8783d2b1..7a92b2f1 100644
--- a/orx-fx/src/commonMain/kotlin/color/ColorMix.kt
+++ b/orx-fx/src/commonMain/kotlin/color/ColorMix.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_color_mix
 import org.openrndr.extra.fx.fx_color_tint
diff --git a/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt b/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt
index cc493a82..b87fe690 100644
--- a/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt
+++ b/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt
@@ -1,13 +1,9 @@
 package org.openrndr.extra.fx.color
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
-import org.openrndr.extra.fx.*
-import org.openrndr.extra.fx.fx_rgb_to_oklab
-import org.openrndr.extra.fx.fx_rgb_to_ycbcr
-import org.openrndr.extra.fx.fx_ycbcr_to_rgb
-import org.openrndr.extra.shaderphrases.preprocess
 import org.openrndr.extra.color.phrases.ColorPhraseBook
+import org.openrndr.extra.fx.*
+import org.openrndr.extra.shaderphrases.preprocess
 
 class RgbToYCbcr : Filter1to1(mppFilterShader(fx_rgb_to_ycbcr, "rgb-to-ycbcr"))
 class YcbcrToRgb : Filter1to1(mppFilterShader(fx_ycbcr_to_rgb, "ycbcr_to_rgb"))
diff --git a/orx-fx/src/commonMain/kotlin/color/Duotone.kt b/orx-fx/src/commonMain/kotlin/color/Duotone.kt
index 19a2c7f6..36a0bb05 100644
--- a/orx-fx/src/commonMain/kotlin/color/Duotone.kt
+++ b/orx-fx/src/commonMain/kotlin/color/Duotone.kt
@@ -3,19 +3,16 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
+import org.openrndr.extra.color.phrases.ColorPhraseBook
+import org.openrndr.extra.color.presets.CORAL
+import org.openrndr.extra.color.presets.NAVY
 import org.openrndr.extra.fx.fx_duotone
 import org.openrndr.extra.parameters.BooleanParameter
-
 import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.shaderphrases.preprocess
-import org.openrndr.extra.color.phrases.ColorPhraseBook
-import org.openrndr.extra.color.presets.CORAL
-import org.openrndr.extra.color.presets.DARK_GRAY
-import org.openrndr.extra.color.presets.NAVY
 
 @Description("Duotone")
 class Duotone : Filter1to1(filterShaderFromCode(run {
diff --git a/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt b/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt
index 0400c512..52c56868 100644
--- a/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt
+++ b/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt
@@ -3,19 +3,17 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
+import org.openrndr.extra.color.phrases.ColorPhraseBook
+import org.openrndr.extra.color.presets.CORAL
+import org.openrndr.extra.color.presets.NAVY
 import org.openrndr.extra.fx.fx_duotone_gradient
 import org.openrndr.extra.parameters.BooleanParameter
-
 import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.extra.shaderphrases.preprocess
-import org.openrndr.extra.color.phrases.ColorPhraseBook
-import org.openrndr.extra.color.presets.CORAL
-import org.openrndr.extra.color.presets.NAVY
 
 @Description("Duotone Gradient")
 class DuotoneGradient : Filter1to1(filterShaderFromCode(run {
diff --git a/orx-fx/src/commonMain/kotlin/color/Invert.kt b/orx-fx/src/commonMain/kotlin/color/Invert.kt
index eadcea9b..8eb06357 100644
--- a/orx-fx/src/commonMain/kotlin/color/Invert.kt
+++ b/orx-fx/src/commonMain/kotlin/color/Invert.kt
@@ -2,10 +2,8 @@
 
 package org.openrndr.extra.fx.color
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_invert
-import org.openrndr.extra.fx.fx_sepia
 import org.openrndr.extra.fx.mppFilterShader
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
diff --git a/orx-fx/src/commonMain/kotlin/color/LumaMap.kt b/orx-fx/src/commonMain/kotlin/color/LumaMap.kt
index cfc6caa9..9ad50c50 100644
--- a/orx-fx/src/commonMain/kotlin/color/LumaMap.kt
+++ b/orx-fx/src/commonMain/kotlin/color/LumaMap.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_luma_map
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt b/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt
index e1797314..a57f5103 100644
--- a/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt
+++ b/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.color
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_luma_opacity
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt b/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt
index 5077cdb0..dcb13a0e 100644
--- a/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt
+++ b/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_luma_threshold
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/color/Pal.kt b/orx-fx/src/commonMain/kotlin/color/Pal.kt
index 3758033f..a5e223db 100644
--- a/orx-fx/src/commonMain/kotlin/color/Pal.kt
+++ b/orx-fx/src/commonMain/kotlin/color/Pal.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.color
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_pal
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/color/Posterize.kt b/orx-fx/src/commonMain/kotlin/color/Posterize.kt
index 063c0a19..dfa340a1 100644
--- a/orx-fx/src/commonMain/kotlin/color/Posterize.kt
+++ b/orx-fx/src/commonMain/kotlin/color/Posterize.kt
@@ -2,22 +2,11 @@
 
 package org.openrndr.extra.fx.color
 
-import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
-import org.openrndr.extra.fx.fx_duotone
 import org.openrndr.extra.fx.fx_posterize
-import org.openrndr.extra.parameters.BooleanParameter
-
-import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.IntParameter
-import org.openrndr.extra.shaderphrases.preprocess
-import org.openrndr.extra.color.phrases.ColorPhraseBook
-import org.openrndr.extra.color.presets.CORAL
-import org.openrndr.extra.color.presets.DARK_GRAY
-import org.openrndr.extra.color.presets.NAVY
 
 @Description("Posterize")
 class Posterize : Filter1to1(filterShaderFromCode(fx_posterize, "posterize")) {
diff --git a/orx-fx/src/commonMain/kotlin/color/Sepia.kt b/orx-fx/src/commonMain/kotlin/color/Sepia.kt
index ddafece2..8af108cc 100644
--- a/orx-fx/src/commonMain/kotlin/color/Sepia.kt
+++ b/orx-fx/src/commonMain/kotlin/color/Sepia.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.color
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_sepia
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/color/SetBackground.kt b/orx-fx/src/commonMain/kotlin/color/SetBackground.kt
index 784675a0..9ba43772 100644
--- a/orx-fx/src/commonMain/kotlin/color/SetBackground.kt
+++ b/orx-fx/src/commonMain/kotlin/color/SetBackground.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_set_background
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/color/SubtractConstant.kt b/orx-fx/src/commonMain/kotlin/color/SubtractConstant.kt
index ec0fe2e2..3d2b9f68 100644
--- a/orx-fx/src/commonMain/kotlin/color/SubtractConstant.kt
+++ b/orx-fx/src/commonMain/kotlin/color/SubtractConstant.kt
@@ -1,7 +1,6 @@
 package org.openrndr.extra.fx.color
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_subtract_constant
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt b/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt
index 7f652ab1..e520132e 100644
--- a/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt
+++ b/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt
@@ -2,13 +2,14 @@
 
 package org.openrndr.extra.fx.distort
 
-import org.openrndr.draw.*
+import org.openrndr.draw.ColorBuffer
+import org.openrndr.draw.Filter1to1
+import org.openrndr.draw.MagnifyingFilter
+import org.openrndr.draw.MinifyingFilter
 import org.openrndr.extra.fx.fx_polar_to_rectangular
 import org.openrndr.extra.fx.mppFilterShader
 import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.extra.parameters.Description
-import org.openrndr.extra.parameters.Vector2Parameter
-import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
 
 @Description("Polar to rectangular")
diff --git a/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt b/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt
index 3fb905d7..a5f71ed6 100644
--- a/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt
+++ b/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt
@@ -2,15 +2,15 @@
 
 package org.openrndr.extra.fx.distort
 
-import org.openrndr.draw.*
+import org.openrndr.draw.ColorBuffer
+import org.openrndr.draw.Filter1to1
+import org.openrndr.draw.MagnifyingFilter
+import org.openrndr.draw.MinifyingFilter
 import org.openrndr.extra.fx.fx_rectangular_to_polar
 import org.openrndr.extra.fx.mppFilterShader
 import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.extra.parameters.Description
-import org.openrndr.extra.parameters.Vector2Parameter
-import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
-import kotlin.math.log
 
 @Description("Rectangular to polar")
 class RectangularToPolar : Filter1to1(mppFilterShader(fx_rectangular_to_polar, "rectangular-to-polar")) {
diff --git a/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt b/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt
index 304888aa..c06d6519 100644
--- a/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt
+++ b/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.distort
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_tape_noise
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt b/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt
index 8dc68661..362f9a5f 100644
--- a/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt
+++ b/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.distort
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_video_glitch
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/dither/ADither.kt b/orx-fx/src/commonMain/kotlin/dither/ADither.kt
index 2baa5822..dc3b274a 100644
--- a/orx-fx/src/commonMain/kotlin/dither/ADither.kt
+++ b/orx-fx/src/commonMain/kotlin/dither/ADither.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.dither
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_a_dither
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt b/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt
index 375a78bd..719de37b 100644
--- a/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt
+++ b/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.dither
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_cmyk_halftone
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt b/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt
index 523c243e..74e858d6 100644
--- a/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt
+++ b/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.dither
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_crosshatch
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt b/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt
index 8e1ff3ed..865dc7bb 100644
--- a/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt
+++ b/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.dither
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
 import org.openrndr.extra.fx.fx_luma_halftone
diff --git a/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt b/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt
index 9f2b3d2d..d2e6a83a 100644
--- a/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt
+++ b/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.edges
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
 import org.openrndr.extra.fx.fx_canny_edge_detector
diff --git a/orx-fx/src/commonMain/kotlin/edges/Contour.kt b/orx-fx/src/commonMain/kotlin/edges/Contour.kt
index 217e6780..64610d18 100644
--- a/orx-fx/src/commonMain/kotlin/edges/Contour.kt
+++ b/orx-fx/src/commonMain/kotlin/edges/Contour.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.edges
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_contour
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt b/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt
index 263ce95b..a871c4e9 100644
--- a/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt
+++ b/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.edges
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_luma_sobel
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt b/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt
index de7e8988..8f39776d 100644
--- a/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt
+++ b/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt
@@ -2,13 +2,13 @@
 
 package org.openrndr.extra.fx.grain
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_film_grain
 import org.openrndr.extra.fx.mppFilterShader
 import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
+
 /**
  * Film grain filter
  */
diff --git a/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt b/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt
index 0359bf4b..5064d4f0 100644
--- a/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt
+++ b/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt
@@ -1,14 +1,11 @@
 @file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
-import org.openrndr.extra.fx.fx_film_grain
 import org.openrndr.extra.fx.fx_multiply_u
-import org.openrndr.extra.fx.mppFilterShader
-import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
+
 /**
  * Multiply by u coordinate
  */
diff --git a/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt b/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt
index 6b739cba..9e24ff09 100644
--- a/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt
+++ b/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt
@@ -1,12 +1,12 @@
 @file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
 import org.openrndr.extra.fx.fx_multiply_v
 import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
+
 /**
  * Multiply by v coordinate
  */
diff --git a/orx-fx/src/commonMain/kotlin/math/Square.kt b/orx-fx/src/commonMain/kotlin/math/Square.kt
index b310bbe0..9f0c7c46 100644
--- a/orx-fx/src/commonMain/kotlin/math/Square.kt
+++ b/orx-fx/src/commonMain/kotlin/math/Square.kt
@@ -1,10 +1,10 @@
 @file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.draw.filterShaderFromCode
 import org.openrndr.extra.fx.fx_square
 import org.openrndr.extra.parameters.Description
+
 /**
  * Square input texture values
  */
diff --git a/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt b/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt
index fe460783..8df4f53d 100644
--- a/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt
+++ b/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt
@@ -3,7 +3,6 @@
 package org.openrndr.extra.fx.patterns
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_checkers
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt b/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt
index a4010e93..fd175595 100644
--- a/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt
+++ b/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt
@@ -2,7 +2,6 @@
 
 package org.openrndr.extra.fx.tonemap
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_uncharted2_tonemap
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/commonMain/kotlin/transform/FlipVertically.kt b/orx-fx/src/commonMain/kotlin/transform/FlipVertically.kt
index 29d1accf..6f7ee767 100644
--- a/orx-fx/src/commonMain/kotlin/transform/FlipVertically.kt
+++ b/orx-fx/src/commonMain/kotlin/transform/FlipVertically.kt
@@ -1,6 +1,5 @@
 package org.openrndr.extra.fx.transform
 
-import org.openrndr.draw.Filter
 import org.openrndr.draw.Filter1to1
 import org.openrndr.extra.fx.fx_flip_vertically
 import org.openrndr.extra.fx.mppFilterShader
diff --git a/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt b/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt
index ea365f76..8d0a063e 100644
--- a/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt
+++ b/orx-fx/src/jvmDemo/kotlin/DemoColorDuotone01.kt
@@ -1,8 +1,7 @@
-import org.openrndr.extra.fx.color.Duotone
 import org.openrndr.application
 import org.openrndr.draw.createEquivalent
 import org.openrndr.draw.loadImage
-import org.openrndr.math.mod_
+import org.openrndr.extra.fx.color.Duotone
 
 fun main() {
     application {
@@ -13,14 +12,10 @@ fun main() {
             val duotone = Duotone()
 
             extend {
-
                 duotone.labInterpolation = seconds.mod(2.0) < 1.0
                 duotone.apply(image, filteredImage)
                 drawer.image(filteredImage)
-
             }
-
         }
-
     }
 }
\ No newline at end of file
diff --git a/orx-fx/src/jvmDemo/kotlin/DemoColorPosterize01.kt b/orx-fx/src/jvmDemo/kotlin/DemoColorPosterize01.kt
index ce265c02..afdef9a8 100644
--- a/orx-fx/src/jvmDemo/kotlin/DemoColorPosterize01.kt
+++ b/orx-fx/src/jvmDemo/kotlin/DemoColorPosterize01.kt
@@ -1,9 +1,7 @@
-import org.openrndr.extra.fx.color.Duotone
 import org.openrndr.application
 import org.openrndr.draw.createEquivalent
 import org.openrndr.draw.loadImage
 import org.openrndr.extra.fx.color.Posterize
-import org.openrndr.math.mod_
 
 fun main() {
     application {
@@ -16,10 +14,7 @@ fun main() {
                 posterize.levels = 2
                 posterize.apply(image, filteredImage)
                 drawer.image(filteredImage)
-
             }
-
         }
-
     }
 }
\ No newline at end of file
diff --git a/orx-fx/src/jvmDemo/kotlin/DemoFluidDistort01.kt b/orx-fx/src/jvmDemo/kotlin/DemoFluidDistort01.kt
index b6992d13..c66cf85e 100644
--- a/orx-fx/src/jvmDemo/kotlin/DemoFluidDistort01.kt
+++ b/orx-fx/src/jvmDemo/kotlin/DemoFluidDistort01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.draw.colorBuffer
 import org.openrndr.draw.createEquivalent
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.fx.distort.FluidDistort
 import org.openrndr.extra.fx.patterns.Checkers
 
diff --git a/orx-fx/src/jvmDemo/kotlin/DemoPost01.kt b/orx-fx/src/jvmDemo/kotlin/DemoPost01.kt
index 95109150..7b4bc756 100644
--- a/orx-fx/src/jvmDemo/kotlin/DemoPost01.kt
+++ b/orx-fx/src/jvmDemo/kotlin/DemoPost01.kt
@@ -1,9 +1,7 @@
-import org.openrndr.WindowMultisample
 import org.openrndr.application
 import org.openrndr.extra.fx.Post
 import org.openrndr.extra.fx.blend.Add
 import org.openrndr.extra.fx.blur.ApproximateGaussianBlur
-import org.openrndr.shape.Circle
 import kotlin.math.cos
 
 fun main() = application {
diff --git a/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt b/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt
index c2b85c17..4cc867ff 100644
--- a/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt
@@ -3,14 +3,12 @@
 package org.openrndr.extra.jumpfill.draw
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.ColorBuffer
 import org.openrndr.draw.Filter
 import org.openrndr.draw.filterShaderFromCode
 import org.openrndr.extra.jumpflood.jf_sdf_stroke_fill
 import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
-import org.openrndr.shape.Rectangle
 
 @Description("SDF stroke and fill")
 class SDFStrokeFill : Filter(filterShaderFromCode(jf_sdf_stroke_fill, "sdf-stroke-fill")) {
diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/InnerBevel.kt b/orx-jumpflood/src/commonMain/kotlin/fx/InnerBevel.kt
index e0e6bbca..087e9aef 100644
--- a/orx-jumpflood/src/commonMain/kotlin/fx/InnerBevel.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/fx/InnerBevel.kt
@@ -10,7 +10,6 @@ import org.openrndr.extra.jumpflood.jf_inner_bevel
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 
 private class InnerBevelFilter : Filter(filterShaderFromCode(jf_inner_bevel, "inner-bevel")) {
diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt b/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt
index dbb6012a..85770cab 100644
--- a/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt
@@ -12,7 +12,6 @@ import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 
 private class InnerGlowFilter : Filter(filterShaderFromCode(jf_inner_glow, "inner-glow")) {
diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/Inpaint.kt b/orx-jumpflood/src/commonMain/kotlin/fx/Inpaint.kt
index 7938cf16..fed89bc1 100644
--- a/orx-jumpflood/src/commonMain/kotlin/fx/Inpaint.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/fx/Inpaint.kt
@@ -8,7 +8,6 @@ import org.openrndr.extra.jumpflood.jf_inpaint
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 
 private class InpaintFilter : Filter(filterShaderFromCode(jf_inpaint, "inpaint")) {
diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt b/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt
index df05a05a..27e174eb 100644
--- a/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt
@@ -12,7 +12,6 @@ import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 
 private class OuterGlowFilter : Filter(filterShaderFromCode(jf_outer_glow, "outer-glow")) {
diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt b/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt
index ed4b8f9f..a60bd981 100644
--- a/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt
@@ -4,14 +4,15 @@ package org.openrndr.extra.jumpfill.fx
 
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
-import org.openrndr.extra.jumpfill.*
+import org.openrndr.extra.jumpfill.ContourPoints
+import org.openrndr.extra.jumpfill.JumpFlooder
+import org.openrndr.extra.jumpfill.PixelDistance
+import org.openrndr.extra.jumpfill.Threshold
 import org.openrndr.extra.jumpflood.jf_skeleton
 import org.openrndr.extra.parameters.ColorParameter
-
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 
 private class SkeletonFilter : Filter(filterShaderFromCode(jf_skeleton, "skeleton")) {
diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt b/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt
index fcf40fde..fcb077c6 100644
--- a/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt
@@ -4,14 +4,15 @@ package org.openrndr.extra.jumpfill.fx
 
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
-import org.openrndr.extra.jumpfill.*
+import org.openrndr.extra.jumpfill.ContourPoints
+import org.openrndr.extra.jumpfill.JumpFlooder
+import org.openrndr.extra.jumpfill.PixelDirection
+import org.openrndr.extra.jumpfill.Threshold
 import org.openrndr.extra.jumpflood.jf_straight_skeleton
 import org.openrndr.extra.parameters.ColorParameter
-
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 import kotlin.math.sqrt
 
diff --git a/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt b/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt
index 17ac2756..4d3f310f 100644
--- a/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt
+++ b/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt
@@ -9,7 +9,6 @@ import org.openrndr.draw.filterShaderFromCode
 import org.openrndr.extra.jumpflood.*
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 
 class SDFSmoothUnion : Filter(filterShaderFromCode(jf_sdf_smooth_union, "sdf-smooth-union")) {
diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoInnerGlow02.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoInnerGlow02.kt
index 95c16b1e..d00f8dee 100644
--- a/orx-jumpflood/src/jvmDemo/kotlin/DemoInnerGlow02.kt
+++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoInnerGlow02.kt
@@ -1,6 +1,5 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.compositor.compose
 import org.openrndr.extra.compositor.draw
 import org.openrndr.extra.compositor.layer
diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoSkeleton01.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoSkeleton01.kt
index 7895d5b9..b3e699c3 100644
--- a/orx-jumpflood/src/jvmDemo/kotlin/DemoSkeleton01.kt
+++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoSkeleton01.kt
@@ -2,10 +2,8 @@ import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.ColorType
 import org.openrndr.draw.createEquivalent
-
 import org.openrndr.draw.isolatedWithTarget
 import org.openrndr.draw.renderTarget
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.jumpfill.fx.Skeleton
 import org.openrndr.extra.noise.simplex
 
diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoVoronoi03.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoVoronoi03.kt
index 35d36042..22ebd802 100644
--- a/orx-jumpflood/src/jvmDemo/kotlin/DemoVoronoi03.kt
+++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoVoronoi03.kt
@@ -1,8 +1,8 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
-import org.openrndr.extra.fx.blend.Passthrough
-import org.openrndr.extra.jumpfill.*
+import org.openrndr.extra.jumpfill.ClusteredField
+import org.openrndr.extra.jumpfill.DecodeMode
 import org.openrndr.extra.noise.scatter
 import org.openrndr.extra.noise.uniformRing
 import org.openrndr.math.Vector2
diff --git a/orx-jumpflood/src/jvmMain/kotlin/ShapeSDF.kt b/orx-jumpflood/src/jvmMain/kotlin/ShapeSDF.kt
index 688b6d8f..b949b584 100644
--- a/orx-jumpflood/src/jvmMain/kotlin/ShapeSDF.kt
+++ b/orx-jumpflood/src/jvmMain/kotlin/ShapeSDF.kt
@@ -5,7 +5,6 @@ import org.openrndr.extra.jumpflood.jf_shape_sdf
 import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.math.Matrix44
 import org.openrndr.math.Vector4
-import org.openrndr.resourceUrl
 import org.openrndr.shape.Rectangle
 import org.openrndr.shape.Shape
 import org.openrndr.shape.ShapeContour
diff --git a/orx-jvm/orx-boofcv/src/demo/kotlin/DemoContours01.kt b/orx-jvm/orx-boofcv/src/demo/kotlin/DemoContours01.kt
index 2b4a5249..bd17d0da 100644
--- a/orx-jvm/orx-boofcv/src/demo/kotlin/DemoContours01.kt
+++ b/orx-jvm/orx-boofcv/src/demo/kotlin/DemoContours01.kt
@@ -9,7 +9,6 @@ import org.openrndr.boofcv.binding.toShapeContours
 import org.openrndr.color.ColorRGBa
 import org.openrndr.color.rgb
 import org.openrndr.draw.loadImage
-import org.openrndr.extensions.SingleScreenshot
 import kotlin.math.cos
 import kotlin.math.sin
 
diff --git a/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize01.kt b/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize01.kt
index 7bce9b08..2d24d44c 100644
--- a/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize01.kt
+++ b/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize01.kt
@@ -1,8 +1,7 @@
 import org.openrndr.application
-import org.openrndr.boofcv.binding.*
+import org.openrndr.boofcv.binding.resizeBy
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.loadImage
-import org.openrndr.extensions.SingleScreenshot
 
 
 fun main() {
diff --git a/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize02.kt b/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize02.kt
index 354fb8f0..0271cd1b 100644
--- a/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize02.kt
+++ b/orx-jvm/orx-boofcv/src/demo/kotlin/DemoResize02.kt
@@ -1,8 +1,7 @@
 import org.openrndr.application
-import org.openrndr.boofcv.binding.*
+import org.openrndr.boofcv.binding.resizeTo
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.loadImage
-import org.openrndr.extensions.SingleScreenshot
 
 
 fun main() {
diff --git a/orx-jvm/orx-boofcv/src/main/kotlin/Binding.kt b/orx-jvm/orx-boofcv/src/main/kotlin/Binding.kt
index 2df3defb..e593ce46 100644
--- a/orx-jvm/orx-boofcv/src/main/kotlin/Binding.kt
+++ b/orx-jvm/orx-boofcv/src/main/kotlin/Binding.kt
@@ -9,7 +9,6 @@ import org.openrndr.draw.ColorBuffer
 import org.openrndr.draw.ColorFormat
 import org.openrndr.draw.ColorType
 import org.openrndr.draw.colorBuffer
-import kotlin.experimental.and
 
 fun ColorBuffer.toGrayF32() : GrayF32 {
     val p = GrayF32(width, height)
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
index 8f5b4503..f46a833c 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
@@ -1,13 +1,14 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.DirectionalLight
+import org.openrndr.extra.dnk3.HemisphereLight
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.extra.camera.Orbital
 import org.openrndr.math.Vector3
-import org.openrndr.math.mod_
 import org.openrndr.math.transforms.transform
 import java.io.File
 
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt
index 36c3e3a5..9fec6c2d 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt
@@ -1,11 +1,9 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.dnk3.*
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.math.*
 import java.io.File
 
 fun main() = application {
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt
index 5303f2b5..05156987 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt
@@ -1,30 +1,22 @@
 import kotlinx.coroutines.yield
-import org.openrndr.*
+import org.openrndr.WindowMultisample
+import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.BufferMultisample
 import org.openrndr.draw.ColorFormat
 import org.openrndr.draw.ColorType
 import org.openrndr.draw.DrawPrimitive
-import org.openrndr.extensions.SingleScreenshot
+import org.openrndr.extra.camera.Orbital
 import org.openrndr.extra.dnk3.*
-import org.openrndr.extra.dnk3.features.IrradianceSH
 import org.openrndr.extra.dnk3.features.addIrradianceSH
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
-import org.openrndr.extra.dnk3.post.ScreenspaceReflections
-import org.openrndr.extra.dnk3.post.VolumetricIrradiance
 import org.openrndr.extra.dnk3.renderers.postRenderer
-import org.openrndr.extra.shaderphrases.annotations.ShaderPhrases
-import org.openrndr.extra.camera.Orbital
 import org.openrndr.extra.meshgenerators.sphereMesh
-import org.openrndr.ffmpeg.ScreenRecorder
 import org.openrndr.filter.color.Delinearize
-import org.openrndr.math.Matrix44
+import org.openrndr.launch
 import org.openrndr.math.Spherical
 import org.openrndr.math.Vector3
-import org.openrndr.math.transforms.scale
 import org.openrndr.math.transforms.transform
-import org.openrndr.math.transforms.translate
 import java.io.File
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt
index 836a99c0..431c18b1 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt
@@ -1,12 +1,14 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.HemisphereLight
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.extra.camera.Orbital
-import org.openrndr.math.*
+import org.openrndr.math.Spherical
+import org.openrndr.math.Vector3
 import java.io.File
 
 fun main() = application {
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt
index 67236c80..d1a57447 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt
@@ -1,12 +1,14 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.HemisphereLight
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.extra.camera.Orbital
-import org.openrndr.math.*
+import org.openrndr.math.Spherical
+import org.openrndr.math.Vector3
 import java.io.File
 
 fun main() = application {
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt
index 2c55b2c0..11d65de5 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt
@@ -1,12 +1,14 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.HemisphereLight
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.extra.camera.Orbital
-import org.openrndr.math.*
+import org.openrndr.math.Spherical
+import org.openrndr.math.Vector3
 import java.io.File
 
 fun main() = application {
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt
index ddb8d91f..39bce5d0 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt
@@ -1,9 +1,8 @@
 import org.openrndr.application
 import org.openrndr.draw.DrawPrimitive
 import org.openrndr.draw.shadeStyle
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.math.Vector3
 import java.io.File
 
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt
index cff00adf..3fec9087 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt
@@ -1,11 +1,13 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.DirectionalLight
+import org.openrndr.extra.dnk3.HemisphereLight
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.extra.camera.Orbital
 import org.openrndr.math.Vector3
 import org.openrndr.math.transforms.transform
 import java.io.File
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt
index fc062e8a..f0d6b97d 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt
@@ -1,11 +1,9 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.DrawPrimitive
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
-
-import org.openrndr.extra.dnk3.renderers.dryRenderer
 import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.dnk3.renderers.dryRenderer
 import org.openrndr.extra.meshgenerators.sphereMesh
 import org.openrndr.math.Vector3
 import org.openrndr.math.transforms.transform
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt
index ce42de8c..f1af38f8 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt
@@ -2,14 +2,13 @@ import org.openrndr.WindowMultisample
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.BufferMultisample
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.segmentContourRenderer
-import org.openrndr.extra.camera.Orbital
 import org.openrndr.math.Vector3
-import org.openrndr.math.mod_
 import java.io.File
 
 fun main() = application {
diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt
index 7bfcbfab..9c5df1e9 100644
--- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt
+++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt
@@ -1,13 +1,13 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.dnk3.*
+import org.openrndr.extra.camera.Orbital
+import org.openrndr.extra.dnk3.HemisphereLight
+import org.openrndr.extra.dnk3.Scene
+import org.openrndr.extra.dnk3.SceneNode
 import org.openrndr.extra.dnk3.gltf.buildSceneNodes
 import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
 import org.openrndr.extra.dnk3.renderers.dryRenderer
-import org.openrndr.extra.camera.Orbital
 import org.openrndr.math.Vector3
-import org.openrndr.math.mod_
 import java.io.File
 
 fun main() = application {
diff --git a/orx-jvm/orx-dnk3/src/main/kotlin/Material.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Material.kt
index 807bdd72..fa9e85ff 100644
--- a/orx-jvm/orx-dnk3/src/main/kotlin/Material.kt
+++ b/orx-jvm/orx-dnk3/src/main/kotlin/Material.kt
@@ -1,8 +1,10 @@
 package org.openrndr.extra.dnk3
 
-import org.openrndr.draw.*
+import org.openrndr.draw.Cubemap
+import org.openrndr.draw.RenderTarget
+import org.openrndr.draw.ShadeStyle
+import org.openrndr.draw.shadeStyle
 import org.openrndr.extra.dnk3.features.IrradianceSH
-import org.openrndr.math.Vector3
 
 interface Material {
     val name: String?
diff --git a/orx-jvm/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt b/orx-jvm/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt
index 2525b0c6..77961c34 100644
--- a/orx-jvm/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt
+++ b/orx-jvm/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt
@@ -1,8 +1,6 @@
 package org.openrndr.extra.dnk3.post
 
 import org.openrndr.draw.Filter
-import org.openrndr.draw.Shader
-import org.openrndr.draw.filterShaderFromUrl
 import org.openrndr.math.Matrix44
 import org.openrndr.resourceUrl
 
diff --git a/orx-jvm/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt b/orx-jvm/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt
index 9fe2fec7..86d1809b 100644
--- a/orx-jvm/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt
+++ b/orx-jvm/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt
@@ -1,11 +1,7 @@
 package org.openrndr.extra.dnk3.renderers
 
 import org.openrndr.draw.BufferMultisample
-import org.openrndr.draw.ColorFormat
-import org.openrndr.draw.ColorType
 import org.openrndr.extra.dnk3.*
-import org.openrndr.extra.dnk3.post.SegmentContours
-import org.openrndr.extra.dnk3.post.SegmentContoursMSAA8
 
 fun postRenderer(multisample: BufferMultisample = BufferMultisample.Disabled): SceneRenderer {
     val sr = SceneRenderer()
diff --git a/orx-jvm/orx-gui/build.gradle.kts b/orx-jvm/orx-gui/build.gradle.kts
index e1b44697..e1170a46 100644
--- a/orx-jvm/orx-gui/build.gradle.kts
+++ b/orx-jvm/orx-gui/build.gradle.kts
@@ -1,5 +1,3 @@
-import ScreenshotsHelper.collectScreenshots
-
 plugins {
     org.openrndr.extra.convention.`kotlin-jvm`
 }
diff --git a/orx-jvm/orx-gui/src/demo/kotlin/DemoHide01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoHide01.kt
index d234b73d..f7cb92c3 100644
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoHide01.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoHide01.kt
@@ -1,6 +1,5 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.gui.GUI
 import org.openrndr.extra.parameters.*
 import org.openrndr.math.Vector2
diff --git a/orx-jvm/orx-gui/src/demo/kotlin/DemoMultiWindow02.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoMultiWindow02.kt
index 162f49bc..0ea3bbaa 100644
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoMultiWindow02.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoMultiWindow02.kt
@@ -1,9 +1,6 @@
-import org.openrndr.WindowConfiguration
 import org.openrndr.application
-import org.openrndr.extra.gui.GUI
 import org.openrndr.extra.gui.WindowedGUI
-import org.openrndr.extra.parameters.*
-import org.openrndr.window
+import org.openrndr.extra.parameters.DoubleParameter
 import kotlin.system.exitProcess
 
 /**
diff --git a/orx-jvm/orx-gui/src/demo/kotlin/DemoOptions01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoOptions01.kt
index 161bfded..cf75db77 100644
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoOptions01.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoOptions01.kt
@@ -1,8 +1,8 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.gui.GUI
-import org.openrndr.extra.parameters.*
+import org.openrndr.extra.parameters.Description
+import org.openrndr.extra.parameters.OptionParameter
 
 /**
  * A simple demonstration of a GUI with a drop down menu
diff --git a/orx-jvm/orx-gui/src/demo/kotlin/DemoPresets01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoPresets01.kt
index 6ba32e27..feac020d 100644
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoPresets01.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoPresets01.kt
@@ -1,10 +1,10 @@
 import org.openrndr.KeyModifier
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.color.mix
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.gui.GUI
-import org.openrndr.extra.parameters.*
+import org.openrndr.extra.parameters.ColorParameter
+import org.openrndr.extra.parameters.Description
+import org.openrndr.extra.parameters.IntParameter
 
 /**
  * Shows how to store and retrieve in-memory gui presets.
diff --git a/orx-jvm/orx-gui/src/demo/kotlin/DemoSimple01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoSimple01.kt
index 13b99df9..315a67b1 100644
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoSimple01.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoSimple01.kt
@@ -1,6 +1,5 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.gui.GUI
 import org.openrndr.extra.parameters.*
 import org.openrndr.math.Vector2
diff --git a/orx-jvm/orx-gui/src/demo/kotlin/DemoXYParameter.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoXYParameter.kt
index 1d1e77d5..def7e0c5 100644
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoXYParameter.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoXYParameter.kt
@@ -1,5 +1,4 @@
 import org.openrndr.application
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.gui.GUI
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.XYParameter
diff --git a/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt b/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
index a7f24b75..64507807 100644
--- a/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
+++ b/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
@@ -1,13 +1,11 @@
 package org.openrndr.extra.olive
 
 import org.openrndr.ApplicationBuilder
-import org.openrndr.Program
 import org.openrndr.ProgramImplementation
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
 import kotlin.reflect.KProperty
-import kotlin.streams.toList
 
 open class OliveProgram(private val sourceLocation: String, private val scriptHost: OliveScriptHost, resources: Resources?) : ProgramImplementation() {
     val olive = extend(Olive<OliveProgram>(scriptMode = ScriptMode.OLIVE_PROGRAM, resources = resources)) {
diff --git a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt
index 76529e55..d6ad57f7 100644
--- a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt
+++ b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt
@@ -1,7 +1,6 @@
 package org.openrndr.panel.elements
 
 import kotlinx.coroutines.yield
-import org.openrndr.color.ColorRGBa
 import org.openrndr.events.Event
 import org.openrndr.launch
 import org.openrndr.math.Vector2
diff --git a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt
index da913d87..f79f6ab7 100644
--- a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt
+++ b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt
@@ -4,9 +4,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.yield
 import org.openrndr.draw.Drawer
 import org.openrndr.launch
-import org.openrndr.panel.elements.*
 import org.openrndr.panel.hash.watchHash
-import kotlin.reflect.KMutableProperty0
 
 class WatchObjectDiv<T:Any>(
     val watchObject: T,
diff --git a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt
index b890dd78..233f98e5 100644
--- a/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt
+++ b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt
@@ -4,7 +4,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.yield
 import org.openrndr.draw.Drawer
 import org.openrndr.launch
-import org.openrndr.panel.elements.*
 import kotlin.reflect.KMutableProperty0
 
 class WatchPropertyDiv<T : Any>(
diff --git a/orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt
index e51df80e..ad6277b7 100644
--- a/orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt
+++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt
@@ -8,7 +8,6 @@ import org.openrndr.extra.runway.FaceLandmarksResponse
 import org.openrndr.extra.runway.runwayQuery
 import org.openrndr.ffmpeg.VideoPlayerFFMPEG
 import org.openrndr.math.Vector2
-import org.openrndr.resourceUrl
 
 fun main() = application {
     configure {
diff --git a/orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt
index 68ca8864..aba35d18 100644
--- a/orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt
+++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt
@@ -4,9 +4,7 @@ import org.openrndr.draw.ColorBuffer
 import org.openrndr.draw.loadFont
 import org.openrndr.extra.runway.*
 import org.openrndr.ffmpeg.ScreenRecorder
-import org.openrndr.resourceUrl
 import java.io.File
-import java.net.URL
 
 /**
  * This demonstrates a feedback loop
diff --git a/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt
index c0cc4e7e..f9f39fbb 100644
--- a/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt
+++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt
@@ -3,10 +3,11 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.colorBuffer
 import org.openrndr.draw.loadFont
 import org.openrndr.extra.fx.transform.FlipVertically
-import org.openrndr.extra.runway.*
+import org.openrndr.extra.runway.Im2txtRequest
+import org.openrndr.extra.runway.Im2txtResult
+import org.openrndr.extra.runway.runwayQuery
 import org.openrndr.ffmpeg.ScreenRecorder
 import org.openrndr.ffmpeg.VideoPlayerFFMPEG
-import org.openrndr.math.Vector2
 
 
 /**
diff --git a/orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt b/orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt
index 3acab421..edb22bff 100644
--- a/orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt
+++ b/orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt
@@ -3,7 +3,6 @@ package org.openrndr.extra.runway
 import com.google.gson.Gson
 import org.openrndr.draw.ColorBuffer
 import org.openrndr.draw.ImageFileFormat
-import java.io.ByteArrayInputStream
 import java.io.File
 import java.net.*
 import java.util.*
diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt
index 1b57e8d9..1e19b93d 100644
--- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt
+++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt
@@ -1,8 +1,5 @@
         package jsyphon
 
-import java.io.File
-import java.util.*
-
 class JSyphonClient
 {
     private var ptr: Long = 0
diff --git a/orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt b/orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt
index 6dfb0200..a495ad39 100644
--- a/orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt
+++ b/orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt
@@ -6,11 +6,8 @@ import org.openrndr.draw.ColorFormat
 import org.openrndr.draw.ColorType
 import org.openrndr.draw.colorBuffer
 import org.openrndr.extra.tensorflow.arrays.*
-import org.tensorflow.Output
-import org.tensorflow.Tensor
 import org.tensorflow.ndarray.StdArrays
 import org.tensorflow.ndarray.buffer.DataBuffers
-import org.tensorflow.op.math.Add
 import org.tensorflow.types.*
 import org.tensorflow.types.family.TType
 import java.nio.ByteBuffer
diff --git a/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt
index 38728cd2..04e53b73 100644
--- a/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt
+++ b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.videoprofiles.GIFProfile
-import org.openrndr.extra.videoprofiles.ProresProfile
 import org.openrndr.ffmpeg.ScreenRecorder
 
 fun main() = application {
diff --git a/orx-noise/src/commonMain/kotlin/GaussianRandom.kt b/orx-noise/src/commonMain/kotlin/GaussianRandom.kt
index 338860ab..e00ac7a2 100644
--- a/orx-noise/src/commonMain/kotlin/GaussianRandom.kt
+++ b/orx-noise/src/commonMain/kotlin/GaussianRandom.kt
@@ -4,7 +4,6 @@ import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.Vector4
 import kotlin.math.ln
-import kotlin.math.log
 import kotlin.math.sqrt
 import kotlin.random.Random
 
diff --git a/orx-noise/src/commonMain/kotlin/Random.kt b/orx-noise/src/commonMain/kotlin/Random.kt
index ad9cf34b..63ebcc4a 100644
--- a/orx-noise/src/commonMain/kotlin/Random.kt
+++ b/orx-noise/src/commonMain/kotlin/Random.kt
@@ -4,10 +4,8 @@ import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.Vector4
 import org.openrndr.shape.Rectangle
-import kotlin.math.ln
 import kotlin.math.max
 import kotlin.math.pow
-import kotlin.math.sqrt
 import org.openrndr.extra.noise.fbm as orxFbm
 import kotlin.random.Random as DefaultRandom
 
diff --git a/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb2D.kt b/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb2D.kt
index 9b5bec10..883ec047 100644
--- a/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb2D.kt
+++ b/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb2D.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.colorBuffer
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.noise.gradientPerturbFractal
 import org.openrndr.extra.noise.simplex
 import org.openrndr.math.Vector2
diff --git a/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb3D.kt b/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb3D.kt
index a186e7eb..c707b063 100644
--- a/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb3D.kt
+++ b/orx-noise/src/jvmDemo/kotlin/DemoGradientPerturb3D.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.colorBuffer
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.noise.gradientPerturbFractal
 import org.openrndr.extra.noise.simplex
 import org.openrndr.math.Vector3
diff --git a/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt b/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt
index d1ba0c1b..eaa63630 100644
--- a/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt
+++ b/orx-noise/src/jvmDemo/kotlin/DemoScatter01.kt
@@ -1,9 +1,7 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.math.Vector2
-import org.openrndr.math.mod_
-
 import org.openrndr.extra.noise.scatter
+import org.openrndr.math.Vector2
 import org.openrndr.shape.Ellipse
 import kotlin.math.cos
 import kotlin.random.Random
diff --git a/orx-noise/src/jvmDemo/kotlin/DemoSimplex01.kt b/orx-noise/src/jvmDemo/kotlin/DemoSimplex01.kt
index 4e023c37..b42c8c24 100644
--- a/orx-noise/src/jvmDemo/kotlin/DemoSimplex01.kt
+++ b/orx-noise/src/jvmDemo/kotlin/DemoSimplex01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.noise.simplex
 import org.openrndr.shape.contour
 
diff --git a/orx-palette/src/main/kotlin/ColorUtils.kt b/orx-palette/src/main/kotlin/ColorUtils.kt
index 09ac5b65..bd5b83ab 100644
--- a/orx-palette/src/main/kotlin/ColorUtils.kt
+++ b/orx-palette/src/main/kotlin/ColorUtils.kt
@@ -1,7 +1,6 @@
 package org.openrndr.extra.palette
 
 import org.openrndr.color.ColorRGBa
-import org.openrndr.color.Linearity
 
 // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
 fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
diff --git a/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree01.kt b/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree01.kt
index 15d38adb..ba5bcf62 100644
--- a/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree01.kt
+++ b/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree01.kt
@@ -1,12 +1,11 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.rectangleBatch
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.noise.Random
 import org.openrndr.extra.noise.gaussian
+import org.openrndr.extra.quadtree.Quadtree
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
-import org.openrndr.extra.quadtree.Quadtree
 
 fun main() {
     application {
diff --git a/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree02.kt b/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree02.kt
index 3bd4660a..4cde136b 100644
--- a/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree02.kt
+++ b/orx-quadtree/src/jvmDemo/kotlin/DemoQuadTree02.kt
@@ -1,12 +1,11 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.rectangleBatch
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.noise.Random
 import org.openrndr.extra.noise.gaussian
+import org.openrndr.extra.quadtree.Quadtree
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
-import org.openrndr.extra.quadtree.Quadtree
 
 fun main() {
     application {
diff --git a/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt b/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt
index 0cf49ba0..a144ac1e 100644
--- a/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt
+++ b/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt
@@ -2,16 +2,17 @@
 
 package org.openrndr.extra.shadestyles
 
-import org.openrndr.color.*
+import org.openrndr.color.AlgebraicColor
+import org.openrndr.color.ColorRGBa
+import org.openrndr.color.ConvertibleToColorRGBa
 import org.openrndr.draw.ShadeStyle
-import org.openrndr.extra.shaderphrases.preprocess
 import org.openrndr.extra.color.phrases.ColorPhraseBook
 import org.openrndr.extra.color.spaces.ColorOKLABa
 import org.openrndr.extra.color.spaces.toOKLABa
 import org.openrndr.extra.parameters.*
+import org.openrndr.extra.shaderphrases.preprocess
 import org.openrndr.math.CastableToVector4
 import org.openrndr.math.Vector2
-import kotlin.reflect.KClass
 
 @Description("Linear gradient")
 open class LinearGradientBase<C>(
diff --git a/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt b/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt
index 78c0f3ec..c75ff9dc 100644
--- a/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt
+++ b/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt
@@ -2,15 +2,16 @@
 
 package org.openrndr.extra.shadestyles
 
-import org.openrndr.color.*
+import org.openrndr.color.AlgebraicColor
+import org.openrndr.color.ColorRGBa
+import org.openrndr.color.ConvertibleToColorRGBa
 import org.openrndr.draw.ShadeStyle
-import org.openrndr.draw.shadeStyle
+import org.openrndr.extra.color.phrases.ColorPhraseBook
+import org.openrndr.extra.color.spaces.ColorOKLABa
 import org.openrndr.extra.parameters.ColorParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 import org.openrndr.extra.shaderphrases.preprocess
-import org.openrndr.extra.color.phrases.ColorPhraseBook
-import org.openrndr.extra.color.spaces.ColorOKLABa
 import org.openrndr.math.CastableToVector4
 import org.openrndr.math.Vector2
 
diff --git a/orx-shade-styles/src/jvmDemo/kotlin/DemoAllGradients01.kt b/orx-shade-styles/src/jvmDemo/kotlin/DemoAllGradients01.kt
index 68c0ce85..aa68f5a2 100644
--- a/orx-shade-styles/src/jvmDemo/kotlin/DemoAllGradients01.kt
+++ b/orx-shade-styles/src/jvmDemo/kotlin/DemoAllGradients01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.isolated
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.shadestyles.*
 import org.openrndr.math.Polar
 import org.openrndr.shape.Rectangle
diff --git a/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointGradient01.kt b/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointGradient01.kt
index f09ce82d..9f4772c7 100644
--- a/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointGradient01.kt
+++ b/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointGradient01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.color.ColorXSVa
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.shadestyles.NPointGradient
 import org.openrndr.math.Polar
 import org.openrndr.shape.ShapeContour
diff --git a/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointRadialGradient01.kt b/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointRadialGradient01.kt
index 2736f107..1da00cf6 100644
--- a/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointRadialGradient01.kt
+++ b/orx-shade-styles/src/jvmDemo/kotlin/DemoNPointRadialGradient01.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.color.rgb
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.shadestyles.NPointRadialGradient
 import org.openrndr.shape.Circle
 import kotlin.random.Random
diff --git a/orx-shade-styles/src/jvmDemo/kotlin/DemoRadialGradient01.kt b/orx-shade-styles/src/jvmDemo/kotlin/DemoRadialGradient01.kt
index d786876e..d02a17dc 100644
--- a/orx-shade-styles/src/jvmDemo/kotlin/DemoRadialGradient01.kt
+++ b/orx-shade-styles/src/jvmDemo/kotlin/DemoRadialGradient01.kt
@@ -1,7 +1,5 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-
 import org.openrndr.extra.shadestyles.radialGradient
 import kotlin.math.cos
 
diff --git a/orx-shapes/build.gradle.kts b/orx-shapes/build.gradle.kts
index 81ea982b..17edb2d9 100644
--- a/orx-shapes/build.gradle.kts
+++ b/orx-shapes/build.gradle.kts
@@ -44,6 +44,7 @@ kotlin {
                 implementation(project(":orx-shapes"))
                 implementation(project(":orx-noise"))
                 implementation(project(":orx-mesh-generators"))
+                implementation(project(":orx-fx"))
             }
         }
     }
diff --git a/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt b/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt
index c5fde689..d86e357f 100644
--- a/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt
+++ b/orx-shapes/src/commonMain/kotlin/operators/ChamferCorners.kt
@@ -1,7 +1,6 @@
 package org.openrndr.extra.shapes.operators
 
 import org.openrndr.math.Vector2
-import org.openrndr.math.mod_
 import org.openrndr.shape.*
 import kotlin.math.abs
 import kotlin.math.sign
diff --git a/orx-shapes/src/commonMain/kotlin/splines/CatmullRom.kt b/orx-shapes/src/commonMain/kotlin/splines/CatmullRom.kt
index f6c7007d..030b310e 100644
--- a/orx-shapes/src/commonMain/kotlin/splines/CatmullRom.kt
+++ b/orx-shapes/src/commonMain/kotlin/splines/CatmullRom.kt
@@ -4,7 +4,6 @@ import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.mod
 import org.openrndr.shape.*
-import kotlin.jvm.JvmOverloads
 import kotlin.math.abs
 import kotlin.math.pow
 
diff --git a/orx-shapes/src/commonMain/kotlin/utilities/FromPaths.kt b/orx-shapes/src/commonMain/kotlin/utilities/FromPaths.kt
index 63f57f43..f61fd6c5 100644
--- a/orx-shapes/src/commonMain/kotlin/utilities/FromPaths.kt
+++ b/orx-shapes/src/commonMain/kotlin/utilities/FromPaths.kt
@@ -1,8 +1,6 @@
 package org.openrndr.extra.shapes.utilities
 
 import org.openrndr.shape.Path3D
-import org.openrndr.shape.ShapeContour
-import org.openrndr.shape.contour
 import org.openrndr.shape.path3D
 
 /**
diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt
index 89115f55..205ae7fd 100644
--- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt
+++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt
@@ -4,7 +4,6 @@ import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.shapes.adjust.adjustContour
 import org.openrndr.math.Vector2
-import org.openrndr.shape.Circle
 import kotlin.math.cos
 import kotlin.math.sin
 
diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt
index 53a34687..73d23184 100644
--- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt
+++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt
@@ -3,10 +3,8 @@ package adjust
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.shapes.adjust.adjustContour
-import org.openrndr.math.Vector2
 import org.openrndr.shape.Circle
 import kotlin.math.cos
-import kotlin.math.sin
 
 fun main() {
     application {
diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour08.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour08.kt
index 5a2cb446..d70917c7 100644
--- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour08.kt
+++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour08.kt
@@ -5,7 +5,6 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.shapes.adjust.adjustContour
 import org.openrndr.math.Vector2
 import org.openrndr.shape.contour
-import kotlin.math.cos
 
 fun main() {
     application {
diff --git a/orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer03.kt b/orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer03.kt
index 663b8e9e..dc51ce30 100644
--- a/orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer03.kt
+++ b/orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer03.kt
@@ -8,7 +8,6 @@ import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.extra.shapes.primitives.grid
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
-import org.openrndr.math.min
 import org.openrndr.math.transforms.buildTransform
 import org.openrndr.shape.Circle
 import org.openrndr.shape.Rectangle
diff --git a/orx-shapes/src/jvmDemo/kotlin/text/DemoText01.kt b/orx-shapes/src/jvmDemo/kotlin/text/DemoText01.kt
index c1a1df19..d54eac9e 100644
--- a/orx-shapes/src/jvmDemo/kotlin/text/DemoText01.kt
+++ b/orx-shapes/src/jvmDemo/kotlin/text/DemoText01.kt
@@ -5,8 +5,6 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.font.loadFace
 import org.openrndr.extra.shapes.bounds.bounds
 import org.openrndr.extra.shapes.text.shapesFromText
-import org.openrndr.math.Vector2
-import java.io.File
 
 fun main() {
     application {
diff --git a/orx-svg/src/jvmMain/kotlin/SVGLoader.kt b/orx-svg/src/jvmMain/kotlin/SVGLoader.kt
index 23f6041e..5bbd8cd1 100644
--- a/orx-svg/src/jvmMain/kotlin/SVGLoader.kt
+++ b/orx-svg/src/jvmMain/kotlin/SVGLoader.kt
@@ -1,10 +1,10 @@
 package org.openrndr.extra.svg
-import org.jsoup.*
-import org.jsoup.parser.*
+import org.jsoup.Jsoup
+import org.jsoup.parser.Parser
 import org.openrndr.extra.composition.*
-import org.openrndr.shape.*
-import java.io.*
-import java.net.*
+import java.io.File
+import java.net.MalformedURLException
+import java.net.URL
 
 /**
  * Load a [Composition] from a filename, url or svg string
diff --git a/orx-temporal-blur/src/demo/kotlin/DemoBasic01.kt b/orx-temporal-blur/src/demo/kotlin/DemoBasic01.kt
index 0cb67843..5f315710 100644
--- a/orx-temporal-blur/src/demo/kotlin/DemoBasic01.kt
+++ b/orx-temporal-blur/src/demo/kotlin/DemoBasic01.kt
@@ -1,5 +1,4 @@
 import org.openrndr.application
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.temporalblur.TemporalBlur
 import org.openrndr.math.Polar
 
diff --git a/orx-triangulation/src/commonMain/kotlin/Delaunay.kt b/orx-triangulation/src/commonMain/kotlin/Delaunay.kt
index a312cfea..409325d1 100644
--- a/orx-triangulation/src/commonMain/kotlin/Delaunay.kt
+++ b/orx-triangulation/src/commonMain/kotlin/Delaunay.kt
@@ -1,11 +1,8 @@
 package org.openrndr.extra.triangulation
 
+import org.openrndr.extra.triangulation.Delaunay.Companion.from
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
-import org.openrndr.shape.Triangle
-import org.openrndr.shape.contour
-import org.openrndr.shape.contours
-import kotlin.js.JsName
 import kotlin.math.cos
 import kotlin.math.pow
 import kotlin.math.sin
diff --git a/orx-triangulation/src/commonMain/kotlin/Voronoi.kt b/orx-triangulation/src/commonMain/kotlin/Voronoi.kt
index 3073c34d..bbcc0e7c 100644
--- a/orx-triangulation/src/commonMain/kotlin/Voronoi.kt
+++ b/orx-triangulation/src/commonMain/kotlin/Voronoi.kt
@@ -2,10 +2,6 @@ package org.openrndr.extra.triangulation
 
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
-import org.openrndr.shape.Shape
-import org.openrndr.shape.ShapeContour
-import org.openrndr.shape.bounds
-import kotlin.js.JsName
 import kotlin.math.abs
 import kotlin.math.floor
 import kotlin.math.sign